From 5b327a3fc3c4b554baccf2075a97b61a51b606ea Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 26 Sep 2016 07:58:04 -0300
Subject: kipi-plugins-5.2.0-1.parabola1{,.nonprism1}: updating version

---
 nonprism/kipi-plugins/nonprism.patch | 243 ++++++++++++++++++++++++++++++-----
 1 file changed, 208 insertions(+), 35 deletions(-)

(limited to 'nonprism/kipi-plugins/nonprism.patch')

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',
-- 
cgit v1.2.3