summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/efivar/efivar.SlackBuild2
-rwxr-xr-xsource/a/gptfdisk/gptfdisk.SlackBuild2
-rwxr-xr-xsource/a/xfsprogs/xfsprogs.SlackBuild2
-rwxr-xr-xsource/ap/sqlite/sqlite.SlackBuild2
-rwxr-xr-xsource/ap/sudo/sudo.SlackBuild13
-rw-r--r--source/kde/kde/build/kcoreaddons2
-rw-r--r--source/kde/kde/build/kfilemetadata2
-rw-r--r--source/kde/kde/build/ktexteditor2
-rw-r--r--source/kde/kde/patch/ktexteditor.patch2
-rw-r--r--source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch101
-rwxr-xr-xsource/l/gnu-efi/gnu-efi.SlackBuild2
-rw-r--r--source/l/gnu-efi/gnu-efi.url2
-rwxr-xr-xsource/l/pango/pango.SlackBuild4
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild17
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild17
-rwxr-xr-xsource/xap/seamonkey/seamonkey.SlackBuild7
16 files changed, 56 insertions, 123 deletions
diff --git a/source/a/efivar/efivar.SlackBuild b/source/a/efivar/efivar.SlackBuild
index dc4430c4c..39b8a7572 100755
--- a/source/a/efivar/efivar.SlackBuild
+++ b/source/a/efivar/efivar.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=efivar
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/gptfdisk/gptfdisk.SlackBuild b/source/a/gptfdisk/gptfdisk.SlackBuild
index 37708a610..431161a5d 100755
--- a/source/a/gptfdisk/gptfdisk.SlackBuild
+++ b/source/a/gptfdisk/gptfdisk.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gptfdisk
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index e53e4c164..fe5d5e8f9 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfsprogs
VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index 781f7d40a..6e4df6f07 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sqlite
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# First, convert the .zip file if needed:
if ls *.zip 1> /dev/null 2> /dev/null ; then
diff --git a/source/ap/sudo/sudo.SlackBuild b/source/ap/sudo/sudo.SlackBuild
index 984c7e0bd..5bbe1f487 100755
--- a/source/ap/sudo/sudo.SlackBuild
+++ b/source/ap/sudo/sudo.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2016, 2018, 2021 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sudo
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -54,12 +54,19 @@ mkdir -p $TMP $PKG/var/db
if [ "$ARCH" = "i386" ]; then
SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
cd $TMP
@@ -79,8 +86,8 @@ if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
PAM_OPTIONS="--enable-pam-session --with-pam=yes"
unset SHADOW_OPTIONS
else
- unset PAM_OPTIONS
SHADOW_OPTIONS="--disable-pam-session --with-pam=no"
+ unset PAM_OPTIONS
fi
CFLAGS="$SLKCFLAGS" \
diff --git a/source/kde/kde/build/kcoreaddons b/source/kde/kde/build/kcoreaddons
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kcoreaddons
+++ b/source/kde/kde/build/kcoreaddons
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kfilemetadata
+++ b/source/kde/kde/build/kfilemetadata
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/ktexteditor b/source/kde/kde/build/ktexteditor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/ktexteditor
+++ b/source/kde/kde/build/ktexteditor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/patch/ktexteditor.patch b/source/kde/kde/patch/ktexteditor.patch
deleted file mode 100644
index 39331d706..000000000
--- a/source/kde/kde/patch/ktexteditor.patch
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fix syntax highlighting in kdevelop:
-cat $CWD/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch b/source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch
deleted file mode 100644
index 7fca1a9e5..000000000
--- a/source/kde/kde/patch/ktexteditor/686da7797105a93035cfbc7edbf2a8e8f8adf0ec.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 686da7797105a93035cfbc7edbf2a8e8f8adf0ec Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Wed, 17 Feb 2021 20:51:12 +0100
-Subject: [PATCH] ensure rangesForLine caching is correcly updated
-
-during fixing a segfault, as invalid range pointer were kept
-in the rangesForLine cache, too many ranges were purged
-
-properly update the cache before potential invalidation
-
-add unit test to avoid regressions in the future
----
- autotests/src/movingrange_test.cpp | 33 ++++++++++++++++++++++++++++++
- autotests/src/movingrange_test.h | 1 +
- src/buffer/katetextblock.cpp | 10 +++++++++
- 3 files changed, 44 insertions(+)
-
-diff --git a/autotests/src/movingrange_test.cpp b/autotests/src/movingrange_test.cpp
-index 66393ae7..81a85b1a 100644
---- a/autotests/src/movingrange_test.cpp
-+++ b/autotests/src/movingrange_test.cpp
-@@ -459,3 +459,36 @@ void MovingRangeTest::testLineRemoved()
- auto r = doc.buffer().rangesForLine(1, view, true);
- QVERIFY(r.isEmpty());
- }
-+
-+void MovingRangeTest::testLineWrapOrUnwrapUpdateRangeForLineCache()
-+{
-+ KTextEditor::DocumentPrivate doc;
-+ doc.setText(
-+ QStringLiteral("abcd\n"
-+ "efgh\n"
-+ "hijk\n"));
-+
-+ // add range to line 2, it shall be in rangeForLine for the right lines after each update!
-+ // must be single line range to be in the cache!
-+ auto range = static_cast<Kate::TextRange *>(doc.newMovingRange({2, 1, 2, 3},
-+ KTextEditor::MovingRange::ExpandLeft | KTextEditor::MovingRange::ExpandRight,
-+ KTextEditor::MovingRange::InvalidateIfEmpty));
-+
-+ // range shall be in the lookup cache for line 2
-+ QVERIFY(doc.buffer().rangesForLine(0, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(1, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(2, nullptr, false).contains(range));
-+
-+ // wrap line 1 => range should move to line 3
-+ doc.editWrapLine(1, 1);
-+ QVERIFY(doc.buffer().rangesForLine(0, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(1, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(2, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(3, nullptr, false).contains(range));
-+
-+ // unwrap line 1 => range should back move to line 2
-+ doc.editUnWrapLine(1);
-+ QVERIFY(doc.buffer().rangesForLine(0, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(1, nullptr, false).isEmpty());
-+ QVERIFY(doc.buffer().rangesForLine(2, nullptr, false).contains(range));
-+}
-diff --git a/autotests/src/movingrange_test.h b/autotests/src/movingrange_test.h
-index 6f8c057d..016655f7 100644
---- a/autotests/src/movingrange_test.h
-+++ b/autotests/src/movingrange_test.h
-@@ -24,6 +24,7 @@ private Q_SLOTS:
- void testFeedbackCaret();
- void testFeedbackMouse();
- void testLineRemoved();
-+ void testLineWrapOrUnwrapUpdateRangeForLineCache();
- };
-
- #endif // KATE_MOVINGRANGE_TEST_H
-diff --git a/src/buffer/katetextblock.cpp b/src/buffer/katetextblock.cpp
-index 43d137e4..246897b4 100644
---- a/src/buffer/katetextblock.cpp
-+++ b/src/buffer/katetextblock.cpp
-@@ -167,6 +167,11 @@ void TextBlock::wrapLine(const KTextEditor::Cursor &position, int fixStartLinesS
- // we might need to invalidate ranges or notify about their changes
- // checkValidity might trigger delete of the range!
- for (TextRange *range : qAsConst(changedRanges)) {
-+ // we need to do updateRange to ALWAYS ensure the line => range and back cache is updated
-+ // see MovingRangeTest::testLineWrapOrUnwrapUpdateRangeForLineCache
-+ updateRange(range);
-+
-+ // in addition: ensure that we really invalidate bad ranges!
- range->checkValidity(range->toLineRange());
- }
- }
-@@ -333,6 +338,11 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
- // we might need to invalidate ranges or notify about their changes
- // checkValidity might trigger delete of the range!
- for (TextRange *range : qAsConst(changedRanges)) {
-+ // we need to do updateRange to ALWAYS ensure the line => range and back cache is updated
-+ // see MovingRangeTest::testLineWrapOrUnwrapUpdateRangeForLineCache
-+ updateRange(range);
-+
-+ // in addition: ensure that we really invalidate bad ranges!
- range->checkValidity(range->toLineRange());
- }
- }
---
-GitLab
-
diff --git a/source/l/gnu-efi/gnu-efi.SlackBuild b/source/l/gnu-efi/gnu-efi.SlackBuild
index 19c3195c0..d98191af5 100755
--- a/source/l/gnu-efi/gnu-efi.SlackBuild
+++ b/source/l/gnu-efi/gnu-efi.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gnu-efi
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/l/gnu-efi/gnu-efi.url b/source/l/gnu-efi/gnu-efi.url
index f8534125c..25afde1be 100644
--- a/source/l/gnu-efi/gnu-efi.url
+++ b/source/l/gnu-efi/gnu-efi.url
@@ -1 +1 @@
-https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.12.tar.bz2
+https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.13.tar.bz2
diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild
index 1b0c79ccb..f39466bfb 100755
--- a/source/l/pango/pango.SlackBuild
+++ b/source/l/pango/pango.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pango
VERSION=${VERSION:-$(echo pango-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -94,7 +94,7 @@ meson setup \
--sysconfdir=/etc \
--localstatedir=/var \
--buildtype=release \
- -Dgtk_doc=true \
+ -Dgtk_doc=false \
.. || exit 1
"${NINJA:=ninja}" $NUMJOBS || exit 1
DESTDIR=$PKG $NINJA install || exit 1
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" \
generated by cgit v1.2.3-65-gdbad (git 2.45.1) at 2024-05-22 19:37:59 +0000