Attachment #147764 for bug #194001

View | Details | Raw Unified | Return to bug 194001
Collapse All | Expand All

Lines 2-9 Link Here

(-)Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= shotwell	4	PORTNAME= shotwell
5	PORTVERSION= 0.18.1	5	PORTVERSION= 0.20.0
6	PORTREVISION= 1
7	CATEGORIES= graphics gnome	6	CATEGORIES= graphics gnome
8	MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}	7	MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}
9		8

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (shotwell-0.18.1.tar.xz) = af1e1a682a7d293b04970b81f2c25c267f5dd9b2cd7b1ebc84eb0bb45c123317	1	SHA256 (shotwell-0.20.0.tar.xz) = d698ee59e2b582b4553ff343aa92a5bbc3e56146e5cbd3f2af321be4bca56f70
2	SIZE (shotwell-0.18.1.tar.xz) = 1727276	2	SIZE (shotwell-0.20.0.tar.xz) = 1809492




--- Makefile.orig	2014-09-28 18:41:10.000000000 +0200
+++ Makefile	2014-09-28 18:43:30.000000000 +0200
@@ -261,7 +261,6 @@
 	gstreamer-base-1.0 \
 	gstreamer-pbutils-1.0 \
 	gtk+-3.0 \

 	libexif \
 	libgphoto2 \
 	json-glib-1.0 \
@@ -293,7 +292,6 @@
 	gstreamer-plugins-base-1.0 >= 1.0.0 \
 	gstreamer-pbutils-1.0 >= 1.0.0 \
 	gtk+-3.0 >= 3.6.0 \

 	libexif >= 0.6.16 \
 	libgphoto2 >= 2.4.2 \
 	libraw >= 0.13.2 \
@@ -543,8 +541,8 @@
 # Required for gudev-1.0
 CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
 
+# do not forget about libintl
+LDFLAGS += -lintl
+
 all: pkgcheck valacheck desktop
 
 ifdef ENABLE_BUILD_FOR_GLADE
@@ -591,8 +592,8 @@
 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 endif
 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL

Lines 1-5 Link Here

(-)files/patch-src-camera-CameraTable.vala (-2 / +2 lines)
1	--- src/camera/CameraTable.vala.orig 2013-11-09 18:20:35.000000000 +0100	1	--- src/camera/CameraTable.vala.orig 2014-09-28 18:49:39.000000000 +0200
2	+++ src/camera/CameraTable.vala 2013-11-09 18:24:57.000000000 +0100	2	+++ src/camera/CameraTable.vala 2014-09-28 19:10:01.000000000 +0200
3	@@ -26,7 +26,6 @@	3	@@ -26,7 +26,6 @@
4		4
5	private static CameraTable instance = null;	5	private static CameraTable instance = null;

Lines 5-15 Link Here

(-)pkg-plist (+46 lines)
5	lib/shotwell/plugins/builtin/flickr.png	5	lib/shotwell/plugins/builtin/flickr.png
6	lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade	6	lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade
7	lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade	7	lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade
		8	lib/shotwell/plugins/builtin/gallery3.png
		9	lib/shotwell/plugins/builtin/gallery3_authentication_pane.glade
		10	lib/shotwell/plugins/builtin/gallery3_publishing_options_pane.glade
8	lib/shotwell/plugins/builtin/picasa.png	11	lib/shotwell/plugins/builtin/picasa.png
9	lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade	12	lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade
10	lib/shotwell/plugins/builtin/piwigo.png	13	lib/shotwell/plugins/builtin/piwigo.png
11	lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade	14	lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade
12	lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade	15	lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade
		16	lib/shotwell/plugins/builtin/rajce.png
		17	lib/shotwell/plugins/builtin/rajce_authentication_pane.glade
		18	lib/shotwell/plugins/builtin/rajce_publishing_options_pane.glade
13	lib/shotwell/plugins/builtin/shotwell-data-imports.so	19	lib/shotwell/plugins/builtin/shotwell-data-imports.so
14	lib/shotwell/plugins/builtin/shotwell-publishing-extras.so	20	lib/shotwell/plugins/builtin/shotwell-publishing-extras.so
15	lib/shotwell/plugins/builtin/shotwell-publishing.so	21	lib/shotwell/plugins/builtin/shotwell-publishing.so
Lines 147-152 Link Here
147	share/gnome/help/shotwell/es/view-displaying.page	153	share/gnome/help/shotwell/es/view-displaying.page
148	share/gnome/help/shotwell/es/view-information.page	154	share/gnome/help/shotwell/es/view-information.page
149	share/gnome/help/shotwell/es/view-sidebar.page	155	share/gnome/help/shotwell/es/view-sidebar.page
		156	share/gnome/help/shotwell/hu/edit-adjustments.page
		157	share/gnome/help/shotwell/hu/edit-crop.page
		158	share/gnome/help/shotwell/hu/edit-enhance.page
		159	share/gnome/help/shotwell/hu/edit-external.page
		160	share/gnome/help/shotwell/hu/edit-nondestructive.page
		161	share/gnome/help/shotwell/hu/edit-redeye.page
		162	share/gnome/help/shotwell/hu/edit-rotate.page
		163	share/gnome/help/shotwell/hu/edit-straighten.page
		164	share/gnome/help/shotwell/hu/edit-time-date.page
		165	share/gnome/help/shotwell/hu/edit-undo.page
		166	share/gnome/help/shotwell/hu/formats.page
		167	share/gnome/help/shotwell/hu/import-camera.page
		168	share/gnome/help/shotwell/hu/import-f-spot.page
		169	share/gnome/help/shotwell/hu/import-file.page
		170	share/gnome/help/shotwell/hu/import-memorycard.page
		171	share/gnome/help/shotwell/hu/index.page
		172	share/gnome/help/shotwell/hu/organize-event.page
		173	share/gnome/help/shotwell/hu/organize-flag.page
		174	share/gnome/help/shotwell/hu/organize-rating.page
		175	share/gnome/help/shotwell/hu/organize-remove.page
		176	share/gnome/help/shotwell/hu/organize-search.page
		177	share/gnome/help/shotwell/hu/organize-tag.page
		178	share/gnome/help/shotwell/hu/organize-title.page
		179	share/gnome/help/shotwell/hu/other-files.page
		180	share/gnome/help/shotwell/hu/other-missing.page
		181	share/gnome/help/shotwell/hu/other-multiple.page
		182	share/gnome/help/shotwell/hu/other-plugins.page
		183	share/gnome/help/shotwell/hu/raw.page
		184	share/gnome/help/shotwell/hu/running.page
		185	share/gnome/help/shotwell/hu/share-background.page
		186	share/gnome/help/shotwell/hu/share-export.page
		187	share/gnome/help/shotwell/hu/share-print.page
		188	share/gnome/help/shotwell/hu/share-send.page
		189	share/gnome/help/shotwell/hu/share-slideshow.page
		190	share/gnome/help/shotwell/hu/share-upload.page
		191	share/gnome/help/shotwell/hu/view-displaying.page
		192	share/gnome/help/shotwell/hu/view-information.page
		193	share/gnome/help/shotwell/hu/view-sidebar.page
150	share/icons/hicolor/16x16/apps/shotwell.svg	194	share/icons/hicolor/16x16/apps/shotwell.svg
151	share/icons/hicolor/24x24/apps/shotwell.svg	195	share/icons/hicolor/24x24/apps/shotwell.svg
152	share/icons/hicolor/scalable/apps/shotwell.svg	196	share/icons/hicolor/scalable/apps/shotwell.svg
Lines 169-174 Link Here
169	share/locale/eu/LC_MESSAGES/shotwell.mo	213	share/locale/eu/LC_MESSAGES/shotwell.mo
170	share/locale/fi/LC_MESSAGES/shotwell.mo	214	share/locale/fi/LC_MESSAGES/shotwell.mo
171	share/locale/fr/LC_MESSAGES/shotwell.mo	215	share/locale/fr/LC_MESSAGES/shotwell.mo
		216	share/locale/gd/LC_MESSAGES/shotwell.mo
172	share/locale/gl/LC_MESSAGES/shotwell.mo	217	share/locale/gl/LC_MESSAGES/shotwell.mo
173	share/locale/gu/LC_MESSAGES/shotwell.mo	218	share/locale/gu/LC_MESSAGES/shotwell.mo
174	share/locale/he/LC_MESSAGES/shotwell.mo	219	share/locale/he/LC_MESSAGES/shotwell.mo
Lines 202-207 Link Here
202	share/locale/sk/LC_MESSAGES/shotwell.mo	247	share/locale/sk/LC_MESSAGES/shotwell.mo
203	share/locale/sl/LC_MESSAGES/shotwell.mo	248	share/locale/sl/LC_MESSAGES/shotwell.mo
204	share/locale/sr/LC_MESSAGES/shotwell.mo	249	share/locale/sr/LC_MESSAGES/shotwell.mo
		250	share/locale/sr@latin/LC_MESSAGES/shotwell.mo
205	share/locale/sv/LC_MESSAGES/shotwell.mo	251	share/locale/sv/LC_MESSAGES/shotwell.mo
206	share/locale/ta/LC_MESSAGES/shotwell.mo	252	share/locale/ta/LC_MESSAGES/shotwell.mo
207	share/locale/te/LC_MESSAGES/shotwell.mo	253	share/locale/te/LC_MESSAGES/shotwell.mo

Return to bug 194001

Lines 1-6 Link Here

(-)files/patch-Makefile (-15 / +5 lines)
1	--- Makefile.orig 2013-11-09 18:33:15.000000000 +0100	1	--- Makefile.orig 2014-09-28 18:41:10.000000000 +0200
2	+++ Makefile 2013-11-09 18:46:05.000000000 +0100	2	+++ Makefile 2014-09-28 18:43:30.000000000 +0200
3	@@ -315,7 +315,6 @@	3	@@ -261,7 +261,6 @@
4	gstreamer-base-1.0 \	4	gstreamer-base-1.0 \
5	gstreamer-pbutils-1.0 \	5	gstreamer-pbutils-1.0 \
6	gtk+-3.0 \	6	gtk+-3.0 \
Lines 8-14 Link Here
8	libexif \	8	libexif \
9	libgphoto2 \	9	libgphoto2 \
10	json-glib-1.0 \	10	json-glib-1.0 \
11	@@ -347,7 +346,6 @@	11	@@ -293,7 +292,6 @@
12	gstreamer-plugins-base-1.0 >= 1.0.0 \	12	gstreamer-plugins-base-1.0 >= 1.0.0 \
13	gstreamer-pbutils-1.0 >= 1.0.0 \	13	gstreamer-pbutils-1.0 >= 1.0.0 \
14	gtk+-3.0 >= 3.6.0 \	14	gtk+-3.0 >= 3.6.0 \
Lines 16-32 Link Here
16	libexif >= 0.6.16 \	16	libexif >= 0.6.16 \
17	libgphoto2 >= 2.4.2 \	17	libgphoto2 >= 2.4.2 \
18	libraw >= 0.13.2 \	18	libraw >= 0.13.2 \
19	@@ -461,6 +459,9 @@	19	@@ -543,8 +541,8 @@
20	# Required for gudev-1.0
21	CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
22
23	+# do not forget about libintl
24	+LDFLAGS += -lintl
25	+
26	all: pkgcheck valacheck desktop
27
28	ifdef ENABLE_BUILD_FOR_GLADE
29	@@ -591,8 +592,8 @@
30	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas	20	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
31	endif	21	endif
32	ifndef DISABLE_GSETTINGS_CONVERT_INSTALL	22	ifndef DISABLE_GSETTINGS_CONVERT_INSTALL