Re-add nonprism/digikam

I removed it by mistake

4 files changed, 389 insertions, 0 deletions

diff --git a/nonprism/digikam/0001-optionally-enable-OpenGL.patch b/nonprism/digikam/0001-optionally-enable-OpenGL.patch
new file mode 100644
index 000000000..f87e8e4a8
--- /dev/null
+++ b/nonprism/digikam/0001-optionally-enable-OpenGL.patch
@@ -0,0 +1,34 @@
+From 9b37ca152cbae4b86ce2b93f7b1af58f092d1ccf Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Tue, 5 Jul 2016 18:47:56 -0600
+Subject: [PATCH] optionally enable OpenGL
+
+Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 89e0682..b60d0b4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,6 +105,7 @@ option(ENABLE_KFILEMETADATASUPPORT  "Build digiKam with KDE files indexer suppor
+ option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                         OFF)
+ option(ENABLE_MEDIAPLAYER           "Build digiKam with Media Player support (default=OFF)"                              OFF)
+ option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                       ON)
++option(ENABLE_OPENGL                "Build digiKam with OpenGL support (default=ON)"                                   ON)
+ option(ENABLE_APPSTYLES             "Build digiKam with support for changing the widget application style (default=OFF)" OFF)
+ 
+ # Mysql support options (experimental):
+@@ -293,7 +294,7 @@ else()
+ endif()
+ 
+ # decide if Presentation tool can be built with OpenGL
+-if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND)
++if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND Qt5OpenGL_FOUND AND ENABLE_OPENGL)
+     set(HAVE_OPENGL TRUE)
+ elseif()
+     set(HAVE_OPENGL FALSE)
+-- 
+2.10.2
+
diff --git a/nonprism/digikam/PKGBUILD b/nonprism/digikam/PKGBUILD
new file mode 100644
index 000000000..06d55ef0a
--- /dev/null
+++ b/nonprism/digikam/PKGBUILD
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Andreas Grapentin <andreas@grapentin.org>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
+# Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
+
+# parabola changes and rationale:
+#  - remove libkvkontakte support for kipi-plugins
+
+pkgbase=digikam
+pkgname=(kipi-plugins)
+_pkgver=5.8.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1.nonprism1
+pkgdesc="An advanced digital photo management application"
+arch=('x86_64' 'i686' 'armv7h')
+license=('GPL')
+url="http://www.digikam.org/"
+makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common
+             kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte)
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+        "libre.patch"
+        "nonprism.patch")
+sha256sums=('194a44cc3ca229d501acfba67a38d483d1d64069a85e0491dd28dc2b57091c6e'
+            '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89'
+            'e3d8ec4fd041a5545b7efef167d3b2ae6efc1f510832dabc7430ddfeb6b3c4ac')
+
+prepare() {
+  mkdir -p build
+
+# fix freedom issues
+  cd $pkgbase-$_pkgver
+  patch -Np1 -i "$srcdir"/libre.patch
+  patch -Np1 -i "$srcdir"/nonprism.patch
+}
+
+build() {
+  cd build
+
+  cmake ../${pkgbase}-${_pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DENABLE_KFILEMETADATASUPPORT=ON \
+    -DENABLE_MEDIAPLAYER=ON \
+    -DENABLE_AKONADICONTACTSUPPORT=ON \
+    -DENABLE_MYSQLSUPPORT=ON \
+    -DENABLE_OPENCV3=ON \
+    -DENABLE_APPSTYLES=ON \
+    -DENABLE_LEGACY=ON \
+    -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF
+  make
+}
+
+package_kipi-plugins() {
+  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree suggestions and support for unsafe and dangerous for privacy protocols"
+  depends=(kio libkipi)
+  optdepends=('libmediawiki: MediaWiki Export plugin')
+
+  cd build/extra
+  make DESTDIR="$pkgdir" install
+  cd $srcdir/build/po
+  make DESTDIR="$pkgdir" install
+
+# Provided by digikam
+  rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
+}
diff --git a/nonprism/digikam/libre.patch b/nonprism/digikam/libre.patch
new file mode 100644
index 000000000..8c677e210
--- /dev/null
+++ b/nonprism/digikam/libre.patch
@@ -0,0 +1,58 @@
+diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
+index 0f58cc4..b497299 100644
+--- a/extra/kipi-plugins/sendimages/emailsettings.h
++++ b/extra/kipi-plugins/sendimages/emailsettings.h
+@@ -64,10 +64,9 @@ public:
+         CLAWSMAIL,
+         EVOLUTION,
+         KMAIL,
+-        NETSCAPE,
+         SYLPHEED,
+         SYLPHEEDCLAWS,
+-        THUNDERBIRD
++        ICEDOVE
+     };
+ 
+     enum ImageSize
+diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
+index 1be65d6..68094de 100644
+--- a/extra/kipi-plugins/sendimages/sendimages.cpp
++++ b/extra/kipi-plugins/sendimages/sendimages.cpp
+@@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()
+                 // More info about command lines options with Mozilla & co:
+                 // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules
+ 
+-                case EmailSettings::NETSCAPE:
+-                case EmailSettings::THUNDERBIRD:
++                case EmailSettings::ICEDOVE:
+                 {
+                     QString prog;
+ 
+-                    if (d->settings.emailProgram == EmailSettings::NETSCAPE)
++                    if (d->settings.emailProgram == EmailSettings::ICEDOVE)
+                     {
+-                        prog = QLatin1String("netscape");
+-                    }
+-                    else
+-                    {
+-                        prog = QLatin1String("thunderbird");
++                        prog = QLatin1String("icedove");
+                     }
+ 
+                     QStringList args;
+diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
+index b8416a4..f160310 100644
+--- a/extra/kipi-plugins/sendimages/settingswidget.cpp
++++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
+@@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
+     d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL,     QLatin1String("Claws Mail"));
+     d->mailAgentName->insertItem(EmailSettings::EVOLUTION,     QLatin1String("Evolution"));
+     d->mailAgentName->insertItem(EmailSettings::KMAIL,         QLatin1String("KMail"));
+-    d->mailAgentName->insertItem(EmailSettings::NETSCAPE,      QLatin1String("Netscape"));
+     d->mailAgentName->insertItem(EmailSettings::SYLPHEED,      QLatin1String("Sylpheed"));
+     d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));
+-    d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD,   QLatin1String("Thunderbird"));
++    d->mailAgentName->insertItem(EmailSettings::ICEDOVE,   QLatin1String("Icedove"));
+ #endif
+     d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
+     d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch
new file mode 100644
index 000000000..779196f09
--- /dev/null
+++ b/nonprism/digikam/nonprism.patch
@@ -0,0 +1,225 @@
+diff --git a/doc/TODO b/doc/TODO
+index a0ac4f4c6..23bf7450f 100644
+--- a/doc/TODO
++++ b/doc/TODO
+@@ -78,16 +78,10 @@ menu-mainwindow.docbook                    *               *                  Gi
+ tool-acquireimages.docbook
+ tool-advrename.docbook                                                                             Need to be created
+ tool-calendar.docbook                                                                              Need to be created
+-tool-dropbox.docbook                                                                               Need to be created
+ tool-expoblending.docbook                                                                          Need to be created
+-tool-facebook.docbook                                                                              Need to be created
+ tool-findduplicates.docbook                                                                        Need to be created
+ tool-flashexport.docbook                                                                           Need to be created
+-tool-flickrexport.docbook
+ tool-geolocationeditor.docbook                                                                     Need to be created
+-tool-googleexport.docbook                                                                          Need to be created
+-tool-imageshack.docbook                                                                            Need to be created
+-tool-imgur.docbook                                                                                 Need to be created
+ tool-kmlexport.docbook                                                                             Need to be created
+ tool-maintenance.docbook                                                                           Need to be created
+ tool-mediawiki.docbook                                                                             Need to be created
+@@ -97,12 +91,8 @@ tool-panorama.docbook
+ tool-piwigoexport.docbook                                                                          Need to be created
+ tool-presentation.docbook
+ tool-printwizard.docbook
+-tool-rajce.docbook                                                                                 Need to be created
+ tool-remotestorage.docbook                                                                         Need to be created
+ tool-sendimages.docbook
+-tool-smug.docbook                                                                                  Need to be created
+-tool-vkontakte.docbook                                                                             Need to be created
+-tool-yandexfotki.docbook                                                                           Need to be created
+ using-bqm.docbook
+ using-camera.docbook                       DONE            DONE               Gilles
+ using-camera-intro.docbook
+diff --git a/doc/digikam/index.docbook b/doc/digikam/index.docbook
+index 080275044..0fe7027c9 100644
+--- a/doc/digikam/index.docbook
++++ b/doc/digikam/index.docbook
+@@ -172,21 +172,11 @@
+     <!-- plugins -->
+     <!ENTITY doc-tool-printwizard                 SYSTEM "tool-printwizard.docbook">
+     <!ENTITY doc-tool-sendimages                  SYSTEM "tool-sendimages.docbook">
+-    <!ENTITY doc-tool-flickrexport                SYSTEM "tool-flickrexport.docbook">
+     <!ENTITY doc-tool-piwigoexport                SYSTEM "tool-piwigoexport.docbook">
+     <!ENTITY doc-tool-kmlexport                   SYSTEM "tool-kmlexport.docbook">
+-    <!ENTITY doc-tool-googleexport                SYSTEM "tool-googleexport.docbook">
+     <!ENTITY doc-tool-flashexport                 SYSTEM "tool-flashexport.docbook">
+-    <!ENTITY doc-tool-dropbox                     SYSTEM "tool-dropbox.docbook">
+-    <!ENTITY doc-tool-facebook                    SYSTEM "tool-facebook.docbook">
+-    <!ENTITY doc-tool-imageshack                  SYSTEM "tool-imageshack.docbook">
+-    <!ENTITY doc-tool-imgur                       SYSTEM "tool-imgur.docbook">
+     <!ENTITY doc-tool-mediawiki                   SYSTEM "tool-mediawiki.docbook">
+-    <!ENTITY doc-tool-rajce                       SYSTEM "tool-rajce.docbook">
+     <!ENTITY doc-tool-remotestorage               SYSTEM "tool-remotestorage.docbook">
+-    <!ENTITY doc-tool-smug                        SYSTEM "tool-smug.docbook">
+-    <!ENTITY doc-tool-vkontakte                   SYSTEM "tool-vkontakte.docbook">
+-    <!ENTITY doc-tool-yandexfotki                 SYSTEM "tool-yandexfotki.docbook">
+ 
+     <!-- Menus Chapter -->
+ 
+@@ -311,21 +301,11 @@
+     <!-- plugins -->
+     &doc-tool-printwizard;
+     &doc-tool-sendimages;
+-    &doc-tool-flickrexport;
+     &doc-tool-piwigoexport;
+     &doc-tool-kmlexport;
+-    &doc-tool-googleexport;
+     &doc-tool-flashexport;
+-    &doc-tool-dropbox;
+-    &doc-tool-facebook;
+-    &doc-tool-imageshack;
+-    &doc-tool-imgur;
+     &doc-tool-mediawiki;
+-    &doc-tool-rajce;
+     &doc-tool-remotestorage;
+-    &doc-tool-smug;
+-    &doc-tool-vkontakte;
+-    &doc-tool-yandexfotki;
+ 
+ <!-- ******** MENUS ******************************************************** -->
+ 
+diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook
+index 5c8e8e2b2..acdef13a2 100644
+--- a/doc/digikam/menu-mainwindow.docbook
++++ b/doc/digikam/menu-mainwindow.docbook
+@@ -943,22 +943,6 @@
+ 
+         <varlistentry>
+             <term><menuchoice>
+-                <guimenu>Export</guimenu><guimenuitem>KML Export...</guimenuitem>
+-            </menuchoice></term>
+-            <listitem>
+-                <para><action>
+-                    Tool to export the images series into a KML structure. KML files can then be opened and displayed with GoogleEarth.
+-                </action></para>
+-                <para>
+-                    See the dedicated 
+-                    <link linkend="tool-flickrexport">KML Export Tool</link> 
+-                    for more information.
+-                </para>
+-            </listitem>
+-        </varlistentry>
+-
+-        <varlistentry>
+-            <term><menuchoice>
+                 <guimenu>Tools</guimenu><guimenuitem>Export to Piwigo</guimenuitem>
+             </menuchoice></term>
+             <listitem>
+@@ -973,21 +957,6 @@
+             </listitem>
+         </varlistentry>
+ 
+-        <varlistentry>
+-            <term><menuchoice>
+-                <guimenu>Export</guimenu><guimenuitem>Export to Flickr...</guimenuitem>
+-            </menuchoice></term>
+-            <listitem>
+-                <para><action>
+-                    Tool to upload or update images to <ulink url="http://www.flickr.com/">Flickr</ulink> server.
+-                </action></para>
+-                <para>
+-                    See the dedicated 
+-                    <link linkend="tool-flickrexport">Flickr Export Tool</link> 
+-                    for more information.
+-                </para>
+-            </listitem>
+-        </varlistentry>
+ <!-- not ported to Qt5
+         <varlistentry>
+             <term><menuchoice>
+@@ -1005,37 +974,6 @@
+             </listitem>
+         </varlistentry>
+ -->
+-        <varlistentry>
+-            <term><menuchoice>
+-                <guimenu>Export</guimenu><guimenuitem>Export to Google Photos...</guimenuitem>
+-            </menuchoice></term>
+-            <listitem>
+-                <para><action>
+-                    Tool upload or update images to <ulink url="https://photos.google.com/">Google Photos galleries</ulink>.
+-                </action></para>
+-                <para>
+-                    See the dedicated 
+-                    <link linkend="tool-googleexport">Google Services Tool</link>
+-                    for more information.
+-                </para>
+-            </listitem>
+-        </varlistentry>
+-
+-        <varlistentry>
+-            <term><menuchoice>
+-                <guimenu>Export</guimenu><guimenuitem>Export to Google Drive...</guimenuitem>
+-            </menuchoice></term>
+-            <listitem>
+-                <para><action>
+-                    Tool upload images to <ulink url="https://www.google.com/drive/">Google Drive</ulink>.
+-                </action></para>
+-                <para>
+-                    See the dedicated 
+-                    <link linkend="tool-googleexport">Google Services Tool</link>
+-                    for more information.
+-                </para>
+-            </listitem>
+-        </varlistentry>
+ <!-- not ported to Qt5
+         <varlistentry>
+             <term><menuchoice>
+diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt
+index 63579cae7..9b8171ca3 100644
+--- a/extra/kipi-plugins/CMakeLists.txt
++++ b/extra/kipi-plugins/CMakeLists.txt
+@@ -145,7 +145,6 @@ if(KF5Kipi_FOUND)
+     # -- Optional dependencies detection required by some plugins -------------------------------------
+ 
+     DETECT_LIBMEDIAWIKI(5.0.0)                                                 # For Mediawiki.
+-    DETECT_LIBKVKONTAKTE(4.70.0)                                               # For VKontakte.
+ 
+     # ==================================================================================================
+     # Log messages
+@@ -166,7 +165,6 @@ if(KF5Kipi_FOUND)
+     PRINT_OPTIONAL_LIBRARY_STATUS("libkio"          "https://projects.kde.org/projects/frameworks/kio"                "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libkio support."          KF5KIO_FOUND)
+     PRINT_OPTIONAL_LIBRARY_STATUS("libkarchive"     "https://projects.kde.org/projects/frameworks/karchive"           "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libkarchive support."     KF5Archive_FOUND)
+     PRINT_OPTIONAL_LIBRARY_STATUS("libmediawiki"    "https://projects.kde.org/projects/extragear/libs/libmediawiki"   "(version >= ${KF5_MIN_VERSION})"      "Kipi-plugins will be compiled without libmediawiki support."    KF5MediaWiki_FOUND)
+-    PRINT_OPTIONAL_LIBRARY_STATUS("libkvkontakte"   "https://projects.kde.org/projects/extragear/libs/libkvkontakte"  "(version >= 4.70.0)"                  "Kipi-plugins will be compiled without libkvkontakte support."   KF5Vkontakte_FOUND)
+ 
+     # Optional plugins results ----------------------------------------------------------------------------
+ 
+@@ -183,7 +181,6 @@ if(KF5Kipi_FOUND)
+     endif()
+ 
+     PRINT_COMPONENT_COMPILE_STATUS("Legacy plugins"     ENABLE_LEGACY)
+-    PRINT_COMPONENT_COMPILE_STATUS("VKontakte"          KF5Vkontakte_FOUND)
+     PRINT_COMPONENT_COMPILE_STATUS("Mediawiki"          KF5MediaWiki_FOUND)
+     PRINT_COMPONENT_COMPILE_STATUS("FlashExport"        KF5Archive_FOUND)
+ 
+@@ -243,16 +240,7 @@ if(KF5Kipi_FOUND)
+         add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ 
+         add_subdirectory(common)
+-        add_subdirectory(flickr)
+-        add_subdirectory(dropbox)
+-        add_subdirectory(facebook)
+-        add_subdirectory(imgur)
+         add_subdirectory(piwigo)
+-        add_subdirectory(rajce)
+-        add_subdirectory(smug)
+-        add_subdirectory(imageshack)
+-        add_subdirectory(yandexfotki)
+-        add_subdirectory(googleservices)
+ 
+         if(ENABLE_LEGACY)
+             add_subdirectory(printimages)
+@@ -266,10 +254,6 @@ if(KF5Kipi_FOUND)
+ 
+         endif()
+ 
+-        if(KF5Vkontakte_FOUND)
+-            add_subdirectory(vkontakte)
+-        endif()
+-
+         if(KF5MediaWiki_FOUND)
+             add_subdirectory(mediawiki)
+         endif()