diff options
Diffstat (limited to 'nonprism/shotwell')
| -rw-r--r-- | nonprism/shotwell/PKGBUILD | 54 | ||||
| -rw-r--r-- | nonprism/shotwell/nonprism.patch | 674 |
2 files changed, 0 insertions, 728 deletions
diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD deleted file mode 100644 index 750ffc50d..000000000 --- a/nonprism/shotwell/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 209631 2017-02-01 11:02:26Z 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> -# Maintainer: André Silva <emulatorman@parabola.nu> -# Contributor: Márcio Silva <coadde@parabola.nu> - -pkgname=shotwell -epoch=1 -pkgver=0.24.5 -_basever=${pkgver%.*} -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' 'armv7h') -url="http://yorba.org/shotwell/" -license=('LGPL2.1') -replaces=(${pkgname}-nonprism) -conflicts=(${pkgname}-nonprism) -depends=('libgee' 'webkit2gtk' 'libgexiv2' 'libraw' 'rest' - 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' - 'gst-plugins-base' 'libgphoto2' 'libgudev') -makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool') -# odd versions are unstable! -source=("https://download.gnome.org/sources/shotwell/${_basever}/shotwell-$pkgver.tar.xz" - 'nonprism.patch') -sha256sums=('4936c2c8c63b701ac0cf15b7bd6619ee3241a6d08b4187f2475348642ff9c1fd' - '99647c08bb0b7a12575e2ae3b6d794d6b3e2a72059e905bae5e86575628475d0') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../nonprism.patch - - cd po - 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 - done -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexec=/usr/lib \ - --disable-schemas-compile \ - --disable-desktop-update \ - --disable-icon-update \ - --disable-extra-plugins-install - make -j1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch deleted file mode 100644 index 0f861ecef..000000000 --- a/nonprism/shotwell/nonprism.patch +++ /dev/null @@ -1,674 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 2967050..613c1a2 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -227,9 +227,7 @@ am__plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES_DIS - @HAVE_EXTRA_PLUGINS_TRUE@am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.lo \ - @HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.lo \ - @HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo \ --@HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo \ --@HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo --@HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo -+@HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo \ - plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS = $(am_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) \ - $(nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_OBJECTS) - plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK = \ -@@ -245,10 +243,6 @@ plugins_shotwell_publishing_shotwell_publishing_la_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) \ - $(top_builddir)/plugins/common/libshotwell-plugin-common.la - am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo \ -- plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo \ -- plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo \ -- plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo \ -- plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo \ - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo - nodist_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-resource.lo - plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = $(am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS) \ -@@ -572,18 +566,9 @@ am__can_run_installinfo = \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac --am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \ -- plugins/shotwell-publishing/flickr.png \ -- plugins/shotwell-publishing/picasa.png \ -- plugins/shotwell-publishing/piwigo.png \ -- plugins/shotwell-publishing/youtube.png \ -- plugins/shotwell-publishing/facebook_publishing_options_pane.ui \ -- plugins/shotwell-publishing/flickr_pin_entry_pane.ui \ -- plugins/shotwell-publishing/flickr_publishing_options_pane.ui \ -- plugins/shotwell-publishing/picasa_publishing_options_pane.ui \ -+am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/piwigo.png \ - plugins/shotwell-publishing/piwigo_authentication_pane.ui \ - plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \ -- plugins/shotwell-publishing/youtube_publishing_options_pane.ui \ - plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \ - plugins/shotwell-publishing-extras/gallery3.png \ - plugins/shotwell-publishing-extras/rajce.png \ -@@ -592,9 +577,6 @@ am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \ - plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \ - plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \ - plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \ -- plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \ -- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \ -- plugins/shotwell-publishing-extras/yandex_publish_model.ui \ - plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml \ - plugins/shotwell-transitions/slideshow-plugin.png \ - plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml \ -@@ -676,14 +658,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - plugins/shotwell-data-imports/shotwell-data-imports.c \ - plugins/shotwell-publishing-extras/GalleryConnector.c \ - plugins/shotwell-publishing-extras/RajcePublishing.c \ -- plugins/shotwell-publishing-extras/TumblrPublishing.c \ -- plugins/shotwell-publishing-extras/YandexPublishing.c \ - plugins/shotwell-publishing-extras/shotwell-publishing-extras.c \ -- plugins/shotwell-publishing/FacebookPublishing.c \ -- plugins/shotwell-publishing/FlickrPublishing.c \ -- plugins/shotwell-publishing/PicasaPublishing.c \ - plugins/shotwell-publishing/PiwigoPublishing.c \ -- plugins/shotwell-publishing/YouTubePublishing.c \ - plugins/shotwell-publishing/shotwell-publishing.c \ - plugins/shotwell-transitions/BlindsEffect.c \ - plugins/shotwell-transitions/ChessEffect.c \ -@@ -1112,18 +1088,9 @@ plugin_LTLIBRARIES = \ - plugins/shotwell-data-imports/shotwell-data-imports.la - dist_plugin_DATA = - dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator --dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/facebook.png \ -- plugins/shotwell-publishing/flickr.png \ -- plugins/shotwell-publishing/picasa.png \ -- plugins/shotwell-publishing/piwigo.png \ -- plugins/shotwell-publishing/youtube.png \ -- plugins/shotwell-publishing/facebook_publishing_options_pane.ui \ -- plugins/shotwell-publishing/flickr_pin_entry_pane.ui \ -- plugins/shotwell-publishing/flickr_publishing_options_pane.ui \ -- plugins/shotwell-publishing/picasa_publishing_options_pane.ui \ -+dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/piwigo.png \ - plugins/shotwell-publishing/piwigo_authentication_pane.ui \ - plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \ -- plugins/shotwell-publishing/youtube_publishing_options_pane.ui \ - plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \ - $(am__append_4) \ - plugins/shotwell-transitions/slideshow-plugin.png \ -@@ -1375,10 +1342,6 @@ thumbnailer_shotwell_video_thumbnailer_CFLAGS = $(THUMBNAILER_CFLAGS) - thumbnailer_shotwell_video_thumbnailer_LDADD = $(THUMBNAILER_LIBS) - plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \ - plugins/shotwell-publishing/shotwell-publishing.vala \ -- plugins/shotwell-publishing/FacebookPublishing.vala \ -- plugins/shotwell-publishing/PicasaPublishing.vala \ -- plugins/shotwell-publishing/FlickrPublishing.vala \ -- plugins/shotwell-publishing/YouTubePublishing.vala \ - plugins/shotwell-publishing/PiwigoPublishing.vala \ - plugins/shotwell-plugin-common.vapi - -@@ -1414,8 +1377,6 @@ plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \ - @HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/GalleryConnector.vala \ - @HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/RajcePublishing.vala \ - @HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \ --@HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/TumblrPublishing.vala \ --@HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-publishing-extras/YandexPublishing.vala \ - @HAVE_EXTRA_PLUGINS_TRUE@ plugins/shotwell-plugin-common.vapi - - @HAVE_EXTRA_PLUGINS_TRUE@nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \ -@@ -1758,12 +1719,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p - plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo: \ - plugins/shotwell-publishing-extras/$(am__dirstamp) \ - plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) --plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: \ -- plugins/shotwell-publishing-extras/$(am__dirstamp) \ -- plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) --plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo: \ -- plugins/shotwell-publishing-extras/$(am__dirstamp) \ -- plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) - plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo: \ - plugins/shotwell-publishing-extras/$(am__dirstamp) \ - plugins/shotwell-publishing-extras/$(DEPDIR)/$(am__dirstamp) -@@ -1779,18 +1734,6 @@ plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp): - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo: \ - plugins/shotwell-publishing/$(am__dirstamp) \ - plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo: \ -- plugins/shotwell-publishing/$(am__dirstamp) \ -- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo: \ -- plugins/shotwell-publishing/$(am__dirstamp) \ -- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo: \ -- plugins/shotwell-publishing/$(am__dirstamp) \ -- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: \ -- plugins/shotwell-publishing/$(am__dirstamp) \ -- plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo: \ - plugins/shotwell-publishing/$(am__dirstamp) \ - plugins/shotwell-publishing/$(DEPDIR)/$(am__dirstamp) -@@ -2646,15 +2589,9 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-shotwell-data-imports.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-GalleryConnector.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-RajcePublishing.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-resource.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-transitions/$(DEPDIR)/plugins_shotwell_transitions_shotwell_transitions_la-BlindsEffect.Plo@am__quote@ -@@ -3030,20 +2967,6 @@ plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_p - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-shotwell-publishing-extras.lo `test -f 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/shotwell-publishing-extras.c - --plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo: plugins/shotwell-publishing-extras/TumblrPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing-extras/TumblrPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-TumblrPublishing.lo `test -f 'plugins/shotwell-publishing-extras/TumblrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/TumblrPublishing.c -- --plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo: plugins/shotwell-publishing-extras/YandexPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo `test -f 'plugins/shotwell-publishing-extras/YandexPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/YandexPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing-extras/YandexPublishing.c' object='plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-YandexPublishing.lo `test -f 'plugins/shotwell-publishing-extras/YandexPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/YandexPublishing.c -- - plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo: plugins/shotwell-publishing-extras/resource.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo -MD -MP -MF plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Tpo -c -o plugins/shotwell-publishing-extras/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.lo `test -f 'plugins/shotwell-publishing-extras/resource.c' || echo '$(srcdir)/'`plugins/shotwell-publishing-extras/resource.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Tpo plugins/shotwell-publishing-extras/$(DEPDIR)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la-resource.Plo -@@ -3058,34 +2981,6 @@ plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-s - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo `test -f 'plugins/shotwell-publishing/shotwell-publishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/shotwell-publishing.c - --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo: plugins/shotwell-publishing/FacebookPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo `test -f 'plugins/shotwell-publishing/FacebookPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FacebookPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/FacebookPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo `test -f 'plugins/shotwell-publishing/FacebookPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FacebookPublishing.c -- --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo: plugins/shotwell-publishing/PicasaPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo `test -f 'plugins/shotwell-publishing/PicasaPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PicasaPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/PicasaPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo `test -f 'plugins/shotwell-publishing/PicasaPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PicasaPublishing.c -- --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo: plugins/shotwell-publishing/FlickrPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/FlickrPublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FlickrPublishing.lo `test -f 'plugins/shotwell-publishing/FlickrPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/FlickrPublishing.c -- --plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo: plugins/shotwell-publishing/YouTubePublishing.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/shotwell-publishing/YouTubePublishing.c' object='plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-YouTubePublishing.lo `test -f 'plugins/shotwell-publishing/YouTubePublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/YouTubePublishing.c -- - plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo: plugins/shotwell-publishing/PiwigoPublishing.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo -MD -MP -MF plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Tpo -c -o plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.lo `test -f 'plugins/shotwell-publishing/PiwigoPublishing.c' || echo '$(srcdir)/'`plugins/shotwell-publishing/PiwigoPublishing.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Tpo plugins/shotwell-publishing/$(DEPDIR)/plugins_shotwell_publishing_shotwell_publishing_la-PiwigoPublishing.Plo -@@ -6965,16 +6860,6 @@ $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(src - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ - fi --$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp -- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi -- @if test -f $@; then :; else \ -- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ -- fi --$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp -- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi -- @if test -f $@; then :; else \ -- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \ -- fi - $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t - $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi -@@ -7072,34 +6957,14 @@ $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_s - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi --$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp -- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi -- @if test -f $@; then :; else \ -- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ -- fi --$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp -- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi -- @if test -f $@; then :; else \ -- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ -- fi --$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp -- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi -- @if test -f $@; then :; else \ -- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ -- fi --$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp -- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi -- @if test -f $@; then :; else \ -- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ -- fi - $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi - @if test -f $@; then :; else \ - $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \ - fi --$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi -+$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)rm -f $@ && echo stamp > $@-t -- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi -+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi - $(AM_V_at)mv -f $@-t $@ - - mostlyclean-libtool: -@@ -7551,14 +7416,8 @@ maintainer-clean-generic: - -rm -f $(srcdir)/plugins/shotwell-data-imports/shotwell-data-imports.c - -rm -f $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c - -rm -f $(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c -- -rm -f $(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c -- -rm -f $(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c -- -rm -f $(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c -- -rm -f $(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c -- -rm -f $(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c -- -rm -f $(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c - -rm -f $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c - -rm -f $(srcdir)/plugins/shotwell-transitions/BlindsEffect.c - -rm -f $(srcdir)/plugins/shotwell-transitions/ChessEffect.c -@@ -7793,14 +7652,8 @@ maintainer-clean-generic: - -rm -f plugins/shotwell-data-imports/shotwell-data-imports.c - -rm -f plugins/shotwell-publishing-extras/GalleryConnector.c - -rm -f plugins/shotwell-publishing-extras/RajcePublishing.c -- -rm -f plugins/shotwell-publishing-extras/TumblrPublishing.c -- -rm -f plugins/shotwell-publishing-extras/YandexPublishing.c - -rm -f plugins/shotwell-publishing-extras/shotwell-publishing-extras.c -- -rm -f plugins/shotwell-publishing/FacebookPublishing.c -- -rm -f plugins/shotwell-publishing/FlickrPublishing.c -- -rm -f plugins/shotwell-publishing/PicasaPublishing.c - -rm -f plugins/shotwell-publishing/PiwigoPublishing.c -- -rm -f plugins/shotwell-publishing/YouTubePublishing.c - -rm -f plugins/shotwell-publishing/shotwell-publishing.c - -rm -f plugins/shotwell-transitions/BlindsEffect.c - -rm -f plugins/shotwell-transitions/ChessEffect.c -diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml -index 16ba868..209994b 100644 ---- a/misc/org.yorba.shotwell.gschema.xml -+++ b/misc/org.yorba.shotwell.gschema.xml -@@ -327,107 +327,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> -- --<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/"> -@@ -536,14 +436,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> -@@ -627,48 +519,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="publishing-rajce" type="b"> - <default>false</default> - <summary>enable rajce publishing plugin</summary> -diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in -index 955ec1c..4371892 100644 ---- a/misc/shotwell.appdata.xml.in -+++ b/misc/shotwell.appdata.xml.in -@@ -16,10 +16,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 --git a/misc/shotwell.desktop.in.in b/misc/shotwell.desktop.in.in -index aa1ede2..ea52381 100644 ---- a/misc/shotwell.desktop.in.in -+++ b/misc/shotwell.desktop.in.in -@@ -4,7 +4,7 @@ Name=Shotwell - GenericName=Photo Manager - Comment=Organize your photos - # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! --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 - # Translators: Do NOT translate or transliterate this text (this is an icon file name)! - Icon=shotwell -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; - --// "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 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module { - 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 --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala -index 9e70d30..560d193 100644 ---- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala -+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala -@@ -10,8 +10,6 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module { - private Spit.Pluggable[] pluggables = new Spit.Pluggable[0]; - - public ShotwellPublishingExtraServices(GLib.File module_file) { -- pluggables += new YandexService(); -- pluggables += new TumblrService(module_file.get_parent()); - pluggables += new RajceService(module_file.get_parent()); - pluggables += new Gallery3Service(module_file.get_parent()); - } -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 5f96f0a..637971d 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -28,24 +28,10 @@ plugins/shotwell-publishing-extras/rajce_authentication_pane.ui - plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui - plugins/shotwell-publishing-extras/RajcePublishing.vala - plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala --plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui --plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui --plugins/shotwell-publishing-extras/TumblrPublishing.vala --plugins/shotwell-publishing-extras/YandexPublishing.vala --plugins/shotwell-publishing-extras/yandex_publish_model.ui --plugins/shotwell-publishing/facebook_publishing_options_pane.ui --plugins/shotwell-publishing/FacebookPublishing.vala --plugins/shotwell-publishing/flickr_pin_entry_pane.ui --plugins/shotwell-publishing/flickr_publishing_options_pane.ui --plugins/shotwell-publishing/FlickrPublishing.vala --plugins/shotwell-publishing/picasa_publishing_options_pane.ui --plugins/shotwell-publishing/PicasaPublishing.vala - plugins/shotwell-publishing/piwigo_authentication_pane.ui - plugins/shotwell-publishing/piwigo_publishing_options_pane.ui - plugins/shotwell-publishing/PiwigoPublishing.vala - plugins/shotwell-publishing/shotwell-publishing.vala --plugins/shotwell-publishing/youtube_publishing_options_pane.ui --plugins/shotwell-publishing/YouTubePublishing.vala - plugins/shotwell-transitions/BlindsEffect.vala - plugins/shotwell-transitions/ChessEffect.vala - plugins/shotwell-transitions/CircleEffect.vala -@@ -215,7 +201,6 @@ src/ThumbnailCache.vala - src/Thumbnail.vala - src/TimedQueue.vala - src/Tombstone.vala --src/unit/rc/template.vala - src/unit/Unit.vala - src/UnityProgressBar.vala - src/Upgrades.vala -diff --git a/publish-extra.am b/publish-extra.am -index 7448bf6..7bd68c7 100644 ---- a/publish-extra.am -+++ b/publish-extra.am -@@ -8,17 +8,12 @@ dist_noinst_DATA += \ - plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui \ - plugins/shotwell-publishing-extras/rajce_authentication_pane.ui \ - plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui \ -- plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui \ -- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui \ -- plugins/shotwell-publishing-extras/yandex_publish_model.ui \ - plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml - - plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \ - plugins/shotwell-publishing-extras/GalleryConnector.vala \ - plugins/shotwell-publishing-extras/RajcePublishing.vala \ - plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala \ -- plugins/shotwell-publishing-extras/TumblrPublishing.vala \ -- plugins/shotwell-publishing-extras/YandexPublishing.vala \ - plugins/shotwell-plugin-common.vapi - - nodist_plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \ -diff --git a/publish.am b/publish.am -index 194dcb6..7dab0a6 100644 ---- a/publish.am -+++ b/publish.am -@@ -1,26 +1,13 @@ - plugin_LTLIBRARIES += plugins/shotwell-publishing/shotwell-publishing.la - - dist_noinst_DATA += \ -- plugins/shotwell-publishing/facebook.png \ -- plugins/shotwell-publishing/flickr.png \ -- plugins/shotwell-publishing/picasa.png \ - plugins/shotwell-publishing/piwigo.png \ -- plugins/shotwell-publishing/youtube.png \ -- plugins/shotwell-publishing/facebook_publishing_options_pane.ui \ -- plugins/shotwell-publishing/flickr_pin_entry_pane.ui \ -- plugins/shotwell-publishing/flickr_publishing_options_pane.ui \ -- plugins/shotwell-publishing/picasa_publishing_options_pane.ui \ - plugins/shotwell-publishing/piwigo_authentication_pane.ui \ - plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \ -- plugins/shotwell-publishing/youtube_publishing_options_pane.ui \ - plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml - - plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \ - plugins/shotwell-publishing/shotwell-publishing.vala \ -- plugins/shotwell-publishing/FacebookPublishing.vala \ -- plugins/shotwell-publishing/PicasaPublishing.vala \ -- plugins/shotwell-publishing/FlickrPublishing.vala \ -- plugins/shotwell-publishing/YouTubePublishing.vala \ - plugins/shotwell-publishing/PiwigoPublishing.vala \ - plugins/shotwell-plugin-common.vapi - -diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala -index 7a8ac40..22b75ae 100644 ---- a/src/plugins/PublishingInterfaces.vala -+++ b/src/plugins/PublishingInterfaces.vala -@@ -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 --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 -- 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; - } |