From 11d781840ea25b8c1cbbc7acd9071e5a0b27ca29 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sat, 18 Feb 2017 10:07:28 +0000 Subject: [PATCH] Set up functions script - modified get-source.sh and replaced common code in SBs with a function call Added xmedcon to Misc build list Added -no-exceptions option to tqt3 build Added dbus-tqt slack-desc to dbus-tqt.SlackBuild Added selected language support to some SlackBuilds Moved some Misc optional packages in BUILD-TDE.sh next to the package that needs them --- Apps/abakus/abakus.SlackBuild | 47 ++---- Apps/digikam/digikam.SlackBuild | 50 ++----- Apps/dolphin/dolphin.SlackBuild | 49 ++---- Apps/filelight/filelight.SlackBuild | 49 ++---- Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild | 58 +++----- .../gtk3-tqt-engine.SlackBuild | 47 ++---- Apps/k9copy/k9copy.SlackBuild | 48 ++---- Apps/kaffeine/kaffeine.SlackBuild | 58 +++----- Apps/kbfx/kbfx.SlackBuild | 58 +++----- Apps/kbookreader/kbookreader.SlackBuild | 47 ++---- Apps/kile/kile.SlackBuild | 48 ++---- Apps/knemo/knemo.SlackBuild | 49 ++---- Apps/knights/knights.SlackBuild | 50 ++----- Apps/knmap/knmap.SlackBuild | 48 ++---- Apps/koffice-i18n/koffice-i18n.SlackBuild | 41 ++---- Apps/koffice/koffice.SlackBuild | 50 ++----- Apps/kscope/kscope.SlackBuild | 48 ++---- Apps/ksensors/ksensors.SlackBuild | 48 ++---- Apps/kshutdown/kshutdown.SlackBuild | 48 ++---- Apps/ksquirrel/ksquirrel.SlackBuild | 48 ++---- Apps/kvpnc/kvpnc.SlackBuild | 51 ++----- Apps/potracegui/potracegui.SlackBuild | 48 ++---- .../tde-style-lipstik.SlackBuild | 49 ++---- .../tde-style-qtcurve.SlackBuild | 47 ++---- Apps/tdeamarok/tdeamarok.SlackBuild | 48 ++---- .../tdegwenview-i18n.SlackBuild | 51 ++----- Apps/tdegwenview/tdegwenview.SlackBuild | 49 ++---- Apps/tdeio-locate/tdeio-locate.SlackBuild | 47 ++---- Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild | 49 ++---- Apps/tdek3b/tdek3b.SlackBuild | 48 ++---- Apps/tdesudo/tdesudo.SlackBuild | 48 ++---- .../twin-style-crystal.SlackBuild | 49 ++---- BUILD-TDE.sh | 22 +-- Core/tde-i18n/tde-i18n.SlackBuild | 30 ++-- Core/tdeaddons/tdeaddons.SlackBuild | 46 ++---- Core/tdeartwork/tdeartwork.SlackBuild | 47 ++---- Core/tdebase/tdebase.SlackBuild | 46 ++---- Core/tdegames/tdegames.SlackBuild | 47 ++---- Core/tdegraphics/tdegraphics.SlackBuild | 46 ++---- Core/tdelibs/tdelibs.SlackBuild | 46 ++---- Core/tdemultimedia/tdemultimedia.SlackBuild | 55 ++----- Core/tdenetwork/tdenetwork.SlackBuild | 46 ++---- Core/tdepim/tdepim.SlackBuild | 46 ++---- Core/tdesdk/tdesdk.SlackBuild | 55 ++----- Core/tdetoys/tdetoys.SlackBuild | 46 ++---- Core/tdeutils/tdeutils.SlackBuild | 46 ++---- Core/tdevelop/tdevelop.SlackBuild | 46 ++---- Core/tdewebdev/tdewebdev.SlackBuild | 48 ++---- Deps/arts/arts.SlackBuild | 46 ++---- Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild | 46 ++---- Deps/dbus-tqt/dbus-tqt.SlackBuild | 67 ++++----- Deps/dbus-tqt/slack-desc | 19 --- Deps/libart_lgpl/libart_lgpl.SlackBuild | 48 ++---- Deps/libcaldav/libcaldav.SlackBuild | 44 ++---- Deps/libcarddav/libcarddav.SlackBuild | 44 ++---- Deps/tqca-tls/tqca-tls.SlackBuild | 40 ++--- Deps/tqt3/tqt3.SlackBuild | 46 ++---- Deps/tqtinterface/tqtinterface.SlackBuild | 46 ++---- Libs/kipi-plugins/kipi-plugins.SlackBuild | 49 ++---- Libs/libksquirrel/libksquirrel.SlackBuild | 46 ++---- Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild | 50 ++----- Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild | 50 ++----- Libs/tdelibkipi/tdelibkipi.SlackBuild | 50 ++----- Misc/GraphicsMagick/GraphicsMagick.SlackBuild | 50 ++----- Misc/graphviz/graphviz.SlackBuild | 58 +++----- Misc/inkscape/inkscape.SlackBuild | 53 ++----- Misc/libmp4v2/libmp4v2.SlackBuild | 51 ++----- Misc/lxml/lxml.SlackBuild | 44 ++---- Misc/moodbar/moodbar.SlackBuild | 49 ++---- Misc/potrace/potrace.SlackBuild | 50 ++----- Misc/speex/speex.SlackBuild | 56 +++---- Misc/tidy-html5/tidy-html5.SlackBuild | 42 ++---- Misc/xmedcon/xmedcon.SlackBuild | 139 ++++++++++++++++++ get-source.sh | 106 +++++++++++++ ltoolupdate.sh | 31 ---- 75 files changed, 1159 insertions(+), 2552 deletions(-) delete mode 100755 Deps/dbus-tqt/slack-desc create mode 100755 Misc/xmedcon/xmedcon.SlackBuild delete mode 100644 ltoolupdate.sh diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 0235b9e..ef83dde 100644 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -29,12 +29,9 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn ## add check for mpfr installed to set HAVE_MPFR, otherwise even if it is installed, abakus won't be built with mpfr sed -i 's|HAVE_INOTIFY )|HAVE_INOTIFY )\ncheck_include_file( mpfr.h HAVE_MPFR )|' ConfigureChecks.cmake @@ -43,14 +40,11 @@ sed -i 's|HAVE_INOTIFY )|HAVE_INOTIFY )\ncheck_include_file( mpfr.h HAVE_MPFR )| ## As libgmp is linked through libmpfr, do we really need libgmp here? sed -i 's|mpfr gmp|mpfr -lgmp|' src/CMakeLists.txt -# 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 +listdocs_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -61,21 +55,14 @@ cd build-${PRGNAM} -DBUILD_DOC="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -98,18 +85,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 6ffd284..be196f8 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -48,38 +44,32 @@ langdocdk="digikam";for Lang in $langs;do [[ -d doc/$Lang"_digikam" ]] && langdo langdocsf="showfoto";for Lang in $langs;do [[ -d doc/$Lang"_showfoto" ]] && langdocsf=$(echo $Lang"_showfoto" $langdocsf);done sed -i "s|SUBDIRS =.*$|SUBDIRS =. $langdocdk $langdocsf|" doc/Makefile.am -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn + +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,10 +91,7 @@ digikam: digikam: digikam: " > $PKG/install/slack-desc -} -mkdir -p $PKG/install -SlackDesc # If building with additional language support, showfoto doesn't run using the language selected # because showfoto.mo files are not being built. This is added into the build at this packaging @@ -117,14 +104,5 @@ do ln -s digikam.mo showfoto.mo) done fi -cd $PKG - -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +makepkg_fn -# Restore the original umask: -umask ${_UMASK_} - diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 74a891e..2af1160 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -29,17 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn -# 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 +listdocs_fn ## Patches to edit/create CMakeLists.txt for documentation and locales support @@ -95,11 +89,9 @@ done langs=$(echo $langs | sed 's|.po||g') -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -112,21 +104,14 @@ cd build-${PRGNAM} -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -148,9 +133,7 @@ $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 @@ -166,7 +149,6 @@ fi EOINS -SlackDesc # Replace the desktop file, with an alternate one. This one changes the # icon name from d3lphin to dolphin. To allow easy system-wide icon @@ -177,13 +159,4 @@ SlackDesc #$PKG/${INSTALL_TDE}/share/applications/tde/d3lphine.desktop.orig #cp -v $SRCDIR/d3lphin.desktop $PKG/${INSTALL_TDE}/share/applications/tde/d3lphin.desktop -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild index 8759350..4e62fb6 100644 --- a/Apps/filelight/filelight.SlackBuild +++ b/Apps/filelight/filelight.SlackBuild @@ -29,17 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn -# 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 +listdocs_fn # set support for additional language(s) as per I18N variable @@ -61,11 +55,9 @@ 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 . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -78,21 +70,14 @@ cd build-${PRGNAM} -DBUILD_TRANSLATIONS="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -114,18 +99,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 6546af6..1997f97 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -28,23 +28,22 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS ChangeLog* COPYING NEWS README* TODO" - source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +# 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/gtkqtengine.po ]] && langs="$langs $Lang";done +[[ $langs == "" ]] && sed -i "/ADD_SUBDIRECTORY(po)/d" CMakeLists.txt \ +|| (cd po ; for po_dir in $(ls -1 ?? |grep :|cut -d: -f1) ; do [[ $langs != *$po_dir* ]] && rm -rf $po_dir ; done) -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +chown_fn + +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -59,21 +58,14 @@ cd build-${PRGNAM} -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -89,16 +81,14 @@ 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: With language support for: +gtk-qt-engine: en $langs 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 <> $PKG/install/doinst.sh # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then @@ -107,15 +97,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild index ca704a5..131ddbd 100755 --- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild +++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild @@ -29,50 +29,41 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=${INSTALL_TDE} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn # can't figure out why installation of theme engines is to usr/lib and not usr/lib$LIBDIRSUFFIX # where in the source/build is this set up? 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 -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -94,9 +85,7 @@ $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 @@ -105,15 +94,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index b58ac09..407f349 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -45,13 +41,11 @@ 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') -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -66,20 +60,14 @@ CXX="g++" \ --enable-closure \ --enable-k3bdevices - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,18 +89,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index 1f92e19..bade98f 100644 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -29,22 +29,23 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done +sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am +langs=$(echo $langs | sed "s|.po||g") -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn # Refusing to compile with Clang LDFLAGS="${SLKLDFLAGS}" \ @@ -60,21 +61,14 @@ CXX="g++" \ --enable-closure \ --build=$ARCH-slackware-linux - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -90,15 +84,13 @@ $PRGNAM: Media Player for TDE $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: With language support for: $PRGNAM: +$PRGNAM: en $langs $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 @@ -114,17 +106,5 @@ fi EOINS -mkdir -p $PKG/install -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index 5dc62a7..48e1c84 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -29,21 +29,23 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +cd doc;listdocs_fn;cd ../ -# 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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done +(cd po;for file in $(ls -1 *.po) ; do [[ $langs != *$file* ]] && rm -rf $file ; done) || true +langs=$(echo $langs | sed "s|.po||g") +## prevent build error if no additional languages are required +[[ $langs != "" ]] && TRANS=ON -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -55,23 +57,17 @@ cd build-${PRGNAM} -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -86,16 +82,14 @@ $PRGNAM: $PRGNAM: KBFX is an alternative to the classical K-Menu button and it's menu $PRGNAM: $PRGNAM: -$PRGNAM: +$PRGNAM: With language support for: $PRGNAM: -$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: if [ -x usr/bin/update-desktop-database ]; then @@ -111,15 +105,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index f37fbeb..bb9de16 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -29,46 +29,36 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +cd_builddir_fn LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ - --docdir=${INSTALL_TDE}/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -91,9 +81,7 @@ 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 @@ -114,14 +102,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 0a7ab4b..5f1a831 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -29,28 +29,22 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # 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 translations/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -64,20 +58,14 @@ CXX="g++" \ --disable-rpath \ --enable-closure - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -99,18 +87,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index 52eea8a..198ba0b 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -29,12 +29,9 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn # rename knemo icons to avoid conflict with those in tdeartwork rename network_ knemo_network_ src/knemod/pics/*png @@ -48,16 +45,13 @@ sed -i 's|Default Gateway" ), LINK_QUALITY|Default Gateway" ), GATEWAY|' src/kne langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -# 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 +listdocs_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -71,21 +65,14 @@ CXX="g++" \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -107,18 +94,6 @@ 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 -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index ffda210..2606485 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # 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, @@ -54,38 +50,32 @@ 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 -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn + +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -107,18 +97,6 @@ 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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index b3c4fe9..4691da7 100644 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -29,23 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -55,20 +49,14 @@ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -90,18 +78,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild index be3f66e..e57c8c0 100755 --- a/Apps/koffice-i18n/koffice-i18n.SlackBuild +++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild @@ -24,17 +24,15 @@ # SUCH DAMAGE. PRGNAM=koffice-i18n +[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -54,32 +52,28 @@ cd $dir make -f admin/Makefile.common -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn + +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=${INSTALL_TDE} - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn cd ../ done langs=$(echo $langdir | sed 's|koffice-i18n-||g') -cd - -mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -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 {} \; +installdocs_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,18 +95,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc -} -mkdir -p $PKG/install -SlackDesc ARCH="noarch" -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index f3926c8..0212fec 100644 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -29,22 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn # Refusing to compile with Clang =[ LDFLAGS="${SLKLDFLAGS} $($(which Magick++-config) --libs)" \ @@ -60,21 +55,14 @@ CXX="g++" \ --enable-closure \ --build=$ARCH-slackware-linux - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,9 +84,7 @@ $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 @@ -114,17 +100,5 @@ fi EOINS -mkdir -p $PKG/install -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 90cddc1..71fc7b8 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -45,13 +41,11 @@ 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') -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -61,20 +55,14 @@ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,18 +84,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index 86ac94f..c3753c9 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -45,13 +41,11 @@ 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') -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -61,20 +55,14 @@ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,18 +84,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 16ae0b1..3664b15 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -29,24 +29,18 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -60,20 +54,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " $PRGNAM: $PRGNAM (shut down utility for TDE) $PRGNAM: @@ -88,18 +76,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index 29458ca..6da1e9a 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # add English help documentation tar xf $SRCDIR/ksquirrel-en-docs.tar.xz @@ -53,10 +49,11 @@ langs=$(echo $langs | sed 's|.po||g') # if Russian is not required, only package English docs [[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn + +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +#cd_builddir_fn - don't use LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -71,21 +68,14 @@ CXX=${COMPILER_CXX} \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -107,18 +97,6 @@ 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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 45cadfd..17a8526 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -29,16 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn mkdir tmpdocs for file in $(ls -1 doc | grep -v Makefile) do @@ -56,13 +51,11 @@ 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 -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -73,22 +66,14 @@ CXX=${COMPILER_CXX} \ --prefix=${INSTALL_TDE} \ --build=$ARCH-slackware-linux - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -rm $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION/*{debian,gentoo}* -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -110,18 +95,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index 70512d3..8eaa59c 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -29,25 +29,19 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn patch -p0 < $SRCDIR/reformat-message.patch -# 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 +listdocs_fn -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -61,20 +55,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,18 +84,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index 1a7e018..e9b3bc9 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -29,23 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -59,21 +53,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " tde-style-lipstik: tde-style-lipstik (lipstik style for tde) tde-style-lipstik: @@ -87,18 +74,6 @@ tde-style-lipstik: tde-style-lipstik: tde-style-lipstik: " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 105fe59..ea925e8 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -29,21 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -57,21 +51,14 @@ cd build-${PRGNAM} -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -94,18 +81,6 @@ tde-style-qtcurve: tde-style-qtcurve: Home: https://www.trinitydesktop.org/index.php " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild index 707f164..6497642 100755 --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -30,12 +30,9 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn ## speex patches to cmake: ## [1] new speex/CMakeLists.txt using aac/CMakeLists.txt as a template @@ -53,8 +50,7 @@ sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \ # See if xine-lib package from Slackware is installed. (Need this to play music so hopefully it is.) [[ $(grep -E "xine.h" /var/log/packages/*) ]] && XINE="ON" -# 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 +listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -75,11 +71,9 @@ 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 . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -107,21 +101,14 @@ cd build-${PRGNAM} -DBUILD_TRANSLATIONS="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -143,9 +130,7 @@ $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 @@ -161,15 +146,6 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" | grep -v handy > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index 6364a8e..f0aed79 100755 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -25,17 +25,15 @@ PKGNAM=tdegwenview-i18n PRGNAM=gwenview-i18n +[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd applications -cd ${PRGNAM} +untar_fn # Add missing files for Spanish TDE handbook docs if [[ $I18N == *es* ]] @@ -52,21 +50,18 @@ cp de/doc/index.docbook es/doc/index.docbook sed -i -e 's|German|Spanish|' -e 's|Das Handbuch zu Gwenview|Manual del usuario Gwenview|' -e 's|Deutsche Übersetzung|Traducción Española|' -e 's|ist ein Bildbetrachter für &kde;|es un visor de imágenes para TDE|' -e '85s|Bild|imagen|' -e '87s|Betrachter|visionador|' -e 's|Künstler|artista|' -e 's|Photo|foto|' -e '93s|Bild|dibujo|' -e 's|Tipps|Consejos|' -e 's|Thomas||' -e 's|Reitelbach||' -e 's|tr@erdfunkstelle.de||' es/doc/index.docbook 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 +listdocs_fn # 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 sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" Makefile.am -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -80,21 +75,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -116,19 +104,8 @@ tdegwenview-i18n: tdegwenview-i18n: tdegwenview-i18n: " > $PKG/install/slack-desc -} -mkdir -p $PKG/install -SlackDesc ARCH="noarch" -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Apps/tdegwenview/tdegwenview.SlackBuild b/Apps/tdegwenview/tdegwenview.SlackBuild index c7ad988..30f9363 100755 --- a/Apps/tdegwenview/tdegwenview.SlackBuild +++ b/Apps/tdegwenview/tdegwenview.SlackBuild @@ -30,22 +30,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -59,21 +54,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -95,18 +83,7 @@ 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 -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index aec6a53..6b47d7a 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -29,21 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -57,21 +51,14 @@ cd build-${PRGNAM} -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -94,18 +81,6 @@ tdeio-locate: tdeio-locate: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -} - -mkdir -p $PKG/install -SlackDesc -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild index 2105f36..afffa20 100755 --- a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild +++ b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild @@ -25,23 +25,19 @@ PKGNAM=tdek3b-i18n PRGNAM=k3b-i18n +[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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 . +chown_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -51,8 +47,7 @@ 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} +cd_builddir_fn cmake \ -DCMAKE_C_COMPILER=${COMPILER} \ @@ -60,21 +55,14 @@ cd build-${PRGNAM} -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,19 +84,8 @@ tdek3b-i18n: tdek3b-i18n: tdek3b-i18n: " > $PKG/install/slack-desc -} -mkdir -p $PKG/install -SlackDesc ARCH="noarch" -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt - -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild index 16937e1..015e21d 100755 --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -30,21 +30,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -75,21 +69,14 @@ cd build-${PRGNAM} -DBUILD_DOC="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -111,18 +98,7 @@ $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 -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" | grep -v handy > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index 97fa6fd..478c233 100644 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -29,15 +29,11 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -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 +listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -45,13 +41,11 @@ 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') -source $SRCDIR/../../ltoolupdate.sh +ltoolupdate_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -61,20 +55,14 @@ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} - make ${NUMJOBS:-} || exit 1 - make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION -find $PKG${INSTALL_TDE}/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,18 +84,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index d84f063..5b6c848 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -29,23 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd applications -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -59,21 +53,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -95,18 +82,6 @@ twin-style-crystal: twin-style-crystal: twin-style-crystal: " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 8763de8..3ad185f 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -176,7 +176,7 @@ dialog --nocancel --no-shadow --colors --help-button --help-label "README" --tit 2> $TMPVARS/I18N && break [[ $EXITVAL == 2 ]] && dialog --defaultno --yes-label "Ascii" --no-label "Continue" --no-shadow --colors --no-collapse --yesno \ "\n -If you can see the two 'y' like letters, then you've probably got +If you can see the two 'y' like characters, then you've probably got \na suitable terminal font installed and can choose \Zr\Z4\ZbContinue\Zn, \notherwise choose \Z1A\Zb\Z0scii\Zn. \n\n @@ -326,19 +326,22 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Core/tdevelop" "TDE development programs" off "\Zb\Z6 Requires tdesdk \Zn" \ "Core/tdetoys" "TDE Amusements" off "\Zb\Z6 \Zn" \ "Core/tdewebdev" "Quanta Plus and other applications" off "\Zb\Z6 \Zn" \ -" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Requires l/speexdsp \Zn" \ -"Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional dependency - speex \Zn" \ +" Misc/tidy-html5" "Corrects and cleans up HTML and XML documents" off "\Zb\Z6 Runtime option for Quanta+ [tdewebdev] \Zn" \ +" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for tdenetwork and amarok. Requires l/speexdsp \Zn" \ +"Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency - speex \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Libs/tdelibkdcraw" "Decode RAW picture files" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \ "Libs/tdelibkexiv2" "Library to manipulate picture metadata" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Needs l/exiv2... \Zn" \ "Libs/tdelibkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \ "Libs/kipi-plugins" "Additional functions for digiKam, ksquirrel and gwenview" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Requires tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ -"Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel \Zn" \ +" Misc/xmedcon" "A medical image conversion utility & library" off "\Zb\Z6 Buildtime option for libksquirrel \Zn" \ +"Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel. Buildtime options include l/netpbm, t/transfig [fig2dev], Misc/xmedcon \Zn" \ "Apps/abakus" "PC calculator" off "\Zb\Z6 optional dependency l/mpfr which requires l/gmp \Zn" \ -" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6 \Zn" \ +" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \ "Apps/tdeamarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, libmp4v2, speex, moodbar \Zn" \ +" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \ "Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ -"Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 \Zn" \ +"Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild. \Zn" \ "Apps/filelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \ "Apps/gtk-qt-engine" "A GTK+2 theme engine" off "\Zb\Z6 \Zn" \ "Apps/gtk3-tqt-engine" "A GTK+3 theme engine" off "\Zb\Z6 \Zn" \ @@ -356,6 +359,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/koffice-i18n" "Internationalization files for koffice" off "\Zb\Z6 Required for koffice when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Apps/ksensors" "A graphical interface for sensors" off "\Zb\Z6 Runtime requirement ap/lm_sensors \Zn" \ "Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \ +" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. pdf/html docs not built by default \Zn" \ "Apps/kshutdown" "Shutdown utility for TDE" off "\Zb\Z6 \Zn" \ "Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi libksquirrel. \Zn" \ "Apps/kvpnc" "TDE frontend for various vpn clients" off "\Zb\Z6 Miscellaneous documentation will be in $(cat $TMPVARS/INSTALL_TDE)/doc/kvpnc-$(cat $TMPVARS/TDEVERSION) \Zn" \ @@ -369,11 +373,8 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/tdesudo" "Graphical frontend for the sudo command" off "\Zb\Z6 \Zn" \ "Apps/twin-style-crystal" "twin theme" off "\Zb\Z6 \Zn" \ " Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6 \Zn" \ -" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Optional for kscope. pdf/html docs not built by default \Zn" \ -" Misc/tidy-html5" "Corrects and cleans up HTML and XML documents" off "\Zb\Z6 Optional for Quanta+ [tdewebdev] \Zn" \ " Misc/inkscape" "SVG editor" off "\Zb\Z6 Requires lxml if online help facility is required. \Zn" \ " Misc/lxml" "Python bindings for libxml2 and libxslt" off "\Zb\Z6 Required to use Inkscape online help \Zn" \ -" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Optional for Amarok \Zn" \ 2> $TMPVARS/TDEbuilds # successful builds are removed from the TDEbuilds list by '$dir ' so add a space to the last entry # and the " needs to be removed because the Misc entries are double-quoted @@ -461,7 +462,8 @@ do { [[ $dir == Deps* ]] && export TDEMIR_SUBDIR="/dependencies"; } \ || { [[ $dir == Core* ]] && export TDEMIR_SUBDIR=""; } \ || { [[ $dir == Libs* ]] && export TDEMIR_SUBDIR="/libraries"; } \ -|| { [[ $dir == Apps* ]] && export TDEMIR_SUBDIR="/applications"; } +|| { [[ $dir == Apps* ]] && export TDEMIR_SUBDIR="/applications"; } \ +|| { [[ $dir == *Misc* ]] && export TDEMIR_SUBDIR="misc"; } # used for untar_fn - leading slash deliberately omitted # Get the package name package=$(echo $dir | cut -f2- -d /) diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 3aa5ed1..de37cca 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -24,10 +24,12 @@ # SUCH DAMAGE. PRGNAM=tde-i18n +[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} source ../../get-source.sh +getsource_fn ## the source unpacked is ~950MB, so to save on build space ## extract, build, and remove source for each language package one at a time @@ -49,8 +51,7 @@ tar -xf ${SOURCE} ${PRGNAM}/${PRGNAM}-$lang cd ${PRGNAM} -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn mkdir -p ${PRGNAM}-$lang/build cd ${PRGNAM}-$lang/build @@ -67,9 +68,7 @@ cd ${PRGNAM}-$lang/build -DBUILD_ALL="ON" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn mkdir -p $PKG/${INSTALL_TDE}/doc/${PRGNAM}-$VERSION #cp -a $DOCS $PKG${INSTALL_TDE}/doc/${PRGNAM}-$VERSION || true @@ -77,11 +76,14 @@ cat $SRCDIR/$(basename $0) > $PKG${INSTALL_TDE}/doc/${PRGNAM}-$VERSION/${PRGNAM} 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() -{ +mkdir_install_fn + +# 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) +[[ "$lang" == "pt" ]] && Lang="Portuguese" +[[ "$lang" == "fy" ]] && Lang="Frisian" + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -103,16 +105,7 @@ ${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) -[[ "$lang" == "pt" ]] && Lang="Portuguese" -[[ "$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 @@ -133,7 +126,6 @@ cd $PKG makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${lang}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz} cd $OUTPUT md5sum ${PRGNAM}-${lang}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz} > ${PRGNAM}-${lang}-${VERSION}-${ARCH}-${BUILD}.${PKGTYPE:-txz}.md5 -cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${lang}-${VERSION}-${ARCH}-${BUILD}.txt # Restore the original umask: diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index 77fdf19..9384926 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -29,23 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -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 +untar_fn +listdocs_fn # patch for TDE bug 2043 patch -p0 < $SRCDIR/arkplugin-diffs-1 -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -65,21 +59,14 @@ cd build-${PRGNAM} -DBUILD_KADDRESSBOOK_PLUGINS="OFF" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,9 +88,7 @@ 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 @@ -124,14 +109,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index 3e20b84..9c36a18 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -29,20 +29,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -60,21 +54,14 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,9 +83,7 @@ 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 @@ -119,15 +104,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 9a7342d..76f86c0 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -31,20 +31,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -82,18 +76,11 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn # Add xinitrc: mkdir -p $PKG/etc/X11/xinit @@ -124,8 +111,8 @@ 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() -{ +mkdir_install_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -147,19 +134,8 @@ tdebase: tdebase: tdebase: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -} -mkdir -p $PKG/install 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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index e2b0c8d..92b4282 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -29,20 +29,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -101,21 +95,14 @@ do : # need something here to prevent exit 1 done - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -137,18 +124,6 @@ tdegames: tdegames: tdegames: " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index bed296c..c3c22f8 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -29,22 +29,16 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -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 . +chown_fn # If imlib is installed, include Kuickshow: [[ $(ls /var/log/packages/imlib-*) ]] && KUICKSHOW=ON -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -70,21 +64,14 @@ cd build-${PRGNAM} -DBUILD_KOOKA="OFF" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -106,9 +93,7 @@ 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 @@ -124,14 +109,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index b0677da..c04ff7a 100644 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -29,22 +29,16 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -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 . +chown_fn patch -p1 < $SRCDIR/patches/build-with-clang.patch -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -76,21 +70,14 @@ cd build-${PRGNAM} -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -112,9 +99,7 @@ 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 @@ -135,14 +120,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index 05601f8..3d027a3 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -36,23 +36,17 @@ NUMJOBS=$NUMJOBS USECMAKE="no" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -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 . +chown_fn if [ ! "${USECMAKE:-}" == "no" ] then # Ummm...so this just builds kmix....? lmao -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -67,14 +61,9 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ .. else -# 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 - -make -f admin/Makefile.common +ltoolupdate_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn # change hard-coded tqt headers directory: [[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|${INSTALL_TDE}/include/tqt|g" ../configure @@ -92,21 +81,14 @@ CXX=${COMPILER_CXX} \ --enable-closure fi - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -128,9 +110,7 @@ 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 @@ -146,14 +126,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 131c58f..bfdc151 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -29,23 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd ${PRGNAM} - +untar_fn # If speex is installed, include it in the build for jingle [[ $(grep speex.h /var/log/packages/*speex*) ]] 2>/dev/null && SPX="ON" -# 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 +listdocs_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn ## If changing any of these options, READ CMakeLists.txt for info on interdependencies .. cmake \ @@ -112,21 +106,14 @@ cd build-${PRGNAM} -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -148,9 +135,7 @@ $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 @@ -171,14 +156,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index 2988802..bf5f900 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -29,14 +29,10 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -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 +untar_fn +listdocs_fn # If libcaldav is installed, include it in the build for korganizer [[ $(ls /var/log/packages/libcaldav*) ]] 2>/dev/null && LCALDAV="ON" @@ -44,11 +40,9 @@ DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E # 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 . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -68,21 +62,14 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -104,9 +91,7 @@ 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 @@ -127,14 +112,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index 72d545e..1de52b3 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -29,20 +29,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -60,26 +54,16 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - 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 {} \; - -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 +make_fn + +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mangzip_fn + +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,9 +85,7 @@ 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 @@ -124,14 +106,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index a4d3cfc..80e0b9e 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -29,20 +29,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -58,21 +52,14 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -94,9 +81,7 @@ 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 @@ -112,14 +97,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 1352cbd..aabc12b 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -29,20 +29,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -62,21 +56,14 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -98,9 +85,7 @@ 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 @@ -121,14 +106,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index 9a01d6f..d275d47 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -29,20 +29,14 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +chown_fn -# 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 . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -L$TQTDIR/lib" \ @@ -61,21 +55,14 @@ cd build-${PRGNAM} -DBUILD_ALL="ON" \ -Wno-dev \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -97,9 +84,7 @@ tdevelop: tdevelop: tdevelop: 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 @@ -120,14 +105,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index 15fdfc2..f7f043e 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -29,47 +29,37 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM} +ltoolupdate_fn -# 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_fn -source $SRCDIR/../../ltoolupdate.sh - -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=${INSTALL_TDE} \ --sysconfdir="/etc/trinity" \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -91,9 +81,7 @@ 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 @@ -109,15 +97,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index c409092..c7ac4bb 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -29,21 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -58,21 +52,14 @@ cd build-${PRGNAM} -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DCMAKE_SKIP_RPATH="OFF" \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -94,17 +81,6 @@ arts: arts: arts: Home: https://www.trinitydesktop.org/index.php " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index 4716280..5e362ab 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -29,21 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -56,21 +50,14 @@ cd build-${PRGNAM} -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -92,17 +79,6 @@ dbus-1-tqt: dbus-1-tqt: dbus-1-tqt: Home: https://www.trinitydesktop.org/index.php " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index 706fd8a..7defcc5 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -28,23 +28,17 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -DOCS="AUTHORS COPYING NEWS README*" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -echo " -Extracting the source from the ${PRGNAM} archive ..." -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -57,33 +51,36 @@ cd build-${PRGNAM} -DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +mangzip_fn -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 +strip_fn -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_install_fn -mkdir -p $PKG/install -cat $SRCDIR/slack-desc > $PKG/install/slack-desc +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 ':'. -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt + |-----handy-ruler------------------------------------------------------| +dbus-tqt: dbus-tqt (simple IPC library) +dbus-tqt: +dbus-tqt: A core concept of the D-BUS implementation is that +dbus-tqt: 'libdbus' is intended to be a low-level API, similar to +dbus-tqt: Xlib. Most programmers are intended to use the bindings to GLib, +dbus-tqt: Qt, Python, Mono, Java, or whatever. These bindings have varying +dbus-tqt: levels of completeness. +dbus-tqt: +dbus-tqt: +dbus-tqt: +dbus-tqt: Home: https://www.trinitydesktop.org/index.php +" > $PKG/install/slack-desc -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Deps/dbus-tqt/slack-desc b/Deps/dbus-tqt/slack-desc deleted file mode 100755 index 443ab83..0000000 --- a/Deps/dbus-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-tqt: dbus-tqt (simple IPC library) -dbus-tqt: -dbus-tqt: A core concept of the D-BUS implementation is that -dbus-tqt: "libdbus" is intended to be a low-level API, similar to -dbus-tqt: Xlib. Most programmers are intended to use the bindings to GLib, -dbus-tqt: Qt, Python, Mono, Java, or whatever. These bindings have varying -dbus-tqt: levels of completeness. -dbus-tqt: -dbus-tqt: -dbus-tqt: -dbus-tqt: Home: https://www.trinitydesktop.org/index.php diff --git a/Deps/libart_lgpl/libart_lgpl.SlackBuild b/Deps/libart_lgpl/libart_lgpl.SlackBuild index 9f089b6..a59a38c 100755 --- a/Deps/libart_lgpl/libart_lgpl.SlackBuild +++ b/Deps/libart_lgpl/libart_lgpl.SlackBuild @@ -27,48 +27,38 @@ PRGNAM=libart-lgpl VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -PKGNAME=libart_lgpl +PKGNAM=libart_lgpl source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +cd_builddir_fn LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --docdir=/usr/doc/$PKGNAME-$VERSION \ --disable-static \ --build=$ARCH-slackware-linux \ -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn -mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION -cp -a $DOCS $PKG/usr/doc/$PKGNAME-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild -chown -R root:root $PKG/usr/doc/$PKGNAME-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -90,17 +80,7 @@ libart_lgpl: libart_lgpl: libart_lgpl: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -} - -mkdir -p $PKG/install -SlackDesc -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PKGNAME}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PKGNAME}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAME}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAME}" > $OUTPUT/${PKGNAME}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 81d1e6f..4f271af 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -29,18 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -bsdtar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# list only files > zero bytes -DOCS=$(for file in AUTHORS* rfc4791.pdf ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +#cd_builddir_fn - don't use LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -55,21 +52,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -91,18 +81,6 @@ libcaldav: libcaldav: en $(echo $langs) libcaldav: " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index dec63bf..a009bcb 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -29,18 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -bsdtar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# list only files > zero bytes -DOCS=$(for file in AUTHORS* rfc4791.pdf ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* NEWS* README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +#cd_builddir_fn - don't use LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -55,21 +52,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -91,18 +81,6 @@ $PRGNAM: $PRGNAM: en $(echo $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index 1599008..e63eb4b 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -29,18 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +#cd_builddir_fn # This configure script doesn't accept crap for arguments see ./configure --help to verify [[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|${INSTALL_TDE}/include/tqt|g" configure || true @@ -52,22 +49,18 @@ CXX=${COMPILER_CXX} \ ./configure \ --qtdir=$TQTDIR-${VERSION} + make $NUMJOBS || exit 1 mkdir -p $PKG$TQTDIR-${VERSION}/plugins/crypto/ install -m 0755 libtqca-tls.so $PKG$TQTDIR-${VERSION}/plugins/crypto/ -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 {} \; +installdocs_fn + +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -89,17 +82,6 @@ tqca-tls: tqca-tls: tqca-tls: Home: https://www.trinitydesktop.org/index.php " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild index 4bf91ba..565ba00 100755 --- a/Deps/tqt3/tqt3.SlackBuild +++ b/Deps/tqt3/tqt3.SlackBuild @@ -32,23 +32,21 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# 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_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +#cd_builddir_fn +[[ $COMPILER_CXX == "g++" ]] && NO_EXCEP="-no-exceptions " echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ - ./configure \ + ./configure ${NO_EXCEP:-}\ -prefix $TQTDIR-${VERSION} \ -release \ -verbose \ @@ -95,11 +93,7 @@ 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 {} \; +installdocs_fn mkdir -p $PKG/etc/profile.d # JD: adapt these to the correct value of LIBDIRSUFFIX @@ -108,11 +102,7 @@ sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/${PRGNAM}.sh > $PKG/etc/profile.d 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 -) +strip_fn # Put a ton of links to more "normal" places. mkdir -p $PKG${INSTALL_TDE}/bin @@ -134,8 +124,8 @@ mkdir -p $PKG${INSTALL_TDE}/include # Symlink all of it: ( cd $PKG${INSTALL_TDE}/lib${LIBDIRSUFFIX} ; ln -sf ${PRGNAM}-${VERSION} ${PRGNAM}) -SlackDesc() -{ +mkdir_install_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -157,10 +147,8 @@ 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 ]] && \ cat <> $PKG/install/doinst.sh # Add TQt library directories to /etc/ld.so.conf: @@ -202,7 +190,6 @@ 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 @@ -218,14 +205,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild index 745466b..04d4194 100755 --- a/Deps/tqtinterface/tqtinterface.SlackBuild +++ b/Deps/tqtinterface/tqtinterface.SlackBuild @@ -29,24 +29,18 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd dependencies -cd ${PRGNAM} +listdocs_fn -# 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 . +chown_fn # Until the cmake migration is fully completed, tqtinterface should be # built to install with a $PREFIX of /usr rather than ${INSTALL_TDE}, # even if you are installing everything else to ${INSTALL_TDE}. -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -63,21 +57,14 @@ cd build-${PRGNAM} -DQT_BINARY_DIR=$TQTDIR/bin \ -DQT_VERSION=3 \ .. - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -99,17 +86,6 @@ tqtinterface: tqtinterface: tqtinterface: Home: https://www.trinitydesktop.org/index.php " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index 53aaab6..351d477 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -29,20 +29,15 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd libraries -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh - -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package @@ -52,8 +47,7 @@ sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am langdoc="kipi-plugins";for Lang in $I18N;do [[ -d doc/$Lang"_kipi-plugins" ]] && langdoc=$(echo $Lang"_kipi-plugins" $langdoc);done sed -i "s|SUBDIRS =.*$|SUBDIRS =$langdoc|" doc/Makefile.am -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -67,21 +61,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -103,18 +90,6 @@ 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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index 73e3651..ce00ee3 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -29,20 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd libraries -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +#cd_builddir_fn - don't use LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -56,21 +53,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn -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 {} \; +installdocs_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -92,18 +82,6 @@ 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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +makepkg_fn diff --git a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild index d5aa5c7..dc53050 100755 --- a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild +++ b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild @@ -30,28 +30,22 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd libraries -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh - -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn # 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 po/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -65,21 +59,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,18 +88,7 @@ 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 -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index 90943f4..a02ac3d 100755 --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -29,23 +29,17 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd libraries -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh +chown_fn -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . - -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -59,21 +53,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -95,18 +82,7 @@ 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 -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index 9e54f44..aa0e37b 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -30,28 +30,22 @@ BUILD=${BUILD:-1} TAG=${TAG:-_tde} source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd libraries -cd ${PRGNAM} +listdocs_fn -# 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 +ltoolupdate_fn -source $SRCDIR/../../ltoolupdate.sh - -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn # 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 po/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am -mkdir -p build-${PRGNAM} -cd build-${PRGNAM} +cd_builddir_fn LDFLAGS="${SLKLDFLAGS}" \ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ @@ -65,21 +59,14 @@ CXX=${COMPILER_CXX} \ --disable-rpath \ --enable-closure - make $NUMJOBS || exit 1 - make DESTDIR=$PKG install || exit 1 -cd - +make_fn + +installdocs_fn -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 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -101,18 +88,7 @@ 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 -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} - +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild index 4858284..7d31b44 100755 --- a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild @@ -30,30 +30,26 @@ TAG=${TAG:-} SRCURL="http://downloads.sourceforge.net/graphicsmagick/${PRGNAM}-${VERSION}.tar.bz2" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM}-${VERSION} +chown_fn -# 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 . +cd_builddir_fn LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-shared \ --disable-static \ --disable-openmp \ @@ -76,25 +72,16 @@ CXX=${COMPILER_CXX} \ # programs running in parallel (competing for resources) is a complex topic and some research and experimentation may # be required in order to find the best parameters. -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +mangzip_fn -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 +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -116,17 +103,6 @@ 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 -SlackDesc -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index 67fb46e..0f3357e 100644 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -33,24 +33,22 @@ TAG=${TAG:-_tde} SRCURL="http://graphviz.org/pub/graphviz/stable/SOURCES/$PRGNAM-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM}-${VERSION} +chown_fn -# 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 . +#cd_builddir_fn +source $SRCDIR/patches # set file permissions -source $SRCDIR/patches && setperms +setperms # Install PHP bindings to proper location. -source $SRCDIR/patches && phpbindings +phpbindings # Fix for php-5.4 and patches from Arch (thanks!) -source $SRCDIR/patches && patches +patches CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -68,27 +66,22 @@ make install-strip DESTDIR=$PKG || exit 1 ## The primary purpose of this build is for 'dot' for kscope. ## If you want the pdf and html documentation, then comment out this line: -source $SRCDIR/patches && rmdoc +rmdoc # Install config file for PHP. -source $SRCDIR/patches && graphvizini +graphvizini # gzip man pages -source $SRCDIR/patches && gzipman +gzipman # Remove empty directories of language bindings that are absent. -source $SRCDIR/patches && emptydirs +emptydirs # Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz ... -source $SRCDIR/patches && dummy +dummy + +installdocs_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -111,18 +104,7 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt +doinstsh -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index 118642a..dc3a981 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -30,12 +30,9 @@ TAG=${TAG:-} SRCURL="https://media.inkscape.org/dl/resources/file/$PRGNAM-$VERSION.tar.bz2" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} - -cd ${PRGNAM}-${VERSION} - +untar_fn langs="" # don't package non-english man pages in man/man.1 - add them during make install for required languages sed -i -e '556,559d' -e '550,554d' -e '533,537d' Makefile.in @@ -50,15 +47,18 @@ 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 . +chown_fn # 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 +# only include keys..html for required languages +KEYS_LIST="doc/keys.css doc/keys.en.html" +for po in $I18N;do KEYS_LIST="$KEYS_LIST $(ls -1 doc/keys.$po.html)";done || true + +listdocs_fn -# 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 +#cd_builddir_fn - don't use LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ @@ -69,10 +69,8 @@ CXX=${COMPILER_CXX} \ --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 +make_fn # remove all man pages .. rm -rf $PKG/usr/man # .. and re-install those required @@ -81,23 +79,15 @@ 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 -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +installdocs_fn + +mangzip_fn -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 +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -119,9 +109,7 @@ $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 @@ -137,14 +125,5 @@ fi EOINS -SlackDesc - -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/libmp4v2/libmp4v2.SlackBuild b/Misc/libmp4v2/libmp4v2.SlackBuild index 9bef387..d42098d 100755 --- a/Misc/libmp4v2/libmp4v2.SlackBuild +++ b/Misc/libmp4v2/libmp4v2.SlackBuild @@ -31,50 +31,37 @@ TAG=${TAG:-} SRCURL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM}-${VERSION} +chown_fn -# 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 . +cd_builddir_fn LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --build=$ARCH-slackware-linux \ -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +mangzip_fn -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 +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,17 +83,7 @@ libmp4v2: libmp4v2: libmp4v2: Home: http://code.google.com/p/mp4v2/ " > $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 -md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +PRGNAM=$PKGNAM +makepkg_fn diff --git a/Misc/lxml/lxml.SlackBuild b/Misc/lxml/lxml.SlackBuild index d5bd464..dcd1def 100755 --- a/Misc/lxml/lxml.SlackBuild +++ b/Misc/lxml/lxml.SlackBuild @@ -35,17 +35,14 @@ TAG=${TAG:-} SRCURL="http://pypi.python.org/packages/source/l/$PRGNAM/$PRGNAM-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM}-${VERSION} +chown_fn -# 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 . +#cd_builddir_fn python setup.py build --with-unicode-strings || exit 1 python setup.py install --skip-build --root=$PKG || exit 1 @@ -55,22 +52,14 @@ 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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +installdocs_fn -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 +mangzip_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -92,17 +81,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild index fad9c16..8b170b7 100755 --- a/Misc/moodbar/moodbar.SlackBuild +++ b/Misc/moodbar/moodbar.SlackBuild @@ -31,49 +31,37 @@ TAG=${TAG:-} SRCURL="http://pkgs.fedoraproject.org/repo/pkgs/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz/28c8eb65e83b30f71b84be4fab949360/${PRGNAM}-${VERSION}.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM}-${VERSION} +chown_fn -# 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 . +cd_builddir_fn LDFLAGS="$SLKLDFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --disable-static \ --build=$ARCH-slackware-linux \ -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +mangzip_fn -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 +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -96,17 +84,6 @@ $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/potrace/potrace.SlackBuild b/Misc/potrace/potrace.SlackBuild index d94acff..4ecc415 100755 --- a/Misc/potrace/potrace.SlackBuild +++ b/Misc/potrace/potrace.SlackBuild @@ -31,49 +31,36 @@ TAG=${TAG:-} SRCURL="http://$PRGNAM.sourceforge.net/download/$VERSION/$PRGNAM-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn +listdocs_fn -cd ${PRGNAM}-${VERSION} +chown_fn -# 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 . +cd_builddir_fn LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=/usr/local \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-libpotrace \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn + +installdocs_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +mangzip_fn -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 +strip_fn -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_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -95,17 +82,6 @@ $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 -cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} -cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/speex/speex.SlackBuild b/Misc/speex/speex.SlackBuild index c06f59f..81e4f2e 100755 --- a/Misc/speex/speex.SlackBuild +++ b/Misc/speex/speex.SlackBuild @@ -37,57 +37,48 @@ TAG=${TAG:-} SRCURL="http://downloads.xiph.org/releases/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh +getsource_fn -cd $TMP/tmp-$PRGNAM -tar -xf ${SOURCE} +untar_fn -cd ${PRGNAM}-${VERSION} +# Thanks to SBo: +sed -i s/r// README.TI-DSP -# 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 . +listdocs_fn + +chown_fn + +cd_builddir_fn -# Thanks to SBo: -sed -i 's/\r//' README.TI-DSP LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ -./configure \ +../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-static=no \ --enable-binaries \ --build=$ARCH-slackware-linux -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +installdocs_fn -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 +mangzip_fn # Fix libspeex.la Thanks SBo script: sed -i "s|-L$PKG.*/lib${LIBDIRSUFFIX} ||" $PKG/usr/lib${LIBDIRSUFFIX}/libspeex.la -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() -{ +strip_fn + +mkdir_install_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -109,17 +100,6 @@ speex: speex: speex: Home: http://www.speex.org/ " > $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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/tidy-html5/tidy-html5.SlackBuild b/Misc/tidy-html5/tidy-html5.SlackBuild index 8edcfe2..a74d25a 100755 --- a/Misc/tidy-html5/tidy-html5.SlackBuild +++ b/Misc/tidy-html5/tidy-html5.SlackBuild @@ -33,10 +33,10 @@ 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 -DOCS="README" ARCHIVE_TYPE="zip" source ../../get-source.sh +getsource_fn cd $TMP/tmp-$PRGNAM unzip ${SOURCE} @@ -44,6 +44,8 @@ unzip ${SOURCE} cd ${PRGNAM}-${VERSION} VERSION=$(head -n 1 version.txt) +listdocs_fn + # don't build in other locales if tidy doesn't support those set as additional languages I18N=$(echo $I18N | tr '[:upper:]' '[:lower:]') for lang in $I18N @@ -52,6 +54,7 @@ do done [[ ${langs:-} != "" ]] && langs=$langs" + other locales" + cd build/cmake cmake ../.. \ @@ -67,28 +70,18 @@ cmake ../.. \ -DTIDY_COMPAT_HEADERS="OFF" \ -DSUPPORT_LOCALIZATIONS=${LOCALize:-"OFF"} -chown -R root:root . -chmod -R u+w,go+r-w,a+rX-st . +chown_fn -make $NUMJOBS || exit 1 -make DESTDIR=$PKG install || exit 1 +make_fn -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 -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; +installdocs_fn -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 +mangzip_fn -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +strip_fn + +mkdir_install_fn -SlackDesc() -{ echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -110,17 +103,6 @@ $PRGNAM: For languages: $PRGNAM: en $(echo ${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 -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 -cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt -# Restore the original umask: -umask ${_UMASK_} +makepkg_fn diff --git a/Misc/xmedcon/xmedcon.SlackBuild b/Misc/xmedcon/xmedcon.SlackBuild new file mode 100755 index 0000000..33caeed --- /dev/null +++ b/Misc/xmedcon/xmedcon.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/sh +# +# Slackware build script for (X)MedCon +# +# Copyright 2016 Marek Srejma (sam_web@yahoo.de) +# Copyright 2015-2017 tde-slackbuilds project on GitHub - modified SBo script +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +PRGNAM=xmedcon +VERSION=${VERSION:-0.14.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_tde} + +SRCURL="https://sourceforge.net/projects/xmedcon/files/XMedCon-Source/$VERSION/$PRGNAM-$VERSION.tar.bz2/download" + +source ../../get-source.sh +getsource_fn + +untar_fn + +listdocs_fn + +chown_fn + +#cd_builddir_fn + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +make_fn + +installdocs_fn + +mangzip_fn + +strip_fn + +mkdir_install_fn + +mv $PKG/usr/etc $PKG/ +mv $PKG/etc/xmedconrc $PKG/etc/xmedconrc.new + +mkdir -p $PKG/usr/share/pixmaps +cp -a $DOCDIR/etc/xmedcon.png $PKG/usr/share/pixmaps + +mkdir -p $PKG/usr/share/applications +echo "[Desktop Entry] +Encoding=UTF-8 +Type=Application +Name=(X)MedCon +GenericName=Medical Image Conversion +Comment=Medical Image Conversion +Exec=xmedcon +Icon=xmedcon.png +Categories=Graphics;Utility;" > $PKG/usr/share/applications/xmedcon.desktop + + +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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xmedcon: xmedcon (X) +xmedcon: +xmedcon: a medical image conversion utility & library; hereby hoping to lower +xmedcon: at least one barrier in medical research projects. +xmedcon: +xmedcon: +xmedcon: http://xmedcon.sourceforge.net/ +xmedcon: +xmedcon: +xmedcon: +xmedcon:" > $PKG/install/slack-desc + +echo $'config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there is no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +config etc/xmedconrc.new + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi' > $PKG/install/doinst.sh + +makepkg_fn diff --git a/get-source.sh b/get-source.sh index ffffaf6..054030a 100755 --- a/get-source.sh +++ b/get-source.sh @@ -1,4 +1,28 @@ #!/bin/sh +# Copyright 2015-2017 tde-slackbuilds project on GitHub +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +getsource_fn () +{ +#!/bin/sh # Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST # Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands # Copyright 2015-2017 Thorn Inurcide USA @@ -128,4 +152,86 @@ if [ "$P1" == "--download" ]; then echo "Download complete." exit 0 fi +} + +untar_fn () +{ +cd $TMP/tmp-$PRGNAM +tar -xf ${SOURCE} +[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) && cd ${PRGNAM} || cd ${PRGNAM}-${VERSION} +} + +listdocs_fn () +{ +DOCDIR=$PWD # this is set for installdocs_fn +DOCS=$(for file in AUTHORS* rfc4791.pdf ChangeLog* COPYING* CreatingThemes FAQ* HOWTO INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README{$,^[\.*\.txt],/}* ${RM_LIST:-} ${KEYS_LIST:-} TODO* *.lsm ^[README]*.txt PKG-INFO doc/licenses/* doc/FAQ.txt REMARKS ; do [[ -s $file ]] && ls -1 $file;done ) || true +} + +chown_fn () +{ +chown -R root:root . +chmod -R u+w,go+r-w,a+rX-st . +} + +ltoolupdate_fn () +{ +cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ +cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in +cp /$(grep -h missing /var/log/packages/libtool*) admin/ + +make -f admin/Makefile.common +} + +cd_builddir_fn () +{ +mkdir -p build-${PRGNAM} +cd build-${PRGNAM} +} + +make_fn () +{ +make ${NUMJOBS:-} || exit 1 +make DESTDIR=$PKG install || exit 1 +} + +installdocs_fn () +{ +[[ $TDEMIR_SUBDIR == misc || $PRGNAM == libart-lgpl ]] && INSTALL_TDE=/usr +mkdir -p $PKG${INSTALL_TDE}/doc/$PRGNAM-$VERSION +(cd $DOCDIR;cp -a --parents ${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 {} \; +} + +mangzip_fn () +{ +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 +} + +strip_fn () +{ +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_install_fn () +{ +mkdir -p $PKG/install +} + +makepkg_fn () +{ +cd $PKG +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +cd $OUTPUT +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +cat $PKG/install/slack-desc | grep "^${PRGNAM}" | grep -v handy > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt + +# Restore the original umask: +umask ${_UMASK_} +} diff --git a/ltoolupdate.sh b/ltoolupdate.sh deleted file mode 100644 index 861fc79..0000000 --- a/ltoolupdate.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Copyright 2017 tde-slackbuilds project on GitHub -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -# Update admin for installed version of libtool - -# BEGIN -cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ -cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in -cp /$(grep -h missing /var/log/packages/libtool*) admin/ - -make -f admin/Makefile.common -# END