Alexandre Julliard : packaging: Bump the version of several of the Android package dependencies.
Alexandre Julliard
julliard at winehq.org
Thu Dec 17 15:29:53 CST 2020
Module: tools
Branch: master
Commit: 3161fe99057ba6bd217c4fea9354d4e91b74def6
URL: https://source.winehq.org/git/tools.git/?a=commit;h=3161fe99057ba6bd217c4fea9354d4e91b74def6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Dec 17 22:11:39 2020 +0100
packaging: Bump the version of several of the Android package dependencies.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
packaging/android/build-apks | 56 ++++++++++++----------
packaging/android/cups.diff | 111 +++++++++++++++++--------------------------
2 files changed, 74 insertions(+), 93 deletions(-)
diff --git a/packaging/android/build-apks b/packaging/android/build-apks
index c2147ae..3662a48 100755
--- a/packaging/android/build-apks
+++ b/packaging/android/build-apks
@@ -31,31 +31,26 @@ winetools=$basedir/tools
silent=--silent
makeflags="--no-print-directory $silent -j$(nproc)"
-android_ndk=android-ndk-r18b
+android_ndk=android-ndk-r21d
gradle=gradle-3.5.1
-png=libpng-1.6.36
-jpeg=jpeg-9c
-freetype=freetype-2.8.1
-lcms2=lcms2-2.9
-tiff=tiff-4.0.10
-xml2=libxml2-2.9.7
-xslt=libxslt-1.1.30
-gmp=gmp-6.1.2
-nettle=nettle-3.4.1
-gnutls=gnutls-3.6.5
-openldap=openldap-2.4.46
-mpeg=mpg123-1.25.10
-cups=cups-2.2.9
+png=libpng-1.6.37
+jpeg=jpeg-9d
+freetype=freetype-2.10.4
+lcms2=lcms2-2.11
+tiff=tiff-4.1.0
+xml2=libxml2-2.9.10
+xslt=libxslt-1.1.34
+gmp=gmp-6.2.1
+nettle=nettle-3.6
+gnutls=gnutls-3.7.0
+openldap=openldap-2.4.56
+mpeg=mpg123-1.26.3
+cups=cups-2.3.3
+gecko=wine-gecko-2.47.2
sourcedir=$(cd $(dirname $0) && pwd)
release=$1
-if test -z "$release"
-then
- echo "Usage: $0 release_tag"
- exit 1
-fi
-
download ()
{
test -d $downloads || mkdir -p $downloads
@@ -87,13 +82,13 @@ config_gradle ()
config_png ()
{
- download $png https://sourceforge.net/projects/libpng/files/libpng16/1.6.36/$png.tar.xz/download?use_mirror=netcologne
+ download $png $png.tar.xz https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/$png.tar.xz/download
(cd $png && $run_configure && make $makeflags)
}
config_jpeg ()
{
- download $jpeg http://www.ijg.org/files/jpegsrc.v9c.tar.gz
+ download $jpeg http://www.ijg.org/files/jpegsrc.v9d.tar.gz
(cd $jpeg && $run_configure && make $makeflags)
# rename libjpeg.so to avoid conflicts with the system one
cp $jpeg/.libs/libjpeg.so $jpeg/.libs/libwjpeg.so
@@ -102,7 +97,7 @@ config_jpeg ()
config_freetype ()
{
test -d $png || config_png
- download $freetype http://download.savannah.gnu.org/releases/freetype/$freetype.tar.bz2
+ download $freetype http://download.savannah.gnu.org/releases/freetype/$freetype.tar.xz
pngdir=$(pwd)/$png
(cd $freetype && $run_configure LIBPNG_CFLAGS=-I$pngdir LIBPNG_LIBS="-L$pngdir/.libs -lpng16" && make $makeflags)
}
@@ -275,12 +270,11 @@ install_all ()
$install -m 644 $sourcedir/LICENSE.txt assets-tmp/LICENSE.txt
mv assets-tmp $destdir/assets
- (cd $destdir && gradle -q -Psrcdir=../../$srcdir -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug)
+ (cd $destdir && gradle -q -Psrcdir=$srcdir -Dorg.gradle.jvmargs="-Xmx2048m -XX:MaxPermSize=512m" assembleDebug)
mv $destdir/build/outputs/apk/wine-debug.apk ../../wine-${release:-debug}-$arch.apk
}
-rm -rf $basedir
-
+test -z "$release" || rm -rf $basedir
test -d $basedir || mkdir $basedir
cd $basedir
@@ -312,3 +306,13 @@ do
run_configure="./configure $silent --host=$host PKG_CONFIG=false"
install_all)
done
+
+# upload
+
+if test -n "$release"
+then
+ allfiles="wine-$release-x86.apk wine-$release-arm.apk"
+ scp -p $allfiles www.winehq.org:.
+ sha512sum $allfiles | ssh www.winehq.org sha512sum -c
+ ssh -n www.winehq.org mv $allfiles /home/ftp/pub/wine-builds/android
+fi
diff --git a/packaging/android/cups.diff b/packaging/android/cups.diff
index 0bad095..af82ad6 100644
--- a/packaging/android/cups.diff
+++ b/packaging/android/cups.diff
@@ -1,27 +1,26 @@
-diff -ur cups-2.2.4.orig/config-scripts/cups-sharedlibs.m4 cups-2.2.4/config-scripts/cups-sharedlibs.m4
---- cups-2.2.4.orig/config-scripts/cups-sharedlibs.m4 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/config-scripts/cups-sharedlibs.m4 2017-11-02 10:32:29.411070604 +0100
-@@ -32,6 +32,16 @@
+diff -ur cups-2.3.3.orig/config-scripts/cups-sharedlibs.m4 cups-2.3.3/config-scripts/cups-sharedlibs.m4
+--- cups-2.3.3.orig/config-scripts/cups-sharedlibs.m4 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/config-scripts/cups-sharedlibs.m4 2020-12-09 11:23:58.182435987 +0100
+@@ -29,6 +29,15 @@
DSOXX="\$(CXX)"
- DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
+ DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G"
;;
+ linux-android*)
+ LIBCUPS="lib$cupsbase.so"
-+ LIBCUPSCGI="libcupscgi.so"
-+ LIBCUPSIMAGE="libcupsimage.so"
-+ LIBCUPSMIME="libcupsmime.so"
-+ LIBCUPSPPDC="libcupsppdc.so"
++ if test "x$cupsimagebase" != x; then
++ LIBCUPSIMAGE="lib$cupsimagebase.so"
++ fi
+ DSO="\$(CC)"
+ DSOXX="\$(CXX)"
+ DSOFLAGS="$DSOFLAGS -shared \$(OPTIM)"
+ ;;
linux* | gnu* | *bsd*)
LIBCUPS="lib$cupsbase.so.2"
- LIBCUPSCGI="libcupscgi.so.1"
-diff -ur cups-2.2.4.orig/config-scripts/cups-ssl.m4 cups-2.2.4/config-scripts/cups-ssl.m4
---- cups-2.2.4.orig/config-scripts/cups-ssl.m4 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/config-scripts/cups-ssl.m4 2017-11-02 10:32:29.411070604 +0100
-@@ -68,6 +68,12 @@
+ if test "x$cupsimagebase" != x; then
+diff -ur cups-2.3.3.orig/config-scripts/cups-ssl.m4 cups-2.3.3/config-scripts/cups-ssl.m4
+--- cups-2.3.3.orig/config-scripts/cups-ssl.m4 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/config-scripts/cups-ssl.m4 2020-12-09 11:12:41.389901875 +0100
+@@ -45,6 +45,12 @@
SSLFLAGS=`$PKGCONFIG --cflags gnutls`
AC_DEFINE(HAVE_SSL)
AC_DEFINE(HAVE_GNUTLS)
@@ -34,27 +33,26 @@ diff -ur cups-2.2.4.orig/config-scripts/cups-ssl.m4 cups-2.2.4/config-scripts/cu
elif test "x$LIBGNUTLSCONFIG" != x; then
have_ssl=1
SSLLIBS=`$LIBGNUTLSCONFIG --libs`
-diff -ur cups-2.2.4.orig/configure cups-2.2.4/configure
---- cups-2.2.4.orig/configure 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/configure 2017-11-02 10:32:29.415070543 +0100
-@@ -6530,6 +6530,16 @@
+diff -ur cups-2.3.3.orig/configure cups-2.3.3/configure
+--- cups-2.3.3.orig/configure 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/configure 2020-12-09 11:24:31.907224437 +0100
+@@ -6511,6 +6511,15 @@
DSOXX="\$(CXX)"
- DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
+ DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G"
;;
+ linux-android*)
+ LIBCUPS="lib$cupsbase.so"
-+ LIBCUPSCGI="libcupscgi.so"
-+ LIBCUPSIMAGE="libcupsimage.so"
-+ LIBCUPSMIME="libcupsmime.so"
-+ LIBCUPSPPDC="libcupsppdc.so"
++ if test "x$cupsimagebase" != x; then
++ LIBCUPSIMAGE="lib$cupsimagebase.so"
++ fi
+ DSO="\$(CC)"
+ DSOXX="\$(CXX)"
+ DSOFLAGS="$DSOFLAGS -shared \$(OPTIM)"
+ ;;
linux* | gnu* | *bsd*)
LIBCUPS="lib$cupsbase.so.2"
- LIBCUPSCGI="libcupscgi.so.1"
-@@ -8516,6 +8526,14 @@
+ if test "x$cupsimagebase" != x; then
+@@ -8290,6 +8299,14 @@
$as_echo "#define HAVE_SSL 1" >>confdefs.h
$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
@@ -69,10 +67,10 @@ diff -ur cups-2.2.4.orig/configure cups-2.2.4/configure
elif test "x$LIBGNUTLSCONFIG" != x; then
have_ssl=1
-diff -ur cups-2.2.4.orig/cups/Makefile cups-2.2.4/cups/Makefile
---- cups-2.2.4.orig/cups/Makefile 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/cups/Makefile 2017-11-02 11:14:10.450961961 +0100
-@@ -317,6 +317,16 @@
+diff -ur cups-2.3.3.orig/cups/Makefile cups-2.3.3/cups/Makefile
+--- cups-2.3.3.orig/cups/Makefile 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/cups/Makefile 2020-12-09 11:27:09.498901365 +0100
+@@ -373,6 +373,16 @@
#
@@ -89,54 +87,33 @@ diff -ur cups-2.2.4.orig/cups/Makefile cups-2.2.4/cups/Makefile
# libcups.2.dylib
#
-diff -ur cups-2.2.4.orig/cups/language.c cups-2.2.4/cups/language.c
---- cups-2.2.4.orig/cups/language.c 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/cups/language.c 2017-11-02 10:32:29.415070543 +0100
-@@ -31,6 +31,13 @@
- #endif /* HAVE_COREFOUNDATION_H */
-
-
-+#ifdef __ANDROID__
-+/* nl_langinfo not available on API < 26 */
-+#if __ANDROID_API__ < 26
-+#undef CODESET
-+#endif
-+#endif
-+
- /*
- * Local globals...
- */
-diff -ur cups-2.2.4.orig/cups/thread.c cups-2.2.4/cups/thread.c
---- cups-2.2.4.orig/cups/thread.c 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/cups/thread.c 2017-11-02 10:32:29.415070543 +0100
-@@ -150,7 +150,9 @@
- void
- _cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */
- {
-- pthread_cancel(thread);
-+#ifndef __ANDROID__
-+ pthread_cancel(thread);
-+#endif
- }
-
-
-diff -ur cups-2.2.4.orig/filter/Makefile cups-2.2.4/filter/Makefile
---- cups-2.2.4.orig/filter/Makefile 2017-06-30 17:44:38.000000000 +0200
-+++ cups-2.2.4/filter/Makefile 2017-11-02 11:16:22.624712571 +0100
-@@ -241,6 +241,16 @@
+@@ -439,6 +449,15 @@
#
+# libcupsimage.so
+#
+
-+libcupsimage.so: $(IMAGEOBJS)
++libcupsimage.so: $(IMAGEOBJS) libcups.so
+ echo Linking $@...
-+ $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
-+ -L../cups $(LINKCUPS)
++ $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(LINKCUPS)
+
+
+#
# libcupsimage.2.dylib
#
+diff -ur cups-2.3.3.orig/cups/thread.c cups-2.3.3/cups/thread.c
+--- cups-2.3.3.orig/cups/thread.c 2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/cups/thread.c 2020-12-09 11:12:41.393901979 +0100
+@@ -153,7 +153,9 @@
+ void
+ _cupsThreadCancel(_cups_thread_t thread)/* I - Thread ID */
+ {
+- pthread_cancel(thread);
++#ifndef __ANDROID__
++ pthread_cancel(thread);
++#endif
+ }
+
+
More information about the wine-cvs
mailing list