shotwell-1:0.20.0-1.nonprism1: updating version

2 files changed, 47 insertions, 37 deletions

diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD
index 697c98959..96a0ae0b1 100644
--- a/nonprism/shotwell/PKGBUILD
+++ b/nonprism/shotwell/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 119094 2014-09-17 17:24:19Z spupykin $
+# $Id: PKGBUILD 119376 2014-09-21 19:41:58Z spupykin $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
@@ -7,7 +7,7 @@
 
 pkgname=shotwell
 epoch=1
-pkgver=0.18.1
+pkgver=0.20.0
 pkgrel=1.nonprism1
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,17 +20,17 @@ depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
 	 'gst-plugins-base' 'libgphoto2')
 makedepends=('intltool' 'vala>=0.17.2' 'libunique3' 'gnome-doc-utils')
 install=shotwell.install
-source=("https://download.gnome.org/sources/shotwell/0.18/shotwell-$pkgver.tar.xz"
+source=("https://download.gnome.org/sources/shotwell/0.20/shotwell-$pkgver.tar.xz"
         'nonprism.patch')
-md5sums=('361eeef67f5aaed36ec44b12cfd675b3'
-         'b6c67e76af91be99852310e9c2be5ffa')
+md5sums=('e1ab302ea9f53025368023f15e6e457e'
+         '47a50a8599c68065e9a1197fc5ec9440')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i ${srcdir}/nonprism.patch
 
   cd po
-#  sed -i '\|set_background_slideshow_dialog.glade|d' $(grep -rIl set_background_slideshow_dialog.glade)
+  sed -i '\|set_background_slideshow_dialog.glade|d' $(grep -rIl set_background_slideshow_dialog.glade)
   for file in *.po; do
     intltool-update ${file%.*}
     msgattrib --no-obsolete -o $file $file
diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch
index 8a83cbe3a..eb4a25ac3 100644
--- a/nonprism/shotwell/nonprism.patch
+++ b/nonprism/shotwell/nonprism.patch
@@ -21,15 +21,16 @@ diff -Nur shotwell-0.18.0.orig/help/Makefile.am shotwell-0.18.0/help/Makefile.am
  	view-displaying.page \
  	view-information.page \
  	view-sidebar.page
-diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18.0/misc/org.yorba.shotwell.gschema.xml
---- shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml	2014-03-04 20:54:12.000000000 -0200
-+++ shotwell-0.18.0/misc/org.yorba.shotwell.gschema.xml	2014-04-19 18:15:46.389178475 -0300
-@@ -321,106 +321,6 @@
+diff -Nur shotwell-0.19.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.19.0/misc/org.yorba.shotwell.gschema.xml
+--- shotwell-0.19.0.orig/misc/org.yorba.shotwell.gschema.xml	2014-07-01 18:32:41.000000000 -0300
++++ shotwell-0.19.0/misc/org.yorba.shotwell.gschema.xml	2014-09-09 02:06:48.373515256 -0300
+@@ -321,107 +321,7 @@
          <description>A numeric code representing the last service to which photos were published</description>
      </key>
      
 -    <child name="facebook" schema="org.yorba.shotwell.sharing.facebook" />
 -    <child name="flickr" schema="org.yorba.shotwell.sharing.flickr" />
+     <child name="gallery3" schema="org.yorba.shotwell.sharing.publishing-gallery3" />
 -    <child name="picasa" schema="org.yorba.shotwell.sharing.picasa" />
 -    <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" />
 -</schema>
@@ -131,7 +132,7 @@ diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18
  </schema>
  
  <schema id="org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo" path="/org/yorba/shotwell/sharing/org-yorba-shotwell-publishing-piwigo/">
-@@ -485,14 +385,6 @@
+@@ -530,14 +430,6 @@
      </key>
  </schema>
  
@@ -146,7 +147,7 @@ diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18
  <schema id="org.yorba.shotwell.dataimports" path="/org/yorba/shotwell/dataimports/">
      <key name="last-used-dataimports-service" type="s">
          <default>""</default>
-@@ -576,48 +468,12 @@
+@@ -621,48 +513,12 @@
  </schema>
  
  <schema id="org.yorba.shotwell.plugins.enable-state" path="/org/yorba/shotwell/plugins/enable-state/" >
@@ -179,7 +180,7 @@ diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18
          <summary>enable piwigo publishing plugin</summary>
          <description>True if the Piwigo publishing plugin is enabled, false otherwise</description>
      </key>
-     
+ 
 -    <key name="publishing-yandex-fotki" type="b">
 -        <default>false</default>
 -        <summary>enable yandex publishing plugin</summary>
@@ -192,13 +193,13 @@ diff -Nur shotwell-0.18.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.18
 -        <description>True if the Tumblr publishing plugin is enabled, false otherwise</description>
 -    </key>
 -
-     <key name="dataimports-fspot" type="b">
-         <default>true</default>
-         <summary>enable F-Spot import plugin</summary>
-diff -Nur shotwell-0.18.0.orig/misc/shotwell.appdata.xml shotwell-0.18.0/misc/shotwell.appdata.xml
---- shotwell-0.18.0.orig/misc/shotwell.appdata.xml	2014-03-04 20:54:12.000000000 -0200
-+++ shotwell-0.18.0/misc/shotwell.appdata.xml	2014-04-19 18:15:46.392511834 -0300
-@@ -13,10 +13,6 @@
+     <key name="publishing-rajce" type="b">
+         <default>false</default>
+         <summary>enable rajce publishing plugin</summary>
+diff -Nur shotwell-0.19.0.orig/misc/shotwell.appdata.xml shotwell-0.19.0/misc/shotwell.appdata.xml
+--- shotwell-0.19.0.orig/misc/shotwell.appdata.xml	2014-07-01 18:32:41.000000000 -0300
++++ shotwell-0.19.0/misc/shotwell.appdata.xml	2014-09-09 00:28:49.457222103 -0300
+@@ -14,10 +14,6 @@
        your master photos, making it easy to experiment and correct errors.
      </p>
      <p>
@@ -280,10 +281,10 @@ diff -Nur shotwell-0.18.0.orig/plugins/common/RESTSupport.vala shotwell-0.18.0/p
      protected abstract Transaction create_transaction(Spit.Publishing.Publishable publishable);
      
      public void upload(Spit.Publishing.ProgressCallback? status_updated = null) {
-diff -Nur shotwell-0.18.0.orig/plugins/plugins.mk shotwell-0.18.0/plugins/plugins.mk
---- shotwell-0.18.0.orig/plugins/plugins.mk	2014-03-04 20:54:12.000000000 -0200
-+++ shotwell-0.18.0/plugins/plugins.mk	2014-04-19 18:52:04.852983921 -0300
-@@ -5,29 +5,13 @@
+diff -Nur shotwell-0.19.0.orig/plugins/plugins.mk shotwell-0.19.0/plugins/plugins.mk
+--- shotwell-0.19.0.orig/plugins/plugins.mk	2014-07-01 18:32:41.000000000 -0300
++++ shotwell-0.19.0/plugins/plugins.mk	2014-09-09 02:08:26.797576218 -0300
+@@ -5,32 +5,16 @@
  	shotwell-data-imports
  
  PLUGINS_RC := \
@@ -306,14 +307,16 @@ diff -Nur shotwell-0.18.0.orig/plugins/plugins.mk shotwell-0.18.0/plugins/plugin
 -
  EXTRA_PLUGINS_RC := \
 -	plugins/shotwell-publishing-extras/yandex_publish_model.glade \
--	plugins/shotwell-data-imports/f-spot-24.png \
+ 	plugins/shotwell-data-imports/f-spot-24.png \
+ 	plugins/shotwell-publishing-extras/gallery3.png \
+ 	plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade \
+ 	plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade \
 -	plugins/shotwell-publishing-extras/tumblr.png \
 -	plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \
--	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
-+	plugins/shotwell-data-imports/f-spot-24.png
- 
- ALL_PLUGINS := $(PLUGINS) $(EXTRA_PLUGINS)
- 
+-	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade \
+ 	plugins/shotwell-publishing-extras/rajce.png \
+ 	plugins/shotwell-publishing-extras/rajce_authentication_pane.glade \
+ 	plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
 diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile shotwell-0.18.0/plugins/shotwell-publishing/Makefile
 --- shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile	2014-03-04 20:54:12.000000000 -0200
 +++ shotwell-0.18.0/plugins/shotwell-publishing/Makefile	2014-04-19 18:45:15.729833873 -0300
@@ -369,20 +372,27 @@ diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.v
          pluggables += new PiwigoService(resource_directory);
      }
      
-diff -Nur shotwell-0.18.0.orig/po/POTFILES.in shotwell-0.18.0/po/POTFILES.in
---- shotwell-0.18.0.orig/po/POTFILES.in	2014-03-04 20:54:12.000000000 -0200
-+++ shotwell-0.18.0/po/POTFILES.in	2014-04-19 19:01:24.750459462 -0300
-@@ -18,22 +18,9 @@
- plugins/shotwell-publishing-extras/TumblrPublishing.vala
- plugins/shotwell-publishing-extras/YandexPublishing.vala
+diff -Nur shotwell-0.19.0.orig/po/POTFILES.in shotwell-0.19.0/po/POTFILES.in
+--- shotwell-0.19.0.orig/po/POTFILES.in	2014-07-01 18:32:41.000000000 -0300
++++ shotwell-0.19.0/po/POTFILES.in	2014-09-09 02:10:38.708551676 -0300
+@@ -17,29 +17,15 @@
+ plugins/shotwell-data-imports/shotwell-data-imports.vala
+ plugins/shotwell-publishing-extras/GalleryConnector.vala
+ plugins/shotwell-publishing-extras/RajcePublishing.vala
+-plugins/shotwell-publishing-extras/TumblrPublishing.vala
+-plugins/shotwell-publishing-extras/YandexPublishing.vala
  plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+ [type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade
+ [type: gettext/glade]plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade
 -[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade
 -[type: gettext/glade]plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
+ [type: gettext/glade]plugins/shotwell-publishing-extras/rajce_authentication_pane.glade
+ [type: gettext/glade]plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade
 -[type: gettext/glade]plugins/shotwell-publishing-extras/yandex_publish_model.glade
 -plugins/shotwell-publishing/FacebookPublishing.vala
 -plugins/shotwell-publishing/FlickrPublishing.vala
 -plugins/shotwell-publishing/PicasaPublishing.vala
--plugins/shotwell-publishing/PiwigoPublishing.vala
+ plugins/shotwell-publishing/PiwigoPublishing.vala
 -plugins/shotwell-publishing/YouTubePublishing.vala
 -[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade
 -[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade