diff options
Diffstat (limited to 'source/xap')
12 files changed, 56 insertions, 39 deletions
diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild index 5bb398323..934b6b0a3 100755 --- a/source/xap/fluxbox/fluxbox.SlackBuild +++ b/source/xap/fluxbox/fluxbox.SlackBuild @@ -83,6 +83,9 @@ zcat $CWD/fluxbox.startfluxbox.dbus.diff.gz | patch -p1 --verbose || exit 1 # Fix multimedia volume keys: zcat $CWD/fluxbox.keys.diff.gz | patch -p1 --verbose || exit 1 +# Fix build with gcc11: +zcat $CWD/fluxbox.gcc11.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/fluxbox/fluxbox.gcc11.patch b/source/xap/fluxbox/fluxbox.gcc11.patch new file mode 100644 index 000000000..f01849711 --- /dev/null +++ b/source/xap/fluxbox/fluxbox.gcc11.patch @@ -0,0 +1,11 @@ +--- ./util/fluxbox-remote.cc.orig 2015-02-08 04:44:45.377187009 -0600 ++++ ./util/fluxbox-remote.cc 2021-08-05 23:16:44.301526535 -0500 +@@ -73,7 +73,7 @@ + if (strcmp(cmd, "result") == 0) { + XTextProperty text_prop; + if (XGetTextProperty(disp, root, &text_prop, atom_result) != 0 +- && text_prop.value > 0 ++ && text_prop.value != 0 + && text_prop.nitems > 0) { + + printf("%s", text_prop.value); diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build index d0813df0e..aa09beaba 100755 --- a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build +++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build @@ -81,6 +81,9 @@ if [ ! -z $LIBDIRSUFFIX ]; then sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py fi +# Use gcc as there have been linker failures with objects build with clang: +CC="gcc" \ +CXX="g++" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url index 88bd888a5..75f7f4d38 100644 --- a/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url +++ b/source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url @@ -1,2 +1,2 @@ -https://nodejs.org/dist/latest-v14.x/node-v14.17.1.tar.xz +https://nodejs.org/dist/v10.16.0/node-v10.16.0.tar.gz #https://github.com/nodejs/node diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index d81bea33e..4b558e783 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -333,8 +333,8 @@ DESTDIR=$PKG ./mach install || exit 1 # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -# Clean up the build time dependencies: -rm -rf $TMP/mozilla-firefox-build-deps +## Clean up the build time dependencies: +#rm -rf $TMP/mozilla-firefox-build-deps # We don't need these (just symlinks anyway): rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER diff --git a/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build index 6f98074fe..e07f5a72e 100755 --- a/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build +++ b/source/xap/mozilla-thunderbird/build-deps/nodejs/nodejs.build @@ -81,6 +81,9 @@ if [ ! -z $LIBDIRSUFFIX ]; then sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py fi +# Use gcc as there have been linker failures with objects build with clang: +CC="gcc" \ +CXX="g++" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff b/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff index 759809277..115ba0e7a 100644 --- a/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff +++ b/source/xap/mozilla-thunderbird/gkrust.a.no.networking.check.diff @@ -1,27 +1,31 @@ ---- ./config/makefiles/rust.mk.orig 2020-08-04 21:42:49.000000000 -0500 -+++ ./config/makefiles/rust.mk 2020-08-24 21:44:11.930497037 -0500 -@@ -303,15 +303,15 @@ +--- ./config/makefiles/rust.mk.orig 2021-03-15 12:42:08.219987929 -0500 ++++ ./config/makefiles/rust.mk 2021-03-15 12:43:15.996984180 -0500 +@@ -332,17 +332,17 @@ # the chance of proxy bypasses originating from rust code. - # The check only works when rust code is built with -Clto. + # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS. # Sanitizers and sancov also fail because compiler-rt hooks network functions. -ifndef MOZ_PROFILE_GENERATE -ifeq ($(OS_ARCH), Linux) -ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) +-ifndef MOZ_LTO_RUST_CROSS -ifneq (,$(filter -Clto,$(cargo_rustc_flags))) - $(call py_action,check_binary,--target --networking $@) -endif -endif -endif -endif +-endif +#ifndef MOZ_PROFILE_GENERATE +#ifeq ($(OS_ARCH), Linux) +#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN)) ++#ifndef MOZ_LTO_RUST_CROSS +#ifneq (,$(filter -Clto,$(cargo_rustc_flags))) +# $(call py_action,check_binary,--target --networking $@) +#endif +#endif +#endif +#endif ++#endif force-cargo-library-check: $(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag) diff --git a/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch b/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch deleted file mode 100644 index 7309b55a1..000000000 --- a/source/xap/mozilla-thunderbird/mozilla-firefox.xpcom_arm.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/xpcom/glue/objs.mk -+++ a/xpcom/glue/objs.mk -@@ -71,13 +71,13 @@ XPCOM_GLUENS_SRC_LCPPSRCS = \ - SSE.cpp \ - unused.cpp \ - nsProxyRelease.cpp \ - nsTextFormatter.cpp \ - GenericFactory.cpp \ - FileUtils.cpp \ - $(NULL) - --ifeq (arm,$(TARGET_CPU)) -+ifneq (,$(filter arm%,$(TARGET_CPU))) - XPCOM_GLUENS_SRC_LCPPSRCS += arm.cpp - endif - - XPCOM_GLUENS_SRC_CPPSRCS = $(addprefix $(topsrcdir)/xpcom/glue/,$(XPCOM_GLUENS_SRC_LCPPSRCS)) - diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index afc9aa5bc..3ad94b607 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -50,14 +50,6 @@ LANG=C # this to something other than "YES": MOZ_ALLOW_DOWNGRADE=${MOZ_ALLOW_DOWNGRADE:-YES} -# This can be set to YES or NO: -ENABLE_CALENDAR=${ENABLE_CALENDAR:-YES} -if [ "$ENABLE_CALENDAR" = "NO" ]; then - ENABLE_CALENDAR="--disable-calendar" -else - ENABLE_CALENDAR="--enable-calendar" -fi - # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -192,8 +184,6 @@ fi # Arch-dependent patches: case "$ARCH" in armv7hl) ARCH_CONFIG="--with-arch=armv7-a --with-float-abi=hard --with-fpu=vfpv3-d16 --disable-elf-hack" - # Make Thunderbird compile on ARM platforms lacking neon support: - zcat $CWD/mozilla-firefox.xpcom_arm.patch.gz | patch -p1 --verbose || exit 1 ;; *) ARCH_CONFIG=" " ;; @@ -216,7 +206,6 @@ OPTIONS="\ --with-system-nspr \ --enable-alsa \ --enable-application=comm/mail \ - $ENABLE_CALENDAR \ --enable-default-toolkit=cairo-gtk3-wayland \ --enable-linker=$LINKER \ --disable-strip \ @@ -291,8 +280,8 @@ DESTDIR=$PKG ./mach install || exit 1 # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -# Clean up the build time dependencies: -rm -rf $TMP/mozilla-thunderbird-build-deps +## Clean up the build time dependencies: +#rm -rf $TMP/mozilla-thunderbird-build-deps # We don't need these (just symlinks anyway): rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/thunderbird-devel-$RELEASEVER diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild index f033b3e1d..1e39ed78f 100755 --- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild +++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=network-manager-applet VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild index d9cacee99..a7dec1693 100755 --- a/source/xap/pan/pan.SlackBuild +++ b/source/xap/pan/pan.SlackBuild @@ -81,6 +81,8 @@ zcat $CWD/pan.glib-2.68.0.diff.gz | patch -p1 --verbose || exit 1 # Build with enchant-2: zcat $CWD/pan.enchant2.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/pan.gcc11.diff.gz | patch -p1 --verbose || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/pan/pan.gcc11.diff b/source/xap/pan/pan.gcc11.diff new file mode 100644 index 000000000..fe7e6b2f2 --- /dev/null +++ b/source/xap/pan/pan.gcc11.diff @@ -0,0 +1,20 @@ +--- ./pan/usenet-utils/mime-utils.cc.orig 2019-09-29 16:01:34.000000000 -0500 ++++ ./pan/usenet-utils/mime-utils.cc 2021-08-05 23:56:48.628393544 -0500 +@@ -1749,7 +1749,7 @@ + #ifdef HAVE_GMIME_30 + GMimeObject *gmo; + gmo = g_mime_message_get_mime_part (body); +- if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) <0) ++ if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) != 0) + #else + if (g_mime_multipart_signed_sign (mps, GMIME_OBJECT (part), gpg_ctx, uid.c_str(), GMIME_DIGEST_ALGO_SHA1, &err) <0) + #endif +@@ -1784,7 +1784,7 @@ + + #ifdef HAVE_GMIME_30 + if (g_mime_multipart_encrypted_encrypt(gpg_ctx, GMIME_OBJECT (part), sign, uid.c_str(), +- GMIME_ENCRYPT_NONE, rcp, &err) < 0) ++ GMIME_ENCRYPT_NONE, rcp, &err) != 0) + #else + if (g_mime_multipart_encrypted_encrypt(mpe, GMIME_OBJECT (part), gpg_ctx, sign, + uid.c_str(), GMIME_DIGEST_ALGO_SHA1, rcp, &err) < 0) |