Updates for R14.0.13

master
Ray-V 2 years ago
parent 7c0d24fef7
commit 2fd2be5f2e

@ -42,11 +42,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man page for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -55,7 +50,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
@ -65,7 +60,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -60,14 +60,14 @@ cd_builddir_fn
pkg-config mp4v2 && MP4V2="ON" pkg-config mp4v2 && MP4V2="ON"
## Build xine-engine? ## Build xine-engine?
[[ -s /usr/include/xine.h ]] && XINE="ON" pkg-config libxine && XINE="ON"
## Build yauap-engine_plugin? ## Build yauap-engine_plugin?
# Yauap does NOT handle the mp3 format. # Yauap does NOT handle the mp3 format.
[[ -s $(which yauap) ]] && YAUAP="ON" [[ -s $(which yauap) ]] && YAUAP="ON"
## Build aKode-engine? ## Build aKode-engine?
[[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE="ON" pkg-config akode && AKODE="ON"
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \

@ -33,21 +33,11 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && {
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/gtkqtengine.po";done
sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
[[ $langs ]] && langs=" $(echo $langs|sed "s|/gtkqtengine.po||g")"
## There is no BUILD_TRANSLATIONS option for this build
## [[ $langs != "" ]] && TRANS=ON
} || {
## for slack-desc ## for slack-desc
langs="" langs=""
for Lang in $I18N for Lang in $I18N
do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang"
done done
}
listdocs_fn listdocs_fn
@ -55,12 +45,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add [empty]docs & translations for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
BUILDDOC=-DBUILD_DOC="ON"
TRANS=-DBUILD_TRANSLATIONS="ON"
}
## BONOBO will be included in the build if installed ## BONOBO will be included in the build if installed
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -71,8 +55,9 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${BUILDDOC:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
${TRANS:-} \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..

@ -33,34 +33,12 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && {
## install theme engine to lib$LIBDIRSUFFIX
sed -i 's|/lib/|/lib$(LIBDIRSUFFIX)/|' tdegtk/Makefile.am
## remove redundant KDE_INCLUDES which is null if installing to /usr and causes a '/tde not found' error
sed -i 's| $(KDE_INCLUDES)/tde||' {tdegtk,tests}/Makefile.am
}
listdocs_fn listdocs_fn
[[ $TDEVERSION == 14.0.12 ]] && ltoolupdate_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION == 14.0.12 ]] && {
CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=$INSTALL_TDE \
--disable-rpath \
--enable-closure
} || {
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -74,8 +52,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-Wno-dev \ -Wno-dev \
.. ..
}
make_fn make_fn
installdocs_fn installdocs_fn

@ -65,7 +65,7 @@ langs="$langs $Lang/messages/gwenview.po"
## ... and restore help documentation for the selected and available locales ## ... and restore help documentation for the selected and available locales
[[ -e $Lang/CMakeLists.txt ]] && { [[ -e $Lang/CMakeLists.txt ]] && {
echo 'tde_conditional_add_subdirectory( BUILD_DOC doc )' > $Lang/CMakeLists.txt echo 'tde_conditional_add_subdirectory( BUILD_DOC doc )' > $Lang/CMakeLists.txt
ldocs="$ldocs $Lang" ldocs="${ldocs:+"${ldocs} "}$Lang"
} }
} }
done done

@ -38,27 +38,9 @@ getsource_fn
untar_fn untar_fn
## remove help documentation build instruction from all locales ... ## for slack-desc
sed -i '/BUILD_DOC/d' */CMakeLists.txt langs="";for Lang in $I18N;do [[ -d $Lang/messages ]] && langs="${langs:+"${langs} "}$Lang";done
# ldocs="";for Lang in $I18N;do [[ -d $Lang/doc ]] && ldocs="${ldocs:+"${ldocs} "}$Lang";done
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
langs="" # the *.po file list
locas="" # the locale codes
ldocs="" # the help docs
for Lang in $I18N
do
[[ -d $Lang ]] && {
langs="$langs $Lang/messages/k3b.po $Lang/messages/k3bsetup.po $Lang/messages/libk3b.po $Lang/messages/libk3bdevice.po"
locas="$locas $Lang"
## ... and restore help documentation for the selected and available locales
[[ -e $Lang/CMakeLists.txt ]] && {
echo 'tde_conditional_add_subdirectory( BUILD_DOC doc )' > $Lang/CMakeLists.txt
ldocs="$ldocs $Lang"
}
}
done
sed -i "s|\${po_files}|$langs|" CMakeLists.txt
listdocs_fn listdocs_fn
@ -96,7 +78,7 @@ echo "
$PRGNAM: tdek3b-i18n (internationalization files for the CD Creator). $PRGNAM: tdek3b-i18n (internationalization files for the CD Creator).
$PRGNAM: $PRGNAM:
$PRGNAM: For languages: $PRGNAM: For languages:
$PRGNAM: $locas $PRGNAM: $langs
$PRGNAM: $PRGNAM:
$PRGNAM: With help documentation for: $PRGNAM: With help documentation for:
$PRGNAM: $ldocs $PRGNAM: $ldocs

@ -167,193 +167,15 @@ MUSICBRAINZ="ON"
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && {
## Re: commit 1f4a3ab - Make s_codecFeatures a "const char *" to remove ISO C++ warning
patch -p0 << EOF
--- libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
+++ libk3b/jobs/k3bvideodvdtitletranscodingjob.cpp
@@ -564,1 +564,1 @@
- static char* s_codecFeatures[] = { "xvid", "ffmpeg" };
+ static const char* s_codecFeatures[] = { "xvid", "ffmpeg" };
@@ -575,1 +575,1 @@
- static char* s_codecFeatures[] = { "lame", "ac3", "ac3" };
+ static const char* s_codecFeatures[] = { "lame", "ac3", "ac3" };
EOF
## all versons ffmpeg support, ported from upstream commits
patch -p0 << EOF
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -36,4 +36,2 @@
-#define FFMPEG_CODEC(s) (s->codec)
-
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 101, 0)
@@ -105,3 +103,7 @@
+ ::AVCodecContext *audio_stream_ctx;
::AVSampleFormat sampleFormat;
::AVFrame *frame;
- ::AVPacket packet;
+ ::AVPacket *packet;
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 12, 100)
+ ::AVPacket _packet;
+#endif
@@ -120,2 +122,4 @@
+ d->audio_stream_ctx = NULL;
d->frame = av_frame_alloc();
d->outputBufferPos = NULL;
+ d->packet = NULL;
@@ -161,16 +165,37 @@
- ::AVCodecContext *codecContext = FFMPEG_CODEC(d->audio_stream);
- if (codecContext->codec_type != AVMEDIA_TYPE_AUDIO) {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ if (d->audio_stream->codecpar->codec_type != AVMEDIA_TYPE_AUDIO)
+#else
+ d->audio_stream_ctx = d->audio_stream->codec;
+ if (d->audio_stream_ctx->codec_type != AVMEDIA_TYPE_AUDIO)
+#endif
+ {
kdDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
return false;
}
// get the codec
- d->codec = ::avcodec_find_decoder(codecContext->codec_id);
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ d->codec = (AVCodec *)::avcodec_find_decoder(d->audio_stream->codecpar->codec_id);
+#else
+ d->codec = (AVCodec *)::avcodec_find_decoder(d->audio_stream_ctx->codec_id);
+#endif
if (!d->codec) {
kdDebug() << "(K3bFFMpegFile) no codec found for " << m_filename;
return false;
}
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ // allocate a codec context
+ d->audio_stream_ctx = avcodec_alloc_context3(d->codec);
+ if (d->audio_stream_ctx) {
+ avcodec_parameters_to_context(d->audio_stream_ctx, d->audio_stream->codecpar);
+ }
+ else {
+ kdDebug() << "(K3bFFMpegFile) failed to allocate a codec context for "
+ << m_filename;
+ }
+#endif
+
// open the codec on our context
- kdDebug() << "(K3bFFMpegFile) found codec for " << m_filename;
- if (::avcodec_open2(codecContext, d->codec, NULL) < 0) {
+ kdDebug() << "(K3bFFMpegFile) found codec for " << m_filename << endl;
+ if (::avcodec_open2(d->audio_stream_ctx, d->codec, NULL) < 0) {
@@ -210,2 +235,6 @@
- ::avcodec_close(FFMPEG_CODEC(d->audio_stream));
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ ::avcodec_free_context(&d->audio_stream_ctx);
+#else
+ ::avcodec_close(d->audio_stream_ctx);
d->codec = NULL;
+#endif
@@ -304,7 +333,12 @@
- ::av_init_packet(&d->packet);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100)
+ d->packet = ::av_packet_alloc();
+#else
+ ::av_init_packet(&d->_packet);
+ d->packet = &d->_packet;
+#endif
- if (::av_read_frame(d->formatContext, &d->packet) < 0) {
+ if (::av_read_frame(d->formatContext, d->packet) < 0) {
return 0;
}
- d->packetSize = d->packet.size;
- d->packetData = d->packet.data;
+ d->packetSize = d->packet->size;
+ d->packetData = d->packet->data;
@@ -327,10 +361,37 @@
- int len = ::avcodec_decode_audio4(FFMPEG_CODEC(d->audio_stream), d->frame,
- &gotFrame, &d->packet);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 106, 100)
+ int len = avcodec_receive_frame(d->audio_stream_ctx, d->frame);
+ if (len == 0) {
+ gotFrame = 1;
+ }
+ else if (len == AVERROR(EAGAIN)) {
+ len = 0;
+ }
+
+ if (len == 0) {
+ len = avcodec_send_packet(d->audio_stream_ctx, d->packet);
+ if (len == AVERROR(EAGAIN)) {
+ len = 0;
+ }
+ }
+#else
+ int len = ::avcodec_decode_audio4(d->audio_stream_ctx, d->frame,
+ &gotFrame, d->packet);
+#endif
- if (d->packetSize <= 0 || len < 0)
- ::av_packet_unref(&d->packet);
+ if (d->packetSize <= 0 || len < 0) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100)
+ ::av_packet_free(&d->packet);
+#else
+ ::av_packet_unref(d->packet);
+ d->packet = NULL;
+#endif
+ }
if (len < 0) {
kdDebug() << "(K3bFFMpegFile) decoding failed for " << m_filename;
return -1;
}
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100)
+ len = d->packet->size;
+#endif
+
@@ -389,1 +450,5 @@
-K3bFFMpegWrapper::K3bFFMpegWrapper() { ::av_register_all(); }
+K3bFFMpegWrapper::K3bFFMpegWrapper() {
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100)
+ ::av_register_all();
+#endif
+}
EOF
}
[[ $TDEVERSION == 14.0.12 ]] && {
## using cmake common rules
find doc -name CMakeLists.txt | xargs rm
sed -i '/tde_conditional_add_subdirectory( BUILD_DOC doc )/d' CMakeLists.txt
sed -i 's|k3bsetup )|&\
\
\
##### other data\
\
tde_conditional_add_project_docs( BUILD_DOC )|' CMakeLists.txt
mv doc/tdeioslave doc/en
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
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
## Add man page for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -363,7 +185,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_LIBDVDREAD="ON" \ -DWITH_LIBDVDREAD="ON" \
-DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \ -DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \
-DWITH_SYSTEM_LIBSAMPLERATE="ON" \ -DWITH_SYSTEM_LIBSAMPLERATE="ON" \
@ -389,7 +211,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -36,599 +36,11 @@ untar_fn
## clang build - C++11 requires a space between literal and identifier ## clang build - C++11 requires a space between literal and identifier
sed -i 's|%%"REG_b|%%" REG_b|;s|%%"REG_S|%%" REG_S|' k9vamps/cputest.cpp sed -i 's|%%"REG_b|%%" REG_b|;s|%%"REG_S|%%" REG_S|' k9vamps/cputest.cpp
[[ $TDEVERSION == 14.0.12 ]] && {
## all versons ffmpeg support, ported from upstream commits
patch -p0 << EOF
--- config.h.in
+++ config.h.in
@@ -29,0 +30,3 @@
+/* define if the compiler supports basic C++11 syntax */
+#undef HAVE_CXX11
+
@@ -51,3 +53,0 @@
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
@@ -74,0 +75,3 @@
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
@@ -96,3 +98,0 @@
-/* swscale support */
-#undef HAVE_SWSCALE
-
@@ -120,2 +120 @@
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
@@ -124,6 +122,0 @@
-/* no */
-#undef NEEDS_AV_FREE_PACKET
-
-/* new ffmpeg */
-#undef NEW_FFMPEG
-
@@ -133,6 +125,0 @@
-/* No swscale support */
-#undef NO_SWSCALE
-
-/* old ffmpeg */
-#undef OLD_FFMPEG
-
@@ -178 +165,3 @@
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
@@ -298,4 +286,0 @@
-
-/* type to use in place of socklen_t if not defined (deprecated, use
- kde_socklen_t) */
-#undef ksize_t
--- configure.in.in
+++ configure.in.in
@@ -46,0 +47,2 @@
+PKG_CHECK_MODULES(FFMPEG, libavcodec libavformat libavutil libswscale, , \\
+ [AC_MSG_ERROR([ffmpeg installation is missing or incomplete])])
@@ -48,32 +49,0 @@
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-cxx_flags_safe="\$CXXFLAGS"
-CXXFLAGS="\$CXXFLAGS -D__STDC_CONSTANT_MACROS -I\$qt_includes"
-AC_CHECK_HEADER([ffmpeg/avcodec.h], \\
-[AC_DEFINE(OLD_FFMPEG,1, [old ffmpeg])], \\
- [AC_CHECK_HEADER([libavcodec/avcodec.h], \\
- [AC_DEFINE(NEW_FFMPEG,1, [new ffmpeg])], \\
- [AC_MSG_ERROR([libavcodec may be missing]) ])])
-CXXFLAGS="\$cxx_flags_safe"
-AC_LANG_RESTORE
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-cxx_flags_safe="\$CXXFLAGS"
-cflags_safe="\$CFLAGS"
-CXXFLAGS="\$CXXFLAGS -D__STDC_CONSTANT_MACROS -I\$qt_includes"
-CFLAGS="\$CFLAGS -D__STDC_CONSTANT_MACROS"
-AC_MSG_CHECKING([if libavformat/avformat.h provides av_free_packet])
-AC_TRY_LINK([#include <libavformat/avformat.h>
-],[AVPacket *packet; av_free_packet(packet);],
-AC_MSG_RESULT(yes),
-[AC_MSG_RESULT(no)
-AC_DEFINE(NEEDS_AV_FREE_PACKET,1,[no])])
-CXXFLAGS="\$cxx_flags_safe"
-CFLAGS="\$cflags_safe"
-AC_LANG_RESTORE
-
-have_swscale=no
-AC_CHECK_HEADER([libswscale/swscale.h], \\
-[AC_DEFINE(HAVE_SWSCALE, 1, [swscale support]) have_swscale=yes], \\
-[AC_DEFINE(NO_SWSCALE, 1, [No swscale support])])
--- k9author/Makefile.am
+++ k9author/Makefile.am
@@ -1 +1 @@
-AM_CPPFLAGS= -I\$(srcdir) -I\$(includedir) \$(all_includes)
+AM_CPPFLAGS= -I\$(srcdir) -I\$(includedir) \$(all_includes) \$(FFMPEG_CFLAGS)
@@ -8 +8 @@
-libk9author_la_LDFLAGS = \$(all_libraries)
+libk9author_la_LDFLAGS = \$(all_libraries) \$(FFMPEG_LIBS)
--- k9author/k9avidecode.cpp
+++ k9author/k9avidecode.cpp
@@ -15,9 +14,0 @@
-#ifdef OLD_FFMPEG
-#include <ffmpeg/avcodec.h>
-#endif
-#ifdef NEW_FFMPEG
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#endif
-
@@ -30 +21 @@
-#if !defined(NEW_FFMPEG) || LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,42,0)
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51,42,0)
@@ -40,17 +30,0 @@
-void *CodecHandle=0;
-void *FormatHandle=0;
-void *UtilHandle=0;
-void *SwscaleHandle=0;
-int glibref=0;
-
-#ifdef NEW_FFMPEG
-void av_free_packet_internal(AVPacket *pkt)
-{
- if (pkt) {
-# if LIBAVCODEC_VERSION_INT < (AV_VERSION_INT(56,0,0))
- if (pkt->destruct) pkt->destruct(pkt);
-# endif
- pkt->data = NULL; pkt->size = 0;
- }
-}
-#endif
@@ -58,2 +31,0 @@
-#ifdef HAVE_SWSCALE
-#include "libswscale/swscale.h"
@@ -61 +32,0 @@
-#endif
@@ -65,89 +36,2 @@
- if (glibref==0) {
- CodecHandle=dlopen("libavcodec.so",RTLD_LAZY | RTLD_GLOBAL);
- FormatHandle=dlopen("libavformat.so",RTLD_LAZY | RTLD_GLOBAL);
- UtilHandle=dlopen("libavutil.so",RTLD_LAZY | RTLD_GLOBAL);
-# ifdef HAVE_SWSCALE
- SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
- if (SwscaleHandle==0)
- SwscaleHandle=dlopen("libswscale.so.2",RTLD_LAZY);
-# endif
- }
- if (!CodecHandle) {
- m_error =i18n("Cannot open then library %1").arg("libavcodec");
- return;
- }
- if (!FormatHandle) {
- m_error =i18n("Cannot open then library %1").arg("libavformat");
- return;
- }
-# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
- if (!UtilHandle) {
- m_error =i18n("Cannot open then library %1").arg("libavutil");
- return;
- }
-# endif
-# ifdef HAVE_SWSCALE
- if (!SwscaleHandle) {
- m_error =i18n("Cannot open the library %1").arg("libswscale");
- }
-# endif
- m_error="";
- av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
- avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
-# else
- av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
-# endif
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
- avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
-# else
- av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
-# endif
- avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
-# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
- avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
-# else
- avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
-# endif
- avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
- avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
- av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
- avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
- av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
-# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
- avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
-# else
- avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
-# endif
-# ifndef HAVE_SWSCALE
- img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
- //if img_convert is null (deprecated in ffmpeg), we need libswscale
- if (!img_convert) {
- m_error = i18n("Cannot open the library %1").arg("libswscale");
- return;
- }
-# endif
- av_free = (av_free_t)dlsym(CodecHandle,"av_free");
- av_free_packet = (av_free_packet_t)dlsym(CodecHandle,"av_free_packet");
- if (av_free_packet==0)
- av_free_packet=av_free_packet_internal;
- avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
- avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
-# else
- av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
-# endif
- av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
- av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
- avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
-# ifdef HAVE_SWSCALE
- sws_freeContext= (sws_freeContext_t)dlsym(SwscaleHandle,"sws_freeContext");
- sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
- sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
-# endif
-
-# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
- av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
-# else
- av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
-# endif
+
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100)
@@ -154,0 +39 @@
+#endif
@@ -157,2 +41,0 @@
- glibref++;
-
@@ -171,14 +53,0 @@
- glibref--;
- if (glibref==0) {
- dlclose(FormatHandle);
- dlclose(CodecHandle);
- if(UtilHandle) {
- dlclose(UtilHandle);
- }
-# ifdef HAVE_SWSCALE
- if (SwscaleHandle) {
- dlclose(CodecHandle);
- }
-# endif
- }
-
@@ -197,7 +66,6 @@
- if (
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
- avformat_open_input(&m_FormatCtx, _fileName.utf8(), NULL, NULL)!=0
-# else
- av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0
-# endif
- ) {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
+ if (avformat_open_input(&m_FormatCtx, _fileName.utf8(), NULL, NULL)!=0)
+#else
+ if (av_open_input_file(&m_FormatCtx, _fileName.utf8(), NULL, 0, NULL)!=0)
+#endif
+ {
@@ -208,7 +76,6 @@
- if (
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
- avformat_find_stream_info(m_FormatCtx, NULL)<0
-# else
- av_find_stream_info(m_FormatCtx)<0
-# endif
- ) {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
+ if (avformat_find_stream_info(m_FormatCtx, NULL)<0)
+#else
+ if (av_find_stream_info(m_FormatCtx)<0)
+#endif
+ {
@@ -218 +85 @@
- int i;
+ unsigned int i;
@@ -223 +90,6 @@
- if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ if (m_FormatCtx->streams[i]->codecpar->codec_type==AVMEDIA_TYPE_VIDEO)
+#else
+ if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO)
+#endif
+ {
@@ -232,4 +103,0 @@
- // Get a pointer to the codec context for the video stream
- m_CodecCtx=m_FormatCtx->streams[m_videoStream]->codec;
-
-
@@ -237 +105,5 @@
- m_Codec=avcodec_find_decoder(m_CodecCtx->codec_id);
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ m_Codec=(AVCodec *)avcodec_find_decoder(m_FormatCtx->streams[m_videoStream]->codecpar->codec_id);
+#else
+ m_Codec=(AVCodec *)avcodec_find_decoder(m_FormatCtx->streams[m_videoStream]->codec->codec_id);
+#endif
@@ -241,0 +114,15 @@
+
+// Get/allocate a pointer to the codec context for the video stream
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ m_CodecCtx = avcodec_alloc_context3(m_Codec);
+ if (m_CodecCtx) {
+ avcodec_parameters_to_context(m_CodecCtx, m_FormatCtx->streams[m_videoStream]->codecpar);
+ }
+ else {
+ m_error=i18n("Failed to allocate a codec context");
+ return false;
+ }
+#else
+ m_CodecCtx=m_FormatCtx->streams[m_videoStream]->codec;
+#endif
+
@@ -243,7 +130,6 @@
- if (
-# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
- avcodec_open2(m_CodecCtx, m_Codec, NULL)<0
-# else
- avcodec_open(m_CodecCtx, m_Codec)<0
-# endif
- ) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
+ if (avcodec_open2(m_CodecCtx, m_Codec, NULL)<0)
+#else
+ if (avcodec_open(m_CodecCtx, m_Codec)<0)
+#endif
+ {
@@ -255,0 +142,3 @@
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101)
+ m_Frame=av_frame_alloc();
+#else
@@ -256,0 +146 @@
+#endif
@@ -258,0 +149,3 @@
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101)
+ m_FrameRGB=av_frame_alloc();
+#else
@@ -259,0 +153 @@
+#endif
@@ -267,0 +162,4 @@
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 24, 100)
+ numBytes=av_image_get_buffer_size(AV_PIX_FMT_RGB24, m_CodecCtx->width,
+ m_CodecCtx->height, 1);
+#else
@@ -269,0 +168 @@
+#endif
@@ -274,0 +174,4 @@
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 24, 100)
+ av_image_fill_arrays(m_FrameRGB->data, m_FrameRGB->linesize, m_buffer,
+ AV_PIX_FMT_RGB24, m_CodecCtx->width, m_CodecCtx->height, 1);
+#else
@@ -276,0 +180 @@
+#endif
@@ -299 +203,9 @@
- AVPacket packet;
+ AVPacket *packet;
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100)
+ packet = av_packet_alloc();
+#else
+ AVPacket _packet;
+ av_init_packet(&_packet);
+ packet = &_packet;
+#endif
@@ -301 +212,0 @@
-# ifdef HAVE_SWSCALE
@@ -303 +213,0 @@
-# endif
@@ -305 +215 @@
- while (av_read_frame(m_FormatCtx, &packet)>=0 && !bFound) {
+ while (av_read_frame(m_FormatCtx, packet)>=0 && !bFound) {
@@ -307 +217 @@
- if (packet.stream_index==m_videoStream) {
+ if (packet->stream_index==m_videoStream) {
@@ -309,3 +219,11 @@
-# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
- avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished, &packet);
-# else
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 106, 100)
+ int ret = avcodec_receive_frame(m_CodecCtx, m_Frame);
+ if (ret == 0)
+ frameFinished = 1;
+ else if (ret == AVERROR(EAGAIN))
+ ret = 0;
+ if (ret == 0)
+ ret = avcodec_send_packet(m_CodecCtx, packet);
+#elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
+ avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished, packet);
+#else
@@ -313,2 +231,2 @@
- packet.data, packet.size);
-# endif
+ packet->data, packet->size);
+#endif
@@ -318,8 +236,7 @@
-// if (m_Frame->pts >=fspos)
- int64_t cur_dts=fspos;
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 0)
- cur_dts= packet.dts;
-# else
- if (m_FormatCtx->cur_st)
- cur_dts= m_FormatCtx->cur_st->cur_dts;
-# endif
+ int64_t cur_dts=fspos;
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 0)
+ cur_dts = packet->dts;
+#else
+ if (m_FormatCtx->cur_st)
+ cur_dts = m_FormatCtx->cur_st->cur_dts;
+#endif
@@ -328,10 +244,0 @@
-# ifndef HAVE_SWSCALE
- // Convert the image from its native format to RGB
- img_convert((AVPicture *)m_FrameRGB, AV_PIX_FMT_RGB24,
- (AVPicture*)m_Frame, m_CodecCtx->pix_fmt,
- m_CodecCtx->width, m_CodecCtx->height);
-
- // convert frame to TQImage
- SaveFrame(m_FrameRGB, m_CodecCtx->width,
- m_CodecCtx->height);
-# else
@@ -339 +246 @@
- sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize);
+ sws_scale(toRGB_convert_ctx, m_Frame->data, m_Frame->linesize, 0, m_CodecCtx->height, m_FrameRGB->data,m_FrameRGB->linesize);
@@ -344 +250,0 @@
-# endif
@@ -349,2 +255,7 @@
- // Free the packet that was allocated by av_read_frame
- av_free_packet(&packet);
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 25, 100)
+ // Unreference the packet from av_read_frame
+ av_packet_unref(packet);
+#else
+ // Free the packet from av_read_frame
+ av_free_packet(packet);
+#endif
@@ -352,0 +264,3 @@
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100)
+ av_packet_free(&packet);
+#endif
@@ -383 +297 @@
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
@@ -385 +299 @@
-# else
+#else
@@ -387 +301,6 @@
-# endif
+#endif
+
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ avcodec_free_context(&m_CodecCtx);
+#endif
+
--- k9author/k9avidecode.h
+++ k9author/k9avidecode.h
@@ -17,4 +17,2 @@
-#ifdef OLD_FFMPEG
-#include <ffmpeg/avformat.h>
-#endif
-#ifdef NEW_FFMPEG
+
+extern "C" {
@@ -21,0 +20 @@
+#include <libavcodec/avcodec.h>
@@ -23,3 +22,3 @@
-#endif
-
-#ifdef HAVE_SWSCALE
+#include <libavutil/time.h>
+#include <libavutil/imgutils.h>
+#include <libavutil/mathematics.h>
@@ -27 +26 @@
-#endif
+};
@@ -36,54 +34,0 @@
-//typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
-typedef void (*av_register_all_t) (void);
-typedef int64_t (*av_gettime_t) (void);
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
-typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
-#else
-typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
-#endif
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
-typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
-#else
-typedef int (*av_find_stream_info_t)(AVFormatContext *);
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0)
-typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
-#else
-typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
-#endif
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
-typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
-#else
-typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
-#endif
-typedef AVFrame * (*avcodec_alloc_frame_t)(void);
-
-typedef int (*avpicture_get_size_t)(int , int , int );
-typedef void * (*av_malloc_t)(unsigned int );
-typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
-typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
-
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
-typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
-#else
-typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
-#endif
-typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
-typedef void (*av_free_t)(void *);
-typedef int (*avcodec_close_t)(AVCodecContext *);
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
-typedef void (*avformat_close_input_t)(AVFormatContext **);
-#else
-typedef void (*av_close_input_file_t)(AVFormatContext *);
-#endif
-typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational ) ;
-typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
-typedef void (*av_free_packet_t)(AVPacket *);
-
-#ifdef HAVE_SWSCALE
-typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
-typedef struct SwsContext* (*sws_getContext_t)(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat, int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
-typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,int srcSliceH, uint8_t* dst[], int dstStride[]);
-#endif
-
-
@@ -107 +52 @@
- TQString getError() const;
+ TQString getError() const;
@@ -110,47 +54,0 @@
- av_register_all_t av_register_all;
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
- avformat_open_input_t avformat_open_input;
-# else
- av_open_input_file_t av_open_input_file;
-# endif
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
- avformat_find_stream_info_t avformat_find_stream_info;
-# else
- av_find_stream_info_t av_find_stream_info;
-# endif
- avcodec_find_decoder_t avcodec_find_decoder;
-# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
- avcodec_open2_t avcodec_open2;
-# else
- avcodec_open_t avcodec_open;
-# endif
- avcodec_alloc_frame_t avcodec_alloc_frame;
- av_seek_frame_t av_seek_frame;
- avpicture_get_size_t avpicture_get_size;
- av_malloc_t av_malloc;
- avpicture_fill_t avpicture_fill;
- av_read_frame_t av_read_frame;
-# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
- avcodec_decode_video2_t avcodec_decode_video2;
-# else
- avcodec_decode_video_t avcodec_decode_video;
-# endif
- img_convert_t img_convert;
- av_free_t av_free;
- avcodec_close_t avcodec_close;
-# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
- avformat_close_input_t avformat_close_input;
-# else
- av_close_input_file_t av_close_input_file;
-# endif
- av_rescale_q_t av_rescale_q;
- av_gettime_t av_gettime;
- avcodec_flush_buffers_t avcodec_flush_buffers;
- av_free_packet_t av_free_packet;
-# ifdef HAVE_SWSCALE
- sws_freeContext_t sws_freeContext;
- sws_getContext_t sws_getContext;
- sws_scale_t sws_scale;
-# endif
-
-
--- src/Makefile.am
+++ src/Makefile.am
@@ -33 +33 @@
-k9copy_LDFLAGS = \$(all_libraries) \$(KDE_RPATH) \$(LIB_QT) -lDCOP \$(LIB_TDECORE) \$(LIB_TDEUI) -ltdefx \$(LIB_TDEIO) -ltdetexteditor \$(LIB_TDEPARTS)
+k9copy_LDFLAGS = \$(all_libraries) \$(KDE_RPATH) \$(LIB_QT) -lDCOP \$(LIB_TDECORE) \$(LIB_TDEUI) -ltdefx \$(LIB_TDEIO) -ltdetexteditor \$(LIB_TDEPARTS) \$(FFMPEG_LIBS)
EOF
}
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package
langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done langs="";for Lang in $I18N;do [[ -e po/$Lang.po ]] && langs="$langs $Lang.po";done
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 != "" ]] && langs=" $(echo $langs | sed 's|.po||g')"
listdocs_fn listdocs_fn
@ -646,6 +58,7 @@ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \
--disable-rpath \ --disable-rpath \
${EN_GCC_VIS:-} \ ${EN_GCC_VIS:-} \
--enable-closure \ --enable-closure \
@ -655,6 +68,8 @@ make_fn
installdocs_fn installdocs_fn
mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -33,64 +33,6 @@ getsource_fn
untar_fn untar_fn
## for clang, commit 2fa7734
patch -p0 -N << EOF || true
--- kdbg/dbgdriver.cpp
+++ kdbg/dbgdriver.cpp
@@ -133,2 +133 @@
- TRACE(TQString().sprintf("interrupted the command %d",
- (m_activeCmd ? m_activeCmd->m_cmd : -1)));
+ TRACE(TQString("interrupted the command %1").arg((m_activeCmd ? m_activeCmd->m_cmd : -1)));
--- kdbg/debugger.cpp
+++ kdbg/debugger.cpp
@@ -2178,2 +2178 @@
- TRACE(TQString().sprintf("Changing %s to ",
- wnd->name()) + text);
+ TRACE(TQString("Changing %1 to ").arg(wnd->name()) + text);
--- kdbg/gdbdriver.cpp
+++ kdbg/gdbdriver.cpp
@@ -905 +905 @@
- TRACE(TQString().sprintf("parse error: = not found after %s", name));
+ TRACE(TQString("parse error: = not found after %1").arg(name));
@@ -944 +944 @@
- TRACE(TQString().sprintf("parse error: mismatching %c%c at %-20.20s", opening, closing, s));
+ TRACE(TQString("parse error: mismatching %1%2 at %3").arg(opening).arg(closing).arg(s));
@@ -987 +987 @@
- TRACE(TQString().sprintf("parse error: mismatching <> at %-20.20s", s));
+ TRACE(TQString("parse error: mismatching <> at %1").arg(s));
@@ -1103 +1103 @@
- TRACE(TQString().sprintf("parse error: mismatching %c%c at %-20.20s", opening, closing, s));
+ TRACE(TQString("parse error: mismatching %1%2 at %3").arg(opening).arg(closing).arg(s));
@@ -1135 +1135 @@
- TRACE(TQString().sprintf("parse error: not a name %-20.20s", s));
+ TRACE(TQString("parse error: not a name %1").arg(s));
@@ -1148 +1148 @@
- TRACE(TQString().sprintf("parse error: not a name after static %-20.20s", s));
+ TRACE(TQString("parse error: not a name after static %1").arg(s));
@@ -1480 +1480 @@
- TRACE(TQString().sprintf("found <repeats %d times> in array", l));
+ TRACE(TQString("found <repeats %1 times> in array").arg(l));
--- kdbg/sourcewnd.cpp
+++ kdbg/sourcewnd.cpp
@@ -254 +254 @@
- TRACE(TQString().sprintf("checking for bp at %d", line));
+ TRACE(TQString("checking for bp at %1").arg(line));
@@ -278 +278 @@
- TRACE(TQString().sprintf("updating %s:%d", bp->fileName, bp->lineNo));
+ TRACE(TQString("updating %1:%2").arg(bp->fileName).arg(bp->lineNo));
@@ -373 +373 @@
- TRACE(TQString().sprintf("left-clicked line %d", line));
+ TRACE(TQString("left-clicked line %1").arg(line));
@@ -378 +378 @@
- TRACE(TQString().sprintf("mid-clicked row %d", line));
+ TRACE(TQString("mid-clicked row %1").arg(line));
--- kdbg/typetable.cpp
+++ kdbg/typetable.cpp
@@ -185 +185 @@
- TRACE(type + TQString().sprintf(": %d exprs", info->m_numExprs));
+ TRACE(type + TQString(": %1 exprs").arg(info->m_numExprs));
EOF
## 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

@ -34,7 +34,8 @@ getsource_fn
untar_fn untar_fn
## 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
langs="en"
listdocs_fn listdocs_fn
@ -42,6 +43,7 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## The BUILD_TRANSLATIONS option is set in CMakeLists.txt but there are none available yet
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -50,6 +52,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DBUILD_TRANSLATIONS="OFF" \
-Wno-dev \ -Wno-dev \
.. ..

@ -46,11 +46,7 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man page for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i '/If the TDE/,+2d' ../doc/man/kile.1 sed -i '/If the TDE/,+2d' ../doc/man/kile.1
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -60,7 +56,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="ON" \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
@ -70,7 +66,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -49,10 +49,9 @@ echo '
untar_fn 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 which has a limited number of 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 want to use it, uncomment the following line:
# then comment out the following line: #cp $SB_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

@ -63,19 +63,20 @@ sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' configure.in
find docs/koffice -type f -exec sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' {} \; || true find docs/koffice -type f -exec sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' {} \; || true
} }
ltoolupdate_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
CFLAGS="$SLKRCFLAGS" \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
CXXFLAGS="$SLKRCFLAGS" \ -DCMAKE_C_COMPILER=$COMPILER \
CC=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
CXX=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \
../configure \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
--prefix=$INSTALL_TDE \ -DBUILD_DOC="ON" \
--disable-rpath -DBUILD_DATA="ON" \
-DBUILD_MESSAGES="ON" \
-Wno-dev \
..
make_fn make_fn
@ -83,8 +84,6 @@ cd ../../
done done
langs=$(echo $langdir | sed 's|koffice-i18n-||g') langs=$(echo $langdir | sed 's|koffice-i18n-||g')
installdocs_fn
mkdir_install_fn mkdir_install_fn
echo " echo "

@ -10,5 +10,15 @@ in=<path-to>/original.png # existing
out=<path-to>/converted.png # will be created out=<path-to>/converted.png # will be created
profile=<TDE-installation-directory>/share/apps/{chalk,krita}/profiles/srgb_color_space_profile.icm profile=<TDE-installation-directory>/share/apps/{chalk,krita}/profiles/srgb_color_space_profile.icm
convert='gm convert' convert='gm convert'
($convert $in -profile $profile $out) ($convert $in -profile $profile $out)
-------------
kword/mailmerge requires kspread/libkspreadcommon so if kword is chosen to be built, the SlackBuild will add kspread to the build list if not already selected.
Or, to build kword without mailmerge and the kspread dependency, run:
mailmerge=n ./BUILD-TDE.sh

@ -33,45 +33,6 @@ getsource_fn
untar_fn untar_fn
## clang build
## ../chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp:243:40: error: non-constant-expression cannot be narrowed from type 'int' to 'TQ_UINT8' (aka 'unsigned char') in initializer list [-Wc++11-narrowing]
## commit 7994981
patch -p0 -N << EOF || true
--- chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
+++ chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
@@ -243,1 +243,1 @@
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
--- chalk/plugins/filters/colorsfilters/colorsfilters.cpp
+++ chalk/plugins/filters/colorsfilters/colorsfilters.cpp
@@ -212,1 +212,1 @@
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
@@ -306,1 +306,1 @@
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
--- chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
+++ chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
@@ -257,1 +257,1 @@
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
--- chalk/plugins/filters/levelfilter/kis_level_filter.cpp
+++ chalk/plugins/filters/levelfilter/kis_level_filter.cpp
@@ -198,1 +198,1 @@
- TQ_UINT8 weights[2] = {MAX_SELECTED - selectedness, selectedness};
+ TQ_UINT8 weights[2] = {(TQ_UINT8)(MAX_SELECTED - selectedness), selectedness};
--- filters/kspread/excel/sidewinder/cell.cpp
+++ filters/kspread/excel/sidewinder/cell.cpp
@@ -120,1 +120,1 @@
- char buf[3] = { 'A'+(d/26), 'A'+(d%26), 0};
+ char buf[3] = { (char)('A'+(d / 26)), (char)('A'+(d % 26)), 0};
--- filters/kword/rtf/import/rtfimport.cpp
+++ filters/kword/rtf/import/rtfimport.cpp
@@ -1270,1 +1270,1 @@
- char tmpch[2] = {token.value, '\0'};
+ char tmpch[2] = {(char)(token.value), '\0'};
EOF
## Workaround to prevent chalk/krita crashing when loading PNGs it has saved ## Workaround to prevent chalk/krita crashing when loading PNGs it has saved
## Awaiting fix for koffice issue 20 ## Awaiting fix for koffice issue 20
patch -p0 << EOF patch -p0 << EOF
@ -88,7 +49,7 @@ patch -p0 << EOF
EOF EOF
## fix chalk crashing - ## fix chalk crashing -
## - set liblcms as a direct dependency - see issue 37 for details ## - set liblcms as a direct dependency - see TI issue 37 for details
sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am
## - when launched from Applications menu ## - when launched from Applications menu
sed -i "s|Exec=.*$|Exec=$INSTALL_TDE/bin/chalk %U|" chalk/chalk.desktop sed -i "s|Exec=.*$|Exec=$INSTALL_TDE/bin/chalk %U|" chalk/chalk.desktop
@ -98,7 +59,7 @@ sed -i "s|Exec=.*$|Exec=$INSTALL_TDE/bin/chalk %U|" chalk/chalk.desktop
{ mv $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la-bak 2>/dev/null || true { mv $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la $TQTDIR/lib$LIBDIRSUFFIX/libtqt-mt.la-bak 2>/dev/null || true
} }
## fix build problem for karbon - see issue 40 for details ## fix build problem for karbon - see TI issue 40 for details
sed -i 's|(Magick-config|(Wand-config|' configure.in.in sed -i 's|(Magick-config|(Wand-config|' configure.in.in
## revert name 'chalk' to 'krita' - option set in BUILD-TDE.sh ## revert name 'chalk' to 'krita' - option set in BUILD-TDE.sh
@ -121,9 +82,14 @@ sed -i 's|KFORMULA$COMPILE_FILTER_KUGAR|&$COMPILE_FILTER_KRITA$COMPILE_FILTER_KI
[[ $(cat $TMPVARS/DO_NOT_COMPILE) == *kross* ]] && SCRIPTING=--disable-scripting [[ $(cat $TMPVARS/DO_NOT_COMPILE) == *kross* ]] && SCRIPTING=--disable-scripting
## Add man pages for development builds ## issue #31
[[ $TDEVERSION != 14.0.12 ]] && \ ## to remove mailmerge from the kword build:
MANDIR=--mandir=$INSTALL_TDE/man [[ ${mailmerge:-} == [nN0] ]] && \
sed -i 's|SUBDIRS = . mailmerge|SUBDIRS = .|' kword/Makefile.am
## if kword is selected and includes mailmerge, ensure kspread is built
[[ $(cat $TMPVARS/DO_NOT_COMPILE) != *kword* ]] && \
[[ $(grep SUBDIRS kword/Makefile.am) == *mailmerge* ]] && \
sed -i 's|kspread||' $TMPVARS/DO_NOT_COMPILE
listdocs_fn listdocs_fn
@ -140,7 +106,7 @@ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
${MANDIR:-} \ --mandir=$INSTALL_TDE/man \
--disable-rpath \ --disable-rpath \
${SCRIPTING:-} \ ${SCRIPTING:-} \
--enable-closure --enable-closure
@ -149,7 +115,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -62,21 +62,6 @@ patch -p0 -N << EOF || true
- static TQPixmap getIcon(vfile *vf); - static TQPixmap getIcon(vfile *vf);
' | while read line ' | while read line
EOF EOF
#
## ../../../../krusader/DiskUsage/radialMap/map.cpp:329:26: error: non-constant-expression cannot be narrowed from type 'uint' (aka 'unsigned int') to 'int' in initializer list [-Wc++11-narrowing]
## commit 57f84ff
patch -p0 -N << EOF || true
--- krusader/DiskUsage/radialMap/map.cpp
+++ krusader/DiskUsage/radialMap/map.cpp
@@ -329,1 +329,1 @@
- int a[3] = { (*it)->start(), (*it)->length(), 0 };
+ uint a[3] = { (*it)->start(), (*it)->length(), 0 };
--- krusader/UserAction/useraction.cpp
+++ krusader/UserAction/useraction.cpp
@@ -113,1 +113,1 @@
- i18n( "The actionfile's root-element isn't called "ACTION_ROOT", using %1").arg( filename ),
+ i18n( "The actionfile's root-element isn't called " ACTION_ROOT ", using %1").arg( filename ),
EOF
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package

@ -33,7 +33,7 @@ getsource_fn
untar_fn untar_fn
# add English help documentation # add English help documentation, overwriting placeholder
tar xf $SB_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

@ -34,31 +34,13 @@ getsource_fn
untar_fn untar_fn
## clang build
## ../plugins/infowidget/chunkbar.cpp:210:16: error: non-constant-expression cannot be narrowed from type 'bt::Uint32' (aka 'unsigned int') to 'int' in initializer list [-Wc++11-narrowing]
# commit 3ce1e1c
patch -p0 -N << EOF || true
--- plugins/infowidget/chunkbar.cpp
+++ plugins/infowidget/chunkbar.cpp
@@ -210,1 +210,1 @@
- Range r = {i,i,0};
+ Range r = {(int)i,(int)i,0};
@@ -222,1 +222,1 @@
- Range r = {i,i,0};
+ Range r = {(int)i,(int)i,0};
@@ -259,1 +259,1 @@
- Range r = {i,i,fac};
+ Range r = {(int)i,(int)i,fac};
@@ -271,1 +271,1 @@
- Range r = {i,i,fac};
+ Range r = {(int)i,(int)i,fac};
EOF
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package
langs="";for Lang in $I18N;do [[ -e translations/$Lang ]] && langs="$langs $Lang";done langs="";for Lang in $I18N;do [[ -e translations/$Lang ]] && langs="$langs $Lang";done
sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am
sed -i '/On Debian systems/,+2d' doc/man/ktorrent.1
listdocs_fn listdocs_fn
ltoolupdate_fn ltoolupdate_fn
@ -73,6 +55,7 @@ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
--mandir=$INSTALL_TDE/man \
--disable-rpath \ --disable-rpath \
--enable-torrent-mimetype \ --enable-torrent-mimetype \
--enable-closure --enable-closure
@ -81,6 +64,8 @@ make_fn
installdocs_fn installdocs_fn
mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -33,35 +33,9 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && { ## for slack-desc
## remove help documentation build instruction from all locales ... langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
sed -i '/tde_create_handbook/,+3d' doc/*/CMakeLists.txt || true
## ... and restore for 'en'
echo "tde_create_handbook( LANG en DESTINATION $PRGNAM )" >> doc/en/CMakeLists.txt
#
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
langs="" # the *.po file list
ldocs="" # the help docs
for Lang in $I18N
do
[[ -d po/$Lang ]] && {
langs="$langs $Lang/$PRGNAM.po"
## ... and restore help documentation for the selected and available locales
[[ -e doc/$Lang/CMakeLists.txt ]] && {
echo "tde_create_handbook( LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt
ldocs="$ldocs $Lang"
}
}
done
#
sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
[[ $langs != "" ]] && TRANS=ON && langs=" $(echo $langs|sed "s|/$PRGNAM.po||g")"
} || {
## for slack-desc and to set TRANS=ON until 14.0.12 build removed
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" && TRANS=ON;done
ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
}
## delete zero length files ## delete zero length files
find data/pixmaps/feta -type f -empty -delete find data/pixmaps/feta -type f -empty -delete
@ -78,12 +52,8 @@ pkg-config jack && JACK="ON"
# Check for DSSI aka "Dizzy" # Check for DSSI aka "Dizzy"
pkg-config dssi && DSSI="ON" pkg-config dssi && DSSI="ON"
## Add man page for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
## for cmake version 3.21.x? ## for cmake version 3.21.x?
sed -i 's|PROJECT(ROSEGARDEN)|project(rosegarden)|' ../CMakeLists.txt sed -i 's|PROJECT(ROSEGARDEN)|project(rosegarden)|' ../CMakeLists.txt
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -94,9 +64,9 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-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:-} \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-DWANT_SOUND="ON" \ -DWANT_SOUND="ON" \
-DWANT_DEBUG="OFF" \ -DWANT_DEBUG="OFF" \
-DWANT_FULLDBG="OFF" \ -DWANT_FULLDBG="OFF" \
@ -112,7 +82,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -33,19 +33,11 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && { ## for slack-desc
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
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 != "" ]] && TRANS=ON && langs=" $(echo $langs|sed "s|/$PRGNAM.po||g")"
} || {
## for slack-desc and to set TRANS=ON until 14.0.12 build removed
langs="" langs=""
for Lang in $I18N for Lang in $I18N
do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" && TRANS=ON do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang"
done done
}
listdocs_fn listdocs_fn
@ -63,7 +55,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..

@ -33,39 +33,9 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && { ## for slack-desc
## remove help documentation build instruction from all [non-en] locales ... langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true
# .. restore for en always
echo 'tde_create_handbook( LANG en DESTINATION tdepowersave )' >> doc/en/CMakeLists.txt
#
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
lpos="" # the *.po files list
langs="" # the languages
ldocs="" # the help docs - there is no doc locale without a corresponding po locale
# so can be set within the po loop
for Lang in $I18N
do
[[ -s po/$Lang.po ]] && {
lpos="$lpos $Lang.po"
langs="$langs $Lang"
## ... and restore help documentation for the selected and available locales
[[ -s doc/$Lang/CMakeLists.txt ]] && {
echo "tde_create_handbook( LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt
ldocs="$ldocs $Lang"
}
}
done
#
## this GLOB overrides "LANG auto" in po/CMakeLists.txt:
sed -i "s| \*.po| $lpos|" cmake/modules/TDEMacros.cmake
[[ $lpos != "" ]] && TRANS=ON
} || {
## for slack-desc and to set TRANS=ON until 14.0.12 build removed
langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang" && TRANS=ON;done
ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
}
listdocs_fn listdocs_fn
@ -84,7 +54,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DBUILD_TRANSLATIONS="ON" \
-Wno-dev \ -Wno-dev \
.. ..

@ -101,7 +101,7 @@ Set the version of TDE to be built.
" \ " \
13 75 3 \ 13 75 3 \
"14.0.12" "the R14.0.12 release - source from archives" \ "14.0.13" "the R14.0.13 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
@ -641,7 +641,7 @@ rm -f $TMPVARS/Koffice_OPTS
echo "autocorrect ${CHALK:-chalk} doc example filters karbon kchart kdgantt kexi kformula kivio koshell kounavail kplato kpresenter kross kspread kugar kword mimetypes pics plugins servicetypes templates tools" > $TMPVARS/DO_NOT_COMPILE echo "autocorrect ${CHALK:-chalk} doc example filters karbon kchart kdgantt kexi kformula kivio koshell kounavail kplato kpresenter kross kspread kugar kword mimetypes pics plugins servicetypes templates tools" > $TMPVARS/DO_NOT_COMPILE
# #
[[ $CHALK != krita ]] && { [[ $CHALK != krita ]] && {
# Using non-breaking space - U00a0 - in strings # Using non-breaking space - U00a0 - in strings so that dialog sees a character, not a space
app_c=" chalk" app_c=" chalk"
about_c="Image creation and editing" about_c="Image creation and editing"
status_c=off status_c=off
@ -652,9 +652,6 @@ about_k="Image creation and editing"
status_k=off status_k=off
comment_k="\Zb\Z6 Needs filters and servicetypes \Zn" comment_k="\Zb\Z6 Needs filters and servicetypes \Zn"
} }
#
[[ $(cat $TMPVARS/TDEVERSION) != 14.0.12 ]] && MAN_PAGES=' including man pages'
DOCS="Application handbooks${MAN_PAGES:-}"
# #
### for the record, --separate-output generates output without quotes ### for the record, --separate-output generates output without quotes
dialog --cr-wrap --nocancel --separate-output --no-shadow --colors --title " KOffice applications " --item-help --checklist \ dialog --cr-wrap --nocancel --separate-output --no-shadow --colors --title " KOffice applications " --item-help --checklist \
@ -666,7 +663,7 @@ Filters and servicetypes are required for most apps.
" ALL" "Build all applications" off "\Zb\Z6 Overrides any off/on selections below \Zn" \ " ALL" "Build all applications" off "\Zb\Z6 Overrides any off/on selections below \Zn" \
" autocorrect" "Autocorrection for US English" off "\Zb\Z6 \Zn" \ " autocorrect" "Autocorrection for US English" off "\Zb\Z6 \Zn" \
${app_c:-} ${about_c:-} ${status_c:-} ${comment_c:-} \ ${app_c:-} ${about_c:-} ${status_c:-} ${comment_c:-} \
" doc" "$DOCS" off "\Zb\Z6 \Zn" \ " doc" "Application handbooks including man pages" off "\Zb\Z6 \Zn" \
" example" "KOffice Example Application" off "\Zb\Z6 \Zn" \ " example" "KOffice Example Application" off "\Zb\Z6 \Zn" \
" filters" "Import/export filters" on "\Zb\Z6 \Zn" \ " filters" "Import/export filters" on "\Zb\Z6 \Zn" \
" karbon" "A scalable graphics editor" off "\Zb\Z6 Needs filters and servicetypes \Zn" \ " karbon" "A scalable graphics editor" off "\Zb\Z6 Needs filters and servicetypes \Zn" \
@ -792,8 +789,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.12 ]] && 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.0.13 ]] && 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'."
## testing for cgit!=no will allow =yes, or null, which is the 14.0.12 build case ## testing for cgit!=no will allow =yes, or null, which is the 14.0.13 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 \
" "
@ -878,7 +875,6 @@ Confirm or change these build options ..
} }
###################### ######################
# there should be no need to make any changes below
export TDEVERSION=$(cat $TMPVARS/TDEVERSION) export TDEVERSION=$(cat $TMPVARS/TDEVERSION)
export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE) export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE)

@ -38,7 +38,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.12 ]] && { [[ $TDEVERSION == 14.0.13 ]] && {
# extract the template source once only # extract the template source once only
echo -e "\033[39;1m echo -e "\033[39;1m
Extracting the template source from $(basename $SOURCE) ... Extracting the template source from $(basename $SOURCE) ...
@ -58,6 +58,10 @@ echo -e "\033[39;1m
(cd $PRGNAM-trinity-$TDEVERSION (cd $PRGNAM-trinity-$TDEVERSION
tar xf $SRCDIR/cmake-$TDEVERSION.tar.xz tar xf $SRCDIR/cmake-$TDEVERSION.tar.xz
mv cmake-trinity-$TDEVERSION cmake) mv cmake-trinity-$TDEVERSION cmake)
## prevent copying from cgit if this fails
cd tde-i18n-trinity-$TDEVERSION
[[ ! -d cmake || ! -d template || ! -d translations ]] && exit
cd - > /dev/null
} || { } || {
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
@ -67,7 +71,7 @@ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/)
for lang in $I18N for lang in $I18N
do do
[[ $TDEVERSION == 14.0.12 ]] && { [[ $TDEVERSION == 14.0.13 ]] && {
# 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
Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ... Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ...
@ -99,10 +103,9 @@ chown_fn
mkdir -p $PRGNAM-$lang/build mkdir -p $PRGNAM-$lang/build
cd $PRGNAM-$lang/build cd $PRGNAM-$lang/build
## The path to the TDE cmake modules is added for 14.0.x[aka 14.0.13+] & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories ## The path to the TDE cmake modules is added for 14.0.11+ & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories
CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/../cmake/modules cmake ${G_NINJA:-} \
-DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_C_COMPILER=$COMPILER \

@ -39,8 +39,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON pkg-config akode && AKODE=ON
FREEVERB=OFF && [[ -s $INSTALL_TDE/include/arts/artsmodules.h ]] && FREEVERB=ON pkg-config arts && FREEVERB=ON
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -54,7 +54,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_AKODE="$AKODE" \ -DWITH_AKODE="${AKODE:-OFF}" \
-DWITH_ALSA="ON" \ -DWITH_ALSA="ON" \
-DWITH_GSTREAMER="OFF" \ -DWITH_GSTREAMER="OFF" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \
@ -63,7 +63,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KMOUSETOOL="ON" \ -DBUILD_KMOUSETOOL="ON" \
-DBUILD_KMOUTH="ON" \ -DBUILD_KMOUTH="ON" \
-DBUILD_KSAYIT="ON" \ -DBUILD_KSAYIT="ON" \
-DBUILD_KSAYIT_FREEVERB="$FREEVERB" \ -DBUILD_KSAYIT_FREEVERB="${FREEVERB:-OFF}" \
-DBUILD_KTTSD="ON" \ -DBUILD_KTTSD="ON" \
-DBUILD_KTTSD_COMMAND="ON" \ -DBUILD_KTTSD_COMMAND="ON" \
-DBUILD_KTTSD_EPOS="ON" \ -DBUILD_KTTSD_EPOS="ON" \

@ -40,10 +40,7 @@ echo $'
@@ -347 +347 @@ @@ -347 +347 @@
- if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) ) - if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", false ) )
+ if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", true ) ) + if ( !TDEStandardDirs::findExe( "ar" ).isNull() && m_conf->readBoolEntry( "UseAr", true ) )
' | while read line ' | patch -N -p0 || true
do
patch -N -p0
done || true
listdocs_fn listdocs_fn
@ -60,12 +57,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i 's|\\fI/opt/trinity/share/doc/ksig/README.Debian\\fP|the Ksig Handbook|' ../doc/man/ksig/ksig.1 sed -i 's|\\fI/opt/trinity/share/doc/ksig/README.Debian\\fP|the Ksig Handbook|' ../doc/man/ksig/ksig.1
sed -i 's|^done|& - in konqueror enter \\fI'\''help:/ksig'\''\\f - or on the command line run \\fI'\''khelpcenter help:/ksig'\''\\f|' ../doc/man/ksig/ksig.1 sed -i 's|^done|& - in konqueror enter \\fI'\''help:/ksig'\''\\f - or on the command line run \\fI'\''khelpcenter help:/ksig'\''\\f|' ../doc/man/ksig/ksig.1
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -76,7 +69,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_SDL="ON" \ -DWITH_SDL="ON" \
-DWITH_BERKELEY_DB="ON" \ -DWITH_BERKELEY_DB="ON" \
@ -102,7 +95,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -39,11 +39,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -53,7 +48,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_ALL_INCLUDED_XSCREENSAVERS="OFF" \ -DWITH_ALL_INCLUDED_XSCREENSAVERS="OFF" \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
@ -78,7 +73,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -106,17 +106,17 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true
patch -N -p0 << EOF || true patch -N -p0 << EOF || true
--- translations/desktop_files/kcontrol-desktops/en_GB.po --- translations/desktop_files/kcontrol-desktops/en_GB.po
+++ translations/desktop_files/kcontrol-desktops/en_GB.po +++ translations/desktop_files/kcontrol-desktops/en_GB.po
@@ -1355,3 +1355,3 @@ @@ -1338,3 +1338,3 @@
msgid "Configure display ICC color profile" msgid "Configure display ICC color profile"
-msgstr "" -msgstr ""
+msgstr "Configure display ICC colour profile" +msgstr "Configure display ICC colour profile"
@@ -1360,3 +1360,3 @@ @@ -1343,3 +1343,3 @@
msgid "ICC;display;color;profile;" msgid "ICC;display;color;profile;"
-msgstr "" -msgstr ""
+msgstr "ICC;display;colour;profile;" +msgstr "ICC;display;colour;profile;"
@@ -1365,3 +1365,3 @@ @@ -1348,3 +1348,3 @@
msgid "Color Profile" msgid "Color Profile"
-msgstr "" -msgstr ""
+msgstr "Colour Profile" +msgstr "Colour Profile"
@ -133,9 +133,6 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION != 14.0.12 ]] && {
## Add man pages for development builds
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|/etc/trinity|$INSTALL_TDE/share/config|" ../doc/man/{gentdmconf,tdm}.1 sed -i "s|/etc/trinity|$INSTALL_TDE/share/config|" ../doc/man/{gentdmconf,tdm}.1
[[ $TDE_CNF_DIR == *tde* ]] && \ [[ $TDE_CNF_DIR == *tde* ]] && \
sed -i 's|trinity,kde,kde2,kde1|tde|' ../doc/man/*.1 && \ sed -i 's|trinity,kde,kde2,kde1|tde|' ../doc/man/*.1 && \
@ -156,7 +153,6 @@ endif( )
' >> ../tdm/kfrontend/CMakeLists.txt ' >> ../tdm/kfrontend/CMakeLists.txt
# #
sed -i "s|/opt/.*/share/doc/tdm/README.gz|$INSTALL_TDE/share/config/tdm/README-config|" ../doc/man/tdm{,ctl}.1 sed -i "s|/opt/.*/share/doc/tdm/README.gz|$INSTALL_TDE/share/config/tdm/README-config|" ../doc/man/tdm{,ctl}.1
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -167,7 +163,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_ELFICON="OFF" \ -DWITH_ELFICON="OFF" \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
@ -258,7 +254,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -230,12 +230,7 @@ untar_fn
## patch for kig python scripting error: ## patch for kig python scripting error:
## kig: /usr/include/boost/python/object_core.hpp:422: boost::python::api::object_base::~object_base(): Assertion `Py_REFCNT(m_ptr) > 0' failed. ## kig: /usr/include/boost/python/object_core.hpp:422: boost::python::api::object_base::~object_base(): Assertion `Py_REFCNT(m_ptr) > 0' failed.
## Re: https://bugs.kde.org/show_bug.cgi?id=401512#c5 ## Re: https://bugs.kde.org/show_bug.cgi?id=401512#c5
patch -N -p0 << EOF || true sed -i 's| PyTuple_SetItem| Py_XINCREF((objectvect.begin() +i)->ptr());\n&|' kig/scripting/python_scripter.cpp
--- kig/scripting/python_scripter.cpp
+++ kig/scripting/python_scripter.cpp
@@ -493,0 +494 @@
+ Py_XINCREF((objectvect.begin() +i)->ptr());
EOF
## add some files to html docs ## add some files to html docs
sed -i 's|*.png|& *.svgz README|' cmake/modules/TDEMacros.cmake sed -i 's|*.png|& *.svgz README|' cmake/modules/TDEMacros.cmake

@ -33,75 +33,13 @@ getsource_fn
untar_fn untar_fn
## build error with cgit:
##/tmp/build/tmp-tdegraphics/tdegraphics/build-tdegraphics/kmrml/kmrml/kcontrol/serverconfigwidget.cpp:37:61: error: invalid use of incomplete type class KComboBox
## .. and more ..
## patch based on solution for similar amarok errors, issue #16
echo $'
--- kmrml/kmrml/kcontrol/serverconfigwidget.ui
+++ kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -271,0 +272,5 @@
+<includes>
+ <include location="global" impldecl="in implementation">kcombobox.h</include>
+ <include location="global" impldecl="in implementation">knuminput.h</include>
+ <include location="global" impldecl="in implementation">klineedit.h</include>
+</includes>
' | patch -N -p0 || true
[[ $TDEVERSION == 14.0.12 ]] && {
## for poppler-22.03+
patch -N -p0 << EOF || true
--- config.h.cmake
+++ config.h.cmake
@@ -3,2 +3,3 @@
// poppler-tqt
+#cmakedefine HAVE_POPPLER_2203
#cmakedefine HAVE_POPPLER_2112
--- tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -27,1 +27,1 @@
-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 )
+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 22.03 )
--- tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
+++ tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp
@@ -53,1 +53,5 @@
+# if defined(HAVE_POPPLER_2203)
+ DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {});
+# else
DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL);
+# endif
@@ -87,4 +91,9 @@
+# if defined(HAVE_POPPLER_2203)
+ DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()),
+ GooString(password.data()));
+# else
GooString *filename = new GooString(data->doc.getFileName());
GooString *pwd = new GooString(password.data());
DocumentData *doc2 = new DocumentData(filename, pwd);
delete pwd;
+# endif
--- tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
+++ tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
@@ -107,1 +107,5 @@
+# if defined(HAVE_POPPLER_2203)
+ DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {}
+# else
DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {}
+# endif
EOF
}
listdocs_fn listdocs_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1 sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
}
# If imlib is installed, include Kuickshow: # If imlib is installed, include Kuickshow:
pkg-config imlib && KUICKSHOW=ON pkg-config imlib && KUICKSHOW=ON
@ -115,7 +53,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_T1LIB="OFF" \ -DWITH_T1LIB="OFF" \
-DWITH_PAPER="OFF" \ -DWITH_PAPER="OFF" \
-DWITH_TIFF="ON" \ -DWITH_TIFF="ON" \
@ -150,7 +88,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -6,6 +6,6 @@ Some formatting for help pages has been changed by a patch in the SlackBuild - i
--- ---
Markdown syntax highlighting for kate has been backported for 14.0.12, with some personal preferences. Markdown syntax highlighting for kate has been added for 14.0.13.
The original file is @ https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/raw/branch/master/kate/data/markdown.xml There is a patch in the SlackBuild to revert the diff highlighting - comment out if not required.

@ -1,182 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Kate syntax highlight filter for Markdown/MultiMarkdown documents.
Copyright 2008 Darrin Yeager. http://www.dyeager.org/
Dual-Licensed under both GPL and BSD licenses.
Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/
-->
<!-- the [^\s]{1} is in the regex to avoid interfering with bullet list which
starts "* item". Thus emphasis/strong MUST be formed like *words here*
with the asterisks next to the beginning of the first word.
Match space or newline, followed by "*", followed by one non-space,
followed by anything non-asterisk, followed by "*", followed by
space, end-of-sentence punctuation, or the end of the line.
-->
<!DOCTYPE language SYSTEM "language.dtd"
[
<!ENTITY strongemphasisregex "(\s|^)[\*_]{3}[^\*_]+[\*_]{3}(\s|\.|,|;|:|\-|\?|$)">
<!ENTITY strongregex "(\s|^)[\*_]{2}[^\s]{1}[^\*_]+[\*_]{2}(\s|\.|,|;|:|\-|\?|$)">
<!ENTITY emphasisregex "(\s|^)[\*_]{1}[^\s]{1}[^\*_]+[\*_]{1}(\s|\.|,|;|:|\-|\?|$)">
<!ENTITY reflinkregex '\[[^\]\^]+\]\s*\[[^\]]*\]\s*(\s+\"[^\"]*\"){0,1}'>
<!ENTITY reflinktargetregex '\[[^\]\^]+\]\:\s+[^\s]+(\s+\"[^\"]*\"){0,1}'>
<!ENTITY footnoteregex "\[\^[^\]]+\]">
<!ENTITY idlinkregex '\[[^\]\^]+\]\s*\(#[^\(]*\)'>
<!ENTITY inlinelinkregex '\[[^\]\^]+\]\s*\([^\(]*\)'>
<!ENTITY inlineimageregex '\!\[[^\]\^]+\]\([^\(]*\)'>
<!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'>
<!ENTITY autolinkregex '&lt;(https?|ftp):[^\"&gt;\s]+&gt;'>
<!ENTITY mailtolinkregex '&lt;(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)&gt;'>
<!ENTITY rulerregex '^\s*([\*\-_]\s?){3,}\s*$'>
<!-- two spaces at end of line generates linebreak -->
<!ENTITY linebreakregex " $">
<!ENTITY strikeoutregex "~~[^~].*~~">
<!ENTITY difflineremoveregex "^-[^-].*$">
<!ENTITY difflineaddregex "^\+[^\+].*$">
<!ENTITY diffheader1regex "^-{3} .*$">
<!ENTITY diffheader2regex "^\+{3} .*$|^@@.*$">
<!ENTITY diffheaderdiffregex "^diff .*$">
]>
<language name="Markdown" version="1.3" section="Markup"
extensions="*.md;*.mmd;*.mdwn"
author="Darrin Yeager, Claes Holmerson"
license="GPL,BSD" >
<highlighting>
<contexts>
<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
<DetectChar context="blockquote" char="&gt;" column="0"/>
<RegExpr attribute="h1" String="^#\s.*[#]?$" />
<RegExpr attribute="h2" String="^##\s.*[#]?$" />
<RegExpr attribute="h3" String="^###\s.*[#]?$" />
<RegExpr attribute="h4" String="^####\s.*[#]?$" />
<RegExpr attribute="h5" String="^#####\s.*[#]?$" />
<RegExpr attribute="strongemphasis" String="&strongemphasisregex;" />
<RegExpr attribute="strong" String="&strongregex;" />
<RegExpr attribute="emphasis" String="&emphasisregex;" />
<RegExpr attribute="ruler" String="&rulerregex;" />
<RegExpr context="bullet" String="^[,\t, {4}]*[\*\+\-]\s" />
<RegExpr context="numlist" String="^[,\t, {4}]*[\d]+\.\s" />
<RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" />
<RegExpr attribute="meta" String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$" />
<IncludeRules context="inc" />
</context>
<context attribute="blockquote" lineEndContext="#pop" name="blockquote">
<RegExpr attribute="bq-strong" String="&strongregex;" />
<RegExpr attribute="bq-emphasis" String="&emphasisregex;" />
<RegExpr attribute="bq-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="bullet" lineEndContext="#pop" name="bullet" >
<RegExpr attribute="bl-strong" String="&strongregex;" />
<RegExpr attribute="bl-emphasis" String="&emphasisregex;" />
<RegExpr attribute="bl-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="numlist" lineEndContext="#pop" name="numlist" >
<RegExpr attribute="nl-strong" String="&strongregex;" />
<RegExpr attribute="nl-emphasis" String="&emphasisregex;" />
<RegExpr attribute="nl-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="comment" lineEndContext="#stay" name="comment" >
<RegExpr String="--&gt;" attribute="comment" context="#pop" endRegion="comment"/>
</context>
<context attribute="pre" lineEndContext="#stay" name="pre" >
<RegExpr String="```$" attribute="pre" context="#pop" endRegion="pre"/>
</context>
<context attribute="prediff" lineEndContext="#stay" name="prediff" >
<RegExpr String="```$" attribute="prediff" context="#pop" endRegion="prediff"/>
<RegExpr attribute="difflineremove" String="&difflineremoveregex;" />
<RegExpr attribute="difflineadd" String="&difflineaddregex;" />
<RegExpr attribute="diffheader1" String="&diffheader1regex;" />
<RegExpr attribute="diffheader2" String="&diffheader2regex;" />
<RegExpr attribute="diffheaderdiff" String="&diffheaderdiffregex;" />
</context>
<context attribute="common" name="inc" lineEndContext="#stay" >
<RegExpr context="comment" String="&lt;!--" beginRegion="comment" />
<RegExpr context="prediff" String="```\s{0,}diff" beginRegion="prediff" />
<RegExpr context="pre" String="```.*" beginRegion="pre" />
<RegExpr attribute="code" String="`[^`].*[^\\]`" />
<RegExpr attribute="reflink" String="&reflinkregex;" />
<RegExpr attribute="footnote" String="&footnoteregex;" />
<RegExpr attribute="idlink" String="&idlinkregex;"/>
<RegExpr attribute="inlinelink" String="&inlinelinkregex;"/>
<RegExpr attribute="reflinktarget" String="&reflinktargetregex;"/>
<RegExpr attribute="inlineimage" String="&inlineimageregex;"/>
<RegExpr attribute="refimage" String="&refimageregex;"/>
<RegExpr attribute="autolink" String="&autolinkregex;"/>
<RegExpr attribute="mailtolink" String="&mailtolinkregex;"/>
<RegExpr attribute="strikeout" minimal="true" String="&strikeoutregex;"/>
<RegExpr attribute="linebreak" minimal="true" String="&linebreakregex;"/>
</context>
</contexts>
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="common" defStyleNum="dsNormal" />
<itemData name="emphasis" defStyleNum="dsNormal" italic="true" />
<itemData name="strong" defStyleNum="dsNormal" bold="true" />
<itemData name="diffheader1" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" bold="true" />
<itemData name="diffheader2" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" />
<itemData name="diffheaderdiff" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#000000" bold="true" />
<itemData name="difflineremove" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="red" />
<itemData name="difflineadd" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="blue" />
<itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/>
<itemData name="ruler" defStyleNum="dsNormal" color="#e200e2" bold="true" />
<itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" backgroundColor="#fafaaf" />
<itemData name="linebreak" defStyleNum="dsNormal" backgroundColor="#F8E0FF" />
<itemData name="h1" defStyleNum="dsFunction" bold="true" />
<itemData name="h2" defStyleNum="dsFunction" bold="true" />
<itemData name="h3" defStyleNum="dsFunction" bold="true" />
<itemData name="h4" defStyleNum="dsFunction" bold="true" />
<itemData name="h5" defStyleNum="dsFunction" bold="true" />
<itemData name="blockquote" defStyleNum="dsNormal" color="black" />
<itemData name="bq-emphasis" defStyleNum="dsNormal" color="black" italic="true" />
<itemData name="bq-strong" defStyleNum="dsNormal" color="black" bold="true" />
<itemData name="bq-strongemphasis" defStyleNum="dsNormal" color="black" italic="true" bold="true" />
<itemData name="bullet" defStyleNum="dsNormal" color="#b700b7" />
<itemData name="bl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
<itemData name="bl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
<itemData name="bl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
<itemData name="numlist" defStyleNum="dsNormal" color="#b700b7" />
<itemData name="nl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
<itemData name="nl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
<itemData name="nl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
<itemData name="comment" defStyleNum="dsComment" />
<itemData name="pre" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
<itemData name="prediff" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
<itemData name="code" defStyleNum="dsNormal" color="darkcyan" backgroundColor="#eeeeee" />
<itemData name="reflink" defStyleNum="dsOthers" color="blue" />
<itemData name="idlink" defStyleNum="dsOthers" color="blue" italic="true" />
<itemData name="inlinelink" defStyleNum="dsOthers" color="blue" />
<itemData name="autolink" defStyleNum="dsOthers" underline="true" />
<itemData name="mailtolink" defStyleNum="dsOthers" underline="true" />
<itemData name="footnote" defStyleNum="dsOthers" italic="true" />
<itemData name="meta" defStyleNum="dsComment" />
<itemData name="reflinktarget" defStyleNum="dsOthers" />
<itemData name="inlineimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
<itemData name="refimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
</itemDatas>
</highlighting>
<general>
<comments>
<comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
</comments>
</general>
</language>

@ -115,36 +115,26 @@ patch -N -p0 << EOF || true
+ text-align: left; + text-align: left;
EOF EOF
[[ $TDEVERSION == 14.0.12 ]] && { ## Restore diff.xml +/- colours
## for jasper-3.0.0+
patch -N -p0 << EOF || true patch -N -p0 << EOF || true
--- kimgio/jp2.cpp --- kate/data/diff.xml
+++ kimgio/jp2.cpp +++ kate/data/diff.xml
@@ -279,7 +279,16 @@ kimgio_jp2_write( TQImageIO* io ) @@ -111,2 +111,2 @@
TQTextStream ts( &rate, IO_WriteOnly ); - <itemData name="Removed line" defStyleNum="dsString" backgroundColor="#ffeef0"/>
ts << "rate=" - <itemData name="Added line" defStyleNum="dsOthers" backgroundColor="#e6ffed"/>
<< ( (io->quality() < 0) ? DEFAULT_RATE : io->quality() / 100.0F ); + <itemData name="Removed line" defStyleNum="dsString" color="#FF0000"/>
+# if defined(JAS_VERSION_MAJOR) && (JAS_VERSION_MAJOR >= 3) + <itemData name="Added line" defStyleNum="dsOthers" color="#0000FF"/>
+ const jas_image_fmtinfo_t *jp2_fmtinfo = jas_image_lookupfmtbyname("jp2"); EOF
+ int i = -1; ## Match markdown.xml diff display to diff.xml
+ if (jp2_fmtinfo) patch -N -p0 << EOF || true
+ { --- kate/data/markdown.xml
+ i = jas_image_encode(ji, stream, jp2_fmtinfo->id, rate.utf8().data()); +++ kate/data/markdown.xml
+ } @@ -149,2 +149,2 @@
+# else - <itemData name="difflineremove" defStyleNum="dsString" backgroundColor="#ffeef0" />
int i = jp2_encode( ji, stream, rate.utf8().data() ); - <itemData name="difflineadd" defStyleNum="dsOthers" backgroundColor="#e6ffed" />
+# endif + <itemData name="difflineremove" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#FF0000" />
+ <itemData name="difflineadd" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#0000FF" />
jas_image_destroy( ji );
jas_stream_close( stream );
EOF EOF
## Backport for markdown syntax highlighting in kate
sed -i 's|mandoc.xml|& markdown.xml|' kate/data/CMakeLists.txt
sed -i 's|mandoc.xml.*$|&\n<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.3"/>|' kate/data/update-files.xml
}
## and add modified markdown.xml for all TDE versions
cp $SB_SRCDIR/markdown.xml kate/data/
listdocs_fn listdocs_fn
@ -170,7 +160,7 @@ sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLi
WITH_PCSC WITH_PCSC
WITH_PKCS WITH_PKCS
WITH_UDEVIL WITH_UDEVIL
are 14.1.0 options and will be ignored by 14.0.? builds are 14.1.0 options and will be ignored by 14.0.* builds
comment comment
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \

@ -39,14 +39,10 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1 sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
}
## akode is required for ARTS_AKODE plugin & JUK ## akode is required for ARTS_AKODE plugin & JUK
[[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && aRts_AKODE=ON && JUK=ON pkg-config akode && aRts_AKODE=ON && JUK=ON
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -57,7 +53,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ALSA="ON" \ -DWITH_ALSA="ON" \
-DWITH_ARTS_AKODE="${aRts_AKODE:-OFF}" \ -DWITH_ARTS_AKODE="${aRts_AKODE:-OFF}" \
-DWITH_ARTS_AUDIOFILE="ON" \ -DWITH_ARTS_AUDIOFILE="ON" \
@ -94,7 +90,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -33,33 +33,19 @@ getsource_fn
untar_fn untar_fn
## r14.0.x branch commit 3e7a60bf
## libvncserver: remove unnecessary re-definition of true/false boolean values.
patch -p0 -N << EOF || true
--- krfb/libvncserver/main.cpp
+++ krfb/libvncserver/main.cpp
@@ -19,5 +19,0 @@
- #ifndef false
- #define false 0
- #define true -1
- #endif
-
@@ -830,1 +825,1 @@
-#include "main.moc"
\ No newline at end of file
+#include "main.moc"
EOF
listdocs_fn listdocs_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
sed -i "s|http://bugs.*desktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.[18]
sed -i "s|/opt/trinity/share/doc/lisa/README.gz|$INSTALL_TDE/share/apps/lisa/README|" ../doc/man/lisa/*lisa.8
## If changing any of these options, READ CMakeLists.txt for info on interdependencies .. ## If changing any of these options, READ CMakeLists.txt for info on interdependencies ..
## GADU & MEANWHILE require libgadu and meanwhile installed. ## GADU & MEANWHILE require libgadu and meanwhile installed.
# If speex is installed, include it in the build for jingle # If speex is installed, include it in the build for jingle
[[ -s /usr/include/speex/speex.h ]] && SPX="ON" pkg-config speex && SPX="ON"
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -70,6 +56,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_JINGLE="ON" \ -DWITH_JINGLE="ON" \
@ -132,6 +119,8 @@ make_fn
installdocs_fn installdocs_fn
mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -40,10 +40,10 @@ chown_fn
cd_builddir_fn cd_builddir_fn
# If libcaldav is installed, include it in the build for korganizer # If libcaldav is installed, include it in the build for korganizer
[[ -s $INSTALL_TDE/include/libcaldav/caldav.h ]] 2>/dev/null && LCALDAV="ON" pkg-config libcaldav && LCALDAV="ON"
# If libcarddav is installed, include it in the build for korganizer # If libcarddav is installed, include it in the build for korganizer
[[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON" pkg-config libcarddav && LCARDDAV="ON"
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -71,7 +71,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_SASL="ON" \ -DWITH_SASL="ON" \
-DWITH_SCALIX="ON" \ -DWITH_SCALIX="ON" \
-DWITH_SLOX="ON" \ -DWITH_SLOX="ON" \
-DWITH_XSCREENSAVER="ON" \ -DWITH_XSCREENSAVER="OFF" \
-DBUILD_AKREGATOR="ON" \ -DBUILD_AKREGATOR="ON" \
-DBUILD_CERTMANAGER="ON" \ -DBUILD_CERTMANAGER="ON" \
-DBUILD_DOC="ON" \ -DBUILD_DOC="ON" \

@ -33,31 +33,13 @@ getsource_fn
untar_fn untar_fn
## clang build failure
## ...kmilo/generic/generic_monitor.cpp:78:16: error: non-constant-expression cannot be narrowed from type 'int' to 'uint' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
## commit 4046d4e - fixes issue 28
patch -p0 -N << EOF || true
--- kmilo/generic/generic_monitor.h
+++ kmilo/generic/generic_monitor.h
@@ -42,1 +42,1 @@ namespace KMilo {
- uint symbol;
+ int symbol;
EOF
## set installation directory for superkaramba.desktop file
sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' superkaramba/src/CMakeLists.txt
listdocs_fn listdocs_fn
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1 sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
}
## TDEFileReplace has been moved from tdewebdev for R14.1.0 ## TDEFileReplace has been moved from tdewebdev for R14.1.0
[[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" [[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
@ -70,7 +52,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_DPMS="ON" \ -DWITH_DPMS="ON" \
-DWITH_XSCREENSAVER="OFF" \ -DWITH_XSCREENSAVER="OFF" \
-DWITH_SENSORS="ON" \ -DWITH_SENSORS="ON" \
@ -111,7 +93,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -33,10 +33,6 @@ getsource_fn
untar_fn untar_fn
## error: /usr/bin/ld: cannot find -ltqt-mt
sed -i '18ilink_directories( ${TQT_LIBRARY_DIRS} )' lib/interfaces/external/CMakeLists.txt
sed -i '18ilink_directories( ${TQT_LIBRARY_DIRS} )' src/newui/CMakeLists.txt
listdocs_fn listdocs_fn
chown_fn chown_fn

@ -33,181 +33,6 @@ getsource_fn
untar_fn untar_fn
[[ $TDEVERSION == 14.0.12 ]] && {
## all versons ffmpeg support, ported from upstream commits
patch -p0 << EOF
--- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
+++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
@@ -40 +40 @@
-#if LIBAVCODEC_VERSION_MAJOR < 58
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100)
@@ -72,4 +71,0 @@
-/*
-void FFMPEGDecoderPlugin::initializeFFMPEG() {
- av_register_all();
-}*/
@@ -84 +80,2 @@
- eof(false), error(false), initialized(false), retries(0) {};
+ eof(false), error(false), initialized(false), retries(0),
+ packet(NULL), audioStream_ctx(NULL), videoStream_ctx(NULL) {};
@@ -92,0 +90,2 @@
+ AVCodecContext *audioStream_ctx;
+ AVCodecContext *videoStream_ctx;
@@ -94 +93,4 @@
- AVPacket packet;
+ AVPacket *packet;
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 12, 100)
+ AVPacket _packet;
+#endif
@@ -115,0 +118,3 @@
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58,9,100)
+ av_register_all();
+#endif
@@ -209,3 +214,3 @@
- // Set config
- if (!setAudioConfiguration(&d->config, d->ic->streams[d->audioStream]->codec))
- {
+ d->codec = (AVCodec *)avcodec_find_decoder(d->ic->streams[d->audioStream]->CODECPAR->codec_id);
+ if (!d->codec) {
+ std::cerr << "akode: FFMPEG: Codec not found\n";
@@ -216,3 +221,8 @@
- d->codec = avcodec_find_decoder(d->ic->streams[d->audioStream]->CODECPAR->codec_id);
- if (!d->codec) {
- std::cerr << "akode: FFMPEG: Codec not found\n";
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ // allocate a codec context
+ d->audioStream_ctx = avcodec_alloc_context3(d->codec);
+ if (d->audioStream_ctx) {
+ avcodec_parameters_to_context(d->audioStream_ctx, d->ic->streams[d->audioStream]->codecpar);
+ }
+ else {
+ std::cerr << "akode: failed to allocate an audio codec context\n";
@@ -222 +232,17 @@
- avcodec_open2( d->ic->streams[d->audioStream]->codec, d->codec, NULL );
+#else
+ d->audioStream_ctx = d->ic->streams[d->audioStream]->codec;
+#endif
+
+ // Set config
+ if (!setAudioConfiguration(&d->config, d->audioStream_ctx))
+ {
+ closeFile();
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ avcodec_free_context(&d->audioStream_ctx);
+#else
+ d->audioStream_ctx = NULL;
+#endif
+ return false;
+ }
+
+ avcodec_open2( d->audioStream_ctx, d->codec, NULL );
@@ -242 +268 @@
- av_free_packet(&d->packet);
+ av_free_packet(&d->_packet);
@@ -244 +270 @@
- av_packet_unref( &d->packet );
+ av_packet_unref( d->packet );
@@ -245,0 +272 @@
+ d->packet = NULL;
@@ -250 +277,6 @@
- avcodec_close( d->ic->streams[d->audioStream]->codec );
+ avcodec_close( d->audioStream_ctx );
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100)
+ avcodec_free_context(&d->audioStream_ctx);
+#else
+ d->audioStream_ctx = NULL;
+#endif
@@ -254,0 +287 @@
+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100)
@@ -255,0 +289 @@
+#endif
@@ -266,2 +300,7 @@
- av_init_packet(&d->packet);
- if ( av_read_frame(d->ic, &d->packet) < 0 ) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100)
+ d->packet = av_packet_alloc();
+#else
+ av_init_packet(&d->_packet);
+ d->packet = &d->_packet;
+#endif
+ if ( av_read_frame(d->ic, d->packet) < 0 ) {
@@ -269 +308 @@
- av_free_packet(&d->packet);
+ av_free_packet(&d->_packet);
@@ -271 +310 @@
- av_packet_unref( &d->packet );
+ av_packet_unref( d->packet );
@@ -272,0 +312 @@
+ d->packet = NULL;
@@ -277,3 +317,3 @@
- if (d->packet.stream_index == d->audioStream) {
- d->packetSize = d->packet.size;
- d->packetData = d->packet.data;
+ if (d->packet->stream_index == d->audioStream) {
+ d->packetSize = d->packet->size;
+ d->packetData = d->packet->data;
@@ -283 +323 @@
- av_free_packet(&d->packet);
+ av_free_packet(&d->_packet);
@@ -285 +325 @@
- av_packet_unref(&d->packet);
+ av_packet_unref(d->packet);
@@ -286,0 +327 @@
+ d->packet = NULL;
@@ -327 +368 @@
- assert(d->packet.stream_index == d->audioStream);
+ assert(d->packet->stream_index == d->audioStream);
@@ -339 +380,23 @@
- int len = avcodec_decode_audio4( d->ic->streams[d->audioStream]->codec,
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 106, 100)
+ int len = avcodec_receive_frame(d->audioStream_ctx, decodeFrame);
+ if (len == 0) {
+ decoded = 1;
+ }
+ else if (len == AVERROR(EAGAIN)) {
+ len = 0;
+ }
+
+ if (len == 0) {
+ len = avcodec_send_packet(d->audioStream_ctx, d->packet);
+ if (len == AVERROR(EAGAIN)) {
+ len = 0;
+ }
+ else
+ {
+ len = d->packet->size;
+ d->packetSize = d->packet->size;
+ }
+ }
+#else
+ int len = avcodec_decode_audio4( d->audioStream_ctx,
@@ -341 +404 @@
- &d->packet );
+ d->packet );
@@ -343 +406 @@
- d->packetSize = d->packet.size;
+ d->packetSize = d->packet->size;
@@ -346,0 +410,2 @@
+#endif
+
@@ -349 +414 @@
- d->buffer_size = decodeFrame->nb_samples * d->ic->streams[d->audioStream]->codec->channels * av_get_bytes_per_sample(d->ic->streams[d->audioStream]->codec->sample_fmt);
+ d->buffer_size = decodeFrame->nb_samples * d->ic->streams[d->audioStream]->CODECPAR->channels * av_get_bytes_per_sample(d->ic->streams[d->audioStream]->codec->sample_fmt);
@@ -351 +416 @@
- d->buffer_size = decodeFrame->nb_samples * decodeFrame->channels * av_get_bytes_per_sample(d->ic->streams[d->audioStream]->codec->sample_fmt);
+ d->buffer_size = decodeFrame->nb_samples * decodeFrame->channels * av_get_bytes_per_sample(d->audioStream_ctx->sample_fmt);
@@ -397 +462 @@
- av_free_packet(&d->packet);
+ av_free_packet(&d->_packet);
@@ -399 +464 @@
- av_packet_unref( &d->packet );
+ av_packet_unref( d->packet );
@@ -400,0 +466 @@
+ d->packet = NULL;
EOF
}
chown_fn chown_fn
cd_builddir_fn cd_builddir_fn

@ -39,13 +39,8 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
BUILDDOC=-DBUILD_DOC="ON"
sed -i 's|^KDE|TDE|' ../README.md sed -i 's|^KDE|TDE|' ../README.md
for i in ../doc/man/*.1 ; do mv $i ${i%%-trinity.1}.1 ; done for i in ../doc/man/*.1 ; do mv $i ${i%%-trinity.1}.1 ; done
}
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -55,7 +50,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
${MANDIR:-} \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ALSA="ON" \ -DWITH_ALSA="ON" \
-DWITH_AUDIOFILE="ON" \ -DWITH_AUDIOFILE="ON" \
-DWITH_ESOUND="OFF" \ -DWITH_ESOUND="OFF" \
@ -64,7 +59,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_MAD="ON" \ -DWITH_MAD="ON" \
-DWITH_SNDIO="OFF" \ -DWITH_SNDIO="OFF" \
-DWITH_VORBIS="ON" \ -DWITH_VORBIS="ON" \
${BUILDDOC:-} \ -DBUILD_DOC="ON" \
-Wno-dev \ -Wno-dev \
.. ..
@ -72,7 +67,7 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn mangzip_fn
strip_fn strip_fn

@ -38,6 +38,7 @@ untar_fn
## add -march, -mtune and no_warn options to CFLAGS where they've been set in BUILD-TDE.sh ## add -march, -mtune and no_warn options to CFLAGS where they've been set in BUILD-TDE.sh
sed -i "s|^QMAKE_CFLAGS[^_].*$|& $SET_march ${NO_WARN:-}|" mkspecs/linux-g++/qmake.conf sed -i "s|^QMAKE_CFLAGS[^_].*$|& $SET_march ${NO_WARN:-}|" mkspecs/linux-g++/qmake.conf
sed -i "s|CONFIG.*$|& ${NO_WARN:+warn_off}|" mkspecs/linux-g++/qmake.conf
## RPATH is set to $ORIGIN/../lib to locate libs during the build ## RPATH is set to $ORIGIN/../lib to locate libs during the build
## and added during configure with the -R option ## and added during configure with the -R option
@ -51,7 +52,7 @@ sed -i "s|X11R6/lib|&$LIBDIRSUFFIX|" mkspecs/linux-g++/qmake.conf
[[ $TDEVERSION == 14.1.0 ]] && QTDIR_PFX=T || QTDIR=$TQTDIR [[ $TDEVERSION == 14.1.0 ]] && QTDIR_PFX=T || QTDIR=$TQTDIR
sed -i "s|QMAKE_INCDIR =|& \$(${QTDIR_PFX:-}QTDIR)/include/tqt|" mkspecs/linux-g++/qmake.conf sed -i "s|QMAKE_INCDIR =|& \$(${QTDIR_PFX:-}QTDIR)/include/tqt|" mkspecs/linux-g++/qmake.conf
## allow building with clang ## allow building with clang, either build-time or run-time
[[ ! $(grep COMPILER mkspecs/linux-g++/qmake.conf) ]] && { [[ ! $(grep COMPILER mkspecs/linux-g++/qmake.conf) ]] && {
echo $'--- mkspecs/linux-g++/qmake.conf echo $'--- mkspecs/linux-g++/qmake.conf
+++ mkspecs/linux-g++/qmake.conf +++ mkspecs/linux-g++/qmake.conf
@ -65,10 +66,7 @@ echo $'--- mkspecs/linux-g++/qmake.conf
-QMAKE_LINK = g++ -QMAKE_LINK = g++
-QMAKE_LINK_SHLIB = g++ -QMAKE_LINK_SHLIB = g++
+QMAKE_LINK = $(COMPILER_CXX) +QMAKE_LINK = $(COMPILER_CXX)
+QMAKE_LINK_SHLIB = $(COMPILER_CXX)' | while read line +QMAKE_LINK_SHLIB = $(COMPILER_CXX)' | patch -p0
do
patch -p0
done
} }
## don't install html docs if 'nodocs' has been selected ## don't install html docs if 'nodocs' has been selected
@ -83,9 +81,9 @@ sed -i '/templates/d' tools/designer/designer/designer.pro
## only need linux-g++ ## only need linux-g++
[[ $TQT_OPTS == *mkspecs* ]] && { [[ $TQT_OPTS == *mkspecs* ]] && {
mv mkspecs/linux-g++ ../ (cd mkspecs
rm -rf mkspecs/* GLOBIGNORE=linux-g++
mv ../linux-g++ mkspecs/ rm -rf *)
} }
## install desktop files to applications/tde as for the other TDE desktop files ## install desktop files to applications/tde as for the other TDE desktop files
@ -244,12 +242,12 @@ $PRGNAM:
" > $PKG/install/slack-desc " > $PKG/install/slack-desc
## build regextester .. ## build regextester ..
[[ ${build_regextester:-} == [yp] ]] && { [[ ${build_regextester:-} == [yY1pP] ]] && {
cd examples/regexptester cd examples/regexptester
rm regexptester.pro rm regexptester.pro
## include the patch .. ## include the patch ..
[[ $build_regextester == p ]] && \ [[ $build_regextester == [pP] ]] && \
patch -p0 << EOF patch -p0 << EOF
--- regexptester.cpp --- regexptester.cpp
+++ regexptester.cpp +++ regexptester.cpp
@ -287,15 +285,23 @@ patch -p0 << EOF
+ resultTable->setText(row, 2, ""); + resultTable->setText(row, 2, "");
+ resultTable->item(row, 2)->setSpan( num_lf + 1 , 1); + resultTable->item(row, 2)->setSpan( num_lf + 1 , 1);
+ row+=num_lf; + row+=num_lf;
@@ -169 +189 @@ @@ -144 +165 @@
- statusBar->message(tr("Executed \"%1\" on \"%2\"")
+ statusBar->message(tr("Ran \"%1\" on \"%2\"")
@@ -168,2 +189,2 @@
- regexLabel->setText(tr("&Regex:"));
- regexComboBox->insertItem(tr("[A-Z]+=(\\\\d+):(\\\\d*)")); - regexComboBox->insertItem(tr("[A-Z]+=(\\\\d+):(\\\\d*)"));
+ regexComboBox->insertItem(tr("(\`{3})[^\`]+\\\\1")); + regexLabel->setText(tr("Rege&x:"));
@@ -171 +191 @@ + regexComboBox->insertItem(tr("([\`~]{3})[^\`~]+\\\\1"));
@@ -171 +192 @@
- textComboBox->insertItem(tr("ABC=12:3456")); - textComboBox->insertItem(tr("ABC=12:3456"));
+ textComboBox->insertItem(tr("\`\`\`script\\ncode here\\n\`\`\`\\n\\n\`\`\`\\ncode\\n\`\`\`")); + textComboBox->insertItem(tr("\`\`\`bash\\n#!/bin/bash\\na number\\nof lines\\nof script\\n\`\`\`\\n\\n\`\`\`\\npre text\\n\`\`\`"));
@@ -176 +197 @@
- executePushButton->setText(tr("&Execute"));
+ executePushButton->setText(tr("&Run"));
EOF EOF
## This is most likely a first build of tqt3, so build with the packaging directory binaries ## This could be a first build of tqt3, so build with the packaging directory binaries
$PKG$INSTALL_TDE/bin/tqmake -project -o regextester.pro $PKG$INSTALL_TDE/bin/tqmake -project -o regextester.pro
$PKG$INSTALL_TDE/bin/tqmake TARGET=regextester -spec $PKG$INSTALL_TDE/lib64/tqt/mkspecs/linux-g++ $PKG$INSTALL_TDE/bin/tqmake TARGET=regextester -spec $PKG$INSTALL_TDE/lib64/tqt/mkspecs/linux-g++

@ -44,6 +44,9 @@ chown_fn
#cd_builddir_fn - don't use #cd_builddir_fn - don't use
## don't include man pages, they're a waste of space
sed -i 's|SUBDIRS =.*$|SUBDIRS =. html sources|' doc/Makefile.in
CFLAGS="$SLKRCFLAGS" \ CFLAGS="$SLKRCFLAGS" \
CXXFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \
CC=$COMPILER \ CC=$COMPILER \

@ -484,10 +484,7 @@ echo $'--- Imlib/load.c
+\t\t\t if (colptr + ls < sizeof(col)) +\t\t\t if (colptr + ls < sizeof(col))
@@ -1560,0 +1583 @@ @@ -1560,0 +1583 @@
+ free(line); + free(line);
' | while read line ' | patch -p0
do
patch -p0
done
listdocs_fn listdocs_fn

@ -191,7 +191,6 @@ cmake ${G_NINJA:-} \
-DWITH_PROFILING="OFF" \ -DWITH_PROFILING="OFF" \
-DWITH_SVG2="ON" \ -DWITH_SVG2="ON" \
-DWITH_X11="ON" \ -DWITH_X11="ON" \
-DENABLE_BINRELOC="OFF" \
-Wno-dev \ -Wno-dev \
.. ..

@ -7,7 +7,7 @@
See [*Cross compiling for RPi3*](#xcompiling) for building for arm_hf and aarch64. See [*Cross compiling for RPi3*](#xcompiling) for building for arm_hf and aarch64.
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,
which will build the release version 14.0.12, or the development versions 14.0.x, 14.1.0. which will build the release version 14.0.13, or the development versions 14.0.x, 14.1.0.
[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png "TDE version") [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png "TDE version")
... select TDE version ... select TDE version
@ -19,7 +19,7 @@ Information about dependencies for some packages has been added at the bottom of
Only building the packages is a global option. It therefore can't be used where the build list includes packages which will need to be installed as dependencies for other packages in the build list [for example tdesdk needs tdepim to be installed]. Only building the packages is a global option. It therefore can't be used where the build list includes packages which will need to be installed as dependencies for other packages in the build list [for example tdesdk needs tdepim to be installed].
14.0.12 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 trinitydesktop gitea. 14.0.13 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 trinitydesktop 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).
@ -34,7 +34,8 @@ URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorsta
* GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs * GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs
* FEAT= - for development builds - see get-source.sh * FEAT= - for development builds - see get-source.sh
* GVZ_DOCS=y - for graphviz, include documentation - see SlackBuild * GVZ_DOCS=y - for graphviz, include documentation - see SlackBuild
* build_regextester= - build the regex tester from the tqt3 example - see the tqt3 README * build_regextester=[yp] - build the regex tester from the tqt3 example - see the tqt3 README
* mailmerge=n - build kword without mailmerge - see the koffice README and SlackBuild
--- ---

@ -71,14 +71,14 @@ SRCDIR=$BUILD_TDE_ROOT/src
SB_SRCDIR=$(cd $(dirname $0); pwd) SB_SRCDIR=$(cd $(dirname $0); pwd)
## for 14.0.11 onwards, check for cmake archive .. ## for 14.0.11 onwards, check for cmake archive ..
[[ $TDEVERSION == 14.0.12 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && ( [[ $TDEVERSION == 14.0.13 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
echo -e "\nDownloading to $SRCDIR" 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 wget -T 20 -O $SRCDIR/cmake-$TDEVERSION.tar.xz $TDE_MIRROR/releases/R$TDEVERSION/main/common/cmake-trinity-$TDEVERSION.tar.xz
echo -e "----\n" echo -e "----\n"
) )
## if 14.0.12 or misc, download archive: ## if 14.0.13 or misc, download archive:
[[ $TDEVERSION == 14.0.12 || $TDEMIR_SUBDIR == misc ]] && { [[ $TDEVERSION == 14.0.13 || $TDEMIR_SUBDIR == misc ]] && {
## check for and remove any zero byte archive files ## check for and remove any zero byte archive files
[[ ! -s $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \ [[ ! -s $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
rm $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true rm $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
@ -114,7 +114,7 @@ if [ "$P1" == "--download" ]; then
exit 0 exit 0
fi fi
} || { } || {
## otherwise, not R14.0.12 or misc, and we are creating/updating git, ## otherwise, not R14.0.13 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
@ -171,7 +171,7 @@ git fetch origin r14.0.x:r14.0.x)
git clone https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl git clone https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl
} }
## if tdenetwork, need libtdevnc, but not yet for 14.0.x or 14.0.12 which use krfb/libvncserver ## if tdenetwork, need libtdevnc, but not yet for 14.0.x or 14.0.13 which use krfb/libvncserver
[[ " tdenetwork " == *$PRGNAM* ]] && { [[ " tdenetwork " == *$PRGNAM* ]] && {
[[ -d libtdevnc ]] && \ [[ -d libtdevnc ]] && \
(echo "Updating libtdevnc ..." (echo "Updating libtdevnc ..."
@ -246,7 +246,7 @@ cd $TMP_BUILD/tmp-$PRGNAM
## ##
## [1] firstly test for R14 or misc .. ## [1] firstly test for R14 or misc ..
## ##
[[ $TDEVERSION == 14.0.12 || $TDEMIR_SUBDIR == misc ]] && { [[ $TDEVERSION == 14.0.13 || $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
@ -260,7 +260,7 @@ mv cmake-trinity-$TDEVERSION cmake
} || { } || {
## [2] not 14.0.12 nor misc, so must be git .. ## [2] not 14.0.13 nor misc, so must be git ..
[[ $TDEVERSION == 14.1.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.0.x [[ $TDEVERSION == 14.1.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.0.x
## copy git content to build area: ## copy git content to build area:
@ -309,7 +309,7 @@ echo # if this fails, SlackBuild will fail from [3]
cd $PRGNAM* cd $PRGNAM*
## For cmake builds - the path to the TDE cmake modules ## For cmake builds - the path to the TDE cmake modules
## Added for 14.0.x[aka 14.0.13+] & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories ## Added for 14.0.11+ & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories
export CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/cmake/modules export CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/cmake/modules
} }

Loading…
Cancel
Save