Added option to build pre-release snapshot

Removed libart_lgpl references
pull/25/head
Ray-V 6 years ago
parent da40d67dfb
commit af39fe8b8d

@ -35,7 +35,7 @@ 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
@ -74,7 +74,7 @@ else(NOT GETTEXT_MSGFMT_EXECUTABLE)
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

@ -89,8 +89,9 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu
Set the version of TDE to be built.
" \
13 75 3 \
"R14.0.5" "the latest released version" \
14 75 4 \
"R14.0.5" "the latest release from source archives" \
"r14.0.6" "snapshot of the next release" \
"cgit" "development source from Trinity git" \
"R14.0.4" "the previous release" \
2> $TMPVARS/TDEVERSION
@ -359,7 +360,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Deps/arts" "\Zb\Zr\Z4R\Zn Sound server for TDE" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/dbus-tqt" "\Zb\Zr\Z4R\Zn A simple IPC library" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/libart_lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" ${SELECT:-off} "\Zb\Z6 \Zn" \
"Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" ${SELECT:-off} "\Zb\Z6 \Zn" \
"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 \Zn" \

@ -1,23 +0,0 @@
12/29/2015 Removed Avahi and krb5 as deps
08/01/2016 Overhaul to entire build process using a dialog script - Thanks Ray-V
2016-12-04 Issue 21 - Added TDEVERSION variable. Changed libcaldav to optional dependency. Updated mp4v2 URL.
2016-12-27 Updated dolphin, amarok, tdenetwork, k3b[-i18n], tdegames to cmake build.
Added Apps/abakus and Apps/filelight. Put Apps in program name order in BUILD-TDE.sh
2016-12-27 Added Apps/{knmap,kscope,tdesudo} and Misc/graphviz
Modified BUILD-TDE.sh and tqt3.SlackBuild for ld.so.conf option
12/27/2016 Added moodbar in Misc, as optional dep for {tde}amarok
12/27/2016 Added libcarddav. Added an alternate dektop file for dolphin that just changes
the icon name from d3lphin to dolphin. You can undo this in the SlackBuild if this is undesired.
2016-12-29 Added Apps/{kvpnc,ksensors}
01/01/2017 Update license year and add tde-slackbuild project as I no longer do this alone.
Commented out the desktop file change to d3lphin I previously made. Will leave it for an option
for the users who want it, like me. -Thorn Inurcide
01/02/2017 Added option to choose between Clang or GCC as your compiler.
Added ltoolupdate.sh for the scripts using configure in TDE. This allows changes to it to effect
all the scripts at once instead of going through each and every one of them. And frees up several lines
in the SlackBuilds.
2017-07-13 Issue 40 - koffice.SB, build 3. Fixed karbon build failure caused by configure options used for Sl14.2 ImageMagick build.
07/18/2017 Added avahi-tqt as an optional dep for users with avahi on their system already
No longer maintained - see the git log for commit comments

@ -35,22 +35,27 @@ getsource_fn
## extract, build, and remove source for each language package one at a time
cd $TMP_BUILD/tmp-$PRGNAM
[[ $TDEVERSION == R14.0.? ]] && {
[[ $TDEVERSION == [rR]14.0.? ]] && {
[[ $TDEVERSION == r14.0.? ]] && SNAPSHOT=-$TDEVERSION
# extract the cmake source once only
echo -e "\033[39;1m"
echo "Extracting the cmake source from the $PRGNAM archive ..."
echo -e "\033[0m"
tar xf $SOURCE $PRGNAM/cmake
tar xf $SOURCE $PRGNAM${SNAPSHOT:-}/cmake
[[ $TDEVERSION == r14.0.? ]] && {
## copy cmake contents to cmake directory
tar xf $SRCDIR/../../src/cmake-$TDEVERSION.$ARCHIVE_TYPE --strip-components=1 -C $PRGNAM${SNAPSHOT:-}/cmake
}
}
for lang in $I18N
do
[[ $TDEVERSION == R14.0.? ]] && {
[[ $TDEVERSION == [rR]14.0.? ]] && {
# extract the source for one language at a time for each iteration of the loop
echo -e "\033[39;1m"
echo "Extracting the $PRGNAM-$lang source from the $PRGNAM archive ..."
echo -e "\033[0m"
tar -xf $SOURCE $PRGNAM/$PRGNAM-$lang
cd $PRGNAM
tar -xf $SOURCE $PRGNAM${SNAPSHOT:-}/$PRGNAM-$lang
cd $PRGNAM*
} || {
mkdir -p $PRGNAM # need -p for git builds if more than one lang
cd $PRGNAM
@ -92,7 +97,7 @@ 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
Lang=$(grep Language-Team: $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/tde-i18n-$lang/messages/tdebase/*.po|sort -k2 | sed -e 's|Team: |\n|' -e 's| <|\n|' -e 's|akh\\n"|akh|' -e 's|an S|#|' | grep "[A-Z][a-z][a-z]*$"|head -n 1)
Lang=$(grep Language-Team: $TMP_BUILD/tmp-$PRGNAM/$PRGNAM*/tde-i18n-$lang/messages/tdebase/*.po|sort -k2 | sed -e 's|Team: |\n|' -e 's| <|\n|' -e 's|akh\\n"|akh|' -e 's|an S|#|' | grep "[A-Z][a-z][a-z]*$"|head -n 1)
[[ "$lang" == "pt" ]] && Lang="Portuguese"
[[ "$lang" == "fy" ]] && Lang="Frisian"

@ -25,7 +25,7 @@
PRGNAM=tdemultimedia
VERSION=${VERSION:-$TDEVERSION}
BUILD=${BUILD:-2}
BUILD=${BUILD:-1}
TAG=${TAG:-_tde}
# This is one of the builds that Trinity 'How to Build' advises may not build if greater than -j1

@ -27,7 +27,6 @@ PRGNAM=libart-lgpl
VERSION=${VERSION:-$TDEVERSION}
BUILD=${BUILD:-1}
TAG=${TAG:-_tde}
PKGNAM=libart_lgpl
source ../../get-source.sh
getsource_fn
@ -59,7 +58,6 @@ 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

@ -1,7 +1,8 @@
Build TDE [Trinity Desktop Environment] for Slackware 14.2 or current on i586+, x86_64, or Raspberry Pi3 [see README-Raspberry-Pi3.md or 'Cross compiling for RPi3'].
Run ./BUILD-TDE.sh - a dialog based script with a series of screens for user input. Build the release versions R14.0.4/5 from tar archives or the development version from trinitydesktop cgit.
Build the release versions R14.0.4/5, or pre-release snapshot r14.0.6, from tar archives or the development version from trinitydesktop cgit.
Run ./BUILD-TDE.sh - a dialog based script with a series of screens for user input.
The default is to install the built packages - which is necessary initially for the required packages and for some interdependencies [example tdesdk requires tdepim].
Run 'INST=0 ./BUILD-TDE.sh' to build only.
@ -11,7 +12,7 @@ Any package, or set of packages, can be built by running BUILD-TDE.sh and select
The TDE mandatory packages can be pre-selected.
Some packages also require other packages to be pre-installed - see notes at the bottom of the dialog screen.
The directory structure for the SlackBuild scripts is in line with the Trinity source repositories:
The directory structure for the SlackBuild scripts is in line with the Trinity release source repositories:
Deps [dependencies/]
Core []
Libs [libraries/]
@ -24,7 +25,7 @@ src - to hold all the source tarballs, either pre-downloaded or downloaded durin
Other scripts:
get-source.sh - a chunk of common code for the SBs - used for getting the source archive, setting FLAGS, creating build directories.
There is an override in the Misc SlackBuilds for non-trinity source archive URLs. Non-trinity builds have been included where a TDE package requires a dependency that is not in Slackware. Or, where it might be an alternative to a TDE package.
There is an override in the Misc SlackBuilds for non-trinity source archive URLs. Non-trinity builds have been included where a TDE package requires a dependency that is not in Slackware, or where it's an alternative to a TDE package.
Required packages for a basic working TDE are:
Deps/tqt3
@ -33,16 +34,22 @@ Required packages for a basic working TDE are:
Deps/dbus-tqt
Deps/dbus-1-tqt
Deps/tqca-tls
Deps/libart_lgpl
Deps/libart-lgpl
Core/tdelibs
Core/tdebase
i18n support [locale and html/help docs] in the packages is restricted to whatever is selected in BUILD-TDE.sh and, of that, to whatever is available in the package source.
i18n support [locale and html/help docs] in the packages is restricted to whatever is selected in the BUILD-TDE.sh 'Select Additional Languages' screen and, of that, to whatever is available in any individual package source.
See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information
=========================================================
Building a pre-release from snapshot sources
This is similar to the build for a release version, but the sources are taken from the TDE cgit repository @ https://git.trinitydesktop.org/cgit/<package>.
=========================================================
Building the development version from git sources
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-$lang packs as they are not git repositories.

@ -30,7 +30,7 @@ tqtinterface 4:26 3:43 2:11
arts 6:47 6:07 5:37
dbus-tqt 24 26 23
dbus-1-tqt 51 45 40
libart_lgpl 35 35 30
libart-lgpl 35 35 30
tqca-tls 22 21 18
tdelibs 52:12 49:32 42:59
tdebase 54:47 49:01 44:02

@ -65,14 +65,35 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log
# Where do we look for sources?
SRCDIR=$(cd $(dirname $0); pwd)
## if R14.0.? or misc, do this:
[[ $TDEVERSION == R14.0.? || $TDEMIR_SUBDIR == misc ]] && \
## if snapshot, need to change some variables:
[[ $TDEVERSION == r14.0.6 && ! $TDEMIR_SUBDIR == misc ]] && \
ARCHIVE_TYPE=tar.gz && \
SRCURL=https://git.trinitydesktop.org/cgit/$PRGNAM/snapshot/$PRGNAM-$TDEVERSION.$ARCHIVE_TYPE && \
(
## download admin/cmake/libltdl/libtdevnc as prerequisites
cd $SRCDIR/../../src/
echo 'admin
cmake
libltdl
libtdevnc' | while read line
do
[[ ! -s $line-$TDEVERSION.$ARCHIVE_TYPE && ! $line == libtdevnc ]] && \
wget https://git.trinitydesktop.org/cgit/$line/snapshot/$line-$TDEVERSION.$ARCHIVE_TYPE
[[ ! -s $line-r14.0.1.$ARCHIVE_TYPE && $line == libtdevnc ]] && \
wget https://git.trinitydesktop.org/cgit/$line/snapshot/$line-r14.0.1.$ARCHIVE_TYPE
done
)
## if [rR]14.0.? or misc, download archive:
[[ $TDEVERSION == [rR]14.0.? || $TDEMIR_SUBDIR == misc ]] && \
{
[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} ]] && rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} 2>/dev/null || true
## check for and remove any zero byte archive files
[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} ]] && \
rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} 2>/dev/null || true
ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} $SRCDIR
SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"}
# SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.bz2 URL
SRCURL=${SRCURL:-"http://$TDE_MIRROR/releases/$VERSION$TDEMIR_SUBDIR/$PRGNAM-$VERSION.tar.bz2"}
SRCURL=${SRCURL:-"https://$TDE_MIRROR/releases/$VERSION$TDEMIR_SUBDIR/$PRGNAM-$VERSION.tar.bz2"}
# Source file availability:
if ! [ -f $SOURCE ]; then
echo "Source '$(basename $SOURCE)' not available yet..."
@ -204,12 +225,39 @@ umask 0022
untar_fn ()
{
cd $TMP_BUILD/tmp-$PRGNAM
##
## [1] firstly test for R14 or misc ..
##
[[ $TDEVERSION == R14.0.? || $TDEMIR_SUBDIR == misc ]] && {
## unpack R14 or misc
echo -e " unpacking $(basename $SOURCE) ... \n"
tar -xf $SOURCE
[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true
} || {
##
## [2] not R14 nor misc - is it r14 snapshot?
##
[[ $TDEVERSION == r14.0.? ]] && {
## unpack r14
echo -e " unpacking $(basename $SOURCE) ... \n"
tar -xf $SOURCE
## unpack all needed common sources ..
(cd $PRGNAM-$TDEVERSION
echo 'admin
cmake
libltdl
libtdevnc' | while read line
do
[[ -d $line && ! $line == libtdevnc ]] && tar xf $SRCDIR/../../src/$line-$TDEVERSION.$ARCHIVE_TYPE --strip-components=1 -C $line
[[ -d $line && $line == libtdevnc ]] && tar xf $SRCDIR/../../src/$line-r14.0.1.tar.gz --strip-components=1 -C $line
done
true # don't go on to [3] if this fails
)
}
} || {
##
## [3] not [rR]14 nor misc, so must be cgit ..
##
## copy git repo but don't copy .git directory:
echo -e " copying $PRGNAM source files to build area ... \n"
(cd $BUILD_TDE_ROOT/src/cgit
@ -217,7 +265,12 @@ 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/ || true
[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ || true)
} && cd $PRGNAM 2>/dev/null || cd $PRGNAM-$VERSION
} && {
##
## [4] finally, cd into source directory
##
cd $PRGNAM*
}
[[ $TDEVERSION == R14.0.4 ]] && {
## patch to allow automake 1.16.x
[[ -s admin/cvs.sh ]] && echo $'

Loading…
Cancel
Save