Merge branch '0.6'

000-kernel/64bit.config

@@ -7274,12 +7274,12 @@ CONFIG_EXT4_FS_SECURITY=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
 CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_REISERFS_FS_POSIX_ACL is not set
+# CONFIG_REISERFS_FS_SECURITY is not set
 CONFIG_JFS_FS=m
 CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y

000-kernel/createModule.sh

@@ -77,12 +77,12 @@ rm -r $MODULEPATH/a && rm -r $MODULEPATH/b && rm -r $MODULEPATH/aufs
 
 echo "Building vmlinuz (this may take a while)..."
 CPUTHREADS=$(nproc --all)
-make olddefconfig > /dev/null 2>&1 && make -j$CPUTHREADS "KCFLAGS=-g -O3 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -m64 -fasynchronous-unwind-tables -Wp,-D_REENTRANT -ftree-loop-distribute-patterns -Wl,-z -Wl,now -Wl,-z -Wl,relro -fno-semantic-interposition -ffat-lto-objects -fno-trapping-math -Wl,-sort-common -Wl,--enable-new-dtags -mtune=skylake -flto -fwhole-program" || { echo "Fail to build kernel."; exit 1; }
+make olddefconfig > /dev/null 2>&1 && make INSTALL_MOD_STRIP=1 -j$CPUTHREADS "KCFLAGS=-g -O3 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -m64 -fasynchronous-unwind-tables -Wp,-D_REENTRANT -ftree-loop-distribute-patterns -Wl,-z -Wl,now -Wl,-z -Wl,relro -fno-semantic-interposition -ffat-lto-objects -fno-trapping-math -Wl,-sort-common -Wl,--enable-new-dtags -mtune=skylake -flto -fwhole-program" || { echo "Fail to build kernel."; exit 1; }
 cp -f arch/x86/boot/bzImage ../vmlinuz
 make clean
 
 echo "Building modules (this may take a while)..."
-make olddefconfig > /dev/null 2>&1 && make -j$CPUTHREADS "KCFLAGS=-O3 -mtune=skylake" || { echo "Fail to build kernel."; exit 1; }
+make olddefconfig > /dev/null 2>&1 && make INSTALL_MOD_STRIP=1 -j$CPUTHREADS "KCFLAGS=-O3 -mtune=skylake" || { echo "Fail to build kernel."; exit 1; }
 make -j$CPUTHREADS modules_install INSTALL_MOD_PATH=../ > /dev/null 2>&1
 make -j$CPUTHREADS firmware_install INSTALL_MOD_PATH=../ > /dev/null 2>&1
 

001-core/createModule.sh

@@ -97,12 +97,26 @@ wget https://github.com/slicer69/sysvinit/releases/download/$version/sysvinit-$v
 sh ${currentPackage}.SlackBuild || exit 1
 rm -fr $MODULEPATH/${currentPackage}
 
+currentPackage=neofetch
+mkdir -p $MODULEPATH/${currentPackage}/package/usr/bin && cd $MODULEPATH/${currentPackage}
+wget https://github.com/hykilpikonna/hyfetch/archive/refs/heads/master.zip -O ${currentPackage}.zip || exit 1
+unzip ${currentPackage}.zip
+rm ${currentPackage}.zip
+cp -p */${currentPackage} package/usr/bin
+sed -i "s|has pkginfo && tot pkginfo -i|#has pkginfo && tot pkginfo -i|g" package/usr/bin/${currentPackage}
+chown 755 package/usr/bin/${currentPackage}
+chmod +x package/usr/bin/${currentPackage}
+version=$(date -r package/usr/bin/${currentPackage} +%Y%m%d)
+cd $MODULEPATH/${currentPackage}/package
+/sbin/makepkg -l y -c n $MODULEPATH/packages/${currentPackage}-$version-noarch-1.txz > /dev/null 2>&1
+rm -fr $MODULEPATH/${currentPackage}
+
 currentPackage=p7zip
 version=17.04
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 wget -r -nd --no-parent $SLACKBUILDREPOSITORY/system/${currentPackage}/ -A * || exit 1
 wget https://github.com/flyfishzy/p7zip/archive/refs/tags/v$version.tar.gz -O ${currentPackage}-$version.tar.gz || exit 1
-sed -i "s|make |make -j$NUMBERTHREADS |g" ./${currentPackage}.SlackBuild
+sed -i "s|make |make -j$NUMBERTHREADS |g" ${currentPackage}.SlackBuild
 sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
 sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
 sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild
@@ -135,11 +149,11 @@ mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
 rm -fr $MODULEPATH/${currentPackage}
 
 currentPackage=unrar
-version=6.2.6
+version=6.2.10
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 wget -r -nd --no-parent $SLACKBUILDREPOSITORY/system/${currentPackage}/ -A * || exit 1
 wget https://www.rarlab.com/rar/unrarsrc-$version.tar.gz || exit 1
-sed -i "s|make |make -j$NUMBERTHREADS |g" ./${currentPackage}.SlackBuild
+sed -i "s|make |make -j$NUMBERTHREADS |g" ${currentPackage}.SlackBuild
 sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
 sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
 sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild
@@ -307,18 +321,21 @@ rm usr/bin/smbtorture
 rm usr/lib64/p7zip/7za
 rm usr/lib64/p7zip/7zr
 rm usr/lib64/liblibboost_*
+rm usr/lib64/libslang.so.1*
 rm usr/libexec/samba/rpcd_*
 rm usr/local/bin/webfsd
 rm var/db/Makefile
 
 find usr/lib64/python* -type d -name 'test' -prune -exec rm -rf {} +
 find usr/lib64/python* -type d -name 'tests' -prune -exec rm -rf {} +
 
-mv $MODULEPATH/packages/lib64 $MODULEPATH/ # move out /lib64 so we can strip safely
+# move out stuff that can't be stripped
+mv $MODULEPATH/packages/lib64 $MODULEPATH/
+mv $MODULEPATH/packages/usr/lib64/libmozjs-* $MODULEPATH/
 GenericStrip
-mv $MODULEPATH/lib64 $MODULEPATH/packages/
-
 AggressiveStrip
+mv $MODULEPATH/lib64 $MODULEPATH/packages/
+mv $MODULEPATH/libmozjs-* $MODULEPATH/packages/usr/lib64
 
 ### copy cache files
 

002-xorg/createModule.sh

@@ -82,6 +82,8 @@ filename=${info% *}
 tar xvf "$filename" && rm "$filename" || exit 1
 sed -i "s|+++ .*/gtk/|+++ gtk/|g" gtk3-classic*/*.patch
 sed -i "s|+++ .*/gdk/|+++ gdk/|g" gtk3-classic*/*.patch
+rm gtk3-classic*/gtk+-atk-bridge-meson.build.patch
+rm gtk3-classic*/gtk+-atk-bridge-meson_options.txt.patch
 wget -r -nd --no-parent -l1 $SOURCEREPOSITORY/l/${currentPackage}/ || exit 1
 sed -i "s|# Configure, build, and install:|cp -r $PWD/gtk3-classic*/* /tmp/gtk+-\$VERSION/\nfor i in *.patch; do patch -p0 < \$i; done\n\n# Configure, build, and install:|g" ${currentPackage}.SlackBuild
 sed -i "s|Ddemos=true|Ddemos=false|g" ${currentPackage}.SlackBuild
@@ -148,6 +150,7 @@ wget http://openbox.org/dist/openbox/openbox-$version.tar.xz || exit 1
 sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
 sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
 sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild
+sed -z -i "s|make\n|make -j8\n|g" ${currentPackage}.SlackBuild
 sh ${currentPackage}.SlackBuild || exit 1
 mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
 rm -fr $MODULEPATH/${currentPackage}
@@ -328,11 +331,10 @@ find usr/share/icons/hicolor -name 'image-vnd.djvu.png' -delete
 
 # move out things that don't support stripping
 mv $MODULEPATH/packages/usr/lib64/dri $MODULEPATH/
-GenericStrip
-mv $MODULEPATH/dri $MODULEPATH/packages/usr/lib64/
-
 mv $MODULEPATH/packages/usr/libexec/gpartedbin $MODULEPATH/
+GenericStrip
 AggressiveStrip
+mv $MODULEPATH/dri $MODULEPATH/packages/usr/lib64/
 mv $MODULEPATH/gpartedbin $MODULEPATH/packages/usr/libexec
 
 ### copy cache files

002-xorg/downloadPackages.sh

@@ -50,6 +50,7 @@ DownloadPackage "hicolor-icon-theme" &
 DownloadPackage "iceauth" &
 DownloadPackage "intel-vaapi-driver" &
 DownloadPackage "json-c" &
+DownloadPackage "json-glib" &
 DownloadPackage "lame" &
 DownloadPackage "lcms2" &
 wait

002-xtra/createModule.sh

@@ -242,7 +242,7 @@ mv $MODULEPATH/packages/frei0r-plugins-*.t?z . || exit 1
 mv $MODULEPATH/packages/opencl-headers-*.t?z . || exit 1
 installpkg frei0r-plugins*.t?z
 installpkg opencl-headers*.t?z
-sed -i "s|\./configure \\\\|\./configure \\\\\n  --enable-nvdec --enable-nvenc\\\\|g" ./${currentPackage}.SlackBuild
+sed -i "s|\./configure \\\\|\./configure \\\\\n  --enable-nvdec --enable-nvenc\\\\|g" ${currentPackage}.SlackBuild
 GLSLANG=no VULKAN=no ASS=yes OPENCORE=yes GSM=yes RTMP=yes TWOLAME=yes XVID=yes X265=yes X264=yes DAV1D=yes AAC=yes sh ${currentPackage}.SlackBuild || exit 1
 mv /tmp/${currentPackage}*.t?z $MODULEPATH/packages
 installpkg $MODULEPATH/packages/${currentPackage}*.t?z
@@ -268,8 +268,8 @@ mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 wget -r -nd --no-parent $SLACKBUILDREPOSITORY/multimedia/${currentPackage}/ -A * || exit 1
 info=$(DownloadLatestFromGithub "mpv-player" ${currentPackage})
 version=${info#* }
-wget https://waf.io/waf-2.0.24 || exit 1
-sed -z -i "s|--enable-html-build \\\\\n| |g" ./${currentPackage}.SlackBuild
+sed -z -i "s|-Dhtml-build=enabled \\\\\n| |g" ${currentPackage}.SlackBuild
+sed -z -i "s|-Dmanpage-build=enabled \\\\\n| |g" ${currentPackage}.SlackBuild
 sed -i "s|VERSION=\${VERSION.*|VERSION=\${VERSION:-$version}|g" ${currentPackage}.SlackBuild
 sed -i "s|TAG=\${TAG:-_SBo}|TAG=|g" ${currentPackage}.SlackBuild
 sed -i "s|PKGTYPE=\${PKGTYPE:-tgz}|PKGTYPE=\${PKGTYPE:-txz}|g" ${currentPackage}.SlackBuild

003-gnome-44/createModule.sh

@@ -203,7 +203,7 @@ find usr/share/backgrounds/gnome/ -mindepth 1 -maxdepth 1 ! \( -name "adwaita*"
 find usr/share/gnome-background-properties/ -mindepth 1 -maxdepth 1 ! \( -name "adwaita*" \) -exec rm -rf '{}' \; 2>/dev/null
 
 GenericStrip
-AggressiveStrip
+AggressiveStripAll
 
 ### copy cache files
 

003-gnome-44/downloadPackages.sh

@@ -24,10 +24,9 @@ DownloadPackage "gst-plugins-good" &
 DownloadPackage "gst-plugins-libav" &
 DownloadPackage "gstreamer" &
 DownloadPackage "gtk4" &
-DownloadPackage "hyphen" &
 wait
+DownloadPackage "hyphen" &
 DownloadPackage "ibus" &
-DownloadPackage "json-glib" &
 DownloadPackage "libcanberra" &
 DownloadPackage "libgtop" &
 DownloadPackage "libhandy" &

003-gnome-44/gnome/clutter/clutter.SlackBuild

@@ -25,7 +25,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O3 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O3 -fPIC"
+  SLKCFLAGS="-O3 -fPIC -flto"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O3"
@@ -62,7 +62,7 @@ meson .. \
  --infodir=/usr/info \
  --mandir=/usr/man \
  --localstatedir=/var \
- -Dbackends=x11,wayland,egl \
+ -Dbackends=x11,wayland,egl,gdk \
  -Dbuild_examples=false \
  -Dbuild_tests=false \
  -Ddocumentation=false \

003-gnome-44/gnome/mutter/mutter.SlackBuild

@@ -25,7 +25,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O3 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O3 -fPIC"
+  SLKCFLAGS="-O3 -fPIC -flto"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O3"
@@ -57,12 +57,8 @@ sed -i '/libmutter_dep = declare_dependency(/a sources: mutter_built_sources,' s
 mkdir -p build
 cd build
 
-# -Dverbose=false
-# -Dxwayland_path
-# -Dxwayland_grab_default_access_rules
-# -Dxwayland_initfd
-# -Dxwayland_ignore_executables
-# -Dudev_dir=/etc/udev \
+SLKCFLAGS="${CFLAGS/-O2/-O3} -fno-semantic-interposition"
+LDFLAGS+=" -Wl,-Bsymbolic-functions"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -82,8 +78,6 @@ meson .. \
  -Dwayland=true \
  -Dnative_backend=true \
  -Dremote_desktop=false \
- -Degl_device=true \
- -Dwayland_eglstream=true \
  -Dudev=true \
  -Dlibwacom=true \
  -Dpango_ft2=true \
@@ -118,28 +112,6 @@ $PRGNAM: https://wiki.gnome.org/Projects/Mutter/
 $PRGNAM:
 EOT
 
-cat <<EOT >$PKG/install/doinst.sh
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database /usr/share/mime &> /dev/null
-fi
-
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
-
-if [ -e usr/share/glib-2.0/schemas ]; then
-  if [ -x /usr/bin/glib-compile-schemas ]; then
-    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
-  fi
-fi
-EOT
-
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}
 

003-gnome/createModule.sh

@@ -266,7 +266,7 @@ find usr/share/backgrounds/gnome/ -mindepth 1 -maxdepth 1 ! \( -name "adwaita*"
 find usr/share/gnome-background-properties/ -mindepth 1 -maxdepth 1 ! \( -name "adwaita*" \) -exec rm -rf '{}' \; 2>/dev/null
 
 GenericStrip
-AggressiveStrip
+AggressiveStripAll
 
 ### copy cache files
 

003-gnome/downloadPackages.sh

@@ -20,7 +20,6 @@ DownloadPackage "gstreamer" &
 DownloadPackage "hyphen" &
 wait
 DownloadPackage "ibus" &
-DownloadPackage "json-glib" &
 DownloadPackage "libcanberra" &
 DownloadPackage "libgtop" &
 DownloadPackage "libxklavier" &

003-kde/createModule.sh

@@ -206,7 +206,7 @@ rm -R usr/share/wallpapers/Next
 find usr/share/plasma/avatars/photos -mindepth 1 ! \( -name "Air Balloon.png" -o -name "Air Balloon.png.license" -o -name "Astronaut.png" -o -name "Astronaut.png.license" \) -exec rm -rf '{}' \; 2>/dev/null
 
 GenericStrip
-AggressiveStrip
+AggressiveStripAll
 
 ### copy cache files
 

003-kde/downloadPackages.sh

@@ -31,7 +31,6 @@ DownloadPackage "gstreamer" &
 DownloadPackage "gwenview" &
 DownloadPackage "hunspell" &
 DownloadPackage "jasper" &
-DownloadPackage "json-glib" &
 DownloadPackage "kactivities" &
 wait
 DownloadPackage "kactivities-stats" &

003-lxde/createModule.sh

@@ -50,7 +50,7 @@ version=0.2.5
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 git clone https://github.com/lxde/gpicview || exit 1
 cd ${currentPackage}
-patch -p0 < $SCRIPTPATH/extras/gpicview/image-view.c.patch || exit 1
+cp $SCRIPTPATH/extras/gpicview/image-view.c src/ || exit 1
 ./autogen.sh
 CFLAGS="-g -O3 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -m64 -fasynchronous-unwind-tables -Wp,-D_REENTRANT -ftree-loop-distribute-patterns -Wl,-z -Wl,now -Wl,-z -Wl,relro -fno-semantic-interposition -ffat-lto-objects -fno-trapping-math -Wl,-sort-common -Wl,--enable-new-dtags -mtune=skylake -Wa,-mbranches-within-32B-boundaries -flto -fuse-linker-plugin -DNDEBUG" ./configure --prefix=/usr --libdir=/usr/lib$SYSTEMBITS --sysconfdir=/etc --disable-static --disable-debug --enable-gtk3
 make -j$NUMBERTHREADS install DESTDIR=$MODULEPATH/${currentPackage}/package || exit 1
@@ -201,7 +201,6 @@ currentPackage=menu-cache
 mkdir $MODULEPATH/${currentPackage} && cd $MODULEPATH/${currentPackage}
 git clone https://github.com/lxde/${currentPackage}
 cd ${currentPackage}
-patch -p0 < $SCRIPTPATH/extras/lxde/menu-tags.h.patch || exit 1
 version=`git describe | cut -d- -f1`
 sh ./autogen.sh && CFLAGS="-g -O3 -feliminate-unused-debug-types -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=32 -Wformat -Wformat-security -fasynchronous-unwind-tables -Wp,-D_REENTRANT -ftree-loop-distribute-patterns -Wl,-z -Wl,now -Wl,-z -Wl,relro -fno-semantic-interposition -ffat-lto-objects -fno-trapping-math -Wl,-sort-common -Wl,--enable-new-dtags -mtune=skylake -Wa,-mbranches-within-32B-boundaries -flto -fuse-linker-plugin" \
 ./configure \
@@ -542,8 +541,8 @@ InstallAdditionalPackages
 ### fix some .desktop files
 
 sed -i "s|Graphics;||g" $MODULEPATH/packages/usr/share/applications/epdfview.desktop
-sed -i "s|Core;||g" $MODULEPATH/packages/usr/share/applications/gpicview.desktop
-sed -i "s|System;||g" $MODULEPATH/packages/usr/share/applications/pcmanfm.desktop
+sed -i "s|Core;|Utility;|g" $MODULEPATH/packages/usr/share/applications/gpicview.desktop
+sed -i "s|System;|Utility|g" $MODULEPATH/packages/usr/share/applications/pcmanfm.desktop
 
 ### add lxde session
 
@@ -571,7 +570,7 @@ rm -R usr/share/gdm
 rm -R usr/share/gnome
 
 GenericStrip
-AggressiveStrip
+AggressiveStripAll
 
 ### copy cache files
 

003-lxde/downloadPackages.sh

@@ -7,7 +7,6 @@ GenerateRepositoryUrls "$REPOSITORY"
 
 DownloadPackage "blueman" &
 DownloadPackage "ffmpegthumbnailer" &
-DownloadPackage "json-glib" &
 DownloadPackage "keybinder3" &
 DownloadPackage "libcanberra" &
 wait