From 1686b7acfc86b105abb2de4a04138155a7b05a30 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Jan 2017 00:34:30 -0300 Subject: kipi-plugins-5.4.0-1.parabola1{,.nonprism1}: updating version --- .../digikam/0001-optionally-enable-OpenGL.patch | 34 ++++ nonprism/digikam/PKGBUILD | 85 ++++++++ nonprism/digikam/digikam-find-qtav.patch | 21 ++ nonprism/digikam/libre.patch | 58 ++++++ nonprism/digikam/nonprism.patch | 223 +++++++++++++++++++++ 5 files changed, 421 insertions(+) create mode 100644 nonprism/digikam/0001-optionally-enable-OpenGL.patch create mode 100644 nonprism/digikam/PKGBUILD create mode 100644 nonprism/digikam/digikam-find-qtav.patch create mode 100644 nonprism/digikam/libre.patch create mode 100644 nonprism/digikam/nonprism.patch (limited to 'nonprism/digikam') diff --git a/nonprism/digikam/0001-optionally-enable-OpenGL.patch b/nonprism/digikam/0001-optionally-enable-OpenGL.patch new file mode 100644 index 000000000..909a44434 --- /dev/null +++ b/nonprism/digikam/0001-optionally-enable-OpenGL.patch @@ -0,0 +1,34 @@ +From 9e291325f5d2568834fd0d590e5e99af129d9518 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Tue, 5 Jul 2016 18:47:56 -0600 +Subject: [PATCH] optionally enable OpenGL + +Signed-off-by: Kevin Mihelich +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d3e64b5..1dabead 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,6 +104,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 QtMultimedia 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): +@@ -286,7 +287,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.9.2 + diff --git a/nonprism/digikam/PKGBUILD b/nonprism/digikam/PKGBUILD new file mode 100644 index 000000000..72602bb03 --- /dev/null +++ b/nonprism/digikam/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 285609 2017-01-09 23:33:53Z arojas $ +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Tobias Powalowski +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgbase=digikam +pkgname=kipi-plugins +_pkgver=5.4.0 +pkgver=${_pkgver//-/_} # for beta versions +pkgrel=1.parabola1.nonprism1 +pkgdesc="Digital photo management application for KDE" +arch=('i686' 'x86_64' 'armv7h') +license=('GPL') +url="http://www.digikam.org/" +replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism") +conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") +makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost' + 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin' + 'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore' + 'knotifyconfig' 'libmediawiki' 'libkvkontakte') +source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" digikam-find-qtav.patch + "libre.patch" + "nonprism.patch" + '0001-optionally-enable-OpenGL.patch') +sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894' + 'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939' + 'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544' + '246366b6b4b315957387938d842112e1146b9495' + '95169d438884b1650a4c11e1ca44ae7ad5096a89') + +prepare() { + mkdir -p build + + cd ${pkgbase}-${_pkgver} + patch -p1 -i ../libre.patch + patch -p1 -i ../nonprism.patch + + # Fix QtAV location + patch -p1 -i ../digikam-find-qtav.patch + + # OpenGL switch + if [[ "$CARCH" = arm* ]]; then + cd core + patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch + fi +} + +build() { + cd build + + if [[ "$CARCH" = arm* ]]; then + local cmake_extra="-DENABLE_OPENGL=OFF" + fi + + 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 \ + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ + $cmake_extra + 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/digikam-find-qtav.patch b/nonprism/digikam/digikam-find-qtav.patch new file mode 100644 index 000000000..e1121897c --- /dev/null +++ b/nonprism/digikam/digikam-find-qtav.patch @@ -0,0 +1,21 @@ +--- digikam-5.4.0/core/cmake/modules/FindQtAV.cmake.0 2017-01-09 22:56:43.303991660 +0000 ++++ digikam-5.4.0/core/cmake/modules/FindQtAV.cmake 2017-01-09 22:57:24.843934106 +0000 +@@ -24,15 +24,17 @@ + HINTS ${_qt5_install_prefix} # For MXE + ${_qt5_install_prefix}/../qt5/include # For Mageia + ${_qt5_install_prefix}/../../include/qt5 # For Suse ++ ${_qt5_install_prefix}/../../include/qt + ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian + PATH_SUFFIXES QtAV + ) + + find_path(QTAV_WIDGETS_INCLUDE_DIR + NAMES QtAVWidgets.h + HINTS ${_qt5_install_prefix} # For MXE + ${_qt5_install_prefix}/../qt5/include # For Mageia + ${_qt5_install_prefix}/../../include/qt5 # For Suse ++ ${_qt5_install_prefix}/../../include/qt + ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5 # For Debian + PATH_SUFFIXES QtAVWidgets + ) + 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..3a4846bec --- /dev/null +++ b/nonprism/digikam/nonprism.patch @@ -0,0 +1,223 @@ +diff --git a/doc/TODO b/doc/TODO +index a0ac4f4..23bf745 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 +@@ -96,12 +90,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 4ca6846..e52406e 100644 +--- a/doc/digikam/index.docbook ++++ b/doc/digikam/index.docbook +@@ -168,21 +168,11 @@ + + + +- + + +- + +- +- +- +- + +- + +- +- +- + + + +@@ -304,21 +294,11 @@ + + &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; + + + +diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook +index cb0c5da..dcca755 100644 +--- a/doc/digikam/menu-mainwindow.docbook ++++ b/doc/digikam/menu-mainwindow.docbook +@@ -660,22 +660,6 @@ + + + +- ExportKML Export... +- +- +- +- Tool to export the images series into a KML structure. KML files can then be opened and displayed with GoogleEarth. +- +- +- See the dedicated +- KML Export Tool +- for more information. +- +- +- +- +- +- + ToolsExport to Piwigo + + +@@ -690,21 +674,6 @@ + + + +- +- +- ExportExport to Flickr... +- +- +- +- Tool to upload or update images to Flickr server. +- +- +- See the dedicated +- Flickr Export Tool +- for more information. +- +- +- + +- +- +- ExportExport to Google Photos... +- +- +- +- Tool upload or update images to Google Photos galleries. +- +- +- See the dedicated +- Google Services Tool +- for more information. +- +- +- +- +- +- +- ExportExport to Google Drive... +- +- +- +- Tool upload images to Google Drive. +- +- +- See the dedicated +- Google Services Tool +- for more information. +- +- +- +