diff options
Diffstat (limited to '')
24 files changed, 103 insertions, 52 deletions
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index 56ae24107..c6753a78b 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -2,7 +2,7 @@ # GCC package build script (written by volkerdi@slackware.com) # # Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -84,6 +84,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "gcc-objc-$VERSION-$ARCH-$BUILD.txz" echo "gcc-go-$VERSION-$ARCH-$BUILD.txz" echo "gcc-gdc-$VERSION-$ARCH-$BUILD.txz" + echo "gcc-gm2-$VERSION-$ARCH-$BUILD.txz" exit 0 fi @@ -143,13 +144,14 @@ PKG4=$TMP/package-gcc-gnat PKG6=$TMP/package-gcc-objc PKG8=$TMP/package-gcc-go PKG10=$TMP/package-gcc-gdc +PKG11=$TMP/package-gcc-gm2 # Clear the build locations: -rm -rf $PKG{1,2,3,4,6,8,10} -mkdir -p $PKG{1,2,3,4,6,8,10}/usr/doc/gcc-$VERSION +rm -rf $PKG{1,2,3,4,6,8,10,11} +mkdir -p $PKG{1,2,3,4,6,8,10,11}/usr/doc/gcc-$VERSION # Insert package descriptions: -mkdir -p $PKG{1,2,3,4,6,8,9,10}/install +mkdir -p $PKG{1,2,3,4,6,8,9,10,11}/install cat $CWD/slack-desc.gcc > $PKG1/install/slack-desc cat $CWD/slack-desc.gcc-g++ > $PKG2/install/slack-desc cat $CWD/slack-desc.gcc-gfortran > $PKG3/install/slack-desc @@ -157,6 +159,7 @@ cat $CWD/slack-desc.gcc-gnat > $PKG4/install/slack-desc cat $CWD/slack-desc.gcc-objc > $PKG6/install/slack-desc cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc +cat $CWD/slack-desc.gcc-gm2 > $PKG11/install/slack-desc cd gcc-$SRCVER || exit 1 @@ -259,6 +262,17 @@ mkdir -p $PKG10/usr/doc/gcc-${VERSION}/gcc/d fi ) +mkdir -p $PKG11/usr/doc/gcc-${VERSION}/gcc/m2 +( cd gcc/m2 || exit 0 + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG11/usr/doc/gcc-${VERSION}/gcc/m2/ChangeLog + touch -r ChangeLog $PKG11/usr/doc/gcc-${VERSION}/gcc/m2/ChangeLog + fi + cp -a \ + COPYING* NEWS* README* \ + $PKG11/usr/doc/gcc-${VERSION}/gcc/m2 +) + mkdir -p $PKG3/usr/doc/gcc-${VERSION}/libgfortran ( cd libgfortran || exit 0 if [ -r ChangeLog ]; then @@ -331,7 +345,7 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 --infodir=/usr/info \ --enable-shared \ --enable-bootstrap \ - --enable-languages=ada,c,c++,d,fortran,go,lto,objc,obj-c++ \ + --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++ \ --enable-threads=posix \ --enable-checking=release \ --enable-objc-gc \ @@ -602,6 +616,26 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la mv $PKG1/usr/man/man1/gdc.1.gz usr/man/man1 ) || exit 1 +# gcc-gm2: +( cd $PKG11 + mkdir -p usr/bin + mv $PKG1/usr/bin/gm2 $PKG1/usr/bin/*-gm2 usr/bin + mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/plugin + mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/m2 usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION + mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/plugin/m2* usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/plugin + mv $PKG1/usr/lib${LIBDIRSUFFIX}/libm2* usr/lib${LIBDIRSUFFIX} + # As a rule, we don't package static libraries: + ( cd usr/lib${LIBDIRSUFFIX} + for library in libm2*.so ; do + rm -f $(basename $library .so).a + done + ) + mkdir -p usr/libexec/gcc/$TARGET/$VERSION + mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/cc1gm2 usr/libexec/gcc/$TARGET/$VERSION + mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/gm2.1.gz usr/man/man1 +) || exit 1 + # Generate packages: ( cd $PKG1 makepkg -l y -c n $TMP/gcc-$VERSION-$ARCH-$BUILD.txz ) @@ -617,8 +651,9 @@ rm -f $PKG1/{,usr/}lib${LIBDIRSUFFIX}/*.la makepkg -l y -c n $TMP/gcc-go-$VERSION-$ARCH-$BUILD.txz ) ( cd $PKG10 makepkg -l y -c n $TMP/gcc-gdc-$VERSION-$ARCH-$BUILD.txz ) +( cd $PKG11 + makepkg -l y -c n $TMP/gcc-gm2-$VERSION-$ARCH-$BUILD.txz ) echo echo "Slackware GCC package build complete!" echo - diff --git a/source/d/gcc/patches/gcc-no_fixincludes.diff b/source/d/gcc/patches/gcc-no_fixincludes.diff index e152e0821..8307fbfc9 100644 --- a/source/d/gcc/patches/gcc-no_fixincludes.diff +++ b/source/d/gcc/patches/gcc-no_fixincludes.diff @@ -1,19 +1,23 @@ ---- ./gcc/Makefile.in.orig 2018-03-09 09:24:44.000000000 -0600 -+++ ./gcc/Makefile.in 2018-05-02 12:25:43.958002771 -0500 -@@ -3004,9 +3004,9 @@ - chmod a+r $${fix_dir}/limits.h; \ +--- ./gcc/Makefile.in.orig 2023-04-26 12:25:33.525797045 -0500 ++++ ./gcc/Makefile.in 2023-04-26 13:40:12.282459243 -0500 +@@ -3202,11 +3202,11 @@ + cp $(srcdir)/gsyslimits.h $${include_dir}/syslimits.h; \ done # Install the README -- rm -f include-fixed/README -- cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README -- chmod a+r include-fixed/README -+# rm -f include-fixed/README -+# cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README -+# chmod a+r include-fixed/README +- if [ x$(STMP_FIXINC) != x ]; then \ +- rm -f include-fixed/README; \ +- cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README; \ +- chmod a+r include-fixed/README; \ +- fi; ++# if [ x$(STMP_FIXINC) != x ]; then \ ++# rm -f include-fixed/README; \ ++# cp $(srcdir)/../fixincludes/README-fixinc include-fixed/README; \ ++# chmod a+r include-fixed/README; \ ++# fi; $(STAMP) $@ .PHONY: install-gcc-tooldir -@@ -3087,10 +3087,7 @@ +@@ -3287,10 +3287,7 @@ (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \ SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \ gcc_dir=`${PWD_COMMAND}` ; \ @@ -22,6 +26,6 @@ - $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \ - $(BUILD_SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \ + export TARGET_MACHINE srcdir SHELL MACRO_LIST ); \ - rm -f $${fix_dir}/syslimits.h; \ - if [ -f $${fix_dir}/limits.h ]; then \ - mv $${fix_dir}/limits.h $${fix_dir}/syslimits.h; \ + done; \ + fi + $(STAMP) stmp-fixinc diff --git a/testing/source/gcc/slack-desc.gcc-gm2 b/source/d/gcc/slack-desc.gcc-gm2 index a06b61475..a06b61475 100644 --- a/testing/source/gcc/slack-desc.gcc-gm2 +++ b/source/d/gcc/slack-desc.gcc-gm2 diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index 4bf94114b..8cfd2cfcc 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libtool VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/k/kernel-configs/config-generic-6.1.31 b/source/k/kernel-configs/config-generic-6.1.32 index 474131902..d9b46a070 100644 --- a/source/k/kernel-configs/config-generic-6.1.31 +++ b/source/k/kernel-configs/config-generic-6.1.32 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.31 Kernel Configuration +# Linux/x86 6.1.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 diff --git a/source/k/kernel-configs/config-generic-6.1.31.x64 b/source/k/kernel-configs/config-generic-6.1.32.x64 index 11caef2a6..ff167e153 100644 --- a/source/k/kernel-configs/config-generic-6.1.31.x64 +++ b/source/k/kernel-configs/config-generic-6.1.32.x64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.31 Kernel Configuration +# Linux/x86 6.1.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 diff --git a/source/k/kernel-configs/config-generic-smp-6.1.31-smp b/source/k/kernel-configs/config-generic-smp-6.1.32-smp index 7acd48159..9cb7b039a 100644 --- a/source/k/kernel-configs/config-generic-smp-6.1.31-smp +++ b/source/k/kernel-configs/config-generic-smp-6.1.32-smp @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.31 Kernel Configuration +# Linux/x86 6.1.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 diff --git a/source/k/kernel-configs/config-huge-6.1.31 b/source/k/kernel-configs/config-huge-6.1.32 index a6edb81c4..1d37e47f5 100644 --- a/source/k/kernel-configs/config-huge-6.1.31 +++ b/source/k/kernel-configs/config-huge-6.1.32 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.31 Kernel Configuration +# Linux/x86 6.1.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 diff --git a/source/k/kernel-configs/config-huge-6.1.31.x64 b/source/k/kernel-configs/config-huge-6.1.32.x64 index 7a799d996..5eab48d71 100644 --- a/source/k/kernel-configs/config-huge-6.1.31.x64 +++ b/source/k/kernel-configs/config-huge-6.1.32.x64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.31 Kernel Configuration +# Linux/x86 6.1.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 diff --git a/source/k/kernel-configs/config-huge-smp-6.1.31-smp b/source/k/kernel-configs/config-huge-smp-6.1.32-smp index 784a0c71c..89c61c6e3 100644 --- a/source/k/kernel-configs/config-huge-smp-6.1.31-smp +++ b/source/k/kernel-configs/config-huge-smp-6.1.32-smp @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.31 Kernel Configuration +# Linux/x86 6.1.32 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120200 +CONFIG_GCC_VERSION=130100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 diff --git a/source/kde/kde/build/calligra b/source/kde/kde/build/calligra index f04c001f3..64bb6b746 100644 --- a/source/kde/kde/build/calligra +++ b/source/kde/kde/build/calligra @@ -1 +1 @@ -29 +30 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kile b/source/kde/kde/build/kile index a45fd52cc..7273c0fa8 100644 --- a/source/kde/kde/build/kile +++ b/source/kde/kde/build/kile @@ -1 +1 @@ -24 +25 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index ec635144f..f599e28b8 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -9 +10 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/patch/okular.patch b/source/kde/kde/patch/okular.patch new file mode 100644 index 000000000..7ea976a78 --- /dev/null +++ b/source/kde/kde/patch/okular.patch @@ -0,0 +1 @@ +cat $CWD/patch/okular/okular.cxx_standard.17.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/okular/okular.cxx_standard.17.patch b/source/kde/kde/patch/okular/okular.cxx_standard.17.patch new file mode 100644 index 000000000..ce9c9bac4 --- /dev/null +++ b/source/kde/kde/patch/okular/okular.cxx_standard.17.patch @@ -0,0 +1,11 @@ +--- ./CMakeLists.txt.orig 2023-05-06 03:21:55.000000000 -0500 ++++ ./CMakeLists.txt 2023-06-06 13:51:17.306612957 -0500 +@@ -93,7 +93,7 @@ + set(ENV{QT_PLUGIN_PATH} "$ENV{QT_PLUGIN_PATH};${KDE_INSTALL_FULL_QTPLUGINDIR}") + endif() + +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index 2ee9af9ba..fc491be0c 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mozilla-nss SRCNAM=nss -VERSION=${VERSION:-3.89.1} +VERSION=${VERSION:-3.90} NSPR=${NSPR:-4.35} BUILD=${BUILD:-1} diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild index f443a1d91..7b862744a 100755 --- a/source/l/openexr/openexr.SlackBuild +++ b/source/l/openexr/openexr.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=openexr 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/n/krb5/krb5.SlackBuild b/source/n/krb5/krb5.SlackBuild index 55fd9690d..fbc5123a4 100755 --- a/source/n/krb5/krb5.SlackBuild +++ b/source/n/krb5/krb5.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=krb5 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/x/x11/post-install/xorg-cf-files.post-install b/source/x/x11/post-install/xorg-cf-files.post-install index e5fc2cc45..650ed9dac 100644 --- a/source/x/x11/post-install/xorg-cf-files.post-install +++ b/source/x/x11/post-install/xorg-cf-files.post-install @@ -1,4 +1,4 @@ -if [ "$(uname -m)" = "x86_64" ]; then +if [[ "$(uname -m)" =~ (x86_64|aarch64|riscv64) ]]; then ( cd $PKG/usr/lib/X11/config zcat $CWD/post-install/xorg-cf-files/x11.tmpl.lib64.kludge.diff.gz | patch -p1 || exit 1 ) diff --git a/source/xfce/xfce4-panel-profiles/slack-desc b/source/xfce/xfce4-panel-profiles/slack-desc index 15d98b284..f4c5d2c53 100644 --- a/source/xfce/xfce4-panel-profiles/slack-desc +++ b/source/xfce/xfce4-panel-profiles/slack-desc @@ -15,5 +15,5 @@ xfce4-panel-profiles: With the modular Xfce Panel, a multitude of panel layouts xfce4-panel-profiles: created. This tool makes it possible to backup, restore, import, xfce4-panel-profiles: and export these panel layouts. xfce4-panel-profiles: -xfce4-panel-profiles: Homepage: https://git.xfce.org/apps/xfce4-panel-profiles +xfce4-panel-profiles: Homepage: https://gitlab.xfce.org/apps/xfce4-panel-profiles xfce4-panel-profiles: |