kipi-plugins: update nonprism.patch

2 files changed, 10 insertions, 52 deletions

diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD
index 110cfc23c..9ecff8658 100644
--- a/nonprism/kipi-plugins/PKGBUILD
+++ b/nonprism/kipi-plugins/PKGBUILD
@@ -26,7 +26,7 @@ source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
         '0001-optionally-enable-OpenGL.patch')
 sha1sums=('3a62f6efdfafc37341626cbf0225cd7adc9d0633'
           'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
-          '13854d5db12a5be5d866eb37290db8ac1db7c1a3'
+          '246366b6b4b315957387938d842112e1146b9495'
           '2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
 
 prepare() {
diff --git a/nonprism/kipi-plugins/nonprism.patch b/nonprism/kipi-plugins/nonprism.patch
index 570c61ae0..3a4846bec 100644
--- a/nonprism/kipi-plugins/nonprism.patch
+++ b/nonprism/kipi-plugins/nonprism.patch
@@ -1,5 +1,5 @@
 diff --git a/doc/TODO b/doc/TODO
-index 2440062..e8ff7a3 100644
+index a0ac4f4..23bf745 100644
 --- a/doc/TODO
 +++ b/doc/TODO
 @@ -78,16 +78,10 @@ menu-mainwindow.docbook                    *               *                  Gi
@@ -33,10 +33,10 @@ index 2440062..e8ff7a3 100644
  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
+index 4ca6846..e52406e 100644
 --- a/doc/digikam/index.docbook
 +++ b/doc/digikam/index.docbook
-@@ -169,21 +169,11 @@
+@@ -168,21 +168,11 @@
      <!-- plugins -->
      <!ENTITY doc-tool-printwizard                 SYSTEM "tool-printwizard.docbook">
      <!ENTITY doc-tool-sendimages                  SYSTEM "tool-sendimages.docbook">
@@ -58,7 +58,7 @@ index 8e28728..cc9819e 100644
  
      <!-- Menus Chapter -->
  
-@@ -292,21 +282,11 @@
+@@ -304,21 +294,11 @@
      <!-- plugins -->
      &doc-tool-printwizard;
      &doc-tool-sendimages;
@@ -168,18 +168,10 @@ index cb0c5da..dcca755 100644
          <varlistentry>
              <term><menuchoice>
 diff --git a/extra/kipi-plugins/CMakeLists.txt b/extra/kipi-plugins/CMakeLists.txt
-index f20e7f3..1937582 100644
+index 68e61a3..4d1195d 100644
 --- a/extra/kipi-plugins/CMakeLists.txt
 +++ b/extra/kipi-plugins/CMakeLists.txt
-@@ -108,7 +108,6 @@ find_package(KF5 ${KF5_MIN_VERSION}
- 
- find_package(KF5 ${KF5_MIN_VERSION}
-              OPTIONAL_COMPONENTS
--             IconThemes   # for GoogleServices (KIO/PixmapLoader)
-              Archive      # for FlashExport
-              KIO          # Some kipi-plugins depends of KIO indeep..
- )
-@@ -135,7 +134,6 @@ if(KF5Kipi_FOUND)
+@@ -148,7 +148,6 @@ if(KF5Kipi_FOUND)
      # -- Optional dependencies detection required by some plugins -------------------------------------
  
      DETECT_LIBMEDIAWIKI(5.0.0)                                                 # For Mediawiki.
@@ -187,7 +179,7 @@ index f20e7f3..1937582 100644
  
      # ==================================================================================================
      # Log messages
-@@ -156,7 +154,6 @@ if(KF5Kipi_FOUND)
+@@ -169,7 +168,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)
@@ -195,7 +187,7 @@ index f20e7f3..1937582 100644
  
      # Optional plugins results ----------------------------------------------------------------------------
  
-@@ -172,7 +169,6 @@ if(KF5Kipi_FOUND)
+@@ -185,7 +183,6 @@ if(KF5Kipi_FOUND)
          set(KIPIPLUGINS_CAN_BE_COMPILED false)
      endif()
  
@@ -203,7 +195,7 @@ index f20e7f3..1937582 100644
      PRINT_COMPONENT_COMPILE_STATUS("Mediawiki"          KF5MediaWiki_FOUND)
      PRINT_COMPONENT_COMPILE_STATUS("FlashExport"        KF5Archive_FOUND)
  
-@@ -229,25 +225,12 @@ if(KF5Kipi_FOUND)
+@@ -242,25 +239,12 @@ if(KF5Kipi_FOUND)
          add_subdirectory(printimages)
          add_subdirectory(kmlexport)
          add_subdirectory(sendimages)
@@ -229,37 +221,3 @@ index f20e7f3..1937582 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',