SlavekB
/
tde-packaging-slackware
mirror of https://github.com/Ray-V/tde-slackbuilds.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Final revisions for a complete build using git sources

Browse Source
pull/25/head
Ray-V 6 years ago
parent 48c63f38a7
commit 4a08326eb9
17 changed files with 145 additions and 103 deletions
Show Stats Download Patch File Download Diff File

2
Apps/digikam/digikam.SlackBuild
Unescape View File

@ -33,6 +33,7 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == R14.0.4 ]] && {
## fix for gcc7: ## fix for gcc7:
##In file included from ../../../../../digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp:35:0: ##In file included from ../../../../../digikam/imageplugins/coreplugin/sharpnesseditor/matrix.cpp:35:0:
##/usr/include/stdlib.h:751:12: error: expected unqualified-id before ‘int’ ##/usr/include/stdlib.h:751:12: error: expected unqualified-id before ‘int’
@ -58,6 +59,7 @@ echo '--- digikam/imageplugins/coreplugin/sharpnesseditor/clapack/f2c.h
do do
patch -p0 patch -p0
done done
}
listdocs_fn listdocs_fn

6
Apps/kaffeine/kaffeine.SlackBuild
Unescape View File

@ -41,6 +41,8 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po
sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
langs=$(echo $langs | sed "s|.po||g") langs=$(echo $langs | sed "s|.po||g")
[[ $TDEVERSION == R14.0.4 ]] && {
## patch for clang ## patch for clang
echo $' echo $'
--- kaffeine/src/input/audiobrowser/urllistview.h --- kaffeine/src/input/audiobrowser/urllistview.h
@ -52,6 +54,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
ltoolupdate_fn ltoolupdate_fn
@ -59,7 +62,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
# Refusing to compile with Clang
LDFLAGS=$SLKLDFLAGS \ LDFLAGS=$SLKLDFLAGS \
CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \
CXXFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \
@ -89,7 +91,7 @@ echo "
# make exactly 11 lines for the formatting to be correct. It's also # make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'. # customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------| |-----handy-ruler------------------------------------------------------|
$PRGNAM: $PRGNAM (Media Player) $PRGNAM: $PRGNAM (Media Player)
$PRGNAM: $PRGNAM:
$PRGNAM: Media Player for TDE $PRGNAM: Media Player for TDE

16
Apps/kbfx/kbfx.SlackBuild
Unescape View File

@ -50,12 +50,12 @@ cd_builddir_fn
cmake \ cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_COMPILER=${COMPILER} \ -DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_ALL="ON" \ -DBUILD_ALL="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-OFF} \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \
.. ..
@ -79,7 +79,7 @@ echo "
$PRGNAM|-----handy-ruler------------------------------------------------------| $PRGNAM|-----handy-ruler------------------------------------------------------|
$PRGNAM: $PRGNAM (Alternate Menu) $PRGNAM: $PRGNAM (Alternate Menu)
$PRGNAM: $PRGNAM:
$PRGNAM: KBFX is an alternative to the classical K-Menu button and it's menu $PRGNAM: KBFX is an alternative to the classical K-Menu button and its menu
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
@ -93,13 +93,13 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
cat <<EOINS >> $PKG/install/doinst.sh cat <<EOINS >> $PKG/install/doinst.sh
# Update the desktop database: # Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then if [ -x usr/bin/update-desktop-database ]; then
chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
fi fi
# Update hicolor theme cache: # Update hicolor theme cache:
if [ -d usr/share/icons/hicolor ]; then if [ -d usr/share/icons/hicolor ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; 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 chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
fi fi
fi fi

18
Apps/kdbusnotification/kdbusnotification.SlackBuild
Unescape View File

@ -41,13 +41,13 @@ chown_fn
cd_builddir_fn cd_builddir_fn
LDFLAGS="${SLKLDFLAGS}" \ LDFLAGS=$SLKLDFLAGS \
CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \
CXXFLAGS="${SLKCFLAGS}" \ CXXFLAGS=$SLKCFLAGS \
CC=${COMPILER} \ CC=$COMPILER \
CXX=${COMPILER_CXX} \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=${INSTALL_TDE} \ --prefix=$INSTALL_TDE \
--disable-debug \ --disable-debug \
--build=$ARCH-slackware-linux --build=$ARCH-slackware-linux
@ -58,9 +58,9 @@ installdocs_fn
strip_fn strip_fn
# Add desktop file # Add desktop file
mkdir -p $PKG/${INSTALL_TDE}/share/applications mkdir -p $PKG/$INSTALL_TDE/share/applications
cp -a $SRCDIR/kdbusnotification-autostart.desktop \ cp -a $SRCDIR/kdbusnotification-autostart.desktop \
$PKG/${INSTALL_TDE}/share/applications/kdbusnotification-autostart.desktop $PKG/$INSTALL_TDE/share/applications/kdbusnotification-autostart.desktop
mkdir_install_fn mkdir_install_fn
@ -89,7 +89,7 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
cat <<EOINS >> $PKG/install/doinst.sh cat <<EOINS >> $PKG/install/doinst.sh
# Update the desktop database: # Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then if [ -x usr/bin/update-desktop-database ]; then
chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
fi fi
EOINS EOINS

2
Apps/kile/kile.SlackBuild
Unescape View File

@ -40,6 +40,7 @@ listdocs_fn
langs="";for Lang in $I18N;do [[ -e translations/$Lang ]] && langs="$langs $Lang";done langs="";for Lang in $I18N;do [[ -e translations/$Lang ]] && langs="$langs $Lang";done
sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am
[[ $TDEVERSION == R14.0.4 ]] && {
## patch for clang ## patch for clang
echo $' echo $'
--- src/kile/kileprojectview.h --- src/kile/kileprojectview.h
@ -51,6 +52,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
ltoolupdate_fn ltoolupdate_fn

2
Apps/knemo/knemo.SlackBuild
Unescape View File

@ -45,6 +45,7 @@ sed -i 's|Default Gateway" ), LINK_QUALITY|Default Gateway" ), GATEWAY|' src/kne
langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang";done langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang";done
sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am
[[ $TDEVERSION == R14.0.4 ]] && {
## patch for clang ## patch for clang
echo $' echo $'
--- src/knemod/knemodaemon.h --- src/knemod/knemodaemon.h
@ -56,6 +57,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
ltoolupdate_fn ltoolupdate_fn

2
Apps/koffice/koffice.SlackBuild
Unescape View File

@ -45,6 +45,7 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == R14.0.4 ]] && {
## patch for clang ## patch for clang
## second hunk based on 0004-fix-an-FTBFS-when-build-with-clang.patch @ http://trinity-devel.pearsoncomputing.net/?0::11397 ## second hunk based on 0004-fix-an-FTBFS-when-build-with-clang.patch @ http://trinity-devel.pearsoncomputing.net/?0::11397
echo $' echo $'
@ -67,6 +68,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
## fix chalk crashing - set liblcms as a direct dependency - see issue 37 for details ## fix chalk crashing - set liblcms as a direct dependency - see issue 37 for details
sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am

2
Apps/tdek3b/tdek3b.SlackBuild
Unescape View File

@ -34,6 +34,7 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == R14.0.4 ]] && {
## patch for clang ## patch for clang
echo $' echo $'
--- libk3b/projects/k3babstractwriter.h --- libk3b/projects/k3babstractwriter.h
@ -95,6 +96,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
listdocs_fn listdocs_fn

15
BUILD-TDE.sh
Unescape View File

@ -9,6 +9,8 @@ if [ ! -d $TMPVARS ]; then
fi fi
rm $TMPVARS/got-this-far ## testing rm $TMPVARS/got-this-far ## testing
## remove marker for git admin/cmake to update or clone only once per run of this script
rm -f $TMPVARS/admin-cmake-done
dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \ dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \
" "
@ -95,16 +97,18 @@ Set the version of TDE to be built.
rm -f $TMPVARS/INSTALL_TDE rm -f $TMPVARS/INSTALL_TDE
dialog --cr-wrap --defaultno --no-shadow --colors --cancel-label "/opt/trinity" --ok-label "/usr" --title " TDE Installation Directory " --inputbox \ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Installation Directory " --menu \
" "
Select the directory that TDE is to be installed in, \Zb\Zr\Z4</....>\Zn. Select the directory that TDE is to be installed in.
Use any arrow key x2 to activate the input box to edit for another installation directory. Any other option will have to be edited into BUILD-TDE.sh
" \ " \
14 75 /usr \ 14 75 3 \
"/opt/trinity" "" \
"/opt/tde" "" \
"/usr" "" \
2> $TMPVARS/INSTALL_TDE 2> $TMPVARS/INSTALL_TDE
[[ $? == 1 ]] && echo /opt/trinity > $TMPVARS/INSTALL_TDE
rm -f $TMPVARS/COMPILER rm -f $TMPVARS/COMPILER
@ -744,7 +748,6 @@ checkinstall ()
{ {
{ {
[[ $package != libpng ]] && [[ $(ls /var/log/packages/$package-*$(eval echo $version)-*-$build*) ]] [[ $package != libpng ]] && [[ $(ls /var/log/packages/$package-*$(eval echo $version)-*-$build*) ]]
## testing #echo $(ls /var/log/packages/$package-*$(eval echo $version)-*-$build*) > $TMPVARS/libcaldav-package-build-failed
} || { } || {
[[ $package == libpng ]] && [[ $(ls $LIBPNG_TMP/$package-$(eval echo $version)-*-$build*.txz) ]] [[ $package == libpng ]] && [[ $(ls $LIBPNG_TMP/$package-$(eval echo $version)-*-$build*.txz) ]]
} }

2
Core/tde-i18n/tde-i18n.SlackBuild
Unescape View File

@ -52,7 +52,7 @@ echo -e "\033[0m"
tar -xf $SOURCE $PRGNAM/$PRGNAM-$lang tar -xf $SOURCE $PRGNAM/$PRGNAM-$lang
cd $PRGNAM cd $PRGNAM
} || { } || {
mkdir $PRGNAM mkdir -p $PRGNAM # need -p for git builds if more than one lang
cd $PRGNAM cd $PRGNAM
cp -a $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang . cp -a $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang .
cp -a $BUILD_TDE_ROOT/src/cgit/{admin,cmake} tde-i18n-$lang/ cp -a $BUILD_TDE_ROOT/src/cgit/{admin,cmake} tde-i18n-$lang/

7
Core/tdeaddons/tdeaddons.SlackBuild
Unescape View File

@ -34,8 +34,8 @@ getsource_fn
untar_fn untar_fn
listdocs_fn listdocs_fn
# patch for TDE bug 2043
[[ $TDEVERSION == R14.0.4 ]] && { [[ $TDEVERSION == R14.0.4 ]] && {
# patch for TDE bug 2043
echo $' echo $'
--- konq-plugins/arkplugin/arkplugin.cpp --- konq-plugins/arkplugin/arkplugin.cpp
+++ konq-plugins/arkplugin/arkplugin.cpp +++ konq-plugins/arkplugin/arkplugin.cpp
@ -73,7 +73,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
## Set the default compression as tar.xz ## Set the default compression as tar.xz
## enable jar & ar compression in Compress As menu ## enable jar & ar compression in Compress As menu
## remove application/x-rar-compressed ## remove application/x-rar-compressed
@ -99,6 +99,7 @@ echo $'
do do
patch -p0 patch -p0
done done
}
chown_fn chown_fn
@ -109,7 +110,7 @@ chown_fn
[[ $(ls /var/log/packages/tdepim-*) ]] && KADDRESSBOOK_PLUGINS="ON" [[ $(ls /var/log/packages/tdepim-*) ]] && KADDRESSBOOK_PLUGINS="ON"
# Check for tdemultimedia # Check for tdemultimedia
[[ $(ls /var/log/packages/tdemultimedia-*) ]] && NOATUN_PLUGINS="ON" [[ $(ls $INSTALL_TDE/include/arts/artsmodules.h) ]] && NOATUN_PLUGINS="ON"
cd_builddir_fn cd_builddir_fn
cmake \ cmake \

39
Core/tdenetwork/tdenetwork.SlackBuild
Unescape View File

@ -37,6 +37,27 @@ untar_fn
## add patch for gcc6 ## add patch for gcc6
sed -i 's|"functionName"|" functionName "|' kopete/libkopete/kautoconfig.cpp sed -i 's|"functionName"|" functionName "|' kopete/libkopete/kautoconfig.cpp
##Add '-pthread' for error:
##/bin/ld: ../libtdevnc/libtdevncclient.a(tls_openssl.c.o): undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
##/lib64/libpthread.so.0: error adding symbols: DSO missing from command line
[[ $TDEVERSION != R14.0.4 ]] && PTHRD="-pthread"
##Error in git build where libtdevnc has been added as a dependency of KRDC and KRFB and openssl is being used:
##../libtdevnc/libtdevncclient.a(tls_openssl.c.o): In function `InitializeTLS':
##/tmp/build/tmp-tdenetwork/tdenetwork/libtdevnc/libvncclient/tls_openssl.c:153: undefined reference to `CRYPTO_num_locks'
[[ $TDEVERSION != R14.0.4 ]] && {
echo $'
--- libtdevnc/CMakeLists.txt
+++ libtdevnc/CMakeLists.txt
@@ -304 +304 @@
- ${ADDITIONAL_LIBS} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${GNUTLS_LIBRARIES}
+ ${ADDITIONAL_LIBS} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${GNUTLS_LIBRARIES} ${OPENSSL_LIBRARIES}
' | while read line
do
patch -N -p0
done || true # added for if/when upstream apply this patch causing it to fail
}
listdocs_fn listdocs_fn
chown_fn chown_fn
@ -47,13 +68,13 @@ cd_builddir_fn
## GADU & MEANWHILE require libgadu and meanwhile installed. ## GADU & MEANWHILE require libgadu and meanwhile installed.
cmake \ cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS ${PTHRD:-}" \
-DCMAKE_C_COMPILER=${COMPILER} \ -DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_JINGLE="ON" \ -DWITH_JINGLE="ON" \
-DWITH_SPEEX=${SPX:-"OFF"} \ -DWITH_SPEEX=${SPX:-"OFF"} \
@ -142,19 +163,19 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
cat <<EOINS >> $PKG/install/doinst.sh cat <<EOINS >> $PKG/install/doinst.sh
# Update the desktop database: # Update the desktop database:
if [ -x usr/bin/update-desktop-database ]; then if [ -x usr/bin/update-desktop-database ]; then
chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1 chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
fi fi
# Update hicolor theme cache: # Update hicolor theme cache:
if [ -d usr/share/icons/hicolor ]; then if [ -d usr/share/icons/hicolor ]; then
if [ -x /usr/bin/gtk-update-icon-cache ]; 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 chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
fi fi
fi fi
# Update the mime database: # Update the mime database:
if [ -x usr/bin/update-mime-database ]; then if [ -x usr/bin/update-mime-database ]; then
chroot . /usr/bin/update-mime-database ${INSTALL_TDE}/share/mime >/dev/null 2>&1 chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1
fi fi
EOINS EOINS

8
Core/tdeutils/tdeutils.SlackBuild
Unescape View File

@ -33,6 +33,7 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == R14.0.4 ]] && {
## remove redundant application/x-tbz2 references [line 55] to get rid of ark warning: ## 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 ?) ## 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 ## the other removals are a general clear out of the mimetype before they cause problems
@ -73,8 +74,8 @@ echo $'
+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 +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 ' | while read line
do do
patch -N -p0 patch -p0
done || true ## to avoid build failure because patch has skipped already applied patches [cgit] done
## fix bug 2794 - ark can't open rar files ## fix bug 2794 - ark can't open rar files
echo $' echo $'
@ -98,8 +99,9 @@ echo $'
+ m_version += versionRegExp.cap(5).toShort(); + m_version += versionRegExp.cap(5).toShort();
' | while read line ' | while read line
do do
patch -N -p0 patch -p0
done done
}
listdocs_fn listdocs_fn

2
Misc/inkscape/inkscape.SlackBuild
Unescape View File

@ -57,7 +57,7 @@ for locale in $I18N
done done
## set up a directory to store the required locale files temporarily ## set up a directory to store the required locale files temporarily
TEMP_DIR=$TMP/tmp-$PRGNAM/loc_tmp TEMP_DIR=$TMP_BUILD/tmp-$PRGNAM/loc_tmp
mkdir $TEMP_DIR mkdir $TEMP_DIR
## .. for READMEs ## .. for READMEs

2
Misc/tidy-html5/tidy-html5.SlackBuild
Unescape View File

@ -37,7 +37,7 @@ ARCHIVE_TYPE="zip"
source ../../get-source.sh source ../../get-source.sh
getsource_fn getsource_fn
cd $TMP/tmp-$PRGNAM cd $TMP_BUILD/tmp-$PRGNAM
unzip $SOURCE unzip $SOURCE
cd $PRGNAM-$VERSION cd $PRGNAM-$VERSION

41
README-git
Unescape View File

@ -1,6 +1,6 @@
The individual TDE apps can be cloned from Trinity git, so the build is set up to do that - except for individual language packs of tde-i18n. The whole tde-i18n download is ~1x10^6 bytes, so to reduce that, wget is used to download individual tde-i18n-ab_CD packs as they are not git repositories. The individual TDE apps can be cloned from Trinity git, so the build is set up to do that - except for individual language packs of tde-i18n. The whole tde-i18n download is ~1x10^6 bytes, so to reduce that, wget is used to download individual tde-i18n-ab_CD packs as they are not git repositories.
Once any git repository has been cloned, further downloads are updates only. Once any git repository has been cloned, further downloads are updates only[*].
This gives the best options - only fetching what is needed, and incremental updates. This gives the best options - only fetching what is needed, and incremental updates.
@ -23,35 +23,18 @@ src
├── tde-i18n-en_GB ├── tde-i18n-en_GB
└── tde-i18n-ru └── tde-i18n-ru
For the build, these repositories are copied to the build area where the R14.0.4 archives would otherwise be extracted. admin & cmake are also always copied, and libltdl where it's needed. For the build, these repositories are copied to the build area where the R14.0.4 archives would otherwise be extracted. admin & cmake are also always copied, and libltdl and libtdevnc where they're needed.
This has resulted in most of the modifications being in the main scripts, BUILD-TDE.sh and get-source.sh [in getsource_fn and untar_fn]. tde-i18n.SlackBuild had to be modified because it doesn't use untar_fn. Some other *.SlackBuild modifications are work-arounds to accommodate the patching already included in the git sources. This has resulted in most of the modifications being in the main scripts, BUILD-TDE.sh and get-source.sh [in getsource_fn and untar_fn]. tde-i18n.SlackBuild had to be modified because it doesn't use untar_fn. Some other *.SlackBuild modifications are work-arounds to accommodate the patching already included in the git sources.
As this is in beta stage, I've left in the markers I use in get-source.sh to give a better idea of where the build is failing. As this is in beta stage, I've left in the markers I use in get-source.sh to give a better idea of where the build fails. However, all packages in the BUILD-TDE.sh " TDE Packages Selection " have now been tested and build using gcc - except kdbusnotification:
First upload:
modified: BUILD-TDE.sh
modified: Core/tde-i18n/tde-i18n.SlackBuild
modified: Core/tdeaddons/tdeaddons.SlackBuild
modified: Core/tdelibs/tdelibs.SlackBuild
modified: Core/tdeutils/tdeutils.SlackBuild
modified: Deps/arts/arts.SlackBuild
modified: Deps/tqt3/tqt3.SlackBuild
modified: README
modified: get-source.sh
tested: tqt3
tested: tqtinterface
tested: arts
tested: dbus-tqt
tested: dbus-1-tqt
tested: libart_lgpl
tested: tqca-tls
tested: avahi-tqt
tested: tdelibs
tested: tdebase
tested: tde-i18n-en_GB
tested: tde-i18n-ru
tested: tdeaddons
tested: tdeutils
In file included from daemon.moc.cpp:9:0:
../../../src/daemon/daemon.h:25:42: error: expected initializer before ‘:’ token
class TDEUI_EXPORT NotificationContainer : public TDEPassivePopupStackContainer
^
which I haven't been able to fix.
[*] I'm sure that checking timestamps with wget did work when I set it up, but it doesn't now as the server doesn't seem to be delivering that information. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As the latest update was a year ago, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue.

82
get-source.sh
Unescape View File

@ -116,76 +116,93 @@ fi
{ {
## if not creating/updating git, nothing to do in this function for git builds ## if not creating/updating git, nothing to do in this function for git builds
## otherwise, now not R14.0.4 or misc, and creating/updating git, do admin/cmake: ## otherwise, now not R14.0.4 or misc, and we are creating/updating git, so [1] start with admin/cmake:
[[ $(cat $TMPVARS/CGIT) == yes ]] && { [[ $(cat $TMPVARS/CGIT) == yes ]] && {
#mkdir -p $BUILD_TDE_ROOT/src/cgit
cd $BUILD_TDE_ROOT/src/cgit cd $BUILD_TDE_ROOT/src/cgit
echo yes8 >> $TMPVARS/got-this-far echo yes8 >> $TMPVARS/got-this-far
## if admin and cmake don't exist, clone them [[ ! -e $TMPVARS/admin-cmake-done ]] && {
[[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/cgit/tde-common-admin admin ## if admin and cmake exist, update them
[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/cgit/tde-common-cmake cmake [[ -d admin ]] && \
## update admin and cmake (echo "Updating admin ..."
[[ -d admin ]] && echo "Updating admin ..." && (cd admin cd admin
git checkout -- * git checkout -- *
git pull) git pull)
[[ -d cmake ]] && echo "Updating cmake ..." && (cd cmake [[ -d cmake ]] && \
(echo "Updating cmake ..."
cd cmake
git checkout -- * git checkout -- *
git pull) git pull)
## not tde-i18n, and creating/updating git, do PRGNAM ## 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
## place a marker so that admin/cmake update or clone only once per run of BUILD-TDE.sh
touch $TMPVARS/admin-cmake-done
}
## if not tde-i18n, [2] update or clone PRGNAM
[[ $PRGNAM != tde-i18n ]] && { [[ $PRGNAM != tde-i18n ]] && {
echo yes9 >> $TMPVARS/got-this-far echo yes9 >> $TMPVARS/got-this-far
## if the app repo doesn't exist, clone it .. ## get latest commits if the local repository for PRGNAM exists
[[ -d $PRGNAM ]] && \
(echo "Updating $PRGNAM ..."
cd $PRGNAM
git checkout -- *
git pull)
## if the local repository for PRGNAM doesn't exist, clone it ..
[[ ! -d $PRGNAM ]] && \ [[ ! -d $PRGNAM ]] && \
echo "yes10 $PWD clone $PRGNAM" >> $TMPVARS/got-this-far && \ echo "yes10 $PWD clone $PRGNAM" >> $TMPVARS/got-this-far && \
git clone https://mirror.git.trinitydesktop.org/cgit/$PRGNAM git clone https://mirror.git.trinitydesktop.org/cgit/$PRGNAM
## get latest commits
[[ -d $PRGNAM ]] && echo "Updating $PRGNAM ..." && {
(cd $PRGNAM
git checkout -- *
git pull)
## if arts/tdelibs, need libltdl ## if arts/tdelibs, need libltdl
[[ " arts tdelibs " == *$PRGNAM* ]] && { [[ " arts tdelibs " == *$PRGNAM* ]] && {
[[ ! -d libltdl ]] && \
#rm -rf $PRGNAM/libltdl
git clone https://mirror.git.trinitydesktop.org/cgit/libltdl
#ln -s ../libltdl $PRGNAM/
[[ -d libltdl ]] && \ [[ -d libltdl ]] && \
(echo "Updating libltdl ..." (echo "Updating libltdl ..."
cd libltdl cd libltdl
git checkout -- * git checkout -- *
git pull) git pull)
[[ ! -d libltdl ]] && \
git clone https://mirror.git.trinitydesktop.org/cgit/libltdl
} }
## if tdenetwork, need libtdevnc
[[ " tdenetwork " == *$PRGNAM* ]] && {
[[ -d libtdevnc ]] && \
(echo "Updating libtdevnc ..."
cd libtdevnc
git checkout -- *
git pull)
[[ ! -d libtdevnc ]] && \
git clone https://mirror.git.trinitydesktop.org/cgit/libtdevnc
} }
true # stop the following i18n download (attempts) if this routine fails true # stop the following i18n download (attempts) if this routine fails and i18n not required
} || \ } || \
{ {
## for tde-i18n-$lang, and creating/updating git do this: ## still creating/updating git, so [3] for tde-i18n-$lang:
## Use wget to download the required i18n repos to avoid the ~1x10^6 byte download for the full tde-i18n ## Use wget to download the required i18n repos to avoid the ~1x10^6 byte download for the full tde-i18n
## same for both creating and updating ## - same for both creating and updating
## this test not strictly logically necessary, but can run a second time if the previous fails
## add this if the above 'true' causes problems
## [[ $PRGNAM == tde-i18n ]] && {
for lang in $I18N for lang in $I18N
do do
echo "yes11 $PWD" >> $TMPVARS/got-this-far echo "yes11 $PWD" >> $TMPVARS/got-this-far
cd tdei18n cd tdei18n
echo "yes12 $PWD" >> $TMPVARS/got-this-far echo "yes12 $PWD" >> $TMPVARS/got-this-far
wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/tde-i18n-$lang/ wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/tde-i18n-$lang/
##will give: ##will download the tde-i18n-$lang files to:
##$BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang/* ##$BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang/*
cd .. cd ..
done done
#}
} }
} }
} }
@ -229,10 +246,13 @@ do
patch -p0 patch -p0
done || true done || true
} || { } || {
## don't copy .git directory:
(cd $BUILD_TDE_ROOT/src/cgit
echo "yes15 $PWD" >> $TMPVARS/got-this-far echo "yes15 $PWD" >> $TMPVARS/got-this-far
cp -a $BUILD_TDE_ROOT/src/cgit/$PRGNAM . cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/
cp -a $BUILD_TDE_ROOT/src/cgit/{admin,cmake} $PRGNAM/ cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/
[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a $BUILD_TDE_ROOT/src/cgit/libltdl $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 yes16 >> $TMPVARS/got-this-far echo yes16 >> $TMPVARS/got-this-far
} && { } && {
[[ $TDEVERSION == R14.0.4 && $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true [[ $TDEVERSION == R14.0.4 && $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true

Write Preview
Loading…
Cancel
Save