Sun Aug 23 14:04:32 2015 UTC ()
Update to 0.22.0:

Shotwell 0.22.0 - 23 March 2015
-------------------------------

  * Improved metadata support for Facebook upload (#742163)
  * Saved search now properly supports text is-set, not-set (#743924, #743923)
  * Import title, exposure time when available
  * User interface improvements (#744291, #719284, more)
  * Sort photos by filename (#717878)
  * Updated translations

Shotwell 0.21.0 - 2 February 2015
---------------------------------

  * User interface refresh (#742326, #742443)
  * Fix Shotwell Viewer .desktop file (#743799)
  * Natural sorting of photo titles (#717960)
  * Improved video thumbnailer (#739396, #741821)
  * Updated translations


(wiz)
diff -r1.70 -r1.71 pkgsrc/graphics/shotwell/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/shotwell/PLIST
diff -r1.15 -r1.16 pkgsrc/graphics/shotwell/distinfo
diff -r1.10 -r1.11 pkgsrc/graphics/shotwell/patches/patch-aa
diff -r1.6 -r1.7 pkgsrc/graphics/shotwell/patches/patch-ab
cvs diff -r1.70 -r1.71 pkgsrc/graphics/shotwell/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/Makefile 2015/08/23 13:56:34 1.70
+++ pkgsrc/graphics/shotwell/Makefile 2015/08/23 14:04:32 1.71
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.70 2015/08/23 13:56:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2015/08/23 14:04:32 wiz Exp $
2 2
3DISTNAME= shotwell-0.20.2 3DISTNAME= shotwell-0.22.0
4PKGREVISION= 5 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= https://download.gnome.org/sources/shotwell/0.20/ 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/shotwell/0.22/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= pkgrsc-users@NetBSD.org 8MAINTAINER= pkgrsc-users@NetBSD.org
10HOMEPAGE= https://wiki.gnome.org/Apps/Shotwell 9HOMEPAGE= https://wiki.gnome.org/Apps/Shotwell
11COMMENT= Shotwell is a photo organizer for the GNOME desktop 10COMMENT= Shotwell is a photo organizer for the GNOME desktop
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14BUILD_DEPENDS+= gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils 13BUILD_DEPENDS+= gnome-doc-utils-[0-9]*:../../textproc/gnome-doc-utils
15 14
16HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
17USE_TOOLS+= gmake bash pkg-config m4 msgfmt 16USE_TOOLS+= gmake bash pkg-config m4 msgfmt
18 17
19CONFIG_SHELL= bash 18CONFIG_SHELL= bash
@@ -37,16 +36,17 @@ REPLACE_SH+= configure @@ -37,16 +36,17 @@ REPLACE_SH+= configure
37BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2 36BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
38.include "../../graphics/libraw/buildlink3.mk" 37.include "../../graphics/libraw/buildlink3.mk"
39# Required for dealing with .svg icons. Spotted on a clean box 38# Required for dealing with .svg icons. Spotted on a clean box
40.include "../../graphics/librsvg/buildlink3.mk" 39.include "../../graphics/librsvg/buildlink3.mk"
41BUILDLINK_DEPMETHOD.vala= build 40BUILDLINK_DEPMETHOD.vala= build
42.include "../../lang/vala/buildlink3.mk" 41.include "../../lang/vala/buildlink3.mk"
43.include "../../net/libsoup/buildlink3.mk" 42.include "../../net/libsoup/buildlink3.mk"
44.include "../../sysutils/desktop-file-utils/desktopdb.mk" 43.include "../../sysutils/desktop-file-utils/desktopdb.mk"
45.include "../../sysutils/dbus-glib/buildlink3.mk" 44.include "../../sysutils/dbus-glib/buildlink3.mk"
46.include "../../textproc/libxml2/buildlink3.mk" 45.include "../../textproc/libxml2/buildlink3.mk"
47.include "../../textproc/json-glib/buildlink3.mk" 46.include "../../textproc/json-glib/buildlink3.mk"
48.include "../../www/webkit24-gtk3/buildlink3.mk" 47.include "../../www/webkit24-gtk3/buildlink3.mk"
49.include "../../www/librest07/buildlink3.mk" 48.include "../../www/librest07/buildlink3.mk"
 49BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.12.2
50.include "../../x11/gtk3/buildlink3.mk" 50.include "../../x11/gtk3/buildlink3.mk"
51.include "../../x11/libunique3/buildlink3.mk" 51.include "../../x11/libunique3/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/graphics/shotwell/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/PLIST 2014/11/25 10:07:18 1.6
+++ pkgsrc/graphics/shotwell/PLIST 2015/08/23 14:04:32 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2014/11/25 10:07:18 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.7 2015/08/23 14:04:32 wiz Exp $
2bin/shotwell 2bin/shotwell
3lib/shotwell/plugins/builtin/f-spot-24.png 3lib/shotwell/plugins/builtin/f-spot-24.png
4lib/shotwell/plugins/builtin/facebook.png 4lib/shotwell/plugins/builtin/facebook.png
5lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade 5lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade
6lib/shotwell/plugins/builtin/flickr.png 6lib/shotwell/plugins/builtin/flickr.png
7lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade 7lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade
8lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade 8lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade
9lib/shotwell/plugins/builtin/gallery3.png 9lib/shotwell/plugins/builtin/gallery3.png
10lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade 10lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
11lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade 11lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
12lib/shotwell/plugins/builtin/picasa.png 12lib/shotwell/plugins/builtin/picasa.png
13lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade 13lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
14lib/shotwell/plugins/builtin/piwigo.png 14lib/shotwell/plugins/builtin/piwigo.png
@@ -68,26 +68,102 @@ share/gnome/help/shotwell/C/other-missin @@ -68,26 +68,102 @@ share/gnome/help/shotwell/C/other-missin
68share/gnome/help/shotwell/C/other-multiple.page 68share/gnome/help/shotwell/C/other-multiple.page
69share/gnome/help/shotwell/C/other-plugins.page 69share/gnome/help/shotwell/C/other-plugins.page
70share/gnome/help/shotwell/C/raw.page 70share/gnome/help/shotwell/C/raw.page
71share/gnome/help/shotwell/C/running.page 71share/gnome/help/shotwell/C/running.page
72share/gnome/help/shotwell/C/share-background.page 72share/gnome/help/shotwell/C/share-background.page
73share/gnome/help/shotwell/C/share-export.page 73share/gnome/help/shotwell/C/share-export.page
74share/gnome/help/shotwell/C/share-print.page 74share/gnome/help/shotwell/C/share-print.page
75share/gnome/help/shotwell/C/share-send.page 75share/gnome/help/shotwell/C/share-send.page
76share/gnome/help/shotwell/C/share-slideshow.page 76share/gnome/help/shotwell/C/share-slideshow.page
77share/gnome/help/shotwell/C/share-upload.page 77share/gnome/help/shotwell/C/share-upload.page
78share/gnome/help/shotwell/C/view-displaying.page 78share/gnome/help/shotwell/C/view-displaying.page
79share/gnome/help/shotwell/C/view-information.page 79share/gnome/help/shotwell/C/view-information.page
80share/gnome/help/shotwell/C/view-sidebar.page 80share/gnome/help/shotwell/C/view-sidebar.page
 81share/gnome/help/shotwell/cs/edit-adjustments.page
 82share/gnome/help/shotwell/cs/edit-crop.page
 83share/gnome/help/shotwell/cs/edit-enhance.page
 84share/gnome/help/shotwell/cs/edit-external.page
 85share/gnome/help/shotwell/cs/edit-nondestructive.page
 86share/gnome/help/shotwell/cs/edit-redeye.page
 87share/gnome/help/shotwell/cs/edit-rotate.page
 88share/gnome/help/shotwell/cs/edit-straighten.page
 89share/gnome/help/shotwell/cs/edit-time-date.page
 90share/gnome/help/shotwell/cs/edit-undo.page
 91share/gnome/help/shotwell/cs/formats.page
 92share/gnome/help/shotwell/cs/import-camera.page
 93share/gnome/help/shotwell/cs/import-f-spot.page
 94share/gnome/help/shotwell/cs/import-file.page
 95share/gnome/help/shotwell/cs/import-memorycard.page
 96share/gnome/help/shotwell/cs/index.page
 97share/gnome/help/shotwell/cs/organize-event.page
 98share/gnome/help/shotwell/cs/organize-flag.page
 99share/gnome/help/shotwell/cs/organize-rating.page
 100share/gnome/help/shotwell/cs/organize-remove.page
 101share/gnome/help/shotwell/cs/organize-search.page
 102share/gnome/help/shotwell/cs/organize-tag.page
 103share/gnome/help/shotwell/cs/organize-title.page
 104share/gnome/help/shotwell/cs/other-files.page
 105share/gnome/help/shotwell/cs/other-missing.page
 106share/gnome/help/shotwell/cs/other-multiple.page
 107share/gnome/help/shotwell/cs/other-plugins.page
 108share/gnome/help/shotwell/cs/raw.page
 109share/gnome/help/shotwell/cs/running.page
 110share/gnome/help/shotwell/cs/share-background.page
 111share/gnome/help/shotwell/cs/share-export.page
 112share/gnome/help/shotwell/cs/share-print.page
 113share/gnome/help/shotwell/cs/share-send.page
 114share/gnome/help/shotwell/cs/share-slideshow.page
 115share/gnome/help/shotwell/cs/share-upload.page
 116share/gnome/help/shotwell/cs/view-displaying.page
 117share/gnome/help/shotwell/cs/view-information.page
 118share/gnome/help/shotwell/cs/view-sidebar.page
 119share/gnome/help/shotwell/de/edit-adjustments.page
 120share/gnome/help/shotwell/de/edit-crop.page
 121share/gnome/help/shotwell/de/edit-enhance.page
 122share/gnome/help/shotwell/de/edit-external.page
 123share/gnome/help/shotwell/de/edit-nondestructive.page
 124share/gnome/help/shotwell/de/edit-redeye.page
 125share/gnome/help/shotwell/de/edit-rotate.page
 126share/gnome/help/shotwell/de/edit-straighten.page
 127share/gnome/help/shotwell/de/edit-time-date.page
 128share/gnome/help/shotwell/de/edit-undo.page
 129share/gnome/help/shotwell/de/formats.page
 130share/gnome/help/shotwell/de/import-camera.page
 131share/gnome/help/shotwell/de/import-f-spot.page
 132share/gnome/help/shotwell/de/import-file.page
 133share/gnome/help/shotwell/de/import-memorycard.page
 134share/gnome/help/shotwell/de/index.page
 135share/gnome/help/shotwell/de/organize-event.page
 136share/gnome/help/shotwell/de/organize-flag.page
 137share/gnome/help/shotwell/de/organize-rating.page
 138share/gnome/help/shotwell/de/organize-remove.page
 139share/gnome/help/shotwell/de/organize-search.page
 140share/gnome/help/shotwell/de/organize-tag.page
 141share/gnome/help/shotwell/de/organize-title.page
 142share/gnome/help/shotwell/de/other-files.page
 143share/gnome/help/shotwell/de/other-missing.page
 144share/gnome/help/shotwell/de/other-multiple.page
 145share/gnome/help/shotwell/de/other-plugins.page
 146share/gnome/help/shotwell/de/raw.page
 147share/gnome/help/shotwell/de/running.page
 148share/gnome/help/shotwell/de/share-background.page
 149share/gnome/help/shotwell/de/share-export.page
 150share/gnome/help/shotwell/de/share-print.page
 151share/gnome/help/shotwell/de/share-send.page
 152share/gnome/help/shotwell/de/share-slideshow.page
 153share/gnome/help/shotwell/de/share-upload.page
 154share/gnome/help/shotwell/de/view-displaying.page
 155share/gnome/help/shotwell/de/view-information.page
 156share/gnome/help/shotwell/de/view-sidebar.page
81share/gnome/help/shotwell/el/edit-adjustments.page 157share/gnome/help/shotwell/el/edit-adjustments.page
82share/gnome/help/shotwell/el/edit-crop.page 158share/gnome/help/shotwell/el/edit-crop.page
83share/gnome/help/shotwell/el/edit-enhance.page 159share/gnome/help/shotwell/el/edit-enhance.page
84share/gnome/help/shotwell/el/edit-external.page 160share/gnome/help/shotwell/el/edit-external.page
85share/gnome/help/shotwell/el/edit-nondestructive.page 161share/gnome/help/shotwell/el/edit-nondestructive.page
86share/gnome/help/shotwell/el/edit-redeye.page 162share/gnome/help/shotwell/el/edit-redeye.page
87share/gnome/help/shotwell/el/edit-rotate.page 163share/gnome/help/shotwell/el/edit-rotate.page
88share/gnome/help/shotwell/el/edit-straighten.page 164share/gnome/help/shotwell/el/edit-straighten.page
89share/gnome/help/shotwell/el/edit-time-date.page 165share/gnome/help/shotwell/el/edit-time-date.page
90share/gnome/help/shotwell/el/edit-undo.page 166share/gnome/help/shotwell/el/edit-undo.page
91share/gnome/help/shotwell/el/formats.page 167share/gnome/help/shotwell/el/formats.page
92share/gnome/help/shotwell/el/import-camera.page 168share/gnome/help/shotwell/el/import-camera.page
93share/gnome/help/shotwell/el/import-f-spot.page 169share/gnome/help/shotwell/el/import-f-spot.page
@@ -192,26 +268,27 @@ share/gnome/help/shotwell/hu/share-uploa @@ -192,26 +268,27 @@ share/gnome/help/shotwell/hu/share-uploa
192share/gnome/help/shotwell/hu/view-displaying.page 268share/gnome/help/shotwell/hu/view-displaying.page
193share/gnome/help/shotwell/hu/view-information.page 269share/gnome/help/shotwell/hu/view-information.page
194share/gnome/help/shotwell/hu/view-sidebar.page 270share/gnome/help/shotwell/hu/view-sidebar.page
195share/icons/hicolor/16x16/apps/shotwell.svg 271share/icons/hicolor/16x16/apps/shotwell.svg
196share/icons/hicolor/24x24/apps/shotwell.svg 272share/icons/hicolor/24x24/apps/shotwell.svg
197share/icons/hicolor/scalable/apps/shotwell.svg 273share/icons/hicolor/scalable/apps/shotwell.svg
198share/locale/af/LC_MESSAGES/shotwell.mo 274share/locale/af/LC_MESSAGES/shotwell.mo
199share/locale/ar/LC_MESSAGES/shotwell.mo 275share/locale/ar/LC_MESSAGES/shotwell.mo
200share/locale/as/LC_MESSAGES/shotwell.mo 276share/locale/as/LC_MESSAGES/shotwell.mo
201share/locale/ast/LC_MESSAGES/shotwell.mo 277share/locale/ast/LC_MESSAGES/shotwell.mo
202share/locale/bg/LC_MESSAGES/shotwell.mo 278share/locale/bg/LC_MESSAGES/shotwell.mo
203share/locale/bn/LC_MESSAGES/shotwell.mo 279share/locale/bn/LC_MESSAGES/shotwell.mo
204share/locale/bn_IN/LC_MESSAGES/shotwell.mo 280share/locale/bn_IN/LC_MESSAGES/shotwell.mo
 281share/locale/bs/LC_MESSAGES/shotwell.mo
205share/locale/ca/LC_MESSAGES/shotwell.mo 282share/locale/ca/LC_MESSAGES/shotwell.mo
206share/locale/cs/LC_MESSAGES/shotwell.mo 283share/locale/cs/LC_MESSAGES/shotwell.mo
207share/locale/da/LC_MESSAGES/shotwell.mo 284share/locale/da/LC_MESSAGES/shotwell.mo
208share/locale/de/LC_MESSAGES/shotwell.mo 285share/locale/de/LC_MESSAGES/shotwell.mo
209share/locale/el/LC_MESSAGES/shotwell.mo 286share/locale/el/LC_MESSAGES/shotwell.mo
210share/locale/en_GB/LC_MESSAGES/shotwell.mo 287share/locale/en_GB/LC_MESSAGES/shotwell.mo
211share/locale/eo/LC_MESSAGES/shotwell.mo 288share/locale/eo/LC_MESSAGES/shotwell.mo
212share/locale/es/LC_MESSAGES/shotwell.mo 289share/locale/es/LC_MESSAGES/shotwell.mo
213share/locale/et/LC_MESSAGES/shotwell.mo 290share/locale/et/LC_MESSAGES/shotwell.mo
214share/locale/eu/LC_MESSAGES/shotwell.mo 291share/locale/eu/LC_MESSAGES/shotwell.mo
215share/locale/fi/LC_MESSAGES/shotwell.mo 292share/locale/fi/LC_MESSAGES/shotwell.mo
216share/locale/fr/LC_MESSAGES/shotwell.mo 293share/locale/fr/LC_MESSAGES/shotwell.mo
217share/locale/gd/LC_MESSAGES/shotwell.mo 294share/locale/gd/LC_MESSAGES/shotwell.mo
@@ -253,27 +330,26 @@ share/locale/sv/LC_MESSAGES/shotwell.mo @@ -253,27 +330,26 @@ share/locale/sv/LC_MESSAGES/shotwell.mo
253share/locale/ta/LC_MESSAGES/shotwell.mo 330share/locale/ta/LC_MESSAGES/shotwell.mo
254share/locale/te/LC_MESSAGES/shotwell.mo 331share/locale/te/LC_MESSAGES/shotwell.mo
255share/locale/th/LC_MESSAGES/shotwell.mo 332share/locale/th/LC_MESSAGES/shotwell.mo
256share/locale/tr/LC_MESSAGES/shotwell.mo 333share/locale/tr/LC_MESSAGES/shotwell.mo
257share/locale/uk/LC_MESSAGES/shotwell.mo 334share/locale/uk/LC_MESSAGES/shotwell.mo
258share/locale/vi/LC_MESSAGES/shotwell.mo 335share/locale/vi/LC_MESSAGES/shotwell.mo
259share/locale/zh_CN/LC_MESSAGES/shotwell.mo 336share/locale/zh_CN/LC_MESSAGES/shotwell.mo
260share/locale/zh_HK/LC_MESSAGES/shotwell.mo 337share/locale/zh_HK/LC_MESSAGES/shotwell.mo
261share/locale/zh_TW/LC_MESSAGES/shotwell.mo 338share/locale/zh_TW/LC_MESSAGES/shotwell.mo
262share/shotwell/icons/all-rejected.png 339share/shotwell/icons/all-rejected.png
263share/shotwell/icons/crop-pivot-reticle.png 340share/shotwell/icons/crop-pivot-reticle.png
264share/shotwell/icons/crop.svg 341share/shotwell/icons/crop.svg
265share/shotwell/icons/drag_nub.png 342share/shotwell/icons/drag_nub.png
266share/shotwell/icons/enhance.png 
267share/shotwell/icons/filter-flagged.png 343share/shotwell/icons/filter-flagged.png
268share/shotwell/icons/filter-photos.png 344share/shotwell/icons/filter-photos.png
269share/shotwell/icons/filter-raw.png 345share/shotwell/icons/filter-raw.png
270share/shotwell/icons/filter-videos.png 346share/shotwell/icons/filter-videos.png
271share/shotwell/icons/five-star-filter.svg 347share/shotwell/icons/five-star-filter.svg
272share/shotwell/icons/five-stars.svg 348share/shotwell/icons/five-stars.svg
273share/shotwell/icons/flag-page.png 349share/shotwell/icons/flag-page.png
274share/shotwell/icons/flag-trinket.png 350share/shotwell/icons/flag-trinket.png
275share/shotwell/icons/four-star-filter-plus.svg 351share/shotwell/icons/four-star-filter-plus.svg
276share/shotwell/icons/four-stars.svg 352share/shotwell/icons/four-stars.svg
277share/shotwell/icons/generic-plugin.png 353share/shotwell/icons/generic-plugin.png
278share/shotwell/icons/image-adjust.svg 354share/shotwell/icons/image-adjust.svg
279share/shotwell/icons/import-all.png 355share/shotwell/icons/import-all.png
@@ -284,26 +360,27 @@ share/shotwell/icons/multiple-events.png @@ -284,26 +360,27 @@ share/shotwell/icons/multiple-events.png
284share/shotwell/icons/multiple-tags.png 360share/shotwell/icons/multiple-tags.png
285share/shotwell/icons/no-event.png 361share/shotwell/icons/no-event.png
286share/shotwell/icons/noninterpretable-video.png 362share/shotwell/icons/noninterpretable-video.png
287share/shotwell/icons/one-event.png 363share/shotwell/icons/one-event.png
288share/shotwell/icons/one-star-filter-plus.svg 364share/shotwell/icons/one-star-filter-plus.svg
289share/shotwell/icons/one-star.svg 365share/shotwell/icons/one-star.svg
290share/shotwell/icons/one-tag.png 366share/shotwell/icons/one-tag.png
291share/shotwell/icons/pin-toolbar.svg 367share/shotwell/icons/pin-toolbar.svg
292share/shotwell/icons/publish.png 368share/shotwell/icons/publish.png
293share/shotwell/icons/redeye.png 369share/shotwell/icons/redeye.png
294share/shotwell/icons/rejected.svg 370share/shotwell/icons/rejected.svg
295share/shotwell/icons/shotwell-16.svg 371share/shotwell/icons/shotwell-16.svg
296share/shotwell/icons/shotwell-24.svg 372share/shotwell/icons/shotwell-24.svg
 373share/shotwell/icons/shotwell-auto-enhance.png
297share/shotwell/icons/shotwell-street.jpg 374share/shotwell/icons/shotwell-street.jpg
298share/shotwell/icons/shotwell.ico 375share/shotwell/icons/shotwell.ico
299share/shotwell/icons/shotwell.svg 376share/shotwell/icons/shotwell.svg
300share/shotwell/icons/slideshow-extension-point.png 377share/shotwell/icons/slideshow-extension-point.png
301share/shotwell/icons/sprocket.png 378share/shotwell/icons/sprocket.png
302share/shotwell/icons/straighten.svg 379share/shotwell/icons/straighten.svg
303share/shotwell/icons/three-star-filter-plus.svg 380share/shotwell/icons/three-star-filter-plus.svg
304share/shotwell/icons/three-stars.svg 381share/shotwell/icons/three-stars.svg
305share/shotwell/icons/two-star-filter-plus.svg 382share/shotwell/icons/two-star-filter-plus.svg
306share/shotwell/icons/two-stars.svg 383share/shotwell/icons/two-stars.svg
307share/shotwell/icons/videos-page.png 384share/shotwell/icons/videos-page.png
308share/shotwell/icons/zoom-in.png 385share/shotwell/icons/zoom-in.png
309share/shotwell/icons/zoom-out.png 386share/shotwell/icons/zoom-out.png
cvs diff -r1.15 -r1.16 pkgsrc/graphics/shotwell/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/distinfo 2014/11/25 10:07:18 1.15
+++ pkgsrc/graphics/shotwell/distinfo 2015/08/23 14:04:32 1.16
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.15 2014/11/25 10:07:18 wiz Exp $ 1$NetBSD: distinfo,v 1.16 2015/08/23 14:04:32 wiz Exp $
2 2
3SHA1 (shotwell-0.20.2.tar.xz) = f69ea2a2fc6ae1dad0f56bf85d1a3275dd8a6f1e 3SHA1 (shotwell-0.22.0.tar.xz) = 8ed803a5da8c61dd16a629f42946cc586197e392
4RMD160 (shotwell-0.20.2.tar.xz) = 25c282de74f5dd35f0f44f05067eec4db6f4d33e 4RMD160 (shotwell-0.22.0.tar.xz) = eb46f018b1022e22ff6d5198f2e341928b6ac4cb
5Size (shotwell-0.20.2.tar.xz) = 1815580 bytes 5Size (shotwell-0.22.0.tar.xz) = 1872952 bytes
6SHA1 (patch-aa) = 23f6982e1ba135c706afc6983c48602f6060dfad 6SHA1 (patch-aa) = 3baaeceac9a1d652cd4f1ef14ee8fa96691ce598
7SHA1 (patch-ab) = e4951475348523f407fe4960fcee861e8cbc29ed 7SHA1 (patch-ab) = 83e9ece301dc4264ecd64e85b6547471bf514ce7
8SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a 8SHA1 (patch-ac) = 0183761f3ab30788703e54aecba72b194e0d770a
cvs diff -r1.10 -r1.11 pkgsrc/graphics/shotwell/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/patches/Attic/patch-aa 2014/11/25 10:07:18 1.10
+++ pkgsrc/graphics/shotwell/patches/Attic/patch-aa 2015/08/23 14:04:32 1.11
@@ -1,46 +1,46 @@ @@ -1,46 +1,46 @@
1$NetBSD: patch-aa,v 1.10 2014/11/25 10:07:18 wiz Exp $ 1$NetBSD: patch-aa,v 1.11 2015/08/23 14:04:32 wiz Exp $
2 2
3--- Makefile.orig 2013-11-19 02:16:36.000000000 +0000 3--- Makefile.orig 2015-03-24 00:38:31.000000000 +0000
4+++ Makefile 4+++ Makefile
5@@ -315,7 +315,6 @@ EXT_PKGS = \ 5@@ -263,7 +263,6 @@ EXT_PKGS = \
6 gstreamer-base-1.0 \ 6 gstreamer-base-1.0 \
7 gstreamer-pbutils-1.0 \ 7 gstreamer-pbutils-1.0 \
8 gtk+-3.0 \ 8 gtk+-3.0 \
9- gudev-1.0 \ 9- gudev-1.0 \
10 libexif \ 10 libexif \
11 libgphoto2 \ 11 libgphoto2 \
12 json-glib-1.0 \ 12 json-glib-1.0 \
13@@ -347,7 +346,6 @@ EXT_PKG_VERSIONS = \ 13@@ -295,7 +294,6 @@ EXT_PKG_VERSIONS = \
14 gstreamer-plugins-base-1.0 >= 1.0.0 \ 14 gstreamer-plugins-base-1.0 >= 1.0.0 \
15 gstreamer-pbutils-1.0 >= 1.0.0 \ 15 gstreamer-pbutils-1.0 >= 1.0.0 \
16 gtk+-3.0 >= 3.6.0 \ 16 gtk+-3.0 >= 3.12.2 \
17- gudev-1.0 >= 145 \ 17- gudev-1.0 >= 145 \
18 libexif >= 0.6.16 \ 18 libexif >= 0.6.16 \
19 libgphoto2 >= 2.4.2 \ 19 libgphoto2 >= 2.4.2 \
20 libraw >= 0.13.2 \ 20 libraw >= 0.13.2 \
21@@ -461,7 +459,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU 21@@ -417,7 +415,7 @@ PLUGIN_CFLAGS += $(PROFILE_FLAGS) $(REQU
22 # Required for gudev-1.0 22 # Required for gudev-1.0
23 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE 23 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
24  24
25-all: pkgcheck valacheck desktop 25-all: pkgcheck valacheck desktop
26+all: pkgcheck desktop 26+all: pkgcheck desktop
27  27
28 ifdef ENABLE_BUILD_FOR_GLADE 28 ifdef ENABLE_BUILD_FOR_GLADE
29 all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE) 29 all: $(PLUGINS_DIR) lib$(PROGRAM).so $(PROGRAM) $(PC_FILE)
30@@ -535,7 +533,7 @@ ifndef DISABLE_DESKTOP_VALIDATE 30@@ -489,7 +487,7 @@ ifndef DISABLE_DESKTOP_VALIDATE
31 else rm -f misc/shotwell.desktop.errors; \ 31 else rm -f misc/shotwell.desktop.errors; \
32 fi 32 fi
33 endif 33 endif
34-  34-
35+ 35+
36 misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES) 36 misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
37 cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop 37 cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
38 $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \ 38 $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
39@@ -736,7 +732,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU 39@@ -694,7 +692,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
40  40
41 .PHONY: $(PLUGINS_DIR) 41 .PHONY: $(PLUGINS_DIR)
42 $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS) 42 $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
43- $(call check_valac_version) 43- $(call check_valac_version)
44 @$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \ 44 @$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
45 PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)" 45 PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
46  46
cvs diff -r1.6 -r1.7 pkgsrc/graphics/shotwell/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/patches/Attic/patch-ab 2014/11/25 10:07:18 1.6
+++ pkgsrc/graphics/shotwell/patches/Attic/patch-ab 2015/08/23 14:04:32 1.7
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-ab,v 1.6 2014/11/25 10:07:18 wiz Exp $ 1$NetBSD: patch-ab,v 1.7 2015/08/23 14:04:32 wiz Exp $
2 2
3--- src/camera/CameraTable.vala.orig 2012-03-28 22:35:57.000000000 +0000 3--- src/camera/CameraTable.vala.orig 2015-02-14 00:50:15.000000000 +0000
4+++ src/camera/CameraTable.vala 4+++ src/camera/CameraTable.vala
5@@ -26,7 +26,6 @@ public class CameraTable { 5@@ -26,7 +26,6 @@ public class CameraTable {
6  6
7 private static CameraTable instance = null; 7 private static CameraTable instance = null;
8  8
9- private GUdev.Client client = new GUdev.Client(SUBSYSTEMS); 9- private GUdev.Client client = new GUdev.Client(SUBSYSTEMS);
10 private OneShotScheduler camera_update_scheduler = null; 10 private OneShotScheduler camera_update_scheduler = null;
11 private GPhoto.Context null_context = new GPhoto.Context(); 11 private GPhoto.Context null_context = new GPhoto.Context();
12 private GPhoto.CameraAbilitiesList abilities_list; 12 private GPhoto.CameraAbilitiesList abilities_list;
13@@ -44,7 +43,6 @@ public class CameraTable { 13@@ -43,7 +42,6 @@ public class CameraTable {
14 on_update_cameras); 14 on_update_cameras);
15  15
16 // listen for interesting events on the specified subsystems 16 // listen for interesting events on the specified subsystems
17- client.uevent.connect(on_udev_event); 17- client.uevent.connect(on_udev_event);
18 volume_monitor = VolumeMonitor.get(); 18 volume_monitor = VolumeMonitor.get();
19 volume_monitor.volume_changed.connect(on_volume_changed); 19 volume_monitor.volume_changed.connect(on_volume_changed);
20 volume_monitor.volume_added.connect(on_volume_changed); 20 volume_monitor.volume_added.connect(on_volume_changed);
21@@ -105,31 +103,6 @@ public class CameraTable { 21@@ -111,31 +109,6 @@ public class CameraTable {
22 private string[] get_all_usb_cameras() { 22 private string[] get_all_usb_cameras() {
23 string[] cameras = new string[0]; 23 string[] cameras = new string[0];
24  24
25- GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null); 25- GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
26- foreach (GUdev.Device device in device_list) { 26- foreach (GUdev.Device device in device_list) {
27- string device_file = device.get_device_file(); 27- string device_file = device.get_device_file();
28- if( 28- if(
29- // only keep devices that have a non-null device file and that 29- // only keep devices that have a non-null device file and that
30- // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set 30- // have both the ID_GPHOTO2 and GPHOTO2_DRIVER properties set
31- (device_file != null) && 31- (device_file != null) &&
32- (device.has_property("ID_GPHOTO2")) && 32- (device.has_property("ID_GPHOTO2")) &&
33- (device.has_property("GPHOTO2_DRIVER")) 33- (device.has_property("GPHOTO2_DRIVER"))
34- ) { 34- ) {
@@ -40,76 +40,76 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07 @@ -40,76 +40,76 @@ $NetBSD: patch-ab,v 1.6 2014/11/25 10:07
40- critical("get_all_usb_cameras: Failed to scanf device file %s", device_file); 40- critical("get_all_usb_cameras: Failed to scanf device file %s", device_file);
41-  41-
42- continue; 42- continue;
43- } 43- }
44- string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device); 44- string camera = "usb:%.3d,%.3d".printf(camera_bus, camera_device);
45- debug("USB camera detected at %s", camera); 45- debug("USB camera detected at %s", camera);
46- cameras += camera; 46- cameras += camera;
47- } 47- }
48- } 48- }
49-  49-
50 return cameras; 50 return cameras;
51 } 51 }
52  52
53@@ -206,24 +179,6 @@ public class CameraTable { 53@@ -212,24 +185,6 @@ public class CameraTable {
54 "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null; 54 "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
55 } 55 }
56  56
57- private string? get_name_for_uuid(string uuid) { 57- private string? get_name_for_uuid(string uuid) {
58- foreach (Volume volume in volume_monitor.get_volumes()) { 58- foreach (Volume volume in volume_monitor.get_volumes()) {
59- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) { 59- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
60- return volume.get_name(); 60- return volume.get_name();
61- } 61- }
62- } 62- }
63- return null; 63- return null;
64- } 64- }
65-  65-
66- private GLib.Icon? get_icon_for_uuid(string uuid) { 66- private string? get_icon_for_uuid(string uuid) {
67- foreach (Volume volume in volume_monitor.get_volumes()) { 67- foreach (Volume volume in volume_monitor.get_volumes()) {
68- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) { 68- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
69- return volume.get_icon(); 69- return volume.get_icon().to_string();
70- } 70- }
71- } 71- }
72- return null; 72- return null;
73- } 73- }
74- 74-
75 private void update_camera_table() throws GPhotoError { 75 private void update_camera_table() throws GPhotoError {
76 // need to do this because virtual ports come and go in the USB world (and probably others) 76 // need to do this because virtual ports come and go in the USB world (and probably others)
77 GPhoto.PortInfoList port_info_list; 77 GPhoto.PortInfoList port_info_list;
78@@ -313,23 +268,6 @@ public class CameraTable { 78@@ -333,23 +288,6 @@ public class CameraTable {
79 continue; 79 continue;
80 } 80 }
81  81
82- // Get display name for camera. 82- // Get display name for camera.
83- string path = get_port_path(port); 83- string path = get_port_path(port);
84- if (null != path) { 84- if (null != path) {
85- GUdev.Device device = client.query_by_device_file(path); 85- GUdev.Device device = client.query_by_device_file(path);
86- string serial = device.get_property("ID_SERIAL_SHORT"); 86- string serial = device.get_property("ID_SERIAL_SHORT");
87- if (null != serial) { 87- if (null != serial) {
88- // Try to get the name and icon. 88- // Try to get the name and icon.
89- display_name = get_name_for_uuid(serial); 89- display_name = get_name_for_uuid(serial);
90- icon = get_icon_for_uuid(serial); 90- icon = get_icon_for_uuid(serial);
91- } 91- }
92- if (null == display_name) { 92- if (null == display_name) {
93- display_name = device.get_sysfs_attr("product"); 93- display_name = device.get_sysfs_attr("product");
94- }  94- }
95- if (null == display_name) { 95- if (null == display_name) {
96- display_name = device.get_property("ID_MODEL"); 96- display_name = device.get_property("ID_MODEL");
97- } 97- }
98- } 98- }
99 if (null == display_name) { 99 if (null == display_name) {
100 // Default to GPhoto detected name. 100 // Default to GPhoto detected name.
101 display_name = name; 101 display_name = name;
102@@ -367,14 +305,6 @@ public class CameraTable { 102@@ -394,14 +332,6 @@ public class CameraTable {
103 } 103 }
104 } 104 }
105  105
106- private void on_udev_event(string action, GUdev.Device device) { 106- private void on_udev_event(string action, GUdev.Device device) {
107- debug("udev event: %s on %s", action, device.get_name()); 107- debug("udev event: %s on %s", action, device.get_name());
108-  108-
109- // Device add/removes often arrive in pairs; this allows for a single 109- // Device add/removes often arrive in pairs; this allows for a single
110- // update to occur when they come in all at once 110- // update to occur when they come in all at once
111- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); 111- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
112- } 112- }
113-  113-
114 public void on_volume_changed(Volume volume) { 114 public void on_volume_changed(Volume volume) {
115 camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); 115 camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);