summaryrefslogtreecommitdiff
path: root/nonprism/digikam/nonprism.patch
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-01-20 06:01:09 +0100
committerAndreas Grapentin <andreas@grapentin.org>2018-01-20 06:09:27 +0100
commitaf21b330575fd55d3e8092fd286141e55cdcb090 (patch)
treec5fca5a19220e8a66b96c274c4256afbb8e1c77f /nonprism/digikam/nonprism.patch
parent01fe1e237b33bbd3ce7a87b66467acdc947de192 (diff)
downloadabslibre-af21b330575fd55d3e8092fd286141e55cdcb090.tar.gz
abslibre-af21b330575fd55d3e8092fd286141e55cdcb090.tar.bz2
abslibre-af21b330575fd55d3e8092fd286141e55cdcb090.zip
nonprism/digikam: updated to 5.8.0
Diffstat (limited to 'nonprism/digikam/nonprism.patch')
-rw-r--r--nonprism/digikam/nonprism.patch25
1 files changed, 13 insertions, 12 deletions
diff --git a/nonprism/digikam/nonprism.patch b/nonprism/digikam/nonprism.patch
index 1a6608a1a..779196f09 100644
--- a/nonprism/digikam/nonprism.patch
+++ b/nonprism/digikam/nonprism.patch
@@ -19,7 +19,7 @@ index a0ac4f4c6..23bf7450f 100644
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
+@@ -97,12 +91,8 @@ tool-panorama.docbook
tool-piwigoexport.docbook Need to be created
tool-presentation.docbook
tool-printwizard.docbook
@@ -36,7 +36,7 @@ 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
-@@ -169,21 +169,11 @@
+@@ -172,21 +172,11 @@
<!-- plugins -->
<!ENTITY doc-tool-printwizard SYSTEM "tool-printwizard.docbook">
<!ENTITY doc-tool-sendimages SYSTEM "tool-sendimages.docbook">
@@ -58,7 +58,7 @@ index 080275044..0fe7027c9 100644
<!-- Menus Chapter -->
-@@ -303,21 +293,11 @@
+@@ -311,21 +301,11 @@
<!-- plugins -->
&doc-tool-printwizard;
&doc-tool-sendimages;
@@ -187,18 +187,18 @@ index 63579cae7..9b8171ca3 100644
# Optional plugins results ----------------------------------------------------------------------------
-@@ -182,7 +180,6 @@ if(KF5Kipi_FOUND)
- set(KIPIPLUGINS_CAN_BE_COMPILED false)
+@@ -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)
-@@ -235,26 +232,13 @@ if(KF5Kipi_FOUND)
- add_subdirectory(printimages)
- add_subdirectory(kmlexport)
- add_subdirectory(sendimages)
+@@ -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)
@@ -209,10 +209,11 @@ index 63579cae7..9b8171ca3 100644
- add_subdirectory(imageshack)
- add_subdirectory(yandexfotki)
- add_subdirectory(googleservices)
- add_subdirectory(jalbum)
- if(KF5Archive_FOUND)
- add_subdirectory(flashexport)
+ if(ENABLE_LEGACY)
+ add_subdirectory(printimages)
+@@ -266,10 +254,6 @@ if(KF5Kipi_FOUND)
+
endif()
- if(KF5Vkontakte_FOUND)