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

kaffeine - updated development build to cmake

Browse Source 
amarok - removed includehints patch, now done upstream
set up separate log for source downloads
pull/25/head
Ray-V 5 years ago
parent f0ae940b29
commit f5f3608346
4 changed files with 69 additions and 144 deletions
Show Stats Download Patch File Download Diff File

132
Apps/amarok/amarok.SlackBuild
Unescape View File

@ -44,138 +44,6 @@ sed 's|tagaac|tagspeex|g;s|aacfile.*$|taglib_speexfiletyperesolver.cpp speexfile
sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \ sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \
-e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt -e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt
# fix includehints - see issue #16
echo $'
--- amarok/src/Options1.ui
+++ amarok/src/Options1.ui
@@ -686,0 +687,3 @@
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
@@ -695,5 +697,0 @@
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kactivelabel.h</includehint>
-</includehints>
--- amarok/src/Options2.ui
+++ amarok/src/Options2.ui
@@ -746,0 +747,3 @@
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
@@ -759,9 +761,0 @@
-<includehints>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>tdefontrequester.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
--- amarok/src/Options5.ui
+++ amarok/src/Options5.ui
@@ -508,0 +509,5 @@
+ <include location="global" impldecl="in implementation">ktextedit.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+ <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
@@ -528,3 +528,0 @@
-<includehints>
- <includehint>ktextedit.h</includehint>
-</includehints>
--- amarok/src/Options8.ui
+++ amarok/src/Options8.ui
@@ -292,0 +293,2 @@
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
@@ -298,7 +299,0 @@
-<includehints>
- <includehint>kactivelabel.h</includehint>
- <includehint>kactivelabel.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kactivelabel.h</includehint>
-</includehints>
--- amarok/src/dbsetup.ui
+++ amarok/src/dbsetup.ui
@@ -450,0 +451,3 @@
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
@@ -459,9 +461,0 @@
-<includehints>
- <includehint>knuminput.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kcombobox.h</includehint>
-</includehints>
--- amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@@ -436,0 +437 @@
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
@@ -460,3 +460,0 @@
-<includehints>
- <includehint>kactivelabel.h</includehint>
-</includehints>
--- amarok/src/organizecollectiondialog.ui
+++ amarok/src/organizecollectiondialog.ui
@@ -565,0 +566,3 @@
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+ <include location="global" impldecl="in implementation">kactivelabel.h</include>
@@ -589,7 +591,0 @@
-<includehints>
- <includehint>kcombobox.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>kactivelabel.h</includehint>
- <includehint>klineedit.h</includehint>
- <includehint>klineedit.h</includehint>
-</includehints>
--- amarok/src/scripts/graphequalizer/eqdialog.ui
+++ amarok/src/scripts/graphequalizer/eqdialog.ui
@@ -200,0 +201 @@
+ <include location="global" impldecl="in implementation">equalizercanvasview.h</include>
@@ -209,3 +209,0 @@
-<includehints>
- <includehint>equalizercanvasview.h</includehint>
-</includehints>
--- amarok/src/tagguesserconfigdialog.ui
+++ amarok/src/tagguesserconfigdialog.ui
@@ -192,0 +193,2 @@
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
+ <include location="global" impldecl="in implementation">kpushbutton.h</include>
@@ -213,9 +214,0 @@
-<includehints>
- <includehint>kdialog.h</includehint>
- <includehint>tdelistview.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
- <includehint>kpushbutton.h</includehint>
-</includehints>
--- amarok/src/scriptmanagerbase.ui
+++ amarok/src/scriptmanagerbase.ui
@@ -131,0 +132 @@
+ <include location="global" impldecl="in implementation">tdelistview.h</include>
--- amarok/src/engine/xine/xineconfigbase.ui
+++ amarok/src/engine/xine/xineconfigbase.ui
@@ -503,0 +504,2 @@
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
' | while read line
do
patch -N -p0
done || true
## and then do the rest ...
find . -name \*.ui -exec sed -i -e 's|includehint|include|g' '{}' +
## remove help documentation build instruction from all [non-en] locales ... ## remove help documentation build instruction from all [non-en] locales ...
sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true
# #

46
Apps/kaffeine/kaffeine.SlackBuild
Unescape View File

@ -33,6 +33,48 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION != 14.0.7 ]] && {
# 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
## this GLOB overrides 'LANG auto' in po/CMakeLists.txt:
sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake
[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs | sed "s|.po||g")
listdocs_fn
chown_fn
cd_builddir_fn
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 \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
-DWITH_GCC_VISIBILITY="OFF" \
-DWITH_DPMS="ON" \
-DWITH_XTEST="ON" \
-DWITH_XINERAMA="ON" \
-DWITH_XCB="ON" \
-DWITH_GSTREAMER="ON" \
-DWITH_OGGVORBIS="ON" \
-DWITH_LAME="ON" \
-DWITH_DVB="ON" \
-DUSE_TQT_ONLY="OFF" \
-DWITH_XINIT_WORKAROUND="OFF" \
..
: # don't go to autotools build if this fails - set exit 0 always
} || {
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package
langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
@ -57,10 +99,14 @@ CXX=$COMPILER_CXX \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure
}
make_fn make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.7 ]] && mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

2
Apps/koffice/koffice.SlackBuild
Unescape View File

@ -25,7 +25,7 @@
PRGNAM=koffice PRGNAM=koffice
VERSION=${VERSION:-$TDEVERSION} VERSION=${VERSION:-$TDEVERSION}
BUILD=${BUILD:-4} BUILD=${BUILD:-1}
TAG=${TAG:-_tde} TAG=${TAG:-_tde}
## ignore this if pre-downloading sources ## ignore this if pre-downloading sources

33
BUILD-TDE.sh
Unescape View File

@ -550,18 +550,21 @@ sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds
## option to prefix some package names ## option to prefix some package names
## get a list of packages that have SlackBuilds set up to use the prefix 'tde'
grep TDEPFX [ACDL]???/*/*SlackBuild | grep PKGNAM | cut -d/ -f2 > $TMPVARS/TDEPFX_packages
## then create a list of those being built
FILE="" FILE=""
for file in ktorrent k3b-i18n k3b gwenview-i18n gwenview filelight amarok libkipi libkexiv2 libkdcraw for file in $(cat $TMPVARS/TDEPFX_packages)
do do
[[ $(cat $TMPVARS/TDEbuilds) == *"$file "* ]] && FILE="$file $FILE" [[ $(cat $TMPVARS/TDEbuilds) == *"$file "* ]] && FILE="$FILE $file"
done done
# ## and then if there is anything in that list, run this dialog
rm -f $TMPVARS/TDEPFX rm -f $TMPVARS/TDEPFX
[[ $FILE ]] && { [[ $FILE ]] && {
dialog --aspect 7 --cr-wrap --yes-label "tde" --no-label "None" --defaultno --no-shadow --colors --title " tde prefix " --yesno \ dialog --aspect 7 --cr-wrap --yes-label "tde" --no-label "None" --defaultno --no-shadow --colors --title " tde prefix " --yesno \
" "
A 'tde' prefix can be added to some package names A 'tde' prefix can be added to some package names
[ \Zb\Z6$FILE\Zn] [\Zb\Z6$FILE\Zn ]
to avoid confusion with identical packages which might be installed for KDE. to avoid confusion with identical packages which might be installed for KDE.
" \ " \
@ -747,7 +750,7 @@ INST_PACKAGE=yes && [[ $INST == 0 ]] && INST_PACKAGE=no
## emphasise downloading only, not building ## emphasise downloading only, not building
[[ $PRE_DOWNLOAD == yes ]] && DL_BLD_MSG="Download sources" [[ $PRE_DOWNLOAD == yes ]] && DL_BLD_MSG="Download sources"
## whether using tde prefix ## whether using tde prefix
[[ -e $TMPVARS/TDEPFX ]] && tde_prefix=$(cat $TMPVARS/TDEPFX) && [[ ! -s $TMPVARS/TDEPFX ]] && tde_prefix="not used" [[ -e $TMPVARS/TDEPFX ]] && tde_prefix=\\Zn\\Zb\\Z2tde\\Zn && [[ ! -s $TMPVARS/TDEPFX ]] && tde_prefix=no
## start dialog ## start dialog
EXITVAL=2 EXITVAL=2
@ -784,7 +787,10 @@ Prefix for packages common to KDE \Zb\Z6${tde_prefix:-\Z0\Zbn/a}\Zn
EXITVAL=$? EXITVAL=$?
[[ $EXITVAL == 2 ]] && dialog --aspect 5 --cr-wrap --no-shadow --colors --scrollbar --ok-label "Return" --msgbox \ [[ $EXITVAL == 2 ]] && dialog --aspect 5 --cr-wrap --no-shadow --colors --scrollbar --ok-label "Return" --msgbox \
" "
The packages to be built are: The packages to be built are -
\Z0\Zb[sorted list, see
$TMPVARS/TDEbuilds
for the build order]\Zn
$(cat $TMPVARS/TDEbuilds | tr -s " " "\n"|sed 's|^|\\Z0\\Zb|;s|/|\\Zn |'|sort -k 2) $(cat $TMPVARS/TDEbuilds | tr -s " " "\n"|sed 's|^|\\Z0\\Zb|;s|/|\\Zn |'|sort -k 2)
@ -830,13 +836,18 @@ do
Starting $package.SlackBuild Starting $package.SlackBuild
$(printf '%0.s\"' $(seq 1 $[${#package}+20])) $(printf '%0.s\"' $(seq 1 $[${#package}+20]))
\033[0m" \033[0m"
## set 'noarch' for i18n packages
ARCH_i18n="" && [[ $package == *i18n* ]] && ARCH_i18n=noarch ARCH_i18n="" && [[ $package == *i18n* ]] && ARCH_i18n=noarch
TDE_PFX="" && [[ " ktorrent k3b-i18n k3b gwenview-i18n gwenview filelight amarok libkipi libkexiv2 libkdcraw " == *$package* ]] && TDE_PFX=$TDEPFX ## TDEPFX could be set '' from null [n/a], in which case set TDE_PFX="", or
script -c "sh $package.SlackBuild" $TMP/$TDE_PFX$package-$(eval echo $version)-${ARCH_i18n:-$ARCH}-$build-build-log || ${EXIT_FAIL:-"true"} ## if building one of these packages, can be set [tde] or '' [None=no]
TDE_PFX="" && [[ $(cat $TMPVARS/TDEPFX_packages) == *$package* ]] && TDE_PFX=$TDEPFX
## set up separate log for source downloads
LOG="" && [[ $PRE_DOWNLOAD == yes ]] && LOG="source_download"
script -c "sh $package.SlackBuild" $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log || ${EXIT_FAIL:-"true"}
# remove colorizing escape sequences from build-log # 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 # 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/$TDE_PFX$package-$(eval echo $version)-${ARCH_i18n:-$ARCH}-$build-build-log || ${EXIT_FAIL:-"true"} sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log || ${EXIT_FAIL:-"true"}
checkmakepkg () checkmakepkg ()
{ {
@ -845,8 +856,8 @@ checkmakepkg ()
sed -i "s|$dir ||" $TMPVARS/TDEbuilds || { sed -i "s|$dir ||" $TMPVARS/TDEbuilds || {
## if unsuccessful, display error message \ ## if unsuccessful, display error message \
echo " echo "
Error: $TDE_PFX$package package build failed Error: $TDE_PFX$package package ${LOG:-build} failed
Check the build log $TMP/$TDE_PFX$package-$(eval echo $version)-${ARCH_i18n:-$ARCH}-$build-build-log Check the ${LOG:-build} log $TMP/$TDE_PFX$package-$(eval echo $version)-${LOG:-"${ARCH_i18n:-$ARCH}-$build-build"}-log
" "
## if koffice was building with libpng14, restore the libpng16 headers for any following builds ## 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 [[ ${USE_PNG14:-} == yes ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn || true

Write Preview
Loading…
Cancel
Save