From 475efda68aa9653720539b11ad10ae40bc28dd63 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Tue, 29 Oct 2019 19:41:50 +0000 Subject: [PATCH] Some SlackBuilds updated to cmake Added cmake for cgit build: kdbusnotification Updated to cmake for all builds: knights ksensors kshutdown kvkbd kvpnc potracegui tdegwenview-i18n tdesudo get-source.sh - updated cgit admin & cmake URLs imlib - added README about building gdk_imlib --- .../kdbusnotification-autostart.desktop | 13 ---- .../kdbusnotification.SlackBuild | 24 +++++-- Apps/knights/knights.SlackBuild | 35 ++++----- Apps/ksensors/ksensors.SlackBuild | 25 ++++--- Apps/kshutdown/kshutdown.SlackBuild | 43 ++++++----- Apps/kvkbd/kvkbd.SlackBuild | 32 ++++----- Apps/kvpnc/kvpnc.SlackBuild | 58 +++++++-------- Apps/potracegui/potracegui.SlackBuild | 44 +++++++----- .../tdegwenview-i18n.SlackBuild | 71 ++++++++++--------- Apps/tdesudo/tdesudo.SlackBuild | 24 ++++--- Misc/imlib/README | 11 +++ get-source.sh | 4 +- 12 files changed, 207 insertions(+), 177 deletions(-) delete mode 100644 Apps/kdbusnotification/kdbusnotification-autostart.desktop create mode 100644 Misc/imlib/README diff --git a/Apps/kdbusnotification/kdbusnotification-autostart.desktop b/Apps/kdbusnotification/kdbusnotification-autostart.desktop deleted file mode 100644 index b5ad759..0000000 --- a/Apps/kdbusnotification/kdbusnotification-autostart.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=kdbusnotification -Name[xx]=xxkdbusnotificationxx -Exec=notification-daemon-tde -Icon=bell -Type=Application -Comment=DBUS notification service daemon -X-TDE-autostart-phase=1 -X-TDE-StartupNotify=false -X-TDE-UniqueApplet=true -Categories=System; - diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index 619ed1b..65d02c2 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -35,21 +35,33 @@ untar_fn listdocs_fn -ltoolupdate_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 \ - --disable-debug \ - --build=$ARCH-slackware-linux + --prefix=$INSTALL_TDE + +} || { + +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + .. + +} make_fn @@ -59,8 +71,8 @@ strip_fn # Add desktop file mkdir -p $PKG/$INSTALL_TDE/share/applications -cp -a $SRCDIR/kdbusnotification-autostart.desktop \ -$PKG/$INSTALL_TDE/share/applications/kdbusnotification-autostart.desktop +(cd $PKG/$INSTALL_TDE/share/applications +ln -s ../autostart/kdbusnotification-autostart.desktop .) mkdir_install_fn diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index be6126e..a6ab4cd 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -43,30 +43,25 @@ cp $SRCDIR/es.po po || true # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done -sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am -langs=$(echo $langs | sed 's|.po||g') -# -# Only French and English help documents are in the source, -# if French is not required, only package English docs -[[ $langs != *fr* ]] && sed -i "s|LANGUAGES = en fr|LANGUAGES = en|" doc/Makefile.am - -ltoolupdate_fn +## 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 -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 $TQT_INCLUDE_PATH" \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. make_fn @@ -94,7 +89,7 @@ knights: Needs separate chess engines, for example gnuchess, stockfish, komodo. knights: knights: With language support for: knights: -knights: en $(echo $langs) +knights: en $langs knights: " > $PKG/install/slack-desc diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index c3753c9..9eafeb0 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -38,22 +38,25 @@ 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 +## 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 -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -../configure \ - --prefix=${INSTALL_TDE} +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 \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. make_fn diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 7412690..d954a99 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -33,26 +33,37 @@ getsource_fn untar_fn - listdocs_fn -ltoolupdate_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 +## 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 + +## always build 'en' docs ... +langdoc="kshutdown man" +## ... and find other html docs required and available ... +for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done +## ... and edit tde_auto_add_subdirectories GLOB: +sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake chown_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 $TQT_INCLUDE_PATH" \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. make_fn @@ -68,11 +79,11 @@ $PRGNAM: $PRGNAM: KShutDown is an advanced shut down utility for TDE $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: With language support for: +$PRGNAM: en $langs $PRGNAM: -$PRGNAM: en $(echo $langs) +$PRGNAM: and help documentation for: +$PRGNAM: $(echo $langdoc | sed 's|kshutdown|en|;s| man||') $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 1c7942b..da51dbe 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -35,23 +35,17 @@ untar_fn listdocs_fn -ltoolupdate_fn - chown_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-debug \ - --build=$ARCH-slackware-linux +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 \ + .. make_fn @@ -72,14 +66,14 @@ echo " $PRGNAM: $PRGNAM (A virtual keyboard for TDE) $PRGNAM: $PRGNAM: A virtual keyboard for TDE -$PRGNAM: -$PRGNAM: loginhelper: Stand alone version for use with TDM or XDM. -$PRGNAM: You should Add : HOME=/root kvkbd --loginhelper & -$PRGNAM: to Xsetup to run in xdm/tdm $PRGNAM: -$PRGNAM: Taken from main.cpp ^^^^^^ +$PRGNAM: Re: kvkbd --help +$PRGNAM: loginhelper Stand alone version for use with TDM or XDM. +$PRGNAM: You should Add : HOME=/root kvkbd --loginhelper & +$PRGNAM: to Xsetup to run in xdm/tdm +$PRGNAM: +$PRGNAM: $PRGNAM: -$PRGNAM: $PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 17a8526..3aaa1ac 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -33,42 +33,43 @@ getsource_fn untar_fn -listdocs_fn -mkdir tmpdocs -for file in $(ls -1 doc | grep -v Makefile) -do -cp doc/$file tmpdocs 2>/dev/null || true # need this to overrule exit 1 when directories fail to copy -rm doc/$file 2>/dev/null || true # need this to overrule exit 1 when directories fail to be removed -done - # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done -sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am -langs=$(echo $langs | sed 's|.po||g') -# -langdoc="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done -sed -i "s|KDE_LANG = .*$|KDE_LANG = $langdoc|" doc/Makefile.am -sed -i "s|SUBDIRS = .*$|SUBDIRS = tdeioslave $langdoc|" doc/Makefile.am - -ltoolupdate_fn +## 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 + +## always build 'en' docs ... +langdoc="en man tdeioslave" +## ... and find other html docs required and available ... +for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done +## ... and edit tde_auto_add_subdirectories GLOB: +sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -../configure \ - --prefix=${INSTALL_TDE} \ - --build=$ARCH-slackware-linux +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 \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. make_fn installdocs_fn +for file in $(ls -1 ../doc | grep -vE "compile|Makefile|CMakeLists.txt") +do +cp ../doc/$file $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/ 2>/dev/null || true +done strip_fn @@ -87,14 +88,13 @@ $PRGNAM: $PRGNAM: $PRGNAM is a TDE frontend for various vpn clients. $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: With language support for: -$PRGNAM: $PRGNAM: en $langs $PRGNAM: +$PRGNAM: and help documentation for: +$PRGNAM: $(echo $langdoc | sed 's| man||') +$PRGNAM: +$PRGNAM: " > $PKG/install/slack-desc - makepkg_fn diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index c20d630..d4a2582 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -37,23 +37,35 @@ patch -p0 < $SRCDIR/reformat-message.patch listdocs_fn -ltoolupdate_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 +## 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 + +## always build 'en' docs ... +langdoc="en man" +## ... and find other html docs required and available ... +for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done +## ... and edit tde_auto_add_subdirectories GLOB: +sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake chown_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 $TQT_INCLUDE_PATH" \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_DOC=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. make_fn @@ -77,11 +89,11 @@ $PRGNAM: $PRGNAM (GUI interface for potrace) $PRGNAM: $PRGNAM: GUI interface for potrace $PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: en $langs $PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: and help documentation for: +$PRGNAM: $(echo $langdoc | sed 's| man||') $PRGNAM: " > $PKG/install/slack-desc diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index d165dc2..d490a52 100755 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -23,9 +23,9 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PKGNAM=tdegwenview-i18n PRGNAM=gwenview-i18n -[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit +PKGNAM=tde$PRGNAM +[[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -38,42 +38,45 @@ untar_fn # Add missing files for Spanish TDE handbook docs if [[ $I18N == *es* ]] then -sed -i 's|SUBDIRS= messages|SUBDIRS= messages doc|' es/Makefile.am -echo "KDE_LANG = es -KDE_DOCS=gwenview -" > es/doc/Makefile.am +## restore es/doc/CMakeLists.txt as the following creates a handbook index +sed -i 's|# ||' es/doc/CMakeLists.txt # use the German index.docbook as a template -cp de/doc/index.docbook es/doc/index.docbook +cp de/doc/index.docbook es/doc/ # these index.docbook 'translations' have been made from the gwenview [US] English original, # the other 'es' *.docbook files are the original translations in the source code # 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 listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -langs="";for Lang in $I18N;do [[ -d $Lang ]] && langs="$langs $Lang";done -sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" Makefile.am - -ltoolupdate_fn +langs="" +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 +} +done +sed -i "s|\${po_files}|$langs|" CMakeLists.txt && \ +langs=$(echo $langs|sed "s|/messages/gwenview.po||g") chown_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_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + .. make_fn @@ -91,18 +94,18 @@ echo " # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -tdegwenview-i18n: tdegwenview-i18n (Internationalization files for gwenview.) -tdegwenview-i18n: -tdegwenview-i18n: For languages: -tdegwenview-i18n: -tdegwenview-i18n: $(echo $langs) -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: -tdegwenview-i18n: + |-----handy-ruler------------------------------------------------------| +$PKGNAM: $PKGNAM (Internationalization files for gwenview.) +$PKGNAM: +$PKGNAM: For languages: +$PKGNAM: +$PKGNAM: $langs +$PKGNAM: +$PKGNAM: +$PKGNAM: +$PKGNAM: +$PKGNAM: +$PKGNAM: " > $PKG/install/slack-desc diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index 804c47d..cfbc511 100644 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -38,22 +38,24 @@ 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 +## 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 -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -../configure \ - --prefix=${INSTALL_TDE} +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 \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + .. make_fn diff --git a/Misc/imlib/README b/Misc/imlib/README new file mode 100644 index 0000000..1f0141d --- /dev/null +++ b/Misc/imlib/README @@ -0,0 +1,11 @@ +Using the gtk+-1.2.10-*-5 and glib-1.2.10-*-3 packages from Slackware 14.2 produces an error: + +| multiple definition of `g_bit_storage' + +gdk_imlib isn't needed for kuickshow, and imlib can be built without it by moving gtk-config out of the PATH. Or removing those packages or upgrading to gtk+-1.2.10-*-7 and glib-1.2.10-*-7 from Slackware-current produces a successful build. + +So if you really want to build gdk_imlib, try using those Sl-current packages, but be aware of this note from the Imlib README: + +"Also note that gdk-imlib WILL NOT WORK with GTK2. It won't even compile. + This is not a bug. This is a feature. If you need an image loader for GTK2, use gdk-pixbuf." + diff --git a/get-source.sh b/get-source.sh index d577021..377d9d0 100755 --- a/get-source.sh +++ b/get-source.sh @@ -147,8 +147,8 @@ git checkout -- * git pull) ## if admin and cmake don't exist, clone them -[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/cgit/tde-common-admin admin -[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/cgit/tde-common-cmake cmake +[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/cgit/admin admin +[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/cgit/cmake cmake ## place a marker so that admin/cmake update or clone only once per run of BUILD-TDE.sh touch $TMPVARS/admin-cmake-done