diff options
| -rw-r--r-- | nonprism/shotwell/PKGBUILD | 8 | ||||
| -rw-r--r-- | nonprism/shotwell/nonprism.patch | 42 |
2 files changed, 25 insertions, 25 deletions
diff --git a/nonprism/shotwell/PKGBUILD b/nonprism/shotwell/PKGBUILD index 6a62b3efb..9175700d9 100644 --- a/nonprism/shotwell/PKGBUILD +++ b/nonprism/shotwell/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186868 2016-08-16 17:32:00Z spupykin $ +# $Id: PKGBUILD 188123 2016-08-31 12:23:44Z 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.23.5 +pkgver=0.23.6 _basever=$(echo $pkgver | cut -f1-2 -d.) pkgrel=1.nonprism1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment, without support for unsafe and dangerous for privacy protocols" @@ -22,8 +22,8 @@ depends=('libgee' 'webkit2gtk' 'libgexiv2' 'libraw' 'rest' makedepends=('intltool' 'vala>=0.17.2' 'gnome-doc-utils' 'itstool') source=("https://download.gnome.org/sources/shotwell/${_basever}/shotwell-$pkgver.tar.xz" 'nonprism.patch') -md5sums=('4795be91d2f5adfb00641ba03435131b' - 'e4e087d9506ae30dc4f6805690d4b9f2') +md5sums=('5d5d5c74064866eea1127dc0f18b3a6b' + 'a73c79691dc3fa90adb442a4b2864336') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/nonprism/shotwell/nonprism.patch b/nonprism/shotwell/nonprism.patch index 097f4c972..d92f2eb24 100644 --- a/nonprism/shotwell/nonprism.patch +++ b/nonprism/shotwell/nonprism.patch @@ -1,5 +1,5 @@ diff --git a/Makefile.in b/Makefile.in -index fe97449..0e66f6b 100644 +index a155dab..8b3277a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -227,9 +227,7 @@ am__plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES_DIS @@ -213,24 +213,7 @@ index fe97449..0e66f6b 100644 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 -@@ -6941,16 +6836,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 -@@ -6960,34 +6845,14 @@ $(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_s +@@ -6969,34 +6864,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 @@ -265,8 +248,25 @@ index fe97449..0e66f6b 100644 - $(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 $@ - $(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp - @if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi + $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.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 +@@ -7013,16 +6888,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 @@ -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 |