aboutsummaryrefslogtreecommitdiff
path: root/graphics/shotwell/files
diff options
context:
space:
mode:
authorDavid Thiel <lx@FreeBSD.org>2012-03-07 20:41:35 +0000
committerDavid Thiel <lx@FreeBSD.org>2012-03-07 20:41:35 +0000
commitaa48b30d9978edfef9a38e936e1c527f85ca271f (patch)
tree9f82de04125c8470bd4aeed9b670760764e59dbd /graphics/shotwell/files
parent7d79668b57b65853bc36f2af48dacb53b4a238c8 (diff)
Notes
Diffstat (limited to 'graphics/shotwell/files')
-rw-r--r--graphics/shotwell/files/patch-Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile
index 234d5784ecc3..c11cbfa70b0c 100644
--- a/graphics/shotwell/files/patch-Makefile
+++ b/graphics/shotwell/files/patch-Makefile
@@ -1,5 +1,5 @@
--- Makefile.orig 2011-11-03 14:39:05.000000000 -0700
-+++ Makefile 2012-02-02 16:27:40.000000000 -0800
++++ Makefile 2012-03-07 11:47:18.000000000 -0800
@@ -273,7 +273,6 @@
gstreamer-base-0.10 \
gstreamer-pbutils-0.10 \
@@ -25,6 +25,17 @@
@ ./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 )
$(if $(MAX_VALAC_VERSION),\
@ ./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 ),)
+@@ -556,8 +554,8 @@
+ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+ endif
+ ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
+- mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
+- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
++ mkdir -p $(DESTDIR)$(PREFIX)/share/GConf/gsettings
++ $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)$(PREFIX)/share/GConf/gsettings
+ endif
+ ifndef DISABLE_ICON_UPDATE
+ -gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
@@ -660,7 +658,6 @@
# EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY