diff options
Diffstat (limited to 'nonprism/shotwell/nonprism.patch')
| -rw-r--r-- | nonprism/shotwell/nonprism.patch | 119 |
1 files changed, 65 insertions, 54 deletions
diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch index eb4a25ac3..d7dd4676c 100644 --- a/nonprism/shotwell/nonprism.patch +++ b/nonprism/shotwell/nonprism.patch @@ -1,7 +1,8 @@ -diff -Nur shotwell-0.18.0.orig/Makefile shotwell-0.18.0/Makefile ---- shotwell-0.18.0.orig/Makefile 2014-03-18 18:50:19.000000000 -0300 -+++ shotwell-0.18.0/Makefile 2014-04-19 18:15:46.389178475 -0300 -@@ -316,7 +316,7 @@ +diff --git a/Makefile b/Makefile +index fbd3ebb..a21067c 100644 +--- a/Makefile ++++ b/Makefile +@@ -291,7 +291,7 @@ DESKTOP_APP_SHORT_NAME="Shotwell" DESKTOP_APP_FULL_NAME="Shotwell Photo Manager" DESKTOP_APPLICATION_COMMENT="Organize your photos" DESKTOP_APPLICATION_CLASS="Photo Manager" @@ -10,10 +11,11 @@ diff -Nur shotwell-0.18.0.orig/Makefile shotwell-0.18.0/Makefile DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell" DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer" DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer" -diff -Nur shotwell-0.18.0.orig/help/Makefile.am shotwell-0.18.0/help/Makefile.am ---- shotwell-0.18.0.orig/help/Makefile.am 2014-03-18 15:50:59.000000000 -0300 -+++ shotwell-0.18.0/help/Makefile.am 2014-04-19 18:15:46.389178475 -0300 -@@ -45,7 +45,6 @@ +diff --git a/help/Makefile.am b/help/Makefile.am +index 3ed819f..c5c2d22 100644 +--- a/help/Makefile.am ++++ b/help/Makefile.am +@@ -45,7 +45,6 @@ DOC_PAGES = \ share-print.page \ share-send.page \ share-slideshow.page \ @@ -21,9 +23,10 @@ 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.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 +diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml +index 1f6a093..f94ee0a 100644 +--- a/misc/org.yorba.shotwell.gschema.xml ++++ b/misc/org.yorba.shotwell.gschema.xml @@ -321,107 +321,7 @@ <description>A numeric code representing the last service to which photos were published</description> </key> @@ -196,9 +199,10 @@ diff -Nur shotwell-0.19.0.orig/misc/org.yorba.shotwell.gschema.xml shotwell-0.19 <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 +diff --git a/misc/shotwell.appdata.xml b/misc/shotwell.appdata.xml +index 62b9a57..89c08ad 100644 +--- a/misc/shotwell.appdata.xml ++++ b/misc/shotwell.appdata.xml @@ -14,10 +14,6 @@ your master photos, making it easy to experiment and correct errors. </p> @@ -210,10 +214,11 @@ diff -Nur shotwell-0.19.0.orig/misc/shotwell.appdata.xml shotwell-0.19.0/misc/sh Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats. </p> </description> -diff -Nur shotwell-0.18.0.orig/misc/shotwell.convert shotwell-0.18.0/misc/shotwell.convert ---- shotwell-0.18.0.orig/misc/shotwell.convert 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/misc/shotwell.convert 2014-04-19 18:15:46.392511834 -0300 -@@ -65,29 +65,11 @@ +diff --git a/misc/shotwell.convert b/misc/shotwell.convert +index 2f972c1..c8d4ee2 100644 +--- a/misc/shotwell.convert ++++ b/misc/shotwell.convert +@@ -65,29 +65,11 @@ default-service = /apps/shotwell/sharing/default_service last-used-service = /apps/shotwell/sharing/last_used_service [org.yorba.shotwell.plugins.enable-state] @@ -243,7 +248,7 @@ diff -Nur shotwell-0.18.0.orig/misc/shotwell.convert shotwell-0.18.0/misc/shotwe [org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-piwigo] url = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/url username = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/username -@@ -95,11 +77,3 @@ +@@ -95,11 +77,3 @@ password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/password remember-password = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/remember-password last-category = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-category last-permission-level = /apps/shotwell/sharing/org.yorba.shotwell.publishing.piwigo/last-permission-level @@ -255,10 +260,11 @@ diff -Nur shotwell-0.18.0.orig/misc/shotwell.convert shotwell-0.18.0/misc/shotwe -user-name = /apps/shotwell/sharing/youtube/user_name -auth-token = /apps/shotwell/sharing/youtube/auth_token - -diff -Nur shotwell-0.18.0.orig/misc/shotwell.desktop.head shotwell-0.18.0/misc/shotwell.desktop.head ---- shotwell-0.18.0.orig/misc/shotwell.desktop.head 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/misc/shotwell.desktop.head 2014-04-19 18:15:46.392511834 -0300 -@@ -3,7 +3,7 @@ +diff --git a/misc/shotwell.desktop.head b/misc/shotwell.desktop.head +index 09ca9ed..b85f3c6 100644 +--- a/misc/shotwell.desktop.head ++++ b/misc/shotwell.desktop.head +@@ -3,7 +3,7 @@ Version=1.0 Name=Shotwell GenericName=Photo Manager Comment=Organize your photos @@ -267,10 +273,11 @@ diff -Nur shotwell-0.18.0.orig/misc/shotwell.desktop.head shotwell-0.18.0/misc/s Exec=shotwell %U Icon=shotwell Terminal=false -diff -Nur shotwell-0.18.0.orig/plugins/common/RESTSupport.vala shotwell-0.18.0/plugins/common/RESTSupport.vala ---- shotwell-0.18.0.orig/plugins/common/RESTSupport.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/plugins/common/RESTSupport.vala 2014-04-19 18:44:24.962777076 -0300 -@@ -628,10 +628,6 @@ +diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala +index d9bf2ce..9d47cf8 100644 +--- a/plugins/common/RESTSupport.vala ++++ b/plugins/common/RESTSupport.vala +@@ -652,10 +652,6 @@ public abstract class BatchUploader { return session; } @@ -281,10 +288,11 @@ 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.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 @@ +diff --git a/plugins/plugins.mk b/plugins/plugins.mk +index 687ceeb..ab82aed 100644 +--- a/plugins/plugins.mk ++++ b/plugins/plugins.mk +@@ -6,32 +6,16 @@ PLUGINS := \ shotwell-data-imports PLUGINS_RC := \ @@ -317,10 +325,11 @@ diff -Nur shotwell-0.19.0.orig/plugins/plugins.mk shotwell-0.19.0/plugins/plugin 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 -@@ -13,27 +13,14 @@ +diff --git a/plugins/shotwell-publishing/Makefile b/plugins/shotwell-publishing/Makefile +index 607bc6b..40071ba 100644 +--- a/plugins/shotwell-publishing/Makefile ++++ b/plugins/shotwell-publishing/Makefile +@@ -13,25 +13,12 @@ PLUGIN_PKGS := \ SRC_FILES := \ shotwell-publishing.vala \ @@ -328,9 +337,7 @@ diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile shotwell-0.1 - PicasaPublishing.vala \ - FlickrPublishing.vala \ - YouTubePublishing.vala \ - PiwigoPublishing.vala \ - ../../src/util/string.vala \ - ../common/RESTSupport.vala + PiwigoPublishing.vala RC_FILES := \ - facebook.png \ @@ -349,9 +356,10 @@ diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/Makefile shotwell-0.1 include ../Makefile.plugin.mk -diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.vala shotwell-0.18.0/plugins/shotwell-publishing/shotwell-publishing.vala ---- shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/plugins/shotwell-publishing/shotwell-publishing.vala 2014-04-19 18:15:46.392511834 -0300 +diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala +index bbd5ddb..342f2f3 100644 +--- a/plugins/shotwell-publishing/shotwell-publishing.vala ++++ b/plugins/shotwell-publishing/shotwell-publishing.vala @@ -6,7 +6,7 @@ extern const string _VERSION; @@ -361,7 +369,7 @@ diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.v private class ShotwellPublishingCoreServices : Object, Spit.Module { private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; -@@ -15,10 +15,6 @@ +@@ -15,10 +15,6 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module { public ShotwellPublishingCoreServices(GLib.File module_file) { GLib.File resource_directory = module_file.get_parent(); @@ -372,11 +380,12 @@ diff -Nur shotwell-0.18.0.orig/plugins/shotwell-publishing/shotwell-publishing.v pluggables += new PiwigoService(resource_directory); } -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 +diff --git a/po/POTFILES.in b/po/POTFILES.in +index d83fed1..9c9bd89 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -17,29 +17,15 @@ plugins/shotwell-data-imports/SqliteSupport.vala + plugins/shotwell-data-imports/VersionNumber.vala plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala -plugins/shotwell-publishing-extras/TumblrPublishing.vala @@ -405,9 +414,10 @@ diff -Nur shotwell-0.19.0.orig/po/POTFILES.in shotwell-0.19.0/po/POTFILES.in plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala -diff -Nur shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala shotwell-0.18.0/src/plugins/PublishingInterfaces.vala ---- shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/src/plugins/PublishingInterfaces.vala 2014-04-19 18:15:46.395845194 -0300 +diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala +index 6f06cba..8936cc9 100644 +--- a/src/plugins/PublishingInterfaces.vala ++++ b/src/plugins/PublishingInterfaces.vala @@ -8,8 +8,7 @@ * Shotwell Pluggable Publishing API * @@ -418,10 +428,11 @@ diff -Nur shotwell-0.18.0.orig/src/plugins/PublishingInterfaces.vala shotwell-0. * To enable Shotwell to connect to additional services, developers like you write * publishing plugins, dynamically-loadable shared objects that are linked into the * Shotwell process at runtime. Publishing plugins are just one of several kinds of -diff -Nur shotwell-0.18.0.orig/src/plugins/StandardHostInterface.vala shotwell-0.18.0/src/plugins/StandardHostInterface.vala ---- shotwell-0.18.0.orig/src/plugins/StandardHostInterface.vala 2014-03-04 20:54:12.000000000 -0200 -+++ shotwell-0.18.0/src/plugins/StandardHostInterface.vala 2014-04-19 18:37:54.803118064 -0300 -@@ -22,24 +22,8 @@ +diff --git a/src/plugins/StandardHostInterface.vala b/src/plugins/StandardHostInterface.vala +index 857c8ff..7c67e55 100644 +--- a/src/plugins/StandardHostInterface.vala ++++ b/src/plugins/StandardHostInterface.vala +@@ -22,24 +22,8 @@ public class StandardHostInterface : Object, Spit.HostInterface { private static string parse_key(string id) { // special case: legacy plugins (Web publishers moved into SPIT) have special names // new plugins will use their full ID |