summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-03-19 21:22:50 +0100
committer Eric Hameleers <alien@slackware.com>2017-03-19 21:22:50 +0100
commit16dbede0be07e7d94017442bc4f0202743c797dc (patch)
treea0194991e5bc3e0395224c3010d1a42a29fb1761 /kde
parent0155d9a5ee90259d5622da1dc19ae257e0a04409 (diff)
downloadktown-16dbede0be07e7d94017442bc4f0202743c797dc.tar.gz
ktown-16dbede0be07e7d94017442bc4f0202743c797dc.tar.xz
kde: added digikam, k3b, kdenlive, libkface
Diffstat (limited to 'kde')
-rw-r--r--kde/cmake/digikam34
-rw-r--r--kde/cmake/k3b7
l---------kde/cmake/krusader1
-rw-r--r--kde/cmake/libkface22
-rw-r--r--kde/modularize5
-rw-r--r--kde/modules/applications4
-rw-r--r--kde/modules/applications-extra3
-rw-r--r--kde/modules/kde4-extragear1
-rw-r--r--kde/patch/digikam.patch4
-rw-r--r--kde/patch/digikam/digikam_clang_fix.patch38
-rw-r--r--kde/patch/libkface.patch3
-rw-r--r--kde/patch/libkface/libkface_opencv3.patch61
-rw-r--r--kde/slack-desc/kdenlive2
-rw-r--r--kde/slack-desc/krusader19
14 files changed, 197 insertions, 7 deletions
diff --git a/kde/cmake/digikam b/kde/cmake/digikam
new file mode 100644
index 0000000..23af279
--- /dev/null
+++ b/kde/cmake/digikam
@@ -0,0 +1,34 @@
+# https://bugs.kde.org/show_bug.cgi?id=377597 :
+# Don't try to compile documentation translations for the moment.
+# Only the English handbook compiles fine.
+# Use cmake option "-DDIGIKAMSC_COMPILE_DOC=OFF"
+
+mkdir build
+cd build
+ cmake \
+ $KDE_OPT_ARGS \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -std=c++11" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF \
+ -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
+ -DENABLE_AKONADICONTACTSUPPORT=ON \
+ -DENABLE_APPSTYLES=ON \
+ -DENABLE_KFILEMETADATASUPPORT=ON \
+ -DENABLE_MEDIAPLAYER=ON \
+ -DENABLE_MYSQLSUPPORT=ON \
+ -DENABLE_OPENCV3=ON \
+ -DDIGIKAMSC_COMPILE_DOC=OFF \
+ ..
+
diff --git a/kde/cmake/k3b b/kde/cmake/k3b
index f770d25..00abdd5 100644
--- a/kde/cmake/k3b
+++ b/kde/cmake/k3b
@@ -1,4 +1,3 @@
-sed -i.cmakehack -e "s|^cmake_minimum_required|#cmake_minimum_required|" CMakeLists.txt
mkdir build
cd build
cmake \
@@ -12,7 +11,11 @@ cd build
-DMAN_INSTALL_DIR=/usr/man \
-DSYSCONF_INSTALL_DIR=/etc/kde \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
+ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DBUILD_TESTING:BOOL=OFF \
-DK3B_ENABLE_HAL_SUPPORT:BOOL=OFF \
- -DKDE4_ENABLE_HTMLHANDBOOK:BOOL=ON \
+ -DK3B_ENABLE_PERMISSION_HELPER:BOOL=ON \
..
diff --git a/kde/cmake/krusader b/kde/cmake/krusader
new file mode 120000
index 0000000..ab12832
--- /dev/null
+++ b/kde/cmake/krusader
@@ -0,0 +1 @@
+applications5 \ No newline at end of file
diff --git a/kde/cmake/libkface b/kde/cmake/libkface
new file mode 100644
index 0000000..d57a922
--- /dev/null
+++ b/kde/cmake/libkface
@@ -0,0 +1,22 @@
+mkdir build
+cd build
+ cmake \
+ $KDE_OPT_ARGS \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMAN_INSTALL_DIR=/usr/man \
+ -DSYSCONF_INSTALL_DIR=/etc/kde \
+ -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+ -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DLIBEXEC_INSTALL_DIR=lib$LIBDIRSUFFIX \
+ -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
+ -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF \
+ -DENABLE_OPENCV3=ON \
+ ..
+
diff --git a/kde/modularize b/kde/modularize
index 90b8599..a06985e 100644
--- a/kde/modularize
+++ b/kde/modularize
@@ -453,7 +453,6 @@ libkexiv2_4
# kde4 extragear
libkcddb4
-k3b
kaudiocreator
kplayer
kwebkitpart
@@ -463,6 +462,8 @@ kdeconnect4
# applications extra
calligra
+digikam
+k3b
krita
libktorrent
ktorrent
@@ -477,4 +478,6 @@ kdev-php
kuser
kdiagram
kjots
+krusader
+
diff --git a/kde/modules/applications b/kde/modules/applications
index 87f59de..cb33bdb 100644
--- a/kde/modules/applications
+++ b/kde/modules/applications
@@ -55,7 +55,7 @@ ksaneplugin
spectacle
svgpart
# needs opencv:
-#libkface
+libkface
# kdeaccessibility:
#jovie
@@ -193,7 +193,7 @@ step
libkgeomap
# Needs ffmpeg and dvdauthor to be really useful:
-#kdenlive
+kdenlive
# kdewebdev is split into kfilereplace, kimagemapeditor, klinkstatus, kommander:
kfilereplace
diff --git a/kde/modules/applications-extra b/kde/modules/applications-extra
index 3e7af05..2df82b8 100644
--- a/kde/modules/applications-extra
+++ b/kde/modules/applications-extra
@@ -1,4 +1,6 @@
calligra
+digikam
+k3b
krita
libktorrent
ktorrent
@@ -12,6 +14,7 @@ kdev-php
kdiagram
kjots
kuser
+krusader
# Requires python3:
#kdev-python
diff --git a/kde/modules/kde4-extragear b/kde/modules/kde4-extragear
index a77a5f7..e5a24ea 100644
--- a/kde/modules/kde4-extragear
+++ b/kde/modules/kde4-extragear
@@ -1,5 +1,4 @@
libkcddb4
-k3b
#kaudiocreator
#kplayer
kwebkitpart
diff --git a/kde/patch/digikam.patch b/kde/patch/digikam.patch
new file mode 100644
index 0000000..21b9052
--- /dev/null
+++ b/kde/patch/digikam.patch
@@ -0,0 +1,4 @@
+# Fix compilation with clang.
+# Fixed in digikam 5.5.0.
+#cat $CWD/patch/digikam/digikam_clang_fix.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/digikam/digikam_clang_fix.patch b/kde/patch/digikam/digikam_clang_fix.patch
new file mode 100644
index 0000000..a4d77b0
--- /dev/null
+++ b/kde/patch/digikam/digikam_clang_fix.patch
@@ -0,0 +1,38 @@
+Taken from:
+http://pkgs.fedoraproject.org/cgit/rpms/digikam.git/
+And added and extra '/core/' path componenent.
+
+From 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 Mon Sep 17 00:00:00 2001
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Wed, 18 Jan 2017 10:13:20 +0100
+Subject: [PATCH 2/2] Fix compilation with clang
+
+---
+ libs/dmetadata/metaengine_p.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/libs/dmetadata/metaengine_p.cpp b/core/libs/dmetadata/metaengine_p.cpp
+index 2c83b58..2b44e06 100644
+--- a/core/libs/dmetadata/metaengine_p.cpp
++++ b/core/libs/dmetadata/metaengine_p.cpp
+@@ -49,7 +49,7 @@ extern "C"
+ #include "digikam_debug.h"
+
+ // Pragma directives to reduce warnings from Exiv2.
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ #endif
+@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar)
+ } // namespace Digikam
+
+ // Restore warnings
+-#if not defined(__APPLE__) && defined(__GNUC__)
++#if !defined(__APPLE__) && defined(__GNUC__)
+ #pragma GCC diagnostic pop
+ #endif
+
+--
+2.9.3
+
diff --git a/kde/patch/libkface.patch b/kde/patch/libkface.patch
new file mode 100644
index 0000000..9775e82
--- /dev/null
+++ b/kde/patch/libkface.patch
@@ -0,0 +1,3 @@
+# Compile libkface against opencv 3.2:
+cat $CWD/patch/libkface/libkface_opencv3.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/libkface/libkface_opencv3.patch b/kde/patch/libkface/libkface_opencv3.patch
new file mode 100644
index 0000000..a6804d3
--- /dev/null
+++ b/kde/patch/libkface/libkface_opencv3.patch
@@ -0,0 +1,61 @@
+Taken from Gentoo:
+https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-apps/libkface/files/libkface-16.11.80-opencv3.2-gentoo-3.1.patch
+
+--- a/src/recognition-opencv-lbph/facerec_borrowed.h 2016-11-26 14:19:01.492645170 +0100
++++ b/src/recognition-opencv-lbph/facerec_borrowed.h.new 2016-11-26 14:19:17.655835794 +0100
+@@ -141,7 +141,7 @@
+ /*
+ * Predict
+ */
+- void predict(cv::InputArray src, cv::Ptr<cv::face::PredictCollector> collector, const int state = 0) const override;
++ void predict(cv::InputArray src, cv::Ptr<cv::face::PredictCollector> collector) const override;
+ #endif
+
+ /**
+--- a/src/recognition-opencv-lbph/facerec_borrowed.cpp 2016-11-26 14:19:01.492645170 +0100
++++ b/src/recognition-opencv-lbph/facerec_borrowed.cpp.new 2016-11-26 14:19:29.184971765 +0100
+@@ -380,7 +380,7 @@
+ #if OPENCV_TEST_VERSION(3,1,0)
+ void LBPHFaceRecognizer::predict(InputArray _src, int &minClass, double &minDist) const
+ #else
+-void LBPHFaceRecognizer::predict(cv::InputArray _src, cv::Ptr<cv::face::PredictCollector> collector, const int state) const
++void LBPHFaceRecognizer::predict(cv::InputArray _src, cv::Ptr<cv::face::PredictCollector> collector) const
+ #endif
+ {
+ if(m_histograms.empty())
+@@ -404,7 +404,7 @@
+ minDist = DBL_MAX;
+ minClass = -1;
+ #else
+- collector->init((int)m_histograms.size(), state);
++ collector->init((int)m_histograms.size());
+ #endif
+
+ // This is the standard method
+@@ -424,7 +424,7 @@
+ }
+ #else
+ int label = m_labels.at<int>((int) sampleIdx);
+- if (!collector->emit(label, dist, state))
++ if (!collector->collect(label, dist))
+ {
+ return;
+ }
+@@ -470,7 +470,7 @@
+ minClass = it->first;
+ }
+ #else
+- if (!collector->emit(it->first, mean, state))
++ if (!collector->collect(it->first, mean))
+ {
+ return;
+ }
+@@ -523,7 +523,7 @@
+ }
+ #else
+ // large is better thus it is -score.
+- if (!collector->emit(it->first, -score, state))
++ if (!collector->collect(it->first, -score))
+ {
+ return;
+ }
diff --git a/kde/slack-desc/kdenlive b/kde/slack-desc/kdenlive
index 0b20c12..7d1b619 100644
--- a/kde/slack-desc/kdenlive
+++ b/kde/slack-desc/kdenlive
@@ -14,6 +14,6 @@ kdenlive:
kdenlive:
kdenlive:
kdenlive:
-kdenlive:e
+kdenlive:
kdenlive: For more information, visit: http://www.kdenlive.org
kdenlive:
diff --git a/kde/slack-desc/krusader b/kde/slack-desc/krusader
new file mode 100644
index 0000000..9221c43
--- /dev/null
+++ b/kde/slack-desc/krusader
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+krusader: krusader (twin panel file management for KDE)
+krusader:
+krusader: Krusader is an advanced twin panel (commander style) file manager
+krusader: for KDE and other desktops in the *nix world, similar to Midnight
+krusader: or Total Commander.
+krusader: It provides all the file management features you could possibly want.
+krusader:
+krusader:
+krusader:
+krusader: For more information, visit: http://krusader.org
+krusader: