Tue Jul 12 19:00:57 2011 UTC ()
update to 0.10.1
changes:
-Fixes "Hide Photos Already Imported"
-Multiple editing bugs fixed
-Resolves crash when two or more cameras have the same name
-Documentation now includes saved searches
-Piwigo bugs fixed
-Translation updates


(drochner)
diff -r1.19 -r1.20 pkgsrc/graphics/shotwell/Makefile
diff -r1.3 -r1.4 pkgsrc/graphics/shotwell/PLIST
diff -r1.8 -r1.9 pkgsrc/graphics/shotwell/distinfo
diff -r1.6 -r1.7 pkgsrc/graphics/shotwell/patches/patch-aa
diff -r1.3 -r1.4 pkgsrc/graphics/shotwell/patches/patch-ab
cvs diff -r1.19 -r1.20 pkgsrc/graphics/shotwell/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/Makefile 2011/06/10 09:39:55 1.19
+++ pkgsrc/graphics/shotwell/Makefile 2011/07/12 19:00:57 1.20
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.19 2011/06/10 09:39:55 obache Exp $ 1# $NetBSD: Makefile,v 1.20 2011/07/12 19:00:57 drochner Exp $
2# 2#
3 3
4DISTNAME= shotwell-0.9.3 4DISTNAME= shotwell-0.10.1
5PKGREVISION= 2 
6CATEGORIES= graphics 5CATEGORIES= graphics
7MASTER_SITES= http://yorba.org/download/shotwell/0.9/ 6MASTER_SITES= http://yorba.org/download/shotwell/0.10/
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10MAINTAINER= pkgrsc-users@NetBSD.org 9MAINTAINER= pkgrsc-users@NetBSD.org
11HOMEPAGE= http://yorba.org/shotwell/ 10HOMEPAGE= http://yorba.org/shotwell/
12COMMENT= Shotwell is a photo organizer for the GNOME desktop 11COMMENT= Shotwell is a photo organizer for the GNOME desktop
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
16 15
17HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
18USE_TOOLS+= gmake bash pkg-config msgfmt 17USE_TOOLS+= gmake bash pkg-config msgfmt
19 18
20CONFIG_SHELL= bash 19CONFIG_SHELL= bash
@@ -38,20 +37,19 @@ post-install: @@ -38,20 +37,19 @@ post-install:
38.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 37.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
39.include "../../graphics/libexif/buildlink3.mk" 38.include "../../graphics/libexif/buildlink3.mk"
40.include "../../graphics/libgexiv2/buildlink3.mk" 39.include "../../graphics/libgexiv2/buildlink3.mk"
41# 0.13.2 added shared libs 40# 0.13.2 added shared libs
42BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2 41BUILDLINK_ABI_DEPENDS.libraw+= libraw>=0.13.2
43.include "../../graphics/libraw/buildlink3.mk" 42.include "../../graphics/libraw/buildlink3.mk"
44# Required for dealing with .svg icons. Spotted on a clean box 43# Required for dealing with .svg icons. Spotted on a clean box
45.include "../../graphics/librsvg/buildlink3.mk" 44.include "../../graphics/librsvg/buildlink3.mk"
46BUILDLINK_API_DEPENDS.vala+= vala>=0.11.7 45BUILDLINK_API_DEPENDS.vala+= vala>=0.11.7
47.include "../../lang/vala/buildlink3.mk" 46.include "../../lang/vala/buildlink3.mk"
48.include "../../net/libsoup24/buildlink3.mk" 47.include "../../net/libsoup24/buildlink3.mk"
49.include "../../sysutils/desktop-file-utils/desktopdb.mk" 48.include "../../sysutils/desktop-file-utils/desktopdb.mk"
50.include "../../sysutils/dbus-glib/buildlink3.mk" 49.include "../../sysutils/dbus-glib/buildlink3.mk"
51.include "../../sysutils/gnome-vfs/buildlink3.mk" 
52.include "../../textproc/libxml2/buildlink3.mk" 50.include "../../textproc/libxml2/buildlink3.mk"
53.include "../../textproc/json-glib/buildlink3.mk" 51.include "../../textproc/json-glib/buildlink3.mk"
54.include "../../www/webkit-gtk/buildlink3.mk" 52.include "../../www/webkit-gtk/buildlink3.mk"
55.include "../../x11/gtk2/buildlink3.mk" 53.include "../../x11/gtk2/buildlink3.mk"
56.include "../../x11/libunique/buildlink3.mk" 54.include "../../x11/libunique/buildlink3.mk"
57.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/graphics/shotwell/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/PLIST 2011/04/05 18:34:20 1.3
+++ pkgsrc/graphics/shotwell/PLIST 2011/07/12 19:00:57 1.4
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1@comment $NetBSD: PLIST,v 1.3 2011/04/05 18:34:20 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.4 2011/07/12 19:00:57 drochner Exp $
2bin/shotwell 2bin/shotwell
 3bin/shotwell-video-thumbnailer
3lib/shotwell/plugins/builtin/facebook.png 4lib/shotwell/plugins/builtin/facebook.png
4lib/shotwell/plugins/builtin/flickr.png 5lib/shotwell/plugins/builtin/flickr.png
5lib/shotwell/plugins/builtin/picasa.png 6lib/shotwell/plugins/builtin/picasa.png
 7lib/shotwell/plugins/builtin/piwigo.png
 8lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
6lib/shotwell/plugins/builtin/shotwell-publishing-extras.so 9lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
7lib/shotwell/plugins/builtin/shotwell-publishing.so 10lib/shotwell/plugins/builtin/shotwell-publishing.so
8lib/shotwell/plugins/builtin/shotwell-transitions.so 11lib/shotwell/plugins/builtin/shotwell-transitions.so
9lib/shotwell/plugins/builtin/slideshow-plugin.png 12lib/shotwell/plugins/builtin/slideshow-plugin.png
10lib/shotwell/plugins/builtin/yandex_publish_model.glade 13lib/shotwell/plugins/builtin/yandex_publish_model.glade
11lib/shotwell/plugins/builtin/youtube.png 14lib/shotwell/plugins/builtin/youtube.png
12share/applications/shotwell-viewer.desktop 15share/applications/shotwell-viewer.desktop
13share/applications/shotwell.desktop 16share/applications/shotwell.desktop
14share/gconf/schemas/shotwell.schemas 17share/gconf/schemas/shotwell.schemas
15share/gnome/help/shotwell/C/edit-adjustments.page 18share/gnome/help/shotwell/C/edit-adjustments.page
16share/gnome/help/shotwell/C/edit-crop.page 19share/gnome/help/shotwell/C/edit-crop.page
17share/gnome/help/shotwell/C/edit-enhance.page 20share/gnome/help/shotwell/C/edit-enhance.page
18share/gnome/help/shotwell/C/edit-external.page 21share/gnome/help/shotwell/C/edit-external.page
@@ -45,71 +48,117 @@ share/gnome/help/shotwell/C/other-multip @@ -45,71 +48,117 @@ share/gnome/help/shotwell/C/other-multip
45share/gnome/help/shotwell/C/running.page 48share/gnome/help/shotwell/C/running.page
46share/gnome/help/shotwell/C/share-background.page 49share/gnome/help/shotwell/C/share-background.page
47share/gnome/help/shotwell/C/share-export.page 50share/gnome/help/shotwell/C/share-export.page
48share/gnome/help/shotwell/C/share-print.page 51share/gnome/help/shotwell/C/share-print.page
49share/gnome/help/shotwell/C/share-send.page 52share/gnome/help/shotwell/C/share-send.page
50share/gnome/help/shotwell/C/share-slideshow.page 53share/gnome/help/shotwell/C/share-slideshow.page
51share/gnome/help/shotwell/C/share-upload.page 54share/gnome/help/shotwell/C/share-upload.page
52share/gnome/help/shotwell/C/view-displaying.page 55share/gnome/help/shotwell/C/view-displaying.page
53share/gnome/help/shotwell/C/view-information.page 56share/gnome/help/shotwell/C/view-information.page
54share/gnome/help/shotwell/C/view-sidebar.page 57share/gnome/help/shotwell/C/view-sidebar.page
55share/icons/hicolor/16x16/apps/shotwell.svg 58share/icons/hicolor/16x16/apps/shotwell.svg
56share/icons/hicolor/24x24/apps/shotwell.svg 59share/icons/hicolor/24x24/apps/shotwell.svg
57share/icons/hicolor/scalable/apps/shotwell.svg 60share/icons/hicolor/scalable/apps/shotwell.svg
 61share/locale/ar/LC_MESSAGES/shotwell-extras.mo
58share/locale/ar/LC_MESSAGES/shotwell.mo 62share/locale/ar/LC_MESSAGES/shotwell.mo
 63share/locale/ast/LC_MESSAGES/shotwell-extras.mo
59share/locale/ast/LC_MESSAGES/shotwell.mo 64share/locale/ast/LC_MESSAGES/shotwell.mo
 65share/locale/bg/LC_MESSAGES/shotwell-extras.mo
60share/locale/bg/LC_MESSAGES/shotwell.mo 66share/locale/bg/LC_MESSAGES/shotwell.mo
 67share/locale/bn/LC_MESSAGES/shotwell-extras.mo
61share/locale/bn/LC_MESSAGES/shotwell.mo 68share/locale/bn/LC_MESSAGES/shotwell.mo
 69share/locale/ca/LC_MESSAGES/shotwell-extras.mo
62share/locale/ca/LC_MESSAGES/shotwell.mo 70share/locale/ca/LC_MESSAGES/shotwell.mo
 71share/locale/cs/LC_MESSAGES/shotwell-extras.mo
63share/locale/cs/LC_MESSAGES/shotwell.mo 72share/locale/cs/LC_MESSAGES/shotwell.mo
 73share/locale/da/LC_MESSAGES/shotwell-extras.mo
64share/locale/da/LC_MESSAGES/shotwell.mo 74share/locale/da/LC_MESSAGES/shotwell.mo
 75share/locale/de/LC_MESSAGES/shotwell-extras.mo
65share/locale/de/LC_MESSAGES/shotwell.mo 76share/locale/de/LC_MESSAGES/shotwell.mo
 77share/locale/el/LC_MESSAGES/shotwell-extras.mo
66share/locale/el/LC_MESSAGES/shotwell.mo 78share/locale/el/LC_MESSAGES/shotwell.mo
 79share/locale/en_GB/LC_MESSAGES/shotwell-extras.mo
67share/locale/en_GB/LC_MESSAGES/shotwell.mo 80share/locale/en_GB/LC_MESSAGES/shotwell.mo
 81share/locale/es/LC_MESSAGES/shotwell-extras.mo
68share/locale/es/LC_MESSAGES/shotwell.mo 82share/locale/es/LC_MESSAGES/shotwell.mo
 83share/locale/et/LC_MESSAGES/shotwell-extras.mo
69share/locale/et/LC_MESSAGES/shotwell.mo 84share/locale/et/LC_MESSAGES/shotwell.mo
 85share/locale/eu/LC_MESSAGES/shotwell-extras.mo
70share/locale/eu/LC_MESSAGES/shotwell.mo 86share/locale/eu/LC_MESSAGES/shotwell.mo
 87share/locale/fi/LC_MESSAGES/shotwell-extras.mo
71share/locale/fi/LC_MESSAGES/shotwell.mo 88share/locale/fi/LC_MESSAGES/shotwell.mo
 89share/locale/fr/LC_MESSAGES/shotwell-extras.mo
72share/locale/fr/LC_MESSAGES/shotwell.mo 90share/locale/fr/LC_MESSAGES/shotwell.mo
 91share/locale/gl/LC_MESSAGES/shotwell-extras.mo
73share/locale/gl/LC_MESSAGES/shotwell.mo 92share/locale/gl/LC_MESSAGES/shotwell.mo
 93share/locale/he/LC_MESSAGES/shotwell-extras.mo
74share/locale/he/LC_MESSAGES/shotwell.mo 94share/locale/he/LC_MESSAGES/shotwell.mo
 95share/locale/hr/LC_MESSAGES/shotwell-extras.mo
75share/locale/hr/LC_MESSAGES/shotwell.mo 96share/locale/hr/LC_MESSAGES/shotwell.mo
 97share/locale/hu/LC_MESSAGES/shotwell-extras.mo
76share/locale/hu/LC_MESSAGES/shotwell.mo 98share/locale/hu/LC_MESSAGES/shotwell.mo
 99share/locale/id/LC_MESSAGES/shotwell-extras.mo
77share/locale/id/LC_MESSAGES/shotwell.mo 100share/locale/id/LC_MESSAGES/shotwell.mo
 101share/locale/it/LC_MESSAGES/shotwell-extras.mo
78share/locale/it/LC_MESSAGES/shotwell.mo 102share/locale/it/LC_MESSAGES/shotwell.mo
 103share/locale/ja/LC_MESSAGES/shotwell-extras.mo
79share/locale/ja/LC_MESSAGES/shotwell.mo 104share/locale/ja/LC_MESSAGES/shotwell.mo
 105share/locale/kk/LC_MESSAGES/shotwell-extras.mo
80share/locale/kk/LC_MESSAGES/shotwell.mo 106share/locale/kk/LC_MESSAGES/shotwell.mo
 107share/locale/ko/LC_MESSAGES/shotwell-extras.mo
81share/locale/ko/LC_MESSAGES/shotwell.mo 108share/locale/ko/LC_MESSAGES/shotwell.mo
 109share/locale/lt/LC_MESSAGES/shotwell-extras.mo
82share/locale/lt/LC_MESSAGES/shotwell.mo 110share/locale/lt/LC_MESSAGES/shotwell.mo
 111share/locale/lv/LC_MESSAGES/shotwell-extras.mo
83share/locale/lv/LC_MESSAGES/shotwell.mo 112share/locale/lv/LC_MESSAGES/shotwell.mo
 113share/locale/mk/LC_MESSAGES/shotwell-extras.mo
84share/locale/mk/LC_MESSAGES/shotwell.mo 114share/locale/mk/LC_MESSAGES/shotwell.mo
 115share/locale/nb/LC_MESSAGES/shotwell-extras.mo
85share/locale/nb/LC_MESSAGES/shotwell.mo 116share/locale/nb/LC_MESSAGES/shotwell.mo
 117share/locale/nl/LC_MESSAGES/shotwell-extras.mo
86share/locale/nl/LC_MESSAGES/shotwell.mo 118share/locale/nl/LC_MESSAGES/shotwell.mo
 119share/locale/pa/LC_MESSAGES/shotwell-extras.mo
87share/locale/pa/LC_MESSAGES/shotwell.mo 120share/locale/pa/LC_MESSAGES/shotwell.mo
 121share/locale/pl/LC_MESSAGES/shotwell-extras.mo
88share/locale/pl/LC_MESSAGES/shotwell.mo 122share/locale/pl/LC_MESSAGES/shotwell.mo
 123share/locale/pt/LC_MESSAGES/shotwell-extras.mo
89share/locale/pt/LC_MESSAGES/shotwell.mo 124share/locale/pt/LC_MESSAGES/shotwell.mo
 125share/locale/pt_BR/LC_MESSAGES/shotwell-extras.mo
90share/locale/pt_BR/LC_MESSAGES/shotwell.mo 126share/locale/pt_BR/LC_MESSAGES/shotwell.mo
 127share/locale/ro/LC_MESSAGES/shotwell-extras.mo
91share/locale/ro/LC_MESSAGES/shotwell.mo 128share/locale/ro/LC_MESSAGES/shotwell.mo
 129share/locale/ru/LC_MESSAGES/shotwell-extras.mo
92share/locale/ru/LC_MESSAGES/shotwell.mo 130share/locale/ru/LC_MESSAGES/shotwell.mo
 131share/locale/sk/LC_MESSAGES/shotwell-extras.mo
93share/locale/sk/LC_MESSAGES/shotwell.mo 132share/locale/sk/LC_MESSAGES/shotwell.mo
 133share/locale/sl/LC_MESSAGES/shotwell-extras.mo
94share/locale/sl/LC_MESSAGES/shotwell.mo 134share/locale/sl/LC_MESSAGES/shotwell.mo
 135share/locale/sr/LC_MESSAGES/shotwell-extras.mo
95share/locale/sr/LC_MESSAGES/shotwell.mo 136share/locale/sr/LC_MESSAGES/shotwell.mo
 137share/locale/sv/LC_MESSAGES/shotwell-extras.mo
96share/locale/sv/LC_MESSAGES/shotwell.mo 138share/locale/sv/LC_MESSAGES/shotwell.mo
 139share/locale/ta/LC_MESSAGES/shotwell-extras.mo
97share/locale/ta/LC_MESSAGES/shotwell.mo 140share/locale/ta/LC_MESSAGES/shotwell.mo
 141share/locale/te/LC_MESSAGES/shotwell-extras.mo
98share/locale/te/LC_MESSAGES/shotwell.mo 142share/locale/te/LC_MESSAGES/shotwell.mo
 143share/locale/th/LC_MESSAGES/shotwell-extras.mo
99share/locale/th/LC_MESSAGES/shotwell.mo 144share/locale/th/LC_MESSAGES/shotwell.mo
 145share/locale/tr/LC_MESSAGES/shotwell-extras.mo
100share/locale/tr/LC_MESSAGES/shotwell.mo 146share/locale/tr/LC_MESSAGES/shotwell.mo
 147share/locale/uk/LC_MESSAGES/shotwell-extras.mo
101share/locale/uk/LC_MESSAGES/shotwell.mo 148share/locale/uk/LC_MESSAGES/shotwell.mo
 149share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo
102share/locale/zh_CN/LC_MESSAGES/shotwell.mo 150share/locale/zh_CN/LC_MESSAGES/shotwell.mo
 151share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo
103share/locale/zh_TW/LC_MESSAGES/shotwell.mo 152share/locale/zh_TW/LC_MESSAGES/shotwell.mo
104share/shotwell/icons/all-rejected.png 153share/shotwell/icons/all-rejected.png
105share/shotwell/icons/crop-pivot-reticle.png 154share/shotwell/icons/crop-pivot-reticle.png
106share/shotwell/icons/crop.svg 155share/shotwell/icons/crop.svg
107share/shotwell/icons/drag_nub.png 156share/shotwell/icons/drag_nub.png
108share/shotwell/icons/enhance.png 157share/shotwell/icons/enhance.png
109share/shotwell/icons/filter-flagged.png 158share/shotwell/icons/filter-flagged.png
110share/shotwell/icons/filter-photos.png 159share/shotwell/icons/filter-photos.png
111share/shotwell/icons/filter-raw.png 160share/shotwell/icons/filter-raw.png
112share/shotwell/icons/filter-videos.png 161share/shotwell/icons/filter-videos.png
113share/shotwell/icons/five-star-filter.svg 162share/shotwell/icons/five-star-filter.svg
114share/shotwell/icons/five-stars.svg 163share/shotwell/icons/five-stars.svg
115share/shotwell/icons/flag-page.png 164share/shotwell/icons/flag-page.png
@@ -149,18 +198,21 @@ share/shotwell/icons/two-stars.svg @@ -149,18 +198,21 @@ share/shotwell/icons/two-stars.svg
149share/shotwell/icons/videos-page.png 198share/shotwell/icons/videos-page.png
150share/shotwell/icons/zoom-in.png 199share/shotwell/icons/zoom-in.png
151share/shotwell/icons/zoom-out.png 200share/shotwell/icons/zoom-out.png
152share/shotwell/ui/collection.ui 201share/shotwell/ui/collection.ui
153share/shotwell/ui/direct.ui 202share/shotwell/ui/direct.ui
154share/shotwell/ui/event.ui 203share/shotwell/ui/event.ui
155share/shotwell/ui/events_directory.ui 204share/shotwell/ui/events_directory.ui
156share/shotwell/ui/fullscreen.ui 205share/shotwell/ui/fullscreen.ui
157share/shotwell/ui/import.ui 206share/shotwell/ui/import.ui
158share/shotwell/ui/import_queue.ui 207share/shotwell/ui/import_queue.ui
159share/shotwell/ui/media.ui 208share/shotwell/ui/media.ui
160share/shotwell/ui/offline.ui 209share/shotwell/ui/offline.ui
161share/shotwell/ui/photo.ui 210share/shotwell/ui/photo.ui
 211share/shotwell/ui/savedsearch.ui
162share/shotwell/ui/search_bar.ui 212share/shotwell/ui/search_bar.ui
163share/shotwell/ui/set_background_dialog.glade 213share/shotwell/ui/set_background_dialog.glade
164share/shotwell/ui/shotwell.glade 214share/shotwell/ui/shotwell.glade
 215share/shotwell/ui/shotwell.xml
 216share/shotwell/ui/sidebar_default.ui
165share/shotwell/ui/tags.ui 217share/shotwell/ui/tags.ui
166share/shotwell/ui/trash.ui 218share/shotwell/ui/trash.ui
cvs diff -r1.8 -r1.9 pkgsrc/graphics/shotwell/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/distinfo 2011/05/14 18:55:59 1.8
+++ pkgsrc/graphics/shotwell/distinfo 2011/07/12 19:00:57 1.9
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.8 2011/05/14 18:55:59 gls Exp $ 1$NetBSD: distinfo,v 1.9 2011/07/12 19:00:57 drochner Exp $
2 2
3SHA1 (shotwell-0.9.3.tar.bz2) = e0bfba6eb408cfb6fa133e1cc929b2f03c710250 3SHA1 (shotwell-0.10.1.tar.bz2) = abd6e771168910943101b62d76f7768a49e69be9
4RMD160 (shotwell-0.9.3.tar.bz2) = ec4317999922f2e709e2060c555694255f924cad 4RMD160 (shotwell-0.10.1.tar.bz2) = 44cccbebf4f1bf024229da9afbcc6d4db510be96
5Size (shotwell-0.9.3.tar.bz2) = 1462225 bytes 5Size (shotwell-0.10.1.tar.bz2) = 1483679 bytes
6SHA1 (patch-aa) = 91a17a63a2ef1000cc02fbacaee77f5d489c5828 6SHA1 (patch-aa) = 8eed6766df5ef9084a47c92fdbd85d3fc0f60827
7SHA1 (patch-ab) = 5f9699feb50926e449b7c5a51152f7ea58da79e6 7SHA1 (patch-ab) = 07503807a44fe20ba33481eb3d8fde9e34c460c0
cvs diff -r1.6 -r1.7 pkgsrc/graphics/shotwell/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/patches/Attic/patch-aa 2011/05/14 18:56:00 1.6
+++ pkgsrc/graphics/shotwell/patches/Attic/patch-aa 2011/07/12 19:00:57 1.7
@@ -1,73 +1,78 @@ @@ -1,73 +1,78 @@
1$NetBSD: patch-aa,v 1.6 2011/05/14 18:56:00 gls Exp $ 1$NetBSD: patch-aa,v 1.7 2011/07/12 19:00:57 drochner Exp $
2 2
3Remove gudev requirements. Fix m4 params and libraw configuration. 3Remove gudev requirements. Fix m4 params and libraw configuration.
4--- Makefile.orig 2011-04-12 22:04:01.000000000 +0000 4
 5--- Makefile.orig 2011-06-02 19:11:21.000000000 +0000
5+++ Makefile 6+++ Makefile
6@@ -261,7 +261,6 @@ EXT_PKGS = \ 7@@ -264,7 +264,6 @@ EXT_PKGS = \
7 gstreamer-0.10 \ 8 gstreamer-0.10 \
8 gstreamer-base-0.10 \ 9 gstreamer-base-0.10 \
9 gtk+-2.0 \ 10 gtk+-2.0 \
10- gudev-1.0 \ 11- gudev-1.0 \
11 libexif \ 12 libexif \
12 libgphoto2 \ 13 libgphoto2 \
13 libsoup-2.4 \ 14 libsoup-2.4 \
14@@ -288,7 +287,6 @@ EXT_PKG_VERSIONS = \ 15@@ -296,7 +295,6 @@ EXT_PKG_VERSIONS = \
15 gstreamer-0.10 >= 0.10.28 \ 16 gstreamer-0.10 >= 0.10.28 \
16 gstreamer-base-0.10 >= 0.10.28 \ 17 gstreamer-base-0.10 >= 0.10.28 \
17 gtk+-2.0 >= 2.18.0 \ 18 gtk+-2.0 >= 2.18.0 \
18- gudev-1.0 >= 145 \ 19- gudev-1.0 >= 145 \
19 libexif >= 0.6.16 \ 20 libexif >= 0.6.16 \
20 libgphoto2 >= 2.4.2 \ 21 libgphoto2 >= 2.4.2 \
21 libsoup-2.4 >= 2.26.0 \ 22 libsoup-2.4 >= 2.26.0 \
22@@ -394,7 +392,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA 23@@ -375,7 +373,7 @@ DIST_FILES = Makefile configure chkver $
 24 $(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
 25 unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
 26 $(EXPANDED_THUMBNAILER_SRC_FILES)
 27-
 28+
 29
 30 DIST_TAR = $(PROGRAM)-$(VERSION).tar
 31 DIST_TAR_BZ2 = $(DIST_TAR).bz2
 32@@ -420,7 +418,7 @@ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHA
23 # if not available. 33 # if not available.
24 LIBRAW_CONFIG=./libraw-config 34 LIBRAW_CONFIG=./libraw-config
25 35
26-define check_valac_version 36-define check_valac_version
27+define xcheck_valac_version 37+define xcheck_valac_version
28 @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ) 38 @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 )
29 $(if $(MAX_VALAC_VERSION),\ 39 $(if $(MAX_VALAC_VERSION),\
30 @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),) 40 @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
31@@ -574,7 +572,7 @@ $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) 41@@ -638,7 +636,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U
32 $(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4 42
33 @mkdir -p $(UNITIZE_DIR) 
34 @$(foreach group,$(APP_GROUPS),\ 
35- `m4 '--define=_APP_GROUP_=$(group)' '--define=_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '--define=_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`) 
36+ `m4 '-D_APP_GROUP_=$(group)' '-D_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '-D_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`) 
37 @$(foreach nm,$(UNIT_NAMESPACES),\ 
38 `m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`) 
39 @touch $@ 
40@@ -584,7 +582,6 @@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(U 
41 
42 # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY 43 # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY
43 $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) 44 $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES)
44- $(call check_valac_version) 45- $(call check_valac_version)
45 ifndef ASSUME_PKGS 46 @echo Compiling Vala code...
46 ifdef EXT_PKG_VERSIONS 47 @mkdir -p $(BUILD_DIR)
47 @pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS) $(DIRECT_LIBS_VERSIONS)' 48 @$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \
48@@ -611,17 +608,16 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) 49@@ -655,10 +652,10 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
49 @ 50 @
50 51
51 $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile 52 $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
52- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< 53- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
53+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $< 54+ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags libraw` -o $@ $<
54 55
55 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) 56 $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
56- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ 57- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
57+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@ 58+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@
58 59
59 $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR) 60 $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES)
60 @ 61 $(VALAC) $(EXPANDED_THUMBNAILER_SRC_FILES) $(VALAFLAGS) -o $@ $(foreach pkg,$(THUMBNAILER_PKGS),--pkg=$(pkg))
61 62@@ -668,7 +665,6 @@ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLU
 63
62 .PHONY: $(PLUGINS_DIR) 64 .PHONY: $(PLUGINS_DIR)
63 $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS) 65 $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS)
64- $(call check_valac_version) 66- $(call check_valac_version)
65 @$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \ 67 @$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \
66 PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)" 68 PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)"
67 69
68@@ -639,5 +635,5 @@ docs: 70@@ -686,7 +682,7 @@ docs:
69 glade: lib$(PROGRAM).so 71 glade: lib$(PROGRAM).so
70 72
71 lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) 73 lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
72- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ 74- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
73+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@ 75+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@
 76
 77 .PHONY: pkgcheck
 78 pkgcheck:
cvs diff -r1.3 -r1.4 pkgsrc/graphics/shotwell/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/shotwell/patches/Attic/patch-ab 2011/04/05 18:34:20 1.3
+++ pkgsrc/graphics/shotwell/patches/Attic/patch-ab 2011/07/12 19:00:57 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ab,v 1.3 2011/04/05 18:34:20 drochner Exp $ 1$NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $
2 2
3--- src/CameraTable.vala.orig 2011-03-22 20:46:15.000000000 +0000 3--- src/camera/CameraTable.vala.orig 2011-03-22 20:46:15.000000000 +0000
4+++ src/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@@ -44,7 +43,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);