diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-04-14 11:58:42 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-04-14 11:58:42 +0000 |
| commit | b65cda7726a4a2943f95a9d4db4a258ad16d589e (patch) | |
| tree | 6d15d8e5673f01c92b62897517646373426ad7b4 /graphics/shotwell | |
| parent | Move pre-configure target inside the jdbc block. So there is no empty target (diff) | |
Fix some glib schema issues.
The schemas should be listed in GLIB_SCHEMAS instead of in the plist so the
glib schema database can be updated on installed/removal of the package.
This updating is done by the GLIB_SCHEMAS macro.
Make shotwell not run glib-compile-schemas in the stagedir, this has no effect.
Additional this generates the share/glib-2.0/schemas/gschemas.compiled file.
This file is managed by the glib20 port. And has a changing checksum because
it recompiled every time a GLIB_SCHEMAS enabled port is installed or removed.
Notes
Notes:
svn path=/head/; revision=383994
Diffstat (limited to 'graphics/shotwell')
| -rw-r--r-- | graphics/shotwell/Makefile | 1 | ||||
| -rw-r--r-- | graphics/shotwell/files/patch-Makefile | 12 | ||||
| -rw-r--r-- | graphics/shotwell/pkg-plist | 1 |
3 files changed, 9 insertions, 5 deletions
diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 420fce235cc4..431c5e4f989b 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -3,6 +3,7 @@ PORTNAME= shotwell PORTVERSION= 0.22.0 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R} diff --git a/graphics/shotwell/files/patch-Makefile b/graphics/shotwell/files/patch-Makefile index 73e949120629..c461aba0cfdd 100644 --- a/graphics/shotwell/files/patch-Makefile +++ b/graphics/shotwell/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2015-03-28 15:11:25.000000000 +0100 -+++ Makefile 2015-03-28 15:14:57.000000000 +0100 +--- Makefile.orig 2015-03-24 01:38:31.000000000 +0100 ++++ Makefile 2015-04-14 13:06:36.396704000 +0200 @@ -13,7 +13,7 @@ VALAC := $(shell which $(VALAC)) endif @@ -25,8 +25,12 @@ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ libraw >= 0.13.2 \ -@@ -544,8 +542,8 @@ - glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas +@@ -541,11 +539,11 @@ + $(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + $(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas + ifndef DISABLE_SCHEMAS_COMPILE +- glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas ++# glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas endif ifndef DISABLE_GSETTINGS_CONVERT_INSTALL - mkdir -p $(DESTDIR)/usr/share/GConf/gsettings diff --git a/graphics/shotwell/pkg-plist b/graphics/shotwell/pkg-plist index 0b6e9d2ad090..eca9cb3e682b 100644 --- a/graphics/shotwell/pkg-plist +++ b/graphics/shotwell/pkg-plist @@ -33,7 +33,6 @@ share/GConf/gsettings/shotwell.convert share/appdata/shotwell.appdata.xml share/applications/shotwell-viewer.desktop share/applications/shotwell.desktop -share/glib-2.0/schemas/gschemas.compiled share/gnome/help/shotwell/C/edit-adjustments.page share/gnome/help/shotwell/C/edit-crop.page share/gnome/help/shotwell/C/edit-enhance.page |