cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge a patch from upstream:

Browse Source 
editor: Load *.enums.xml as well as *.gschema.xml.  This was stopping some
enums from being loaded.
This commit is contained in:
ajacoutot 2011-05-02 14:40:33 +00:00
parent d12f988c1d
commit 570f6645ae
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/dconf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2011/04/13 17:05:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2011/05/02 14:40:33 ajacoutot Exp $
SHARED_ONLY= Yes
@ -12,6 +12,7 @@ PKGNAME-main= ${DISTNAME}
PKGNAME-editor= dconf-editor-${GNOME_VERSION}
REVISION-main= 0
REVISION-editor=0
SHARED_LIBS+= dconf 0.0 # 0.0.0
SHARED_LIBS+= dconf-dbus-1 0.0 # 0.0.0
@ -39,7 +40,7 @@ WANTLIB-editor += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB-editor += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
WANTLIB-editor += drm expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB-editor += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
WANTLIB-editor += png pthread-stubs xcb xcb-render xcb-shm xml2 z
WANTLIB-editor += png pthread-stubs xcb xcb-render xcb-shm xml2 z dconf
MULTI_PACKAGES= -main

18
devel/dconf/patches/patch-editor_dconf-schema_vala Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-editor_dconf-schema_vala,v 1.1 2011/05/02 14:40:33 ajacoutot Exp $
From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 29 Mar 2011 05:50:12 +0000
Subject: editor: Load *.enums.xml as well as *.gschema.xml. This was stopping some enums from being loaded.
--- editor/dconf-schema.vala.orig Tue Mar 22 16:59:23 2011
+++ editor/dconf-schema.vala Mon May 2 16:34:47 2011
@@ -371,7 +371,7 @@ public class SchemaList
while ((info = i.next_file (null)) != null) {
string name = info.get_name();
- if (!name.has_suffix(".gschema.xml"))
+ if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml"))
continue;
string path = Path.build_filename(dir, name, null);