1 files changed, 0 insertions, 119 deletions
diff --git a/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch b/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch
deleted file mode 100644
index 0b48e6e986f9..000000000000
--- a/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- 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