From da1be5a21ba06235b67a999f696ec66e35dc17a1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 00:06:49 +0100 Subject: Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0. KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015 --- deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff | 16 ++++++++++++++++ deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz | Bin 325 -> 0 bytes deps/strigi/strigi-fix-jpeg-isospeedratings.diff | 18 ++++++++++++++++++ .../strigi/strigi-fix-jpeg-isospeedratings.diff.gz | Bin 464 -> 0 bytes deps/strigi/strigi-fix-missing-lucene-lib.diff | 7 +++++++ deps/strigi/strigi-fix-missing-lucene-lib.diff.gz | Bin 294 -> 0 bytes deps/strigi/strigi.SlackBuild | 21 ++++++++++----------- 7 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff delete mode 100644 deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz create mode 100644 deps/strigi/strigi-fix-jpeg-isospeedratings.diff delete mode 100644 deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz create mode 100644 deps/strigi/strigi-fix-missing-lucene-lib.diff delete mode 100644 deps/strigi/strigi-fix-missing-lucene-lib.diff.gz (limited to 'deps/strigi') diff --git a/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff b/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff new file mode 100644 index 0000000..d4721c3 --- /dev/null +++ b/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff @@ -0,0 +1,16 @@ +Description: Fix FTBFS with gcc 4.7 due to missing include. +Author: Cyril Brulebois +Bug-Debian: http://bugs.debian.org/667384 + +--- strigi-0.7.7.orig/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp ++++ strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp +@@ -27,9 +27,7 @@ + #include + #include + +-#if defined(__SUNPRO_CC) + #include +-#endif + + using namespace std; + diff --git a/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz b/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz deleted file mode 100644 index e589819..0000000 Binary files a/deps/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff.gz and /dev/null differ diff --git a/deps/strigi/strigi-fix-jpeg-isospeedratings.diff b/deps/strigi/strigi-fix-jpeg-isospeedratings.diff new file mode 100644 index 0000000..69053d2 --- /dev/null +++ b/deps/strigi/strigi-fix-jpeg-isospeedratings.diff @@ -0,0 +1,18 @@ +diff --git plugins/endplugins/jpegendanalyzer.cpp plugins/endplugins/jpegendanalyzer.cpp +index 78ed36a..0ecab40 100644 +--- a/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp ++++ b/libstreamanalyzer/plugins/endplugins/jpegendanalyzer.cpp +@@ -322,6 +327,11 @@ JpegEndAnalyzer::analyze(AnalysisResult& ar, ::InputStream* in) { + ar.addValue(factory->exifFields.find("Exif.Image.DateTime")->second, uint32_t(mktime(&date))); + } + } ++ else if (i->key() == "Exif.Photo.ISOSpeedRatings") { ++ stringstream st; ++ st << i->toLong(); ++ ar.addValue(factory->exifFields.find("Exif.Photo.ISOSpeedRatings")->second, st.str()); ++ } + else if (i->key() != "Exif.Photo.PixelXDimension" && i->key() != "Exif.Photo.PixelYDimension") { + map::const_iterator f + = factory->exifFields.find(i->key()); + + diff --git a/deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz b/deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz deleted file mode 100644 index 18a5581..0000000 Binary files a/deps/strigi/strigi-fix-jpeg-isospeedratings.diff.gz and /dev/null differ diff --git a/deps/strigi/strigi-fix-missing-lucene-lib.diff b/deps/strigi/strigi-fix-missing-lucene-lib.diff new file mode 100644 index 0000000..cfc9d9e --- /dev/null +++ b/deps/strigi/strigi-fix-missing-lucene-lib.diff @@ -0,0 +1,7 @@ +--- a/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt 2011-07-26 19:12:39.000000000 +0200 ++++ b/libstreamanalyzer/plugins/indexers/clucenengindexer/indexdump/CMakeLists.txt 2011-12-03 09:52:05.062132856 +0100 +@@ -1,2 +1,2 @@ + add_executable(index2dump indexdump.cpp ../tcharutils.cpp) +-target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS}) ++target_link_libraries(index2dump streamanalyzer ${CLUCENE1_LDFLAGS} clucene-shared) + diff --git a/deps/strigi/strigi-fix-missing-lucene-lib.diff.gz b/deps/strigi/strigi-fix-missing-lucene-lib.diff.gz deleted file mode 100644 index e0be6be..0000000 Binary files a/deps/strigi/strigi-fix-missing-lucene-lib.diff.gz and /dev/null differ diff --git a/deps/strigi/strigi.SlackBuild b/deps/strigi/strigi.SlackBuild index 69c248a..cfbc3da 100755 --- a/deps/strigi/strigi.SlackBuild +++ b/deps/strigi/strigi.SlackBuild @@ -21,25 +21,24 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2012, 2014 by Eric Hameleers for ARM port. +# Modified 2012, 2014, 2015 by Eric Hameleers for ARM port. PKGNAM=strigi VERSION=${VERSION:-0.7.8} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi if [ "$ARCH" = "i486" ]; then @@ -70,13 +69,13 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -#zcat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff.gz |patch -p1 --verbose || exit 1 +#cat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff |patch -p1 --verbose || exit 1 # Fix a linker DSO error: -zcat $CWD/strigi-fix-missing-lucene-lib.diff.gz |patch -p1 --verbose || exit 1 +cat $CWD/strigi-fix-missing-lucene-lib.diff |patch -p1 --verbose || exit 1 # Fix indexing of jpegs with 'wrong' isoSpeedRatings: -zcat $CWD/strigi-fix-jpeg-isospeedratings.diff.gz |patch -p1 --verbose || exit 1 +cat $CWD/strigi-fix-jpeg-isospeedratings.diff |patch -p1 --verbose || exit 1 # Fix a bug with gcc 4.8: sed -i -e "s/BufferedStream :/STREAMS_EXPORT &/" libstreams/include/strigi/bufferedstream.h -- cgit v1.2.3