summaryrefslogtreecommitdiff
path: root/nonprism/digikam/nonprism.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-03-16 21:11:17 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-03-16 21:11:47 -0300
commitbb3c0079df0ab7db7750ced85fcd3ebdc376b429 (patch)
tree8fa402b7dab97331a26d88c41db9291a64bb2aca /nonprism/digikam/nonprism.patch
parent5752bd44a11cb6bc78d98a3ff8e23cf9c924647c (diff)
downloadabslibre-bb3c0079df0ab7db7750ced85fcd3ebdc376b429.tar.gz
abslibre-bb3c0079df0ab7db7750ced85fcd3ebdc376b429.tar.bz2
abslibre-bb3c0079df0ab7db7750ced85fcd3ebdc376b429.zip
kipi-plugins-5.5.0-1.parabola1{,.nonprism1}: updating version
Diffstat (limited to 'nonprism/digikam/nonprism.patch')
-rw-r--r--nonprism/digikam/nonprism.patch27
1 files changed, 14 insertions, 13 deletions
diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch
index 3a4846bec..1a6608a1a 100644
--- a/nonprism/digikam/nonprism.patch
+++ b/nonprism/digikam/nonprism.patch
@@ -1,5 +1,5 @@
diff --git a/doc/TODO b/doc/TODO
-index a0ac4f4..23bf745 100644
+index a0ac4f4c6..23bf7450f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -78,16 +78,10 @@ menu-mainwindow.docbook * * Gi
@@ -33,10 +33,10 @@ index a0ac4f4..23bf745 100644
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
+index 080275044..0fe7027c9 100644
--- a/doc/digikam/index.docbook
+++ b/doc/digikam/index.docbook
-@@ -168,21 +168,11 @@
+@@ -169,21 +169,11 @@
<!-- plugins -->
<!ENTITY doc-tool-printwizard SYSTEM "tool-printwizard.docbook">
<!ENTITY doc-tool-sendimages SYSTEM "tool-sendimages.docbook">
@@ -58,7 +58,7 @@ index 4ca6846..e52406e 100644
<!-- Menus Chapter -->
-@@ -304,21 +294,11 @@
+@@ -303,21 +293,11 @@
<!-- plugins -->
&doc-tool-printwizard;
&doc-tool-sendimages;
@@ -81,10 +81,10 @@ index 4ca6846..e52406e 100644
<!-- ******** MENUS ******************************************************** -->
diff --git a/doc/digikam/menu-mainwindow.docbook b/doc/digikam/menu-mainwindow.docbook
-index cb0c5da..dcca755 100644
+index 5c8e8e2b2..acdef13a2 100644
--- a/doc/digikam/menu-mainwindow.docbook
+++ b/doc/digikam/menu-mainwindow.docbook
-@@ -660,22 +660,6 @@
+@@ -943,22 +943,6 @@
<varlistentry>
<term><menuchoice>
@@ -107,7 +107,7 @@ index cb0c5da..dcca755 100644
<guimenu>Tools</guimenu><guimenuitem>Export to Piwigo</guimenuitem>
</menuchoice></term>
<listitem>
-@@ -690,21 +674,6 @@
+@@ -973,21 +957,6 @@
</listitem>
</varlistentry>
@@ -129,7 +129,7 @@ index cb0c5da..dcca755 100644
<!-- not ported to Qt5
<varlistentry>
<term><menuchoice>
-@@ -722,37 +691,6 @@
+@@ -1005,37 +974,6 @@
</listitem>
</varlistentry>
-->
@@ -168,10 +168,10 @@ index cb0c5da..dcca755 100644
<varlistentry>
<term><menuchoice>
diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt
-index 68e61a3..4d1195d 100644
+index 63579cae7..9b8171ca3 100644
--- a/extra/kipi-plugins/CMakeLists.txt
+++ b/extra/kipi-plugins/CMakeLists.txt
-@@ -148,7 +148,6 @@ if(KF5Kipi_FOUND)
+@@ -145,7 +145,6 @@ if(KF5Kipi_FOUND)
# -- Optional dependencies detection required by some plugins -------------------------------------
DETECT_LIBMEDIAWIKI(5.0.0) # For Mediawiki.
@@ -179,7 +179,7 @@ index 68e61a3..4d1195d 100644
# ==================================================================================================
# Log messages
-@@ -169,7 +168,6 @@ if(KF5Kipi_FOUND)
+@@ -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)
@@ -187,7 +187,7 @@ index 68e61a3..4d1195d 100644
# Optional plugins results ----------------------------------------------------------------------------
-@@ -185,7 +183,6 @@ if(KF5Kipi_FOUND)
+@@ -182,7 +180,6 @@ if(KF5Kipi_FOUND)
set(KIPIPLUGINS_CAN_BE_COMPILED false)
endif()
@@ -195,7 +195,7 @@ index 68e61a3..4d1195d 100644
PRINT_COMPONENT_COMPILE_STATUS("Mediawiki" KF5MediaWiki_FOUND)
PRINT_COMPONENT_COMPILE_STATUS("FlashExport" KF5Archive_FOUND)
-@@ -242,25 +239,12 @@ if(KF5Kipi_FOUND)
+@@ -235,26 +232,13 @@ if(KF5Kipi_FOUND)
add_subdirectory(printimages)
add_subdirectory(kmlexport)
add_subdirectory(sendimages)
@@ -209,6 +209,7 @@ index 68e61a3..4d1195d 100644
- add_subdirectory(imageshack)
- add_subdirectory(yandexfotki)
- add_subdirectory(googleservices)
+ add_subdirectory(jalbum)
if(KF5Archive_FOUND)
add_subdirectory(flashexport)