diff options
Diffstat (limited to 'source/x')
48 files changed, 133 insertions, 152 deletions
diff --git a/source/x/anthy/anthy.SlackBuild b/source/x/anthy/anthy.SlackBuild index d86617cbb..6d9348f8d 100755 --- a/source/x/anthy/anthy.SlackBuild +++ b/source/x/anthy/anthy.SlackBuild @@ -85,9 +85,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -114,7 +114,7 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* DIARY INSTALL NEWS README* \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -126,7 +126,7 @@ fi # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild index 7c5143cec..e1cce255d 100755 --- a/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild +++ b/source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild @@ -48,9 +48,9 @@ cd dejavu-fonts-ttf-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/share/fonts/TTF/ cp -a ttf/*.ttf $PKG/usr/share/fonts/TTF/ diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild index b58a3bf72..408dc9f9b 100755 --- a/source/x/fontconfig/fontconfig.SlackBuild +++ b/source/x/fontconfig/fontconfig.SlackBuild @@ -73,9 +73,9 @@ cd fontconfig-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Prefer DejaVu fonts in 60-latin.conf: #zcat $CWD/fontconfig.dejavu.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild index 88c0b4b2a..7a4cadc85 100755 --- a/source/x/freeglut/freeglut.SlackBuild +++ b/source/x/freeglut/freeglut.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=freeglut VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,19 +77,16 @@ cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Fix header installation: -sed -i -e '76s/SRCS/HEADERS/' CMakeLists.txt + -exec chmod 644 {} \+ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html cp -a \ AUTHORS COPYING* INSTALL NEWS README TODO \ $PKG/usr/doc/$PKGNAM-$VERSION cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html -find $PKG/usr/doc -type f -exec chmod 0644 {} \; +find $PKG/usr/doc -type f -exec chmod 0644 {} \+ mkdir -p build cd build diff --git a/source/x/glew/glew.SlackBuild b/source/x/glew/glew.SlackBuild index 0858569b5..4419b4bfa 100755 --- a/source/x/glew/glew.SlackBuild +++ b/source/x/glew/glew.SlackBuild @@ -74,9 +74,9 @@ cd $PKGNAM-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Remove the DOS linefeeds from config.guess TEMPFILE=$(mktemp) diff --git a/source/x/glu/glu.SlackBuild b/source/x/glu/glu.SlackBuild index 146b3472c..05a1dbc5e 100755 --- a/source/x/glu/glu.SlackBuild +++ b/source/x/glu/glu.SlackBuild @@ -72,9 +72,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild index 9f4978988..e28710829 100755 --- a/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild +++ b/source/x/intel-vaapi-driver/intel-vaapi-driver.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # These fix a mandatory check for wayland-scanner: mkdir -p m4 diff --git a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild index 59210d9a4..fa6f00dd2 100755 --- a/source/x/libXaw3dXft/libXaw3dXft.SlackBuild +++ b/source/x/libXaw3dXft/libXaw3dXft.SlackBuild @@ -70,9 +70,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/x/libXcm/libXcm.SlackBuild b/source/x/libXcm/libXcm.SlackBuild index 2630f2e68..3cb3ee11f 100755 --- a/source/x/libXcm/libXcm.SlackBuild +++ b/source/x/libXcm/libXcm.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -95,7 +95,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/x/libdrm/libdrm.SlackBuild b/source/x/libdrm/libdrm.SlackBuild index 2b3c15445..c2590ef78 100755 --- a/source/x/libdrm/libdrm.SlackBuild +++ b/source/x/libdrm/libdrm.SlackBuild @@ -76,9 +76,9 @@ cd ${PKGNAM}-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure: CFLAGS="$SLKCFLAGS" \ diff --git a/source/x/libepoxy/libepoxy.SlackBuild b/source/x/libepoxy/libepoxy.SlackBuild index 6ef387ab1..0792512af 100755 --- a/source/x/libepoxy/libepoxy.SlackBuild +++ b/source/x/libepoxy/libepoxy.SlackBuild @@ -75,9 +75,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ ./autogen.sh @@ -102,7 +102,7 @@ rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild index 0e46a95e9..be9850514 100755 --- a/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild +++ b/source/x/liberation-fonts-ttf/liberation-fonts-ttf.SlackBuild @@ -48,9 +48,9 @@ cd liberation-fonts-ttf-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/share/fonts/TTF/ cp -a *.ttf $PKG/usr/share/fonts/TTF/ diff --git a/source/x/libevdev/libevdev.SlackBuild b/source/x/libevdev/libevdev.SlackBuild index 6ef77bdc5..94bd7a9e4 100755 --- a/source/x/libevdev/libevdev.SlackBuild +++ b/source/x/libevdev/libevdev.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -95,7 +95,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/x/libglvnd/libglvnd.SlackBuild b/source/x/libglvnd/libglvnd.SlackBuild index 1810de8d8..eb2244cf9 100755 --- a/source/x/libglvnd/libglvnd.SlackBuild +++ b/source/x/libglvnd/libglvnd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libglvnd VERSION=${VERSION:-$(echo libglvnd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,10 +81,6 @@ if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh fi -# We don't want libglvnd to include headers that stomp on the official ones -# in the Mesa package: -HEADERS=${HEADERS:-"--disable-headers"} - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,24 +90,12 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - $HEADERS \ --disable-static \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install-strip DESTDIR=$PKG || exit 1 -# If we didn't package the headers then we should not package the pkgconfig -# files either: -if [ "$HEADERS" = "--disable-headers" ]; then - # Move this one out of the way temporarily: - mv $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libglvnd.pc $PKG/usr/lib${LIBDIRSUFFIX} - # Remove the redundant .pc files: - rm -f $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/* - # Put this one back: - mv $PKG/usr/lib${LIBDIRSUFFIX}/libglvnd.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -fi - # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/source/x/libhangul/libhangul.SlackBuild b/source/x/libhangul/libhangul.SlackBuild index 26a697989..ebd0446d8 100755 --- a/source/x/libhangul/libhangul.SlackBuild +++ b/source/x/libhangul/libhangul.SlackBuild @@ -97,9 +97,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CXXFLAGS="$SLKCFLAGS" \ @@ -126,7 +126,7 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* NEWS README* \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -138,7 +138,7 @@ fi # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/libinput/libinput.SlackBuild b/source/x/libinput/libinput.SlackBuild index e7f3e88a1..f40a38d9b 100755 --- a/source/x/libinput/libinput.SlackBuild +++ b/source/x/libinput/libinput.SlackBuild @@ -75,9 +75,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -106,7 +106,7 @@ cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/x/libmypaint/libmypaint.SlackBuild b/source/x/libmypaint/libmypaint.SlackBuild index 34e4dbbbe..887fa09f0 100755 --- a/source/x/libmypaint/libmypaint.SlackBuild +++ b/source/x/libmypaint/libmypaint.SlackBuild @@ -81,9 +81,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure, build, and install: CFLAGS="$SLKCFLAGS" \ @@ -108,7 +108,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/x/libva-utils/libva-utils.SlackBuild b/source/x/libva-utils/libva-utils.SlackBuild index db4004657..9eaaae538 100755 --- a/source/x/libva-utils/libva-utils.SlackBuild +++ b/source/x/libva-utils/libva-utils.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # These fix a mandatory check for wayland-scanner: mkdir -p m4 diff --git a/source/x/libva/libva.SlackBuild b/source/x/libva/libva.SlackBuild index 2d51be198..876c20f0b 100755 --- a/source/x/libva/libva.SlackBuild +++ b/source/x/libva/libva.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # These fix a mandatory check for wayland-scanner: mkdir -p m4 diff --git a/source/x/libvdpau/libvdpau.SlackBuild b/source/x/libvdpau/libvdpau.SlackBuild index c67cc1ed5..4b15127c2 100755 --- a/source/x/libvdpau/libvdpau.SlackBuild +++ b/source/x/libvdpau/libvdpau.SlackBuild @@ -74,9 +74,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure, build, and install: export CFLAGS="$SLKCFLAGS" diff --git a/source/x/libwacom/libwacom.SlackBuild b/source/x/libwacom/libwacom.SlackBuild index b21276905..207b2374f 100755 --- a/source/x/libwacom/libwacom.SlackBuild +++ b/source/x/libwacom/libwacom.SlackBuild @@ -75,9 +75,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -101,7 +101,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/x/m17n-lib/m17n-lib.SlackBuild b/source/x/m17n-lib/m17n-lib.SlackBuild index bf774091c..d32bd6c05 100755 --- a/source/x/m17n-lib/m17n-lib.SlackBuild +++ b/source/x/m17n-lib/m17n-lib.SlackBuild @@ -152,7 +152,7 @@ cp -a $DOCS_DB $PKG/usr/doc/$PKGNAM-$VERSION/db cat ChangeLog | head -n 1000 > $PKG/usr/doc/$PKGNAM-$VERSION/db/ChangeLog touch -r ChangeLog $PKG/usr/doc/$PKGNAM-$VERSION/db/ChangeLog cd .. -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Compress the man page(s): ( cd $PKG/usr/man/man3 @@ -160,7 +160,7 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; mv $file $(basename $file m17n) done ) -find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; +find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i done diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index fd5c9e5b7..5428881bc 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa VERSION=${VERSION:-$(echo $PKGNAM-1*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DEMOVERS=${DEMOVERS:-8.4.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -86,9 +86,9 @@ rm -f src/gallium/state_trackers/d3d1x/w32api chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Apply patches from git (and maybe elsewhere): # Patches obtained by: @@ -157,9 +157,9 @@ export CWD SLKCFLAGS NUMJOBS PKG chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -182,7 +182,7 @@ export CWD SLKCFLAGS NUMJOBS PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Compress info files, if any: diff --git a/source/x/motif/motif.SlackBuild b/source/x/motif/motif.SlackBuild index a62d0a81f..99ab20a3a 100755 --- a/source/x/motif/motif.SlackBuild +++ b/source/x/motif/motif.SlackBuild @@ -87,9 +87,9 @@ touch AUTHORS NEWS chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Fix for x86_64 architecture: sed -i -e "/UsrLibDir/s,/lib,/lib${LIBDIRSUFFIX},g" config/cf/Imake.tmpl @@ -146,7 +146,7 @@ cp -a \ $PKG/usr/doc/${PKGNAM}-$VERSION # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/x/mtdev/mtdev.SlackBuild b/source/x/mtdev/mtdev.SlackBuild index 1668d103d..2bdbf369a 100755 --- a/source/x/mtdev/mtdev.SlackBuild +++ b/source/x/mtdev/mtdev.SlackBuild @@ -72,9 +72,9 @@ cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild index 2a3749795..a562c869e 100755 --- a/source/x/mypaint-brushes/mypaint-brushes.SlackBuild +++ b/source/x/mypaint-brushes/mypaint-brushes.SlackBuild @@ -81,9 +81,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ autoreconf -vif @@ -110,7 +110,7 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/x/pyxdg/pyxdg.SlackBuild b/source/x/pyxdg/pyxdg.SlackBuild index f69ca59e5..c1ea06beb 100755 --- a/source/x/pyxdg/pyxdg.SlackBuild +++ b/source/x/pyxdg/pyxdg.SlackBuild @@ -71,9 +71,9 @@ cd ${PKGNAM}-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ python setup.py install --root=$PKG || exit 1 python3 setup.py install --root=$PKG || exit 1 diff --git a/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild b/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild index 0bfa0f50b..eff81be0b 100755 --- a/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild +++ b/source/x/sazanami-fonts-ttf/sazanami-fonts-ttf.SlackBuild @@ -72,9 +72,9 @@ cd ${REALNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Install font: cp *.ttf $PKG$FONTDIR/ @@ -98,7 +98,7 @@ EOT # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a README doc/* $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Add a package description: mkdir -p $PKG/install diff --git a/source/x/scim-anthy/scim-anthy.SlackBuild b/source/x/scim-anthy/scim-anthy.SlackBuild index fbd652cd8..c8d0e28bf 100755 --- a/source/x/scim-anthy/scim-anthy.SlackBuild +++ b/source/x/scim-anthy/scim-anthy.SlackBuild @@ -84,9 +84,9 @@ zcat $CWD/scim-anthy.gcc43.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CXXFLAGS="$SLKCFLAGS -fpermissive -fno-delete-null-pointer-checks -std=gnu++98" \ @@ -109,11 +109,11 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README TODO \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/scim-hangul/scim-hangul.SlackBuild b/source/x/scim-hangul/scim-hangul.SlackBuild index 24b0e64d4..42edf85b2 100755 --- a/source/x/scim-hangul/scim-hangul.SlackBuild +++ b/source/x/scim-hangul/scim-hangul.SlackBuild @@ -87,9 +87,9 @@ zcat $CWD/scim-hangul-0.4.0+gtk.patch.gz | patch -p0 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CXXFLAGS="$SLKCFLAGS" \ @@ -113,11 +113,11 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING NEWS README ChangeLog \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/scim-input-pad/scim-input-pad.SlackBuild b/source/x/scim-input-pad/scim-input-pad.SlackBuild index 63a063f2c..af8a31b82 100755 --- a/source/x/scim-input-pad/scim-input-pad.SlackBuild +++ b/source/x/scim-input-pad/scim-input-pad.SlackBuild @@ -79,9 +79,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CFLAGS="$SLKCFLAGS" \ diff --git a/source/x/scim-m17n/scim-m17n.SlackBuild b/source/x/scim-m17n/scim-m17n.SlackBuild index 397a47d83..f37a76e45 100755 --- a/source/x/scim-m17n/scim-m17n.SlackBuild +++ b/source/x/scim-m17n/scim-m17n.SlackBuild @@ -88,9 +88,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CXXFLAGS="$SLKCFLAGS" \ @@ -113,11 +113,11 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/scim-pinyin/scim-pinyin.SlackBuild b/source/x/scim-pinyin/scim-pinyin.SlackBuild index 8987588e3..c7b897a58 100755 --- a/source/x/scim-pinyin/scim-pinyin.SlackBuild +++ b/source/x/scim-pinyin/scim-pinyin.SlackBuild @@ -82,9 +82,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CFLAGS="$SLKCFLAGS" \ @@ -110,7 +110,7 @@ chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/scim-tables/scim-tables.SlackBuild b/source/x/scim-tables/scim-tables.SlackBuild index afb2c4bdd..5d97b3c6a 100755 --- a/source/x/scim-tables/scim-tables.SlackBuild +++ b/source/x/scim-tables/scim-tables.SlackBuild @@ -88,9 +88,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... @@ -121,7 +121,7 @@ chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* # Compress the man page(s): if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi diff --git a/source/x/scim/scim.SlackBuild b/source/x/scim/scim.SlackBuild index 06e683bfe..5a44795d7 100755 --- a/source/x/scim/scim.SlackBuild +++ b/source/x/scim/scim.SlackBuild @@ -92,9 +92,9 @@ cd ${PKGNAM}-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ echo Building ... CFLAGS="$SLKCFLAGS" \ diff --git a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild index cd77350a3..27e76e69e 100755 --- a/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild +++ b/source/x/tibmachuni-font-ttf/tibmachuni-font-ttf.SlackBuild @@ -72,9 +72,9 @@ unzip $CWD/TibetanMachineUnicodeFont.zip || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ cd TibetanMachineUnicodeFont # Install font: @@ -113,7 +113,7 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ gpl.txt ReadMe.txt \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Add a package description: mkdir -p $PKG/install diff --git a/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild b/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild index 4fdc4408b..23cf2d39c 100755 --- a/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild +++ b/source/x/ttf-indic-fonts/ttf-indic-fonts.SlackBuild @@ -64,9 +64,9 @@ cd ttf-indic-fonts-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/share/fonts/TTF/ cp -a */*.ttf $PKG/usr/share/fonts/TTF diff --git a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild index 5b77a7d3e..5dc33c0ff 100755 --- a/source/x/ttf-tlwg/ttf-tlwg.SlackBuild +++ b/source/x/ttf-tlwg/ttf-tlwg.SlackBuild @@ -48,9 +48,9 @@ cd $PKGNAM-${VERSION} || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/share/fonts/TTF/ cp -a *.ttf fonts.* $PKG/usr/share/fonts/TTF/ diff --git a/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild b/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild index 9a7f9e815..98609ee38 100755 --- a/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild +++ b/source/x/urw-core35-fonts-otf/urw-core35-fonts-otf.SlackBuild @@ -48,9 +48,9 @@ cd urw-core35-fonts-otf-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p $PKG/usr/share/fonts/OTF/ cp -a *.otf $PKG/usr/share/fonts/OTF/ diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index 34478a6a7..3ed33960b 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -99,9 +99,9 @@ cd $TMP/glslang-${GLSLANG_VERSION} chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Fix LIBDIRSUFFIX for i in $(find . -name CMakeLists.txt); do @@ -128,9 +128,9 @@ cd Vulkan-Headers-sdk-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p build cd build @@ -164,9 +164,9 @@ cd $TMP/Vulkan-Loader-sdk-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p build cd build @@ -191,9 +191,9 @@ cd $TMP/Vulkan-ValidationLayers-sdk-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p build cd build @@ -225,9 +225,9 @@ cd $TMP/Vulkan-Tools-sdk-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ mkdir -p build cd build diff --git a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild index 4a03f8661..17bc2c106 100755 --- a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild +++ b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild @@ -81,9 +81,9 @@ zcat $CWD/wqy-zenhei.fix.fontconfig.warning.diff.gz | patch -p1 || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # The following causes an error since the package no longer contains any ttf # fonts, but it is harmless. It's probably safer to leave the cp command the @@ -135,7 +135,7 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL README \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +find $PKG/usr/doc -type f -exec chmod 644 {} \+ # Add a package description: mkdir -p $PKG/install diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild index 36c837733..3b2891dba 100755 --- a/source/x/x11-skel/x11-skel.SlackBuild +++ b/source/x/x11-skel/x11-skel.SlackBuild @@ -69,7 +69,7 @@ mkdir -p usr/man/man1 cp -a $CWD/scripts/xorg.conf-vesa etc/X11 chown -R root:root etc/X11 -find etc/X11 -type f -exec chmod 644 {} \; +find etc/X11 -type f -exec chmod 644 {} \+ cp -a $CWD/scripts/xorgsetup usr/bin cp -a $CWD/scripts/xwmconfig usr/bin chown root:root usr/bin/* diff --git a/source/x/x11/build/xf86-video-vmware b/source/x/x11/build/xf86-video-vmware index 0cfbf0888..00750edc0 100644 --- a/source/x/x11/build/xf86-video-vmware +++ b/source/x/x11/build/xf86-video-vmware @@ -1 +1 @@ -2 +3 diff --git a/source/x/x11/x11.SlackBuild b/source/x/x11/x11.SlackBuild index af97a7618..f46228738 100755 --- a/source/x/x11/x11.SlackBuild +++ b/source/x/x11/x11.SlackBuild @@ -96,9 +96,9 @@ fix_perms() { chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ } process_man_pages() { @@ -262,7 +262,7 @@ no_usr_share_doc() { fi # Get rid of zero-length junk files: - find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \; + find $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION -type f -size 0 -exec rm --verbose "{}" \+ rmdir --verbose $PKG/usr/doc/${PKGNAME}-$MODULAR_PACKAGE_VERSION 2> /dev/null # Strip binaries: diff --git a/source/x/xcm/xcm.SlackBuild b/source/x/xcm/xcm.SlackBuild index b29934282..bc0ab5822 100755 --- a/source/x/xcm/xcm.SlackBuild +++ b/source/x/xcm/xcm.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ zcat $CWD/xcm.udev.rules.diff.gz | patch -p1 --verbose || exit 1 @@ -109,7 +109,7 @@ EOF find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild index 6b95a5c9d..8dfddbb0d 100755 --- a/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild +++ b/source/x/xdg-user-dirs/xdg-user-dirs.SlackBuild @@ -71,9 +71,9 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -95,7 +95,7 @@ mv $PKG/etc/xdg/user-dirs.conf $PKG/etc/xdg/user-dirs.conf.new mv $PKG/etc/xdg/user-dirs.defaults $PKG/etc/xdg/user-dirs.defaults.new # Compress manual pages: -find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz rm $i diff --git a/source/x/xdg-utils/xdg-utils.SlackBuild b/source/x/xdg-utils/xdg-utils.SlackBuild index 060fbb536..d43a68497 100755 --- a/source/x/xdg-utils/xdg-utils.SlackBuild +++ b/source/x/xdg-utils/xdg-utils.SlackBuild @@ -60,9 +60,9 @@ zcat $CWD/xdg-open.no.relative.paths.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ ./configure \ --prefix=/usr \ diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild index bbe0b1a6d..53ec177ac 100755 --- a/source/x/xterm/xterm.SlackBuild +++ b/source/x/xterm/xterm.SlackBuild @@ -78,9 +78,9 @@ fi chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Configure: CFLAGS="$SLKCFLAGS" \ |