summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/kipi-plugins/PKGBUILD32
-rw-r--r--libre/kipi-plugins/digikam-5.1-fix-build.patch15
-rw-r--r--libre/kipi-plugins/libre.patch12
-rw-r--r--nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch34
-rw-r--r--nonprism/kipi-plugins/PKGBUILD50
-rw-r--r--nonprism/kipi-plugins/digikam-5.1-fix-build.patch15
-rw-r--r--nonprism/kipi-plugins/libre.patch12
-rw-r--r--nonprism/kipi-plugins/nonprism.patch243
8 files changed, 287 insertions, 126 deletions
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD
index 7c01c28ad..282238356 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/kipi-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 275324 2016-08-30 17:01:57Z arojas $
+# $Id: PKGBUILD 276865 2016-09-23 11:17:29Z arojas $
# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,9 +7,9 @@
pkgbase=digikam
pkgname=kipi-plugins
-_pkgver=5.1.0
-pkgver=${_pkgver//-/_}
-pkgrel=4.parabola1
+_pkgver=5.2.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1.parabola1
pkgdesc="Digital photo management application for KDE"
arch=('i686' 'x86_64' 'armv7h')
license=('GPL')
@@ -17,18 +17,14 @@ url="http://www.digikam.org/"
replaces=("${pkgname}-libre")
conflicts=("${pkgname}-libre")
makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
- 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+ 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
- 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+ 'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'gphoto2')
source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
- "digikam-5.1-fix-build.patch"
- kdebug-367675.patch::"https://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=463667c8&o=plain"
"libre.patch"
'0001-optionally-enable-OpenGL.patch')
-sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
- '5b6644c8b5534a1712f46fc84948de9a0039a601'
- 'd669d6f248d6c7dec6728037992fdf8d4e14c1d9'
- 'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f'
+sha1sums=('329195ac7ea890a3bec435cd2ed83b04bc80ba1d'
+ 'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
'2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
prepare() {
@@ -37,12 +33,6 @@ prepare() {
cd ${pkgbase}-${_pkgver}
patch -p1 -i ../libre.patch
- # Fix build on i686
- patch -p1 -i ../digikam-5.1-fix-build.patch
- # Fix digikamhelperdir
- cd core
- patch -p1 -i "$srcdir"/kdebug-367675.patch
-
# OpenGL switch
if [[ "$CARCH" = arm* ]]; then
patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch
@@ -60,13 +50,13 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
-DBUILD_TESTING=OFF \
-DENABLE_KFILEMETADATASUPPORT=ON \
-DENABLE_MEDIAPLAYER=ON \
-DENABLE_AKONADICONTACTSUPPORT=ON \
-DENABLE_MYSQLSUPPORT=ON \
-DENABLE_OPENCV3=ON \
+ -DENABLE_APPSTYLES=ON \
$cmake_extra
make
}
@@ -79,10 +69,6 @@ package_kipi-plugins() {
cd build/extra
make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc/kipi-plugins
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc-translated/kipi-plugins
- make DESTDIR="pkgdir" install
cd $srcdir/build/po
make DESTDIR="$pkgdir" install
diff --git a/libre/kipi-plugins/digikam-5.1-fix-build.patch b/libre/kipi-plugins/digikam-5.1-fix-build.patch
deleted file mode 100644
index 29f282079..000000000
--- a/libre/kipi-plugins/digikam-5.1-fix-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.orig 2016-08-09 15:05:10.449224741 +0000
-+++ digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h 2016-08-09 15:05:50.725789944 +0000
-@@ -618,10 +618,10 @@
- #elif defined(_M_X64) || defined(__amd64__)
- #define LibRawBigEndian 0
-
--#elif defined(__LITTLE_ENDIAN__)
-+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- #define LibRawBigEndian 0
-
--#elif defined(__BIG_ENDIAN__)
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #define LibRawBigEndian 1
- #elif defined(_ARM_)
- #define LibRawBigEndian 0
diff --git a/libre/kipi-plugins/libre.patch b/libre/kipi-plugins/libre.patch
index 6255727bb..8c677e210 100644
--- a/libre/kipi-plugins/libre.patch
+++ b/libre/kipi-plugins/libre.patch
@@ -1,5 +1,5 @@
diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
-index 8f98ec5..4b55443 100644
+index 0f58cc4..b497299 100644
--- a/extra/kipi-plugins/sendimages/emailsettings.h
+++ b/extra/kipi-plugins/sendimages/emailsettings.h
@@ -64,10 +64,9 @@ public:
@@ -15,10 +15,10 @@ index 8f98ec5..4b55443 100644
enum ImageSize
diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
-index 498cf92..67b03f9 100644
+index 1be65d6..68094de 100644
--- a/extra/kipi-plugins/sendimages/sendimages.cpp
+++ b/extra/kipi-plugins/sendimages/sendimages.cpp
-@@ -593,18 +593,13 @@ bool SendImages::invokeMailAgent()
+@@ -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
@@ -41,10 +41,10 @@ index 498cf92..67b03f9 100644
QStringList args;
diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
-index 7e55726..fd8eec5 100644
+index b8416a4..f160310 100644
--- a/extra/kipi-plugins/sendimages/settingswidget.cpp
+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
-@@ -96,10 +96,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
+@@ -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"));
@@ -53,6 +53,6 @@ index 7e55726..fd8eec5 100644
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. "
- "<b>Default</b> is the current email program set in KDE "
diff --git a/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch b/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch
new file mode 100644
index 000000000..8527b9cce
--- /dev/null
+++ b/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch
@@ -0,0 +1,34 @@
+From 72f50a2d29648248e03eb871f896f0c940e44c78 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 47f6b10..7615b7f 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)
+
+ # Mysql support options (experimental):
+ option(ENABLE_MYSQLSUPPORT "Build digiKam with MySQL dabatase support (default=OFF)" OFF)
+@@ -284,7 +285,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.8.3
+
diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD
index d423c0070..445d14396 100644
--- a/nonprism/kipi-plugins/PKGBUILD
+++ b/nonprism/kipi-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 275324 2016-08-30 17:01:57Z arojas $
+# $Id: PKGBUILD 276865 2016-09-23 11:17:29Z arojas $
# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,9 +7,9 @@
pkgbase=digikam
pkgname=kipi-plugins
-_pkgver=5.1.0
-pkgver=${_pkgver//-/_}
-pkgrel=4.parabola1.nonprism1
+_pkgver=5.2.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1.parabola1.nonprism1
pkgdesc="Digital photo management application for KDE"
arch=('i686' 'x86_64' 'armv7h')
license=('GPL')
@@ -17,19 +17,17 @@ 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'
- 'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
- 'kfilemetadata' 'akonadi-contact' 'qt5-multimedia' 'threadweaver' 'kcalcore'
- 'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+ 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+ 'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
+ 'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'gphoto2')
source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
- "digikam-5.1-fix-build.patch"
- kdebug-367675.patch::"https://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=463667c8&o=plain"
"libre.patch"
- "nonprism.patch")
-sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
- '5b6644c8b5534a1712f46fc84948de9a0039a601'
- 'd669d6f248d6c7dec6728037992fdf8d4e14c1d9'
- 'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f'
- '3e0f11296e887171c4f5f05652bb0ea635b021fd')
+ "nonprism.patch"
+ '0001-optionally-enable-OpenGL.patch')
+sha1sums=('329195ac7ea890a3bec435cd2ed83b04bc80ba1d'
+ 'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
+ '13854d5db12a5be5d866eb37290db8ac1db7c1a3'
+ '2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
prepare() {
mkdir -p build
@@ -38,28 +36,32 @@ prepare() {
patch -p1 -i ../libre.patch
patch -p1 -i ../nonprism.patch
- # Fix build on i686
- patch -p1 -i ../digikam-5.1-fix-build.patch
- # Fix digikamhelperdir
- cd core
- patch -p1 -i "$srcdir"/kdebug-367675.patch
+ # OpenGL switch
+ if [[ "$CARCH" = arm* ]]; then
+ 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 \
- -DCMAKE_SKIP_RPATH=ON \
-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 \
- -DENABLE_OPENCV3=ON
+ $cmake_extra
make
}
@@ -70,10 +72,6 @@ package_kipi-plugins() {
cd build/extra
make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc/kipi-plugins
- make DESTDIR="$pkgdir" install
- cd $srcdir/build/doc-translated/kipi-plugins
- make DESTDIR="pkgdir" install
cd $srcdir/build/po
make DESTDIR="$pkgdir" install
diff --git a/nonprism/kipi-plugins/digikam-5.1-fix-build.patch b/nonprism/kipi-plugins/digikam-5.1-fix-build.patch
deleted file mode 100644
index 29f282079..000000000
--- a/nonprism/kipi-plugins/digikam-5.1-fix-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.orig 2016-08-09 15:05:10.449224741 +0000
-+++ digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h 2016-08-09 15:05:50.725789944 +0000
-@@ -618,10 +618,10 @@
- #elif defined(_M_X64) || defined(__amd64__)
- #define LibRawBigEndian 0
-
--#elif defined(__LITTLE_ENDIAN__)
-+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- #define LibRawBigEndian 0
-
--#elif defined(__BIG_ENDIAN__)
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #define LibRawBigEndian 1
- #elif defined(_ARM_)
- #define LibRawBigEndian 0
diff --git a/nonprism/kipi-plugins/libre.patch b/nonprism/kipi-plugins/libre.patch
index 6255727bb..8c677e210 100644
--- a/nonprism/kipi-plugins/libre.patch
+++ b/nonprism/kipi-plugins/libre.patch
@@ -1,5 +1,5 @@
diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
-index 8f98ec5..4b55443 100644
+index 0f58cc4..b497299 100644
--- a/extra/kipi-plugins/sendimages/emailsettings.h
+++ b/extra/kipi-plugins/sendimages/emailsettings.h
@@ -64,10 +64,9 @@ public:
@@ -15,10 +15,10 @@ index 8f98ec5..4b55443 100644
enum ImageSize
diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
-index 498cf92..67b03f9 100644
+index 1be65d6..68094de 100644
--- a/extra/kipi-plugins/sendimages/sendimages.cpp
+++ b/extra/kipi-plugins/sendimages/sendimages.cpp
-@@ -593,18 +593,13 @@ bool SendImages::invokeMailAgent()
+@@ -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
@@ -41,10 +41,10 @@ index 498cf92..67b03f9 100644
QStringList args;
diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
-index 7e55726..fd8eec5 100644
+index b8416a4..f160310 100644
--- a/extra/kipi-plugins/sendimages/settingswidget.cpp
+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
-@@ -96,10 +96,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
+@@ -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"));
@@ -53,6 +53,6 @@ index 7e55726..fd8eec5 100644
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. "
- "<b>Default</b> is the current email program set in KDE "
diff --git a/nonprism/kipi-plugins/nonprism.patch b/nonprism/kipi-plugins/nonprism.patch
index 4b31776a4..570c61ae0 100644
--- a/nonprism/kipi-plugins/nonprism.patch
+++ b/nonprism/kipi-plugins/nonprism.patch
@@ -1,38 +1,177 @@
-diff --git a/doc/kipi-plugins/index.docbook b/doc/kipi-plugins/index.docbook
-index 45f6406..ebafd76 100644
---- a/doc/kipi-plugins/index.docbook
-+++ b/doc/kipi-plugins/index.docbook
-@@ -9,7 +9,6 @@
- <!ENTITY doc-convertimages SYSTEM "convertimages.docbook">
- <!ENTITY doc-effectimages SYSTEM "effectimages.docbook">
- <!ENTITY doc-filterimages SYSTEM "filterimages.docbook">
-- <!ENTITY doc-flickrexport SYSTEM "flickrexport.docbook">
- <!ENTITY doc-geolocation SYSTEM "geolocation.docbook">
- <!ENTITY doc-imagesgallery SYSTEM "imagesgallery.docbook">
- <!ENTITY doc-imageviewer SYSTEM "imageviewer.docbook">
-@@ -121,9 +120,6 @@ The plugins available in this handbook are:
- photograph on your image collections</para>
- </listitem>
- <listitem>
--<para><link linkend="flickrexport">Remote Flickr Export plugin</link></para>
--</listitem>
--<listitem>
- <para>The Gallery Export plugin is a tool for export image collections to a remote Gallery server</para>
- </listitem>
- <listitem>
-@@ -180,7 +176,6 @@ please contact the Kipi team mailing list at <email>kde-imaging@kde.org</email>.
- &doc-convertimages;
- &doc-effectimages;
- &doc-filterimages;
--&doc-flickrexport;
- &doc-geolocation;
- &doc-imagesgallery;
- &doc-imageviewer;
+diff --git a/doc/TODO b/doc/TODO
+index 2440062..e8ff7a3 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 8e28728..cc9819e 100644
+--- a/doc/digikam/index.docbook
++++ b/doc/digikam/index.docbook
+@@ -169,21 +169,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 -->
+
+@@ -292,21 +282,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 cb0c5da..dcca755 100644
+--- a/doc/digikam/menu-mainwindow.docbook
++++ b/doc/digikam/menu-mainwindow.docbook
+@@ -660,22 +660,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>
+@@ -690,21 +674,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>
+@@ -722,37 +691,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 0d3e41f..fde60fc 100644
+index f20e7f3..1937582 100644
--- a/extra/kipi-plugins/CMakeLists.txt
+++ b/extra/kipi-plugins/CMakeLists.txt
-@@ -109,7 +109,6 @@ find_package(KF5 ${KF5_MIN_VERSION}
+@@ -108,7 +108,6 @@ find_package(KF5 ${KF5_MIN_VERSION}
find_package(KF5 ${KF5_MIN_VERSION}
OPTIONAL_COMPONENTS
@@ -40,7 +179,7 @@ index 0d3e41f..fde60fc 100644
Archive # for FlashExport
KIO # Some kipi-plugins depends of KIO indeep..
)
-@@ -136,7 +135,6 @@ if(KF5Kipi_FOUND)
+@@ -135,7 +134,6 @@ if(KF5Kipi_FOUND)
# -- Optional dependencies detection required by some plugins -------------------------------------
DETECT_LIBMEDIAWIKI(5.0.0) # For Mediawiki.
@@ -48,7 +187,7 @@ index 0d3e41f..fde60fc 100644
# ==================================================================================================
# Log messages
-@@ -157,7 +155,6 @@ if(KF5Kipi_FOUND)
+@@ -156,7 +154,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)
@@ -56,7 +195,7 @@ index 0d3e41f..fde60fc 100644
# Optional plugins results ----------------------------------------------------------------------------
-@@ -173,7 +170,6 @@ if(KF5Kipi_FOUND)
+@@ -172,7 +169,6 @@ if(KF5Kipi_FOUND)
set(KIPIPLUGINS_CAN_BE_COMPILED false)
endif()
@@ -90,3 +229,37 @@ index 0d3e41f..fde60fc 100644
if(KF5MediaWiki_FOUND)
add_subdirectory(mediawiki)
endif()
+diff --git a/project/release/fetch_l10n_doc.rb b/project/release/fetch_l10n_doc.rb
+index 1f5854a..74f59cb 100755
+--- a/project/release/fetch_l10n_doc.rb
++++ b/project/release/fetch_l10n_doc.rb
+@@ -143,16 +143,10 @@ i18nlangs.each_line do |lang|
+ 'tool-acquireimages',
+ 'tool-advrename',
+ 'tool-calendar',
+- 'tool-dropbox',
+ 'tool-expoblending',
+- 'tool-facebook',
+ 'tool-findduplicates',
+ 'tool-flashexport',
+- 'tool-flickrexport',
+ 'tool-geolocationeditor',
+- 'tool-googleexport',
+- 'tool-imageshack',
+- 'tool-imgur',
+ 'tool-kmlexport',
+ 'tool-maintenance',
+ 'tool-mediawiki',
+@@ -161,12 +155,8 @@ i18nlangs.each_line do |lang|
+ 'tool-piwigoexport',
+ 'tool-presentation',
+ 'tool-printwizard',
+- 'tool-rajce',
+ 'tool-remotestorage',
+ 'tool-sendimages',
+- 'tool-smug',
+- 'tool-vkontakte',
+- 'tool-yandexfotki',
+ 'using-bqm',
+ 'using-camera',
+ 'using-camera-basis',
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-05 01:54:27 +0000