From 79c7137d9d40951bb31596a3d5be137c6828547b Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sat, 22 Jan 2022 14:38:24 +0000 Subject: [PATCH] Updated kile for cmake build Checkout R14.1.0 as a worktree, rather than assume the repository is in master branch and copy files Added FEAT command line option to checkout temporary branches Added gcc visibility option to tdeaddons Added system sqlite3 option to digikam Updated dcraw build with libkdcraw.SlackBuild Updated graphviz version Updated moodbar version for gstreamer-1.x Removed lxml --- Apps/digikam/digikam.SlackBuild | 2 + Apps/kile/kile.SlackBuild | 34 ++++++++++-- Apps/klamav/klamav.SlackBuild | 5 +- BUILD-TDE.sh | 5 +- Core/tdeaddons/tdeaddons.SlackBuild | 1 + Libs/libkdcraw/libkdcraw.SlackBuild | 8 ++- Misc/graphviz/graphviz.SlackBuild | 20 +++---- Misc/inkscape/README | 2 +- Misc/inkscape/inkscape.SlackBuild | 2 +- Misc/lxml/README | 9 --- Misc/lxml/lxml.SlackBuild | 85 ----------------------------- Misc/moodbar/moodbar.SlackBuild | 13 ++--- README.md | 2 +- get-source.sh | 34 ++++-------- 14 files changed, 69 insertions(+), 153 deletions(-) delete mode 100755 Misc/lxml/README delete mode 100755 Misc/lxml/lxml.SlackBuild diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 2c1a69a..c6ecf37 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -52,6 +52,7 @@ chown_fn cd_builddir_fn [[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility" +pkg-config sqlite3 && SYS_SQL3="--without-included-sqlite3" CFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \ @@ -61,6 +62,7 @@ CXX=$COMPILER_CXX \ --prefix=$INSTALL_TDE \ --mandir=$INSTALL_TDE/man \ ${EN_GCC_VIS:-} \ + ${SYS_SQL3:-} \ --disable-rpath \ --enable-closure diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 7650d18..0e3603d 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -35,20 +35,27 @@ untar_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -locas="" +langs="" ldocs="" -for Lang in $I18N;do [[ -d translations/$Lang ]] && locas="$locas $Lang" && \ +[[ $TDEVERSION == 14.0.11 ]] && { +for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang" && \ [[ -d translations/$Lang/doc ]] && ldocs="$ldocs $Lang";done -sed -i "s|SUBDIRS=.*$|SUBDIRS=$locas|" translations/Makefile.am +sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am +} || { +for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done +for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done +} listdocs_fn -ltoolupdate_fn +[[ $TDEVERSION == 14.0.11 ]] && ltoolupdate_fn chown_fn cd_builddir_fn +[[ $TDEVERSION == 14.0.11 ]] && { + [[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility" CFLAGS="$SLKRCFLAGS" \ @@ -61,6 +68,23 @@ CXX=$COMPILER_CXX \ --disable-rpath \ --enable-closure +} || { + +cmake ${G_NINJA:-} \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS="ON" \ + -Wno-dev \ + .. + +} + make_fn installdocs_fn @@ -82,7 +106,7 @@ echo " $PRGNAM: Kile is a TEX and LATEX source editor and shell $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: en$locas +$PRGNAM: en$langs $PRGNAM: $PRGNAM: With help documentation for: $PRGNAM: en$ldocs diff --git a/Apps/klamav/klamav.SlackBuild b/Apps/klamav/klamav.SlackBuild index 2e2e2a3..7580c8d 100644 --- a/Apps/klamav/klamav.SlackBuild +++ b/Apps/klamav/klamav.SlackBuild @@ -33,7 +33,7 @@ source ../../get-source.sh ## klamav needs clamav as a build time requirement [[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && { # ### clamav - start -clamav_installed_fn () { [[ $(ls {,/usr{,/local}}/lib$LIBDIRSUFFIX/libclamav.so 2>/dev/null) ]] ;} +clamav_installed_fn () { ldconfig -p|grep libclamav 1>/dev/null ;} ## If it's already installed, go to end clamav_installed_fn || { ## otherwise, if the source archive is in 'src' .. @@ -116,7 +116,8 @@ chown_fn cd_builddir_fn -[[ ! -s /usr/lib$LIBDIRSUFFIX/pkgconfig/sqlite3.pc ]] && EMB_SQL="ON" +! pkg-config sqlite3 && EMB_SQL="ON" + cmake ${G_NINJA:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 68641ce..feccca6 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -418,7 +418,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel. Buildtime options include l/netpbm, t/transfig [fig2dev], Misc/xmedcon \Zn" \ "Apps/abakus" "PC calculator" off "\Zb\Z6 optional dependency l/mpfr which requires l/gmp \Zn" \ " Misc/mp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \ -" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \ +" Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Requires gstreamer-1.x. Runtime option for Amarok \Zn" \ " Misc/yauap" "A simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \ "Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, mp4v2, speex, moodbar, akode, yauap \Zn" \ ${app_1:-} ${about_1:-} ${status_1:-} ${comment_1:-} \ @@ -472,8 +472,7 @@ ${app_5:-} ${about_5:-} ${status_5:-} ${comment_5:-} \ "Apps/twin-style-crystal" "Twin theme" off "\Zb\Z6 \Zn" \ ${app_6:-} ${about_6:-} ${status_6:-} ${comment_6:-} \ "Apps/yakuake" "Quake-style terminal emulator" off "\Zb\Z6 \Zn" \ -" Misc/lxml" "Python bindings for libxml2 and libxslt" off "\Zb\Z6 Required to use Inkscape online help \Zn" \ -" Misc/inkscape" "SVG editor - an alternative to potracegui [and GraphicsMagick]." off "\Zb\Z6 Requires lxml if online help facility is required; potrace is a build-time dependency. \Zn" \ +" Misc/inkscape" "SVG editor - an alternative to potracegui [and GraphicsMagick]." off "\Zb\Z6 potrace is a build-time dependency. \Zn" \ 2> $TMPVARS/TDEbuilds # successful builds are removed from the TDEbuilds list as '$dir ' so add a space to the last entry # and the " needs to be removed because the Misc entries are double-quoted, diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index cd012e0..742ba79 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -75,6 +75,7 @@ cmake ${G_NINJA:-} \ -DWITH_BERKELEY_DB="ON" \ -DWITH_XMMS="OFF" \ -DWITH_TEST="OFF" \ + -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DBUILD_DOC="ON" \ -DBUILD_ATLANTIKDESIGNER=${ATLANTIKDESIGNER:-"OFF"} \ -DBUILD_KADDRESSBOOK_PLUGINS=${KADDRESSBOOK_PLUGINS:-"OFF"} \ diff --git a/Libs/libkdcraw/libkdcraw.SlackBuild b/Libs/libkdcraw/libkdcraw.SlackBuild index 6d68bc6..1040d9f 100755 --- a/Libs/libkdcraw/libkdcraw.SlackBuild +++ b/Libs/libkdcraw/libkdcraw.SlackBuild @@ -41,6 +41,9 @@ listdocs_fn ## use latest version of dcraw.c cp $SB_SRCDIR/dcraw.c libkdcraw/dcraw/ +## .. modified as per the dcraw/README +sed -i 's| printf (_("Camera: %s %s\\n"), make, model);| printf (_("Camera: %s\\n"), make);\ + printf (_("Model: %s\\n"), model);|' libkdcraw/dcraw/dcraw.c ## .. and the corresponding supported cameras list cp $SB_SRCDIR/CAMERALIST libkdcraw/dcraw/ ## .. and the updated man page @@ -54,7 +57,7 @@ sed -i '72i find_package( Jasper )\ endif()\ ' ConfigureChecks.cmake # -sed -i 's|MATH_LIBC.*$|&\n ${JASPER_LIBRARIES}|' libkdcraw/dcraw/CMakeLists.txt # OK after jasper check +sed -i 's|MATH_LIBC.*$|&\n ${JASPER_LIBRARIES}|' libkdcraw/dcraw/CMakeLists.txt ## .. and install the list of supported cameras echo "INSTALL( FILES CAMERALIST @@ -66,6 +69,7 @@ echo "INSTALL( ## and revert the name of the cli binary and man page to dcraw as it's not a TDE/TQt application ## and is confusing where kdcraw is used for the libraw library built sed -i 's| kdcraw| dcraw|' libkdcraw/dcraw/CMakeLists.txt +sed -i 's|BUILD_KDCRAW|BUILD_DCRAW|;s|Build kdcraw program|Build dcraw program|' {{,libkdcraw/}CMakeLists.txt,ConfigureChecks.cmake} patch -p0 -N << EOF --- libkdcraw/dcraw/CMakeLists.txt @@ -140,7 +144,7 @@ cmake ${G_NINJA:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_LCMS="ON" \ -DWITH_OPENMP="ON" \ - -DBUILD_KDCRAW="ON" \ + -DBUILD_DCRAW="ON" \ -DBUILD_TESTS="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index c9bfb58..db0822a 100644 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -26,11 +26,11 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=graphviz -VERSION=2.42.3 +VERSION=2.46.1 BUILD=${BUILD:-1} TAG=${TAG:-} -ARCHIVE_TYPE="tar.gz" +ARCHIVE_TYPE="tar.xz" SRCURL="https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-$VERSION.$ARCHIVE_TYPE" source ../../get-source.sh @@ -38,14 +38,11 @@ getsource_fn untar_fn -# Install PHP bindings to proper location. -sed -i 's|/php/modules|/php/extensions|' configure - # Fix for php-5.4 and patches from Arch (thanks!) patch -N -p0 << EOF || true --- plugin/gs/gvloadimage_gs.c +++ plugin/gs/gvloadimage_gs.c -@@ -83,11 +83,11 @@ +@@ -76,11 +76,11 @@ assert (err < 0); @@ -62,10 +59,14 @@ patch -N -p0 << EOF || true errsrc = "Ghostscript internal error"; --- tclpkg/gv/gv_php_init.c +++ tclpkg/gv/gv_php_init.c -@@ -27,0 +28 @@ +@@ -26,2 +26,3 @@ + { + TSRMLS_FETCH(); -@@ -32,0 +34 @@ + return PHPWRITE(s, len); +@@ -31,2 +32,3 @@ + { + TSRMLS_FETCH(); + return PHPWRITE(s, len); EOF listdocs_fn @@ -74,9 +75,6 @@ chown_fn cd_builddir_fn -## find ocaml headers -#sed -i 's|/usr/lib$LIBPOSTFIX/ocaml|/usr/local/lib$LIBPOSTFIX/ocaml|' ../configure - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ diff --git a/Misc/inkscape/README b/Misc/inkscape/README index 09ca68a..d52cc2a 100644 --- a/Misc/inkscape/README +++ b/Misc/inkscape/README @@ -1,4 +1,4 @@ -Inkscape v1* requires the non-Slackware package double-conversion. +Inkscape v1 requires the non-Slackware package double-conversion. The source will need to be pre-downloaded and placed in the 'src' directory and will then be built, packaged, and installed during the inkscape build. diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index 62624a1..318acee 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -39,7 +39,7 @@ getsource_fn # ### double-conversion - start { ## If it is already installed, go to end -[[ -s /usr/local/lib$LIBDIRSUFFIX/libdouble-conversion.so ]] || { +ldconfig -p|grep libdouble-conversion 1>/dev/null || { ## otherwise, if the source archive is in 'src' .. [[ -s $BUILD_TDE_ROOT/src/double-conversion-3.1.5.tar.gz ]] && { ## .. build, package, and install .. diff --git a/Misc/lxml/README b/Misc/lxml/README deleted file mode 100755 index 5669463..0000000 --- a/Misc/lxml/README +++ /dev/null @@ -1,9 +0,0 @@ -lxml is a Pythonic binding for the libxml2 and libxslt libraries. - -Required for online help functions for Inkscape. - ------------------------------------------------------------- - -Cython, python3 and pysetuptools are optional build dependencies. -cssselect and html5lib are optional runtime dependencies. - diff --git a/Misc/lxml/lxml.SlackBuild b/Misc/lxml/lxml.SlackBuild deleted file mode 100755 index 3162b5d..0000000 --- a/Misc/lxml/lxml.SlackBuild +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST -# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands -# Copyright 2015-2017 Thorn Inurcide -# Copyright 2015-2017 tde-slackbuilds project on GitHub -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# Python build taken from the SlackBuilds.org build script for lxml -# Copyright 2009-2015 Larry Hajali -# All rights reserved. - -PRGNAM=lxml -VERSION=4.4.2 -BUILD=${BUILD:-1} -TAG=${TAG:-} - -ARCHIVE_TYPE="tar.gz" -SRCURL="https://files.pythonhosted.org/packages/source/l/lxml/lxml-$VERSION.$ARCHIVE_TYPE" - -source ../../get-source.sh -getsource_fn - -untar_fn - -listdocs_fn - -chown_fn - -#cd_builddir_fn - don't use - -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 - python3 setup.py install --skip-build --root=$PKG || exit 1 -fi - -installdocs_fn - -strip_fn - -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 ':'. - |-----handy-ruler------------------------------------------------------| -$PRGNAM: lxml (Python bindings for libxml2 and libxslt) -$PRGNAM: -$PRGNAM: Required for online help functions for Inkscape. -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc - -makepkg_fn diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild index 7e15d31..8bf3866 100755 --- a/Misc/moodbar/moodbar.SlackBuild +++ b/Misc/moodbar/moodbar.SlackBuild @@ -24,12 +24,12 @@ # SUCH DAMAGE. PRGNAM=moodbar -VERSION=0.1.2 +VERSION=0.1.4 BUILD=${BUILD:-1} TAG=${TAG:-} ARCHIVE_TYPE="tar.gz" -SRCURL="http://pkgs.fedoraproject.org/repo/pkgs/${PRGNAM}/${PRGNAM}-${VERSION}.$ARCHIVE_TYPE/28c8eb65e83b30f71b84be4fab949360/${PRGNAM}-${VERSION}.$ARCHIVE_TYPE" +SRCURL="https://github.com/Mazhoon/moodbar/archive/v0.1.4.$ARCHIVE_TYPE" source ../../get-source.sh getsource_fn @@ -40,15 +40,10 @@ listdocs_fn chown_fn -cd_builddir_fn - CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ +./autogen.sh \ + --prefix=$(pkg-config --variable=prefix gstreamer-1.0) \ --disable-static make_fn diff --git a/README.md b/README.md index 93558ba..d83257d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If you're curious about what this might involve, [take a look at a sample build --- -***Other command line options*** that can be used to set some build parameters: +***Command line options*** that can be used to set some build parameters: * TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://trinitydesktop.mirrorservice.org/trinity*. URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorstatus.php * BUILD= - sets the package build identifier, overriding the SlackBuild default of 1 diff --git a/get-source.sh b/get-source.sh index 7f43a5c..bc7c73a 100755 --- a/get-source.sh +++ b/get-source.sh @@ -136,7 +136,7 @@ git pull git fetch origin r14.0.x:r14.0.x) ## if admin and cmake don't exist, clone them -[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/admin admin +[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin admin [[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-cmake cmake ## place a marker so that admin/cmake update or clone only once per run of BUILD-TDE.sh @@ -261,16 +261,17 @@ mv cmake-trinity-$TDEVERSION cmake } || { ## [2] not 14.0.11 nor misc, so must be git .. -## but is it [2a] 14.0.x .. -[[ $TDEVERSION == 14.0.x ]] && { +[[ $TDEVERSION == 14.1.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.0.x -## copy git r14.0.x content to build area: +## copy git content to build area: ( cd $BUILD_TDE_ROOT/src/cgit/$PRGNAM/ echo -e "\n copying $PRGNAM git sources to build area ... \n" ## remove any old .git/worktrees records - only being used here as a build source rm -rf .git/worktrees/* -git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ r14.0.x +## use FEAT as a command line option to checkout any other development branch .. +## .. plus FEATa for admin, FEATc for cmake if required +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ ${FEAT:-$DEV_BRANCH} ## work-around for some cr*p in admin in the r14.0.x branch of tdeio-locate ## it's a cmake build, so admin isn't needed @@ -278,45 +279,30 @@ git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ r14.0.x cd ../admin echo -e "\n copying admin git sources to build area ... \n" rm -rf .git/worktrees/* -git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/admin/ r14.0.x +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/admin/ ${FEATa:-$DEV_BRANCH} } cd ../cmake echo -e "\n copying cmake git sources to build area ... \n" rm -rf .git/worktrees/* -git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/cmake/ r14.0.x +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/cmake/ ${FEATc:-$DEV_BRANCH} [[ " arts tdelibs " == *$PRGNAM* ]] && { cd ../libltdl echo -e "\n copying libltdl git sources to build area ... \n" rm -rf .git/worktrees/* -git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libltdl/ r14.0.x +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libltdl/ $DEV_BRANCH } [[ " tdenetwork " == *$PRGNAM* && $TDEVERSION != 14.0.x ]] && { cd ../libtdevnc/ echo -e "\n copying libtdevnc git sources to build area ... \n" rm -rf .git/worktrees/* -git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libtdevnc/ r14.0.x +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libtdevnc/ $DEV_BRANCH } echo # if this fails, SlackBuild will fail from [3] ) } - -## .. or [2b] 14.1.0 .. -[[ $TDEVERSION == 14.1.0 ]] && { -## copy git repo but don't copy .git directory: -echo -e "\n copying $PRGNAM git sources to build area ... \n" -(cd $BUILD_TDE_ROOT/src/cgit -cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ -cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a --parents libltdl/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -# -echo # if this fails, SlackBuild will fail from [3] -) -} -} # ## [3] finally, cd into source directory #