diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 07548f9..0235b9e 100644 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -28,38 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM is a calculator designed with computer usability in mind. -$PRGNAM: Instead of using your powerful computer to put a limited simulation -$PRGNAM: of a calculator on-screen, $PRGNAM instead allows you to use your -$PRGNAM: computer to its greater potential. -$PRGNAM: -$PRGNAM: Can be built and used with mpfr. -$PRGNAM: Customizable precision up to 75 digits. -$PRGNAM: -$PRGNAM: Copy/paste or type in and evaluate complex expressions. Exponentiation -$PRGNAM: is right-associative, for example: (2^3)^2*e^4/pi 2^3^2*e^4/pi -$PRGNAM: [The answers given by $PRGNAM: 1112.26437907 8898.11503252] - -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -84,11 +55,12 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DBUILD_DOC="ON" \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - @@ -102,10 +74,35 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM is a calculator designed with computer usability in mind. +$PRGNAM: Instead of using your powerful computer to put a limited simulation +$PRGNAM: of a calculator on-screen, $PRGNAM instead allows you to use your +$PRGNAM: computer to its greater potential. +$PRGNAM: +$PRGNAM: Can be built and used with mpfr. +$PRGNAM: Customizable precision up to 75 digits. +$PRGNAM: +$PRGNAM: Copy/paste or type in and evaluate complex expressions. Exponentiation +$PRGNAM: is right-associative, for example: (2^3)^2*e^4/pi 2^3^2*e^4/pi +$PRGNAM: [The answers given by $PRGNAM: 1112.26437907 8898.11503252] + +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 21056c9..52a5052 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -28,32 +28,6 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -digikam: Digikam is a digital photo management application for the TDE desktop. -digikam: -digikam: Showfoto is a photo viewer and editor. -digikam: -digikam: With language support for: -digikam: -digikam: en $(echo $langs) -digikam: -digikam: -digikam: -digikam: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM @@ -85,11 +59,12 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - # Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -97,7 +72,6 @@ CXXFLAGS="${SLKCFLAGS}" \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - @@ -111,6 +85,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +digikam: Digikam is a digital photo management application for the TDE desktop. +digikam: +digikam: Showfoto is a photo viewer and editor. +digikam: +digikam: With language support for: +digikam: +digikam: en $(echo $langs) +digikam: +digikam: +digikam: +digikam: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 64eb1e5..74a891e 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -28,32 +28,6 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Dolphin file manager for TDE) -$PRGNAM: -$PRGNAM: Dolphin file manager for TDE -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $langs -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM @@ -130,17 +104,52 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM (Dolphin file manager for TDE) +$PRGNAM: +$PRGNAM: Dolphin file manager for TDE +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +$PRGNAM: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: @@ -157,16 +166,6 @@ fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install SlackDesc # Replace the desktop file, with an alternate one. This one changes the diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild index 1d84e3e..8759350 100644 --- a/Apps/filelight/filelight.SlackBuild +++ b/Apps/filelight/filelight.SlackBuild @@ -28,32 +28,6 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM allows you to understand exactly where your diskspace is -$PRGNAM: being used by graphically representating your filesystem as a set of -$PRGNAM: concentric segmented-rings. -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en$langs -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM @@ -87,29 +61,27 @@ do [[ -d doc/$line ]] && [[ $ldocs != *$line* ]] && rm -rf doc/$line done - chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - mkdir -p build-${PRGNAM} cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -119,6 +91,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM allows you to understand exactly where your diskspace is +$PRGNAM: being used by graphically representating your filesystem as a set of +$PRGNAM: concentric segmented-rings. +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en$langs +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 5faa7d5..6546af6 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -50,6 +50,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -61,16 +63,6 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: -mkdir -p $PKG/install -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 -fi - -EOINS - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -80,8 +72,42 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gtk-qt-engine: gtk-qt-engine (Theme gtk+2 to qt3) +gtk-qt-engine: +gtk-qt-engine: A GTK theme engine that uses QT for drawing. Open the 'GTK +gtk-qt-engine: Styles and Fonts' section in the TDE control center and select +gtk-qt-engine: 'Use my TDE style in GTK applications'. +gtk-qt-engine: +gtk-qt-engine: +gtk-qt-engine: +gtk-qt-engine: +gtk-qt-engine: +gtk-qt-engine: Home: https://www.trinitydesktop.org/index.php + +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +cat <> $PKG/install/doinst.sh +# Update the desktop database: +if [ -x usr/bin/update-desktop-database ]; then + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 +fi + +EOINS + +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Apps/gtk-qt-engine/slack-desc b/Apps/gtk-qt-engine/slack-desc deleted file mode 100755 index a0fd4f1..0000000 --- a/Apps/gtk-qt-engine/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -gtk-qt-engine: gtk-qt-engine (Theme gtk+2 to qt3) -gtk-qt-engine: -gtk-qt-engine: A GTK theme engine that uses QT for drawing. Open the "GTK -gtk-qt-engine: Styles and Fonts" section in the TDE control center and select -gtk-qt-engine: "Use my TDE style in GTK applications". -gtk-qt-engine: -gtk-qt-engine: -gtk-qt-engine: -gtk-qt-engine: -gtk-qt-engine: -gtk-qt-engine: Home: https://www.trinitydesktop.org/index.php \ No newline at end of file diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild index c614fbe..76ea01e 100755 --- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild +++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild @@ -28,36 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: Use your TDE style in gtk3 applications. -$PRGNAM: -$PRGNAM: -$PRGNAM: Open TDE control center|Appearance & Themes|GTK Styles and Fonts -$PRGNAM: and select 'Use my TDE style in GTK3 applications'. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -66,7 +39,6 @@ cd ${PRGNAM} # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -76,11 +48,11 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --disable-rpath \ @@ -94,16 +66,6 @@ CXXFLAGS="${SLKCFLAGS}" \ mv $PKG/usr/lib $PKG/usr/lib$LIBDIRSUFFIX sed -i "s|lib/gtk-3.0|lib$LIBDIRSUFFIX/gtk-3.0|" $PKG/usr/lib$LIBDIRSUFFIX/gtk-3.0/3.0.0/theming-engines/libtdegtk.la -# Add this to the doinst.sh: -mkdir -p $PKG/install -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 -fi - -EOINS - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -113,7 +75,40 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: Use your TDE style in gtk3 applications. +$PRGNAM: +$PRGNAM: +$PRGNAM: Open TDE control center|Appearance & Themes|GTK Styles and Fonts +$PRGNAM: and select 'Use my TDE style in GTK3 applications'. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install +cat <> $PKG/install/doinst.sh +# Update the desktop database: +if [ -x usr/bin/update-desktop-database ]; then + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 +fi + +EOINS + SlackDesc cd $PKG diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index 55be5ad..22bb4a1 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -28,41 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: k9copy is an easy to use and powerful DVD backup utility. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $(echo $langs) -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -84,10 +57,11 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -96,11 +70,9 @@ CXXFLAGS="${SLKCFLAGS}" \ --enable-closure \ --enable-k3bdevices - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -110,10 +82,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: k9copy is an easy to use and powerful DVD backup utility. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $(echo $langs) +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index ed39f10..b2a4637 100644 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -50,9 +50,12 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} +# Refusing to compile with Clang LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC="gcc" \ +CXX="g++" \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index 89d90d7..5dc62a7 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -48,6 +48,8 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -93,26 +95,24 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc } -mkdir -p $PKG/install -SlackDesc - -# Add this to the doinst.sh: mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS +SlackDesc + cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index 4226282..def1bf1 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -28,17 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog* COPYING* FAQ HOW.TO.BUILD TODO TRINITY.RELEASE" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -51,6 +51,8 @@ make -f admin/Makefile.common LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ @@ -60,39 +62,63 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kbookreader: kbookreader (book reader) +kbookreader: +kbookreader: kbookreader +kbookreader: +kbookreader: +kbookreader: +kbookreader: +kbookreader: +kbookreader: +kbookreader: +kbookreader: Home: https://www.trinitydesktop.org/ + +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 diff --git a/Apps/kbookreader/slack-desc b/Apps/kbookreader/slack-desc deleted file mode 100755 index b350b4d..0000000 --- a/Apps/kbookreader/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kbookreader: kbookreader (book reader) -kbookreader: -kbookreader: kbookreader -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: -kbookreader: Home: https://www.trinitydesktop.org/ diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 1314b38..d046374 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -28,42 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: Kile is a TEX and LATEX source editor and shell -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $(echo $langs) -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -85,10 +57,11 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -100,7 +73,6 @@ CXXFLAGS="${SLKCFLAGS}" \ make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -110,10 +82,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: Kile is a TEX and LATEX source editor and shell +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $(echo $langs) +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index b2b9ef3..e74fd09 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -28,40 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -knemo: knemo (The TDE Network Monitor) offers a network monitor similar to -knemo: the one found in that other operating system. Supports Ethernet -knemo: (including wireless) and PPP connections, showing both incoming and -knemo: outgoing traffic. For every network interface it displays an icon in -knemo: the Panel. -knemo: -knemo: With language support for: -knemo: en $(echo $langs) -knemo: -knemo: IMPORTANT: KNemo has to be started using -knemo: Trinity Control Center|Internet & Network|Network Monitor. -" > $PKG/install/slack-desc -} - - -DOCS="AUTHORS ChangeLog* COPYING* README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -85,16 +54,20 @@ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in make -f admin/Makefile.common +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -106,7 +79,6 @@ CXXFLAGS="${SLKCFLAGS}" \ make DESTDIR=$PKG install || exit 1 cd - - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -116,6 +88,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +knemo: knemo (The TDE Network Monitor) offers a network monitor similar to +knemo: the one found in that other operating system. Supports Ethernet +knemo: (including wireless) and PPP connections, showing both incoming and +knemo: outgoing traffic. For every network interface it displays an icon in +knemo: the Panel. +knemo: +knemo: With language support for: +knemo: en $(echo $langs) +knemo: +knemo: IMPORTANT: KNemo has to be started using +knemo: Trinity Control Center|Internet & Network|Network Monitor. +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index 23e6b94..ec2eaf1 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -28,47 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -knights: A graphical chess interface for the Trinity Desktop Environment -knights: -knights: Download themepack [additional boards and chessman themes] from: -knights: http://sourceforge.net/project/showfiles.php?group_id=31461 -knights: -knights: Needs separate chess engines, for example gnuchess, stockfish, komodo. -knights: -knights: With language support for: -knights: -knights: en $(echo $langs) -knights: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* CreatingThemes FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # there is a Spanish language file in the source, but it has no translations in it .. # the included es.po file is a Google translation - if you're happy to use it, # then to include it in the build, put it in the same directory as this SB script @@ -84,7 +54,6 @@ langs=$(echo $langs | sed 's|.po||g') # if French is not required, only package English docs [[ $langs != *fr* ]] && sed -i "s|LANGUAGES = en fr|LANGUAGES = en|" doc/Makefile.am - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -94,11 +63,11 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -106,7 +75,6 @@ CXXFLAGS="${SLKCFLAGS}" \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - @@ -120,10 +88,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +knights: A graphical chess interface for the Trinity Desktop Environment +knights: +knights: Download themepack [additional boards and chessman themes] from: +knights: http://sourceforge.net/project/showfiles.php?group_id=31461 +knights: +knights: Needs separate chess engines, for example gnuchess, stockfish, komodo. +knights: +knights: With language support for: +knights: +knights: en $(echo $langs) +knights: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index 515feaf..8f8c3ba 100644 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -28,41 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a front end to nmap -$PRGNAM: -$PRGNAM: A normal (non-root) user can use the privileged nmap functions via -$PRGNAM: the 'tdesu' utility. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -78,18 +51,17 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -99,10 +71,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: $PRGNAM is a front end to nmap +$PRGNAM: +$PRGNAM: A normal (non-root) user can use the privileged nmap functions via +$PRGNAM: the 'tdesu' utility. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild index 874de85..be3f66e 100755 --- a/Apps/koffice-i18n/koffice-i18n.SlackBuild +++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild @@ -28,37 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (internationalization files for koffice). -$PRGNAM: -$PRGNAM: For languages: -$PRGNAM: -$PRGNAM: $langs -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -85,10 +57,11 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} @@ -105,6 +78,31 @@ cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.Sla chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM (internationalization files for koffice). +$PRGNAM: +$PRGNAM: For languages: +$PRGNAM: +$PRGNAM: $langs +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index e0ac23d..989e504 100644 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -50,9 +50,12 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} +# Refusing to compile with Clang =[ LDFLAGS="${SLKLDFLAGS} $($(which Magick++-config) --libs)" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC="gcc" \ +CXX="g++" \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 76bc456..006ba84 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -28,41 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a TDE-based source-editing environment for C and C-style -$PRGNAM: languages. Primarily, it is a front-end to the veteran Cscope, -$PRGNAM: a source-code browser originally developed at Bell Labs. -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $langs -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -85,18 +58,17 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -106,10 +78,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: $PRGNAM is a TDE-based source-editing environment for C and C-style +$PRGNAM: languages. Primarily, it is a front-end to the veteran Cscope, +$PRGNAM: a source-code browser originally developed at Bell Labs. +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index bafdf44..672bc39 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -28,41 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a sensors frontend for TDE. -$PRGNAM: -$PRGNAM: lm_sensors: -$PRGNAM: Read the 'sensors-detect' man page for warnings on usage, then -$PRGNAM: run 'sensors-detect' to scan for hardware monitoring chips. -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $langs -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -85,18 +58,17 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -106,10 +78,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: $PRGNAM is a sensors frontend for TDE. +$PRGNAM: +$PRGNAM: lm_sensors: +$PRGNAM: Read the 'sensors-detect' man page for warnings on usage, then +$PRGNAM: run 'sensors-detect' to scan for hardware monitoring chips. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $langs +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 0449c40..f148676 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -31,7 +31,6 @@ TAG=${TAG:-_tde} source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -53,10 +52,11 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -64,11 +64,9 @@ CXXFLAGS="${SLKCFLAGS}" \ --disable-rpath \ --enable-closure - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index f937047..f372949 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -28,43 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -ksquirrel: KSquirrel is an image viewer for TDE. -ksquirrel: -ksquirrel: Image decoding is based on it's own decoders (ksquirrel-libs) -ksquirrel: -ksquirrel: With OpenGL and KIPI support. -ksquirrel: -ksquirrel: With language support for: -ksquirrel: -ksquirrel: en $(echo $langs) -ksquirrel: -ksquirrel: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -78,7 +49,6 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed 's|.po||g') - # Only Russian and English help documents are in the source, # if Russian is not required, only package English docs [[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am @@ -92,11 +62,11 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -118,10 +88,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +ksquirrel: KSquirrel is an image viewer for TDE. +ksquirrel: +ksquirrel: Image decoding is based on it's own decoders (ksquirrel-libs) +ksquirrel: +ksquirrel: With OpenGL and KIPI support. +ksquirrel: +ksquirrel: With language support for: +ksquirrel: +ksquirrel: en $(echo $langs) +ksquirrel: +ksquirrel: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 6b9e7f4..cf00199 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -28,41 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a TDE frontend for various vpn clients. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $langs -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true # put useful docs in $INSTALL_TDE/doc/kvpnc-$VERSION, not html directory as the Makefile does @@ -73,7 +46,6 @@ cp doc/$file tmpdocs 2>/dev/null || true # need this to overrule exit 1 when dir rm doc/$file 2>/dev/null || true # need this to overrule exit 1 when directories fail to be removed done - # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -84,7 +56,6 @@ langdoc="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang" sed -i "s|KDE_LANG = .*$|KDE_LANG = $langdoc|" doc/Makefile.am sed -i "s|SUBDIRS = .*$|SUBDIRS = tdeioslave $langdoc|" doc/Makefile.am - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -98,10 +69,11 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --build=$ARCH-slackware-linux @@ -109,7 +81,6 @@ CXXFLAGS="${SLKCFLAGS}" \ make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true mv ../tmpdocs/* $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION @@ -121,10 +92,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: $PRGNAM is a TDE frontend for various vpn clients. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $langs +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index 0a5d7e4..53d047a 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -28,36 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: Potracegui is a GUI interface for potrace, a program for tracing -$PRGNAM: bitmapped images and transforming them into vector format images. -$PRGNAM: -$PRGNAM: Potracegui can load remote files (web, ftp...), use any image format -$PRGNAM: recognized by TDE, and supports drag and drop. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -80,10 +53,11 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -91,11 +65,9 @@ CXXFLAGS="${SLKCFLAGS}" \ --disable-rpath \ --enable-closure - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -105,10 +77,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: $PRGNAM is a TDE frontend for various vpn clients. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $langs +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index c856096..1bc8095 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -28,35 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -tde-style-lipstik: tde-style-lipstik (lipstik style for tde) -tde-style-lipstik: -tde-style-lipstik: lipstik style for tde -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -" > $PKG/install/slack-desc -} - -DOCS="AUTHORS ChangeLog* COPYING README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -72,6 +54,8 @@ cd build-${PRGNAM} LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -92,6 +76,23 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +tde-style-lipstik: tde-style-lipstik (lipstik style for tde) +tde-style-lipstik: +tde-style-lipstik: lipstik style for tde +tde-style-lipstik: +tde-style-lipstik: +tde-style-lipstik: +tde-style-lipstik: +tde-style-lipstik: +tde-style-lipstik: +tde-style-lipstik: +tde-style-lipstik: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/tde-style-qtcurve/slack-desc b/Apps/tde-style-qtcurve/slack-desc deleted file mode 100755 index 73d9934..0000000 --- a/Apps/tde-style-qtcurve/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tde-style-qtcurve: tde-style-qtcurve (QtCurve theme) -tde-style-qtcurve: -tde-style-qtcurve: QtCurve theme -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: Home: https://www.trinitydesktop.org/index.php diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 98d06d4..105fe59 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -28,18 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog* COPYING README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -69,8 +70,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tde-style-qtcurve: tde-style-qtcurve (QtCurve theme) +tde-style-qtcurve: +tde-style-qtcurve: QtCurve theme +tde-style-qtcurve: +tde-style-qtcurve: +tde-style-qtcurve: +tde-style-qtcurve: +tde-style-qtcurve: +tde-style-qtcurve: +tde-style-qtcurve: +tde-style-qtcurve: Home: https://www.trinitydesktop.org/index.php + +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild index 418ad98..707f164 100755 --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -29,37 +29,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PKGNAM|-----handy-ruler------------------------------------------------------| -$PKGNAM: $PKGNAM (Amarok Music Player) -$PKGNAM: -$PKGNAM: Amarok music player for TDE -$PKGNAM: -$PKGNAM: -$PKGNAM: With language support for: -$PKGNAM: -$PKGNAM: en$langs -$PKGNAM: -$PKGNAM: -$PKGNAM: Home: https://www.trinitydesktop.org/index.php -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -103,17 +75,17 @@ do [[ -d doc/$line ]] && [[ $ldocs != *$line* ]] && rm -rf doc/$line done - chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - mkdir -p build-${PRGNAM} cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -135,38 +107,60 @@ cd build-${PRGNAM} -DBUILD_TRANSLATIONS="ON" \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PKGNAM|-----handy-ruler------------------------------------------------------| +$PKGNAM: $PKGNAM (Amarok Music Player) +$PKGNAM: +$PKGNAM: Amarok music player for TDE +$PKGNAM: +$PKGNAM: +$PKGNAM: With language support for: +$PKGNAM: +$PKGNAM: en$langs +$PKGNAM: +$PKGNAM: +$PKGNAM: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install SlackDesc cd $PKG diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index 4077cda..27c5099 100755 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -29,37 +29,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdegwenview-i18n: tdegwenview-i18n (Internationalization files for gwenview.) -tdegwenview-i18n: -tdegwenview-i18n: For languages: -tdegwenview-i18n: -tdegwenview-i18n: $(echo $langs) -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -83,7 +55,6 @@ fi # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="";for Lang in $I18N;do [[ -d $Lang ]] && langs="$langs $Lang";done @@ -99,14 +70,14 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -127,6 +98,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdegwenview-i18n: tdegwenview-i18n (Internationalization files for gwenview.) +tdegwenview-i18n: +tdegwenview-i18n: For languages: +tdegwenview-i18n: +tdegwenview-i18n: $(echo $langs) +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +tdegwenview-i18n: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/tdegwenview/tdegwenview.SlackBuild b/Apps/tdegwenview/tdegwenview.SlackBuild index 6fdd2d0..213515a 100755 --- a/Apps/tdegwenview/tdegwenview.SlackBuild +++ b/Apps/tdegwenview/tdegwenview.SlackBuild @@ -29,37 +29,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdegwenview: tdegwenview (gwenview is an image viewer for TDE.) -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -67,7 +39,6 @@ cd ${PRGNAM} DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -80,13 +51,11 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# The libkipi problem needs solved. Not being located in /opt/trinity and -# trying to compiles against kde4's libkipi which causes a build error as -# you would expect. -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -107,10 +76,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdegwenview: tdegwenview (gwenview is an image viewer for TDE.) +tdegwenview: +tdegwenview: gwenview is an image viewer for TDE +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +tdegwenview: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/tdeio-locate/slack-desc b/Apps/tdeio-locate/slack-desc deleted file mode 100755 index 8375287..0000000 --- a/Apps/tdeio-locate/slack-desc +++ /dev/null @@ -1,20 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdeio-locate: tdeio-locate (tdeio-locate) -tdeio-locate: -tdeio-locate: tdeio-locate -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: Home: https://www.trinitydesktop.org/index.php - diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index 80da170..aec6a53 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -28,16 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog COPYING TODO TRINITY* VERSION " - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} -cd applications/${PRGNAM} +cd applications +cd ${PRGNAM} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -47,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -67,8 +70,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdeio-locate: tdeio-locate (tdeio-locate) +tdeio-locate: +tdeio-locate: tdeio-locate +tdeio-locate: +tdeio-locate: +tdeio-locate: +tdeio-locate: +tdeio-locate: +tdeio-locate: +tdeio-locate: +tdeio-locate: Home: https://www.trinitydesktop.org/index.php + +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 diff --git a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild index 11533bd..2105f36 100755 --- a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild +++ b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild @@ -29,37 +29,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdek3b-i18n: tdek3b-i18n (internationalization files for the CD Creator). -tdek3b-i18n: -tdek3b-i18n: For languages: -tdek3b-i18n: -tdek3b-i18n: $langs -tdek3b-i18n: -tdek3b-i18n: -tdek3b-i18n: -tdek3b-i18n: -tdek3b-i18n: -tdek3b-i18n: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -79,11 +51,12 @@ for loca in $langs;do sed -i "/$loca/d" subdirs;done ## ... and use modified subdirs to remove unwanted locale directories while read dir;do rm -rf $dir;done < subdirs - mkdir -p build-${PRGNAM} cd build-${PRGNAM} cmake \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ .. @@ -100,6 +73,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdek3b-i18n: tdek3b-i18n (internationalization files for the CD Creator). +tdek3b-i18n: +tdek3b-i18n: For languages: +tdek3b-i18n: +tdek3b-i18n: $langs +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +tdek3b-i18n: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild index cc7c25b..6fc254b 100755 --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -29,37 +29,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - -$PKGNAM|-----handy-ruler------------------------------------------------------| -$PKGNAM: $PKGNAM (The CD Creator, TDE $TDEVERSION version) -$PKGNAM: -$PKGNAM: K3b makes writing cds under Linux easy. It has an easy to use -$PKGNAM: interface and supports CD burning (including on-the-fly), copying, -$PKGNAM: erasing, ripping, and more. -$PKGNAM: -$PKGNAM: K3b was written by Sebastian Trueg, Thomas Froescher, -$PKGNAM: Christian Kvasny, and Klaus-Dieter Krannich. -$PKGNAM: -$PKGNAM: For more information, visit: http://www.k3b.org -$PKGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications @@ -77,6 +49,8 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -101,7 +75,6 @@ cd build-${PRGNAM} -DBUILD_DOC="ON" \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - @@ -115,10 +88,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + +$PKGNAM|-----handy-ruler------------------------------------------------------| +$PKGNAM: $PKGNAM (The CD Creator, TDE $TDEVERSION version) +$PKGNAM: +$PKGNAM: K3b makes writing cds under Linux easy. It has an easy to use +$PKGNAM: interface and supports CD burning (including on-the-fly), copying, +$PKGNAM: erasing, ripping, and more. +$PKGNAM: +$PKGNAM: K3b was written by Sebastian Trueg, Thomas Froescher, +$PKGNAM: Christian Kvasny, and Klaus-Dieter Krannich. +$PKGNAM: +$PKGNAM: For more information, visit: http://www.k3b.org +$PKGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index 6460419..44bb663 100644 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -28,41 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a graphical front end for the sudo command. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en $langs -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo -e "\nExtracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -84,18 +57,17 @@ chmod -R u+w,go+r-w,a+rX-st . mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION (cd ../;cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -105,10 +77,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: +$PRGNAM: $PRGNAM is a graphical front end for the sudo command. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 90dee94..f1d1d7b 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -28,43 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -twin-style-crystal: twin-style-crystal (Crystal Style for Twin) -twin-style-crystal: -twin-style-crystal: Crystal Style for Twin -twin-style-crystal: -twin-style-crystal: -twin-style-crystal: -twin-style-crystal: -twin-style-crystal: -twin-style-crystal: -twin-style-crystal: -twin-style-crystal: -" > $PKG/install/slack-desc -} - -DOCS="AUTHORS ChangeLog* COPYING README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd applications cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -80,6 +54,8 @@ cd build-${PRGNAM} LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -100,6 +76,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +twin-style-crystal: twin-style-crystal (Crystal Style for Twin) +twin-style-crystal: +twin-style-crystal: Crystal Style for Twin +twin-style-crystal: +twin-style-crystal: +twin-style-crystal: +twin-style-crystal: +twin-style-crystal: +twin-style-crystal: +twin-style-crystal: +twin-style-crystal: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 9601274..4ad9caf 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -97,30 +97,51 @@ Set the directory that TDE is to be installed in. 2> $TMPVARS/INSTALL_TDE -rm -f $TMPVARS/TDE_MIRROR -dialog --nocancel --no-shadow --colors --title " TDE Source Mirror Site " --menu \ +rm -f $TMPVARS/COMPILER +dialog --nocancel --no-shadow --colors --title " Select The Compiler You Wish To Use " --menu \ "\n -Source archives can be pre-downloaded and placed in the 'src' directory or downloaded as required during the build from a TDE mirror. +Here you can select the compiler you wish to use to compile TDE. \n -The mirror will only be used if the source is not available in 'src'. +Your choices are \Zb\Z3GCC\Zn and \Zb\Z3Clang\Zn \n\n -[Non-TDE apps are included in \Zb\Z3TDE Packages Selection\Zn options under -\n - Misc and can also be downloaded during the build from their own -\n - source URLs which are embedded in the SlackBuild script.] +This is a matter of personal preference and not a necessity, but the option exist. \n\n -This list of mirrors, which could change, is @ -\n - https://www.trinitydesktop.org/mirrorstatus.php +If you're not sure which to select, you should probably just use \Zb\Z3GCC\Zn. +\n\n +Please note: the corresponding \Zb\Z3C++\Zn compiler will be chosen for you based on your \Zb\Z3C\Zn compiler selection. +\n\n +So if you choose \Zb\Z3GCC\Zn, the \Zb\Z3g++\Zn compiler will be used. And if you choose \Zb\Z3Clang\Zn then \Zb\Z3clang++\Zn will be used. \n\n" \ -23 75 5 \ -"tde-mirror.yosemite.net/trinity" "USA" \ -"mirrorservice.org/sites/trinitydesktop.org/trinity" "UK" \ -"mirror.ntmm.org/trinity" "Sweden" \ -"bg1.mirror.trinitydesktop.org/trinity" "Bulgaria" \ -"ftp.fau.de/trinity" "Germany" \ -2> $TMPVARS/TDE_MIRROR +25 77 2 \ +"gcc" "GCC" \ +"clang" "Clang" \ +2> $TMPVARS/COMPILER + +# Lets try redirector +#rm -f $TMPVARS/TDE_MIRROR +#dialog --nocancel --no-shadow --colors --title " TDE Source Mirror Site " --menu \ +#"\n +#Source archives can be pre-downloaded and placed in the 'src' directory or downloaded as required during the build from a TDE mirror. +#\n +#The mirror will only be used if the source is not available in 'src'. +#\n\n +#[Non-TDE apps are included in \Zb\Z3TDE Packages Selection\Zn options under +#\n +# Misc and can also be downloaded during the build from their own +#\n +# source URLs which are embedded in the SlackBuild script.] +#\n\n +#This list of mirrors, which could change, is @ +#\n +# https://www.trinitydesktop.org/mirrorstatus.php +#\n\n" \ +#23 75 5 \ +#"tde-mirror.yosemite.net/trinity" "USA" \ +#"mirrorservice.org/sites/trinitydesktop.org/trinity" "UK" \ +#"mirror.ntmm.org/trinity" "Sweden" \ +#"bg1.mirror.trinitydesktop.org/trinity" "Bulgaria" \ +#"ftp.fau.de/trinity" "Germany" \ +#2> $TMPVARS/TDE_MIRROR rm -f $TMPVARS/NUMJOBS @@ -366,13 +387,26 @@ echo export TDEVERSION=$(cat $TMPVARS/TDEVERSION) export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE) -export TDE_MIRROR=$(cat $TMPVARS/TDE_MIRROR) +export COMPILER=$(cat $TMPVARS/COMPILER) +# export TDE_MIRROR=$(cat $TMPVARS/TDE_MIRROR) +export TDE_MIRROR=mirror.ppa.trinitydesktop.org/trinity export NUMJOBS=$(cat $TMPVARS/NUMJOBS) export I18N=$(cat $TMPVARS/I18N) export TQT_DOCS=$(cat $TMPVARS/TQT_DOCS) export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL) export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD) +# See which compiler was selected and use the appropriate C++ compiler +CXX1="g++" +CXX2="clang++" +if [[ $(cat $TMPVARS/COMPILER) == gcc ]] ; then + echo $CXX1 > $TMPVARS/COMPILER_CXX + else + echo $CXX2 > $TMPVARS/COMPILER_CXX +fi + +export COMPILER_CXX=$(cat $TMPVARS/COMPILER_CXX) + LIBDIRSUFFIX="" # Is this a 64 bit system? # 'uname -m' won't identify a 32 bit system with a 64 bit kernel diff --git a/CHANGELOG b/CHANGELOG index ccbed0d..c26d1a3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,3 +13,4 @@ 01/01/2017 Update license year and add tde-slackbuild project as I no longer do this alone. Commented out the desktop file change to d3lphin I previously made. Will leave it for an option for the users who want it, like me. -Thorn Inurcide +01/**/2017 Added option to choose between Clang or GCC as your compiler. diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 498edfc..2a09281 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -27,31 +27,6 @@ PRGNAM=tde-i18n VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - -${PRGNAM}-$lang|-----handy-ruler------------------------------------------------------| -${PRGNAM}-$lang: ${PRGNAM}-$lang -${PRGNAM}-$lang: -${PRGNAM}-$lang: Language support for TDE: -${PRGNAM}-$lang: -${PRGNAM}-$lang: $(echo $Lang) -${PRGNAM}-$lang: -${PRGNAM}-$lang: -${PRGNAM}-$lang: -${PRGNAM}-$lang: -${PRGNAM}-$lang: -${PRGNAM}-$lang: -" > $PKG/install/slack-desc -} - source ../../get-source.sh ## the source unpacked is ~950MB, so to save on build space @@ -83,6 +58,8 @@ cd ${PRGNAM}-$lang/build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -91,28 +68,10 @@ cd ${PRGNAM}-$lang/build -DBUILD_ALL="ON" \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: -mkdir -p $PKG/install -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS - mkdir -p $PKG/${INSTALL_TDE}/doc/${PRGNAM}-$VERSION #cp -a $DOCS $PKG${INSTALL_TDE}/doc/${PRGNAM}-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/${PRGNAM}-$VERSION/${PRGNAM}-${lang}.SlackBuild @@ -122,6 +81,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + +${PRGNAM}-$lang|-----handy-ruler------------------------------------------------------| +${PRGNAM}-$lang: ${PRGNAM}-$lang +${PRGNAM}-$lang: +${PRGNAM}-$lang: Language support for TDE: +${PRGNAM}-$lang: +${PRGNAM}-$lang: $(echo $Lang) +${PRGNAM}-$lang: +${PRGNAM}-$lang: +${PRGNAM}-$lang: +${PRGNAM}-$lang: +${PRGNAM}-$lang: +${PRGNAM}-$lang: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install # extract the name of the language from the source text - a bit messy but there is no standard format Lang=$(grep Language-Team: $TMP/tmp-$PRGNAM/$PRGNAM/tde-i18n-${lang}/messages/tdebase/*.po|sort -k2 | sed -e 's|Team: |\n|' -e 's| <|\n|' -e 's|akh\\n"|akh|' -e 's|an S|#|' | grep "[A-Z][a-z][a-z]*$"|head -n 1) @@ -129,6 +113,22 @@ Lang=$(grep Language-Team: $TMP/tmp-$PRGNAM/$PRGNAM/tde-i18n-${lang}/messages/td [[ "$lang" == "fy" ]] && Lang="Frisian" SlackDesc +mkdir -p $PKG/install +cat <> $PKG/install/doinst.sh +# Update the desktop database: +if [ -x usr/bin/update-desktop-database ]; then + chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 +fi + +# Update hicolor theme cache: +if [ -d usr/share/icons/hicolor ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + fi +fi + +EOINS + ARCH="noarch" cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${lang}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz} diff --git a/Core/tdeaddons/slack-desc b/Core/tdeaddons/slack-desc deleted file mode 100755 index cab532e..0000000 --- a/Core/tdeaddons/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdeaddons: tdeaddons (additional plugins and scripts) -tdeaddons: -tdeaddons: tdeaddons contains additional plugins and scripts for some TDE -tdeaddons: applications. -tdeaddons: -tdeaddons: -tdeaddons: -tdeaddons: -tdeaddons: -tdeaddons: -tdeaddons: Home: http://www.trinitydesktop.org/ diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index de48c0c..77fdf19 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -28,16 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + # patch for TDE bug 2043 patch -p0 < $SRCDIR/arkplugin-diffs-1 @@ -51,6 +51,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -67,39 +69,62 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdeaddons: tdeaddons (additional plugins and scripts) +tdeaddons: +tdeaddons: tdeaddons contains additional plugins and scripts for some TDE +tdeaddons: applications. +tdeaddons: +tdeaddons: +tdeaddons: +tdeaddons: +tdeaddons: +tdeaddons: +tdeaddons: Home: http://www.trinitydesktop.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdeartwork/slack-desc b/Core/tdeartwork/slack-desc deleted file mode 100755 index 19a9316..0000000 --- a/Core/tdeartwork/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdeartwork: tdeartwork (Extra artwork/themes/wallpapers for TDE) -tdeartwork: -tdeartwork: Extra artwork/themes/wallpapers for TDE -tdeartwork: -tdeartwork: -tdeartwork: -tdeartwork: -tdeartwork: -tdeartwork: -tdeartwork: -tdeartwork: Home: https://www.trinitydesktop.org/index.php diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index 6ba8efb..3e20b84 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -28,17 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -63,39 +64,62 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdeartwork: tdeartwork (Extra artwork/themes/wallpapers for TDE) +tdeartwork: +tdeartwork: Extra artwork/themes/wallpapers for TDE +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdebase/doinst.sh b/Core/tdebase/doinst.sh index 6d7bd3d..894b285 100755 --- a/Core/tdebase/doinst.sh +++ b/Core/tdebase/doinst.sh @@ -28,19 +28,19 @@ config etc/tde/tdm/backgroundrc.new # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi diff --git a/Core/tdebase/slack-desc b/Core/tdebase/slack-desc deleted file mode 100755 index 04846e6..0000000 --- a/Core/tdebase/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdebase: tdebase (The Trinity Desktop base) -tdebase: -tdebase: tdebase is the second mandatory package (besides tdelibs) for the -tdebase: Trinity Desktop Environment. Here we have various applications and -tdebase: infrastructure files and libraries. -tdebase: -tdebase: -tdebase: -tdebase: -tdebase: -tdebase: Home: https://www.trinitydesktop.org/index.php diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 2b07955..9a7342d 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -30,17 +30,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -52,6 +51,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -123,10 +124,36 @@ mkdir -p $PKG/etc/tde mv $PKG${INSTALL_TDE}/share/config/tdm $PKG/etc/tde ( cd $PKG${INSTALL_TDE}/share/config ; ln -sf ../../../etc/tde/tdm . ) +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdebase: tdebase (The Trinity Desktop base) +tdebase: +tdebase: tdebase is the second mandatory package (besides tdelibs) for the +tdebase: Trinity Desktop Environment. Here we have various applications and +tdebase: infrastructure files and libraries. +tdebase: +tdebase: +tdebase: +tdebase: +tdebase: +tdebase: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc sed -e "s|\${INSTALL_TDE}|${INSTALL_TDE}|g" -e "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh +SlackDesc + cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 1850c2b..e2b0c8d 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -28,44 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdegames: Games for the Trinity Desktop Environment -tdegames: -tdegames: atlantik, kasteroids, katomic, kbackgammon, kbattleship, kblackbox, -tdegames: kbounce, keneloba, kfouleggs, kjumpingcube, klickety, klines, -tdegames: kmahjongg, kmines, kolf, konquest, kpat, kpoker, kreversi, ksame, -tdegames: kshisen, ksirtet, ksmiletris, ksnake, ksokoban, kspaceduel, ktron, -tdegames: ktuberling, twin4, lskat. -tdegames: -tdegames: -tdegames: -tdegames: -" > $PKG/install/slack-desc -} - - -DOCS="AUTHORS ChangeLog* COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -75,6 +47,8 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -116,7 +90,6 @@ cd build-${PRGNAM} -DBUILD_TWIN4="ON" \ .. - # don't package carddecks if they're not needed for chosen games: [[ ! $(grep -E "kpat|kpoker|lskat" cmake_install.cmake) ]] && sed -i '/carddecks/d' libtdegames/cmake_install.cmake # docs for chosen games only: @@ -128,12 +101,10 @@ do : # need something here to prevent exit 1 done - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - - mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -143,6 +114,31 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdegames: Games for the Trinity Desktop Environment +tdegames: +tdegames: atlantik, kasteroids, katomic, kbackgammon, kbattleship, kblackbox, +tdegames: kbounce, keneloba, kfouleggs, kjumpingcube, klickety, klines, +tdegames: kmahjongg, kmines, kolf, konquest, kpat, kpoker, kreversi, ksame, +tdegames: kshisen, ksirtet, ksmiletris, ksnake, ksokoban, kspaceduel, ktron, +tdegames: ktuberling, twin4, lskat. +tdegames: +tdegames: +tdegames: +tdegames: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Core/tdegraphics/slack-desc b/Core/tdegraphics/slack-desc deleted file mode 100755 index c69305b..0000000 --- a/Core/tdegraphics/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdegraphics: tdegraphics (Misc graphics apps and shit) -tdegraphics: -tdegraphics: Misc graphics apps and shit -tdegraphics: -tdegraphics: -tdegraphics: -tdegraphics: -tdegraphics: -tdegraphics: -tdegraphics: -tdegraphics: Home: https://www.trinitydesktop.org/index.php diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index e9eb36f..bed296c 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -28,17 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog* COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -50,6 +49,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -73,34 +74,57 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdegraphics: tdegraphics (Misc graphics apps) +tdegraphics: +tdegraphics: Misc graphics apps and related +tdegraphics: +tdegraphics: +tdegraphics: +tdegraphics: +tdegraphics: +tdegraphics: +tdegraphics: +tdegraphics: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdelibs/patches/build-with-clang.patch b/Core/tdelibs/patches/build-with-clang.patch new file mode 100644 index 0000000..89229e3 --- /dev/null +++ b/Core/tdelibs/patches/build-with-clang.patch @@ -0,0 +1,13 @@ +diff --git a/tdeabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp +index 12964a6..20617ba 100644 +--- a/tdeabc/tests/testaddresseelist.cpp ++++ b/tdeabc/tests/testaddresseelist.cpp +@@ -17,7 +17,7 @@ static const TDECmdLineOptions options[] = + TDECmdLineLastOption + }; + +-int main(int /*argc*/,char /* **argv*/) ++int main(int /*argc*/, char** /*argv*/) + { + /* TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1"); + TDECmdLineArgs::init(argc, argv, &aboutData); diff --git a/Core/tdelibs/slack-desc b/Core/tdelibs/slack-desc deleted file mode 100755 index e8d77eb..0000000 --- a/Core/tdelibs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdelibs: tdelibs (TDE libraries) -tdelibs: -tdelibs: These are the Trinity Desktop Environment [TDE] -tdelibs: libraries. This package includes libraries that are central -tdelibs: to the development and execution of a TDE program, as well -tdelibs: as internationalization files for these libraries, misc HTML -tdelibs: documentation, theme modules, and regression tests. -tdelibs: -tdelibs: -tdelibs: -tdelibs: Home: https://www.trinitydesktop.org/index.php diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild old mode 100755 new mode 100644 index 891b04e..b0677da --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -28,27 +28,30 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS COPYING* README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . +patch -p1 < $SRCDIR/patches/build-with-clang.patch + mkdir -p build-${PRGNAM} cd build-${PRGNAM} - cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -77,39 +80,62 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdelibs: tdelibs (TDE libraries) +tdelibs: +tdelibs: These are the Trinity Desktop Environment [TDE] +tdelibs: libraries. This package includes libraries that are central +tdelibs: to the development and execution of a TDE program, as well +tdelibs: as internationalization files for these libraries, misc HTML +tdelibs: documentation, theme modules, and regression tests. +tdelibs: +tdelibs: +tdelibs: +tdelibs: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share//applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdemultimedia/slack-desc b/Core/tdemultimedia/slack-desc deleted file mode 100755 index 9f18a62..0000000 --- a/Core/tdemultimedia/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdemultimedia: tdemultimedia (multilmedia apps for tde) -tdemultimedia: -tdemultimedia: Multimedia packages for TDE -tdemultimedia: -tdemultimedia: -tdemultimedia: -tdemultimedia: -tdemultimedia: -tdemultimedia: -tdemultimedia: -tdemultimedia: Home: https://www.trinitydesktop.org/index.php diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index b11f982..05601f8 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -35,17 +35,16 @@ NUMJOBS=$NUMJOBS # otherwise using automake/configure to be able to build all options USECMAKE="no" -DOCS="AUTHORS COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -58,6 +57,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -77,11 +78,11 @@ cd build-${PRGNAM} # change hard-coded tqt headers directory: [[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|${INSTALL_TDE}/include/tqt|g" ../configure - -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -95,34 +96,57 @@ fi make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdemultimedia: tdemultimedia (multilmedia apps for tde) +tdemultimedia: +tdemultimedia: Multimedia packages for TDE +tdemultimedia: +tdemultimedia: +tdemultimedia: +tdemultimedia: +tdemultimedia: +tdemultimedia: +tdemultimedia: +tdemultimedia: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 67f5c43..131c58f 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -28,37 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (networking applications) -$PRGNAM: -$PRGNAM: Networking applications for TDE -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} @@ -79,6 +51,8 @@ cd build-${PRGNAM} cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -138,43 +112,65 @@ cd build-${PRGNAM} -Wno-dev \ .. - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM (networking applications) +$PRGNAM: +$PRGNAM: Networking applications for TDE +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install SlackDesc cd $PKG diff --git a/Core/tdepim/slack-desc b/Core/tdepim/slack-desc deleted file mode 100755 index fbb4b88..0000000 --- a/Core/tdepim/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdepim: tdepim (personal information management) -tdepim: -tdepim: The TDE-PIM project aims to bring together those who wish to help -tdepim: design, implement, test, etc. anything that's to do with -tdepim: personal information management. -tdepim: -tdepim: -tdepim: -tdepim: -tdepim: -tdepim: Home: http://www.trinitydesktop.org/ diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index b512350..2988802 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -28,20 +28,22 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="MAINTAINERS README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + # If libcaldav is installed, include it in the build for korganizer [[ $(ls /var/log/packages/libcaldav*) ]] 2>/dev/null && LCALDAV="ON" +# If libcarddav is installed, include it in the build for korganizer +[[ $(ls /var/log/packages/libcarddav*) ]] 2>/dev/null && LCARDDAV="ON" + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -52,6 +54,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -60,7 +64,7 @@ cd build-${PRGNAM} -DWITH_ALL_OPTIONS="ON" \ -DWITH_GNOKII="OFF" \ -DWITH_CALDAV=${LCALDAV:-"OFF"} \ - -DWITH_CARDDAV="OFF" \ + -DWITH_CARDDAV=${LCARDDAV:-"OFF"} \ -DBUILD_ALL="ON" \ -Wno-dev \ .. @@ -68,39 +72,62 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdepim: tdepim (personal information management) +tdepim: +tdepim: The TDE-PIM project aims to bring together those who wish to help +tdepim: design, implement, test, etc. anything that's to do with +tdepim: personal information management. +tdepim: +tdepim: +tdepim: +tdepim: +tdepim: +tdepim: Home: http://www.trinitydesktop.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdesdk/slack-desc b/Core/tdesdk/slack-desc deleted file mode 100755 index 243c623..0000000 --- a/Core/tdesdk/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdesdk: tdesdk (tools used by TDE developers) -tdesdk: -tdesdk: This is a collection of applications and tools used by TDE -tdesdk: developers. It also has example code for use in learning TDE -tdesdk: programming or starting a new TDE application. -tdesdk: -tdesdk: -tdesdk: -tdesdk: -tdesdk: -tdesdk: Home: http://www.trinitydesktop.org/ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index c9a32fc..72d545e 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -28,17 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="COPYING README" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -63,44 +64,67 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +if [ -d $PKG/usr/man ]; then + 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 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdesdk: tdesdk (tools used by TDE developers) +tdesdk: +tdesdk: This is a collection of applications and tools used by TDE +tdesdk: developers. It also has example code for use in learning TDE +tdesdk: programming or starting a new TDE application. +tdesdk: +tdesdk: +tdesdk: +tdesdk: +tdesdk: +tdesdk: Home: http://www.trinitydesktop.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -if [ -d $PKG/usr/man ]; then - 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 - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdetoys/slack-desc b/Core/tdetoys/slack-desc deleted file mode 100755 index dd596f9..0000000 --- a/Core/tdetoys/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdetoys: tdetoys (TDE Amusements) -tdetoys: -tdetoys: TDE Amusements -tdetoys: -tdetoys: -tdetoys: -tdetoys: -tdetoys: -tdetoys: -tdetoys: -tdetoys: Home: http://www.trinitydesktop.org/ diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index 5c89982..a4d3cfc 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -28,17 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -61,34 +62,57 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdetoys: tdetoys (TDE Amusements) +tdetoys: +tdetoys: TDE Amusements +tdetoys: +tdetoys: +tdetoys: +tdetoys: +tdetoys: +tdetoys: +tdetoys: +tdetoys: Home: http://www.trinitydesktop.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdeutils/slack-desc b/Core/tdeutils/slack-desc deleted file mode 100755 index eeb8a9d..0000000 --- a/Core/tdeutils/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdeutils: tdeutils (Collection of utilities) -tdeutils: -tdeutils: Collection of utilities including ark -tdeutils: -tdeutils: -tdeutils: -tdeutils: -tdeutils: -tdeutils: -tdeutils: -tdeutils: Home: https://www.trinitydesktop.org/index.php diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 67d0f3d..1352cbd 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -28,17 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS COPYING* README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \ @@ -65,39 +66,62 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdeutils: tdeutils (Collection of utilities) +tdeutils: +tdeutils: Collection of utilities including ark +tdeutils: +tdeutils: +tdeutils: +tdeutils: +tdeutils: +tdeutils: +tdeutils: +tdeutils: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index 5ee363f..47279bf 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -28,17 +28,16 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog* COPYING* HACKING* README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -L$TQTDIR/lib" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -64,39 +65,62 @@ cd build-${PRGNAM} make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdeartwork: tdeartwork (Extra artwork/themes/wallpapers for TDE) +tdeartwork: +tdeartwork: Extra artwork/themes/wallpapers for TDE +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: +tdeartwork: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi # Update the mime database: if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 + chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index 3425edd..46a38fe 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -28,37 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdewebdev: tdewebdev (Quanta Plus and other applications) -tdewebdev: -tdewebdev: The tdewebdev package contains Quanta Plus and other applications, -tdewebdev: which are useful for web development. They are runtime dependencies -tdewebdev: of Quanta Plus, and it is highly recommended that you install them. -tdewebdev: -tdewebdev: -tdewebdev: -tdewebdev: -tdewebdev: -tdewebdev: Home: http://www.trinitydesktop.org/ -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM} @@ -76,11 +48,11 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -88,38 +60,60 @@ CXXFLAGS="${SLKCFLAGS}" \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - -# Add this to the doinst.sh: +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +(cd ${PRGNAM};cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdewebdev: tdewebdev (Quanta Plus and other applications) +tdewebdev: +tdewebdev: The tdewebdev package contains Quanta Plus and other applications, +tdewebdev: which are useful for web development. They are runtime dependencies +tdewebdev: of Quanta Plus, and it is highly recommended that you install them. +tdewebdev: +tdewebdev: +tdewebdev: +tdewebdev: +tdewebdev: +tdewebdev: Home: http://www.trinitydesktop.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -(cd ${PRGNAM};cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION) || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/install SlackDesc cd $PKG diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index 3a7ca8a..c409092 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -28,18 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="COPYING TRINITY*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd dependencies cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -50,6 +49,8 @@ cd build-${PRGNAM} -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -70,8 +71,33 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +arts: arts (arts) +arts: +arts: arts +arts: +arts: +arts: +arts: +arts: +arts: +arts: +arts: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Deps/arts/slack-desc b/Deps/arts/slack-desc deleted file mode 100755 index 7b3bdd4..0000000 --- a/Deps/arts/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -arts: arts (arts) -arts: -arts: arts -arts: -arts: -arts: -arts: -arts: -arts: -arts: -arts: Home: https://www.trinitydesktop.org/index.php diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index e016f1c..4716280 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -28,18 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog* COPYING* README* TODO" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd dependencies cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -49,6 +48,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -68,8 +69,33 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +dbus-1-tqt: dbus-1-tqt (Backport of Harald Fernengel's Qt4 D-Bus bindings) +dbus-1-tqt: +dbus-1-tqt: Some Qt4 based code had no direct equivalent in Qt3. Cases where +dbus-1-tqt: this transition to Qt3 might not be fully correct are marked with +dbus-1-tqt: FIXME-QT4 +dbus-1-tqt: +dbus-1-tqt: +dbus-1-tqt: +dbus-1-tqt: +dbus-1-tqt: +dbus-1-tqt: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Deps/dbus-1-tqt/slack-desc b/Deps/dbus-1-tqt/slack-desc deleted file mode 100755 index 7435f0f..0000000 --- a/Deps/dbus-1-tqt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -dbus-1-tqt: dbus-1-tqt (Backport of Harald Fernengel's Qt4 D-Bus bindings) -dbus-1-tqt: -dbus-1-tqt: Some Qt4 based code had no direct equivalent in Qt3. Cases where -dbus-1-tqt: this transition to Qt3 might not be fully correct are marked with -dbus-1-tqt: FIXME-QT4 -dbus-1-tqt: -dbus-1-tqt: -dbus-1-tqt: -dbus-1-tqt: -dbus-1-tqt: -dbus-1-tqt: Home: https://www.trinitydesktop.org/index.php diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index 60428e9..706fd8a 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -49,6 +49,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ diff --git a/Deps/libart_lgpl/libart_lgpl.SlackBuild b/Deps/libart_lgpl/libart_lgpl.SlackBuild index 23d9773..9f089b6 100755 --- a/Deps/libart_lgpl/libart_lgpl.SlackBuild +++ b/Deps/libart_lgpl/libart_lgpl.SlackBuild @@ -29,24 +29,25 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} PKGNAME=libart_lgpl -DOCS="AUTHORS ChangeLog* COPYING NEWS README*" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd dependencies cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -66,8 +67,33 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libart_lgpl: libart_lgpl (the LGPL'd component of libart) +libart_lgpl: +libart_lgpl: This is the LGPL'd component of libart. All functions needed +libart_lgpl: for running the Gnome canvas, and for printing support, will be +libart_lgpl: going in here. The GPL'd component will be getting various +libart_lgpl: enhanced functions for specific applications. +libart_lgpl: +libart_lgpl: +libart_lgpl: +libart_lgpl: +libart_lgpl: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAME}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Deps/libart_lgpl/slack-desc b/Deps/libart_lgpl/slack-desc deleted file mode 100755 index 64b1929..0000000 --- a/Deps/libart_lgpl/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libart_lgpl: libart_lgpl (the LGPL'd component of libart) -libart_lgpl: -libart_lgpl: This is the LGPL'd component of libart. All functions needed -libart_lgpl: for running the Gnome canvas, and for printing support, will be -libart_lgpl: going in here. The GPL'd component will be getting various -libart_lgpl: enhanced functions for specific applications. -libart_lgpl: -libart_lgpl: -libart_lgpl: -libart_lgpl: -libart_lgpl: Home: https://www.trinitydesktop.org/index.php diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index e1883ac..81d1e6f 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -42,10 +42,11 @@ DOCS=$(for file in AUTHORS* rfc4791.pdf ChangeLog* COPYING* FAQ* INSTALL* KNOWNB chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./autogen.sh \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ @@ -58,7 +59,15 @@ CXXFLAGS="${SLKCFLAGS}" \ make DESTDIR=$PKG install || exit 1 cd - -# Create the slack-desc +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + SlackDesc() { echo " @@ -84,16 +93,6 @@ libcaldav: " > $PKG/install/slack-desc } -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Add the slack-desc mkdir -p $PKG/install SlackDesc diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index f9cca4a..dec63bf 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -45,6 +45,8 @@ chmod -R u+w,go+r-w,a+rX-st . LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./autogen.sh \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ diff --git a/Deps/tqca-tls/slack-desc b/Deps/tqca-tls/slack-desc deleted file mode 100755 index 432741d..0000000 --- a/Deps/tqca-tls/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tqca-tls: tqca-tls (Plugin to provide SSL/TLS capability) -tqca-tls: -tqca-tls: This is a plugin to provide SSL/TLS capability to programs that -tqca-tls: utilize the TQt Cryptographic Architecture (TQCA). -tqca-tls: -tqca-tls: -tqca-tls: -tqca-tls: -tqca-tls: -tqca-tls: -tqca-tls: Home: https://www.trinitydesktop.org/index.php diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index 4bfed5b..1599008 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -27,18 +27,18 @@ PRGNAM=tqca-tls VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="COPYING README" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd dependencies cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -47,6 +47,8 @@ chmod -R u+w,go+r-w,a+rX-st . LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --qtdir=$TQTDIR-${VERSION} @@ -64,8 +66,33 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tqca-tls: tqca-tls (Plugin to provide SSL/TLS capability) +tqca-tls: +tqca-tls: This is a plugin to provide SSL/TLS capability to programs that +tqca-tls: utilize the TQt Cryptographic Architecture (TQCA). +tqca-tls: +tqca-tls: +tqca-tls: +tqca-tls: +tqca-tls: +tqca-tls: +tqca-tls: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Deps/tqt3/slack-desc b/Deps/tqt3/slack-desc deleted file mode 100755 index f290f5c..0000000 --- a/Deps/tqt3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tqt3: tqt3 (C++ GUI application framework) -tqt3: -tqt3: Qt is a multiplatform C++ GUI application framework -tqt3: -tqt3: -tqt3: -tqt3: -tqt3: -tqt3: -tqt3: -tqt3: Home: https://wiki.trinitydesktop.org/Trinity_Desktop_Environment diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild index 95cf9df..4bf91ba 100755 --- a/Deps/tqt3/tqt3.SlackBuild +++ b/Deps/tqt3/tqt3.SlackBuild @@ -24,28 +24,31 @@ # SUCH DAMAGE. # Much help from the 12.2 SlackBuild script of qt3. And from SBo qt3 script +# Man pages are not installed, so they won't overwrite Qt4's PRGNAM=tqt3 VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="ChangeLog* FAQ LICENSE* README* TRINITY.RELEASE" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd dependencies cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . -echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure \ +echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ + ./configure \ -prefix $TQTDIR-${VERSION} \ -release \ -verbose \ @@ -92,6 +95,70 @@ make install INSTALL_ROOT=$PKG || exit 1 done ) +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; + +mkdir -p $PKG/etc/profile.d +# JD: adapt these to the correct value of LIBDIRSUFFIX +# later changed to TQTDIR +sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/${PRGNAM}.sh > $PKG/etc/profile.d/${PRGNAM}.sh +sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/${PRGNAM}.csh > $PKG/etc/profile.d/${PRGNAM}.csh +chmod 755 $PKG/etc/profile.d/* + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Put a ton of links to more "normal" places. +mkdir -p $PKG${INSTALL_TDE}/bin +( cd $PKG${INSTALL_TDE}/bin + for file in tqassistant tqdesigner tqlinguist tqlrelease tqlupdate tqmoc tqm2ts tqmake tqtconfig tquic ; do + ln -sf $TQTDIR-$VERSION/bin/$file . + done +) + +mkdir -p $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig +( cd $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig + ln -sf $TQTDIR-${VERSION}/lib/pkgconfig/tqt-mt.pc . +) + +# Symlink tqt3 includes to qt3, to provide it for non-tde software as well =] +mkdir -p $PKG${INSTALL_TDE}/include +( cd $PKG${INSTALL_TDE}/include ; ln -sf $TQTDIR-${VERSION}/include qt3 ) + +# Symlink all of it: +( cd $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX} ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM}) + +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tqt3: tqt3 (C++ GUI application framework) +tqt3: +tqt3: Qt is a multiplatform C++ GUI application framework +tqt3: +tqt3: +tqt3: +tqt3: +tqt3: +tqt3: +tqt3: +tqt3: Home: https://wiki.trinitydesktop.org/Trinity_Desktop_Environment +" > $PKG/install/slack-desc +} + # Add this to the doinst.sh: mkdir -p $PKG/install [[ $PREPEND != yes ]] && \ @@ -135,67 +202,23 @@ sed -i "s|PKG_CONFIG_PATH |PKG_CONFIG_PATH ${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkg EOINS +mkdir -p $PKG/install cat <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 + chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 fi # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null fi fi EOINS -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; - -# Add man pages: -# mkdir -p $PKG/usr/man -# cp -a doc/man/* $PKG/usr/man -# find $PKG/usr/man -type f -exec gzip -9 "{}" \; - -mkdir -p $PKG/etc/profile.d -# JD: adapt these to the correct value of LIBDIRSUFFIX -# later changed to TQTDIR -sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/${PRGNAM}.sh > $PKG/etc/profile.d/${PRGNAM}.sh -sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/${PRGNAM}.csh > $PKG/etc/profile.d/${PRGNAM}.csh -chmod 755 $PKG/etc/profile.d/* - -# Strip binaries: -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) - -# Put a ton of links to more "normal" places. -mkdir -p $PKG${INSTALL_TDE}/bin -( cd $PKG${INSTALL_TDE}/bin - for file in tqassistant tqdesigner tqlinguist tqlrelease tqlupdate tqmoc tqm2ts tqmake tqtconfig tquic ; do - ln -sf $TQTDIR-$VERSION/bin/$file . - done -) - -mkdir -p $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig -( cd $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX}/pkgconfig - ln -sf $TQTDIR-${VERSION}/lib/pkgconfig/tqt-mt.pc . -) - -# Symlink tqt3 includes to qt3, to provide it for non-tde software as well =] -mkdir -p $PKG${INSTALL_TDE}/include -( cd $PKG${INSTALL_TDE}/include ; ln -sf $TQTDIR-${VERSION}/include qt3 ) - -# Symlink all of it: -( cd $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX} ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM}) - -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Deps/tqtinterface/slack-desc b/Deps/tqtinterface/slack-desc deleted file mode 100755 index 25c1c90..0000000 --- a/Deps/tqtinterface/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tqtinterface: tqtinterface (libraries that abstract the underlying Qt system) -tqtinterface: -tqtinterface: This package includes libraries that abstract the underlying -tqtinterface: Qt system from the actual Trinity code, allowing easy, complete -tqtinterface: upgrades to new versions of Qt. -tqtinterface: -tqtinterface: -tqtinterface: -tqtinterface: -tqtinterface: -tqtinterface: Home: https://www.trinitydesktop.org/index.php diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild index bb46061..745466b 100755 --- a/Deps/tqtinterface/tqtinterface.SlackBuild +++ b/Deps/tqtinterface/tqtinterface.SlackBuild @@ -28,18 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS COPYING README* TRINITY.RELEASE" - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd dependencies cd ${PRGNAM} +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -53,6 +52,8 @@ cd build-${PRGNAM} -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=${COMPILER} \ + -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ @@ -75,8 +76,33 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tqtinterface: tqtinterface (libraries that abstract the underlying Qt system) +tqtinterface: +tqtinterface: This package includes libraries that abstract the underlying +tqtinterface: Qt system from the actual Trinity code, allowing easy, complete +tqtinterface: upgrades to new versions of Qt. +tqtinterface: +tqtinterface: +tqtinterface: +tqtinterface: +tqtinterface: +tqtinterface: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/KNOWN-ISSUES b/KNOWN-ISSUES index e2a2e8c..b6894ca 100644 --- a/KNOWN-ISSUES +++ b/KNOWN-ISSUES @@ -8,5 +8,8 @@ Will look in to this when I have more free time. My apologies. Chalk crashes when trying to launch it. (At least for me) The rest of Koffice seems to work fine. +Koffice and kaffeine aren't compiling with Clang. So even if you select to build +with Clang, GCC is used. + THE BUG REPORTS FOR EVERYTHING IF YOU'RE INTERESTED https://bugs.trinitydesktop.org/buglist.cgi?quicksearch=ALL diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index 12a5001..90ee1b6 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -28,43 +28,14 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -kipi-plugins: Kipi Plugins are additional functions for the TDE Images Management -kipi-plugins: Host Programs (digiKam, ksquirrel and gwenview). They can add -kipi-plugins: extra menus and shortcuts, and extend the host program features. -kipi-plugins: You can install as many or as few as you like, from within the host -kipi-plugins: programs. -kipi-plugins: -kipi-plugins: With language support for: -kipi-plugins: -kipi-plugins: en $(echo $langs) -kipi-plugins: -kipi-plugins: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd libraries cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true @@ -88,10 +59,11 @@ sed -i "s|SUBDIRS =.*$|SUBDIRS =$langdoc|" doc/Makefile.am mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -112,10 +84,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kipi-plugins: Kipi Plugins are additional functions for the TDE Images Management +kipi-plugins: Host Programs (digiKam, ksquirrel and gwenview). They can add +kipi-plugins: extra menus and shortcuts, and extend the host program features. +kipi-plugins: You can install as many or as few as you like, from within the host +kipi-plugins: programs. +kipi-plugins: +kipi-plugins: With language support for: +kipi-plugins: +kipi-plugins: en $(echo $langs) +kipi-plugins: +kipi-plugins: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index cb0f44e..978bbea 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -28,37 +28,9 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libksquirrel: ksquirrel-libs is a set of image codecs -libksquirrel: containing regular libraries for KSquirrel. -libksquirrel: -libksquirrel: -libksquirrel: -libksquirrel: -libksquirrel: -libksquirrel: -libksquirrel: -libksquirrel: -libksquirrel: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd libraries @@ -67,7 +39,6 @@ cd ${PRGNAM} # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -77,11 +48,11 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -89,7 +60,6 @@ CXXFLAGS="${SLKCFLAGS}" \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 cd - @@ -103,10 +73,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libksquirrel: ksquirrel-libs is a set of image codecs +libksquirrel: containing regular libraries for KSquirrel. +libksquirrel: +libksquirrel: +libksquirrel: +libksquirrel: +libksquirrel: +libksquirrel: +libksquirrel: +libksquirrel: +libksquirrel: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild index 1d58eb7..bfd1b7b 100755 --- a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild +++ b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild @@ -29,47 +29,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdelibkdcraw: tdeLibkdcraw (dcraw Library Wrapper) -tdelibkdcraw: -tdelibkdcraw: Libkdcraw is a C++ interface around dcraw binary program used to -tdelibkdcraw: decode RAW picture files. The library documentation is available -tdelibkdcraw: on header files. This library is used by kipi-plugins, digiKam -tdelibkdcraw: and other kipi host programs. -tdelibkdcraw: -tdelibkdcraw: With language support for: -tdelibkdcraw: -tdelibkdcraw: en $(echo $langs) -tdelibkdcraw: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd libraries cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -87,10 +57,11 @@ sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -111,10 +82,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdelibkdcraw: tdeLibkdcraw (dcraw Library Wrapper) +tdelibkdcraw: +tdelibkdcraw: Libkdcraw is a C++ interface around dcraw binary program used to +tdelibkdcraw: decode RAW picture files. The library documentation is available +tdelibkdcraw: on header files. This library is used by kipi-plugins, digiKam +tdelibkdcraw: and other kipi host programs. +tdelibkdcraw: +tdelibkdcraw: With language support for: +tdelibkdcraw: +tdelibkdcraw: en $(echo $langs) +tdelibkdcraw: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index 399d7d3..a2ba0cf 100755 --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -28,47 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdelibkexiv2: tdeLibkexiv2 (Exiv2 Library Wrapper) -tdelibkexiv2: -tdelibkexiv2: Libkexiv2 is a wrapper around Exiv2 library to manipulate picture -tdelibkexiv2: metadata. This library is used by kipi-plugins, digiKam and other -tdelibkexiv2: kipi host programs. The library documentation is available in the -tdelibkexiv2: kexiv2.h header file. -tdelibkexiv2: -tdelibkexiv2: Homepage: http://www.kipi-plugins.org/ -tdelibkexiv2: -tdelibkexiv2: -tdelibkexiv2: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd libraries cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -78,14 +48,14 @@ make -f admin/Makefile.common chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . - mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -106,10 +76,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdelibkexiv2: tdeLibkexiv2 (Exiv2 Library Wrapper) +tdelibkexiv2: +tdelibkexiv2: Libkexiv2 is a wrapper around Exiv2 library to manipulate picture +tdelibkexiv2: metadata. This library is used by kipi-plugins, digiKam and other +tdelibkexiv2: kipi host programs. The library documentation is available in the +tdelibkexiv2: kexiv2.h header file. +tdelibkexiv2: +tdelibkexiv2: Homepage: http://www.kipi-plugins.org/ +tdelibkexiv2: +tdelibkexiv2: +tdelibkexiv2: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index a13a559..1a6214d 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -29,47 +29,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} - -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdelibkipi: tdelibKipi (KDE Image Plugin Interface) for TDE -tdelibkipi: -tdelibkipi: Kipi is an effort to develop a common plugin structure for digiKam, -tdelibkipi: and other kipi host programs. Its aim is to share image plugins -tdelibkipi: among graphic applications. Kipi is based on the old digiKam plugins -tdelibkipi: implementation and is maintained by the digiKam team. -tdelibkipi: -tdelibkipi: With language support for: -tdelibkipi: -tdelibkipi: en $(echo $langs) -tdelibkipi: -" > $PKG/install/slack-desc -} - source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd libraries cd ${PRGNAM} - # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true - # update admin for installed version of libtool cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in @@ -87,10 +57,11 @@ sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am mkdir -p build-${PRGNAM} cd build-${PRGNAM} -# Configure the package LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ @@ -111,10 +82,34 @@ find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +tdelibkipi: tdelibKipi (KDE Image Plugin Interface) for TDE +tdelibkipi: +tdelibkipi: Kipi is an effort to develop a common plugin structure for digiKam, +tdelibkipi: and other kipi host programs. Its aim is to share image plugins +tdelibkipi: among graphic applications. Kipi is based on the old digiKam plugins +tdelibkipi: implementation and is maintained by the digiKam team. +tdelibkipi: +tdelibkipi: With language support for: +tdelibkipi: +tdelibkipi: en $(echo $langs) +tdelibkipi: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild index 385d797..4858284 100755 --- a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild @@ -28,23 +28,25 @@ VERSION=${VERSION:-1.3.21} BUILD=${BUILD:-1} TAG=${TAG:-} -DOCS="ChangeLog* Copyright* NEWS* README* TODO*" - SRCURL="http://downloads.sourceforge.net/graphicsmagick/${PRGNAM}-${VERSION}.tar.bz2" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -91,8 +93,33 @@ fi find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +GraphicsMagick: GraphicsMagick (The swiss army knife of image processing) +GraphicsMagick: +GraphicsMagick: GraphicsMagick is the swiss army knife of image processing. Comprised +GraphicsMagick: of 265K physical lines (according to David A. Wheeler's +GraphicsMagick: SLOCCount) of source code in the base package (or 1,220K including +GraphicsMagick: 3rd party libraries) it provides a robust and efficient collection of +GraphicsMagick: tools and libraries which support reading, writing, and manipulating +GraphicsMagick: an image in over 88 major formats including important formats like +GraphicsMagick: DPX, GIF, JPEG, JPEG-2000, PNG, PDF, PNM, and TIFF. +GraphicsMagick: +GraphicsMagick: Home: http://www.graphicsmagick.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Misc/GraphicsMagick/slack-desc b/Misc/GraphicsMagick/slack-desc deleted file mode 100755 index 90434e8..0000000 --- a/Misc/GraphicsMagick/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -GraphicsMagick: GraphicsMagick (The swiss army knife of image processing) -GraphicsMagick: -GraphicsMagick: GraphicsMagick is the swiss army knife of image processing. Comprised -GraphicsMagick: of 265K physical lines (according to David A. Wheeler's -GraphicsMagick: SLOCCount) of source code in the base package (or 1,220K including -GraphicsMagick: 3rd party libraries) it provides a robust and efficient collection of -GraphicsMagick: tools and libraries which support reading, writing, and manipulating -GraphicsMagick: an image in over 88 major formats including important formats like -GraphicsMagick: DPX, GIF, JPEG, JPEG-2000, PNG, PDF, PNM, and TIFF. -GraphicsMagick: -GraphicsMagick: Home: http://www.graphicsmagick.org/ diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index 08592f5..67fb46e 100644 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -30,48 +30,21 @@ VERSION=${VERSION:-2.38.0} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Graph Visualization) -$PRGNAM: -$PRGNAM: Graphviz is open source graph visualization software. -$PRGNAM: It has several main graph layout programs. It also has -$PRGNAM: web and interactive graphical interfaces, and auxiliary -$PRGNAM: tools, libraries, and language bindings. -$PRGNAM: -$PRGNAM: Homepage: http://graphviz.org/ -$PRGNAM: -$PRGNAM: -$PRGNAM: - -" > $PKG/install/slack-desc -} - SRCURL="http://graphviz.org/pub/graphviz/stable/SOURCES/$PRGNAM-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true +chown -R root:root . +chmod -R u+w,go+r-w,a+rX-st . + # set file permissions source $SRCDIR/patches && setperms # Install PHP bindings to proper location. @@ -82,6 +55,8 @@ source $SRCDIR/patches && patches CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -112,11 +87,36 @@ find $PKG/usr/doc -type f -exec chmod 644 {} \; find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM (Graph Visualization) +$PRGNAM: +$PRGNAM: Graphviz is open source graph visualization software. +$PRGNAM: It has several main graph layout programs. It also has +$PRGNAM: web and interactive graphical interfaces, and auxiliary +$PRGNAM: tools, libraries, and language bindings. +$PRGNAM: +$PRGNAM: Homepage: http://graphviz.org/ +$PRGNAM: +$PRGNAM: +$PRGNAM: + +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc source $SRCDIR/patches && doinstsh - cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} cd $OUTPUT diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index a9d7219..118642a 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -28,37 +28,10 @@ VERSION=${VERSION:-0.91} BUILD=${BUILD:-1} TAG=${TAG:-} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: Inkscape (Open Source vector graphics editor) -$PRGNAM: -$PRGNAM: Inkscape is an Open Source vector graphics editor, with capabilities -$PRGNAM: similar to Illustrator, Freehand, CorelDraw, or Xara X using the W3C -$PRGNAM: standard Scalable Vector Graphics (SVG) file format. -$PRGNAM: -$PRGNAM: Homepage: http://www.inkscape.org/ -$PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: en $(echo $langs) -$PRGNAM: -" > $PKG/install/slack-desc -} - SRCURL="https://media.inkscape.org/dl/resources/file/$PRGNAM-$VERSION.tar.bz2" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} @@ -77,27 +50,27 @@ for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang";done sed -i "s|PO_LINGUAS=.*$|PO_LINGUAS=$langs|" po/Makefile.in.in fi - chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . # only include README..txt for required languages RM_LIST="" for po in $I18N;do RM_LIST="$RM_LIST $(ls -1 README.$po.txt)";done || true # fails without true if no README.$po.txt + # list only files > zero bytes DOCS=$(for file in AUTHORS ChangeLog COPYING* INSTALL NEWS README $RM_LIST;do [[ -s $file ]] && ls -1 $file;done ) || true - LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure ${NLS:-} \ --prefix=/usr/local \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION - make $NUMJOBS || exit 1 make DESTDIR=$PKG install || exit 1 # remove all man pages .. @@ -108,21 +81,6 @@ make DESTDIR=$PKG install-man1 # .. and other languages when required for PO in $I18N; do [[ -s inkscape.$PO.1 ]] && make DESTDIR=$PKG install-man$(echo $PO|tr [:upper:] [:lower:] | tr -d "_")DATA;done - -# Add this to the doinst.sh: -mkdir -p $PKG/install -cat <> $PKG/install/doinst.sh -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database 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 -EOINS - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -138,7 +96,47 @@ fi find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: Inkscape (Open Source vector graphics editor) +$PRGNAM: +$PRGNAM: Inkscape is an Open Source vector graphics editor, with capabilities +$PRGNAM: similar to Illustrator, Freehand, CorelDraw, or Xara X using the W3C +$PRGNAM: standard Scalable Vector Graphics (SVG) file format. +$PRGNAM: +$PRGNAM: Homepage: http://www.inkscape.org/ +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $(echo $langs) +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install +cat <> $PKG/install/doinst.sh +# Update the desktop database: +if [ -x usr/bin/update-desktop-database ]; then + chroot . /usr/bin/update-desktop-database /usr/local/share//applications > /dev/null 2>&1 +fi + +# Update hicolor theme cache: +if [ -d usr/share/icons/hicolor ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + chroot . /usr/bin/gtk-update-icon-cache -f -t /usr/local/share/icons/hicolor 1> /dev/null 2> /dev/null + fi +fi + +EOINS + SlackDesc cd $PKG diff --git a/Misc/libmp4v2/libmp4v2.SlackBuild b/Misc/libmp4v2/libmp4v2.SlackBuild index 766a8ed..9bef387 100755 --- a/Misc/libmp4v2/libmp4v2.SlackBuild +++ b/Misc/libmp4v2/libmp4v2.SlackBuild @@ -29,23 +29,25 @@ VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-} -DOCS="COPYING README*" - SRCURL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -71,8 +73,33 @@ fi find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +libmp4v2: libmp4v2 (Create and modify mp4 files) +libmp4v2: +libmp4v2: The MP4v2 library provides an API to create and modify mp4 files as +libmp4v2: defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This file format +libmp4v2: is derived from Apple's QuickTime file format that has been +libmp4v2: used as a multimedia file format in a variety of platforms and +libmp4v2: applications. It is a very powerful and extensible format that can +libmp4v2: accommodate practically any type of media. +libmp4v2: +libmp4v2: +libmp4v2: Home: http://code.google.com/p/mp4v2/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Misc/libmp4v2/slack-desc b/Misc/libmp4v2/slack-desc deleted file mode 100755 index 1127f14..0000000 --- a/Misc/libmp4v2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libmp4v2: libmp4v2 (Create and modify mp4 files) -libmp4v2: -libmp4v2: The MP4v2 library provides an API to create and modify mp4 files as -libmp4v2: defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This file format -libmp4v2: is derived from Apple's QuickTime file format that has been -libmp4v2: used as a multimedia file format in a variety of platforms and -libmp4v2: applications. It is a very powerful and extensible format that can -libmp4v2: accommodate practically any type of media. -libmp4v2: -libmp4v2: -libmp4v2: Home: http://code.google.com/p/mp4v2/ diff --git a/Misc/lxml/lxml.SlackBuild b/Misc/lxml/lxml.SlackBuild index bc55078..d5bd464 100755 --- a/Misc/lxml/lxml.SlackBuild +++ b/Misc/lxml/lxml.SlackBuild @@ -32,47 +32,21 @@ VERSION=${VERSION:-3.5.0} BUILD=${BUILD:-1} TAG=${TAG:-} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: lxml (Python bindings for libxml2 and libxslt) -$PRGNAM: -$PRGNAM: Required for online help functions for Inkscape. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc -} - SRCURL="http://pypi.python.org/packages/source/l/$PRGNAM/$PRGNAM-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . # list only files > zero bytes DOCS=$(for file in *.txt PKG-INFO doc/licenses/* doc/FAQ.txt;do [[ -s $file ]] && ls -1 $file;done ) || true +chown -R root:root . +chmod -R u+w,go+r-w,a+rX-st . + python setup.py build --with-unicode-strings || exit 1 python setup.py install --skip-build --root=$PKG || exit 1 @@ -81,7 +55,6 @@ if $(python3 -c 'import os' 2>/dev/null); then python3 setup.py install --skip-build --root=$PKG || exit 1 fi - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -93,10 +66,34 @@ if [ -d $PKG/usr/man ]; then for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: lxml (Python bindings for libxml2 and libxslt) +$PRGNAM: +$PRGNAM: Required for online help functions for Inkscape. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild index 0be9b8d..fad9c16 100755 --- a/Misc/moodbar/moodbar.SlackBuild +++ b/Misc/moodbar/moodbar.SlackBuild @@ -46,6 +46,8 @@ chmod -R u+w,go+r-w,a+rX-st . LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/Misc/potrace/potrace.SlackBuild b/Misc/potrace/potrace.SlackBuild index bd00e94..d94acff 100755 --- a/Misc/potrace/potrace.SlackBuild +++ b/Misc/potrace/potrace.SlackBuild @@ -28,50 +28,26 @@ VERSION=${VERSION:-1.13} BUILD=${BUILD:-1} TAG=${TAG:-} -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: Potrace is a backend for Potracegui. -$PRGNAM: -$PRGNAM: Potrace is a tool for tracing a bitmap - transforming it into a smooth -$PRGNAM: scalable image. The input is a bitmap (PBM, PGM, PPM, or BMP), and -$PRGNAM: the default output is one of several vector file formats: EPS, -$PRGNAM: PostScript, PDF, SVG, DXF, GeoJSON, Gimppath, XFig, and PGM (for easy -$PRGNAM: antialiasing of pixel-based images). -$PRGNAM: -$PRGNAM: A separate program, mkbitmap, can act as a pre-processor for Potrace, -$PRGNAM: applying scaling and various filters to an image before converting it -$PRGNAM: to a bitmap. This is useful for potracing greyscale and color images. -" > $PKG/install/slack-desc -} - SRCURL="http://$PRGNAM.sourceforge.net/download/$VERSION/$PRGNAM-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . # list only files > zero bytes DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true +chown -R root:root . +chmod -R u+w,go+r-w,a+rX-st . + LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr/local \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -93,10 +69,34 @@ if [ -d $PKG/usr/man ]; then for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: Potrace is a backend for Potracegui. +$PRGNAM: +$PRGNAM: Potrace is a tool for tracing a bitmap - transforming it into a smooth +$PRGNAM: scalable image. The input is a bitmap (PBM, PGM, PPM, or BMP), and +$PRGNAM: the default output is one of several vector file formats: EPS, +$PRGNAM: PostScript, PDF, SVG, DXF, GeoJSON, Gimppath, XFig, and PGM (for easy +$PRGNAM: antialiasing of pixel-based images). +$PRGNAM: +$PRGNAM: A separate program, mkbitmap, can act as a pre-processor for Potrace, +$PRGNAM: applying scaling and various filters to an image before converting it +$PRGNAM: to a bitmap. This is useful for potracing greyscale and color images. +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/Misc/speex/slack-desc b/Misc/speex/slack-desc deleted file mode 100755 index 3d0cc4d..0000000 --- a/Misc/speex/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -speex: speex (patent-free audio compression format designed for speech) -speex: -speex: Speex is an Open Source/Free Software patent-free audio compression -speex: format designed for speech. The Speex Project aims to lower -speex: the barrier of entry for voice applications by providing a free -speex: alternative to expensive proprietary speech codecs. -speex: -speex: -speex: -speex: -speex: Home: http://www.speex.org/ diff --git a/Misc/speex/speex.SlackBuild b/Misc/speex/speex.SlackBuild index ce4568a..c06f59f 100755 --- a/Misc/speex/speex.SlackBuild +++ b/Misc/speex/speex.SlackBuild @@ -34,18 +34,18 @@ VERSION=${VERSION:-1.2rc2} BUILD=${BUILD:-1} TAG=${TAG:-} -DOCS="AUTHORS ChangeLog* COPYING NEWS README* TODO" - SRCURL="http://downloads.xiph.org/releases/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." tar -xf ${SOURCE} cd ${PRGNAM}-${VERSION} + +# list only files > zero bytes +DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -55,6 +55,8 @@ sed -i 's/\r//' README.TI-DSP LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +CC=${COMPILER} \ +CXX=${COMPILER_CXX} \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -84,8 +86,33 @@ sed -i "s|-L$PKG.*/lib${LIBDIRSUFFIX} ||" $PKG/usr/lib${LIBDIRSUFFIX}/libspeex.l find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +speex: speex (patent-free audio compression format designed for speech) +speex: +speex: Speex is an Open Source/Free Software patent-free audio compression +speex: format designed for speech. The Speex Project aims to lower +speex: the barrier of entry for voice applications by providing a free +speex: alternative to expensive proprietary speech codecs. +speex: +speex: +speex: +speex: +speex: Home: http://www.speex.org/ +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +SlackDesc cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} diff --git a/Misc/tidy-html5/tidy-html5.SlackBuild b/Misc/tidy-html5/tidy-html5.SlackBuild index 5783772..592e564 100755 --- a/Misc/tidy-html5/tidy-html5.SlackBuild +++ b/Misc/tidy-html5/tidy-html5.SlackBuild @@ -33,39 +33,12 @@ TAG=${TAG:-} # override download option in get-source.sh because there is no version # in the file name [[ ! -s ../../src/tidy-html5-master.zip ]] && wget -nv -T 20 -O ../../src/tidy-html5-master.zip https://github.com/htacg/tidy-html5/archive/master.zip || true -SlackDesc() -{ -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: Tidy corrects and cleans up HTML and XML documents by fixing markup -$PRGNAM: errors and upgrading legacy code to modern standards. -$PRGNAM: -$PRGNAM: Optional with Quanta+ -$PRGNAM: -$PRGNAM: -$PRGNAM: http://www.html-tidy.org -$PRGNAM: -$PRGNAM: For languages: -$PRGNAM: en $(echo ${langs:-}) -$PRGNAM: -" > $PKG/install/slack-desc -} - DOCS="README" ARCHIVE_TYPE="zip" source ../../get-source.sh cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." unzip ${SOURCE} cd ${PRGNAM}-${VERSION} @@ -82,6 +55,8 @@ done cd build/cmake cmake ../.. \ +-DCMAKE_C_COMPILER=${COMPILER} \ +-DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ -DSUPPORT_LOCALIZATIONS=${LOCALize:-"NO"} @@ -106,6 +81,31 @@ fi find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +SlackDesc() +{ +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + +$PRGNAM|-----handy-ruler------------------------------------------------------| +$PRGNAM: Tidy corrects and cleans up HTML and XML documents by fixing markup +$PRGNAM: errors and upgrading legacy code to modern standards. +$PRGNAM: +$PRGNAM: Optional with Quanta+ +$PRGNAM: +$PRGNAM: +$PRGNAM: http://www.html-tidy.org +$PRGNAM: +$PRGNAM: For languages: +$PRGNAM: en $(echo ${langs:-}) +$PRGNAM: +" > $PKG/install/slack-desc +} + mkdir -p $PKG/install SlackDesc diff --git a/src/tidy-html5-master.zip b/src/tidy-html5-master.zip new file mode 100644 index 0000000..12d7c57 Binary files /dev/null and b/src/tidy-html5-master.zip differ