diff options
| author | David Thiel <lx@FreeBSD.org> | 2012-03-14 21:36:35 +0000 |
|---|---|---|
| committer | David Thiel <lx@FreeBSD.org> | 2012-03-14 21:36:35 +0000 |
| commit | dd82b2083c6d01b577084a4b0e16a2bc78e28b66 (patch) | |
| tree | d811c1bc213a0c86d62bb25948bcea91a0d56518 /graphics/shotwell | |
| parent | - Update to 3.0.2 (diff) | |
Fix handling of gsettings conversion file.
Submitted by: pointy
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=293324
Diffstat (limited to 'graphics/shotwell')
| -rw-r--r-- | graphics/shotwell/files/patch-Makefile | 11 | ||||
| -rw-r--r-- | graphics/shotwell/pkg-plist | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile index c11cbfa70b0c..5fe47683c05f 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-03-07 11:47:18.000000000 -0800 ++++ Makefile 2012-03-14 14:07:24.000000000 -0700 @@ -273,7 +273,6 @@ gstreamer-base-0.10 \ gstreamer-pbutils-0.10 \ @@ -36,6 +36,15 @@ endif ifndef DISABLE_ICON_UPDATE -gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || : +@@ -640,7 +638,7 @@ + glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + endif + ifndef DISABLE_GSETTINGS_CONVERT_INSTALL +- rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert ++ rm -f $(DESTDIR)$(PREFIX)/share/GConf/gsettings/shotwell.convert + endif + + $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) @@ -660,7 +658,6 @@ # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist index 2d06ce94430a..5e735a9d8296 100644 --- a/graphics/shotwell/pkg-plist +++ b/graphics/shotwell/pkg-plist @@ -54,6 +54,7 @@ share/gnome/help/shotwell/C/share-upload.page share/gnome/help/shotwell/C/view-displaying.page share/gnome/help/shotwell/C/view-information.page share/gnome/help/shotwell/C/view-sidebar.page +share/GConf/gsettings/shotwell.convert share/icons/hicolor/16x16/apps/shotwell.svg share/icons/hicolor/24x24/apps/shotwell.svg share/icons/hicolor/scalable/apps/shotwell.svg |