add missing patch file

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 126 insertions, 2 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 649d89c35ce3..2803ce58fd0d 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.4 2010/08/22 07:30:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.5 2010/08/22 14:06:51 hollow Exp $
+
+  22 Aug 2010; Benedikt Böhm <hollow@gentoo.org>
+  +files/shotwell-0.6.1-libraw.patch:
+  add missing patch file
 
 *shotwell-0.6.1 (22 Aug 2010)
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 004f7b46e889..30e0e86a8a11 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,6 +1,7 @@
+AUX shotwell-0.6.1-libraw.patch 3507 RMD160 36fcb280670849214e01097976d94a4c772061a6 SHA1 3f488b68ed0ea2db9341b280e5590e4cd443aa73 SHA256 e136026f79b9d0089bd95436562d44bbf5f1b2208ec34f3f5179633ab68b3e9b
 DIST shotwell-0.5.2.tar.bz2 573748 RMD160 29d58298349b09d940b96d112161a7c250577152 SHA1 878342f987bd44e5833cb7a43f3a943a61f0af38 SHA256 c3ce5bfab332eceb192c7272e33b05b1db226b04211d306031f93efa1ad36c8b
 DIST shotwell-0.6.1.tar.bz2 681013 RMD160 45ef932fcc46b12713cf334c31a57cd18fdc2915 SHA1 824c119ddbc853b07fcce373f92a16ff384f64b1 SHA256 01314373d35f05bcdc223eb06a0f21e76ae3e3e1d6628822816a147db1d534dc
 EBUILD shotwell-0.5.2.ebuild 1281 RMD160 81b4d5373b3e5721401386003ead36f0a94afce3 SHA1 e2b40a4ac1ec0059f9d74e35d628da131a331be9 SHA256 49eed46182598a1db17488d38c61cba1339fea0a13253185fb336f14151c1e22
 EBUILD shotwell-0.6.1.ebuild 1494 RMD160 ffd94c8cb2b080894401e9835a602c818027708b SHA1 01432200681d779db16e7558b71c57fbfc1bbcd4 SHA256 87b10e7c298536c8ba918a97c521fafc37890b04e4ab7b93202ac32780d25062
-MISC ChangeLog 777 RMD160 93650cc42807d6292ac6f57fee84983aef9fe790 SHA1 3aab56857ba4903484e82baac1bf2b6b0eb88c46 SHA256 b38dbd400ccecd55213f430f21f1684813c0932b3f85b5762dc55d3d1dd9eb6e
+MISC ChangeLog 891 RMD160 29dfbc4faf63e3636fe4501aa39d1bdbe88c15e6 SHA1 f6a4122560ee872344e7b765e20335d26709f811 SHA256 ddd06da527636d85497abda158418e4e9e523c5e831ac33a87afa87003a85eb3
 MISC metadata.xml 716 RMD160 88c07e7d694d01c8e383721008c46d5e4c64e0b1 SHA1 bccc91bf5588465da9f5065b899edd4c36dbc769 SHA256 82568b3ae3779e3935f77da29b67b08af480dcac4417f2f6eec9785abd99a2a9
diff --git a/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch b/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch
new file mode 100644
index 000000000000..0b48e6e986f9
--- /dev/null
+++ b/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch
@@ -0,0 +1,119 @@
+--- Makefile.orig	2010-07-04 15:54:45.974241667 +0300
++++ Makefile	2010-07-04 16:00:10.277241950 +0300
+@@ -126,7 +126,7 @@
+ 	FixedKeyFile.vapi \
+ 	ExtendedPosix.vapi \
+ 	LConv.vapi \
+-	libraw.vapi \
++	libraw_r.vapi \
+ 	gdk-none.vapi
+ 
+ RESOURCE_FILES = \
+@@ -196,8 +196,6 @@
+ 	LConv \
+ 	gdk-none
+ 
+-# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
+-# added to this list
+ EXT_PKGS = \
+ 	atk \
+ 	gdk-2.0 \
+@@ -205,10 +203,8 @@
+ 	gtk+-2.0 \
+ 	libexif \
+ 	sqlite3 \
+-	gexiv2
+-
+-LIBRAW_PKG = \
+-	libraw
++	gexiv2 \
++	libraw_r
+ 
+ ifdef LINUX
+ EXT_PKGS += \
+@@ -223,17 +219,13 @@
+ 	gdk-x11-2.0
+ endif
+ 
+-# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
+-# should be added to this list
+ EXT_PKG_VERSIONS = \
+ 	gee-1.0 >= 0.5.0 \
+ 	gtk+-2.0 >= 2.18.0 \
+ 	libexif >= 0.6.16 \
+ 	sqlite3 >= 3.5.9 \
+-	gexiv2 >= 0.1.0
+-
+-LIBRAW_VERSION = \
+-	0.9.0
++	gexiv2 >= 0.1.0 \
++	libraw_r >= 0.9.0
+ 
+ ifdef LINUX
+ EXT_PKG_VERSIONS += \
+@@ -247,7 +239,7 @@
+ 	dbus-glib-1 >= 0.80
+ endif
+ 
+-PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)
++PKGS = $(EXT_PKGS) $(LOCAL_PKGS)
+ 
+ ifndef BUILD_DIR
+ BUILD_DIR=src
+@@ -276,7 +268,7 @@
+ DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
+ 	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
+ 	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
+-	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config
++	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala
+ 
+ DIST_TAR = $(PROGRAM)-$(VERSION).tar
+ DIST_TAR_BZ2 = $(DIST_TAR).bz2
+@@ -318,14 +310,9 @@
+ CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
+ endif
+ 
+-# Packaged libraw is not widely available, so we must fake what would be in its .pc file
+-# if not available.
+-ifdef LINUX
+-LIBRAW_CONFIG=./libraw-config
+-endif
+-
+-ifdef WINDOWS
+-LIBRAW_CONFIG=./libraw-config --windows
++ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
++# If libraw is built with OpenMP support, we'll need this.
++CFLAGS += -fopenmp
+ endif
+ 
+ $(LANG_STAMP): $(EXPANDED_PO_FILES)
+@@ -447,10 +434,6 @@
+ else ifdef EXT_PKGS
+ 	@pkg-config --print-errors --exists $(EXT_PKGS)
+ endif
+-# Check for libraw manually, but not on Windows, where install-deps is used
+-ifndef WINDOWS
+-	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
+-endif
+ endif
+ 	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
+ 	mkdir -p $(BUILD_DIR)
+@@ -468,15 +451,15 @@
+ 	@
+ 
+ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
+-	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
++	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
+ 
+ $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
+ 
+ glade: lib$(PROGRAM).so
+ 
+ lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
+-	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
++	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@
+ 
+ shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
+ 	iscc windows\winstall.iss