From 4cec16280bdc7abdafcaf02712543c7a5f321089 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Mon, 13 Jan 2020 11:42:11 +0000 Subject: [PATCH] Updates Removed redundant patches - digikam, dolphin, k9copy, kaffeine, koffice, soundkonverter, tdmtheme, tdeaddons, tdebase, tdegraphics, tdenetwork, tdepim, tdeutils, inkscape Converted to cmake - tde-style-lipstik Added locale selection in SlackBuilds - abakus, kdbg, piklab, rosegarden, tdeio-locate Updated locale selection in SlackBuilds - amarok, dolphin, filelight, gwenview-i18n, gtk-qt-engine, k3b-i18n, kbookreader, knetstats, krusader, libkipi Patched tdeedu for Kig python scripting support Patched tdegraphics for cgit build Updated some Misc build source URLs Added some error checking to tidy-html5 for source archive Moved database update routine from SlackBuilds to a get-source.sh function General SlackBuild standardisation and tidying --- Apps/abakus/abakus.SlackBuild | 35 ++- Apps/digikam/digikam.SlackBuild | 93 +++--- Apps/dolphin/d3lphin.desktop | 64 ----- Apps/dolphin/dolphin.SlackBuild | 113 ++------ Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild | 69 +++-- .../gtk3-tqt-engine.SlackBuild | 28 +- Apps/k9copy/k9copy.SlackBuild | 26 +- Apps/kaffeine/kaffeine.SlackBuild | 50 +--- Apps/kbfx/kbfx.SlackBuild | 47 ++-- Apps/kbookreader/kbookreader.SlackBuild | 54 +--- Apps/kdbg/kdbg.SlackBuild | 56 ++-- .../kdbusnotification.SlackBuild | 25 +- Apps/kile/kile.SlackBuild | 23 +- Apps/kkbswitch/kkbswitch.SlackBuild | 20 +- Apps/knemo/knemo.SlackBuild | 26 +- Apps/knetstats/knetstats.SlackBuild | 30 +- Apps/knights/knights.SlackBuild | 24 +- Apps/knmap/knmap.SlackBuild | 8 +- Apps/koffice-i18n/koffice-i18n.SlackBuild | 21 +- Apps/koffice/koffice.SlackBuild | 58 +--- Apps/krusader/krusader.SlackBuild | 26 +- Apps/kscope/kscope.SlackBuild | 24 +- Apps/ksensors/ksensors.SlackBuild | 10 +- Apps/kshutdown/kshutdown.SlackBuild | 13 +- Apps/ksquirrel/ksquirrel.SlackBuild | 30 +- Apps/kvkbd/kvkbd.SlackBuild | 22 +- Apps/kvpnc/kvpnc.SlackBuild | 9 +- Apps/piklab/piklab.SlackBuild | 55 ++-- Apps/potracegui/potracegui.SlackBuild | 14 +- Apps/rosegarden/rosegarden.SlackBuild | 78 ++++-- Apps/soundkonverter/soundkonverter.SlackBuild | 50 +--- .../tde-style-lipstik.SlackBuild | 58 ++-- .../tde-style-qtcurve.SlackBuild | 50 ++-- Apps/tdeamarok/tdeamarok.SlackBuild | 102 +++---- Apps/tdefilelight/tdefilelight.SlackBuild | 58 ++-- .../tdegwenview-i18n.SlackBuild | 41 +-- Apps/tdegwenview/tdegwenview.SlackBuild | 44 ++- Apps/tdeio-locate/tdeio-locate.SlackBuild | 57 ++-- Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild | 45 ++- Apps/tdek3b/tdek3b.SlackBuild | 35 ++- Apps/tdektorrent/tdektorrent.SlackBuild | 40 +-- Apps/tdesudo/tdesudo.SlackBuild | 10 +- Apps/tdmtheme/tdmtheme.SlackBuild | 40 +-- .../twin-style-crystal.SlackBuild | 19 +- Apps/yakuake/yakuake.SlackBuild | 44 ++- BUILD-TDE.sh | 34 ++- Core/tde-i18n/tde-i18n.SlackBuild | 33 ++- .../tdeaccessibility.SlackBuild | 52 ++-- Core/tdeaddons/tdeaddons.SlackBuild | 120 ++------ Core/tdeadmin/tdeadmin.SlackBuild | 58 ++-- Core/tdeartwork/tdeartwork.SlackBuild | 72 +++-- Core/tdebase/doinst.sh | 6 +- Core/tdebase/tdebase.SlackBuild | 131 ++++++--- Core/tdeedu/README | 26 +- Core/tdeedu/tdeedu.SlackBuild | 91 +++--- Core/tdegames/tdegames.SlackBuild | 59 ++-- Core/tdegraphics/tdegraphics.SlackBuild | 264 +++++------------- Core/tdelibs/tdelibs.SlackBuild | 83 +++--- Core/tdemultimedia/tdemultimedia.SlackBuild | 52 ++-- Core/tdenetwork/tdenetwork.SlackBuild | 48 ++-- Core/tdepim/tdepim.SlackBuild | 136 +++++---- Core/tdesdk/tdesdk.SlackBuild | 90 +++--- Core/tdetoys/tdetoys.SlackBuild | 70 ++--- Core/tdeutils/tdeutils.SlackBuild | 159 ++++------- Core/tdevelop/tdevelop.SlackBuild | 86 +++--- Core/tdewebdev/tdewebdev.SlackBuild | 50 ++-- Deps/akode/akode.SlackBuild | 8 +- Deps/arts/arts.SlackBuild | 19 +- Deps/avahi-tqt/avahi-tqt.SlackBuild | 8 +- Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild | 24 +- Deps/dbus-tqt/dbus-tqt.SlackBuild | 22 +- Deps/libart-lgpl/libart-lgpl.SlackBuild | 9 +- Deps/libcaldav/libcaldav.SlackBuild | 31 +- Deps/libcarddav/libcarddav.SlackBuild | 30 +- Deps/tqca-tls/tqca-tls.SlackBuild | 5 +- Deps/tqt3/tqt3.SlackBuild | 58 ++-- Deps/tqtinterface/tqtinterface.SlackBuild | 28 +- Libs/kipi-plugins/kipi-plugins.SlackBuild | 71 +++-- Libs/libksquirrel/libksquirrel.SlackBuild | 19 +- Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild | 33 ++- Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild | 10 +- Libs/tdelibkipi/tdelibkipi.SlackBuild | 13 +- Misc/GraphicsMagick/GraphicsMagick.SlackBuild | 41 +-- Misc/graphviz/README | 4 +- Misc/graphviz/graphviz.SlackBuild | 118 ++++++-- Misc/graphviz/patches | 126 --------- Misc/imlib/imlib.SlackBuild | 8 +- Misc/inkscape/inkscape.SlackBuild | 114 ++------ Misc/libmp4v2/libmp4v2.SlackBuild | 23 +- Misc/libpng/libpng.SlackBuild | 5 +- Misc/lxml/lxml.SlackBuild | 7 +- Misc/moodbar/moodbar.SlackBuild | 28 +- Misc/potrace/README | 2 +- Misc/potrace/potrace.SlackBuild | 13 +- Misc/speex/speex.SlackBuild | 17 +- Misc/tidy-html5/tidy-html5.SlackBuild | 17 +- Misc/xmedcon/xmedcon.SlackBuild | 57 ++-- Misc/yauap/yauap.SlackBuild | 25 +- get-source.sh | 16 ++ src/README | 2 +- src/cgit/README | 2 +- src/cgit/tdei18n/README | 2 +- 102 files changed, 1991 insertions(+), 2588 deletions(-) delete mode 100644 Apps/dolphin/d3lphin.desktop delete mode 100644 Misc/graphviz/patches diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index ef83dde..0372987 100644 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -42,17 +42,25 @@ sed -i 's|mpfr gmp|mpfr -lgmp|' src/CMakeLists.txt 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 po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") +[[ $langs != "" ]] && TRANS=ON + chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ \ .. make_fn @@ -70,21 +78,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM is a calculator designed with computer usability in mind. -$PRGNAM: Instead of using your powerful computer to put a limited simulation -$PRGNAM: of a calculator on-screen, $PRGNAM instead allows you to use your -$PRGNAM: computer to its greater potential. -$PRGNAM: + |-----handy-ruler------------------------------------------------------| +$PRGNAM: abakus is an improvement in the limited simulation of a calculator. $PRGNAM: Can be built and used with mpfr. $PRGNAM: Customizable precision up to 75 digits. $PRGNAM: $PRGNAM: Copy/paste or type in and evaluate complex expressions. Exponentiation $PRGNAM: is right-associative, for example: (2^3)^2*e^4/pi 2^3^2*e^4/pi -$PRGNAM: [The answers given by $PRGNAM: 1112.26437907 8898.11503252] - +$PRGNAM: [The answers given by abakus: 1112.26437907 8898.11503252] +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 4108e80..9dfd383 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -33,34 +33,6 @@ getsource_fn untar_fn -[[ $TDEVERSION == R14.0.4 ]] && { -## fix for gcc7: -##In file included from ../../../../../digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp:35:0: -##/usr/include/stdlib.h:751:12: error: expected unqualified-id before ‘int’ -## extern int abs (int __x) __THROW __attribute__ ((__const__)) __wur; -## ^ -echo '--- digikam/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h -+++ digikam/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h -@@ -157 +156,0 @@ --#define abs(x) ((x) >= 0 ? (x) : -(x)) ---- digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp -+++ digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp -@@ -32,0 +33,5 @@ -+// C++ includes. -+#include -+#include -+using ::abs; -+ -@@ -38,4 +42,0 @@ -- --// C++ includes. -- --#include ' | while read line -do -patch -p0 -done -} - listdocs_fn # set support for additional language(s) as per I18N variable @@ -68,7 +40,8 @@ listdocs_fn langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS =.*$|SUBDIRS =.$langs|" po/Makefile.am # only package help documents where they exist for the languages being included -langdocdk="digikam";for Lang in $langs;do [[ -d doc/$Lang"_digikam" ]] && langdocdk=$(echo $Lang"_digikam" $langdocdk);done +ldocs="" # for slack-desc +langdocdk="digikam";for Lang in $langs;do [[ -d doc/$Lang"_digikam" ]] && langdocdk=$(echo $Lang"_digikam" $langdocdk) && ldocs="$ldocs $Lang";done 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 @@ -78,15 +51,15 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -98,6 +71,18 @@ strip_fn mkdir_install_fn +# 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 +# stage as a work-around to provide the translations for showfoto .. +if [ -d $PKG$INSTALL_TDE/share/locale ] +then +for DIR in $PKG$INSTALL_TDE/share/locale/*/LC_MESSAGES/ +do +(cd $DIR +ln -s digikam.mo showfoto.mo) +done +fi + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -105,32 +90,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -digikam: Digikam is a digital photo management application for the TDE desktop. -digikam: -digikam: Showfoto is a photo viewer and editor. -digikam: -digikam: With language support for: -digikam: -digikam: en $(echo $langs) -digikam: -digikam: -digikam: -digikam: +$PRGNAM: Digikam is a digital photo management application for the TDE desktop. +$PRGNAM: +$PRGNAM: Showfoto is a photo viewer and editor. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en$langs +$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: en$ldocs +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - -# 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 -# stage as a work-around to provide the translations for showfoto .. -if [ -d $PKG${INSTALL_TDE}/share/locale ] -then -for DIR in $PKG${INSTALL_TDE}/share/locale/*/LC_MESSAGES/ -do -(cd $DIR -ln -s digikam.mo showfoto.mo) -done -fi makepkg_fn - diff --git a/Apps/dolphin/d3lphin.desktop b/Apps/dolphin/d3lphin.desktop deleted file mode 100644 index 86d28f7..0000000 --- a/Apps/dolphin/d3lphin.desktop +++ /dev/null @@ -1,64 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Dolphin -Name[pa]=ਡਾਲਫਿਨ -Name[sr]=Делфин -Name[sr@latin]=Делфин -Name[uk]=Дельфін -Name[ar]=الدولفين -Name[lv]= Dolphin -Name[ne]=डल्फिन -Name[pa]=ਡਾਲਫਿਨ -Exec=d3lphin %i -caption "%c" "%u" -Icon=dolphin -Type=Application -X-DocPath=d3lphin/index.html -Categories=Qt;TDE;System;FileManager; -GenericName=File Manager -GenericName[ar]=مدير الملفات -GenericName[be]=Кіраўнік файлаў -GenericName[bg]=Файлов браузър -GenericName[ca]=Gestor de fitxers -GenericName[cs]=Správce souborů -GenericName[csb]=Menadżer lopków -GenericName[de]=Dateimanager -GenericName[el]=Διαχειριστής αρχείων -GenericName[eo]=Dosieradministrilo -GenericName[es]=Gestor de ficheros -GenericName[et]=Failihaldur -GenericName[eu]=Fitxategi kudeatzailea -GenericName[fa]=مدیر پرونده -GenericName[ga]=Bainisteoir Comhad -GenericName[he]=מנהל קבצים -GenericName[hu]=Fájlkezelő -GenericName[it]=Gestione file -GenericName[ja]=ファイルマネージャ -GenericName[kk]=Файл менеджері -GenericName[km]=កម្មវិធី​គ្រប់គ្រង​ឯកសារ -GenericName[ko]=파일 관리자 -GenericName[lv]=Failu pārvaldnieks -GenericName[nb]=Filbehandler -GenericName[nds]=Dateipleger -GenericName[ne]=फाइल प्रबन्धक -GenericName[nl]=Bestandsbeheerder -GenericName[nn]=Filhandsamar -GenericName[oc]=Gestionari de fichièrs -GenericName[pa]=ਫਾਇਲ ਮੈਨੇਜਰ -GenericName[pl]=Menedżer plików -GenericName[pt]=Gestor de Ficheiros -GenericName[pt_BR]=Gerenciador de Arquivos -GenericName[ru]=Файловый менеджер -GenericName[sl]=Upravitelj datotek -GenericName[sr]=Менаџер фајлова -GenericName[sr@latin]=Menadžer fajlova -GenericName[sv]=Filhanterare -GenericName[tg]=Мудири файл -GenericName[th]=เครื่องมือจัดการแฟ้ม -GenericName[uk]=Менеджер файлів -GenericName[vi]=Bộ quản lý tập tin -GenericName[wa]=Manaedjeu di fitchîs -GenericName[x-test]=xxFile Managerxx -GenericName[zh_CN]=文件管理器 -GenericName[zh_TW]=檔案管理程式 -Terminal=false -MimeType=inode/directory; diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 721a3ca..e70f32e 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -35,72 +35,30 @@ untar_fn listdocs_fn -[[ $TDEVERSION == R14.0.[45] ]] && { -## Patches to edit/create CMakeLists.txt for documentation and locales support -sed -i 's|src )|src )\nadd_subdirectory( po )\nadd_subdirectory( doc )|' CMakeLists.txt - -## for doc - based on amarok CMakeLists.txt: -echo "tde_auto_add_subdirectories() -" > doc/CMakeLists.txt -echo "tde_create_handbook( LANG en DESTINATION d3lphin ) -" > doc/en/CMakeLists.txt -## for po - based on tde-style-qtcurve CMakeLists.txt: -echo 'exec_program(tde-config - ARGS --install locale --expandvars - OUTPUT_VARIABLE TDE_LOCALE_PREFIX) - -find_program(GETTEXT_MSGFMT_EXECUTABLE msgfmt) - -if(NOT GETTEXT_MSGFMT_EXECUTABLE) - message("------\n" - "NOTE: msgfmt not found. Translations will *not* be installed\n" - "------\n") -else(NOT GETTEXT_MSGFMT_EXECUTABLE) - set(catalogname d3lphin) - add_custom_target(translations ALL) - file(GLOB PO_FILES *.po) - foreach(_poFile ${PO_FILES}) - get_filename_component(_poFileName ${_poFile} NAME) - string(REGEX REPLACE "^${catalogname}_?" "" _langCode ${_poFileName} ) - string(REGEX REPLACE "\\.po$" "" _langCode ${_langCode} ) - if(_langCode) - get_filename_component(_lang ${_poFile} NAME_WE) - set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) - add_custom_command(TARGET translations - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_poFile} - DEPENDS ${_poFile}) - install(FILES ${_gmoFile} DESTINATION ${TDE_LOCALE_PREFIX}/${_langCode}/LC_MESSAGES/ RENAME ${catalogname}.mo) - endif( _langCode ) - endforeach(_poFile ${PO_FILES}) -endif(NOT GETTEXT_MSGFMT_EXECUTABLE) -' > po/CMakeLists.txt -} # set support for additional language(s) as per I18N variable # but only for languages available with this package -cd po -langs="";for Lang in $I18N;do [[ -e $Lang".po" ]] && langs="$langs $Lang"".po";done -## output list of available locales ... -for line in $(ls -1 *.po) -do -## ... and compare to selected locales & remove those not required -[[ $langs != *$line* ]] && rm -rf $line -done -langs=$(echo $langs | sed 's|.po||g') -cd .. +langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done +## this GLOB overrides the one in po/CMakeLists.txt: +sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +langs=$(echo $langs | sed "s|.po||g") +[[ $langs != "" ]] && TRANS=ON chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ .. make_fn @@ -111,6 +69,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -119,43 +79,24 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Dolphin file manager for TDE) +$PRGNAM: Dolphin (a file manager for TDE) +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs $PRGNAM: -$PRGNAM: Dolphin file manager for TDE $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en $langs $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS - - -# Replace the desktop file, with an alternate one. This one changes the -# icon name from d3lphin to dolphin. To allow easy system-wide icon -# themeing changes. No other alterations made. I've decided this shouldn't -# be default. I will uncomment this when I build, and others can do the -# the same if they wish =] -#mv -v $PKG/${INSTALL_TDE}/share/applications/tde/d3lphin.desktop \ -#$PKG/${INSTALL_TDE}/share/applications/tde/d3lphine.desktop.orig -#cp -v $SRCDIR/d3lphin.desktop $PKG/${INSTALL_TDE}/share/applications/tde/d3lphin.desktop +## Legacy note: +# Change the icon name from d3lphin to dolphin in the desktop file to +# allow easy system-wide icon theme changes. +# Uncomment if required .. +# +#sed -i 's|Icon=d3lphin|Icon=dolphin|' $PKG/$INSTALL_TDE/share/applications/tde/d3lphin.desktop makepkg_fn diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 649cee6..965ef3e 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -37,28 +37,32 @@ 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 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) +langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/gtkqtengine.po";done +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +langs=$(echo $langs|sed "s|/gtkqtengine.po||g") +## There is no BUILD_TRANSLATIONS option for this build +## [[ $langs != "" ]] && TRANS=ON chown_fn -## BONOBO will be included in the build if installed cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +## BONOBO will be included in the build if installed +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -Wno-dev \ .. + make_fn installdocs_fn @@ -67,6 +71,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -74,29 +80,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -gtk-qt-engine: gtk-qt-engine (Theme gtk+2 to qt3) -gtk-qt-engine: -gtk-qt-engine: A GTK theme engine that uses QT for drawing. Open the 'GTK -gtk-qt-engine: Styles and Fonts' section in the TDE control center and select -gtk-qt-engine: 'Use my TDE style in GTK applications'. -gtk-qt-engine: -gtk-qt-engine: 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 - + |-----handy-ruler------------------------------------------------------| +$PRGNAM: gtk-qt-engine (Theme gtk+2 to qt3) +$PRGNAM: +$PRGNAM: A GTK theme engine that uses QT for drawing. Open the 'GTK +$PRGNAM: Styles and Fonts' section in the TDE control center and select +$PRGNAM: 'Use my TDE style in GTK applications'. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -EOINS - - makepkg_fn diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild index 5f50208..8b19aa3 100755 --- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild +++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild @@ -46,13 +46,13 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --disable-rpath \ --enable-closure @@ -64,6 +64,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -72,10 +74,7 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Use your TDE style in gtk3 applications) -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: gtk3-tqt-engine (Use your TDE style in gtk3 applications) $PRGNAM: $PRGNAM: Open TDE control center|Appearance & Themes|GTK Styles and Fonts $PRGNAM: and select 'Use my TDE style in GTK3 applications'. @@ -84,13 +83,8 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index cb78e0c..0fb100f 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -41,22 +41,6 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed 's|.po||g') -[[ $TDEVERSION == R14.0.4 ]] && { -## patch for clang from commit 72845f6 -echo $' ---- libk9copy/k9config.cpp -+++ libk9copy/k9config.cpp -@@ -82,2 +82,2 @@ -- m_prefButtonHiliteColor=m_config->readColorEntry("buttonHiliteColor",&TQColor(TQt::yellow)); -- m_prefButtonTextColor=m_config->readColorEntry("buttonTextColor",&TQColor(TQt::yellow)); -+ m_prefButtonHiliteColor=m_config->readColorEntry("buttonHiliteColor", &TQt::yellow); -+ m_prefButtonTextColor=m_config->readColorEntry("buttonTextColor", &TQt::yellow); -' | while read line -do -patch -p0 -done -} - ltoolupdate_fn chown_fn @@ -91,20 +75,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: + |-----handy-ruler------------------------------------------------------| $PRGNAM: k9copy is an easy to use and powerful DVD backup utility. $PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en $(echo $langs) $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index ed573d4..678f5db 100644 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -42,20 +42,6 @@ sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed "s|.po||g") -[[ $TDEVERSION == R14.0.4 ]] && { -## patch for clang -echo $' ---- kaffeine/src/input/audiobrowser/urllistview.h -+++ kaffeine/src/input/audiobrowser/urllistview.h -@@ -35 +35 @@ --class TDEIO::Job; -+namespace TDEIO { class Job; } -' | while read line -do -patch -p0 -done -} - ltoolupdate_fn chown_fn @@ -70,10 +56,9 @@ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ - --enable-closure \ - --build=$ARCH-slackware-linux + --enable-closure make_fn @@ -83,6 +68,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -90,35 +77,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Media Player) +$PRGNAM: kaffeine - a Media Player for TDE $PRGNAM: -$PRGNAM: Media Player for TDE -$PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: $PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS - - makepkg_fn diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index 8ef2a55..2eb2f79 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -33,31 +33,33 @@ getsource_fn untar_fn -cd doc;listdocs_fn;cd ../ - # 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 +## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") -## prevent build error if no additional languages are required [[ $langs != "" ]] && TRANS=ON +cd doc;listdocs_fn;cd ../ + chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_ALL="ON" \ + -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DUSE_STRIGI="OFF" \ + -DUSE_MENUDRAKE="OFF" \ .. make_fn @@ -68,6 +70,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -75,35 +79,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Alternate Menu) -$PRGNAM: + |-----handy-ruler------------------------------------------------------| $PRGNAM: KBFX is an alternative to the classical K-Menu button and its menu $PRGNAM: -$PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS - - makepkg_fn diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index 574f17a..120f1ed 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -37,17 +37,11 @@ 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 [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done -## output list of available locales ... -(cd po -ls -1 *.po | while read line -do -## ... and compare to selected locales & remove those not required -[[ $langs != *$line* ]] && rm -rf $line -: -done) -[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs|sed "s|.po||g") - +langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done +## this GLOB overrides the one in po/CMakeLists.txt: +sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +langs=$(echo $langs | sed "s|.po||g") +[[ $langs != "" ]] && TRANS=ON chown_fn @@ -61,7 +55,9 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DWITH_GCC_VISIBILITY="OFF" \ .. make_fn @@ -72,6 +68,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -79,42 +77,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (book reader) -$PRGNAM: -$PRGNAM: $PRGNAM -$PRGNAM: +$PRGNAM: KBookReader (book reader) is a TDE twin-panel text files viewer +$PRGNAM: specialized in reading e-books. $PRGNAM: +$PRGNAM: It supports multiple bookmarks, custom fonts, encoding selection. $PRGNAM: $PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: $PRGNAM: -$PRGNAM: en ${langs:-} $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/ - " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 -fi - -EOINS - - makepkg_fn diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild index 1cdb13e..e67983e 100755 --- a/Apps/kdbg/kdbg.SlackBuild +++ b/Apps/kdbg/kdbg.SlackBuild @@ -33,6 +33,15 @@ getsource_fn untar_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 po/$Lang".po" ]] && langs="$langs $Lang"".po";done +sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am +langs=$(echo $langs | sed "s|.po||g") +# +ldocs="en";for Lang in $I18N;do [[ -d kdbg/doc/$Lang ]] && ldocs="$ldocs $Lang";done +sed -i "s|SUBDIRS =.*$|SUBDIRS =$ldocs|" kdbg/doc/Makefile.am + listdocs_fn ltoolupdate_fn @@ -41,18 +50,17 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ - --enable-closure \ - --build=$ARCH-slackware-linux + --enable-closure make_fn @@ -62,6 +70,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -69,34 +79,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM: $PRGNAM (GUI for gdb using TDE) + |-----handy-ruler------------------------------------------------------| +$PRGNAM: This is KDbg, a graphical user interface around gdb using TDE $PRGNAM: -$PRGNAM: This is KDbg, a graphical user interface around gdb using -$PRGNAM: TDE, the Trinity Desktop Environment +$PRGNAM: With language support for: +$PRGNAM: en $langs $PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: $ldocs $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - - makepkg_fn diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index 79c5ddb..3a69045 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -45,6 +45,7 @@ cmake \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DWITH_GCC_VISIBILITY="OFF" \ .. make_fn @@ -60,6 +61,8 @@ ln -s ../autostart/kdbusnotification-autostart.desktop .) mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -68,25 +71,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (A DBUS notification to TDE interface) -$PRGNAM: $PRGNAM: A DBUS notification to TDE interface -$PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 703c862..b09ca16 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -33,12 +33,15 @@ getsource_fn untar_fn -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 +locas="" +ldocs="" +for Lang in $I18N;do [[ -d translations/$Lang ]] && locas="$locas $Lang" && \ +[[ -d translations/$Lang/doc ]] && ldocs="$ldocs $Lang";done +sed -i "s|SUBDIRS=.*$|SUBDIRS=$locas|" translations/Makefile.am + +listdocs_fn ltoolupdate_fn @@ -73,20 +76,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: + |-----handy-ruler------------------------------------------------------| $PRGNAM: Kile is a TEX and LATEX source editor and shell $PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en$locas $PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: en$ldocs $PRGNAM: $PRGNAM: -$PRGNAM: With language support for: -$PRGNAM: -$PRGNAM: en$langs $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild index b9d0d7d..5fdf089 100644 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -36,15 +36,10 @@ untar_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 [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done -## output list of available locales ... -(cd po -ls -1 *.po | while read line -do -## ... and compare to selected locales & remove those not required -[[ $langs != *$line* ]] && rm -rf $line -: -done) -[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs|sed "s|.po||g") +## this GLOB overrides the one in po/CMakeLists.txt: +sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +#langs=$(echo $langs | sed "s|.po||g") +[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs | sed "s|.po||g") [[ $langs == *ru* || $langs == *uk* ]] && RU_UA=ON listdocs_fn @@ -61,9 +56,11 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ -DWITH_RU_UA_LAYOUT=${RU_UA:-OFF} \ - -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_SKIP_RPATH="ON" \ .. make_fn @@ -81,7 +78,6 @@ echo " # 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------------------------------------------------------| $PRGNAM: KKBSwitch is a keyboard layout indicator which displays an icon in $PRGNAM: the system tray that indicates which layout is currently active. @@ -90,10 +86,10 @@ $PRGNAM: Switch keyboard groups by clicking the icon or selecting the desired $PRGNAM: group from the icon's menu $PRGNAM: Toggle between the two most recently used groups. $PRGNAM: -$PRGNAM: $PRGNAM: With language support for: $PRGNAM: en $langs $PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index b285652..f1e3798 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -85,20 +85,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -knemo: knemo (The TDE Network Monitor) offers a network monitor similar to -knemo: the one found in that other operating system. Supports Ethernet -knemo: (including wireless) and PPP connections, showing both incoming and -knemo: outgoing traffic. For every network interface it displays an icon in -knemo: the Panel. -knemo: -knemo: With language support for: -knemo: en $langs -knemo: -knemo: IMPORTANT: KNemo has to be started using -knemo: Trinity Control Center|Internet & Network|Network Monitor. + |-----handy-ruler------------------------------------------------------| +$PRGNAM: knemo (The TDE Network Monitor) offers a network monitor similar to +$PRGNAM: the one found in that other operating system. Supports Ethernet +$PRGNAM: (including wireless) and PPP connections, showing both incoming and +$PRGNAM: outgoing traffic. For every network interface it displays an icon in +$PRGNAM: the Panel. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: IMPORTANT: KNemo has to be started using +$PRGNAM: Trinity Control Center|Internet & Network|Network Monitor. " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index eb2b5ae..ebbe44e 100644 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -35,10 +35,9 @@ untar_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -LANG_SUFF=/messages/$PRGNAM.po -langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang${LANG_SUFF:-}";done +langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang/messages/$PRGNAM.po";done sed -i "s|\${po_files}|$langs|" translations/CMakeLists.txt && \ -langs=$(echo $langs|sed "s|$LANG_SUFF||g") +langs=$(echo $langs|sed "s|/messages/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON listdocs_fn @@ -74,19 +73,18 @@ echo " # 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------------------------------------------------------| -knetstats: knetstats is a simple TDE network monitor that shows rx/tx LEDs for -knetstats: any network interface on a system tray icon. -knetstats: -knetstats: -knetstats: -knetstats: -knetstats: With language support for: -knetstats: en $langs -knetstats: -knetstats: -knetstats: + |-----handy-ruler------------------------------------------------------| +$PRGNAM: knetstats is a simple TDE network monitor that shows rx/tx LEDs for +$PRGNAM: any network interface on a system tray icon. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index a6ab4cd..82593d2 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -78,20 +78,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -knights: A graphical chess interface for the Trinity Desktop Environment -knights: -knights: Download themepack [additional boards and chessman themes] from: -knights: http://sourceforge.net/project/showfiles.php?group_id=31461 -knights: -knights: Needs separate chess engines, for example gnuchess, stockfish, komodo. -knights: -knights: With language support for: -knights: -knights: en $langs -knights: +$PRGNAM: A graphical chess interface for the Trinity Desktop Environment +$PRGNAM: +$PRGNAM: Download themepack [additional boards and chessman themes] from: +$PRGNAM: http://sourceforge.net/project/showfiles.php?group_id=31461 +$PRGNAM: +$PRGNAM: Needs separate chess engines, for example gnuchess, stockfish, komodo. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index 6de3f53..79c8623 100644 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -65,10 +65,8 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a front end to nmap + |-----handy-ruler------------------------------------------------------| +$PRGNAM: knmap is a front end to nmap $PRGNAM: $PRGNAM: A normal (non-root) user can use the privileged nmap functions via $PRGNAM: the 'tdesu' utility. @@ -78,7 +76,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild index 8e4e399..b06cfa4 100755 --- a/Apps/koffice-i18n/koffice-i18n.SlackBuild +++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild @@ -38,7 +38,6 @@ untar_fn # but only for languages available with this package langdir="";for Lang in $I18N;do [[ -d koffice-i18n-$Lang ]] && langdir="${langdir}koffice-i18n-$Lang ";done - # 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 @@ -56,13 +55,13 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} + --prefix=$INSTALL_TDE make_fn @@ -81,12 +80,10 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (internationalization files for koffice). + |-----handy-ruler------------------------------------------------------| +$PRGNAM: koffice-i18n (internationalization files for koffice). $PRGNAM: $PRGNAM: For languages: -$PRGNAM: $PRGNAM: $langs $PRGNAM: $PRGNAM: @@ -94,8 +91,8 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - ARCH="noarch" makepkg_fn diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index 04921bf..1941e6e 100755 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -28,7 +28,6 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-4} TAG=${TAG:-_tde} - ## build with libpng-1.4 - set in BUILD-TDE.sh - loading pngs in chalk/krita crashes with libpng16 LIBPNG_VERSION=$(grep VERSION:- ../../Misc/libpng/libpng.SlackBuild | grep -o [.0-9]*) [[ ${USE_PNG14:-} == yes ]] && \ @@ -39,37 +38,11 @@ exit } } || true - source ../../get-source.sh getsource_fn untar_fn -[[ $TDEVERSION == R14.0.4 ]] && { -## patch for clang -## second hunk based on 0004-fix-an-FTBFS-when-build-with-clang.patch @ http://trinity-devel.pearsoncomputing.net/?0::11397 -echo $' ---- kspread/plugins/scripting/Makefile.am -+++ kspread/plugins/scripting/Makefile.am -@@ -23,0 +24,2 @@ -+ -+KDE_CXXFLAGS = $(USE_EXCEPTIONS) ---- kexi/migration/keximigratetest.cpp -+++ kexi/migration/keximigratetest.cpp -@@ -41 +41 @@ -- TDEApplication app(argc, argv, "Kexi Migrate Test"); -+ TDEApplication app(argc, argv, TQCString("Kexi Migrate Test")); ---- filters/kword/mswrite/mswriteimport.h -+++ filters/kword/mswrite/mswriteimport.h -@@ -26 +26 @@ --class MSWrite::InternalParser; -+namespace MSWrite { class InternalParser; } -' | while read line -do -patch -p0 -done -} - ## fix chalk crashing - set liblcms as a direct dependency - see issue 37 for details sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am @@ -133,6 +106,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -140,35 +115,20 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Office Suite) + |-----handy-ruler------------------------------------------------------| +$PRGNAM: KOffice is a collection of office applications linked together by a +$PRGNAM: common basis, which assures that all office applications can work +$PRGNAM: together. $PRGNAM: -$PRGNAM: KOffice is a collection of office applications linked together by a -$PRGNAM: common basis. This common basis assures that all office application -$PRGNAM: can work together. You can, for instance, insert a spreadsheet in your -$PRGNAM: thesis without leaving your document. Editing the spreadsheet happens -$PRGNAM: _inside_ your thesis. +$PRGNAM: You can, for instance, insert a spreadsheet in a thesis without +$PRGNAM: leaving the document. Editing the [spreadsheet] happens _inside_ +$PRGNAM: the thesis. $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn ## restore libpng16 links diff --git a/Apps/krusader/krusader.SlackBuild b/Apps/krusader/krusader.SlackBuild index dc65521..c237558 100755 --- a/Apps/krusader/krusader.SlackBuild +++ b/Apps/krusader/krusader.SlackBuild @@ -73,8 +73,7 @@ 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') # -[[ $I18N != *ru* ]] && \ -sed -i 's| ru||' doc/Makefile.am +[[ $I18N != *ru* ]] && sed -i 's| ru||' doc/Makefile.am ltoolupdate_fn @@ -102,6 +101,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -110,28 +111,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (A file manager for TDE) -$PRGNAM: $PRGNAM: Krusader is an advanced twin panel (commander style) file manager for $PRGNAM: TDE and other desktops in the *nix world, similar to Midnight or -$PRGNAM: Total Commander. It provides all the file management features you -$PRGNAM: could possibly want. -$PRGNAM: +$PRGNAM: Total Commander. +$PRGNAM: It provides all the file management features you could possibly want. $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -\$(which update-desktop-database) $INSTALL_TDE/share/applications - -# Update hicolor theme cache: -\$(which gtk-update-icon-cache) -f -t $INSTALL_TDE/share/icons/hicolor - -EOINS - - makepkg_fn diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 71fc7b8..5b6cded 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -47,13 +47,13 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} + --prefix=$INSTALL_TDE make_fn @@ -70,20 +70,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a TDE-based source-editing environment for C and C-style + |-----handy-ruler------------------------------------------------------| +$PRGNAM: kscope is a TDE-based source-editing environment for C and C-style $PRGNAM: languages. Primarily, it is a front-end to the veteran Cscope, $PRGNAM: a source-code browser originally developed at Bell Labs. $PRGNAM: -$PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: $PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index 9eafeb0..b39f5ae 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -73,20 +73,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a sensors frontend for TDE. + |-----handy-ruler------------------------------------------------------| +$PRGNAM: ksensors is a sensors frontend for TDE. $PRGNAM: $PRGNAM: lm_sensors: $PRGNAM: Read the 'sensors-detect' man page for warnings on usage, then $PRGNAM: run 'sensors-detect' to scan for hardware monitoring chips. $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index d954a99..a27982c 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -74,11 +74,15 @@ strip_fn mkdir_install_fn echo " -$PRGNAM: $PRGNAM (shut down utility for TDE) -$PRGNAM: +# 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------------------------------------------------------| $PRGNAM: KShutDown is an advanced shut down utility for TDE $PRGNAM: -$PRGNAM: $PRGNAM: With language support for: $PRGNAM: en $langs $PRGNAM: @@ -86,7 +90,8 @@ $PRGNAM: and help documentation for: $PRGNAM: $(echo $langdoc | sed 's|kshutdown|en|;s| man||') $PRGNAM: $PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index 68348e0..55f7903 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -47,7 +47,8 @@ langs=$(echo $langs | sed 's|.po||g') # Only Russian and English help documents are in the source, # if Russian is not required, only package English docs -[[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am +ldocs="ru" +[[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am && ldocs="" ltoolupdate_fn @@ -67,7 +68,6 @@ CXX=$COMPILER_CXX \ --disable-rpath \ --enable-closure - make_fn installdocs_fn @@ -83,20 +83,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -ksquirrel: KSquirrel is an image viewer for TDE. -ksquirrel: -ksquirrel: Image decoding is based on its own decoders (ksquirrel-libs) -ksquirrel: -ksquirrel: With OpenGL and KIPI support. -ksquirrel: -ksquirrel: With language support for: -ksquirrel: -ksquirrel: en $(echo $langs) -ksquirrel: -ksquirrel: + |-----handy-ruler------------------------------------------------------| +$PRGNAM: KSquirrel is an image viewer for TDE. +$PRGNAM: +$PRGNAM: Image decoding is based on its own decoders (ksquirrel-libs) +$PRGNAM: With OpenGL and KIPI support. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: en $ldocs +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index da51dbe..0a74297 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -55,6 +55,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -63,8 +65,6 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (A virtual keyboard for TDE) -$PRGNAM: $PRGNAM: A virtual keyboard for TDE $PRGNAM: $PRGNAM: Re: kvkbd --help @@ -74,22 +74,8 @@ $PRGNAM: to Xsetup to run in xdm/tdm $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - - makepkg_fn diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 3aaa1ac..20db507 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -82,11 +82,8 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM is a TDE frontend for various vpn clients. -$PRGNAM: + |-----handy-ruler------------------------------------------------------| +$PRGNAM: kvpnc is a TDE frontend for various vpn clients. $PRGNAM: $PRGNAM: With language support for: $PRGNAM: en $langs @@ -95,6 +92,8 @@ $PRGNAM: and help documentation for: $PRGNAM: $(echo $langdoc | sed 's| man||') $PRGNAM: $PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/piklab/piklab.SlackBuild b/Apps/piklab/piklab.SlackBuild index 2221af3..5e4af3b 100755 --- a/Apps/piklab/piklab.SlackBuild +++ b/Apps/piklab/piklab.SlackBuild @@ -35,23 +35,28 @@ untar_fn 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 po/$Lang".po" ]] && langs="$langs $Lang"".po";done +sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am +langs=$(echo $langs | sed 's|.po||g') + ltoolupdate_fn chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ - --disable-debug \ - --build=$ARCH-slackware-linux + --mandir=$INSTALL_TDE/man \ + --disable-debug make_fn @@ -61,6 +66,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -69,33 +76,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (IDE fot PIC microcontrollers) -$PRGNAM: $PRGNAM: An integrated development environment for PIC microcontrollers -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - - makepkg_fn diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index d4a2582..cbd904c 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -82,20 +82,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM (GUI interface for potrace) -$PRGNAM: -$PRGNAM: GUI interface for potrace + |-----handy-ruler------------------------------------------------------| +$PRGNAM: potracegui - a TDE interface for potrace $PRGNAM: $PRGNAM: With language support for: $PRGNAM: en $langs $PRGNAM: -$PRGNAM: and help documentation for: +$PRGNAM: With help documentation for: $PRGNAM: $(echo $langdoc | sed 's| man||') $PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild index ae25431..38544de 100644 --- a/Apps/rosegarden/rosegarden.SlackBuild +++ b/Apps/rosegarden/rosegarden.SlackBuild @@ -33,33 +33,64 @@ getsource_fn untar_fn +listdocs_fn + # Check for Jack Audio Connection Kit [[ $(ls /var/log/packages/jack-audio-connection-kit-*) ]] && JACK="ON" # Check for DSSI aka "Dizzy" [[ $(grep -E "dssi.h" /var/log/packages/*) ]] && DSSI="ON" -listdocs_fn +## remove help documentation build instruction from all locales ... +sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true +## ... and restore for 'en' +echo "tde_create_handbook( LANG en DESTINATION $PRGNAM )" >> doc/en/CMakeLists.txt + +# set support for additional language(s) as per I18N variable +# but only for languages available with this package +langs="" # the *.po file list +ldocs="" # the help docs +for Lang in $I18N +do +[[ -d po/$Lang ]] && { +langs="$langs $Lang/$PRGNAM.po" +## ... and restore help documentation for the selected and available locales +[[ -e doc/$Lang/CMakeLists.txt ]] && { +echo "tde_create_handbook( LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt +ldocs="$ldocs $Lang" +} +} +done +# +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") +[[ $langs != "" ]] && TRANS=ON chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DBUILD_ALL="ON" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DWANT_SOUND="ON" \ -DWANT_DEBUG="OFF" \ -DWANT_FULLDBG="OFF" \ -DWANT_JACK=${JACK:-"OFF"} \ -DWANT_DSSI=${DSSI:-"OFF"} \ + -DWANT_LIRC="OFF" \ + -DWANT_PCH="OFF" \ + -DWANT_TEST="OFF" \ .. + make_fn installdocs_fn @@ -68,6 +99,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -76,34 +109,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: -$PRGNAM: $PRGNAM (Audio sequencer and musical notation editor) -$PRGNAM: $PRGNAM: Rosegarden is a MIDI and audio sequencer and musical notation editor. $PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: en$ldocs $PRGNAM: -$PRGNAM: $PRGNAM: -$PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS - makepkg_fn - diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild index 9dc742d..070c4bf 100755 --- a/Apps/soundkonverter/soundkonverter.SlackBuild +++ b/Apps/soundkonverter/soundkonverter.SlackBuild @@ -39,26 +39,6 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed "s|.po||g") -[[ $TDEVERSION == R14.0.4 ]] && { -## patch for clang from commit 3f7e19f -echo $' ---- src/metadata/rmff/rmff.h -+++ src/metadata/rmff/rmff.h -@@ -35,0 +36,2 @@ -+ class AudioProperties; -+ -@@ -252,3 +254 @@ -- -- class TagLib::AudioProperties; -- -+ -' | while read line -do -patch -p0 -done -} - - listdocs_fn ltoolupdate_fn @@ -88,6 +68,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -95,34 +77,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (frontend to various audio converters) +$PRGNAM: soundKonverter is a frontend to various audio converters. $PRGNAM: -$PRGNAM: soundKonverter is frontend to various audio converters. -$PRGNAM: -$PRGNAM: The key features are: -$PRGNAM: - Audio conversion -$PRGNAM: - Replay Gain calculation -$PRGNAM: - CD ripping +$PRGNAM: The key features are: +$PRGNAM: - Audio conversion +$PRGNAM: - Replay Gain calculation +$PRGNAM: - CD ripping $PRGNAM: $PRGNAM: With language support for: $PRGNAM: en $langs $PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index 9f7149b..823963d 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -37,21 +37,23 @@ listdocs_fn chown_fn -ltoolupdate_fn - cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -../configure \ - --prefix=${INSTALL_TDE} \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ - --disable-rpath \ - --enable-closure +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TRANSLATIONS="ON" \ + -DWITH_GCC_VISIBILITY="OFF" \ + .. make_fn @@ -62,18 +64,24 @@ strip_fn mkdir_install_fn echo " -tde-style-lipstik: tde-style-lipstik (lipstik style for tde) -tde-style-lipstik: -tde-style-lipstik: lipstik style for tde -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: -tde-style-lipstik: +# 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------------------------------------------------------| +$PRGNAM: lipstik style for TDE +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 3ecdccf..c2393eb 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -38,19 +38,22 @@ listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DBUILD_ALL="ON" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_CONFIG_MODULE="ON" \ + -DBUILD_TRANSLATIONS="ON" \ .. + make_fn installdocs_fn @@ -66,21 +69,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tde-style-qtcurve: tde-style-qtcurve (QtCurve theme) -tde-style-qtcurve: -tde-style-qtcurve: QtCurve theme -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: -tde-style-qtcurve: Home: https://www.trinitydesktop.org/index.php - + |-----handy-ruler------------------------------------------------------| +$PRGNAM: QtCurve theme +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild index a517b15..59e270f 100755 --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdeamarok PRGNAM=amarok +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -45,7 +45,7 @@ sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \ -e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt # If libmp4v2 is installed, use mp4 metadata sources in build, otherwise use m4a .. -[[ $(grep -E "mp4.h|mp4v2.h" /var/log/packages/*) ]] && LMP4V2="ON" || sed -i 's|tagmp4|tagm4a|' amarok/src/metadata/CMakeLists.txt +[[ $(grep -E "mp4.h|mp4v2.h" /var/log/packages/*) ]] && LMP4V2="ON" || sed -i 's|tagmp4-static|tagm4a-static|' amarok/src/metadata/CMakeLists.txt # 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" @@ -188,43 +188,48 @@ find . -name \*.ui -exec sed -i -e 's|includehint|include|g' '{}' + listdocs_fn +## remove help documentation build instruction from all [non-en] locales ... +sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true + # set support for additional language(s) as per I18N variable # but only for languages available with this package -langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done -# -## output list of available locales ... -ls -1 po | while read line +langs="" # the *.po file list +ldocs="" # the help docs +for Lang in $I18N do -## ... and compare to selected locales & remove those not required -[[ -d po/$line ]] && [[ $langs != *$line* ]] && rm -rf po/$line -done -# -## output list of available locale documentation ... -ldocs="amarok $langs" -ls -1 doc | while read line -do -## ... and compare to docs for selected locales & remove those not required -[[ -d doc/$line ]] && [[ $ldocs != *$line* ]] && rm -rf doc/$line +[[ -d po/$Lang ]] && { +langs="$langs $Lang/$PRGNAM.po" +## ... and restore help documentation for the selected and available locales +[[ -e doc/$Lang/CMakeLists.txt ]] && { +[[ $Lang == ru ]] && NOINDEX=NOINDEX +echo "tde_create_handbook( ${NOINDEX:-} LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt +ldocs="$ldocs $Lang" +} +} done +# +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") +[[ $langs != "" ]] && TRANS=ON chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_MP4V2=${LMP4V2:-"OFF"} \ - -DWITH_LIBVISUAL="ON" \ - -DWITH_KONQSIDEBAR="ON" \ -DWITH_XINE=${XINE:-"OFF"} \ -DWITH_YAUAP=${YAUAP:-"OFF"} \ + -DWITH_LIBVISUAL="ON" \ + -DWITH_KONQSIDEBAR="ON" \ -DWITH_AKODE="OFF" \ -DWITH_IPOD="OFF" \ -DWITH_IFP="OFF" \ @@ -234,7 +239,7 @@ cd_builddir_fn -DWITH_DAAP="OFF" \ -DWITH_INOTIFY="OFF" \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. <<'Comment' @@ -254,6 +259,9 @@ strip_fn mkdir_install_fn +doinst_sh_fn + +PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -261,36 +269,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PKGNAM|-----handy-ruler------------------------------------------------------| -$PKGNAM: $PKGNAM (Amarok Music Player) -$PKGNAM: -$PKGNAM: Amarok music player for TDE -$PKGNAM: -$PKGNAM: -$PKGNAM: With language support for: -$PKGNAM: -$PKGNAM: en$langs -$PKGNAM: -$PKGNAM: -$PKGNAM: Home: https://www.trinitydesktop.org/index.php + |-----handy-ruler------------------------------------------------------| +$PRGNAM: Amarok music player for TDE +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: en$ldocs +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS - - -PRGNAM=$PKGNAM makepkg_fn diff --git a/Apps/tdefilelight/tdefilelight.SlackBuild b/Apps/tdefilelight/tdefilelight.SlackBuild index f7ce151..4239d64 100644 --- a/Apps/tdefilelight/tdefilelight.SlackBuild +++ b/Apps/tdefilelight/tdefilelight.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdefilelight PRGNAM=filelight +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -36,39 +36,42 @@ untar_fn listdocs_fn +## remove help documentation build instruction from all [non-en] locales ... +sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true # set support for additional language(s) as per I18N variable # but only for languages available with this package -langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done -# -## output list of available locales ... -ls -1 po | while read line -do -## ... and compare to selected locales & remove those not required -[[ -d po/$line ]] && [[ $langs != *$line* ]] && rm -rf po/$line -done -# -## output list of available locale documentation ... -ldocs="filelight $langs" -ls -1 doc | while read line +langs="" # the *.po file list +ldocs="" # the help docs +for Lang in $I18N do -## ... and compare to docs for selected locales & remove those not required -[[ -d doc/$line ]] && [[ $ldocs != *$line* ]] && rm -rf doc/$line +[[ -d po/$Lang ]] && { +langs="$langs $Lang/$PRGNAM.po" +## ... and restore help documentation for the selected and available locales +[[ -e doc/$Lang/CMakeLists.txt ]] && { +echo "tde_create_handbook( LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt +ldocs="$ldocs $Lang" +} +} done +# +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") +[[ $langs != "" ]] && TRANS=ON chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn @@ -87,19 +90,18 @@ echo " # the right side marks the last column you can put a character in. You must make # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM allows you to understand exactly where your diskspace is + |-----handy-ruler------------------------------------------------------| +$PRGNAM: Filelight allows you to understand exactly where your diskspace is $PRGNAM: being used by graphically representating your filesystem as a set of $PRGNAM: concentric segmented-rings. $PRGNAM: -$PRGNAM: $PRGNAM: With language support for: +$PRGNAM: en $langs $PRGNAM: -$PRGNAM: en$langs +$PKGNAM: With help documentation for: +$PKGNAM: en$ldocs $PRGNAM: $PRGNAM: -$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index d490a52..07e2399 100755 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -47,6 +47,7 @@ cp de/doc/index.docbook es/doc/ # any corrections from a Spanish speaker will be welcome 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 + ## remove help documentation build instruction from all locales ... sed -i '/BUILD_DOC/d' */CMakeLists.txt @@ -54,17 +55,21 @@ listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -langs="" +langs="" # the *.po file list +ldocs="" # the help docs for Lang in $I18N do [[ -d $Lang ]] && { langs="$langs $Lang/messages/gwenview.po" ## ... and restore help documentation for the selected and available locales -[[ -e $Lang/CMakeLists.txt ]] && echo 'tde_conditional_add_subdirectory( BUILD_DOC doc )' > $Lang/CMakeLists.txt +[[ -e $Lang/CMakeLists.txt ]] && { +echo 'tde_conditional_add_subdirectory( BUILD_DOC doc )' > $Lang/CMakeLists.txt +ldocs="$ldocs $Lang" +} } done -sed -i "s|\${po_files}|$langs|" CMakeLists.txt && \ -langs=$(echo $langs|sed "s|/messages/gwenview.po||g") +sed -i "s|\${po_files}|$langs|" CMakeLists.txt +langs=$(echo $langs|sed "s|/messages/gwenview.po||g") # the locale codes chown_fn @@ -76,6 +81,8 @@ cmake \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS="ON" \ .. make_fn @@ -86,6 +93,7 @@ strip_fn mkdir_install_fn +PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -93,22 +101,19 @@ echo " # 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------------------------------------------------------| -$PKGNAM: $PKGNAM (Internationalization files for gwenview.) -$PKGNAM: -$PKGNAM: For languages: -$PKGNAM: -$PKGNAM: $langs -$PKGNAM: -$PKGNAM: -$PKGNAM: -$PKGNAM: -$PKGNAM: -$PKGNAM: +$PRGNAM: gwenview-i18n (Internationalization files for gwenview.) +$PRGNAM: +$PRGNAM: For languages: +$PRGNAM: $langs +$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: $ldocs +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - ARCH="noarch" -PRGNAM=$PKGNAM makepkg_fn diff --git a/Apps/tdegwenview/tdegwenview.SlackBuild b/Apps/tdegwenview/tdegwenview.SlackBuild index 491a86b..9d6fb90 100755 --- a/Apps/tdegwenview/tdegwenview.SlackBuild +++ b/Apps/tdegwenview/tdegwenview.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdegwenview PRGNAM=gwenview +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -42,15 +42,15 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -62,6 +62,7 @@ strip_fn mkdir_install_fn +PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -69,21 +70,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdegwenview: tdegwenview (gwenview is an image viewer for TDE.) -tdegwenview: -tdegwenview: gwenview is an image viewer for TDE -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: -tdegwenview: + |-----handy-ruler------------------------------------------------------| +$PRGNAM: tdegwenview (gwenview is an image viewer for TDE) +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - -PRGNAM=$PKGNAM makepkg_fn diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index ff200dc..78717e7 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -33,24 +33,34 @@ getsource_fn untar_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/$PRGNAM.po";done +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") +[[ $langs != "" ]] && TRANS=ON + listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DBUILD_ALL="ON" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. + make_fn installdocs_fn @@ -66,21 +76,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -tdeio-locate: tdeio-locate (tdeio-locate) -tdeio-locate: -tdeio-locate: tdeio-locate -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: -tdeio-locate: Home: https://www.trinitydesktop.org/index.php - + |-----handy-ruler------------------------------------------------------| +$PRGNAM: tdeio-locate is a TDE I/O Slave for the locate command. +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild index b4a344f..0e8814c 100755 --- a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild +++ b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdek3b-i18n PRGNAM=k3b-i18n +PKGNAM=tde$PRGNAM [[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} @@ -35,24 +35,40 @@ getsource_fn untar_fn +## remove help documentation build instruction from all locales ... +sed -i '/BUILD_DOC/d' */CMakeLists.txt + listdocs_fn 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 [[ $(grep $Lang subdirs) ]] && langs="$langs $Lang";done -## remove wanted locales from subdirs file ... -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 +langs="" # the *.po file list +locas="" # the locale codes +ldocs="" # the help docs +for Lang in $I18N +do +[[ -d $Lang ]] && { +langs="$langs $Lang/messages/k3b.po $Lang/messages/k3bsetup.po $Lang/messages/libk3b.po $Lang/messages/libk3bdevice.po" +locas="$locas $Lang" +## ... and restore help documentation for the selected and available locales +[[ -e $Lang/CMakeLists.txt ]] && { +echo 'tde_conditional_add_subdirectory( BUILD_DOC doc )' > $Lang/CMakeLists.txt +ldocs="$ldocs $Lang" +} +} +done +sed -i "s|\${po_files}|$langs|" CMakeLists.txt cd_builddir_fn - cmake \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ +cmake \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DBUILD_DOC="ON" \ + -DBUILD_MESSAGES="ON" \ .. make_fn @@ -71,17 +87,16 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (internationalization files for the CD Creator). +$PRGNAM: tdek3b-i18n (internationalization files for the CD Creator). $PRGNAM: $PRGNAM: For languages: +$PRGNAM: $locas $PRGNAM: -$PRGNAM: $langs -$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: $ldocs $PRGNAM: $PRGNAM: -$PRGNAM: $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild index 6fa52fc..2a80e0e 100755 --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdek3b PRGNAM=k3b +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -39,17 +39,17 @@ listdocs_fn chown_fn # Check for ffmpeg: -[[ $(ls /var/log/packages/ffmpeg-*) ]] && FFMPEG="ON" +[[ -s /usr/include/libavcodec/avcodec.h ]] && FFMPEG="ON" # Check for lame: -[[ $(ls /var/log/packages/lame-*) ]] && LAME="ON" +[[ -s /usr/include/lame/lame.h ]] && LAME="ON" # Check for musepack: -[[ $(ls /var/log/packages/musepack-tools-*) ]] && MUSEPACK="ON" +[[ -s /usr/include/musepack/musepack.h ]] && MUSEPACK="ON" # Check for musicbrainz: -[[ $(ls /var/log/packages/libmusicbrainz-*) ]] && MUSICBRAINZ="ON" +[[ -s /usr/include/musicbrainz/mb_c.h ]] && MUSICBRAINZ="ON" cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -95,18 +95,17 @@ echo " # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PKGNAM: $PKGNAM (The CD Creator, TDE $TDEVERSION version) -$PKGNAM: -$PKGNAM: K3b makes writing cds under Linux easy. It has an easy to use -$PKGNAM: interface and supports CD burning (including on-the-fly), copying, -$PKGNAM: erasing, ripping, and more. -$PKGNAM: -$PKGNAM: K3b was written by Sebastian Trueg, Thomas Froescher, -$PKGNAM: Christian Kvasny, and Klaus-Dieter Krannich. -$PKGNAM: -$PKGNAM: For more information, visit: http://www.k3b.org -$PKGNAM: -$PKGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: K3b (The CD Creator, TDE $TDEVERSION version) +$PRGNAM: +$PRGNAM: K3b makes writing cds under Linux easy. It has an easy to use +$PRGNAM: interface and supports CD burning (including on-the-fly), copying, +$PRGNAM: erasing, ripping, and more. +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/tdektorrent/tdektorrent.SlackBuild b/Apps/tdektorrent/tdektorrent.SlackBuild index 037abdd..9f6fdd0 100644 --- a/Apps/tdektorrent/tdektorrent.SlackBuild +++ b/Apps/tdektorrent/tdektorrent.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdektorrent PRGNAM=ktorrent +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,15 +47,15 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-torrent-mimetype \ --enable-closure @@ -68,20 +68,7 @@ strip_fn mkdir_install_fn -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS +doinst_sh_fn PRGNAM=$PKGNAM echo " @@ -92,18 +79,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (A TDE BitTorrent client) -$PRGNAM: $PRGNAM: A BitTorrent client for TDE $PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en$langs +$PRGNAM: +$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en$langs $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index cfbc511..47abec4 100644 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -73,19 +73,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Graphical front end for the sudo command) +$PRGNAM: tdesudo (Graphical front end for the sudo command) +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs $PRGNAM: $PRGNAM: -$PRGNAM: Graphical front end for the sudo command $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en $langs $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index b66ec71..954011b 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -35,29 +35,12 @@ untar_fn listdocs_fn -[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn - chown_fn cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ - --disable-rpath \ - --enable-closure - -} || { ## all locales and html docs built by default - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -68,7 +51,6 @@ CXX=$COMPILER_CXX \ -DCMAKE_SKIP_RPATH=ON \ .. -} make_fn @@ -78,6 +60,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -86,25 +70,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (TDM theme module) +$PRGNAM: TDM theme module +$PRGNAM: +$PRGNAM: Currently this module is installed in TDE Components found in the +$PRGNAM: Trinity Control Center, under System Administration. +$PRGNAM: $PRGNAM: -$PRGNAM: Currently this module is installed in TDE Components found in the -$PRGNAM: Trinity Control Center. Under System Administration. $PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 9ad746c..422eee0 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -41,15 +41,15 @@ ltoolupdate_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -68,9 +68,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Crystal Style for Twin) +$PRGNAM: twin-style-crystal $PRGNAM: $PRGNAM: Crystal Style for Twin $PRGNAM: @@ -80,7 +79,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index ff64653..5d9e393 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -33,17 +33,17 @@ getsource_fn untar_fn -listdocs_fn - -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/$PRGNAM.po";done -sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt && \ +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + +chown_fn + cd_builddir_fn cmake \ @@ -53,7 +53,10 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ -DCMAKE_SKIP_RPATH=ON \ .. @@ -66,6 +69,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -74,32 +79,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Quake-style terminal emulator) +$PRGNAM: Yakuake is a Quake-style terminal emulator based on +$PRGNAM: TDE Konsole technology. $PRGNAM: -$PRGNAM: Yakuake is a Quake-style terminal emulator based on TDE -$PRGNAM: Konsole technology. -$PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 0f82d2c..b90cba0 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -216,8 +216,9 @@ rm -f $TMPVARS/NUMJOBS dialog --cr-wrap --nocancel --no-shadow --colors --title " Parallel Build " --inputbox \ " Set the number of simultaneous jobs for make to whatever your system will support. + " \ -11 75 ${NUMJOBS:-"-j6"} \ +12 75 ${NUMJOBS:-"-j6"} \ 2> $TMPVARS/NUMJOBS @@ -235,14 +236,15 @@ dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "REA Build language packages/support for any of: \Zb\Z6af ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta te tg th tr uk uz uz@cyrillic vi wa zh_CN zh_TW\Zn + " \ -24 75 \ +25 75 \ 2> $TMPVARS/I18N && break [[ $EXITVAL == 2 ]] && dialog --cr-wrap --defaultno --yes-label "Ascii" --no-label "Utf-8" --no-shadow --colors --no-collapse --yesno \ " The source unpacked is ~950MB, so to save on build space, the SlackBuild script extracts, builds, and removes source for each language package one at a time. -If you can see the two 'y' like characters, then you've probably got a suitable terminal font installed and can choose \Zr\Z4\ZbUtf-8\Zb\Zn, otherwise choose \Z1A\Zb\Z0scii\Zn. +If you can see the two 'y' like characters, then you've probably got a suitable terminal font installed and can choose \Zr\Z4\ZbUtf-8\Zb\Zn to display the language codes, otherwise choose \Z1A\Zb\Z0scii\Zn. <<\Z3\Zb ҷ ɣ \Zn>> @@ -363,7 +365,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Requires Avahi. Optional for tdelibs and used by default if installed. \Zn" \ "Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" ${SELECT:-off} "\Zb\Z6 Will build with Avahi support if avahi/avahi-tqt are installed. \Zn" \ "Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ +"Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 \Zn" \ "Core/tdeadmin" "System admin packages" off "\Zb\Z6 \Zn" \ "Core/tdeartwork" "Extra artwork/themes/wallpapers for TDE" off "\Zb\Z6 \Zn" \ @@ -378,7 +380,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Deps/libcaldav" "Calendaring Extensions to WebDAV" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \ "Deps/libcarddav" "Online address support" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \ "Core/tdepim" "Personal Information Management" off "\Zb\Z6 \Zn" \ -"Core/tdeaddons" "Additional plugins and scripts" off "\Zb\Z6 Optional plugins from tdegames, tdemultimedia, tdepim \Zn" \ +"Core/tdeaddons" "Additional plugins and scripts" off "\Zb\Z6 Plugins from tdegames, tdemultimedia, tdepim are build-time options \Zn" \ "Core/tdesdk" "Tools used by TDE developers" off "\Zb\Z6 Requires tdepim \Zn" \ "Core/tdetoys" "TDE Amusements" off "\Zb\Z6 \Zn" \ "Core/tdeutils" "Collection of utilities including ark" off "\Zb\Z6 \Zn" \ @@ -402,9 +404,9 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "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" \ "Apps/tdegwenview" "An image viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ -"Apps/tdegwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Required for tdegwenview when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ +"Apps/tdegwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for tdegwenview \Zn" \ "Apps/tdek3b" "The CD Creator" off "\Zb\Z6 \Zn" \ -"Apps/tdek3b-i18n" "Internationalization files for tdek3b." off "\Zb\Z6 Required for tdek3b when \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ +"Apps/tdek3b-i18n" "Internationalization files for tdek3b." off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for tdek3b \Zn" \ "Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires [tde]k3b and ffmpeg \Zn" \ "Apps/kaffeine" "Media player for TDE" off "\Zb\Z6 \Zn" \ "Apps/kbfx" "Alternate menu for TDE" off "\Zb\Z6 \Zn" \ @@ -418,8 +420,8 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/knights" "A graphical chess interface" off "\Zb\Z6 \Zn" \ "Apps/knmap" "A graphical nmap interface" off "\Zb\Z6 Might need tdesudo \Zn" \ " Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6 Buildtime option for chalk[krita] in koffice \Zn" \ -"Apps/koffice" "Office Suite" off "\Zb\Z6 Optional build-time dependencies - GraphicsMagick/libpng14 [for chalk/krita] \Zn" \ -"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/koffice" "Office Suite" off "\Zb\Z6 Optional build-time dependencies - GraphicsMagick, libpng14 \Zn" \ +"Apps/koffice-i18n" "Internationalization files for koffice" off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for koffice \Zn" \ "Apps/krusader" "File manager for TDE" off "\Zb\Z6 \Zn" \ " Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. pdf/html docs not built by default \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" \ @@ -432,7 +434,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/piklab" "IDE for PIC microcontrollers" off "\Zb\Z6 \Zn" \ " Misc/potrace" "For tracing bitmaps to a vector graphics format" off "\Zb\Z6 Required for potracegui, optional for inkscape \Zn" \ "Apps/potracegui" "A GUI for potrace" off "\Zb\Z6 Requires potrace \Zn" \ -"Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper funtionality \Zn" \ +"Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper functionality \Zn" \ "Apps/soundkonverter" "frontend to various audio converters" off "\Zb\Z6 \Zn" \ "Apps/tde-style-lipstik" "lipstik theme" off "\Zb\Z6 \Zn" \ "Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6 \Zn" \ @@ -751,11 +753,17 @@ do build=$(cat $package.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) # The real build starts here - script -c "sh $package.SlackBuild" $TMP/$package-$TDEVERSION-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} + echo -e "\033[39;1m + + Starting $package.SlackBuild .. + $(printf '%0.s\"' $(seq 1 $[${#package}+20])) + \033[0m" + + script -c "sh $package.SlackBuild" $TMP/$package-$(eval echo $version)-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} # remove colorizing escape sequences from build-log # Re: http://serverfault.com/questions/71285/in-centos-4-4-how-can-i-strip-escape-sequences-from-a-text-file - sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$package-$TDEVERSION-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} + sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$package-$(eval echo $version)-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} checkinstall () { @@ -775,7 +783,7 @@ sed -i "s|$dir ||" $TMPVARS/TDEbuilds || \ { echo " Error: $package package build failed - Check the build log $TMP/$package-$TDEVERSION-$ARCH-$build-build-log + Check the build log $TMP/$package-$(eval echo $version)-$ARCH-$build-build-log " ## if koffice was building with libpng14, restore the libpng16 headers for any following builds [[ ${USE_PNG14:-} == yes ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn || true diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 4e10600..6a6aa0f 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -47,6 +47,7 @@ tar xf $SOURCE $PRGNAM${SNAPSHOT:-}/cmake tar xf $SRCDIR/../../src/cmake-$TDEVERSION.$ARCHIVE_TYPE --strip-components=1 -C $PRGNAM${SNAPSHOT:-}/cmake } } + for lang in $I18N do [[ $TDEVERSION == *14.0.? ]] && { @@ -56,6 +57,9 @@ echo "Extracting the $PRGNAM-$lang source from the $(basename $SOURCE) archive . echo -e "\033[0m" tar -xf $SOURCE $PRGNAM${SNAPSHOT:-}/$PRGNAM-$lang cd $PRGNAM* + +true # don't go to cgit if extracting fails + } || { mkdir -p $PRGNAM # need -p for git builds if more than one lang cd $PRGNAM @@ -72,9 +76,10 @@ chown_fn mkdir -p $PRGNAM-$lang/build cd $PRGNAM-$lang/build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -82,7 +87,9 @@ cd $PRGNAM-$lang/build -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DBUILD_ALL="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_DATA="ON" \ + -DBUILD_MESSAGES="ON" \ .. make_fn @@ -93,7 +100,6 @@ cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM-$lang chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; - mkdir_install_fn # extract the name of the language from the source text - a bit messy but there is no standard format @@ -101,6 +107,8 @@ Lang=$(grep Language-Team: $TMP_BUILD/tmp-$PRGNAM/$PRGNAM*/tde-i18n-$lang/messag [[ "$lang" == "pt" ]] && Lang="Portuguese" [[ "$lang" == "fy" ]] && Lang="Frisian" +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -109,12 +117,12 @@ echo " # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| +$PRGNAM-$lang: tde-i18n-$lang +$PRGNAM-$lang: +$PRGNAM-$lang: Language support for TDE: $Lang $PRGNAM-$lang: -$PRGNAM-$lang: $PRGNAM-$lang $PRGNAM-$lang: -$PRGNAM-$lang: Language support for TDE: $PRGNAM-$lang: -$PRGNAM-$lang: $(echo $Lang) $PRGNAM-$lang: $PRGNAM-$lang: $PRGNAM-$lang: @@ -123,15 +131,6 @@ $PRGNAM-$lang: $PRGNAM-$lang: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -\$(which update-desktop-database) $INSTALL_TDE/share/applications - -# Update hicolor theme cache: -\$(which gtk-update-icon-cache) -f -t $INSTALL_TDE/share/icons/hicolor - -EOINS - ARCH="noarch" cd $PKG makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$lang-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild index 6ab34f5..17eec73 100755 --- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild +++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild @@ -41,18 +41,17 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ - --enable-closure \ - --build=$ARCH-slackware-linux + --enable-closure make_fn @@ -62,6 +61,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -70,32 +71,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (accessibility programs) -$PRGNAM: -$PRGNAM: accessibility programs -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: Accessibility programs $PRGNAM: +$PRGNAM: * kmag: a screen magnifier. +$PRGNAM: * kmousetool: clicks the mouse whenever the mouse cursor +$PRGNAM: pauses briefly +$PRGNAM: * kmouth: lets the computer speak. +$PRGNAM: Requires a speech synthesizer installed. +$PRGNAM: * ksayit: a text to speech frontend +$PRGNAM: * kttsd: Text-to-Speech system. A plugin based service to allow any +$PRGNAM: application to speak using the dcop interface $PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index 29ed799..8a16bc3 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -32,85 +32,31 @@ source ../../get-source.sh getsource_fn untar_fn -listdocs_fn - -[[ $TDEVERSION == R14.0.4 ]] && { -# patch for TDE bug 2043 -echo $' ---- konq-plugins/arkplugin/arkplugin.cpp -+++ konq-plugins/arkplugin/arkplugin.cpp -@@ -307 +306,0 @@ -- { -@@ -309,2 +307,0 @@ -- m_archiveMimeTypes << "application/x-tbz2"; -- } -@@ -382 +379 @@ -- m_archiveMimeTypes << "application/x-lzma"; -+ m_extractMimeTypes << "application/x-lzma"; -@@ -389 +386 @@ -- m_archiveMimeTypes << "application/x-xz"; -+ m_extractMimeTypes << "application/x-xz"; -@@ -398 +394,0 @@ -- { -@@ -400,2 +395,0 @@ -- m_extractMimeTypes << "application/x-tbz2"; -- } -@@ -405 +399 @@ -- m_extractMimeTypes << "application/x-lzma"; -+ m_extractMimeTypes << "application/x-tlz"; -' | while read line -do -patch -p0 -done -echo $' ---- konq-plugins/arkplugin/arkplugin.cpp -+++ konq-plugins/arkplugin/arkplugin.cpp -@@ -328 +328 @@ -- m_archiveMimeTypes << "application/x-rar" << "application/x-rar-compressed"; -+ m_archiveMimeTypes << "application/x-rar"; -' | while read line -do -patch -p0 -done +listdocs_fn -## Set the default compression as tar.xz -## enable jar & ar compression in Compress As menu -## remove application/x-rar-compressed +## enable 'ar' compression in Compress As menu echo $' --- konq-plugins/arkplugin/arkplugin.cpp +++ konq-plugins/arkplugin/arkplugin.cpp -@@ -96 +96 @@ -- m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" ); -+ m_ext = m_conf->readEntry( "LastExtension", ".tar.xz" ); -@@ -107 +107 @@ -- "LastMimeType", "application/x-tgz" ) )->comment(), -+ "LastMimeType", "application/x-txz" ) )->comment(), -@@ -323 +323 @@ -- if ( m_conf->readBoolEntry( "UseJar", false ) ) -+ if ( m_conf->readBoolEntry( "UseJar", true ) ) -@@ -346 +346 @@ +@@ -347 +347 @@ - if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) ) + if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", true ) ) -@@ -411 +411 @@ -- m_extractMimeTypes << "application/x-rar" << "application/x-rar-compressed"; -+ m_extractMimeTypes << "application/x-rar"; ' | while read line do -patch -p0 -done -} +patch -N -p0 +done || true chown_fn # check for libatlantic [tdegames] -[[ $(ls $INSTALL_TDE/lib/libatlantic.so.*) ]] && ATLANTIKDESIGNER="ON" +[[ $(ls $INSTALL_TDE/lib$LIBDIRSUFFIX/libatlantic.so.*) ]] && ATLANTIKDESIGNER="ON" -# check for kaddressbook in tdepim -[[ $(ls $INSTALL_TDE/share/cmake/kaddressbook.cmake) ]] && KADDRESSBOOK_PLUGINS="ON" +# check for libkaddressbook [tdepim] +[[ $(ls $INSTALL_TDE/lib$LIBDIRSUFFIX/libkaddressbook.so*) ]] && KADDRESSBOOK_PLUGINS="ON" -# check for tdemultimedia -[[ $(ls $INSTALL_TDE/include/arts/artsmodules.h) ]] && NOATUN_PLUGINS="ON" +# check for libnoatun [tdemultimedia] +[[ $(ls $INSTALL_TDE/lib$LIBDIRSUFFIX/libnoatun.so*) ]] && NOATUN_PLUGINS="ON" cd_builddir_fn cmake \ @@ -125,13 +71,26 @@ cd_builddir_fn -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_ALL_OPTIONS="ON" \ - -DBUILD_ALL="ON" \ + -DWITH_ARTS="ON" \ + -DWITH_SDL="ON" \ + -DWITH_BERKELEY_DB="ON" \ + -DWITH_XMMS="OFF" \ + -DWITH_TEST="OFF" \ + -DBUILD_DOC="ON" \ -DBUILD_ATLANTIKDESIGNER=${ATLANTIKDESIGNER:-"OFF"} \ -DBUILD_KADDRESSBOOK_PLUGINS=${KADDRESSBOOK_PLUGINS:-"OFF"} \ -DBUILD_NOATUN_PLUGINS=${NOATUN_PLUGINS:-"OFF"} \ + -DBUILD_KATE_PLUGINS="ON" \ + -DBUILD_KICKER_APPLETS="ON" \ + -DBUILD_KNEWSTICKER_SCRIPTS="ON" \ + -DBUILD_KONQ_PLUGINS="ON" \ + -DBUILD_KSIG="ON" \ + -DBUILD_RENAMEDLG_PLUGINS="ON" \ + -DBUILD_TDEFILE_PLUGINS="ON" \ + -DBUILD_TUTORIALS="OFF" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -140,6 +99,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -147,39 +108,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (additional plugins and scripts) -$PRGNAM: $PRGNAM: tdeaddons contains additional plugins and scripts for some TDE $PRGNAM: applications. $PRGNAM: +$PRGNAM: See $INSTALL_TDE/doc/tdeaddons-$TDEVERSION/README for details +$PRGNAM: +$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: http://www.trinitydesktop.org/ " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1 -fi - -EOINS - makepkg_fn diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index 88c4839..dbf49f1 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.SlackBuild @@ -51,16 +51,17 @@ cmake \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DBUILD_DOC=ON \ - -DBUILD_KCRON=ON \ - -DBUILD_KDAT=ON \ - -DBUILD_KNETWORKCONF=ON \ - -DBUILD_KSYSV=ON \ - -DBUILD_KUSER=ON \ - -DBUILD_LILO_CONFIG=ON \ - -DBUILD_KPACKAGE=ON \ - -DBUILD_TDEFILE_PLUGINS=ON \ - -DBUILD_SECPOLICY=OFF \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DBUILD_DOC="ON" \ + -DBUILD_KCRON="ON" \ + -DBUILD_KDAT="ON" \ + -DBUILD_KNETWORKCONF="ON" \ + -DBUILD_KSYSV="ON" \ + -DBUILD_KUSER="ON" \ + -DBUILD_LILO_CONFIG="ON" \ + -DBUILD_KPACKAGE="ON" \ + -DBUILD_TDEFILE_PLUGINS="ON" \ + -DBUILD_SECPOLICY="OFF" \ -Wno-dev \ .. @@ -72,6 +73,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -80,32 +83,17 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (System admin packages) -$PRGNAM: -$PRGNAM: The tdeadmin package contains packages that usually only a system -$PRGNAM: administrator might need -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: System admin packages $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: * kcron: Editor for the cron command scheduler. +$PRGNAM: * kdat: Tape backup tool. +$PRGNAM: * tdefile-plugins: Make Konquerer display info about *.dep/rpm files. +$PRGNAM: * kpackage: Manager for DEB, RPM and similar software packages. +$PRGNAM: * ksysv: An editor for System V startup schemes. +$PRGNAM: * kuser: An user manager. +$PRGNAM: * lilo-config: A KControl plugin to manage the Linux boot loader LILO +$PRGNAM: * knetworkconf: management of Network Interfaces, Routing +$PRGNAM: and DNS properties " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index bd7dce6..39bc115 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -32,28 +32,41 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_ARTS="ON" \ -DWITH_XSCREENSAVER="OFF" \ - -DBUILD_ALL="ON" \ + -DWITH_LIBART="ON" \ + -DWITH_OPENGL="ON" \ + -DBUILD_EMOTICONS="ON" \ + -DBUILD_ICEWM_THEMES="ON" \ + -DBUILD_ICON_THEMES="ON" \ + -DBUILD_TDESCREENSAVER="ON" \ + -DBUILD_TWIN_STYLES="ON" \ + -DBUILD_KWORLDCLOCK="ON" \ + -DBUILD_SOUNDS="ON" \ + -DBUILD_STYLES="ON" \ + -DBUILD_WALLPAPERS="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -62,6 +75,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -69,39 +84,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Extra artwork/themes/wallpapers for TDE) +$PRGNAM: tdeartwork $PRGNAM: $PRGNAM: Extra artwork/themes/wallpapers for TDE +$PRGNAM: * themes, +$PRGNAM: * screensaver, +$PRGNAM: * sounds, +$PRGNAM: * wallpapers, +$PRGNAM: * widget styles and +$PRGNAM: * window styles $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 -fi - -EOINS - makepkg_fn diff --git a/Core/tdebase/doinst.sh b/Core/tdebase/doinst.sh index 4df8d35..bf4a95f 100755 --- a/Core/tdebase/doinst.sh +++ b/Core/tdebase/doinst.sh @@ -27,13 +27,13 @@ config .{SYS_CNF_DIR}/tdm/tdmrc.new config .{SYS_CNF_DIR}/tdm/backgroundrc.new # Update the desktop database: -$(which update-desktop-database) {INSTALL_TDE}/share/applications +/usr/bin/update-desktop-database .{INSTALL_TDE}/share/applications # Update the mime database: -$(which update-mime-database) /usr/share/mime +/usr/bin/update-mime-database usr/share/mime # Update hicolor theme cache: -$(which gtk-update-icon-cache) -f -t {INSTALL_TDE}/share/icons/hicolor +/usr/bin/gtk-update-icon-cache -f -t .{INSTALL_TDE}/share/icons/hicolor # update PATH diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 9a732a9..af4dd17 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -37,10 +37,9 @@ untar_fn listdocs_fn -## patch for gcc7 twin/client.cpp:2978:38: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] -sed -i 's|data != None|data != 0|' twin/client.cpp ## allow for configuration files directory != /etc/trinity sed -i "s|/etc/trinity/|$SYS_CNF_DIR/|" tdm/kfrontend/gentdmconf.c || true + ## make default tdm screen text clearer against dark background and align login button with clickable area ## edit color="#ffff74" and/or color="#ff0000" for your own choice echo $' @@ -111,7 +110,7 @@ chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ @@ -123,30 +122,91 @@ cd_builddir_fn -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_ARTS="ON" \ + -DWITH_ELFICON="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_HAL="OFF" \ + -DWITH_I8K="OFF" \ + -DWITH_LDAP="OFF" \ + -DWITH_LIBART="ON" \ + -DWITH_LIBCONFIG="OFF" \ + -DWITH_LIBRAW1394="OFF" \ + -DWITH_LIBUSB="OFF" \ -DWITH_OPENEXR="ON" \ - -DWITH_XCOMPOSITE="ON" \ - -DWITH_XCURSOR="ON" \ - -DWITH_SUDO_TDESU_BACKEND="ON" \ - -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \ + -DWITH_OPENGL="ON" \ -DWITH_PAM="OFF" \ + -DWITH_PCRE="ON" \ + -DWITH_SAMBA="OFF" \ + -DWITH_SASL="OFF" \ + -DWITH_SENSORS="OFF" \ -DWITH_SHADOW="ON" \ + -DWITH_SUDO_KONSOLE_SUPER_USER_COMMAND="ON" \ + -DWITH_SUDO_TDESU_BACKEND="ON" \ + -DWITH_TDEHWLIB="ON" \ + -DWITH_UPOWER="ON" \ + -DWITH_XCOMPOSITE="ON" \ + -DWITH_XCURSOR="ON" \ + -DWITH_XDMCP="ON" \ -DWITH_XFIXES="ON" \ + -DWITH_XINERAMA="ON" \ -DWITH_XRANDR="ON" \ -DWITH_XRENDER="ON" \ - -DWITH_OPENGL="ON" \ -DWITH_XSCREENSAVER="OFF" \ -DWITH_XTEST="ON" \ - -DWITH_LIBART="ON" \ - -DWITH_LIBUSB="OFF" \ - -DWITH_XDMCP="ON" \ - -DWITH_XINERAMA="ON" \ - -DWITH_ARTS="ON" \ - -DWITH_TDEHWLIB="ON" \ - -DWITH_UPOWER="ON" \ - -DWITH_PCRE="ON" \ - -DBUILD_ALL="ON" \ + -DBUILD_APPLNK="ON" \ + -DBUILD_CRASHTEST="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_DRKONQI="ON" \ + -DBUILD_KAPPFINDER="ON" \ + -DBUILD_KATE="ON" \ + -DBUILD_KCHECKPASS="ON" \ + -DBUILD_KCMINIT="ON" \ + -DBUILD_KCONTROL="ON" \ + -DBUILD_KDCOP="ON" \ + -DBUILD_KDESKTOP="ON" \ + -DBUILD_KDIALOG="ON" \ + -DBUILD_KFIND="ON" \ + -DBUILD_KHELPCENTER="ON" \ + -DBUILD_KHOTKEYS="ON" \ + -DBUILD_KICKER="ON" \ + -DBUILD_KLIPPER="ON" \ + -DBUILD_KMENUEDIT="ON" \ + -DBUILD_KNETATTACH="ON" \ + -DBUILD_KONQUEROR="ON" \ + -DBUILD_KONSOLE="ON" \ + -DBUILD_KPAGER="ON" \ + -DBUILD_KPERSONALIZER="ON" \ + -DBUILD_KREADCONFIG="ON" \ + -DBUILD_KROOTBACKING="ON" \ + -DBUILD_KSMSERVER="ON" \ + -DBUILD_KSPLASHML="ON" \ + -DBUILD_KSTART="ON" \ + -DBUILD_KSYSGUARD="ON" \ + -DBUILD_KSYSTRAYCMD="ON" \ + -DBUILD_KTIP="ON" \ + -DBUILD_KXKB="ON" \ + -DBUILD_L10N="ON" \ + -DBUILD_LIBKONQ="ON" \ + -DBUILD_NSPLUGINS="ON" \ + -DBUILD_PICS="ON" \ + -DBUILD_PROFILE_SHUTDOWN="OFF" \ + -DBUILD_STARTTDE="ON" \ + -DBUILD_TDEDEBUGDIALOG="ON" \ + -DBUILD_TDEEJECT="ON" \ + -DBUILD_TDEINIT="ON" \ + -DBUILD_TDEIOSLAVES="ON" \ + -DBUILD_TDEKBDLEDSYNC="ON" \ + -DBUILD_TDEPASSWD="ON" \ + -DBUILD_TDEPRINT="ON" \ + -DBUILD_TDESCREENSAVER="ON" \ + -DBUILD_TDESU="ON" \ + -DBUILD_TDM="ON" \ + -DBUILD_TQT3INTEGRATION="ON" \ + -DBUILD_TSAK="ON" \ + -DBUILD_TWIN="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -199,6 +259,22 @@ fi mkdir_install_fn +sed "s|{SYS_CNF_DIR}|$SYS_CNF_DIR|;s|{INSTALL_TDE}|$INSTALL_TDE|;s|{TQTDIR}|$TQTDIR|" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh +[[ $RUNLEVEL == 4 ]] && { +echo " +## set default runlevel to 4 for tdm +sed -i 's|id:[1-5]|id:4|' etc/inittab +" >> $PKG/install/doinst.sh +} +## set TDEHOME and TDEROOTHOME variables - defaults ~/.trinity and /root/.trinity +[[ $SYS_CNF_DIR == /etc/tde ]] && { +echo "# upgradepkg runs installpkg twice, so firstly remove any previous TDE*HOME entries +sed -i '/TDE.*HOME/d' /etc/profile +echo 'export TDEHOME=~/.tde' >> /etc/profile +echo 'export TDEROOTHOME=/root/.tde' >> /etc/profile +" >> $PKG/install/doinst.sh +} + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -206,9 +282,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (The Trinity Desktop base) +$PRGNAM: tdebase (The Trinity Desktop base) $PRGNAM: $PRGNAM: tdebase is the second mandatory package (besides tdelibs) for the $PRGNAM: Trinity Desktop Environment. Here we have various applications and @@ -218,23 +293,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc -sed "s|{SYS_CNF_DIR}|$SYS_CNF_DIR|;s|{INSTALL_TDE}|$INSTALL_TDE|;s|{TQTDIR}|$TQTDIR|" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh -[[ $RUNLEVEL == 4 ]] && { -echo " -## set default runlevel to 4 for tdm -sed -i 's|id:[1-5]|id:4|' etc/inittab -" >> $PKG/install/doinst.sh -} -## set TDEHOME and TDEROOTHOME variables - defaults ~/.trinity and /root/.trinity -[[ $SYS_CNF_DIR == /etc/tde ]] && { -echo "# upgradepkg runs installpkg twice, so firstly remove any previous TDE*HOME entries -sed -i '/TDE.*HOME/d' /etc/profile -echo 'export TDEHOME=~/.tde' >> /etc/profile -echo 'export TDEROOTHOME=/root/.tde' >> /etc/profile -" >> $PKG/install/doinst.sh -} - makepkg_fn diff --git a/Core/tdeedu/README b/Core/tdeedu/README index e268ded..bd40ea0 100644 --- a/Core/tdeedu/README +++ b/Core/tdeedu/README @@ -1,25 +1,7 @@ -There are issues building with cmake, so until they are resolved, the preference is an autotools build. -If you DO want to build with cmake, run 'USE_CMAKE_EDU=yes ./BUILD-TDE.sh' -kalzium won't build at all with cmake; it will with autotools, with limitations: - -Re: configure output: -""" -The Kalzium Chemical Equation Solver has been disabled. Possible reasons of that: - -* OCaml was not found. In order to have the Solver, you have to install OCaml. You can get OCaml from http://pauillac.inria.fr/ocaml/. - -* The FaCiLe module for OCaml was not found. In order to have the Solver, you have to install the FaCiLe module. You can get it from http://www.recherche.enac.fr/opti/facile/. +Building with cmake, Kig doesn't run with the python scripting option. +Until that is resolved, the preference is an autotools build. +For both, the Kalzium Chemical Equation Solver needs OCaml, and the FaCiLe module. -Kig Python scripting support has been disabled, because you are missing the necessary headers and/or libraries. -In order to use Kig Python scripting, you need to have Python installed, along with its development package ( e.g. libpython-dev ), and also the Boost.Python library, along with its development package ( e.g. libboost-python-dev ). - -Kig will continue to function without Python scripting support, but you will not be able to created Python scripted objects, or load Kig files that use them. - -Installing the libraries: -The python development libraries themselves are almost certainly packaged by your favourite distribution. -Look for a package name like libpython-dev, with possibly a version number inserted somewhere in the name.. -For the Boost.Python libs, check this documentation: "http://boost.org/more/download.html" and "http://boost.org/more/download.html#Installation" or look for a package like libboost-python-dev or libboost-dev.. - -""" +If you DO want to build with cmake, run 'USE_CMAKE_EDU=yes ./BUILD-TDE.sh' diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild index b920e82..337d95c 100755 --- a/Core/tdeedu/tdeedu.SlackBuild +++ b/Core/tdeedu/tdeedu.SlackBuild @@ -33,6 +33,22 @@ getsource_fn untar_fn +## patch for kig python scripting error: +## kig: /usr/include/boost/python/object_core.hpp:422: boost::python::api::object_base::~object_base(): Assertion `Py_REFCNT(m_ptr) > 0' failed. +## Re: https://bugs.kde.org/show_bug.cgi?id=401512#c5 +echo $' +--- kig/scripting/python_scripter.cc ++++ kig/scripting/python_scripter.cc +@@ -493,0 +494 @@ ++ Py_XINCREF((objectvect.begin() +i)->ptr()); +' | while read line +do +patch -N -p0 +done || true + +## for 14.0.7, already done in cgit +sed -i 's|Nome del file di input|Input filename|' kig/pykig/pykig.py + listdocs_fn ## There are issues building with cmake - see README @@ -40,11 +56,20 @@ USE_CMAKE_EDU=${USE_CMAKE_EDU:-no} [[ $USE_CMAKE_EDU == no ]] && { +## patch for the libboost_python soname as used in Slackware +sed -i 's|for bplib in|& "-lboost_python${PYVERSHORT%.*}${PYVERSHORT#*.}"|' kig/configure.in.in + ## include all keyboards for ktouch (cd ktouch/keyboards/ sed -i '/keyboard_DATA/q' Makefile.am echo $(ls *keyboard) >> Makefile.am) +## add sk data to klatin +cat klatin/klatin/data/vocab/pl/Makefile.am | sed 's|pl|sk|g' > klatin/klatin/data/vocab/sk/Makefile.am + +## install kig examples +sed -i 's|noinst_DATA|examplesdir = $(kde_datadir)/kig/examples\nexamples_DATA|' kig/examples/Makefile.am + ltoolupdate_fn chown_fn @@ -59,19 +84,21 @@ CXX=$COMPILER_CXX \ --disable-rpath \ --enable-closure +true # don't go to cmake if ./configure fails + } || { chown_fn cd_builddir_fn -## KALZIUM won't build without ocamlc -KALZIUM=OFF +## The Kalzium Chemical Equation Solver needs OCaml +OCAML=OFF cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -79,15 +106,13 @@ cmake \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DWITH_ALL_OPTIONS="OFF" \ -DWITH_GCC_VISIBILITY="OFF" \ -DWITH_ARTS="ON" \ - -DWITH_OCAML_SOLVER="ON" \ + -DWITH_OCAML_SOLVER=$OCAML \ -DWITH_LIBUSB="ON" \ -DWITH_V4L="ON" \ - -DBUILD_ALL="OFF" \ -DBUILD_BLINKEN="ON" \ - -DBUILD_KALZIUM="$KALZIUM" \ + -DBUILD_KALZIUM="ON" \ -DBUILD_KANAGRAM="ON" \ -DBUILD_KBRUCH="ON" \ -DBUILD_KEDUCA="ON" \ @@ -110,6 +135,9 @@ cmake \ } +## remove obsolete tags +doxygen -u doc/kig/scripting-api/Doxyfile.scripting-api + make_fn installdocs_fn @@ -118,6 +146,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -126,32 +156,27 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (TDE educational software) -$PRGNAM: -$PRGNAM: Many pieces of software for education. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: tdeedu (TDE educational software) $PRGNAM: +$PRGNAM: * blinken: the KDE version of the well-known game Simon Says +$PRGNAM: * kalzium: periodic table of elements +$PRGNAM: * kanagram: an anagram game +$PRGNAM: * kbruch: fraction excercise trainer +$PRGNAM: * keduca: creation and revision of form-based tests and exams. +$PRGNAM: * kgeography: geography learning program +$PRGNAM: * khangman: hangman game. +$PRGNAM: * kig: interactive geometry +$PRGNAM: * kiten: japanese reference tool +$PRGNAM: * klatin: aims to help revise or learn Latin +$PRGNAM: * klettres: helps to learn the alphabet and to read some syllables +$PRGNAM: * kmplot: mathematical function plotter +$PRGNAM: * kpercentage: improve skills in calculating percentages +$PRGNAM: * kstars: desktop planetarium +$PRGNAM: * ktouch: program for learning touch typing +$PRGNAM: * kturtle: programming environment using the Logo programming language +$PRGNAM: * kverbos: study Spanish verb forms +$PRGNAM: * kvoctrain: vocabulary trainer +$PRGNAM: * kwordquiz: a powerful way to master new vocabularies " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 0c324d1..33d4130 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -38,15 +38,15 @@ chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ARTS="ON" \ -DBUILD_ATLANTIK="ON" \ -DBUILD_DOC="ON" \ @@ -110,19 +110,42 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Games for the Trinity Desktop Environment) -$PRGNAM: -$PRGNAM: atlantik, kasteroids, katomic, kbackgammon, kbattleship, kblackbox, -$PRGNAM: kbounce, keneloba, kfouleggs, kjumpingcube, klickety, klines, -$PRGNAM: kmahjongg, kmines, kolf, konquest, kpat, kpoker, kreversi, ksame, -$PRGNAM: kshisen, ksirtet, ksmiletris, ksnake, ksokoban, kspaceduel, ktron, -$PRGNAM: ktuberling, twin4, lskat. -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: Games for TDE $PRGNAM: +$PRGNAM: * atlantik: Monopoly-like board games +$PRGNAM: * kasteroids: Shoot at those nasty asteroids. +$PRGNAM: * katomic: Build complex atoms with a minimal amount of moves. +$PRGNAM: * kbackgammon: Play backgammon against a local human player, via a +$PRGNAM: game server or against GNU Backgammon (not included) +$PRGNAM: * kbattleship: Battleships, with built-in game server. +$PRGNAM: * kblackbox: Find atoms in a grid by shooting electrons. +$PRGNAM: * kbounce: Reduce the areas for the bouncing balls +$PRGNAM: * keneloba: Push pieces of your opponent out of the board +$PRGNAM: * kfouleggs: A famous japanese game known as puyo-puyo. +$PRGNAM: * kgoldrunner: dodge your enemies, collect all the gold +$PRGNAM: * kjumpingcube: A tactical game for number-crunchers. +$PRGNAM: * klickety: A tetris like game. +$PRGNAM: * klines: Build lines of 5 or more marbles +$PRGNAM: * kmahjongg: A tile laying patience. +$PRGNAM: * kmines: The classical mine sweeper. +$PRGNAM: * knetwalk: connect all the LAN terminals to the server +$PRGNAM: * kolf: A mini golf game. +$PRGNAM: * konquest: Conquer the planets of your enemy. +$PRGNAM: * kpat: Several patience card games. +$PRGNAM: * kpoker: The game of poker. +$PRGNAM: * kreversi: The old reversi board game, also known as Othello. +$PRGNAM: * ksame: Collect pieces of the same color. +$PRGNAM: * kshisen: Patience game where you take away all pieces. +$PRGNAM: * ksirtet: Tetris clone +$PRGNAM: * ksmiletris: Another Tetris-like game. +$PRGNAM: * ksnake: Don't bite yourself, eat apples! +$PRGNAM: * ksokoban: Move all storage boxes into the cabinet. +$PRGNAM: * kspaceduel: Two player game - shoot spaceships flying around a sun. +$PRGNAM: * ktron: Like ksnake, but without fruits. +$PRGNAM: * ktuberling: Kids game: make your own potato +$PRGNAM: * lskat: 2 player skat card game. +$PRGNAM: * twin4: Place 4 pieces in a row. " > $PKG/install/slack-desc makepkg_fn diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index e5122b5..3d358cb 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -33,187 +33,48 @@ getsource_fn untar_fn -## for R14* - bug 2957 -[[ $TDEVERSION == R14.0.? ]] && { -echo $'--- tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake -+++ tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake -@@ -27,5 +27,5 @@ --if( NOT DEFINED HAVE_POPPLER_060 ) -- message( STATUS "Performing Test HAVE_POPPLER_060" ) -- if( NOT POPPLER_VERSION VERSION_LESS "0.60" ) -- set( HAVE_POPPLER_060 1 CACHE INTERNAL "" FORCE ) -- message( STATUS "Performing Test HAVE_POPPLER_060 - Success" ) -+if( NOT DEFINED HAVE_POPPLER_058 ) -+ message( STATUS "Performing Test HAVE_POPPLER_058" ) -+ if( NOT POPPLER_VERSION VERSION_LESS "0.58" ) -+ set( HAVE_POPPLER_058 1 CACHE INTERNAL "" FORCE ) -+ message( STATUS "Performing Test HAVE_POPPLER_058 - Success" ) -@@ -33,2 +33,13 @@ -- set( HAVE_POPPLER_060 "" CACHE INTERNAL "" FORCE ) -- message( STATUS "Performing Test HAVE_POPPLER_060 - Failed" ) -+ set( HAVE_POPPLER_058 "" CACHE INTERNAL "" FORCE ) -+ message( STATUS "Performing Test HAVE_POPPLER_058 - Failed" ) -+ endif( ) -+endif( ) -+ -+if( NOT DEFINED HAVE_POPPLER_064 ) -+ message( STATUS "Performing Test HAVE_POPPLER_064" ) -+ if( NOT POPPLER_VERSION VERSION_LESS "0.64" ) -+ set( HAVE_POPPLER_064 1 CACHE INTERNAL "" FORCE ) -+ message( STATUS "Performing Test HAVE_POPPLER_064 - Success" ) -+ else( ) -+ set( HAVE_POPPLER_064 "" CACHE INTERNAL "" FORCE ) -+ message( STATUS "Performing Test HAVE_POPPLER_064 - Failed" ) ---- config.h.cmake -+++ config.h.cmake -@@ -4 +4,2 @@ --#cmakedefine HAVE_POPPLER_060 -+#cmakedefine HAVE_POPPLER_064 -+#cmakedefine HAVE_POPPLER_058 ---- tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc -+++ tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc -@@ -156 +156 @@ --# if defined(HAVE_POPPLER_060) -+# if defined(HAVE_POPPLER_058) -@@ -166 +166 @@ -- GooString *s1; -+ CONST_064 GooString *s1; -@@ -173 +173 @@ --# if defined(HAVE_POPPLER_060) -+# if defined(HAVE_POPPLER_058) -@@ -205 +205 @@ --# if !defined(HAVE_POPPLER_060) -+# if !defined(HAVE_POPPLER_058) -@@ -211 +211 @@ --# if !defined(HAVE_POPPLER_060) -+# if !defined(HAVE_POPPLER_058) -@@ -226 +226 @@ --# if defined(HAVE_POPPLER_060) -+# if defined(HAVE_POPPLER_058) -@@ -232 +232 @@ --# if !defined(HAVE_POPPLER_060) -+# if !defined(HAVE_POPPLER_058) -@@ -245 +245 @@ --# if defined(HAVE_POPPLER_060) -+# if defined(HAVE_POPPLER_058) -@@ -259 +259 @@ --# if !defined(HAVE_POPPLER_060) -+# if !defined(HAVE_POPPLER_058) -@@ -267 +267 @@ --# if !defined(HAVE_POPPLER_060) -+# if !defined(HAVE_POPPLER_058) -@@ -323 +323 @@ -- GooList * items = outline->getItems(); -+ CONST_064 GooList * items = outline->getItems(); -@@ -350 +350 @@ --#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) -+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) ---- tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc -+++ tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc -@@ -33,2 +33,2 @@ -- LinkDest *ld = data.ld; -- -+ CONST_064 LinkDest *ld = data.ld; -+ ---- tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc -+++ tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc -@@ -132 +132 @@ --#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) -+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) -@@ -167 +167 @@ --#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) -+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020) -@@ -208 +208 @@ --# if defined(HAVE_POPPLER_060) -+# if defined(HAVE_POPPLER_058) -@@ -215 +215 @@ --# if !defined(HAVE_POPPLER_060) -+# if !defined(HAVE_POPPLER_058) ---- tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc -+++ tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc -@@ -34 +34 @@ --TQString unicodeToTQString(Unicode* u, int len) -+TQString unicodeToTQString(CONST_064 Unicode* u, int len) -@@ -44 +44 @@ --TQString UnicodeParsedString(GooString *s1) -+TQString UnicodeParsedString(CONST_064 GooString *s1) -@@ -89 +89 @@ --void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items ) -+void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items ) -@@ -99 +99 @@ -- Unicode * uniChar = outlineItem->getTitle(); -+ CONST_064 Unicode * uniChar = outlineItem->getTitle(); -@@ -109 +109 @@ -- ::LinkAction * a = outlineItem->getAction(); -+ CONST_064 ::LinkAction * a = outlineItem->getAction(); -@@ -113,2 +113,2 @@ -- LinkGoTo * g = static_cast< LinkGoTo * >( a ); -- LinkDest * destination = g->getDest(); -+ CONST_064 LinkGoTo * g = static_cast< CONST_064 LinkGoTo * >( a ); -+ CONST_064 LinkDest * destination = g->getDest(); -@@ -120 +120 @@ -- GooString *s = g->getNamedDest(); -+ CONST_064 GooString *s = g->getNamedDest(); -@@ -134 +134 @@ -- LinkGoToR * g2 = static_cast< LinkGoToR * >( a ); -+ CONST_064 LinkGoToR * g2 = static_cast< CONST_064 LinkGoToR * >( a ); -@@ -141 +141 @@ -- GooList * children = outlineItem->getKids(); -+ CONST_064 GooList * children = outlineItem->getKids(); ---- tdefile-plugins/dependencies/poppler-tqt/poppler-private.h -+++ tdefile-plugins/dependencies/poppler-tqt/poppler-private.h -@@ -36,0 +37,5 @@ -+#if defined(HAVE_POPPLER_064) -+#define CONST_064 const -+#else -+#define CONST_064 -+#endif -@@ -42 +47 @@ --TQString unicodeToTQString(Unicode* u, int len); -+TQString unicodeToTQString(CONST_064 Unicode* u, int len); -@@ -44 +49 @@ --TQString UnicodeParsedString(GooString *s1); -+TQString UnicodeParsedString(CONST_064 GooString *s1); -@@ -50 +55 @@ -- LinkDestinationData( LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc) -+ LinkDestinationData( CONST_064 LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc) -@@ -53,2 +58,2 @@ -- -- LinkDest *ld; -+ -+ CONST_064 LinkDest *ld; -@@ -87 +92 @@ -- void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items ); -+ void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items ); -' | while read line -do -patch -p0 -done +## build error with cgit: +##/tmp/build/tmp-tdegraphics/tdegraphics/build-tdegraphics/kmrml/kmrml/kcontrol/serverconfigwidget.cpp:37:61: error: invalid use of incomplete type ‘class KComboBox’ +## .. and more .. +## patch based on solution for similar amarok errors, issue #16 +[[ $TDEVERSION == cgit ]] && { +echo $' +--- kmrml/kmrml/kcontrol/serverconfigwidget.ui ++++ kmrml/kmrml/kcontrol/serverconfigwidget.ui +@@ -271,0 +272,5 @@ ++ ++ kcombobox.h ++ knuminput.h ++ klineedit.h ++ +' | patch -N -p0 || true } listdocs_fn chown_fn -# If imlib is installed, include Kuickshow: -[[ $(ls /var/log/packages/imlib-*) ]] && KUICKSHOW=ON cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +# If imlib is installed, include Kuickshow: +[[ -s /usr/include/Imlib.h ]] && KUICKSHOW=ON +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_T1LIB="OFF" \ + -DWITH_PAPER="OFF" \ -DWITH_TIFF="OFF" \ -DWITH_OPENEXR="OFF" \ -DWITH_PDF="ON" \ - -DBUILD_ALL="ON" \ + -DBUILD_DOC="ON" \ -DBUILD_TDEFILE_PLUGINS="ON" \ -DBUILD_KUICKSHOW=${KUICKSHOW:-OFF} \ -DBUILD_KPDF="ON" \ @@ -221,8 +82,23 @@ cd_builddir_fn -DBUILD_KSVG="OFF" \ -DBUILD_LIBKSCAN="OFF" \ -DBUILD_KOOKA="OFF" \ + -DBUILD_KCOLOREDIT="ON" \ + -DBUILD_KDVI="ON" \ + -DBUILD_KFAX="ON" \ + -DBUILD_KFAXVIEW="ON" \ + -DBUILD_KGAMMA="ON" \ + -DBUILD_KGHOSTVIEW="ON" \ + -DBUILD_TDEICONEDIT="ON" \ + -DBUILD_KMRML="ON" \ + -DBUILD_KOLOURPAINT="ON" \ + -DBUILD_KPOVMODELER="ON" \ + -DBUILD_KRULER="ON" \ + -DBUILD_KSNAPSHOT="ON" \ + -DBUILD_KVIEW="ON" \ + -DBUILD_KVIEWSHELL="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -231,6 +107,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -238,33 +116,33 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Misc graphics apps) -$PRGNAM: -$PRGNAM: Misc graphics apps and related -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: tdegraphics is a collection of graphic oriented applications: $PRGNAM: +$PRGNAM: * kamera: Digital camera io_slave for Konqueror. With gPhoto this +$PRGNAM: allows camera image access with the URL kamera:/ +$PRGNAM: * kcoloredit: A color value editor and color picker. +$PRGNAM: * kdvi: Program (and embeddable KPart) to display *.DVI files from TeX +$PRGNAM: * kfax: Display raw and tiffed fax images (g3, g3-2d, g4). +$PRGNAM: * kfaxview: An embeddable KPart to display tiffed fax images. +$PRGNAM: * kgamma: set monitor gamma +$PRGNAM: * kghostview: Program (and embeddable KPart) to display *.pdf and *.ps +$PRGNAM: * kmrml: Connects to a MRML server and find similar images +$PRGNAM: * kolourpaint: An easy-to-use paint program designed for drawing +$PRGNAM: simple diagrams/logos/icons and editing screenshots. +$PRGNAM: * kooka: A raster image scan program, based on SANE and libkscan. +$PRGNAM: * kpdf: a TDE pdf viewer +$PRGNAM: * kpovmodeler: Enter scenes for the 3D rendering engine PovRay. +$PRGNAM: * kruler: An on-screen ruler in inch, centimeter and pixel +$PRGNAM: * ksnapshot: Capture image of screen +$PRGNAM: * ksvg: a TDE implementation of Scalable Vector Graphics +$PRGNAM: * kuickshow: Imageviewer. +$PRGNAM: * kview: Picture viewer - standalone program and embeddable KPart. +$PRGNAM: * kviewshell: Generic framework for viewer applications. +$PRGNAM: * libkscan: Library to access scanners used by kooka (and koffice) +$PRGNAM: needs SANE +$PRGNAM: * tdefile-plugins: Provide meta information for graphic files. +$PRGNAM: * tdeiconedit: An icon editor. " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index 6d26cd7..c33c1f1 100644 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -33,9 +33,6 @@ getsource_fn untar_fn -## remove x-rar-compressed.desktop -sed -i '/x-rar-compressed.desktop/d' mimetypes/application/{CMakeLists.txt,Makefile.am} - ## TDE bug 2821 ## patch to enable tdecmshell to find TDE .desktop file in the event of a duplication in file names echo $'--- tdecmshell/main.cpp @@ -49,6 +46,7 @@ echo $'--- tdecmshell/main.cpp do patch -N -p0 done || true +# ## further patch to make error message more user friendly echo $'--- tdecmshell/main.cpp +++ tdecmshell/main.cpp @@ -71,11 +69,12 @@ listdocs_fn chown_fn +cd_builddir_fn + # Check for avahi-tqt [[ -s $INSTALL_TDE/include/avahi-tqt/qt-watch.h ]] && AVAHI="ON" -cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ @@ -88,21 +87,47 @@ cd_builddir_fn -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_SKIP_RPATH="OFF" \ - -DWITH_CUPS="ON" \ - -DWITH_SUDO_TDESU_BACKEND="ON" \ - -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DTDE_MALLOC="OFF" \ + -DTDE_MALLOC_DEBUG="OFF" \ + -DTDE_MALLOC_FULL="OFF" \ + -DWITH_ALSA="ON" \ + -DWITH_ARTS="ON" \ -DWITH_ASPELL="OFF" \ -DWITH_AVAHI=${AVAHI:-"OFF"} \ + -DWITH_CONSOLEKIT="OFF" \ + -DWITH_CUPS="ON" \ + -DWITH_DEVKITPOWER="ON" \ + -DWITH_ELFICON="OFF" \ + -DWITH_GAMIN="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_HAL="OFF" \ + -DWITH_HSPELL="OFF" \ + -DWITH_INOTIFY="ON" \ + -DWITH_JASPER="OFF" \ + -DWITH_KDE4_MENU_SUFFIX="ON" \ -DWITH_LIBART="ON" \ - -DWITH_OPENEXR="ON" \ + -DWITH_LIBBFD="OFF" \ + -DWITH_LIBIDN="OFF" \ + -DWITH_LOGINDPOWER="ON" \ + -DWITH_LUA="OFF" \ -DWITH_LZMA="ON" \ - -DWITH_XRANDR="ON" \ - -DWITH_XCOMPOSITE="ON" \ + -DWITH_MITSHM="OFF" \ + -DWITH_NETWORK_MANAGER_BACKEND="ON" \ + -DWITH_OLD_XDG_STD="OFF" \ + -DWITH_OPENEXR="ON" \ + -DWITH_PCRE="ON" \ + -DWITH_SSL="ON" \ + -DWITH_SUDO_TDESU_BACKEND="ON" \ + -DWITH_TDEHWLIB="ON" \ + -DWITH_TDEHWLIB_DAEMONS="ON" \ + -DWITH_TDEICONLOADER_DEBUG="OFF" \ + -DWITH_TIFF="OFF" \ -DWITH_UDISKS2="ON" \ -DWITH_UDISKS="ON" \ - -DWITH_DEVKITPOWER="ON" \ - -DWITH_LOGINDPOWER="ON" \ - -DWITH_KDE4_MENU_SUFFIX="ON" \ + -DWITH_UPOWER="OFF" \ + -DWITH_UTEMPTER="OFF" \ + -DWITH_XCOMPOSITE="ON" \ + -DWITH_XRANDR="ON" \ -Wno-dev \ .. @@ -114,6 +139,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -121,38 +148,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (TDE libraries) +$PRGNAM: tdelibs (TDE libraries) +$PRGNAM: +$PRGNAM: These are the Trinity Desktop Environment [TDE] libraries. $PRGNAM: -$PRGNAM: These are the Trinity Desktop Environment [TDE] -$PRGNAM: libraries. This package includes libraries that are central +$PRGNAM: This package includes libraries that are central $PRGNAM: to the development and execution of a TDE program, as well $PRGNAM: as internationalization files for these libraries, misc HTML $PRGNAM: documentation, theme modules, and regression tests. $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index 289bc46..f8f0385 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -47,7 +47,7 @@ chown_fn 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 +[[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|$INSTALL_TDE/include/tqt|g" ../configure LDFLAGS=$SLKLDFLAGS \ CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ CXXFLAGS=$SLKCFLAGS \ @@ -61,6 +61,8 @@ CXX=$COMPILER_CXX \ --disable-debug \ --enable-closure +true # don't go to cmake if ./configure fails + } || { chown_fn @@ -74,8 +76,8 @@ JUK=OFF && [[ $AKODE == ON ]] && : cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ @@ -124,6 +126,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -131,33 +135,29 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (multilmedia apps for tde) -$PRGNAM: $PRGNAM: Multimedia packages for TDE $PRGNAM: +$PRGNAM: * noatun: a multimedia player for sound and movies +$PRGNAM: * kaudiocreator: CD ripper and audio encoder frontend. +$PRGNAM: * kaboodle: light media player +$PRGNAM: * tdemid: A standalone and embeddable midi player, with a karaoke-mode +$PRGNAM: * kmix: the audio mixer as a standalone program and Kicker applet +$PRGNAM: * kscd: A CD player with an interface to the internet CDDB database +$PRGNAM: * krec: A recording frontend using aRts +$PRGNAM: * juk: a jukebox +$PRGNAM: * artsbuilder: aRts +$PRGNAM: * kcontrol: the Audio CDs module and CDDB retrieval $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: libraries and plugins supporting the above applications: +$PRGNAM: * arts: building blocks to create sound and video processing pipes +$PRGNAM: * tdefile-plugins: provides meta information about sound files +$PRGNAM: * mpeglib: a library for MPEG 1 (layer I, II and III) encoded files +$PRGNAM: * mpeglib_artsplug: wrapped mpeglib to make it aRts-aware +$PRGNAM: * mpg123_artsplugin: a trimmed down mpg123 made aRts-compatible +$PRGNAM: * oggvorbis_artsplugin: support for ogg-vorbis in aRts +$PRGNAM: * libkcddb: a library for retrieving and sending cddb information +$PRGNAM: * tdeioslave: audiocd - treats audio CDs like a 'real' filesystem " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 5c3ee96..76ed35a 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -32,10 +32,9 @@ source ../../get-source.sh getsource_fn 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" -## add patch for gcc6 - done in cgit but still required for R14.0.4 -sed -i 's|"functionName"|" functionName "|' kopete/libkopete/kautoconfig.cpp +[[ -s /usr/include/speex/speex.h ]] && SPX="ON" listdocs_fn @@ -45,7 +44,8 @@ cd_builddir_fn ## If changing any of these options, READ CMakeLists.txt for info on interdependencies .. ## GADU & MEANWHILE require libgadu and meanwhile installed. - cmake \ + +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -68,6 +68,7 @@ cd_builddir_fn -DBUILD_TDEFILE_PLUGINS="ON" \ -DBUILD_KGET="ON" \ -DBUILD_KNEWSTICKER="ON" \ + -DBUILD_KOPETE="ON" \ -DBUILD_KPF="ON" \ -DBUILD_KPPP="OFF" \ -DBUILD_KRDC="ON" \ @@ -77,7 +78,6 @@ cd_builddir_fn -DBUILD_LANBROWSING="ON" \ -DBUILD_LIBRSS="ON" \ -DBUILD_WIFI="ON" \ - -DBUILD_KOPETE="ON" \ -DBUILD_KOPETE_PROTOCOL_TESTBED="ON" \ -DBUILD_KOPETE_PROTOCOL_GROUPWISE="ON" \ -DBUILD_KOPETE_PROTOCOL_IRC="ON" \ @@ -115,7 +115,7 @@ cd_builddir_fn ## rfbScreenInfoPtr d; ## ^~~~~~~~~~~~~~~~ ## It doesn't have any use here, so unset it -## and add $TQT_INCLUDE_PATH to CMAKE_CXX_FLAGS for subsequent ntqglobal.h not found error +## and $TQT_INCLUDE_PATH has been added to CMAKE_CXX_FLAGS for subsequent ntqglobal.h not found error export CPLUS_INCLUDE_PATH="" make_fn @@ -126,6 +126,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -134,30 +136,20 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (networking applications) -$PRGNAM: $PRGNAM: Networking applications for TDE $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: * kdict: graphical client for the DICT protocol. +$PRGNAM: * knewsticker: RDF newsticker applet +$PRGNAM: * kpf: public fileserver applet +$PRGNAM: * ksirc: IRC client +$PRGNAM: * ktalkd: talk daemon +$PRGNAM: * lanbrowsing: lan browsing tdeio slave +$PRGNAM: * krfb: Desktop Sharing server, via VNC +$PRGNAM: * krdc: a client for Desktop Sharing and other VNC servers +$PRGNAM: * wifi: Wireless LAN tools +$PRGNAM: * kopete: multi-protocol instant messenger client. +$PRGNAM: * kget: schedule multiple downloads +$PRGNAM: * stunserver " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -\$(which update-desktop-database) $INSTALL_TDE/share/applications - -# Update hicolor theme cache: -\$(which gtk-update-icon-cache) -f -t $INSTALL_TDE/share/icons/hicolor - -# Update the mime database: -\$(which update-mime-database) /usr/share/mime - -EOINS - makepkg_fn diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index 3b41775..a29cd79 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -34,38 +34,87 @@ getsource_fn untar_fn # If libcaldav is installed, include it in the build for korganizer -[[ $(ls /var/log/packages/libcaldav*) ]] 2>/dev/null && LCALDAV="ON" +[[ -s $INSTALL_TDE/include/libcaldav/caldav.h ]] 2>/dev/null && LCALDAV="ON" # If libcarddav is installed, include it in the build for korganizer -[[ $(ls /var/log/packages/libcarddav*) ]] 2>/dev/null && LCARDDAV="ON" - -## add patch for gcc7 -sed -i "s|Attachment( '\\\0' )|Attachment( TQChar('\\\0') )|" korganizer/koeditorattachments.cpp +[[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON" listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DWITH_ALL_OPTIONS="ON" \ - -DWITH_GNOKII="OFF" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DWITH_ARTS="ON" \ + -DWITH_BIRTHDAYS="ON" \ -DWITH_CALDAV=${LCALDAV:-"OFF"} \ -DWITH_CARDDAV=${LCARDDAV:-"OFF"} \ - -DBUILD_ALL="ON" \ + -DWITH_EGROUPWARE="ON" \ + -DWITH_EXCHANGE="ON" \ + -DWITH_FEATUREPLAN="ON" \ + -DWITH_GNOKII="OFF" \ + -DWITH_GROUPDAV="ON" \ + -DWITH_GROUPWISE="ON" \ + -DWITH_INDEXLIB="ON" \ + -DWITH_KOLAB="ON" \ + -DWITH_NEWDISTRLISTS="ON" \ + -DWITH_NEWEXCHANGE="ON" \ + -DWITH_SASL="ON" \ + -DWITH_SCALIX="ON" \ + -DWITH_SLOX="ON" \ + -DWITH_XSCREENSAVER="ON" \ + -DBUILD_AKREGATOR="ON" \ + -DBUILD_CERTMANAGER="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_INDEXLIB="ON" \ + -DBUILD_KADDRESSBOOK="ON" \ + -DBUILD_KALARM="ON" \ + -DBUILD_KANDY="ON" \ + -DBUILD_KARM="ON" \ + -DBUILD_KGANTT="ON" \ + -DBUILD_KITCHENSYNC="OFF" \ + -DBUILD_KMAIL="ON" \ + -DBUILD_KMAILCVT="ON" \ + -DBUILD_KMOBILE="ON" \ + -DBUILD_KNODE="ON" \ + -DBUILD_KNOTES="ON" \ + -DBUILD_KODE="ON" \ + -DBUILD_KONSOLEKALENDAR="ON" \ + -DBUILD_KONTACT="ON" \ + -DBUILD_KORGANIZER="ON" \ + -DBUILD_KORN="ON" \ + -DBUILD_KTNEF="ON" \ + -DBUILD_LIBKCAL="ON" \ + -DBUILD_LIBKHOLIDAYS="ON" \ + -DBUILD_LIBKMIME="ON" \ + -DBUILD_LIBKPGP="ON" \ + -DBUILD_LIBKPIMEXCHANGE="ON" \ + -DBUILD_LIBKPIMIDENTITIES="ON" \ + -DBUILD_LIBKSIEVE="ON" \ + -DBUILD_LIBTDENETWORK="ON" \ + -DBUILD_LIBTDEPIM="ON" \ + -DBUILD_MIMELIB="ON" \ + -DBUILD_PLUGINS="ON" \ + -DBUILD_TDEABC="ON" \ + -DBUILD_TDEFILE_PLUGINS="ON" \ + -DBUILD_TDEIOSLAVE="ON" \ + -DBUILD_TDERESOURCES="ON" \ + -DBUILD_WIZARDS="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -74,6 +123,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -81,38 +132,27 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (personal information management) +$PRGNAM: tdepim (personal information management) $PRGNAM: -$PRGNAM: The TDE-PIM project aims to bring together those who wish to help -$PRGNAM: design, implement, test, etc. anything that's to do with -$PRGNAM: personal information management. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: http://www.trinitydesktop.org/ +$PRGNAM: * akregator: Feed reader +$PRGNAM: * kaddressbook: The KDE addressbook application. +$PRGNAM: * kalarm: for setting up personal alarm messages, emails and commands +$PRGNAM: * kalarmd: alarm monitoring daemon, shared by korganizer and kalarm. +$PRGNAM: * kandy: sync phone book entries between cell phone and computer +$PRGNAM: * karm: Time tracker. +$PRGNAM: * kleopatra: a tool for managing X.509 certificates +$PRGNAM: * kmail: the KDE mail client +$PRGNAM: * kmailcvt: tool for importing mail related data from other programs +$PRGNAM: * kmobile: a mobile device manager for TDE +$PRGNAM: * knode: news client +$PRGNAM: * knotes: yellow notes application +$PRGNAM: * konsolecalendar: Command line tool for accessing calendar files. +$PRGNAM: * kontact: Integrated PIM application +$PRGNAM: * korganizer: a calendar-of-events and todo-list manager +$PRGNAM: * korn: mail checker +$PRGNAM: * ktnef: a viewer for mail attachments using the TNEF format +$PRGNAM: * tdefile-plugins: vCard KFIleItem plugin. " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index e82a923..2251b21 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -32,28 +32,50 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" \ - -DBUILD_ALL="ON" \ + -DBUILD_CERVISIA="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_KAPPTEMPLATE="ON" \ + -DBUILD_KBABEL="ON" \ + -DBUILD_KBUGBUSTER="ON" \ + -DBUILD_KDEACCOUNTS_PLUGIN="ON" \ + -DBUILD_KMTRACE="ON" \ + -DBUILD_KOMPARE="ON" \ + -DBUILD_KPROFILEMETHOD="ON" \ + -DBUILD_KSPY="ON" \ + -DBUILD_KSTARTPERF="ON" \ + -DBUILD_KUIVIEWER="ON" \ + -DBUILD_POXML="ON" \ + -DBUILD_SCHECK="ON" \ + -DBUILD_SCRIPTS="ON" \ + -DBUILD_TDECACHEGRIND="ON" \ + -DBUILD_TDEFILE_PLUGINS="ON" \ + -DBUILD_TDEIOSLAVE="ON" \ + -DBUILD_TDEUNITTEST="ON" \ + -DBUILD_UMBRELLO="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -64,6 +86,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -71,38 +95,20 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (tools used by TDE developers) -$PRGNAM: -$PRGNAM: This is a collection of applications and tools used by TDE -$PRGNAM: developers. It also has example code for use in learning TDE -$PRGNAM: programming or starting a new TDE application. -$PRGNAM: + |-----handy-ruler------------------------------------------------------| +$PRGNAM: A collection of applications and tools used by TDE developers $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: http://www.trinitydesktop.org/ +$PRGNAM: * cervisia: CVS client part +$PRGNAM: * kapptemplate: shell script to help starting new apps +$PRGNAM: * kbabel: an editor for *.po files +$PRGNAM: * kbugbuster: a gui for the TDE bug reporting system +$PRGNAM: * kmtrace: converts glibc's mtrace log into a full backtrace +$PRGNAM: * kstartperf: startup time measurement +$PRGNAM: * kuiviewer: a KPart for viewing .ui files. +$PRGNAM: * umbrello: a UML modeller. +$PRGNAM: * kompare: a diff gui +$PRGNAM: * tdecachegrind: a profile data visualization tool +$PRGNAM: * .. and more " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index c156624..ca5545f 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -32,26 +32,38 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DBUILD_ALL="ON" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_AMOR="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_EYESAPPLET="ON" \ + -DBUILD_FIFTEENAPPLET="ON" \ + -DBUILD_KMOON="ON" \ + -DBUILD_KODO="ON" \ + -DBUILD_KTEATIME="ON" \ + -DBUILD_KTUX="ON" \ + -DBUILD_KWEATHER="ON" \ + -DBUILD_KWORLDWATCH="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -60,6 +72,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -67,33 +81,19 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (TDE Amusements) -$PRGNAM: $PRGNAM: TDE Amusements $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: http://www.trinitydesktop.org/ +$PRGNAM: * amor: puts comic figures above your windows +$PRGNAM: * eyesapplet: a kicker applet similar to XEyes +$PRGNAM: * fifteenapplet: order 15 pieces in a 4x4 square by moving them +$PRGNAM: * kmoon: system tray applet showing the moon phase +$PRGNAM: * kodo: mouse movement meter +$PRGNAM: * kteatime: applet to ensure your tea doesn't get too strong +$PRGNAM: * ktux: Tux-in-a-Spaceship screen saver +$PRGNAM: * kweather: applet that will display the current weather outside +$PRGNAM: * kworldwatch: application and kicker applet showing daylight area +$PRGNAM: on the world globe " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index c7cf69e..de98da6 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -33,83 +33,13 @@ getsource_fn untar_fn -[[ $TDEVERSION == R14.0.4 ]] && { -## remove redundant application/x-tbz2 references [line 55] to get rid of ark warning: -## tdeio (KMimeType): WARNING: mimetype not valid '' (missing entry in the file ?) -## the other removals are a general clear out of the mimetype before they cause problems -## application/x-rar-compressed causes a double entry in the Compress As menu without adding any functionality -## patch for ark/archiveformatinfo.cpp split to accommodate cgit build -echo $' ---- ark/archiveformatinfo.cpp -+++ ark/archiveformatinfo.cpp -@@ -55 +54,0 @@ -- addFormatInfo( TAR_FORMAT, "application/x-tbz2", ".tar.bz2" ); ---- ark/archiveformatinfo.cpp -+++ ark/archiveformatinfo.cpp -@@ -79 +78,0 @@ -- addFormatInfo( RAR_FORMAT, "application/x-rar-compressed", ".rar" ); ---- ark/tar.cpp -+++ ark/tar.cpp -@@ -94,7 +93,0 @@ -- if ( m_fileMimeType == "application/x-tbz2" ) -- { -- // ark treats .tar.bz2 as x-tbz, instead of duplicating the mimetype -- // let\'s just alias it to the one we already handle. -- m_fileMimeType = "application/x-tbz"; -- } -- ---- superkaramba/src/sknewstuff.cpp -+++ superkaramba/src/sknewstuff.cpp -@@ -67 +66,0 @@ -- result->name() == "application/x-tbz2" || ---- ark/ark.desktop -+++ ark/ark.desktop -@@ -2 +2 @@ --MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz -+MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-zip-compressed;application/x-lzma;application/x-xz;application/x-txz;application/x-tlz ---- ark/ark_part.desktop -+++ ark/ark_part.desktop -@@ -2 +2 @@ --MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-tlz;application/x-txz -+MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-tlz;application/x-txz -' | while read line -do -patch -p0 -done - -## fix bug 2794 - ark can't open rar files -echo $' ---- ark/rar.cpp -+++ ark/rar.cpp -@@ -102 +102 @@ -- TQRegExp versionRegExp (TQString::fromLatin1 ("RAR\\\\s(\\\\d+)\\\\.(\\\\d+)\\\\s(beta (\\\\d+))?\\\\s+Copyright.*")); -+ TQRegExp versionRegExp (TQString::fromLatin1 ("(UN)?RAR\\\\s(\\\\d+)\\\\.(\\\\d+)( beta (\\\\d+))?.*")); -@@ -107,3 +107,3 @@ -- m_version = versionRegExp.cap(1).toShort() * VERSION_MAJOR; -- m_version += versionRegExp.cap(2).toShort()/10 * VERSION_MINOR; -- m_version += versionRegExp.cap(2).toShort()%10 * VERSION_PATCH; -+ m_version = versionRegExp.cap(2).toShort() * VERSION_MAJOR; -+ m_version += versionRegExp.cap(3).toShort()/10 * VERSION_MINOR; -+ m_version += versionRegExp.cap(3).toShort()%10 * VERSION_PATCH; -@@ -111 +111 @@ -- if (!versionRegExp.cap(4).isEmpty()) { // beta versions should go befor release ones -+ if (!versionRegExp.cap(5).isEmpty()) { // beta versions should go before release ones -@@ -113 +113 @@ -- m_version += versionRegExp.cap(4).toShort(); -+ m_version += versionRegExp.cap(5).toShort(); -' | while read line -do -patch -p0 -done -} - listdocs_fn chown_fn -## See CMakeLists.txt for specific laptop support cd_builddir_fn - cmake \ + +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ @@ -125,9 +55,38 @@ cd_builddir_fn -DWITH_XSCREENSAVER="OFF" \ -DWITH_SENSORS="ON" \ -DWITH_SNMP="OFF" \ - -DBUILD_ALL="ON" \ + -DWITH_ASUS="OFF" \ + -DWITH_POWERBOOK="OFF" \ + -DWITH_POWERBOOK2="OFF" \ + -DWITH_VAIO="OFF" \ + -DWITH_THINKPAD="OFF" \ + -DWITH_I8K="OFF" \ + -DWITH_XMMS="OFF" \ + -DWITH_TDENEWSTUFF="OFF" \ + -DBUILD_DOC="ON" \ + -DBUILD_ARK="ON" \ + -DBUILD_CHARSELECTAPPLET="ON" \ + -DBUILD_KCALC="ON" \ + -DBUILD_KCHARSELECT="ON" \ + -DBUILD_TDELIRC="ON" \ + -DBUILD_TDESSH="ON" \ + -DBUILD_KDF="ON" \ + -DBUILD_KEDIT="ON" \ + -DBUILD_KFLOPPY="ON" \ + -DBUILD_KGPG="ON" \ + -DBUILD_KHEXEDIT="ON" \ + -DBUILD_KJOTS="ON" \ + -DBUILD_KLAPTOPDAEMON="ON" \ + -DBUILD_KMILO="ON" \ + -DBUILD_KREGEXPEDITOR="ON" \ + -DBUILD_KSIM="ON" \ + -DBUILD_KTIMER="ON" \ + -DBUILD_TDEWALLET="ON" \ + -DBUILD_SUPERKARAMBA="ON" \ + -DBUILD_TDEFILEREPLACE="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -136,6 +95,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -143,38 +104,30 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Collection of utilities) -$PRGNAM: -$PRGNAM: Collection of utilities including ark -$PRGNAM: +$PRGNAM: tdeutils (Collection of utilities) $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: * ark: manager for compressed files and archives +$PRGNAM: * kcalc: scientific calculator +$PRGNAM: * kcharselect: select characters from any font into the clipboard +$PRGNAM: * charselectapplet: as kcharselect, but as a Kicker applet +$PRGNAM: * tdessh: front end to ssh +$PRGNAM: * kdf: like 'df', a graphical free disk space viewer +$PRGNAM: * kedit: a simple text editor, without formatting like bold, etc +$PRGNAM: * kfloppy: a floppy disks formatter +$PRGNAM: * kgpg: Encryption Tool +$PRGNAM: * khexedit: binary file editor +$PRGNAM: * kjots: manages several 'books' with a subject and notes +$PRGNAM: * klaptopdaemon: battery and power management +$PRGNAM: * kmilo: hardware input devices support +$PRGNAM: * kregexpeditor: graphical regular expression editor +$PRGNAM: * ksim: a plugin based system monitor +$PRGNAM: * ktimer: execute programs after some time +$PRGNAM: * superkaramba: a version of Karamba with python scripting +$PRGNAM: * tdelirc: a TDE frontend for the Linux Infrared Remote Control system +$PRGNAM: * tdewallet: a convenient and secure way to manage all your passwords +$PRGNAM: * TDEFileReplace: powerful search and replace in multiple files +$PRGNAM: [Moved from tdewebdev for R14.1.0] " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index f436ae0..9ad77e1 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -32,29 +32,55 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn cd_builddir_fn - cmake \ + +cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -L$TQTDIR/lib" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ - -DWITH_BUILDTOOL_ALL="ON" \ - -DWITH_LANGUAGE_ALL="ON" \ - -DWITH_VCS_ALL="ON" \ - -DBUILD_ALL="ON" \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DWITH_BUILDTOOL_ADA="ON" \ + -DWITH_BUILDTOOL_ANT="ON" \ + -DWITH_BUILDTOOL_AUTOTOOLS="ON" \ + -DWITH_BUILDTOOL_CUSTOMMAKEFILES="ON" \ + -DWITH_BUILDTOOL_PASCAL="ON" \ + -DWITH_BUILDTOOL_QMAKE="ON" \ + -DWITH_BUILDTOOL_SCRIPT="ON" \ + -DWITH_DEPRECATION="OFF" \ + -DWITH_LANGUAGE_ADA="ON" \ + -DWITH_LANGUAGE_BASH="ON" \ + -DWITH_LANGUAGE_CPP="ON" \ + -DWITH_LANGUAGE_CSHARP="ON" \ + -DWITH_LANGUAGE_FORTRAN="ON" \ + -DWITH_LANGUAGE_JAVA="ON" \ + -DWITH_LANGUAGE_PASCAL="ON" \ + -DWITH_LANGUAGE_PERL="ON" \ + -DWITH_LANGUAGE_PHP="ON" \ + -DWITH_LANGUAGE_PYTHON="ON" \ + -DWITH_LANGUAGE_RUBY="ON" \ + -DWITH_LANGUAGE_SQL="ON" \ + -DWITH_VCS_CLEARCASE="ON" \ + -DWITH_VCS_CVSSERVICE="ON" \ + -DWITH_VCS_PERFORCE="ON" \ + -DWITH_VCS_SUBVERSION="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_KDEVDESIGNER="ON" \ + -DBUILD_VISUALBOYADVANCE="ON" \ -Wno-dev \ .. + make_fn installdocs_fn @@ -63,6 +89,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -70,38 +98,18 @@ echo " # on the right side marks the last column you can put a character in. You must # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM -$PRGNAM: + |-----handy-ruler------------------------------------------------------| $PRGNAM: An Integrated Development Environment providing a graphical front end $PRGNAM: to a wide range of development tools. $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: * kdevassistant: +$PRGNAM: * kdevdesigner: a GUI designer environment +$PRGNAM: * kdevprj2kdevelop: +$PRGNAM: * kdevprofileeditor: +$PRGNAM: * tdevelop: an Integrated Development Environment +$PRGNAM: * tdevelop-htdig: $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -# Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 -fi -EOINS - makepkg_fn diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index 88c5430..fa1788b 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -32,6 +32,7 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn ltoolupdate_fn @@ -40,15 +41,15 @@ chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -60,6 +61,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -67,33 +70,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Quanta Plus and other applications) -$PRGNAM: -$PRGNAM: The tdewebdev package contains Quanta Plus and other applications, -$PRGNAM: which are useful for web development. They are runtime dependencies -$PRGNAM: of Quanta Plus, and it is highly recommended that you install them. -$PRGNAM: +$PRGNAM: Quanta Plus and runtime dependencies $PRGNAM: +$PRGNAM: * Quanta Plus: a web IDE $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: Home: http://www.trinitydesktop.org/ +$PRGNAM: The runtime dependencies are: +$PRGNAM: * Kommander: a GUI script builder and executor tool. +$PRGNAM: * TDEFileReplace: powerful search and replace in multiple files +$PRGNAM: [Moved to tdeutils for R14.1.0] +$PRGNAM: * KXSLDbg: XSL debugger +$PRGNAM: * KImageMapEditor: image map editor +$PRGNAM: * KLinkStatus: link checker " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild index fac0e58..7b9db83 100644 --- a/Deps/akode/akode.SlackBuild +++ b/Deps/akode/akode.SlackBuild @@ -33,10 +33,13 @@ getsource_fn untar_fn -## edit headers locations for Slackware package - but see README +<<'comment' +## abandoned attempt to include ffmpeg decoder - see README +## edit headers locations for Slackware package sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp +comment chown_fn @@ -79,9 +82,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM - player and plugins for aRts music formats +$PRGNAM: akode - player and plugins for aRts music formats $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index 40f5d2e..54699dc 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -38,7 +38,8 @@ listdocs_fn chown_fn cd_builddir_fn - cmake \ + +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ @@ -49,7 +50,16 @@ cd_builddir_fn -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_ALSA="ON" \ + -DWITH_AUDIOFILE="ON" \ + -DWITH_ESOUND="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_JACK="OFF" \ + -DWITH_MAD="ON" \ + -DWITH_SNDIO="OFF" \ + -DWITH_VORBIS="ON" \ .. + make_fn installdocs_fn @@ -65,11 +75,11 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (arts) +$PRGNAM: aRts $PRGNAM: -$PRGNAM: arts +$PRGNAM: All of the aRts documentation is in 'The aRts Handbook', +$PRGNAM: installed with tdemultimedia. $PRGNAM: $PRGNAM: $PRGNAM: @@ -77,7 +87,6 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index 47d1336..b3be975 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -66,10 +66,7 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (avahi-tqt) -$PRGNAM: $PRGNAM: avahi-tqt $PRGNAM: $PRGNAM: @@ -78,8 +75,9 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn - diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index ccf213f..1d34e3b 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -38,16 +38,19 @@ listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_GCC_VISIBILITY="OFF" \ .. + make_fn installdocs_fn @@ -63,9 +66,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Backport of Harald Fernengel's Qt4 D-Bus bindings) +$PRGNAM: dbus-1-tqt (Backport of Harald Fernengel's Qt4 D-Bus bindings) $PRGNAM: $PRGNAM: Some Qt4 based code had no direct equivalent in Qt3. Cases where $PRGNAM: this transition to Qt3 might not be fully correct are marked with @@ -75,7 +77,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index d92eac5..8cb855d 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -38,15 +38,16 @@ listdocs_fn chown_fn cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ .. make_fn @@ -66,9 +67,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (simple IPC library) +$PRGNAM: dbus-tqt (simple IPC library) $PRGNAM: $PRGNAM: A core concept of the D-BUS implementation is that $PRGNAM: 'libdbus' is intended to be a low-level API, similar to @@ -78,7 +78,7 @@ $PRGNAM: levels of completeness. $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild index f2416a6..7ce74e8 100644 --- a/Deps/libart-lgpl/libart-lgpl.SlackBuild +++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -47,6 +47,8 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DBUILD_DOC="ON" \ .. make_fn @@ -64,9 +66,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (the LGPL'd component of libart) +$PRGNAM: libart-lgpl (the LGPL'd component of libart) $PRGNAM: $PRGNAM: This is the LGPL'd component of libart. All functions needed $PRGNAM: for running the Gnome canvas, and for printing support, will be @@ -76,7 +77,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 15eb10f..4de244a 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -39,16 +39,16 @@ chown_fn #cd_builddir_fn - don't use -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ./autogen.sh \ - --prefix=${INSTALL_TDE} \ - --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ + --prefix=$INSTALL_TDE \ + --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -67,19 +67,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Calendaring Extensions to WebDAV) +$PRGNAM: libcaldav (Calendaring Extensions to WebDAV) $PRGNAM: $PRGNAM: Calendaring Extensions to WebDAV -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en $(echo $langs) $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index f32b000..eef518a 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -39,16 +39,16 @@ chown_fn #cd_builddir_fn - don't use -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ./autogen.sh \ - --prefix=${INSTALL_TDE} \ - --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ + --prefix=$INSTALL_TDE \ + --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -67,20 +67,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Online address book support) +$PRGNAM: libcarddav (Online address book support) $PRGNAM: $PRGNAM: Online address book support -$PRGNAM: -$PRGNAM: $PRGNAM: -$PRGNAM: With language support for: $PRGNAM: -$PRGNAM: en $(echo $langs) $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index c148b76..b2995d7 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -68,9 +68,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Plugin to provide SSL/TLS capability) +$PRGNAM: tqca-tls (Plugin to provide SSL/TLS capability) $PRGNAM: $PRGNAM: This is a plugin to provide SSL/TLS capability to programs that $PRGNAM: utilize the TQt Cryptographic Architecture (TQCA). @@ -80,7 +79,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild index ec45b5c..5768743 100755 --- a/Deps/tqt3/tqt3.SlackBuild +++ b/Deps/tqt3/tqt3.SlackBuild @@ -82,7 +82,7 @@ chown_fn #cd_builddir_fn -echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \ +echo "yes" | CFLAGS=$SLKCFLAGS CXXFLAGS=$SLKCFLAGS \ ./configure \ -no-exceptions \ -prefix $TQTDIR-$VERSION \ @@ -181,28 +181,6 @@ mkdir -p $PKG$INSTALL_TDE/include mkdir_install_fn -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - -$PRGNAM|-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (C++ GUI application framework) -$PRGNAM: -$PRGNAM: Qt is a multiplatform C++ GUI application framework -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc - # Add this to the doinst.sh: [[ $PREPEND != yes ]] && \ cat <> $PKG/install/doinst.sh @@ -245,19 +223,27 @@ sed -i "s|PKG_CONFIG_PATH |PKG_CONFIG_PATH $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconf EOINS -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1 -fi +doinst_sh_fn -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi - -EOINS +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| +$PRGNAM: tqt3 (C++ GUI application framework) +$PRGNAM: +$PRGNAM: Qt is a multiplatform C++ GUI application framework +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild index 69ad539..584e7c5 100755 --- a/Deps/tqtinterface/tqtinterface.SlackBuild +++ b/Deps/tqtinterface/tqtinterface.SlackBuild @@ -38,25 +38,28 @@ listdocs_fn 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}. +# built to install with a $PREFIX of /usr rather than $INSTALL_TDE, +# even if everything else is being installed to $INSTALL_TDE. cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_PREFIX_DIR=${INSTALL_TDE} \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DQT_PREFIX_DIR=$INSTALL_TDE \ -DQT_INCLUDE_DIR=$TQTDIR/include \ -DQT_LIBRARY_DIR=$TQTDIR/lib \ -DQT_BINARY_DIR=$TQTDIR/bin \ -DQT_VERSION=3 \ + -DWITH_QT3="ON" \ + -DWITH_QT4="OFF" \ .. + make_fn installdocs_fn @@ -72,9 +75,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (libraries that abstract the underlying Qt system) +$PRGNAM: tqtinterface (libraries that abstract the underlying Qt system) $PRGNAM: $PRGNAM: This package includes libraries that abstract the underlying $PRGNAM: Qt system from the actual Trinity code, allowing easy, complete @@ -84,7 +86,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index 4c5b08e..eaf4d61 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -33,31 +33,38 @@ getsource_fn untar_fn +# set support for additional language(s) as per I18N variable +# but only for languages available with this package +langs="" # for additional locales +langdoc="kipi-plugins" # for html docs +ldocs="" # for slack-desc +for Lang in $I18N +do [[ -d po/$Lang ]] && langs="$langs $Lang" && \ +[[ -d doc/$Lang"_kipi-plugins" ]] && { +langdoc=$(echo $Lang"_kipi-plugins" $langdoc) +ldocs="$ldocs $Lang" +} +done +sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am +sed -i "s|SUBDIRS =.*$|SUBDIRS =$langdoc|" doc/Makefile.am + listdocs_fn ltoolupdate_fn 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 -# -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 - cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -76,9 +83,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Functions for the TDE Images Management Host Programs) +$PRGNAM: kipi-plugins (Functions for the TDE Images Management Host Programs) $PRGNAM: $PRGNAM: Kipi Plugins are additional functions for the TDE Images Management $PRGNAM: Host Programs (digiKam, ksquirrel and gwenview). They can add @@ -87,10 +93,37 @@ $PRGNAM: You can install as many or as few as you like, from within the host $PRGNAM: programs. $PRGNAM: $PRGNAM: With language support for: +$PRGNAM: en$langs +$PRGNAM: +$PRGNAM: With help documentation for: +$PRGNAM: en$ldocs $PRGNAM: -$PRGNAM: en $(echo $langs) +$PRGNAM: -- Enabled kipi plugins: +$PRGNAM: + Acquire Images (acquireimages) +$PRGNAM: + Batch Process Images (batchprocessimages) +$PRGNAM: + Calendar (calendar) +$PRGNAM: + CD Archiving (cdarchiving) +$PRGNAM: + Find Images (findimages) +$PRGNAM: + Flickr Exporter (flickrexport) +$PRGNAM: + Remote Gallery Export (galleryexport) +$PRGNAM: + GPS Synchronization (gpssync) +$PRGNAM: + HTML Gallery (htmlexport) +$PRGNAM: + Viewer (imageviewer) +$PRGNAM: + JPEG Lossless (jpeglossless) +$PRGNAM: + Kamera Klient (kameraklient) +$PRGNAM: + Metadata Editor (metadataedit) +$PRGNAM: + MPEG Encoder (mpegencoder) +$PRGNAM: + Picasaweb Exporter (picasawebexport) +$PRGNAM: + Print Wizard (printwizard) +$PRGNAM: + RAW converter (rawconverter) +$PRGNAM: + Send Images (sendimages) +$PRGNAM: + Simple Viewer (simpleviewerexport) +$PRGNAM: + Slideshow (slideshow) +$PRGNAM: + Date & Time Adjust (timeadjust) +$PRGNAM: + Wallpaper (wallpaper) $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: -- Disabled kipi plugins [untested - libgpod not installed]: +$PRGNAM: - iPod Export (ipodexport) " > $PKG/install/slack-desc makepkg_fn diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index afee91b..a129755 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -41,15 +41,15 @@ chown_fn #cd_builddir_fn - don't use -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ./configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -68,9 +68,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Set of image codecs) +$PRGNAM: libksquirrel (Set of image codecs) $PRGNAM: $PRGNAM: ksquirrel-libs is a set of image codecs $PRGNAM: containing regular libraries for KSquirrel. @@ -80,7 +79,7 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild index d44804d..2dc86ee 100755 --- a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild +++ b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdelibkdcraw PRGNAM=libkdcraw +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -34,29 +34,30 @@ getsource_fn untar_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 + listdocs_fn ltoolupdate_fn 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 - cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ + --enable-openmp \ --enable-closure make_fn @@ -75,9 +76,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (dcraw Library Wrapper) +$PRGNAM: libkdcraw (dcraw Library Wrapper) $PRGNAM: $PRGNAM: Libkdcraw is a C++ interface around dcraw binary program used to $PRGNAM: decode RAW picture files. The library documentation is available @@ -85,10 +85,9 @@ $PRGNAM: on header files. This library is used by kipi-plugins, digiKam $PRGNAM: and other kipi host programs. $PRGNAM: $PRGNAM: With language support for: +$PRGNAM: en$langs $PRGNAM: -$PRGNAM: en $(echo $langs) $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc makepkg_fn diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index 1447c7b..66c2ce8 100755 --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdelibkexiv2 PRGNAM=libkexiv2 +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -48,7 +48,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_SKIP_RPATH="ON" \ + -DWITH_GCC_VISIBILITY="OFF" \ .. make_fn @@ -67,19 +68,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Exiv2 Library Wrapper) +$PRGNAM: libkexiv2 (Exiv2 Library Wrapper) $PRGNAM: $PRGNAM: Libkexiv2 is a wrapper around Exiv2 library to manipulate picture $PRGNAM: metadata. This library is used by kipi-plugins, digiKam and other $PRGNAM: kipi host programs. The library documentation is available in the $PRGNAM: kexiv2.h header file. $PRGNAM: +$PRGNAM: Homepage: http://www.kipi-plugins.org/ $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Homepage: http://www.kipi-plugins.org/ " > $PKG/install/slack-desc makepkg_fn diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index d2912df..9443b0e 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdelibkipi PRGNAM=libkipi +PKGNAM=tde$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -41,13 +41,13 @@ 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/$PRGNAM.po";done -sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt && \ +sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON cd_builddir_fn - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -55,6 +55,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ -DCMAKE_SKIP_RPATH=ON \ .. @@ -75,9 +76,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (KDE Image Plugin Interface) for TDE +$PRGNAM: libkipi (KDE Image Plugin Interface) for TDE $PRGNAM: $PRGNAM: Kipi is an effort to develop a common plugin structure for digiKam, $PRGNAM: and other kipi host programs. Its aim is to share image plugins @@ -85,10 +85,9 @@ $PRGNAM: among graphic applications. Kipi is based on the old digiKam plugins $PRGNAM: implementation and is maintained by the digiKam team. $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: -$PRGNAM: Home: https://www.trinitydesktop.org/index.php +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild index c2d7f64..395570d 100755 --- a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild @@ -24,54 +24,41 @@ # SUCH DAMAGE. PRGNAM=GraphicsMagick -VERSION=${VERSION:-1.3.28} +VERSION=${VERSION:-1.3.34} BUILD=${BUILD:-1} TAG=${TAG:-} -SRCURL="https://sourceforge.net/projects/graphicsmagick/files/graphicsmagick/$VERSION/GraphicsMagick-$VERSION.tar.xz" +SRCURL="https://ftp.icm.edu.pl/pub/unix/graphics/$PRGNAM/1.3/$PRGNAM-$VERSION.tar.xz" ARCHIVE_TYPE="tar.xz" + source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn cd_builddir_fn -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +CFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ --enable-shared \ --disable-static \ - --disable-openmp \ - --without-modules \ + --with-modules \ --with-x \ - --with-frozenpaths \ - --build=$ARCH-slackware-linux + --with-frozenpaths -# By default, GraphicsMagick is compiled with support for OpenMP (http://www.openmp.org/) if the compilation -# environment supports it. OpenMP automatically parallizes loops across concurrent threads based on instructions -# in pragmas. OpenMP was introduced in GCC 4.2. OpenMP is a well-established standard and was implemented in -# some other compilers in the late '90s, long before its appearance in GCC. OpenMP adds additional build and linkage -# requirements. -# By default, GraphicsMagick enables as many threads as there are CPU cores (or CPU threads). According to the OpenMP -# standard, the OMP_NUM_THREADS environment variable specifies how many threads should be used and GraphicsMagick -# also honors this request. In order to obtain the best single-user performance, set OMP_NUM_THREADS equal to the -# number of available CPU cores. On a server with many cores and many programs running at once, there may be benefit -# to setting OMP_NUM_THREADS to a much smaller value than the number of cores, and sometimes values as low as two -# (or even one, to disable threading) will offer the best overall system performance. Tuning a large system with OpenMP -# 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_fn @@ -90,9 +77,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (The swiss army knife of image processing) +$PRGNAM: GraphicsMagick (The swiss army knife of image processing) $PRGNAM: $PRGNAM: GraphicsMagick is the swiss army knife of image processing. Comprised $PRGNAM: of 265K physical lines (according to David A. Wheeler's @@ -105,5 +91,4 @@ $PRGNAM: $PRGNAM: Home: http://www.graphicsmagick.org/ " > $PKG/install/slack-desc - makepkg_fn diff --git a/Misc/graphviz/README b/Misc/graphviz/README index fc86185..7a0c76d 100644 --- a/Misc/graphviz/README +++ b/Misc/graphviz/README @@ -11,6 +11,6 @@ gts is an optional dependency. ------------------------------ -pdf and html documentation is not built by default in the SB. -To build it, comment out 'rmdoc' in the script [c. line 70]. +pdf and html documentation is not built by default in the SlackBuild. +To build it, comment out 'rm -rf $PKG/usr/share/$PRGNAM/doc' in the script [c. line 110]. diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index e5f7875..a5e32af 100644 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -26,12 +26,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=graphviz -VERSION=${VERSION:-2.40.1} +VERSION=${VERSION:-2.42.3} BUILD=${BUILD:-1} TAG=${TAG:-_tde} SRCURL="https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" + source ../../get-source.sh getsource_fn @@ -43,22 +44,53 @@ chown_fn #cd_builddir_fn -source $SRCDIR/patches # set file permissions -setperms +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + # Install PHP bindings to proper location. -phpbindings -# Fix for php-5.4 and patches from Arch (thanks!) -patches +sed -i 's|/php/modules|/php/extensions|' configure -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +# Fix for php-5.4 and patches from Arch (thanks!) +echo $'--- plugin/gs/gvloadimage_gs.c ++++ plugin/gs/gvloadimage_gs.c +@@ -72,11 +72,11 @@ + + assert (err < 0); + +- if (err >= e_VMerror) ++ if (err >= gs_error_VMerror) + errsrc = "PostScript Level 1"; +- else if (err >= e_unregistered) ++ else if (err >= gs_error_unregistered) + errsrc = "PostScript Level 2"; +- else if (err >= e_invalidid) ++ else if (err >= gs_error_invalidid) + errsrc = "DPS error"; + else + errsrc = "Ghostscript internal error"; +--- tclpkg/gv/gv_php_init.c ++++ tclpkg/gv/gv_php_init.c +@@ -27,0 +28 @@ ++ TSRMLS_FETCH(); +@@ -32,0 +34 @@ ++ TSRMLS_FETCH(); +' | while read line +do +patch -p0 +done + +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +LDFLAGS=$SLKLDFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --enable-ocaml=no @@ -67,15 +99,40 @@ 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: -rmdoc +rm -rf $PKG/usr/share/$PRGNAM/doc + # Install config file for PHP. -graphvizini +mkdir -p $PKG/etc/php.d +cat << EOF > $PKG/etc/php.d/graphviz.ini.new +; Enable graphviz extension module +; extension=gv.so + +; Graphviz' own documentation mentions a "gv.php" file that should +; be included. This file is however not necessary, it is just a +; wrapper class around functions that are already available after +; loading the extension, just leave out the "gv::" prefix. +; In case you still prefer to use the wrapper class you have to +; include it using its absolute path: +; +EOF + # gzip man pages -gzipman +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Remove empty directories of language bindings that are absent. -emptydirs -# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz ... -dummy +find $PKG/usr/lib$LIBDIRSUFFIX/graphviz -depth -type d -empty -exec rmdir {} \; + +# Create a "dummy" config file in /usr/lib$LIBDIRSUFFIX/graphviz so that it +# will be removed when the package is uninstalled. This file is generated by +# the postinstall script and contains information about available plugins, so +# this is (or at least should be) safe. +# +# Write some dummy content to it to avoid +# "Error: /usr/lib64/graphviz/config6 is zero sized, or other read error." +# message during installation. +echo '# Dummy content.' > $PKG/usr/lib$LIBDIRSUFFIX/graphviz/config6 installdocs_fn @@ -91,7 +148,7 @@ echo " # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Graph Visualization) +$PRGNAM: graphviz (Graph Visualization) $PRGNAM: $PRGNAM: Graphviz is open source graph visualization software. $PRGNAM: It has several main graph layout programs. It also has @@ -102,9 +159,28 @@ $PRGNAM: Homepage: http://graphviz.org/ $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM:Homepage: http://graphviz.org/ +$PRGNAM: " > $PKG/install/slack-desc -doinstsh +cat << EOF > $PKG/install/doinst.sh +config() { + NEW="\$1" + OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" + # If there's 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... +} + +config etc/php.d/graphviz.ini.new + +# Configure plugins +# (writes /usr/lib*/graphviz/config6 with available plugin information) +chroot . /usr/bin/dot -c +EOF makepkg_fn diff --git a/Misc/graphviz/patches b/Misc/graphviz/patches deleted file mode 100644 index 34c4a01..0000000 --- a/Misc/graphviz/patches +++ /dev/null @@ -1,126 +0,0 @@ -setperms() { -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -} - - -phpbindings() { -sed -i 's|/php/modules|/php/extensions|' configure -} - - -patches() { -echo $'#scan.l patch not required for 2.40.1 -#--- lib/cgraph/scan.l -#+++ lib/cgraph/scan.l -#@@ -152,1 +152,1 @@ -#- agerr(AGWARN,agxbuse(&xb)); -#+ agerr(AGWARN, "%s", agxbuse(&xb)); -#@@ -228,1 +228,1 @@ -#- agerr(AGERR,agxbuse(&xb)); -#+ agerr(AGERR, "%s", agxbuse(&xb)); ---- plugin/gs/gvloadimage_gs.c -+++ plugin/gs/gvloadimage_gs.c -@@ -72,11 +72,11 @@ - - assert (err < 0); - -- if (err >= e_VMerror) -+ if (err >= gs_error_VMerror) - errsrc = "PostScript Level 1"; -- else if (err >= e_unregistered) -+ else if (err >= gs_error_unregistered) - errsrc = "PostScript Level 2"; -- else if (err >= e_invalidid) -+ else if (err >= gs_error_invalidid) - errsrc = "DPS error"; - else - errsrc = "Ghostscript internal error"; ---- tclpkg/gv/gv_php_init.c -+++ tclpkg/gv/gv_php_init.c -@@ -27,0 +28 @@ -+ TSRMLS_FETCH(); -@@ -32,0 +34 @@ -+ TSRMLS_FETCH(); -' | while read line -do -patch -p0 -done -} - - -rmdoc() { -rm -rf $PKG/usr/share/$PRGNAM/doc -} - - -graphvizini() { -mkdir -p $PKG/etc/php.d -cat << EOF > $PKG/etc/php.d/graphviz.ini.new -; Enable graphviz extension module -; extension=gv.so - -; Graphviz' own documentation mentions a "gv.php" file that should -; be included. This file is however not necessary, it is just a -; wrapper class around functions that are already available after -; loading the extension, just leave out the "gv::" prefix. -; In case you still prefer to use the wrapper class you have to -; include it using its absolute path: -; -EOF -} - - -gzipman() { -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -} - - -emptydirs() { -find $PKG/usr/lib${LIBDIRSUFFIX}/graphviz -depth -type d -empty -exec rmdir {} \; -} - - -# Create a "dummy" config file in /usr/lib${LIBDIRSUFFIX}/graphviz so that it -# will be removed when the package is uninstalled. This file is generated by -# the postinstall script and contains information about available plugins, so -# this is (or at least should be) safe. -# -# Write some dummy content to it to avoid -# "Error: /usr/lib64/graphviz/config6 is zero sized, or other read error." -# message during installation. -dummy() { -echo '# Dummy content.' > $PKG/usr/lib${LIBDIRSUFFIX}/graphviz/config6 -} - - -doinstsh() { -cat << EOF > $PKG/install/doinst.sh -config() { - NEW="\$1" - OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" - # If there's 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... -} - -config etc/php.d/graphviz.ini.new - -# Configure plugins -# (writes /usr/lib*/graphviz/config6 with available plugin information) -chroot . /usr/bin/dot -c -EOF -} - - diff --git a/Misc/imlib/imlib.SlackBuild b/Misc/imlib/imlib.SlackBuild index 3185e1a..c647d27 100644 --- a/Misc/imlib/imlib.SlackBuild +++ b/Misc/imlib/imlib.SlackBuild @@ -497,12 +497,12 @@ chown_fn cd_builddir_fn -CFLAGS="$SLKCFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +CFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --disable-static make_fn diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index 860e7a2..d3288f5 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=inkscape -VERSION=${VERSION:-0.92.3} +VERSION=${VERSION:-0.92.4} BUILD=${BUILD:-1} SRCURL="https://media.inkscape.org/dl/resources/file/inkscape-$VERSION.tar.bz2" @@ -36,15 +36,16 @@ getsource_fn untar_fn ## install to .../lib64 on 64-bit system +## add -DLIB_SUFFIX=$LIBDIRSUFFIX to cmake [[ -d /lib64 ]] && \ { ## set RPATH -sed -i "s|ORIGIN/../lib/inkscape|ORIGIN/../lib$LIBDIRSUFFIX/inkscape|" CMakeLists.txt +sed -i 's|ORIGIN/../lib/inkscape|ORIGIN/../lib${LIB_SUFFIX}/inkscape|' CMakeLists.txt ## set output directory -sed -i "s|/lib |/lib$LIBDIRSUFFIX |" CMakeLists.txt +sed -i 's|/lib |/lib${LIB_SUFFIX} |' CMakeLists.txt ## for dynamic lib -sed -i "s|lib/inkscape|lib$LIBDIRSUFFIX/inkscape|" src/CMakeLists.txt +sed -i 's|lib/inkscape|lib${LIB_SUFFIX}/inkscape|' src/CMakeLists.txt ## for static libs -sed -i "s|lib/inkscape|lib$LIBDIRSUFFIX/inkscape|" CMakeScripts/HelperMacros.cmake +sed -i 's|lib/inkscape|lib${LIB_SUFFIX}/inkscape|' CMakeScripts/HelperMacros.cmake } ## only build for required locales @@ -105,63 +106,6 @@ rm share/templates/*.*.* mv $TEMP_DIR/* share/templates/ } || true -## https://gitlab.com/inkscape/inkscape/commit/a600c6438fef2f4c06f9a4a7d933d99fb054a973 -## Fix compilation with poppler 0.64 -echo $'--- src/extension/internal/pdfinput/pdf-parser.cpp -+++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2585,1 +2585,1 @@ --void PdfParser::doShowText(GooString *s) { -+void PdfParser::doShowText(const GooString *s) { -@@ -2604,1 +2604,1 @@ -- builder->beginString(state, s); -+ builder->beginString(state); -@@ -2634,1 +2634,1 @@ -- p = s->getCString(); -+ p = g_strdup(s->getCString()); -@@ -2689,1 +2689,1 @@ -- p = s->getCString(); -+ p = g_strdup(s->getCString()); -@@ -2735,1 +2735,1 @@ -- char *name = args[0].getName(); -+ char *name = g_strdup(args[0].getName()); ---- src/extension/internal/pdfinput/pdf-parser.h -+++ src/extension/internal/pdfinput/pdf-parser.h -@@ -290,1 +290,1 @@ -- void doShowText(GooString *s); -+ void doShowText(const GooString *s); ---- src/extension/internal/pdfinput/svg-builder.cpp -+++ src/extension/internal/pdfinput/svg-builder.cpp -@@ -1023,1 +1023,1 @@ -- _font_specification = font->getName()->getCString(); -+ _font_specification = g_strdup(font->getName()->getCString()); -@@ -1364,1 +1364,1 @@ --void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) { -+void SvgBuilder::beginString(GfxState *state) { ---- src/extension/internal/pdfinput/svg-builder.h -+++ src/extension/internal/pdfinput/svg-builder.h -@@ -32,1 +32,0 @@ --class GooString; -@@ -139,1 +138,1 @@ -- void beginString(GfxState *state, GooString *s); -+ void beginString(GfxState *state); -' | while read line -do -patch -p0 -done - -## https://gitlab.com/inkscape/inkscape/commit/10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 -## Fix compilation with poppler 0.65.0 -## replace unused includes with one that is actually used -echo $'--- src/extension/internal/pdfinput/pdf-parser.cpp -+++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -40,2 +40,1 @@ --#include "goo/GooTimer.h" --#include "goo/GooHash.h" -+#include "goo/GooString.h" -' | while read line -do -patch -p0 -done chown_fn @@ -170,31 +114,33 @@ listdocs_fn cd_builddir_fn ## default options have been pulled from CMakeLists.txt - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/local \ - -DWITH_NLS="ON" \ - -DWITH_DBUS="OFF" \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DENABLE_LCMS="ON" \ + -DENABLE_POPPLER="ON" \ + -DENABLE_POPPLER_CAIRO="ON" \ + -DWITH_DBUS="OFF" \ -DWITH_GNOME_VFS="ON" \ -DWITH_SVG2="ON" \ -DWITH_LPETOOL="OFF" \ -DWITH_INKJAR="ON" \ -DWITH_OPENMP="ON" \ -DWITH_PROFILING="OFF" \ - -DENABLE_POPPLER="ON" \ - -DENABLE_POPPLER_CAIRO="ON" \ -DWITH_IMAGE_MAGICK="ON" \ -DWITH_LIBCDR="ON" \ -DWITH_LIBVISIO="ON" \ -DWITH_LIBWPG="ON" \ + -DWITH_NLS="ON" \ -DWITH_GTK3_EXPERIMENTAL="OFF" \ + -DWITH_GTKSPELL="OFF" \ -DENABLE_BINRELOC="OFF" \ .. @@ -217,6 +163,14 @@ strip_fn mkdir_install_fn +echo " +# Update the desktop database: +/usr/bin/update-desktop-database usr/local/share/applications + +# Update hicolor theme cache: +/usr/bin/gtk-update-icon-cache -f -t usr/local/share/icons/hicolor +" >> $PKG/install/doinst.sh + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -231,26 +185,12 @@ $PRGNAM: Inkscape is an Open Source vector graphics editor, with capabilities $PRGNAM: similar to Illustrator, Freehand, CorelDraw, or Xara X using the W3C $PRGNAM: standard Scalable Vector Graphics (SVG) file format. $PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: With language support for: $PRGNAM: en $(echo $(cat ../po/LINGUAS)) $PRGNAM: $PRGNAM: Homepage: http://www.inkscape.org/ +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc -cat <> $PKG/install/doinst.sh -# Update the desktop database: -if [ -x usr/bin/update-desktop-database ]; then - chroot . /usr/bin/update-desktop-database /usr/local/share/applications > /dev/null 2>&1 -fi - -# Update hicolor theme cache: -if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t /usr/local/share/icons/hicolor 1> /dev/null 2> /dev/null - fi -fi -EOINS - makepkg_fn diff --git a/Misc/libmp4v2/libmp4v2.SlackBuild b/Misc/libmp4v2/libmp4v2.SlackBuild index 579b15f..3f6488e 100755 --- a/Misc/libmp4v2/libmp4v2.SlackBuild +++ b/Misc/libmp4v2/libmp4v2.SlackBuild @@ -23,8 +23,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=libmp4v2 PRGNAM=mp4v2 +PKGNAM=lib$PRGNAM VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-} @@ -36,6 +36,7 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn @@ -45,17 +46,16 @@ sed -i "s|pSlash != '|*pSlash != '|" src/rtphint.cpp cd_builddir_fn -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +CFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux \ + --disable-static make_fn @@ -75,9 +75,8 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (Create and modify mp4 files) +$PRGNAM: mp4v2 (Create and modify mp4 files) $PRGNAM: $PRGNAM: The MP4v2 library provides an API to create and modify mp4 files as $PRGNAM: defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This file format @@ -86,8 +85,8 @@ $PRGNAM: used as a multimedia file format in a variety of platforms and $PRGNAM: applications. It is a very powerful and extensible format that can $PRGNAM: accommodate practically any type of media. $PRGNAM: -$PRGNAM: $PRGNAM: Home: http://code.google.com/p/mp4v2/ +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/libpng/libpng.SlackBuild b/Misc/libpng/libpng.SlackBuild index 2007085..df9d329 100755 --- a/Misc/libpng/libpng.SlackBuild +++ b/Misc/libpng/libpng.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -CFLAGS="$SLKCFLAGS" \ +CFLAGS=$SLKCFLAGS \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ @@ -68,7 +68,7 @@ echo " # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (Portable Network Graphics library) +$PRGNAM: libpng (Portable Network Graphics library) $PRGNAM: $PRGNAM: PNG (Portable Network Graphics) is an extensible file format for the $PRGNAM: lossless, portable, well-compressed storage of raster images. PNG @@ -79,7 +79,6 @@ $PRGNAM: from 1 to 16 bits. $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/lxml/lxml.SlackBuild b/Misc/lxml/lxml.SlackBuild index a107f17..cc4fcc4 100755 --- a/Misc/lxml/lxml.SlackBuild +++ b/Misc/lxml/lxml.SlackBuild @@ -28,16 +28,18 @@ # All rights reserved. PRGNAM=lxml -VERSION=${VERSION:-4.2.1} +VERSION=${VERSION:-4.4.2} BUILD=${BUILD:-1} TAG=${TAG:-} SRCURL="https://files.pythonhosted.org/packages/source/l/lxml/lxml-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" + source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn @@ -46,7 +48,6 @@ chown_fn CC=$COMPILER \ python setup.py install --with-unicode-strings --root=$PKG || exit 1 - if $(python3 -c 'import os' 2>/dev/null); then CC=$COMPILER \ python3 setup.py build --with-unicode-strings || exit 1 @@ -68,7 +69,6 @@ echo " # 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------------------------------------------------------| $PRGNAM: lxml (Python bindings for libxml2 and libxslt) $PRGNAM: @@ -81,7 +81,6 @@ $PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild index b208877..7856d96 100755 --- a/Misc/moodbar/moodbar.SlackBuild +++ b/Misc/moodbar/moodbar.SlackBuild @@ -30,27 +30,28 @@ 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 untar_fn + listdocs_fn chown_fn cd_builddir_fn -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CXXFLAGS=$SLKCFLAGS \ +CFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ - --disable-static \ - --build=$ARCH-slackware-linux \ + --disable-static make_fn @@ -69,20 +70,19 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (For inclusion in the Amarok music player) -$PRGNAM: +$PRGNAM: moodbar (For inclusion in the Amarok music player) +$PRGNAM: $PRGNAM: The Moodbar is an algorithm for creating a colorful visual $PRGNAM: representation of the contents of an audio file, giving an idea of its $PRGNAM: mood (this is a rather fanciful term for the simple analysis it $PRGNAM: actually does). -$PRGNAM: +$PRGNAM: $PRGNAM: This package contains a GStreamer plugin with elements that are used $PRGNAM: in the moodbar analysis, and an application that actually does the analysis. -$PRGNAM: $PRGNAM: -$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/potrace/README b/Misc/potrace/README index 6825251..a60759f 100755 --- a/Misc/potrace/README +++ b/Misc/potrace/README @@ -5,7 +5,7 @@ PGM, PPM, or BMP), and the default output is one of several vector file formats. - A typical use is to create EPS files from scanned data, such as + A typical use is to create EPS files from scanned data, such as company or university logos, handwritten notes, etc. The resulting image is not "jaggy" like a bitmap, but smooth. It can then be rendered at any resolution. diff --git a/Misc/potrace/potrace.SlackBuild b/Misc/potrace/potrace.SlackBuild index 80e510a..39beefe 100755 --- a/Misc/potrace/potrace.SlackBuild +++ b/Misc/potrace/potrace.SlackBuild @@ -24,25 +24,27 @@ # SUCH DAMAGE. PRGNAM=potrace -VERSION=${VERSION:-1.15} +VERSION=${VERSION:-1.16} BUILD=${BUILD:-1} TAG=${TAG:-} -SRCURL="https://sourceforge.net/projects/potrace/files/$VERSION/potrace-$VERSION.tar.gz" +SRCURL="https://sourceforge.net/projects/potrace/files/$VERSION/potrace-$VERSION.tar.gz/download" ARCHIVE_TYPE="tar.gz" + source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn cd_builddir_fn -LDFLAGS="$SLKLDFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ @@ -80,7 +82,6 @@ $PRGNAM: $PRGNAM: A separate program, mkbitmap, can act as a pre-processor for Potrace, $PRGNAM: applying scaling and various filters to an image before converting it $PRGNAM: to a bitmap. This is useful for potracing greyscale and color images. -$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/speex/speex.SlackBuild b/Misc/speex/speex.SlackBuild index 8f32a89..26cecde 100755 --- a/Misc/speex/speex.SlackBuild +++ b/Misc/speex/speex.SlackBuild @@ -36,6 +36,7 @@ TAG=${TAG:-} SRCURL="https://ftp.osuosl.org/pub/xiph/releases/speex/speex-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" + source ../../get-source.sh getsource_fn @@ -50,9 +51,9 @@ chown_fn cd_builddir_fn -LDFLAGS="$SLKLDFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS=$SLKCFLAGS \ +CXXFLAGS=$SLKCFLAGS \ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ @@ -60,9 +61,8 @@ CXX=$COMPILER_CXX \ --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --enable-static=no \ - --enable-binaries \ - --build=$ARCH-slackware-linux - + --enable-binaries + make_fn installdocs_fn @@ -83,19 +83,18 @@ echo " # 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------------------------------------------------------| -$PRGNAM: $PRGNAM (patent-free audio compression format designed for speech) +$PRGNAM: speex (patent-free audio compression format designed for speech) $PRGNAM: $PRGNAM: Speex is an Open Source/Free Software patent-free audio compression $PRGNAM: format designed for speech. The Speex Project aims to lower $PRGNAM: the barrier of entry for voice applications by providing a free $PRGNAM: alternative to expensive proprietary speech codecs. $PRGNAM: +$PRGNAM: Home: http://www.speex.org/ $PRGNAM: $PRGNAM: $PRGNAM: -$PRGNAM: Home: http://www.speex.org/ " > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/tidy-html5/tidy-html5.SlackBuild b/Misc/tidy-html5/tidy-html5.SlackBuild index b3255f6..034be6a 100755 --- a/Misc/tidy-html5/tidy-html5.SlackBuild +++ b/Misc/tidy-html5/tidy-html5.SlackBuild @@ -31,9 +31,16 @@ BUILD=${BUILD:-1} 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 - +[[ ! -s ../../src/$PRGNAM-$VERSION.zip ]] && { +wget -nv -T 20 -O ../../src/$PRGNAM-$VERSION.zip https://github.com/htacg/$PRGNAM/archive/$VERSION.zip || { +echo -e "\033[39;1m" +echo " $PRGNAM-$VERSION.zip isn't in 'src' and hasn't been downloaded " +echo -e "\033[0m" +exit +} +} ARCHIVE_TYPE="zip" + source ../../get-source.sh getsource_fn @@ -95,12 +102,12 @@ $PRGNAM: Tidy corrects and cleans up HTML and XML documents by fixing markup $PRGNAM: errors and upgrading legacy code to modern standards. $PRGNAM: Optional with Quanta+ $PRGNAM: -$PRGNAM: http://www.html-tidy.org +$PRGNAM: For languages: +$PRGNAM: en ${langs:-} $PRGNAM: +$PRGNAM: http://www.html-tidy.org $PRGNAM: $PRGNAM: -$PRGNAM: For languages: -$PRGNAM: en ${langs:-} $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc diff --git a/Misc/xmedcon/xmedcon.SlackBuild b/Misc/xmedcon/xmedcon.SlackBuild index 5672ea7..c0e06eb 100755 --- a/Misc/xmedcon/xmedcon.SlackBuild +++ b/Misc/xmedcon/xmedcon.SlackBuild @@ -54,8 +54,7 @@ CXX=$COMPILER_CXX \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux + --disable-static make_fn @@ -84,28 +83,6 @@ 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------------------------------------------------------| -$PRGNAM: $PRGNAM (X) -$PRGNAM: -$PRGNAM: a medical image conversion utility & library; hereby hoping to lower -$PRGNAM: at least one barrier in medical research projects. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: http://xmedcon.sourceforge.net/ -" > $PKG/install/slack-desc - echo $'config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -132,12 +109,32 @@ preserve_perms() { 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 +# Update the desktop database: +/usr/bin/update-desktop-database usr/share/applications -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 +# Update the mime database: +/usr/bin/update-mime-database usr/share/mime +' > $PKG/install/doinst.sh + +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------------------------------------------------------| +$PRGNAM: xmedcon (X) +$PRGNAM: +$PRGNAM: A medical image conversion utility & library; hereby hoping to lower +$PRGNAM: at least one barrier in medical research projects. +$PRGNAM: +$PRGNAM: http://xmedcon.sourceforge.net/ +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc makepkg_fn diff --git a/Misc/yauap/yauap.SlackBuild b/Misc/yauap/yauap.SlackBuild index 5c074f3..b9bf954 100755 --- a/Misc/yauap/yauap.SlackBuild +++ b/Misc/yauap/yauap.SlackBuild @@ -28,8 +28,9 @@ VERSION=${VERSION:-0.2.4} BUILD=${BUILD:-1} TAG=${TAG:-} -SRCURL="http://download.savannah.nongnu.org/releases/yauap/yauap-0.2.4.tar.gz" +SRCURL="https://download.savannah.nongnu.org/releases/yauap/yauap-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" + source ../../get-source.sh getsource_fn @@ -70,18 +71,18 @@ echo " # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -$PRGNAM: $PRGNAM (simple commandline audio player) -$PRGNAM: -$PRGNAM: Yauap is a simple commandline audio player based on the GStreamer -$PRGNAM: multimedia framework. There is also a DBus interface that allows yauap -$PRGNAM: to act as a backend for the Amarok audio player. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: yauap (a simple commandline audio player) +$PRGNAM: +$PRGNAM: Yauap is a simple commandline audio player based on the GStreamer +$PRGNAM: multimedia framework. +$PRGNAM: +$PRGNAM: There is also a DBus interface that allows yauap to act as a backend +$PRGNAM: for the Amarok audio player. +$PRGNAM: $PRGNAM: http://www.nongnu.org/yauap/ +$PRGNAM: +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/get-source.sh b/get-source.sh index 95c0178..e4edc27 100755 --- a/get-source.sh +++ b/get-source.sh @@ -356,6 +356,22 @@ cat $PKG/install/slack-desc | grep "^$PRGNAM" | grep -v handy > $OUTPUT/$PRGNAM- umask ${_UMASK_} } + +## paths in doinst.sh should be relative to allow for installation to ROOT != "/" +doinst_sh_fn () +{ +echo " +# Update the desktop database: +/usr/bin/update-desktop-database .$INSTALL_TDE/share/applications + +# Update hicolor theme cache: +/usr/bin/gtk-update-icon-cache -f -t .$INSTALL_TDE/share/icons/hicolor + +# Update the mime database: +/usr/bin/update-mime-database -Vn usr/share/mime +" >> $PKG/install/doinst.sh +} + libpng16_fn () { (cd /usr/bin diff --git a/src/README b/src/README index ce134f5..09e59ca 100644 --- a/src/README +++ b/src/README @@ -1 +1 @@ -If you place the source archives for TDE R14.0.4 here, the scripts will use them instead of downloading them individually. +If you place the source archives for TDE R14.0.x here, the scripts will use them instead of downloading them individually. diff --git a/src/cgit/README b/src/cgit/README index 7cdaf61..9721c54 100644 --- a/src/cgit/README +++ b/src/cgit/README @@ -1 +1 @@ -This directory is used to store the cloned tde-git repositories which are copied to the build area in place of the extracted R14.0.4 archives. +This directory is used to store the cloned tde-git repositories which are copied to the build area in place of the extracted R14.0.x archives. diff --git a/src/cgit/tdei18n/README b/src/cgit/tdei18n/README index 7d9aab8..f18e3c9 100644 --- a/src/cgit/tdei18n/README +++ b/src/cgit/tdei18n/README @@ -1,2 +1,2 @@ This directory is used for downloads of tde-i18n-ab_CD packs as they are not git repositories and therefore can't be cloned individually. -They are copied to the build area in place of the extracted R14.0.4 archives. +They are copied to the build area in place of the extracted R14.0.x archives.