diff options
Diffstat (limited to 'graphics/shotwell/patches/patch-aa')
| -rw-r--r-- | graphics/shotwell/patches/patch-aa | 113 |
1 files changed, 113 insertions, 0 deletions
diff --git a/graphics/shotwell/patches/patch-aa b/graphics/shotwell/patches/patch-aa new file mode 100644 index 00000000000..7661276ff46 --- /dev/null +++ b/graphics/shotwell/patches/patch-aa @@ -0,0 +1,113 @@ +$NetBSD: patch-aa,v 1.1.1.1 2010/11/15 19:04:53 gls Exp $ + +--- Makefile.orig 2010-09-10 22:55:54.000000000 +0000 ++++ Makefile +@@ -124,11 +124,6 @@ SRC_FILES = \ + FSpotDatabaseDriver.vala \ + FSpotDatabaseTables.vala + +-ifndef LINUX +-SRC_FILES += \ +- GConf.vala +-endif +- + VAPI_FILES = \ + libexif.vapi \ + libgphoto2.vapi \ +@@ -268,6 +263,7 @@ EXT_PKGS = \ + gee-1.0 \ + gtk+-2.0 \ + glib-2.0 \ ++ gmodule-2.0 \ + libexif \ + sqlite3 \ + gexiv2 +@@ -275,7 +271,6 @@ EXT_PKGS = \ + LIBRAW_PKG = \ + libraw + +-ifdef LINUX + EXT_PKGS += \ + gconf-2.0 \ + libgphoto2 \ +@@ -283,10 +278,8 @@ EXT_PKGS += \ + libxml-2.0 \ + unique-1.0 \ + webkit-1.0 \ +- gudev-1.0 \ + dbus-glib-1 \ + 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 +@@ -301,7 +294,6 @@ EXT_PKG_VERSIONS = \ + LIBRAW_VERSION = \ + 0.9.0 + +-ifdef LINUX + EXT_PKG_VERSIONS += \ + gconf-2.0 >= 2.22.0 \ + libgphoto2 >= 2.4.2 \ +@@ -309,9 +301,7 @@ EXT_PKG_VERSIONS += \ + libxml-2.0 >= 2.6.32 \ + unique-1.0 >= 1.0.0 \ + webkit-1.0 >= 1.1.5 \ +- gudev-1.0 >= 145 \ + dbus-glib-1 >= 0.80 +-endif + + PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG) + +@@ -366,7 +356,7 @@ ifndef BUILD_DEBUG + # -mwindows prevents a console window from appearing when we run Shotwell, but also hides + # all logging/debugging output, so we specify it only in a release build. + VALA_LDFLAGS += -mwindows +-endif ++endif + + shotwell.res: windows/shotwell.rc + windres windows/shotwell.rc -O coff -o shotwell.res +@@ -470,7 +460,6 @@ endif + ifndef DISABLE_DESKTOP_UPDATE + -update-desktop-database || : + endif +-ifdef LINUX + ifndef DISABLE_SCHEMAS_INSTALL + GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule misc/shotwell.schemas + else +@@ -487,7 +476,6 @@ ifndef DISABLE_HELP_INSTALL + mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures + $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures + endif +-endif + -$(foreach lang,$(SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \ + $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \ + $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`) +@@ -518,7 +506,6 @@ endif + + $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \ + $(CONFIG_IN) +- @ ./minver `valac --version | awk '{print $$2}'` $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' `valac --version` '\b.'; exit 1 ) + ifndef ASSUME_PKGS + ifdef EXT_PKG_VERSIONS + @pkg-config --print-errors --exists '$(EXT_PKG_VERSIONS)' +@@ -546,15 +533,15 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) + @ + + $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile +- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< ++ $(CC) -c $(VALA_CFLAGS) $(CFLAGS) `pkg-config --cflags raw` -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) $(LDFLAGS) `pkg-config --libs raw` $(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) $(LDFLAGS) `pkg-config --libs raw` $(EXPORT_FLAGS) -shared -o $@ + + shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss + iscc windows\winstall.iss |