diff options
Diffstat (limited to 'source/xap')
| -rwxr-xr-x | source/xap/mozilla-firefox/mozilla-firefox.SlackBuild | 17 | ||||
| -rwxr-xr-x | source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild | 17 | ||||
| -rwxr-xr-x | source/xap/seamonkey/seamonkey.SlackBuild | 7 |
3 files changed, 35 insertions, 6 deletions
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index 507b85b30..51fe64ea6 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-firefox VERSION=$(basename $(ls firefox-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b | cut -f 1 -d e) -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Specify this variable for a localized build. # For example, to build a version of Firefox with Italian support, run @@ -85,8 +85,8 @@ if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32- fi # Choose a compiler (gcc/g++ or clang/clang++): -export CC=${CC:-gcc} -export CXX=${CXX:-g++} +export CC=${CC:-clang} +export CXX=${CXX:-clang++} # Keep memory usage as low as possible when linking: SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads" @@ -262,6 +262,7 @@ if [ ! -z $MOZLOCALIZE ]; then browser/installer/package-manifest.in || exit 1 fi +export MACH_USE_SYSTEM_PYTHON="1" export MOZILLA_OFFICIAL="1" export BUILD_OFFICIAL="1" export MOZ_PHOENIX="1" @@ -321,6 +322,9 @@ fi ./mach buildsymbols || exit 1 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 @@ -398,6 +402,13 @@ EOF chmod 755 $PKG/usr/bin/firefox fi +# Fix duplicate binary, https://bugzilla.mozilla.org/show_bug.cgi?id=658850 +( cd $PKG/usr/lib$LIBDIRSUFFIX/firefox + if cmp firefox firefox-bin ; then + ln -sf firefox-bin firefox + fi +) + mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index ec9be78f9..469b0e32c 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-thunderbird VERSION=$(basename $(ls thunderbird-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b) -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Specify this variable for a localized build. # For example, to build a version of Thunderbird with Italian support, run @@ -114,8 +114,8 @@ else fi # Choose a compiler (gcc/g++ or clang/clang++): -export CC=${CC:-gcc} -export CXX=${CXX:-g++} +export CC=${CC:-clang} +export CXX=${CXX:-clang++} # Keep memory usage as low as possible when linking: SLKLDFLAGS=" -Wl,--as-needed -Wl,--no-keep-memory -Wl,--stats -Wl,--reduce-memory-overheads" @@ -238,6 +238,7 @@ if [ ! -z $MOZLOCALIZE ]; then mail/installer/package-manifest.in || exit 1 fi +export MACH_USE_SYSTEM_PYTHON="1" export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 export MOZ_PHOENIX=1 @@ -281,6 +282,9 @@ echo "ac_add_options --disable-tests" >> .mozconfig ./mach buildsymbols || exit 1 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 @@ -354,6 +358,13 @@ EOF chmod 755 $PKG/usr/bin/thunderbird fi +# Fix duplicate binary, https://bugzilla.mozilla.org/show_bug.cgi?id=658850 +( cd $PKG/usr/lib$LIBDIRSUFFIX/thunderbird + if cmp thunderbird thunderbird-bin ; then + ln -sf thunderbird-bin thunderbird + fi +) + mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index 84515c6c4..b5ea0a4fe 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -251,6 +251,13 @@ cp -a \ AUTHORS LEGAL LICENSE README.txt \ $PKG/usr/doc/seamonkey-$VERSION +# Fix duplicate binary, https://bugzilla.mozilla.org/show_bug.cgi?id=658850 +( cd $PKG/usr/lib$LIBDIRSUFFIX/seamonkey + if cmp seamonkey seamonkey-bin ; then + ln -sf seamonkey-bin seamonkey + fi +) + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz | sed -e "s#usr/lib#usr/lib${LIBDIRSUFFIX}#g" \ |