diff options
Diffstat (limited to 'nonprism/shotwell-nonprism/nonprism.patch')
| -rw-r--r-- | nonprism/shotwell-nonprism/nonprism.patch | 439 |
1 files changed, 439 insertions, 0 deletions
diff --git a/nonprism/shotwell-nonprism/nonprism.patch b/nonprism/shotwell-nonprism/nonprism.patch new file mode 100644 index 000000000..8a83cbe3a --- /dev/null +++ b/nonprism/shotwell-nonprism/nonprism.patch @@ -0,0 +1,439 @@ +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 @@ + DESKTOP_APP_FULL_NAME="Shotwell Photo Manager" + DESKTOP_APPLICATION_COMMENT="Organize your photos" + DESKTOP_APPLICATION_CLASS="Photo Manager" +-DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;" ++DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo;" + 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 @@ + share-print.page \ + share-send.page \ + share-slideshow.page \ +- share-upload.page \ + 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 @@ + <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="picasa" schema="org.yorba.shotwell.sharing.picasa" /> +- <child name="youtube" schema="org.yorba.shotwell.sharing.youtube" /> +-</schema> +- +-<schema id="org.yorba.shotwell.sharing.facebook" path="/org/yorba/shotwell/sharing/facebook/"> +- <key name="access-token" type="s"> +- <default>""</default> +- <summary>access token</summary> +- <description>Facebook OAuth token for the currently logged in session, if any</description> +- </key> +- +- <key name="uid" type="s"> +- <default>""</default> +- <summary>user i.d.</summary> +- <description>Facebook user i.d. for the currently logged in user, if any</description> +- </key> +- +- <key name="user-name" type="s"> +- <default>""</default> +- <summary>user name</summary> +- <description>The name of the currently logged in Facebook user, if any</description> +- </key> +- +- <key name="default-size" type="i"> +- <default>0</default> +- <summary>default size code</summary> +- <description>A numeric code representing the default size for photos published to Facebook</description> +- </key> +- +- <key name="strip-metadata" type="b"> +- <default>false</default> +- <summary>remove sensitive info from uploads</summary> +- <description>Whether images being uploaded to Facebook should have their metadata removed first</description> +- </key> +-</schema> +- +-<schema id="org.yorba.shotwell.sharing.flickr" path="/org/yorba/shotwell/sharing/flickr/"> +- <key name="access-phase-token" type="s"> +- <default>""</default> +- <summary>OAuth Access Phase Token</summary> +- <description>The authorization token for the currently logged in Flickr user, if any</description> +- </key> +- +- <key name="access-phase-token-secret" type="s"> +- <default>""</default> +- <summary>OAuth Access Phase Token Secret</summary> +- <description>The cryptographic secret used to sign requests against the authorization token for the currently logged in Flickr user, if any</description> +- </key> +- +- <key name="access-phase-username" type="s"> +- <default>""</default> +- <summary>username</summary> +- <description>The user name of the currently logged in Flickr user, if any</description> +- </key> +- +- <key name="default-size" type="i"> +- <default>2</default> +- <summary>default size code</summary> +- <description>A numeric code representing the default size for photos published to Flickr</description> +- </key> +- +- <key name="visibility" type="i"> +- <default>1</default> +- <summary>default visibility</summary> +- <description>A numeric code representing the default visibility for photos published to Flickr</description> +- </key> +- +- <key name="strip-metadata" type="b"> +- <default>false</default> +- <summary>remove sensitive info from uploads</summary> +- <description>Whether images being uploaded to Flickr should have their metadata removed first</description> +- </key> +-</schema> +- +-<schema id="org.yorba.shotwell.sharing.picasa" path="/org/yorba/shotwell/sharing/picasa/"> +- <key name="refresh-token" type="s"> +- <default>""</default> +- <summary>refresh token</summary> +- <description>The OAuth token used to refresh the Picasa Web Albums session for the currently logged in user, if any.</description> +- </key> +- +- <key name="default-size" type="i"> +- <default>2</default> +- <summary>default size</summary> +- <description>A numeric code representing the default size for photos uploaded to Picasa Web Albums</description> +- </key> +- +- <key name="last-album" type="s"> +- <default>""</default> +- <summary>last album</summary> +- <description>The name of the last album the user published photos to, if any</description> +- </key> +- +- <key name="strip-metadata" type="b"> +- <default>false</default> +- <summary>remove sensitive info from uploads</summary> +- <description>Whether images being uploaded to Picasa should have their metadata removed first</description> +- </key> + </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 @@ + </key> + </schema> + +-<schema id="org.yorba.shotwell.sharing.youtube" path="/org/yorba/shotwell/sharing/youtube/"> +- <key name="refresh-token" type="s"> +- <default>""</default> +- <summary>refresh token</summary> +- <description>The OAuth token used to refresh the YouTube session for the currently logged in user, if any.</description> +- </key> +-</schema> +- + <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 @@ + </schema> + + <schema id="org.yorba.shotwell.plugins.enable-state" path="/org/yorba/shotwell/plugins/enable-state/" > +- <key name="publishing-facebook" type="b"> +- <default>true</default> +- <summary>enable facebook publishing plugin</summary> +- <description>True if the Facebook publishing plugin is enabled, false otherwise</description> +- </key> +- +- <key name="publishing-flickr" type="b"> +- <default>true</default> +- <summary>enable flickr publishing plugin</summary> +- <description>True if the Flickr publishing plugin is enabled, false otherwise</description> +- </key> +- +- <key name="publishing-picasa" type="b"> +- <default>true</default> +- <summary>enable picasa publishing plugin</summary> +- <description>True if the Picasa Web Albums publishing plugin is enabled, false otherwise</description> +- </key> +- +- <key name="publishing-youtube" type="b"> +- <default>true</default> +- <summary>enable youtube publishing plugin</summary> +- <description>True if the YouTube publishing plugin is enabled, false otherwise</description> +- </key> +- + <key name="publishing-piwigo" type="b"> + <default>true</default> + <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> +- <description>True if the Yandex.Fotki publishing plugin is enabled, false otherwise</description> +- </key> +- +- <key name="publishing-tumblr" type="b"> +- <default>false</default> +- <summary>enable tumblr publishing plugin</summary> +- <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 @@ + your master photos, making it easy to experiment and correct errors. + </p> + <p> +- When ready, Shotwell can upload your photos to various web sites, such as Facebook, Flickr, +- Picasa (Google Plus), and more. +- </p> +- <p> + 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 @@ + last-used-service = /apps/shotwell/sharing/last_used_service + + [org.yorba.shotwell.plugins.enable-state] +-publishing-facebook = /apps/shotwell/plugins/org.yorba.shotwell.publishing.facebook/enabled +-publishing-flickr = /apps/shotwell/plugins/org.yorba.shotwell.publishing.flickr/enabled +-publishing-picasa = /apps/shotwell/plugins/org.yorba.shotwell.publishing.picasa/enabled + publishing-piwigo = /apps/shotwell/plugins/org.yorba.shotwell.publishing.piwigo/enabled +-publishing-yandex-fotki = /apps/shotwell/plugins/org.yorba.shotwell.publishing.yandex-fotki/enabled +-publishing-youtube = /apps/shotwell/plugins/org.yorba.shotwell.publishing.youtube/enabled + transitions-crumble = /apps/shotwell/plugins/org.yorba.shotwell.transitions.crumble/enabled + transitions-fade = /apps/shotwell/plugins/org.yorba.shotwell.transitions.fade/enabled + transitions-slide = /apps/shotwell/plugins/org.yorba.shotwell.transitions.slide/enabled + +-[org.yorba.shotwell.sharing.facebook] +-uid = /apps/shotwell/sharing/facebook/uid +-user-name = /apps/shotwell/sharing/facebook/user_name +-default-size = /apps/shotwell/sharing/facebook/default_size +- +-[org.yorba.shotwell.sharing.flickr] +-default-size = /apps/shotwell/sharing/flickr/default_size +-visibility = /apps/shotwell/sharing/flickr/visibility +- +-[org.yorba.shotwell.sharing.picasa] +-default-size = /apps/shotwell/sharing/picasa/default_size +-last-album = /apps/shotwell/sharing/picasa/last_album +- + [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 @@ + 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 +- +-[org.yorba.shotwell.sharing.org-yorba-shotwell-publishing-yandex-fotki] +-auth-token = /apps/shotwell/sharing/org.yorba.shotwell.publishing.yandex-fotki/auth_token +- +-[org.yorba.shotwell.sharing.youtube] +-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 @@ + Name=Shotwell + GenericName=Photo Manager + Comment=Organize your photos +-Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo; ++Keywords=album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;piwigo; + 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 @@ + return session; + } + +- protected Spit.Publishing.Publishable get_current_publishable() { +- return publishables[current_file]; +- } +- + 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 @@ + shotwell-data-imports + + PLUGINS_RC := \ +- plugins/shotwell-publishing/facebook.png \ +- plugins/shotwell-publishing/facebook_publishing_options_pane.glade \ +- plugins/shotwell-publishing/flickr.png \ +- plugins/shotwell-publishing/flickr_publishing_options_pane.glade \ +- plugins/shotwell-publishing/flickr_pin_entry_pane.glade \ +- plugins/shotwell-publishing/picasa.png \ +- plugins/shotwell-publishing/picasa_publishing_options_pane.glade \ +- plugins/shotwell-publishing/youtube.png \ +- plugins/shotwell-publishing/youtube_publishing_options_pane.glade \ + plugins/shotwell-publishing/piwigo.png \ + plugins/shotwell-publishing/piwigo_authentication_pane.glade \ + plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \ + plugins/shotwell-transitions/slideshow-plugin.png + +-EXTRA_PLUGINS := \ +- shotwell-publishing-extras +- + EXTRA_PLUGINS_RC := \ +- plugins/shotwell-publishing-extras/yandex_publish_model.glade \ +- plugins/shotwell-data-imports/f-spot-24.png \ +- 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) + +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 @@ + + SRC_FILES := \ + shotwell-publishing.vala \ +- FacebookPublishing.vala \ +- PicasaPublishing.vala \ +- FlickrPublishing.vala \ +- YouTubePublishing.vala \ + PiwigoPublishing.vala \ + ../../src/util/string.vala \ + ../common/RESTSupport.vala + + RC_FILES := \ +- facebook.png \ +- facebook_publishing_options_pane.glade \ +- flickr.png \ +- flickr_publishing_options_pane.glade \ +- flickr_pin_entry_pane.glade \ +- picasa.png \ +- picasa_publishing_options_pane.glade \ + piwigo.png \ + piwigo_authentication_pane.glade \ +- piwigo_publishing_options_pane.glade \ +- youtube.png \ +- youtube_publishing_options_pane.glade ++ piwigo_publishing_options_pane.glade + + 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 +@@ -6,7 +6,7 @@ + + extern const string _VERSION; + +-// "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube ++// "core services" is: Piwigo + private class ShotwellPublishingCoreServices : Object, Spit.Module { + private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; + +@@ -15,10 +15,6 @@ + public ShotwellPublishingCoreServices(GLib.File module_file) { + GLib.File resource_directory = module_file.get_parent(); + +- pluggables += new FacebookService(resource_directory); +- pluggables += new PicasaService(resource_directory); +- pluggables += new FlickrService(resource_directory); +- pluggables += new YouTubeService(resource_directory); + 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 + plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala +-[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/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/YouTubePublishing.vala +-[type: gettext/glade]plugins/shotwell-publishing/facebook_publishing_options_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing/flickr_pin_entry_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing/flickr_publishing_options_pane.glade +-[type: gettext/glade]plugins/shotwell-publishing/picasa_publishing_options_pane.glade + [type: gettext/glade]plugins/shotwell-publishing/piwigo_authentication_pane.glade + [type: gettext/glade]plugins/shotwell-publishing/piwigo_publishing_options_pane.glade + plugins/shotwell-publishing/shotwell-publishing.vala +-[type: gettext/glade]plugins/shotwell-publishing/youtube_publishing_options_pane.glade + 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 +@@ -8,8 +8,7 @@ + * Shotwell Pluggable Publishing API + * + * The Shotwell Pluggable Publishing API allows you to write plugins that upload +- * photos and videos to web services. The Shotwell distribution includes publishing +- * support for four core services: Facebook, Flickr, Picasa Web Albums, and YouTube. ++ * photos and videos to web services. + * 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 @@ + 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 +- switch (id) { +- case "org.yorba.shotwell.publishing.facebook": +- return "facebook"; +- +- case "org.yorba.shotwell.publishing.picasa": +- return "picasa"; +- +- case "org.yorba.shotwell.publishing.flickr": +- return "flickr"; +- +- case "org.yorba.shotwell.publishing.youtube": +- return "youtube"; +- +- default: +- return id; +- } ++ return id; + } +- + public File get_module_file() { + return module_file; + } |