R14.0.11 updates

master
Ray-V 3 years ago
parent 37d055a8ef
commit 805a799dc9

@ -44,37 +44,11 @@ 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
[[ $TDEVERSION == 14.0.10 ]] && {
## remove help documentation build instruction from all [non-en] locales ...
sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true
#
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
lpos="" # the *.po files list
langs="en" # the languages
ldocs="en" # the help docs
for Lang in $I18N
do
[[ -d po/$Lang ]] && {
lpos="$lpos $Lang/$PRGNAM.po"
langs="$langs $Lang"
## ... and restore help documentation for the selected and available locales
[[ -e doc/$Lang/CMakeLists.txt ]] && {
[[ $Lang == ru ]] && NOINDEX=NOINDEX
echo "tde_create_handbook( ${NOINDEX:-} LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt
ldocs="$ldocs $Lang"
}
}
done
#
sed -i "s|\${po_files}|$lpos|" po/CMakeLists.txt || true
} || {
## for slack-desc ## for slack-desc
langs="en" langs="en"
for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
ldocs="en" ldocs="en"
for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
}
listdocs_fn listdocs_fn

@ -51,6 +51,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
@ -58,6 +60,7 @@ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \ --mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure

@ -42,6 +42,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
@ -49,6 +51,7 @@ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \ --mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure

@ -34,7 +34,6 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION != 14.0.10 ]] && {
## using cmake common rules ## using cmake common rules
find doc -name CMakeLists.txt | xargs rm find doc -name CMakeLists.txt | xargs rm
@ -47,12 +46,11 @@ sed -i 's|k3bsetup )|&\
tde_conditional_add_project_docs( BUILD_DOC )|' CMakeLists.txt tde_conditional_add_project_docs( BUILD_DOC )|' CMakeLists.txt
mv doc/tdeioslave doc/en mv doc/tdeioslave doc/en
mv doc/* doc/en || true
mv doc/en/en doc/en/tdeioslave mv doc/en/en doc/en/tdeioslave
mv doc/*.* doc/en/
mkdir doc/misc mkdir doc/misc
mv FAQ doc/misc/ mv FAQ doc/misc/
}
listdocs_fn listdocs_fn
@ -86,7 +84,7 @@ cmake ${G_NINJA:-} \
-DWITH_ALSA="ON" \ -DWITH_ALSA="ON" \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_FFMPEG=${FFMPEG:-"OFF"} \ -DWITH_FFMPEG=${FFMPEG:-"OFF"} \
-DWITH_FFMPEG_ALL_CODECS="OFF" \ -DWITH_FFMPEG_ALL_CODECS=${FFMPEG:-"OFF"} \
-DWITH_FLAC="ON" \ -DWITH_FLAC="ON" \
-DWITH_SNDFILE="ON" \ -DWITH_SNDFILE="ON" \
-DWITH_TAGLIB="ON" \ -DWITH_TAGLIB="ON" \

@ -47,6 +47,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
@ -54,6 +56,7 @@ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--disable-rpath \ --disable-rpath \
${EN_GCC_VIS:-} \
--enable-closure \ --enable-closure \
--enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead) --enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead)

@ -33,11 +33,9 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION != 14.0.10 ]] && {
## using cmake common rules ## using cmake common rules
mkdir doc/misc mkdir doc/misc
mv README* FAQ doc/misc/ mv README* FAQ doc/misc/
}
## for slack-desc ## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

@ -33,39 +33,12 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.10 ]] && {
## edit man page
sed -i "s|/opt/trinity/share/doc/|$INSTALL_TDE/share/doc/|" kdbg/doc/man/kdbg.1
## docs for selected languages only - LINGUAS=$I18N
echo 'file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )
foreach( _dir ${_dirs} )
if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
if( "${_dir}" STREQUAL "en" OR
"${_dir}" STREQUAL "man" OR
"${_linguas}" MATCHES "^;*$" OR
";${_linguas};" MATCHES ";${_dir};" )
add_subdirectory( ${_dir} )
endif( )
endif()
endforeach()
' > kdbg/doc/CMakeLists.txt
} || {
## edit man page ## edit man page
sed -i "s|/opt/trinity/share/doc/|$INSTALL_TDE/share/doc/|" doc/man/kdbg.1 sed -i "s|/opt/trinity/share/doc/|$INSTALL_TDE/share/doc/|" doc/man/kdbg.1
}
## for slack-desc ## for slack-desc
[[ $TDEVERSION == 14.0.10 ]] && {
langs="en";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
ldocs="en";for Lang in $I18N;do [[ -d kdbg/doc/$Lang ]] && ldocs="$ldocs $Lang";done
} || {
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
}
listdocs_fn listdocs_fn
@ -73,7 +46,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION != 14.0.10 ]] && TRACE=ON
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -83,7 +55,7 @@ cmake ${G_NINJA:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_TRACE_OUTPUT="${TRACE:-OFF}" \ -DWITH_TRACE_OUTPUT="ON" \
-DWITH_GDB_TRANSCRIPT="ON" \ -DWITH_GDB_TRANSCRIPT="ON" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \ -DBUILD_TRANSLATIONS="ON" \

@ -49,12 +49,15 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
${EN_GCC_VIS:-} \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure

@ -36,7 +36,7 @@ untar_fn
# there is a Spanish language file in the source, but it has no translations in it .. # there is a Spanish language file in the source, but it has no translations in it ..
# the included es.po file is a Google translation - if you don't want to use it, # the included es.po file is a Google translation - if you don't want to use it,
# then comment out the following line: # then comment out the following line:
cp $SRCDIR/es.po translations/messages/ cp $SB_SRCDIR/es.po translations/messages/
# for slack-desc # for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
@ -47,7 +47,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION != 14.0.10 ]] && B_E_T='-DBUILD_EXTRA_THEME="ON"'
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -59,7 +58,7 @@ cmake ${G_NINJA:-} \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \ -DBUILD_TRANSLATIONS="ON" \
${B_E_T:-} \ -DBUILD_EXTRA_THEME="ON" \
-Wno-dev \ -Wno-dev \
.. ..

@ -55,10 +55,10 @@ echo $'
+ delete [] comboItems; + delete [] comboItems;
--- krusader/Panel/krview.h --- krusader/Panel/krview.h
+++ krusader/Panel/krview.h +++ krusader/Panel/krview.h
@@ -209 +209 @@ @@ -211 +211 @@
- -
+ static TQPixmap getIcon(vfile *vf); + static TQPixmap getIcon(vfile *vf);
@@ -227 +226,0 @@ @@ -229 +228,0 @@
- static TQPixmap getIcon(vfile *vf); - static TQPixmap getIcon(vfile *vf);
' | while read line ' | while read line
do do
@ -71,7 +71,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')
# #
[[ $I18N != *ru* ]] && sed -i 's| ru||' doc/Makefile.am ldocs="en tdeioslave/{krarc,virt}"
[[ $I18N != *ru* ]] && sed -i 's| ru||' doc/Makefile.am || ldocs="$ldocs ru"
listdocs_fn listdocs_fn
@ -81,6 +82,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
@ -88,6 +91,7 @@ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \ --mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
--disable-rpath --disable-rpath
make_fn make_fn
@ -118,8 +122,8 @@ $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: en $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM: With help documentation for:
$PRGNAM: $PRGNAM: $ldocs
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -34,7 +34,7 @@ getsource_fn
untar_fn untar_fn
# add English help documentation # add English help documentation
tar xf $SRCDIR/ksquirrel-en-docs.tar.xz tar xf $SB_SRCDIR/ksquirrel-en-docs.tar.xz
cp doc/ru/*png doc/en cp doc/ru/*png doc/en
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
@ -56,6 +56,8 @@ chown_fn
#cd_builddir_fn - don't use #cd_builddir_fn - don't use
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
@ -63,6 +65,7 @@ CXX=$COMPILER_CXX \
./configure \ ./configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \ --mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure

@ -19,6 +19,6 @@ For example:
[4] Show blank keys where AltGr doesn't produce a character. [4] Show blank keys where AltGr doesn't produce a character.
3rd and 4th level character sets on a keyboard generally don't cover the full set of keys. 3rd and 4th level character sets on a keyboard generally don't cover all keys.
Select this option to see only those characters which AltGr generates. Select this option to see only those characters which AltGr generates.

@ -340,7 +340,7 @@ Then <keycap>LWin</keycap> would print <emphasis role="bold">"</emphasis> and <k
Create a character that doesn't have a direct unicode mapping, but is composed of unicode characters in the font being used. Create a character that doesn't have a direct unicode mapping, but is composed of unicode characters in the font being used.
<sbr/><sbr/> <sbr/><sbr/>
As an example -- a-ogonek 'ą' [U<emphasis role="bold">0105</emphasis>] + combining acute '´' [U<emphasis role="bold">0301</emphasis>]́ As an example -- a-ogonek 'ą' [U<emphasis role="bold">0105</emphasis>] + combining acute '´' [U<emphasis role="bold">0301</emphasis>]
<sbr/><sbr/> <sbr/><sbr/>
Add the character and chosen key combination to the ~/.XCompose file: Add the character and chosen key combination to the ~/.XCompose file:

@ -34,10 +34,10 @@ getsource_fn
untar_fn untar_fn
## copy the helpfile docs to the build tree ## copy the helpfile docs to the build tree
cp -a $SRCDIR/doc . cp -a $SB_SRCDIR/doc .
cp $SRCDIR/dock.png src/ cp $SB_SRCDIR/dock.png src/
## copy translations ## copy translations
cp $SRCDIR/translations/messages/* translations/messages/ cp $SB_SRCDIR/translations/messages/* translations/messages/
## remove meinproc check - there are a number of validity errors relating to the use of <sbr/> etc., ## remove meinproc check - there are a number of validity errors relating to the use of <sbr/> etc.,
## which I feel provides a better presentation. The help file displays as intended. ## which I feel provides a better presentation. The help file displays as intended.
sed -i 's|--check --cache index.cache.bz2|--cache index.cache.bz2|' cmake/modules/TDEMacros.cmake sed -i 's|--check --cache index.cache.bz2|--cache index.cache.bz2|' cmake/modules/TDEMacros.cmake
@ -137,30 +137,6 @@ patch -N -p0 << EOF || true
+ resize ( 64,31 ); + resize ( 64,31 );
EOF EOF
[[ $TDEVERSION == 14.0.10 ]] && {
## Caps+AltGr[+Shift] displayed characters should be toggled from the non-Caps state
patch -N -p0 << EOF || true
--- src/VButton.cpp
+++ src/VButton.cpp
@@ -94,2 +94,13 @@
- // Caps does not seem to make any difference when AltGr is pressed
- if (shift)
+ // If Caps is on, displayed alpha characters should be toggled from the AltGr case
+ if (caps)
+ {
+ if (shift)
+ {
+ TQPushButton::setText(altGrShiftText.lower());
+ }
+ else
+ {
+ TQPushButton::setText(altGrText.upper());
+ }
+ }
+ else if (shift)
EOF
}
## blank character display where AltGr does not provide extra characters ## blank character display where AltGr does not provide extra characters
[[ $(cat $TMPVARS/Kvkbd_OPTS) == *blank* ]] && { [[ $(cat $TMPVARS/Kvkbd_OPTS) == *blank* ]] && {
echo -e "\033[36;1m"'patching for blank keys ..'"\033[0m" echo -e "\033[36;1m"'patching for blank keys ..'"\033[0m"
@ -231,16 +207,6 @@ patch -N -p0 << EOF || true
EOF EOF
} }
[[ $TDEVERSION == 14.0.10 ]] && {
## another combining character to display
patch -N -p0 << EOF || true
--- src/Xutils.cpp
+++ src/Xutils.cpp
@@ -871,0 +872 @@
+ { 0x01000358L, 0x02d9 }, /* combining dot above right ˙ dot above */
EOF
}
## for slack-desc ## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

@ -39,19 +39,6 @@ for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $L
ldocs="en tdeioslave" ldocs="en tdeioslave"
for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
[[ $TDEVERSION == 14.0.10 ]] && {
## add misc docs
MISC_FILES=$(cd doc/misc/;ls README* pptp.txt)
cat << EOF > doc/misc/CMakeLists.txt
INSTALL(
FILES $MISC_FILES
DESTINATION \${CMAKE_INSTALL_PREFIX}/doc/\${PROJECT_NAME}-\$ENV{TDEVERSION}
COMPONENT doc
)
EOF
sed -i 's|add_subdirectory( tdeioslave )|&\nadd_subdirectory( misc )|' doc/CMakeLists.txt
}
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn

@ -33,7 +33,7 @@ getsource_fn
untar_fn untar_fn
patch -p0 < $SRCDIR/reformat-message.patch patch -p0 < $SB_SRCDIR/reformat-message.patch
## for slack-desc ## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done

@ -47,12 +47,15 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
${EN_GCC_VIS:-} \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure

@ -40,23 +40,8 @@ listdocs_fn
chown_fn chown_fn
[[ $TDEVERSION == 14.0.10 ]] && ltoolupdate_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION == 14.0.10 ]] && {
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--disable-rpath \
--enable-closure
} || {
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -71,8 +56,6 @@ cmake ${G_NINJA:-} \
-Wno-dev \ -Wno-dev \
.. ..
}
make_fn make_fn
installdocs_fn installdocs_fn

@ -102,7 +102,7 @@ Set the version of TDE to be built.
" \ " \
13 75 3 \ 13 75 3 \
"14.0.10" "the R14.0.10 release - source from archives" \ "14.0.11" "the R14.0.11 release - source from archives" \
"14.0.x" "next release preview - source from Trinity git" \ "14.0.x" "next release preview - source from Trinity git" \
"14.1.0" "R14.1.0 development - source from Trinity git" \ "14.1.0" "R14.1.0 development - source from Trinity git" \
2> $TMPVARS/TDEVERSION 2> $TMPVARS/TDEVERSION
@ -300,7 +300,7 @@ A practical build method could be:
1] build the \Zb\Zr\Z4R\Znequired packages with the <\Z1S\Zb\Z0top\Zn> option. 1] build the \Zb\Zr\Z4R\Znequired packages with the <\Z1S\Zb\Z0top\Zn> option.
This script will then exit on a failure. When the problem has been This script will then exit on a failure. When the problem has been
fixed, restart the build with the \Z3\ZbTDE build\Zn|<Re-use> option. fixed, restart the build with the \Z3\ZbTDE build\Zn|<\Z1R\Zb\Z0e-use\Zn> option.
2] then build other packages with the \Zr\Z4\ZbContinue\Zn option which allows 2] then build other packages with the \Zr\Z4\ZbContinue\Zn option which allows
this script to continue to the end of the build list whether or this script to continue to the end of the build list whether or
@ -308,7 +308,7 @@ A practical build method could be:
\Zr\Z4\ZbContinue\Zn is probably the better choice if only downloading sources. \Zr\Z4\ZbContinue\Zn is probably the better choice if only downloading sources.
3] re-run the build for the remaining programs with the 3] re-run the build for the remaining programs with the
\Z3\ZbTDE build\Zn|<Re-use> option and select <Stop> in the confirmation \Z3\ZbTDE build\Zn|<\Z1R\Zb\Z0e-use\Zn> option and select <\Z1S\Zb\Z0top\Zn> in the confirmation
screen. screen.
" \ " \
27 75 27 75
@ -329,9 +329,8 @@ If following the build method on the previous screen, the answer here should pro
[[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD [[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD
## new apps for 14.0.x & 14.1.0 ## new apps for 14.0.11 & 14.1.0
[[ $(cat $TMPVARS/TDEVERSION) != 14.0.10 ]] && { # Use non-breaking space - U00a0 - in strings for this to work with 'dialog'
# Use non-breaking space - U00a0 - in strings
# nbsp prefixing Misc avoids double quote in TDEbuilds list # nbsp prefixing Misc avoids double quote in TDEbuilds list
app_1="Apps/codeine" app_1="Apps/codeine"
about_1="Simple multimedia player" about_1="Simple multimedia player"
@ -354,18 +353,19 @@ about_4="Full-screen window/desktop manager"
status_4=off status_4=off
comment_4="\Zb\Z6 Imlib2 is a build time requirement \Zn" comment_4="\Zb\Z6 Imlib2 is a build time requirement \Zn"
## there is no 14.0.x/11 port for this
[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 ]] && {
app_5="Apps/kplayer" app_5="Apps/kplayer"
about_5="Multimedia player with MPlayer backend" about_5="Multimedia player with MPlayer backend"
status_5=off status_5=off
comment_5="\Zb\Z6 MPlayer is a run time requirement \Zn" comment_5="\Zb\Z6 MPlayer is a run time requirement \Zn"
}
app_6="Apps/twin-style-suse2" app_6="Apps/twin-style-suse2"
about_6="SUSE window decorations" about_6="SUSE window decorations"
status_6=off status_6=off
comment_6="\Zb\Z6 \Zn" comment_6="\Zb\Z6 \Zn"
}
#
[[ $(cat $TMPVARS/TDEVERSION) != 14.0.10 ]] && TQCA=tqca && TQCA_MSG="The TQt Cryptographic Architecture"
rm -f $TMPVARS/TDEbuilds rm -f $TMPVARS/TDEbuilds
dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \
" "
@ -376,18 +376,19 @@ The packages selected form the build list and so dependencies are listed before
Look out for messages in the bottom line of the screen, especially relating to dependencies. Look out for messages in the bottom line of the screen, especially relating to dependencies.
Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TDE packages." \ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TDE packages." \
0 85 0 \ 17 85 0 \
"Deps/tqt3" "\Zb\Zr\Z4R\Zn The Qt package for TDE" off "\Zb\Z6 \Zn" \ "Deps/tqt3" "\Zb\Zr\Z4R\Zn The Qt package for TDE" off "\Zb\Z6 \Zn" \
"Deps/tqtinterface" "\Zb\Zr\Z4R\Zn TDE bindings to tqt3." off "\Zb\Z6 \Zn" \ "Deps/tqtinterface" "\Zb\Zr\Z4R\Zn TDE bindings to tqt3." off "\Zb\Z6 \Zn" \
"Deps/arts" "\Zb\Zr\Z4R\Zn Sound server for TDE" off "\Zb\Z6 \Zn" \ "Deps/arts" "\Zb\Zr\Z4R\Zn Sound server for TDE" off "\Zb\Z6 \Zn" \
"Deps/dbus-tqt" "\Zb\Zr\Z4R\Zn A simple IPC library" off "\Zb\Z6 \Zn" \ "Deps/dbus-tqt" "\Zb\Zr\Z4R\Zn A simple IPC library" off "\Zb\Z6 \Zn" \
"Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" off "\Zb\Z6 \Zn" \ "Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" off "\Zb\Z6 \Zn" \
"Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" off "\Zb\Z6 \Zn" \ "Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" off "\Zb\Z6 \Zn" \
"Deps/${TQCA:-tqca-tls}" "\Zb\Zr\Z4R\Zn ${TQCA_MSG:-Plugin to provide SSL/TLS capability}" off "" \ "Deps/tqca" "\Zb\Zr\Z4R\Zn The TQt Cryptographic Architecture" off "" \
"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Optional for tdelibs and used if installed. Requires avahi. \Zn" \ "Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Optional for tdelibs and used if installed. Requires avahi. \Zn" \
"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with avahi support if avahi & avahi-tqt are installed. \Zn" \ "Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with avahi support if avahi & avahi-tqt are installed. \Zn" \
"Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" off "\Zb\Z6 \Zn" \ "Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" off "\Zb\Z6 \Zn" \
"Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for akode [xiph], tdenetwork and amarok. Requires l/speexdsp \Zn" \
"Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk, and amarok engine \Zn" \ "Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk, and amarok engine \Zn" \
"Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 Optional build-time dependency -> akode \Zn" \ "Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 Optional build-time dependency -> akode \Zn" \
"Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \ "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \
@ -398,7 +399,6 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \ "Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \
" Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \ " Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \
"Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \ "Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \
" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for tdenetwork and amarok. Requires l/speexdsp \Zn" \
"Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency -> speex \Zn" \ "Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency -> speex \Zn" \
"Deps/libcaldav" "Calendaring Extensions to WebDAV" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \ "Deps/libcaldav" "Calendaring Extensions to WebDAV" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \
"Deps/libcarddav" "Online address support" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \ "Deps/libcarddav" "Online address support" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \
@ -563,26 +563,29 @@ ${DLG_BOX:-0 0}
} }
## set up for development builds - 14.0.x [aka 14.0.11] & 14.1.0 ## GCC visibility option
[[ $(cat $TMPVARS/TDEVERSION) != 14.0.10 ]] && { ## If tdelibs has been built, the header will exist:
## only run this if tdelibs has been selected [[ $(grep "KDE_HAVE_GCC_VISIBILITY 1" $(cat $TMPVARS/INSTALL_TDE)/include/kdemacros.h) ]] && \
GCC_VIS_M=ON || GCC_VIS_M=OFF
#
## only run this if any of listed Deps or tdelibs has been selected
rm -f $TMPVARS/GCC_VIS rm -f $TMPVARS/GCC_VIS
[[ $(grep -o tdelibs $TMPVARS/TDEbuilds) ]] && { [[ $(grep -oE 'arts|dbus-1-tqt|libart-lgpl|tqca|avahi-tqt|tdelibs' $TMPVARS/TDEbuilds) ]] && {
dialog --cr-wrap --nocancel --no-shadow --colors --title " Gcc visibility " --menu \ dialog --cr-wrap --nocancel --no-shadow --colors --title " Gcc visibility " --menu \
" "
If gcc visibility support [-fvisibility=hidden -fvisibility-inlines-hidden] is required, it has to be built in to tdelibs for the package builds that call the 'tde_setup_gcc_visibility()' macro. If gcc hidden visibility support is required it needs to be set ON for the \Zb\Zr\Z4R\Znequired dependencies and tdelibs.
It will default for those packages to whatever is set here, but if enabled, can be set OFF with the command line option GCC_VIS=0. For any subsequent package builds which are dependent on the setting in tdelibs, it will default to whatever is set here, but if enabled, can be set OFF with the command line option GCC_VIS=0.
Set gcc visibility support in tdelibs .. The current setting is \Zb\Z2$GCC_VIS_M\Zn
" \ " \
21 60 2 \ 20 60 2 \
"ON" "" \ "ON" "" \
"OFF" "" \ "OFF" "" \
2> $TMPVARS/GCC_VIS 2> $TMPVARS/GCC_VIS
} }
}
## only run this if tdebase has been selected ## only run this if tdebase has been selected
rm -f $TMPVARS/RUNLEVEL rm -f $TMPVARS/RUNLEVEL
@ -590,24 +593,26 @@ rm -f $TMPVARS/RUNLEVEL
## the default exit status for the extra button is 3 - exit from a help button is 2 which is needed for RUNLEVEL ## the default exit status for the extra button is 3 - exit from a help button is 2 which is needed for RUNLEVEL
EXITVAL=3 EXITVAL=3
until [[ $EXITVAL -lt 2 ]] ; do until [[ $EXITVAL -lt 2 ]] ; do
dialog --cr-wrap --nocancel --no-shadow --extra-button --extra-label "README" --colors --title " TDM " --checklist \ dialog --cr-wrap --nocancel --no-shadow --extra-button --extra-label "README" --colors --title " TDM & starttde " --checklist \
" "
See the README for further details .. See the README for further details ..
A file \Zb\Z2rc.4.local.tdm\Zn, specifically for launching TDM, will be installed with tdebase. \Zb\Z2rc.4.local.tdm\Zn and \Zb\Z2xinitrc.tde\Zn, specifically for launching TDM & TDE, will be installed with tdebase.
These options will add commands to doinst.sh: These options will be enabled by doinst.sh:
[1] Selecting \Z3\Zbrc4l\Zn will copy \Zb\Z2rc.4.local.tdm\Zn to \Zb\Z2rc.4.local\Zn, overwriting any existing file. [1] \Z3\Zbrc4l\Zn will copy \Zb\Z2rc.4.local.tdm\Zn to \Zb\Z2rc.4.local\Zn, overwriting any existing file.
[2] Selecting \Z3\Zbrl4\Zn will set runlevel 4 in etc/inittab to enable login with TDM, or other DM. [2] \Z3\Zbrl4\Zn will set runlevel 4 in inittab to enable login with TDM.
Otherwise no change will be made to etc/inittab.
With both options selected, TDM should be set up to run by default. [3] \Z3\Zbxinitrc\Zn will sym-link \Zb\Z2xinitrc\Zn to \Zb\Z2xinitrc.tde\Zn to run TDE.
With all options selected, TDM & TDE should be set up to run by default.
" \ " \
25 75 2 \ 27 75 3 \
" rc4l" "install rc.4.local for TDM" off \ " rc4l" "install rc.4.local for TDM" on \
" rl4" "set runlevel 4" off \ " rl4" "set runlevel 4" on \
" xinitrc" "startup script == starttde" on \
2> $TMPVARS/RUNLEVEL 2> $TMPVARS/RUNLEVEL
EXITVAL=$? EXITVAL=$?
[[ $EXITVAL == 3 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --title " TDM README " --msgbox \ [[ $EXITVAL == 3 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --title " TDM README " --msgbox \
@ -740,9 +745,8 @@ Create and/or update the git repositories local copies.
#rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script #rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script
[[ $(cat $TMPVARS/TDEVERSION) == 14.0.10 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." [[ $(cat $TMPVARS/TDEVERSION) == 14.0.11 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'."
[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'." ## testing for cgit!=no will allow =yes, or null, which is the 14.0.11 build case
## testing for cgit!=no will allow =yes, or null, which is the 14.0.10 build case
[[ $(cat $TMPVARS/DL_CGIT) != no ]] && { [[ $(cat $TMPVARS/DL_CGIT) != no ]] && {
dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \
" "
@ -751,7 +755,7 @@ This would be useful for running the build off-line.
\Z1Y\Zb\Z0es\Zn \Z1Y\Zb\Z0es\Zn
Download the sources for the build list without building packages. Download the sources for the build list without building packages.
The build list will be retained, and BUILD-TDE.sh will need to be The build list will be retained, and BUILD-TDE.sh will need to be
re-run selecting the \Z3\ZbTDE build\Zn|<Re-use> option to build the packages. re-run selecting the \Z3\ZbTDE build\Zn|<\Z1R\Zb\Z0e-use\Zn> option to build the packages.
\Zr\Z4\ZbNo\Zn \Zr\Z4\ZbNo\Zn
Download sources as each package is built. Download sources as each package is built.
@ -807,7 +811,7 @@ Confirm or change these build options ..
[3] \Z3\Zbninja\Zn - use ninja for cmake builds [3] \Z3\Zbninja\Zn - use ninja for cmake builds
[4] \Z3\Zbverbose\Zn - show command lines during cmake builds, 'make' debugging information, and standard error output. Using this is only recommended if fault finding. [4] \Z3\Zbverbose\Zn - show -> command lines during cmake builds; 'make' debugging information; and standard error output. Using this is only recommended if fault finding.
" \ " \
25 75 4 \ 25 75 4 \
@ -871,7 +875,7 @@ export PLUGIN_INSTALL_DIR=$(cat $TMPVARS/SYS_CNF_DIR | cut -d/ -f3)
[[ $EXIT_FAIL == "exit 1" ]] && AOF=stop [[ $EXIT_FAIL == "exit 1" ]] && AOF=stop
# #
## if tdebase selected ## if tdebase selected
[[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && [[ $(cat $TMPVARS/RUNLEVEL) == *rl4* ]] && TDMRL=4 [[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && [[ $RUNLEVEL == *rl4* ]] && TDMRL=4
# #
## koffice - only if it is being built ## koffice - only if it is being built
[[ $(grep -o "Apps/koffice " $TMPVARS/TDEbuilds) ]] && { [[ $(grep -o "Apps/koffice " $TMPVARS/TDEbuilds) ]] && {
@ -905,20 +909,14 @@ INST_PACKAGE=yes && [[ $INST == 0 ]] && INST_PACKAGE=no
# #
## Set up gcc visibilty .. ## ## Set up gcc visibilty .. ##
## If GCC_VIS has been set on the command line, export it ## If GCC_VIS has been set on the command line, use that value
[[ $GCC_VIS ]] && export GCC_VIS || { [[ $GCC_VIS ]] && export GCC_VIS || {
## set up for development builds - 14.0.x [aka 14.0.11] & 14.1.0 ## Otherwise, if tdelibs has been built before, the header will exist, so test that, and set GCC_VIS accordingly:
[[ $TDEVERSION != 14.0.10 ]] && {
## If tdelibs has been built before, the header will exist, so test that:
[[ $(grep "KDE_HAVE_GCC_VISIBILITY 1" $INSTALL_TDE/include/kdemacros.h) ]] && \ [[ $(grep "KDE_HAVE_GCC_VISIBILITY 1" $INSTALL_TDE/include/kdemacros.h) ]] && \
GCC_VIS=ON || GCC_VIS=OFF GCC_VIS=ON || GCC_VIS=OFF
## if tdelibs is being built, override any header setting with the dialog output: ## But, if tdelibs or any listed Deps package is being built, or re-built, override any set value with the dialog output:
[[ -s $TMPVARS/GCC_VIS ]] && GCC_VIS=$(cat $TMPVARS/GCC_VIS) [[ -s $TMPVARS/GCC_VIS ]] && GCC_VIS=$(cat $TMPVARS/GCC_VIS)
export GCC_VIS export GCC_VIS
} || {
## otherwise for 14.0.10 builds, continue to set it off
export GCC_VIS=OFF
}
} }
# #
@ -980,7 +978,9 @@ do
{ [[ $dir == Deps* ]] && export TDEMIR_SUBDIR="/dependencies"; } \ { [[ $dir == Deps* ]] && export TDEMIR_SUBDIR="/dependencies"; } \
|| { [[ $dir == Core* ]] && export TDEMIR_SUBDIR="/core"; } \ || { [[ $dir == Core* ]] && export TDEMIR_SUBDIR="/core"; } \
|| { [[ $dir == Libs* ]] && export TDEMIR_SUBDIR="/libraries"; } \ || { [[ $dir == Libs* ]] && export TDEMIR_SUBDIR="/libraries"; } \
|| { [[ $dir == Apps* ]] && export TDEMIR_SUBDIR="/applications"; } \ || { [[ $dir == Apps* ]] \
&& SUB_DIR=$(grep $dir$ $BUILD_TDE_ROOT/apps-list|cut -d- -f1) \
&& export TDEMIR_SUBDIR="/applications/$SUB_DIR"; } \
|| { [[ $dir == *Misc* ]] && export TDEMIR_SUBDIR="misc"; } # used for untar_fn - leading slash deliberately omitted || { [[ $dir == *Misc* ]] && export TDEMIR_SUBDIR="misc"; } # used for untar_fn - leading slash deliberately omitted
# Get the package name # Get the package name

@ -35,12 +35,7 @@ getsource_fn
## extract, build, and remove source for each language package one at a time ## extract, build, and remove source for each language package one at a time
cd $TMP_BUILD/tmp-$PRGNAM cd $TMP_BUILD/tmp-$PRGNAM
[[ $TDEVERSION == 14.0.10 ]] && { [[ $TDEVERSION == 14.0.11 ]] && {
# extract the cmake source once only
echo -e "\033[39;1m"
echo "Extracting the cmake source from $(basename $SOURCE) ..."
echo -e "\033[0m"
tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/cmake
# extract the template source once only # extract the template source once only
echo -e "\033[39;1m" echo -e "\033[39;1m"
echo "Extracting the template source from $(basename $SOURCE) ..." echo "Extracting the template source from $(basename $SOURCE) ..."
@ -51,6 +46,15 @@ echo -e "\033[39;1m"
echo "Extracting the translations source from $(basename $SOURCE) ..." echo "Extracting the translations source from $(basename $SOURCE) ..."
echo -e "\033[0m" echo -e "\033[0m"
tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/translations tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/translations
# extract the cmake source once only
## it's unlikely that this is being run without the required packages,
## in which case the cmake archive will exist
echo -e "\033[39;1m"
echo "Extracting the cmake source from $(basename $SRCDIR/cmake-$TDEVERSION.tar.xz) ..."
echo -e "\033[0m"
(cd $PRGNAM-trinity-$TDEVERSION
tar xf $SRCDIR/cmake-$TDEVERSION.tar.xz
mv cmake-trinity-$TDEVERSION cmake)
} || { } || {
mkdir -p $PRGNAM # need -p for git builds if more than one lang mkdir -p $PRGNAM # need -p for git builds if more than one lang
(cd $BUILD_TDE_ROOT/src/cgit (cd $BUILD_TDE_ROOT/src/cgit
@ -60,13 +64,16 @@ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/)
for lang in $I18N for lang in $I18N
do do
[[ $TDEVERSION == 14.0.10 ]] && { [[ $TDEVERSION == 14.0.11 ]] && {
# extract the source for one language at a time for each iteration of the loop # extract the source for one language at a time for each iteration of the loop
echo -e "\033[39;1m" echo -e "\033[39;1m"
echo "Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ..." echo "Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ..."
echo -e "\033[0m" echo -e "\033[0m"
tar -xf $SOURCE $PRGNAM-trinity-$TDEVERSION/$PRGNAM-$lang tar -xf $SOURCE $PRGNAM-trinity-$TDEVERSION/$PRGNAM-$lang
cd $PRGNAM* cd $PRGNAM-trinity-$TDEVERSION
## link cmake into the $PRGNAM-$lang top level
(cd $PRGNAM-$lang
ln -s ../cmake .)
true # don't go to cgit if extracting fails true # don't go to cgit if extracting fails
} || { } || {
@ -80,7 +87,7 @@ ln -s ../cmake cmake)
} }
## language specific patches ## language specific patches
patch -N -p0 < $SRCDIR/tde-i18n-$lang-patch || true # continue if patch file doesn't exist patch -N -p0 < $SB_SRCDIR/tde-i18n-$lang-patch || true # continue if patch file doesn't exist
chown_fn chown_fn

@ -20,6 +20,3 @@ To enable TDM if this isn't the case, either
or or
[2] copy the contents of rc.4.local to rc.4 above other session manager options [2] copy the contents of rc.4.local to rc.4 above other session manager options
(Runlevel)
Set this to 4 and TDM should work out-of-the-box.

@ -122,6 +122,10 @@ patch -N -p0 << EOF || true
EOF EOF
## find htsearch - add this Slackware default path to list of possible locations
## rather than set HTDIG_SEARCH_BINARY which fixes the location
sed -i 's|HINTS|&\n /var/www/cgi-bin|' khelpcenter/searchhandlers/CMakeLists.txt
listdocs_fn listdocs_fn
chown_fn chown_fn
@ -265,8 +269,10 @@ else
fi fi
' > $PKG/etc/X11/xinit/xinitrc.tde ' > $PKG/etc/X11/xinit/xinitrc.tde
chmod 755 $PKG/etc/X11/xinit/xinitrc.tde chmod 755 $PKG/etc/X11/xinit/xinitrc.tde
[[ $(cat $TMPVARS/RUNLEVEL) == *xinitrc* ]] && {
(cd $PKG/etc/X11/xinit/ (cd $PKG/etc/X11/xinit/
ln -sf xinitrc.tde xinitrc) ln -sf xinitrc.tde xinitrc)
}
############################################################################## ##############################################################################

@ -28,6 +28,7 @@ VERSION=$TDEVERSION
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
TAG=${TAG:-_tde} TAG=${TAG:-_tde}
[[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && {
# ### Kalzium Chemical Equation Solver - start # ### Kalzium Chemical Equation Solver - start
## Needs OCaml and facile ## Needs OCaml and facile
ocaml_installed_fn () { [[ -s /usr/local/lib$LIBDIRSUFFIX/ocaml/libnums.a ]] && \ ocaml_installed_fn () { [[ -s /usr/local/lib$LIBDIRSUFFIX/ocaml/libnums.a ]] && \
@ -80,6 +81,7 @@ ocaml_installed_fn || { echo -e " installation of ocaml/facile failed \n" ; exit
} && \ } && \
OCAML="ON" OCAML="ON"
# ### Kalzium Chemical Equation Solver - end # ### Kalzium Chemical Equation Solver - end
}
source ../../get-source.sh source ../../get-source.sh
getsource_fn getsource_fn

@ -129,7 +129,7 @@ sed -i 's|TQT_INCLUDE_DIRS}|&\n ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists
## Slackware doesn't include Hspell ## Slackware doesn't include Hspell
## Prioritise Aspell according to its slack-desc: ## Prioritise Aspell according to its slack-desc:
# GNU Aspell is a spell checker designed to eventually replace Ispell. # "GNU Aspell is a spell checker designed to eventually replace Ispell."
[[ -d /usr/lib$LIBDIRSUFFIX/ispell ]] && ISPELL=ON && DEF_SP_CHKR=ISPELL [[ -d /usr/lib$LIBDIRSUFFIX/ispell ]] && ISPELL=ON && DEF_SP_CHKR=ISPELL
[[ -d /usr/lib$LIBDIRSUFFIX/aspell ]] && ASPELL=ON && DEF_SP_CHKR=ASPELL # override ISPELL if both installed [[ -d /usr/lib$LIBDIRSUFFIX/aspell ]] && ASPELL=ON && DEF_SP_CHKR=ASPELL # override ISPELL if both installed
## just show message without failing if no spell checker is installed ## just show message without failing if no spell checker is installed
@ -154,7 +154,6 @@ cmake ${G_NINJA:-} \
-DWITH_ASPELL=${ASPELL:-"OFF"} \ -DWITH_ASPELL=${ASPELL:-"OFF"} \
-DWITH_AVAHI=${AVAHI:-"OFF"} \ -DWITH_AVAHI=${AVAHI:-"OFF"} \
-DWITH_CONSOLEKIT="OFF" \ -DWITH_CONSOLEKIT="OFF" \
-DWITH_CRYPTSETUP="ON" \
-DWITH_CUPS="ON" \ -DWITH_CUPS="ON" \
-DWITH_DEVKITPOWER="ON" \ -DWITH_DEVKITPOWER="ON" \
-DWITH_ELFICON="OFF" \ -DWITH_ELFICON="OFF" \
@ -178,15 +177,12 @@ cmake ${G_NINJA:-} \
-DWITH_OLD_XDG_STD="OFF" \ -DWITH_OLD_XDG_STD="OFF" \
-DWITH_OPENEXR="ON" \ -DWITH_OPENEXR="ON" \
-DWITH_PCRE="ON" \ -DWITH_PCRE="ON" \
-DWITH_PCSC="OFF" \
-DWITH_PKCS="OFF" \
-DWITH_SSL="ON" \ -DWITH_SSL="ON" \
-DWITH_SUDO_TDESU_BACKEND="ON" \ -DWITH_SUDO_TDESU_BACKEND="ON" \
-DWITH_TDEHWLIB="ON" \ -DWITH_TDEHWLIB="ON" \
-DWITH_TDEHWLIB_DAEMONS="ON" \ -DWITH_TDEHWLIB_DAEMONS="ON" \
-DWITH_TDEICONLOADER_DEBUG="OFF" \ -DWITH_TDEICONLOADER_DEBUG="OFF" \
-DWITH_TIFF="ON" \ -DWITH_TIFF="ON" \
-DWITH_UDEVIL="ON" \
-DWITH_UDISKS2="ON" \ -DWITH_UDISKS2="ON" \
-DWITH_UDISKS="ON" \ -DWITH_UDISKS="ON" \
-DWITH_UPOWER="OFF" \ -DWITH_UPOWER="OFF" \

@ -58,6 +58,7 @@ cmake ${G_NINJA:-} \
-DBUILD_KTEATIME="ON" \ -DBUILD_KTEATIME="ON" \
-DBUILD_KTUX="ON" \ -DBUILD_KTUX="ON" \
-DBUILD_KWEATHER="ON" \ -DBUILD_KWEATHER="ON" \
-DBUILD_KONQ_KWEATHER="ON" \
-DBUILD_KWORLDWATCH="ON" \ -DBUILD_KWORLDWATCH="ON" \
-Wno-dev \ -Wno-dev \
.. ..

@ -33,14 +33,6 @@ getsource_fn
untar_fn untar_fn
<<'comment'
## abandoned attempt to include ffmpeg decoder - see README
## edit headers locations for Slackware package
sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
comment
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
@ -61,11 +53,11 @@ cmake ${G_NINJA:-} \
-DWITH_PULSE_SINK="ON" \ -DWITH_PULSE_SINK="ON" \
-DWITH_OSS_SINK="OFF" \ -DWITH_OSS_SINK="OFF" \
-DWITH_SUN_SINK="OFF" \ -DWITH_SUN_SINK="OFF" \
-DWITH_FFMPEG_DECODER="OFF" \ -DWITH_FFMPEG_DECODER="ON" \
-DWITH_MPC_DECODER="ON" \ -DWITH_MPC_DECODER="ON" \
-DWITH_MPEG_DECODER="ON" \ -DWITH_MPEG_DECODER="ON" \
-DWITH_SRC_RESAMPLER="OFF" \ -DWITH_SRC_RESAMPLER="ON" \
-DWITH_XIPH_DECODER="OFF" \ -DWITH_XIPH_DECODER="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -85,12 +77,12 @@ echo "
|-----handy-ruler------------------------------------------------------| |-----handy-ruler------------------------------------------------------|
$PRGNAM: akode - player and plugins for aRts music formats $PRGNAM: akode - player and plugins for aRts music formats
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM: - Ogg Vorbis
$PRGNAM: $PRGNAM: - Musepack (MPC)
$PRGNAM: $PRGNAM: - FLAC
$PRGNAM: $PRGNAM: - Speex
$PRGNAM: $PRGNAM: - Libmad (MPEG-1 and MPEG-2)
$PRGNAM: $PRGNAM: - Libsamplerate
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:

@ -40,9 +40,7 @@ chown_fn
cd_builddir_fn cd_builddir_fn
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \

@ -1,83 +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.
PRGNAM=tqca-tls
VERSION=$TDEVERSION
BUILD=${BUILD:-1}
TAG=${TAG:-_tde}
source ../../get-source.sh
getsource_fn
untar_fn
listdocs_fn
chown_fn
cd_builddir_fn
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 \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-Wno-dev \
..
make_fn
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: tqca-tls (Plugin to provide SSL/TLS capability)
$PRGNAM:
$PRGNAM: This is a plugin to provide SSL/TLS capability to programs that
$PRGNAM: utilize the TQt Cryptographic Architecture (TQCA).
$PRGNAM:
$PRGNAM:
$PRGNAM:
$PRGNAM:
$PRGNAM:
$PRGNAM:
$PRGNAM:
" > $PKG/install/slack-desc
makepkg_fn

@ -101,6 +101,7 @@ chown_fn
#cd_builddir_fn - don't use #cd_builddir_fn - don't use
## datadir is where mkspecs is installed ## datadir is where mkspecs is installed
## gcc visibility hidden is the default in mkspecs/..qmake.conf
echo "yes" | \ echo "yes" | \
./configure \ ./configure \
-no-exceptions \ -no-exceptions \

@ -56,6 +56,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
@ -63,6 +65,7 @@ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \ --mandir=$INSTALL_TDE/man \
${EN_GCC_VIS:-} \
--disable-rpath \ --disable-rpath \
--enable-closure --enable-closure

@ -0,0 +1,735 @@
https://www.dechifro.org/dcraw
*Adobe Digital Negative (DNG)
AgfaPhoto DC-833m
Alcatel 5035D
Apple QuickTake 100
Apple QuickTake 150
Apple QuickTake 200
*ARRIRAW format
AVT F-080C
AVT F-145C
AVT F-201C
AVT F-510C
AVT F-810C
Baumer TXG14
Blackmagic URSA
Canon PowerShot 600
Canon PowerShot A5
Canon PowerShot A5 Zoom
Canon PowerShot A50
Canon PowerShot A460 (CHDK hack)
Canon PowerShot A470 (CHDK hack)
Canon PowerShot A530 (CHDK hack)
Canon PowerShot A570 (CHDK hack)
Canon PowerShot A590 (CHDK hack)
Canon PowerShot A610 (CHDK hack)
Canon PowerShot A620 (CHDK hack)
Canon PowerShot A630 (CHDK hack)
Canon PowerShot A640 (CHDK hack)
Canon PowerShot A650 (CHDK hack)
Canon PowerShot A710 IS (CHDK hack)
Canon PowerShot A720 IS (CHDK hack)
Canon PowerShot A3300 IS (CHDK hack)
Canon PowerShot Pro70
Canon PowerShot Pro90 IS
Canon PowerShot Pro1
Canon PowerShot G1
Canon PowerShot G1 X
Canon PowerShot G1 X Mark II
Canon PowerShot G2
Canon PowerShot G3
Canon PowerShot G3 X
Canon PowerShot G5
Canon PowerShot G5 X
Canon PowerShot G6
Canon PowerShot G7 (CHDK hack)
Canon PowerShot G7 X
Canon PowerShot G7 X Mark II
Canon PowerShot G9
Canon PowerShot G9 X
Canon PowerShot G10
Canon PowerShot G11
Canon PowerShot G12
Canon PowerShot G15
Canon PowerShot G16
Canon PowerShot S2 IS (CHDK hack)
Canon PowerShot S3 IS (CHDK hack)
Canon PowerShot S5 IS (CHDK hack)
Canon PowerShot SD300 (CHDK hack)
Canon PowerShot S30
Canon PowerShot S40
Canon PowerShot S45
Canon PowerShot S50
Canon PowerShot S60
Canon PowerShot S70
Canon PowerShot S90
Canon PowerShot S95
Canon PowerShot S100
Canon PowerShot S110
Canon PowerShot S120
Canon PowerShot SX1 IS
Canon PowerShot SX110 IS (CHDK hack)
Canon PowerShot SX120 IS (CHDK hack)
Canon PowerShot SX220 HS (CHDK hack)
Canon PowerShot SX20 IS (CHDK hack)
Canon PowerShot SX30 IS (CHDK hack)
Canon PowerShot SX50 HS
Canon PowerShot SX60 HS
Canon IXUS 160 (CHDK hack)
Canon EOS D30
Canon EOS D60
Canon EOS 5D
Canon EOS 5D Mark II
Canon EOS 5D Mark III
Canon EOS 5DS
Canon EOS 5DS R
Canon EOS 6D
Canon EOS 7D
Canon EOS 7D Mark II
Canon EOS 10D
Canon EOS 20D
Canon EOS 30D
Canon EOS 40D
Canon EOS 50D
Canon EOS 60D
Canon EOS 70D
Canon EOS 77D / 9000D
Canon EOS 80D
Canon EOS 300D / Digital Rebel / Kiss Digital
Canon EOS 350D / Digital Rebel XT / Kiss Digital N
Canon EOS 400D / Digital Rebel XTi / Kiss Digital X
Canon EOS 450D / Digital Rebel XSi / Kiss Digital X2
Canon EOS 500D / Digital Rebel T1i / Kiss Digital X3
Canon EOS 550D / Digital Rebel T2i / Kiss Digital X4
Canon EOS 600D / Digital Rebel T3i / Kiss Digital X5
Canon EOS 650D / Digital Rebel T4i / Kiss Digital X6i
Canon EOS 700D / Digital Rebel T5i / Kiss Digital X7i
Canon EOS 750D / Digital Rebel T6i / Kiss Digital X8i
Canon EOS 760D / Digital Rebel T6s / Kiss Digital X9
Canon EOS 800D / Digital Rebel T7i / Kiss Digital X9i
Canon EOS 100D / Digital Rebel SL1 / Kiss Digital X7
Canon EOS 1000D / Digital Rebel XS / Kiss Digital F
Canon EOS 1100D / Digital Rebel T3 / Kiss Digital X50
Canon EOS 1200D / Digital Rebel T5 / Kiss Digital X70
Canon EOS 1300D / Digital Rebel T6 / Kiss Digital X80
Canon EOS 1500D / Digital Rebel T7 / Kiss Digital X90 / EOS 2000D
Canon EOS 3000D / Digital Rebel T100 / EOS 4000D
Canon EOS C500
Canon EOS D2000C
Canon EOS M
Canon EOS M3
Canon EOS M10
Canon EOS-1D
Canon EOS-1DS
Canon EOS-1D X
Canon EOS-1D X Mark II
Canon EOS-1D Mark II
Canon EOS-1D Mark II N
Canon EOS-1D Mark III
Canon EOS-1D Mark IV
Canon EOS-1Ds Mark II
Canon EOS-1Ds Mark III
Casio QV-2000UX
Casio QV-3000EX
Casio QV-3500EX
Casio QV-4000
Casio QV-5700
Casio QV-R41
Casio QV-R51
Casio QV-R61
Casio EX-FH100
Casio EX-S20
Casio EX-S100
Casio EX-Z4
Casio EX-Z50
Casio EX-Z500
Casio EX-Z55
Casio EX-Z60
Casio EX-Z75
Casio EX-Z750
Casio EX-Z8
Casio EX-Z850
Casio EX-Z1050
Casio EX-Z1080
Casio EX-ZR100
Casio Exlim Pro 505
Casio Exlim Pro 600
Casio Exlim Pro 700
Contax N Digital
Creative PC-CAM 600
DJI 4384x3288
DxO ONE
Epson R-D1
Foculus 531C
Fuji E550
Fuji E900
Fuji F700
Fuji F710
Fuji S1
Fuji S2Pro
Fuji S3Pro
Fuji S5Pro
Fuji S20Pro
Fuji S100FS
Fuji S5000
Fuji S5100/S5500
Fuji S5200/S5600
Fuji S6000fd
Fuji S7000
Fuji S9000/S9500
Fuji S9100/S9600
Fuji S200EXR
Fuji SL1000
Fuji HS10/HS11
Fuji HS20EXR
Fuji HS30EXR
Fuji HS50EXR
Fuji F550EXR
Fuji F600EXR
Fuji F770EXR
Fuji F800EXR
Fuji F900EXR
Fuji X-Pro1
Fuji X-Pro2
Fuji X-A1
Fuji X-A2
Fuji X-E1
Fuji X-E2
Fuji X-E2S
Fuji X-H1
Fuji X-M1
Fuji X-S1
Fuji X-T1
Fuji X-T2
Fuji X-T10
Fuji X-T20
Fuji XF1
Fuji XQ1
Fuji XQ2
Fuji X100
Fuji X100F
Fuji X100S
Fuji X100T
Fuji X10
Fuji X20
Fuji X30
Fuji X70
Fuji IS-1
Hasselblad CFV
Hasselblad CFV-2
Hasselblad H3D
Hasselblad H4D
Hasselblad V96C
Hasselblad X1D
Imacon Ixpress 16-megapixel
Imacon Ixpress 22-megapixel
Imacon Ixpress 39-megapixel
ISG 2020x1520
Kodak DC20
Kodak DC25
Kodak DC40
Kodak DC50
Kodak DC120 (also try kdc2tiff)
Kodak DCS200
Kodak DCS315C
Kodak DCS330C
Kodak DCS420
Kodak DCS460
Kodak DCS460A
Kodak DCS460D
Kodak DCS520C
Kodak DCS560C
Kodak DCS620C
Kodak DCS620X
Kodak DCS660C
Kodak DCS660M
Kodak DCS720X
Kodak DCS760C
Kodak DCS760M
Kodak EOSDCS1
Kodak EOSDCS3B
Kodak NC2000F
Kodak ProBack
Kodak PB645C
Kodak PB645H
Kodak PB645M
Kodak DCS Pro 14n
Kodak DCS Pro 14nx
Kodak DCS Pro SLR/c
Kodak DCS Pro SLR/n
Kodak C330
Kodak C603
Kodak P850
Kodak P880
Kodak Z980
Kodak Z981
Kodak Z990
Kodak Z1015
Kodak KAI-0340
Konica KD-400Z
Konica KD-510Z
Leaf AFi 7
Leaf AFi-II 12
Leaf Aptus 17
Leaf Aptus 22
Leaf Aptus 54S
Leaf Aptus 65
Leaf Aptus 75
Leaf Aptus 75S
Leaf Cantare
Leaf CatchLight
Leaf CMost
Leaf DCB2
Leaf Valeo 6
Leaf Valeo 11
Leaf Valeo 17
Leaf Valeo 22
Leaf Volare
Leica C (Typ 112)
Leica CL
Leica Digilux 2
Leica Digilux 3
Leica D-LUX2
Leica D-LUX3
Leica D-LUX4
Leica D-LUX5
Leica D-LUX6
Leica D-LUX (Typ 109)
Leica M (Typ 240)
Leica M (Typ 262)
Leica M Monochrom (Typ 246)
Leica M8
Leica M9
Leica M10
Leica Q (Typ 116)
Leica R8
Leica S (Typ 007)
Leica SL (Typ 601)
Leica T (Typ 701)
Leica TL
Leica TL2
Leica V-LUX1
Leica V-LUX2
Leica V-LUX3
Leica V-LUX4
Leica V-LUX (Typ 114)
Leica X VARIO (Typ 107)
Leica X1
Leica X2
Leica X (Typ 113)
Leica X-E (Typ 102)
Leica X-U (Typ 113)
Lenovo A820
Logitech Fotoman Pixtura
Mamiya ZD
Matrix 4608x3288
Micron 2010
Minolta RD175
Minolta DiMAGE 5
Minolta DiMAGE 7
Minolta DiMAGE 7i
Minolta DiMAGE 7Hi
Minolta DiMAGE A1
Minolta DiMAGE A2
Minolta DiMAGE A200
Minolta DiMAGE G400
Minolta DiMAGE G500
Minolta DiMAGE G530
Minolta DiMAGE G600
Minolta DiMAGE Z2
Minolta Alpha/Dynax/Maxxum 5D
Minolta Alpha/Dynax/Maxxum 7D
Motorola PIXL
Nikon D1
Nikon D1H
Nikon D1X
Nikon D2H
Nikon D2Hs
Nikon D2X
Nikon D2Xs
Nikon D3
Nikon D3s
Nikon D3X
Nikon D4
Nikon D4s
Nikon Df
Nikon D40
Nikon D40X
Nikon D5
Nikon D50
Nikon D60
Nikon D70
Nikon D70s
Nikon D80
Nikon D90
Nikon D100
Nikon D200
Nikon D300
Nikon D300s
Nikon D500
Nikon D600
Nikon D610
Nikon D700
Nikon D750
Nikon D800
Nikon D800E
Nikon D810
Nikon D850
Nikon D3000
Nikon D3100
Nikon D3200
Nikon D3300
Nikon D3400
Nikon D5000
Nikon D5100
Nikon D5200
Nikon D5300
Nikon D5500
Nikon D7000
Nikon D7100
Nikon D7200
Nikon D7500
Nikon 1 AW1
Nikon 1 J1
Nikon 1 J2
Nikon 1 J3
Nikon 1 J4
Nikon 1 J5
Nikon 1 S1
Nikon 1 V1
Nikon 1 V2
Nikon 1 V3
Nikon E700 ("DIAG RAW" hack)
Nikon E800 ("DIAG RAW" hack)
Nikon E880 ("DIAG RAW" hack)
Nikon E900 ("DIAG RAW" hack)
Nikon E950 ("DIAG RAW" hack)
Nikon E990 ("DIAG RAW" hack)
Nikon E995 ("DIAG RAW" hack)
Nikon E2100 ("DIAG RAW" hack)
Nikon E2500 ("DIAG RAW" hack)
Nikon E3200 ("DIAG RAW" hack)
Nikon E3700 ("DIAG RAW" hack)
Nikon E4300 ("DIAG RAW" hack)
Nikon E4500 ("DIAG RAW" hack)
Nikon E5000
Nikon E5400
Nikon E5700
Nikon E8400
Nikon E8700
Nikon E8800
Nikon Coolpix A
Nikon Coolpix P330
Nikon Coolpix P340
Nikon Coolpix P6000
Nikon Coolpix P7000
Nikon Coolpix P7100
Nikon Coolpix P7700
Nikon Coolpix P7800
Nikon Coolpix S6 ("DIAG RAW" hack)
Nokia N9
Nokia N95
Nokia X2
Nokia 1200x1600
Nokia Lumia 1020
Olympus AIR-A01
Olympus C3030Z
Olympus C5050Z
Olympus C5060WZ
Olympus C7070WZ
Olympus C70Z,C7000Z
Olympus C740UZ
Olympus C770UZ
Olympus C8080WZ
Olympus X200,D560Z,C350Z
Olympus E-1
Olympus E-3
Olympus E-5
Olympus E-10
Olympus E-20
Olympus E-30
Olympus E-300
Olympus E-330
Olympus E-400
Olympus E-410
Olympus E-420
Olympus E-500
Olympus E-510
Olympus E-520
Olympus E-620
Olympus E-M1
Olympus E-M1 Mark II
Olympus E-M5
Olympus E-M5 Mark II
Olympus E-M10
Olympus E-M10 Mark II
Olympus E-M10 Mark III
Olympus E-P1
Olympus E-P2
Olympus E-P3
Olympus E-P5
Olympus E-PL1
Olympus E-PL1s
Olympus E-PL2
Olympus E-PL3
Olympus E-PL5
Olympus E-PL7
Olympus E-PL8
Olympus E-PL9
Olympus E-PM1
Olympus E-PM2
Olympus PEN-F
Olympus SH-2
Olympus SP310
Olympus SP320
Olympus SP350
Olympus SP500UZ
Olympus SP510UZ
Olympus SP550UZ
Olympus SP560UZ
Olympus SP570UZ
Olympus STYLUS1
Olympus TG-4
Olympus TG-5
Olympus XZ-1
Olympus XZ-2
Olympus XZ-10
OmniVision OV5647 (Raspberry Pi)
Panasonic DMC-CM1
Panasonic DMC-FZ8
Panasonic DMC-FZ18
Panasonic DMC-FZ28
Panasonic DMC-FZ30
Panasonic DMC-FZ35/FZ38
Panasonic DMC-FZ40
Panasonic DMC-FZ50
Panasonic DMC-FZ70
Panasonic DC-FZ80
Panasonic DMC-FZ100
Panasonic DMC-FZ150
Panasonic DMC-FZ200
Panasonic DMC-FZ300
Panasonic DMC-FZ330
Panasonic DMC-FZ1000
Panasonic DMC-FZ2000
Panasonic DMC-FX150
Panasonic DMC-G1
Panasonic DMC-G2
Panasonic DMC-G3
Panasonic DMC-G5
Panasonic DMC-G6
Panasonic DMC-G7
Panasonic DC-G9
Panasonic DMC-G80
Panasonic DMC-GF1
Panasonic DMC-GF2
Panasonic DMC-GF3
Panasonic DMC-GF5
Panasonic DMC-GF6
Panasonic DMC-GF7
Panasonic DMC-GH1
Panasonic DMC-GH2
Panasonic DMC-GH3
Panasonic DMC-GH4
Panasonic DC-GH5
Panasonic DMC-GM1
Panasonic DMC-GM5
Panasonic DMC-GX1
Panasonic DMC-GX7
Panasonic DMC-GX8
Panasonic DC-GX9
Panasonic DMC-GX80
Panasonic DC-GX800
Panasonic DMC-L1
Panasonic DMC-L10
Panasonic DMC-LC1
Panasonic DMC-LF1
Panasonic DMC-LX1
Panasonic DMC-LX2
Panasonic DMC-LX3
Panasonic DMC-LX5
Panasonic DMC-LX7
Panasonic DMC-LX15
Panasonic DMC-LX100
Panasonic DMC-TZ61
Panasonic DMC-TZ80
Panasonic DC-TZ90
Panasonic DMC-TZ100
Panasonic DC-TZ200
Panasonic DMC-ZS40
Pentax *ist D
Pentax *ist DL
Pentax *ist DL2
Pentax *ist DS
Pentax *ist DS2
Pentax K10D
Pentax K20D
Pentax K100D
Pentax K100D Super
Pentax K200D
Pentax K2000/K-m
Pentax K-x
Pentax K-r
Pentax K-1
Pentax K-3
Pentax K-3 II
Pentax K-5
Pentax K-5 II
Pentax K-5 II s
Pentax K-50
Pentax K-70
Pentax K-500
Pentax K-7
Pentax K-S1
Pentax K-S2
Pentax KP
Pentax Optio S
Pentax Optio S4
Pentax Optio 33WR
Pentax Optio 750Z
Pentax Q-S1
Pentax Q7
Pentax 645D
Pentax 645Z
Phase One LightPhase
Phase One H 10
Phase One H 20
Phase One H 25
Phase One P 20
Phase One P 25
Phase One P 30
Phase One P 45
Phase One P 45+
Photron BC2-HD
Pixelink A782
Polaroid x530
Redcode R3D format
Ricoh GR
Ricoh GR II
Ricoh GX200
Ricoh GXR MOUNT A12
Ricoh GXR A16
Rollei d530flex
RoverShot 3320af
Samsung EK-GN120
Samsung EX1
Samsung EX2F
Samsung GX-1S
Samsung GX10
Samsung GX20
Samsung NX1
Samsung NX10
Samsung NX11
Samsung NX100
Samsung NX20
Samsung NX200
Samsung NX210
Samsung NX30
Samsung NX300
Samsung NX300M
Samsung NX500
Samsung NX1000
Samsung NX1100
Samsung NX2000
Samsung NX3000
Samsung NX mini
Samsung WB550
Samsung WB2000
Samsung S85 (hacked)
Samsung S850 (hacked)
Sarnoff 4096x5440
Sigma SD9
Sigma SD10
Sigma SD14
Sigma SD15
Sigma SD1
Sigma SD1 Merill
Sigma DP1
Sigma DP1 Merill
Sigma DP1S
Sigma DP1X
Sigma DP2
Sigma DP2 Merill
Sigma DP2S
Sigma DP2X
Sinar 3072x2048
Sinar 4080x4080
Sinar 4080x5440
Sinar STI format
SMaL Ultra-Pocket 3
SMaL Ultra-Pocket 4
SMaL Ultra-Pocket 5
Sony DSC-F828
Sony DSC-R1
Sony DSC-RX0
Sony DSC-RX1
Sony DSC-RX1R
Sony DSC-RX1RM2
Sony DSC-RX10
Sony DSC-RX10M2
Sony DSC-RX10M3
Sony DSC-RX10M4
Sony DSC-RX100
Sony DSC-RX100M2
Sony DSC-RX100M3
Sony DSC-RX100M4
Sony DSC-RX100M5
Sony DSC-V3
Sony DSLR-A100
Sony DSLR-A200
Sony DSLR-A230
Sony DSLR-A290
Sony DSLR-A300
Sony DSLR-A330
Sony DSLR-A350
Sony DSLR-A380
Sony DSLR-A450
Sony DSLR-A500
Sony DSLR-A550
Sony DSLR-A580
Sony DSLR-A700
Sony DSLR-A850
Sony DSLR-A900
Sony ILCA-68
Sony ILCA-77M2
Sony ILCA-99M2
Sony ILCE-7
Sony ILCE-7M2
Sony ILCE-7M3
Sony ILCE-7R
Sony ILCE-7RM2
Sony ILCE-7RM3
Sony ILCE-7S
Sony ILCE-7SM2
Sony ILCE-9
Sony ILCE-3000
Sony ILCE-5000
Sony ILCE-5100
Sony ILCE-6000
Sony ILCE-6300
Sony ILCE-6500
Sony ILCE-QX1
Sony NEX-3
Sony NEX-3N
Sony NEX-5
Sony NEX-5N
Sony NEX-5R
Sony NEX-5T
Sony NEX-6
Sony NEX-7
Sony NEX-C3
Sony NEX-F3
Sony SLT-A33
Sony SLT-A35
Sony SLT-A37
Sony SLT-A55V
Sony SLT-A57
Sony SLT-A58
Sony SLT-A65V
Sony SLT-A77V
Sony SLT-A99V
Sony XCD-SX910CR
STV680 VGA
Xiro Xplorer V
YI M1

@ -0,0 +1,292 @@
.\"
.\" Man page for dcraw
.\"
.\" Copyright (c) 2015 by David Coffin
.\"
.\" You may distribute without restriction.
.\"
.\" David Coffin
.\" dcoffin a cybercom o net
.\" http://www.cybercom.net/~dcoffin
.\"
.TH dcraw 1 "March 3, 2015"
.LO 1
.SH NAME
dcraw - command-line decoder for raw digital photos
.SH SYNOPSIS
.B dcraw
[\fIOPTION\fR]... [\fIFILE\fR]...
.SH DESCRIPTION
.B dcraw
decodes raw photos, displays metadata, and extracts thumbnails.
.SH GENERAL OPTIONS
.TP
.B -v
Print verbose messages, not just warnings and errors.
.TP
.B -c
Write decoded images or thumbnails to standard output.
.TP
.B -e
Extract the camera-generated thumbnail, not the raw image.
You'll get either a JPEG or a PPM file, depending on the camera.
.TP
.B -z
Change the access and modification times of an AVI, JPEG, TIFF or raw
file to when the photo was taken, assuming that the camera clock
was set to Universal Time.
.TP
.B -i
Identify files but don't decode them.
Exit status is 0 if
.B dcraw
can decode the last file, 1 if it can't.
.B -i -v
shows metadata.
.TP
.B ""
.B dcraw
cannot decode JPEG files!!
.SH REPAIR OPTIONS
.TP
.B -I
Read the raw pixels from standard input in CPU byte order with
no header. Use
.B dcraw -E -4
to get the raw pixel values.
.TP
.B -P deadpixels.txt
Read the dead pixel list from this file instead of ".badpixels".
See
.B FILES
for a description of the format.
.TP
.B -K darkframe.pgm
Subtract a dark frame from the raw data. To generate a
dark frame, shoot a raw photo with no light and do
.BR dcraw\ -D\ -4\ -j\ -t\ 0 .
.TP
.B -k darkness
When shadows appear foggy, you need to raise the darkness level.
To measure this, apply
.B pamsumm -mean
to the dark frame generated above.
.TP
.B -S saturation
When highlights appear pink, you need to lower the saturation level.
To measure this, take a picture of something shiny and do
.B dcraw -D -4 -j -c
photo.raw
.B | pamsumm -max
.TP
.B ""
The default darkness and saturation are usually correct.
.TP
.B -n noise_threshold
Use wavelets to erase noise while preserving real detail.
The best threshold should be somewhere between 100 and 1000.
.TP
.B -C red_mag blue_mag
Enlarge the raw red and blue layers by the given factors,
typically 0.999 to 1.001, to correct chromatic aberration.
.TP
.B -H 0
Clip all highlights to solid white (default).
.TP
.B -H 1
Leave highlights unclipped in various shades of pink.
.TP
.B -H 2
Blend clipped and unclipped values together for a gradual fade
to white.
.TP
.B -H 3+
Reconstruct highlights. Low numbers favor whites; high numbers
favor colors. Try
.B -H 5
as a compromise. If that's not good enough, do
.BR -H\ 9 ,
cut out the non-white highlights, and paste them into an image
generated with
.BR -H\ 3 .
.SH COLOR OPTIONS
By default,
.B dcraw
uses a fixed white balance based on a color chart illuminated
with a standard D65 lamp.
.TP
.B -w
Use the white balance specified by the camera.
If this is not found, print a warning and use another method.
.TP
.B -a
Calculate the white balance by averaging the entire image.
.TP
.B -A left top width height
Calculate the white balance by averaging a rectangular area.
First do
.B dcraw\ -j\ -t\ 0
and select an area of neutral grey color.
.TP
.B -r mul0 mul1 mul2 mul3
Specify your own raw white balance.
These multipliers can be cut and pasted from the output of
.BR dcraw\ -v .
.TP
.BR +M " or " -M
Use (or don't use) any color matrix from the camera metadata.
The default is
.B +M
if
.B -w
is set or the photo is in DNG format,
.B -M
otherwise. Besides DNG,
this option only affects Olympus, Leaf, and Phase One cameras.
.TP
.B -o [0-6]
Select the output colorspace when the
.B -p
option is not used:
.B \t0
\ \ Raw color (unique to each camera)
.br
.B \t1
\ \ sRGB D65 (default)
.br
.B \t2
\ \ Adobe RGB (1998) D65
.br
.B \t3
\ \ Wide Gamut RGB D65
.br
.B \t4
\ \ Kodak ProPhoto RGB D65
.br
.B \t5
\ \ XYZ
.br
.B \t6
\ \ ACES
.TP
.BR -p\ camera.icm \ [\ -o\ output.icm \ ]
Use ICC profiles to define the camera's raw colorspace and the
desired output colorspace (sRGB by default).
.TP
.B -p embed
Use the ICC profile embedded in the raw photo.
.SH INTERPOLATION OPTIONS
.TP
.B -d
Show the raw data as a grayscale image with no interpolation.
Good for photographing black-and-white documents.
.TP
.B -D
Same as
.BR -d ,
but with the original unscaled pixel values.
.TP
.B -E
Same as
.BR -D ,
but masked pixels are not cropped.
.TP
.B -h
Output a half-size color image. Twice as fast as
.BR -q\ 0 .
.TP
.B -q 0
Use high-speed, low-quality bilinear interpolation.
.TP
.B -q 1
Use Variable Number of Gradients (VNG) interpolation.
.TP
.B -q 2
Use Patterned Pixel Grouping (PPG) interpolation.
.TP
.B -q 3
Use Adaptive Homogeneity-Directed (AHD) interpolation.
.TP
.B -f
Interpolate RGB as four colors. Use this if the output shows
false 2x2 meshes with VNG or mazes with AHD.
.TP
.B -m number_of_passes
After interpolation, clean up color artifacts by repeatedly
applying a 3x3 median filter to the R-G and B-G channels.
.SH OUTPUT OPTIONS
By default,
.B dcraw
writes PGM/PPM/PAM with 8-bit samples, a BT.709 gamma curve,
a histogram-based white level, and no metadata.
.TP
.B -W
Use a fixed white level, ignoring the image histogram.
.TP
.B -b brightness
Divide the white level by this number, 1.0 by default.
.TP
.B -g power toe_slope
Set the gamma curve, by default BT.709
.RB ( -g\ 2.222\ 4.5 ).
If you prefer sRGB gamma, use
.BR -g\ 2.4\ 12.92 .
For a simple power curve, set the toe slope to zero.
.TP
.B -6
Write sixteen bits per sample instead of eight.
.TP
.B -4
Linear 16-bit, same as
.BR -6\ -W\ -g\ 1\ 1 .
.TP
.B -T
Write TIFF with metadata instead of PGM/PPM/PAM.
.TP
.B -t [0-7,90,180,270]
Flip the output image. By default,
.B dcraw
applies the flip specified by the camera.
.B -t 0
disables all flipping.
.TP
.B -j
For Fuji\ Super\ CCD cameras, show the image tilted 45 degrees.
For cameras with non-square pixels, do not stretch the image to
its correct aspect ratio. In any case, this option guarantees
that each output pixel corresponds to one raw pixel.
.TP
.BR "-s [0..N-1]" " or " "-s all"
If a file contains N raw images, choose one or "all" to decode.
For example, Fuji\ Super\ CCD\ SR cameras generate a second image
underexposed four stops to show detail in the highlights.
.SH FILES
.TP
\:./.badpixels, ../.badpixels, ../../.badpixels, ...
List of your camera's dead pixels, so that
.B dcraw
can interpolate around them. Each line specifies the column,
row, and UNIX time of death for one pixel. For example:
.sp 1
.nf
962 91 1028350000 # died between August 1 and 4, 2002
1285 1067 0 # don't know when this pixel died
.fi
.sp 1
These coordinates are before any stretching or rotation, so use
.B dcraw -j -t 0
to locate dead pixels.
.SH "SEE ALSO"
.BR pgm (5),
.BR ppm (5),
.BR pam (5),
.BR pamsumm (1),
.BR pnmgamma (1),
.BR pnmtotiff (1),
.BR pnmtopng (1),
.BR gphoto2 (1),
.BR cjpeg (1),
.BR djpeg (1)
.SH AUTHOR
Written by David Coffin, dcoffin a cybercom o net

File diff suppressed because it is too large Load Diff

@ -34,33 +34,124 @@ getsource_fn
untar_fn untar_fn
# set support for additional language(s) as per I18N variable # for slack-desc
# but only for languages available with this package langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang".po" ]] && langs="$langs $Lang";done
langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang";done
sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am
listdocs_fn listdocs_fn
ltoolupdate_fn ## use latest version of dcraw.c
cp $SB_SRCDIR/dcraw.c libkdcraw/dcraw/
## .. and the corresponding supported cameras list
cp $SB_SRCDIR/CAMERALIST libkdcraw/dcraw/
## .. and the updated man page
cp $SB_SRCDIR/dcraw.1 libkdcraw/dcraw/
## .. and which requires jasper
sed -i '72i find_package( Jasper )\
if( JASPER_FOUND )\
set( HAVE_JASPER 1 )\
else()\
tde_message_fatal( "jasper library is required, but was not found on your system" )\
endif()\
' ConfigureChecks.cmake
#
sed -i 's|MATH_LIBC.*$|&\n ${JASPER_LIBRARIES}|' libkdcraw/dcraw/CMakeLists.txt # OK after jasper check
## .. and install the list of supported cameras
echo "INSTALL(
FILES CAMERALIST
DESTINATION \${CMAKE_INSTALL_PREFIX}/doc/$PRGNAM-$VERSION
RENAME CameraList
COMPONENT doc
)" >> libkdcraw/dcraw/CMakeLists.txt
#
## 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
patch -p0 -N << EOF
--- libkdcraw/dcraw/CMakeLists.txt
+++ libkdcraw/dcraw/CMakeLists.txt
@@ -4,4 +4,2 @@
\${CMAKE_CURRENT_SOURCE_DIR}
- \${TDE_INCLUDE_DIR}
- \${TQT_INCLUDE_DIRS}
\${LCMS_INCLUDE_DIRS}
@@ -10,8 +8,2 @@
-link_directories(
- \${TQT_LIBRARY_DIRS}
- \${TDE_LIB_DIR}
-)
-
-
##### dcraw (executable)
EOF
## tqt libs required for raw2png
sed -i 's|\##### test programs|link_directories(\
${TQT_LIBRARY_DIRS}\
)\
\
&|' libkdcraw/test/CMakeLists.txt
## .. and install libraw sample [test] programs
patch -p0 -N << EOF
--- libkdcraw/test/CMakeLists.txt
+++ libkdcraw/test/CMakeLists.txt
@@ -22,0 +23 @@
+ DESTINATION \${BIN_INSTALL_DIR}
@@ -30,0 +32 @@
+ DESTINATION \${BIN_INSTALL_DIR}
@@ -38,0 +41 @@
+ DESTINATION \${BIN_INSTALL_DIR}
@@ -46,0 +50 @@
+ DESTINATION \${BIN_INSTALL_DIR}
@@ -54,0 +59 @@
+ DESTINATION \${BIN_INSTALL_DIR}
@@ -62,0 +68 @@
+ DESTINATION \${BIN_INSTALL_DIR}
@@ -70,0 +77 @@
+ DESTINATION \${BIN_INSTALL_DIR}
EOF
## .. add two more libraw sample programs
echo 'tde_add_executable( half_mt AUTOMOC
DESTINATION ${BIN_INSTALL_DIR}
SOURCES ../libraw/samples/half_mt.c
LINK raw-static
)
tde_add_executable( dcraw_half AUTOMOC
DESTINATION ${BIN_INSTALL_DIR}
SOURCES ../libraw/samples/dcraw_half.c
LINK raw-static
)' >> libkdcraw/test/CMakeLists.txt
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
CFLAGS="$SLKRCFLAGS" \ cmake ${G_NINJA:-} \
CXXFLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
CXX=$COMPILER_CXX \ -DCMAKE_C_COMPILER=$COMPILER \
../configure \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
--prefix=$INSTALL_TDE \ -DCMAKE_BUILD_TYPE=Release \
--disable-rpath \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
--enable-openmp \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
--enable-closure -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_LCMS="ON" \
-DWITH_OPENMP="ON" \
-DBUILD_KDCRAW="ON" \
-DBUILD_TESTS="ON" \
-DBUILD_TRANSLATIONS="ON" \
-Wno-dev \
..
make_fn make_fn
installdocs_fn installdocs_fn
mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn
@ -76,17 +167,17 @@ echo "
# exactly 11 lines for the formatting to be correct. It's also customary to # exactly 11 lines for the formatting to be correct. It's also customary to
# leave one space after the ':'. # leave one space after the ':'.
|-----handy-ruler------------------------------------------------------| |-----handy-ruler------------------------------------------------------|
$PRGNAM: libkdcraw (dcraw Library Wrapper) $PRGNAM: libkdcraw (LibRaw Library Wrapper)
$PRGNAM: $PRGNAM:
$PRGNAM: Libkdcraw is a C++ interface around dcraw binary program used to $PRGNAM: Libkdcraw is a C++ interface around the LibRaw library used to decode
$PRGNAM: decode RAW picture files. The library documentation is available $PRGNAM: RAW picture files and used by kipi-plugins, digiKam, gwenview and
$PRGNAM: on header files. This library is used by kipi-plugins, digiKam $PRGNAM: ksquirrel.
$PRGNAM: and other kipi host programs.
$PRGNAM:
$PRGNAM: With language support for:
$PRGNAM: en$langs
$PRGNAM: $PRGNAM:
$PRGNAM: The cameras supported by the cli program dcraw are listed in
$PRGNAM: $INSTALL_TDE/doc/$PRGNAM-$VERSION/CameraList
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for:
$PRGNAM: $langs
" > $PKG/install/slack-desc " > $PKG/install/slack-desc
makepkg_fn makepkg_fn

@ -34,12 +34,8 @@ getsource_fn
untar_fn untar_fn
# set support for additional language(s) as per I18N variable # for slack-desc
# but only for languages available with this package langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang".po" ]] && langs="$langs $Lang";done
langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done
sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
langs=$(echo $langs|sed "s|/$PRGNAM.po||g")
[[ $langs != "" ]] && TRANS=ON
listdocs_fn listdocs_fn
@ -56,7 +52,7 @@ cmake ${G_NINJA:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -87,7 +83,7 @@ $PRGNAM: among graphic applications. Kipi is based on the old digiKam plugins
$PRGNAM: implementation and is maintained by the digiKam team. $PRGNAM: implementation and is maintained by the digiKam team.
$PRGNAM: $PRGNAM:
$PRGNAM: With language support for: $PRGNAM: With language support for:
$PRGNAM: en $langs $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -42,8 +42,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
CXXFLAGS="$SLKCFLAGS" \
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \

@ -497,7 +497,6 @@ cd_builddir_fn
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \ --libdir=/usr/lib$LIBDIRSUFFIX \

@ -80,7 +80,7 @@ $PRGNAM: * Apply filters to images
$PRGNAM: * Scale images $PRGNAM: * Scale images
$PRGNAM: * Apply color correction .. and more $PRGNAM: * Apply color correction .. and more
$PRGNAM: $PRGNAM:
$PRGNAM: See index.html for the full list. $PRGNAM: See /usr/doc/$PRGNAM-$VERSION/index.html for the full list.
$PRGNAM: $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc

@ -28,16 +28,20 @@ PRGNAM=inkscape
## too late for log file name, but sort that out when Sl current is released as Sl 15 ## too late for log file name, but sort that out when Sl current is released as Sl 15
## and this script updated for v1.x.x only ## and this script updated for v1.x.x only
echo 0.92.4 > $TMPVARS/INKSC_VERS && { echo 0.92.4 > $TMPVARS/INKSC_VERS && {
## v 1.0.2 for Slackware current ## v 1.1 for Slackware current
[[ $(ls /var/log/packages/poppler-*) == *-2[1-9].* ]] && echo 1.0.2 > $TMPVARS/INKSC_VERS ; } [[ $(ls /var/log/packages/poppler-*) == *-2[1-9].* ]] && echo 1.1 > $TMPVARS/INKSC_VERS ; }
VERSION=$(cat $TMPVARS/INKSC_VERS) VERSION=$(cat $TMPVARS/INKSC_VERS)
BUILD=${BUILD:-1} BUILD=${BUILD:-1}
ARCHIVE_TYPE="tar.bz2" && [[ $VERSION == 1.0.2 ]] && ARCHIVE_TYPE="tar.xz" ARCHIVE_TYPE="tar.bz2" && [[ $VERSION == 1.1 ]] && ARCHIVE_TYPE="tar.xz"
SRCURL="https://media.inkscape.org/dl/resources/file/$PRGNAM-$VERSION.$ARCHIVE_TYPE" SRCURL="https://media.inkscape.org/dl/resources/file/$PRGNAM-$VERSION.$ARCHIVE_TYPE"
source ../../get-source.sh source ../../get-source.sh
## need this here for CXX_FLAGS for double-conversion
getsource_fn
## inkscape v1.0.2 for Slackware current needs gdl and double-conversion ## inkscape v1.1 for Slackware current needs gdl and double-conversion
[[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && {
# ### gdl and double-conversion - start # ### gdl and double-conversion - start
[[ $(ls /var/log/packages/poppler-*) == *-2[1-9].* ]] && { [[ $(ls /var/log/packages/poppler-*) == *-2[1-9].* ]] && {
## If they are already installed, go to end ## If they are already installed, go to end
@ -83,7 +87,7 @@ cd double-conversion-3.1.5/
cd cmake/ cd cmake/
# LIBDIRSUFFIX not required - builds to lib$LIBDIRSUFFIX .. # LIBDIRSUFFIX not required - builds to lib$LIBDIRSUFFIX ..
cmake ${G_NINJA:-} ../ -DBUILD_SHARED_LIBS=ON cmake ${G_NINJA:-} ../ -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_FLAGS="$SLKCFLAGS"
PKG=$TMP_BUILD/package-double-conversion PKG=$TMP_BUILD/package-double-conversion
make_fn make_fn
@ -102,15 +106,14 @@ echo -e "\n ############ \n\n\033[39;1m gdl and/or double-conversion are not ins
} }
} }
# ### gdl and double-conversion - end # ### gdl and double-conversion - end
}
getsource_fn
untar_fn untar_fn
## install to .../lib64 on 64-bit system ## install to .../lib64 on 64-bit system
## add -DLIB_SUFFIX=$LIBDIRSUFFIX to cmake ## add -DLIB_SUFFIX=$LIBDIRSUFFIX to cmake
[[ -d /lib64 ]] && \ [[ -d /lib64 ]] && {
{ ## set RPATH ## set RPATH
sed -i 's|ORIGIN/../lib/inkscape|ORIGIN/../lib${LIB_SUFFIX}/inkscape|' CMakeLists.txt sed -i 's|ORIGIN/../lib/inkscape|ORIGIN/../lib${LIB_SUFFIX}/inkscape|' CMakeLists.txt
## set output directory ## set output directory
sed -i 's|/lib |/lib${LIB_SUFFIX} |' CMakeLists.txt sed -i 's|/lib |/lib${LIB_SUFFIX} |' CMakeLists.txt
@ -179,7 +182,7 @@ rm share/templates/*.*.*
mv $TEMP_DIR/* share/templates/ mv $TEMP_DIR/* share/templates/
} || true } || true
[[ $VERSION == 1.0.2 ]] && { [[ $VERSION == 1.1 ]] && {
## only package man pages for required locales ## only package man pages for required locales
for file in man/ink*.*.pod.in for file in man/ink*.*.pod.in
do do
@ -197,9 +200,9 @@ cd_builddir_fn
## default options have been pulled from CMakeLists.txt ## default options have been pulled from CMakeLists.txt
## These next two determine the RPATH for the inkscape library relative to the binary: ## These next two determine the RPATH for the inkscape library relative to the binary:
## INKSCAPE_INSTALL_LIBDIR is an addition for v1.0.2 and is relative to CMAKE_INSTALL_PREFIX/ ## INKSCAPE_INSTALL_LIBDIR is an addition for v1.1 and is relative to CMAKE_INSTALL_PREFIX/
## LIB_SUFFIX is used for v0.92.4 ## LIB_SUFFIX is used for v0.92.4
# ### TODO docs and man to /usr/local .. #
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
@ -239,6 +242,7 @@ cmake ${G_NINJA:-} \
make_fn make_fn
INSTALL_TDE="/usr/local"
installdocs_fn installdocs_fn
[[ $VERSION == 0.92.4 ]] && { [[ $VERSION == 0.92.4 ]] && {
@ -255,7 +259,7 @@ mv $TEMP_DIR/* $PKG/usr/man/man1/
rm -rf $TEMP_DIR rm -rf $TEMP_DIR
} || true } || true
## man pages are gzipped by WITH_MANPAGE_COMPRESSION="ON" for 1.0.2 ## man pages are gzipped by WITH_MANPAGE_COMPRESSION="ON" for 1.1
INSTALL_TDE=/usr INSTALL_TDE=/usr
mangzip_fn mangzip_fn
} }

@ -46,11 +46,11 @@ chown_fn
#cd_builddir_fn - don't use #cd_builddir_fn - don't use
CC=$COMPILER \ CC="$COMPILER" \
python setup.py install --with-unicode-strings --root=$PKG || exit 1 python setup.py install --with-unicode-strings --root=$PKG || exit 1
if $(python3 -c 'import os' 2>/dev/null); then if $(python3 -c 'import os' 2>/dev/null); then
CC=$COMPILER \ CC="$COMPILER" \
python3 setup.py build --with-unicode-strings || exit 1 python3 setup.py build --with-unicode-strings || exit 1
python3 setup.py install --skip-build --root=$PKG || exit 1 python3 setup.py install --skip-build --root=$PKG || exit 1
fi fi

@ -42,8 +42,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
CXXFLAGS="$SLKCFLAGS" \
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \

@ -43,20 +43,18 @@ chown_fn
cd_builddir_fn cd_builddir_fn
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=/usr/local \ --prefix=/usr/local \
--libdir=/usr/lib$LIBDIRSUFFIX \ --libdir=/usr/local/lib$LIBDIRSUFFIX \
--with-libpotrace \ --with-libpotrace \
--mandir=/usr/man --mandir=/usr/local/man
make_fn make_fn
installdocs_fn installdocs_fn
INSTALL_TDE=/usr INSTALL_TDE=/usr/local
mangzip_fn mangzip_fn
strip_fn strip_fn

@ -58,8 +58,8 @@ chown_fn
cd build cd build
cmake ${G_NINJA:-} \ cmake ${G_NINJA:-} \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_C_COMPILER=$COMPILER \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_INSTALL_PREFIX=/usr/local \
-DMAN_INSTALL_DIR=/usr/man \ -DMAN_INSTALL_DIR=/usr/man \

@ -44,9 +44,7 @@ chown_fn
#cd_builddir_fn - don't use #cd_builddir_fn - don't use
CFLAGS="$SLKCFLAGS" \ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \
CXX=$COMPILER_CXX \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \ --libdir=/usr/lib$LIBDIRSUFFIX \
@ -56,6 +54,7 @@ CXX=$COMPILER_CXX \
--docdir=/usr/doc/$PRGNAM-$VERSION \ --docdir=/usr/doc/$PRGNAM-$VERSION \
--disable-static --disable-static
NUMJOBS=-j1
make_fn make_fn
installdocs_fn installdocs_fn

@ -6,7 +6,7 @@
.. for Slackware 14.2 or current on i586+ and x86_64. .. for Slackware 14.2 or current on i586+ and x86_64.
.. see 'Cross compiling for RPi3' for building for armv7/aarch64. .. see 'Cross compiling for RPi3' for building for armv7/aarch64.
Build the release version 14.0.10 from tar archives; or the development versions 14.0.x, 14.1.0 from trinitydesktop cgit. Build the release version 14.0.11 from tar archives; or the development versions 14.0.x, 14.1.0 from trinitydesktop gitea.
For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input. For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input.
[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png) [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png)
@ -18,7 +18,7 @@ Only building the packages is a global option. It therefore can't be used where
Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen. Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen.
Information about dependencies for some packages has been added at the bottom of the dialog screen. Information about dependencies for some packages has been added at the bottom of the dialog screen.
14.0.10 source archives will be downloaded from a geoIP located mirror site, or the development sources [14.0.x/14.1.0] cloned or updated from cgit. 14.0.11 source archives will be downloaded from a geoIP located mirror site, or the development sources [14.0.x/14.1.0] cloned or updated from gitea.
Downloading can be done pre-build [useful for an off-line build], or during the build. Downloading can be done pre-build [useful for an off-line build], or during the build.
If you're curious about what this might involve, [take a look at a sample build set up](https://ray-v.github.io/A_typical_TDE_SlackBuild.html). If you're curious about what this might involve, [take a look at a sample build set up](https://ray-v.github.io/A_typical_TDE_SlackBuild.html).
@ -36,7 +36,7 @@ If you're curious about what this might involve, [take a look at a sample build
Deps [dependencies/] Deps [dependencies/]
Core [core/] Core [core/]
Libs [libraries/] Libs [libraries/]
Apps [applications/] Apps [applications/*/]
``` ```
Other directories are: Other directories are:
``` ```
@ -121,7 +121,7 @@ Includes:
[3] The Misc directory contains SlackBuilds for software that might already be installed from other sources. Please check because any misc builds selected here could overwrite them. [3] The Misc directory contains SlackBuilds for software that might already be installed from other sources. Please check because any misc builds selected here could overwrite them.
[4] The README for a native build for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is a better option. [4] The README for a native build for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now out-of-date and cross compiling is a better option.
[5] Building the kalzium equation solver needs ocaml and facile installed. They will be built, packaged, and installed during the tdeedu build if the source archives are pre-downloaded to the 'src' directory. [5] Building the kalzium equation solver needs ocaml and facile installed. They will be built, packaged, and installed during the tdeedu build if the source archives are pre-downloaded to the 'src' directory.
https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz

@ -0,0 +1,52 @@
This file is a work-around for applications [Apps] download URLs, for 14.0.11+, for BUILD-TDE.sh to identify which applications sub-directory a program source archive is in.
development-Apps/kdbg
development-Apps/kscope
development-Apps/piklab
games-Apps/knights
graphics-Apps/digikam
graphics-Apps/gwenview
graphics-Apps/gwenview-i18n
graphics-Apps/ksquirrel
graphics-Apps/potracegui
internet-Apps/knmap
internet-Apps/ktorrent
internet-Apps/kvpnc
multimedia-Apps/amarok
multimedia-Apps/codeine
multimedia-Apps/k3b
multimedia-Apps/k3b-i18n
multimedia-Apps/k9copy
multimedia-Apps/kaffeine
multimedia-Apps/kplayer
multimedia-Apps/rosegarden
multimedia-Apps/soundkonverter
office-Apps/kbookreader
office-Apps/kile
office-Apps/koffice
office-Apps/koffice-i18n
settings-Apps/kkbswitch
settings-Apps/tdesudo
system-Apps/dolphin
system-Apps/kbfx
system-Apps/kdbusnotification
system-Apps/klamav
system-Apps/knemo
system-Apps/knetstats
system-Apps/krusader
system-Apps/kshutdown
system-Apps/kvkbd
system-Apps/tdepowersave
system-Apps/yakuake
tdeio-Apps/tdeio-locate
themes-Apps/gtk-qt-engine
themes-Apps/gtk3-tqt-engine
themes-Apps/tde-style-lipstik
themes-Apps/tde-style-qtcurve
themes-Apps/tdmtheme
themes-Apps/twin-style-crystal
themes-Apps/twin-style-suse2
utilities-Apps/abakus
utilities-Apps/filelight
utilities-Apps/kompose
utilities-Apps/ksensors

@ -62,26 +62,28 @@ mkdir -p $TMP_BUILD/tmp-$PRGNAM
mkdir -p $PKG mkdir -p $PKG
rm -rf $PKG/* rm -rf $PKG/*
rm -rf $TMP_BUILD/tmp-$PRGNAM/* rm -rf $TMP_BUILD/tmp-$PRGNAM/*
rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log rm -rf $OUTPUT/*-$PRGNAM.log
} }
# Where do we look for sources? # Where do we look for sources?
SRCDIR=$(cd $(dirname $0); pwd) SRCDIR=$BUILD_TDE_ROOT/src
## SlackBuild source directory for local patches
SB_SRCDIR=$(cd $(dirname $0); pwd)
## for 14.0.11 onwards, check for cmake archive ..
[[ $TDEVERSION == 14.0.11 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
echo -e "\nDownloading to $SRCDIR"
wget -T 20 -O $SRCDIR/cmake-$TDEVERSION.tar.xz $TDE_MIRROR/releases/R$TDEVERSION/main/common/cmake-trinity-$TDEVERSION.tar.xz
echo -e "----\n"
)
## if 14.0.10 or misc, download archive: ## if 14.0.11 or misc, download archive:
[[ $TDEVERSION == 14.0.10 || $TDEMIR_SUBDIR == misc ]] && { [[ $TDEVERSION == 14.0.11 || $TDEMIR_SUBDIR == misc ]] && {
## check for and remove any zero byte archive files ## check for and remove any zero byte archive files
[[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \ [[ ! -s $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true rm $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
## R14.0.6+ archive names include -trinity.
## To maintain compatibility with the previous naming convention,
## sym-link any pre-downloaded R14.0.6+ archives
[[ $TDEVERSION == 14.0.10 ]] && [[ -s $SRCDIR/../../src/$PRGNAM-trinity-$VERSION.tar.xz ]] && \
(cd $SRCDIR/../../src/
ln -sf $PRGNAM-trinity-$VERSION.tar.xz $PRGNAM-$VERSION.tar.xz)
ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} $SRCDIR
SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"}
# SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.xz URL # SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.xz URL
SRCURL=${SRCURL:-"$TDE_MIRROR/releases/R$VERSION/main$TDEMIR_SUBDIR/$PRGNAM-trinity-$VERSION.tar.xz"} SRCURL=${SRCURL:-"$TDE_MIRROR/releases/R$VERSION/main$TDEMIR_SUBDIR/$PRGNAM-trinity-$VERSION.tar.xz"}
# Source file availability: # Source file availability:
@ -95,14 +97,14 @@ if ! [ -f $SOURCE ]; then
echo -e "\nDownloading to $(dirname $SOURCE)" echo -e "\nDownloading to $(dirname $SOURCE)"
wget -T 20 -O "$SOURCE" "$SRCURL" wget -T 20 -O "$SOURCE" "$SRCURL"
if [ $? -ne 0 -o ! -s "$SOURCE" ]; then if [ $? -ne 0 -o ! -s "$SOURCE" ]; then
echo "Downloading '$(basename $SOURCE)' failed... aborting the build." echo "Downloading '$(basename $SOURCE)' failed... cancelling the build."
mv -f "$SOURCE" "$SOURCE".FAIL rm -f "$SOURCE"
## set this for BUILD-TDE.sh to stop on failure ## set this for BUILD-TDE.sh to stop on failure
[[ $EXIT_FAIL == "exit 1" ]] && touch $TMPVARS/download-failure [[ $EXIT_FAIL == "exit 1" ]] && touch $TMPVARS/download-failure
${EXIT_FAIL:-":"} ${EXIT_FAIL:-":"}
fi fi
else else
echo "File '$(basename $SOURCE)' not available... aborting the build." echo "File '$(basename $SOURCE)' not available... cancelling the build."
${EXIT_FAIL:-":"} ${EXIT_FAIL:-":"}
fi fi
fi fi
@ -112,7 +114,7 @@ if [ "$P1" == "--download" ]; then
exit 0 exit 0
fi fi
} || { } || {
## otherwise, not R14.0.10 or misc, and we are creating/updating git, ## otherwise, not R14.0.11 or misc, and we are creating/updating git,
## so [1] start with admin/cmake: ## so [1] start with admin/cmake:
[[ $(cat $TMPVARS/DL_CGIT) == yes ]] && { [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && {
cd $BUILD_TDE_ROOT/src/cgit cd $BUILD_TDE_ROOT/src/cgit
@ -244,17 +246,21 @@ cd $TMP_BUILD/tmp-$PRGNAM
## ##
## [1] firstly test for R14 or misc .. ## [1] firstly test for R14 or misc ..
## ##
[[ $TDEVERSION == 14.0.10 || $TDEMIR_SUBDIR == misc ]] && { [[ $TDEVERSION == 14.0.11 || $TDEMIR_SUBDIR == misc ]] && {
## unpack R14 or misc ## unpack R14 or misc
echo -e "\n unpacking $(basename $SOURCE) ... \n" echo -e "\n unpacking $(basename $SOURCE) ... \n"
tar -xf $SOURCE tar -xf $SOURCE
[[ $TDEMIR_SUBDIR != misc ]] && (
cd $PRGNAM*
tar -xf $SRCDIR/cmake-$TDEVERSION.tar.xz
mv cmake-trinity-$TDEVERSION cmake
)
: # if this fails, don't try a git build, and go to [3] : # if this fails, don't try a git build, and go to [3]
} || { } || {
## [2] not 14.0.10 nor misc, so must be git .. ## [2] not 14.0.11 nor misc, so must be git ..
## but is it [2a] 14.0.x .. ## but is it [2a] 14.0.x ..
[[ $TDEVERSION == 14.0.x ]] && { [[ $TDEVERSION == 14.0.x ]] && {
@ -320,7 +326,7 @@ cd $PRGNAM*
listdocs_fn () listdocs_fn ()
{ {
DOCDIR=$PWD # this is set for installdocs_fn DOCDIR=$PWD # this is set for installdocs_fn
DOCS=$(for file in AUTHORS* rfc4791.pdf ChangeLog* COPYING* CreatingThemes FAQ* HOWTO INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README{$,^[\.*\.txt],/}* ${RM_LIST:-} ${KEYS_LIST:-} TODO* *.lsm ^[README]*.txt PKG-INFO doc/licenses/* doc/FAQ.txt REMARKS ; do [[ -s $file ]] && ls -1 $file;done ) || true DOCS=$(for file in AUTHORS* rfc4791.pdf ChangeLog* COPYING* CreatingThemes FAQ* HOWTO INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README{$,.md,^[\.*\.txt],/}* ^[README]*.txt ${RM_LIST:-} ${KEYS_LIST:-} TODO* *.lsm PKG-INFO doc/licenses/* doc/FAQ.txt REMARKS ; do [[ -s $file ]] && ls -1 $file;done ) || true
} }
chown_fn () chown_fn ()
@ -363,11 +369,9 @@ DESTDIR=$PKG ${MAKE_PRG:-make} install || exit 1
installdocs_fn () installdocs_fn ()
{ {
[[ $TDEMIR_SUBDIR == misc || $PRGNAM == libart-lgpl ]] && INSTALL_TDE=/usr [[ $INSTALL_TDE != "/usr/local" ]] && [[ $TDEMIR_SUBDIR == misc || $PRGNAM == libart-lgpl ]] && INSTALL_TDE=/usr
mkdir -p $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION mkdir -p $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION
(cd ${DOCDIR:-};cp -a --parents ${DOCS:-} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION) || true # DOCDIR might not exist (cd ${DOCDIR:-};cp -a --parents ${DOCS:-} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION) || true # DOCDIR might not exist
## leave this commented out in case anybody wants to reinstate it
#cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION
find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \;
} }

Loading…
Cancel
Save