diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index b180ba7b65d..606a0c1768c 100755 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2011/09/12 12:07:25 jasper Exp $ +# $OpenBSD: Makefile,v 1.26 2011/09/12 18:20:34 jasper Exp $ SHARED_ONLY= Yes @@ -11,6 +11,8 @@ GNOME_VERSION= 0.8.0 PKGNAME-main= ${DISTNAME} PKGNAME-editor= dconf-editor-${GNOME_VERSION} +REVISION-editor=0 + SHARED_LIBS+= dconf 0.0 # 0.0.0 SHARED_LIBS+= dconf-dbus-1 0.0 # 0.0.0 diff --git a/devel/dconf/patches/patch-editor_dconf-model_vala b/devel/dconf/patches/patch-editor_dconf-model_vala index 92edf95f439..b428fb79197 100644 --- a/devel/dconf/patches/patch-editor_dconf-model_vala +++ b/devel/dconf/patches/patch-editor_dconf-model_vala @@ -1,4 +1,4 @@ -$OpenBSD: patch-editor_dconf-model_vala,v 1.5 2011/06/22 16:08:15 ajacoutot Exp $ +$OpenBSD: patch-editor_dconf-model_vala,v 1.6 2011/09/12 18:20:34 jasper Exp $ From 9d6096ff7790cb39f2cd1638d98b211556c73ff9 Mon Sep 17 00:00:00 2001 From: Robert Ancell @@ -10,8 +10,13 @@ From: Ryan Lortie Date: Wed, 22 Jun 2011 15:46:40 +0000 Subject: Add change watching to dconf-editor ---- editor/dconf-model.vala.orig Wed Jun 22 17:50:47 2011 -+++ editor/dconf-model.vala Wed Jun 22 17:50:54 2011 +From a15d9621fc7019b01968df737da4f2d3772d3fb2 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie +Date: Sun, 03 Jul 2011 15:10:26 +0000 +Subject: Deal with incompatible changes in Vala + +--- editor/dconf-model.vala.orig Mon Sep 12 17:12:30 2011 ++++ editor/dconf-model.vala Mon Sep 12 17:12:24 2011 @@ -118,6 +118,12 @@ public class Key : GLib.Object public signal void value_changed(); @@ -34,7 +39,19 @@ Subject: Add change watching to dconf-editor } public void set_to_default() -@@ -456,7 +464,7 @@ public class EnumModel: GLib.Object, Gtk.TreeModel +@@ -341,7 +349,11 @@ public class KeyModel: GLib.Object, Gtk.TreeModel + return iter_nth_child(out iter, null, path.get_indices()[0]); + } + ++#if VALA_0_14 ++ public Gtk.TreePath? get_path(Gtk.TreeIter iter) ++#else + public Gtk.TreePath get_path(Gtk.TreeIter iter) ++#endif + { + var path = new Gtk.TreePath(); + path.append_index(get_key(iter).index); +@@ -456,7 +468,7 @@ public class EnumModel: GLib.Object, Gtk.TreeModel return typeof(int); } @@ -43,7 +60,7 @@ Subject: Add change watching to dconf-editor { iter.stamp = 0; iter.user_data = value; -@@ -464,9 +472,9 @@ public class EnumModel: GLib.Object, Gtk.TreeModel +@@ -464,9 +476,9 @@ public class EnumModel: GLib.Object, Gtk.TreeModel iter.user_data3 = value; } @@ -55,7 +72,19 @@ Subject: Add change watching to dconf-editor } public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) -@@ -556,10 +564,23 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel +@@ -477,7 +489,11 @@ public class EnumModel: GLib.Object, Gtk.TreeModel + return iter_nth_child(out iter, null, path.get_indices()[0]); + } + ++#if VALA_0_14 ++ public Gtk.TreePath? get_path(Gtk.TreeIter iter) ++#else + public Gtk.TreePath get_path(Gtk.TreeIter iter) ++#endif + { + var path = new Gtk.TreePath(); + path.append_index((int)get_enum_value(iter).index); +@@ -556,10 +572,23 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel public DConf.Client client; private Directory root; @@ -80,3 +109,15 @@ Subject: Add change watching to dconf-editor schemas = new SchemaList(); try +@@ -632,7 +661,11 @@ public class SettingsModel: GLib.Object, Gtk.TreeModel + return true; + } + ++#if VALA_0_14 ++ public Gtk.TreePath? get_path(Gtk.TreeIter iter) ++#else + public Gtk.TreePath get_path(Gtk.TreeIter iter) ++#endif + { + var path = new Gtk.TreePath(); + for (var d = get_directory(iter); d != root; d = d.parent) diff --git a/textproc/gtkaml/Makefile b/textproc/gtkaml/Makefile index 5c6b685b6fd..da459b98bc1 100644 --- a/textproc/gtkaml/Makefile +++ b/textproc/gtkaml/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.28 2011/06/02 17:09:32 kili Exp $ +# $OpenBSD: Makefile,v 1.29 2011/09/12 18:20:34 jasper Exp $ COMMENT= XML parser that extends the Vala.Parser DISTNAME= gtkaml-0.4.3 +REVISION= 0 CATEGORIES= textproc HOMEPAGE= http://gtkaml.googlecode.com/ @@ -16,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c glib-2.0 gobject-2.0 gthread-2.0 pthread xml2 vala-0.12 +WANTLIB += c glib-2.0 gobject-2.0 gthread-2.0 pthread xml2 vala-0.14 WANTLIB += gio-2.0 gmodule-2.0 MASTER_SITES= ${HOMEPAGE}/files/ @@ -26,13 +27,18 @@ MODULES= devel/gettext BUILD_DEPENDS= x11/gtk+2 -LIB_DEPENDS= lang/vala>=0.12.0 +LIB_DEPENDS= lang/vala>=0.13.4 USE_LIBTOOL= Yes USE_GMAKE= Yes -CONFIGURE_STYLE= gnu +AUTOCONF_VERSION= 2.68 + +CONFIGURE_STYLE= autoconf gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +#pre-configure: +# ${SETENV} AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf + .include diff --git a/textproc/gtkaml/patches/patch-configure_ac b/textproc/gtkaml/patches/patch-configure_ac new file mode 100644 index 00000000000..54b2f4d343e --- /dev/null +++ b/textproc/gtkaml/patches/patch-configure_ac @@ -0,0 +1,22 @@ +$OpenBSD: patch-configure_ac,v 1.1 2011/09/12 18:20:34 jasper Exp $ + +Fix for vala-0.14 non-GDBus mode deprecated +From upstream svn rev 824. + +--- configure.ac.orig Mon Sep 12 19:37:46 2011 ++++ configure.ac Mon Sep 12 19:39:44 2011 +@@ -42,8 +42,12 @@ PKG_CHECK_MODULES([LIBXML2], libxml-2.0) + AC_SUBST(LIBXML2_CFLAGS) + AC_SUBST(LIBXML2_LIBS) + +-PKG_CHECK_MODULES(VALA, libvala-0.12,[VALA_PKG="libvala-0.12"],[PKG_CHECK_MODULES(VALA, vala-0.10, [VALA_PKG="vala-0.10"])]) +-AM_CONDITIONAL([VALA_LATEST], [test $VALA_PKG = libvala-0.12]) ++PKG_CHECK_MODULES(VALA, libvala-0.14, [VALA_PKG="libvala-0.14"], ++ [PKG_CHECK_MODULES(VALA, libvala-0.12, [VALA_PKG="libvala-0.12"], ++ [PKG_CHECK_MODULES(VALA, vala-0.10, [VALA_PKG="vala-0.10"]) ++ ]) ++]) ++AM_CONDITIONAL([VALA_LATEST], [test $VALA_PKG = libvala-0.14]) + + AC_SUBST(VALA_PKG) + AC_SUBST(VALA_CFLAGS) diff --git a/textproc/gtkaml/patches/patch-src_GtkamlCompiler_vala b/textproc/gtkaml/patches/patch-src_GtkamlCompiler_vala new file mode 100644 index 00000000000..964bb939722 --- /dev/null +++ b/textproc/gtkaml/patches/patch-src_GtkamlCompiler_vala @@ -0,0 +1,55 @@ +$OpenBSD: patch-src_GtkamlCompiler_vala,v 1.1 2011/09/12 18:20:34 jasper Exp $ + +Fix for vala-0.14 non-GDBus mode deprecated +From upstream svn rev 824. + +--- src/GtkamlCompiler.vala.orig Mon Sep 12 19:40:14 2011 ++++ src/GtkamlCompiler.vala Mon Sep 12 19:41:10 2011 +@@ -67,7 +67,9 @@ class Gtkaml.Compiler { + static bool deprecated; + static bool experimental; + static bool experimental_non_null; ++#if !VALA_0_14 + static bool disable_dbus_transformation; ++#endif + static bool disable_warnings; + static string cc_command; + [CCode (array_length = false, array_null_terminated = true)] +@@ -126,7 +128,9 @@ class Gtkaml.Compiler { + { "disable-warnings", 0, 0, OptionArg.NONE, ref disable_warnings, "Disable warnings", null }, + { "fatal-warnings", 0, 0, OptionArg.NONE, ref fatal_warnings, "Treat warnings as fatal", null }, + { "enable-experimental-non-null", 0, 0, OptionArg.NONE, ref experimental_non_null, "Enable experimental enhancements for non-null types", null }, ++#if !VALA_0_14 + { "disable-dbus-transformation", 0, 0, OptionArg.NONE, ref disable_dbus_transformation, "Disable transformation of D-Bus member names", null }, ++#endif + { "cc", 0, 0, OptionArg.STRING, ref cc_command, "Use COMMAND as C compiler command", "COMMAND" }, + { "Xcc", 'X', 0, OptionArg.STRING_ARRAY, ref cc_options, "Pass OPTION to the C compiler", "OPTION..." }, + { "dump-tree", 0, 0, OptionArg.FILENAME, ref dump_tree, "Write code tree to FILE", "FILE" }, +@@ -181,7 +185,9 @@ class Gtkaml.Compiler { + context.deprecated = deprecated; + context.experimental = experimental; + context.experimental_non_null = experimental_non_null; ++#if !VALA_0_14 + context.dbus_transformation = !disable_dbus_transformation; ++#endif + context.report.enable_warnings = !disable_warnings; + context.report.set_verbose_errors (!quiet_mode); + context.verbose_mode = verbose_mode; +@@ -304,6 +310,7 @@ class Gtkaml.Compiler { + } + + if (context.profile == Profile.GOBJECT) { ++#if !VALA_0_14 + if (context.has_package ("dbus-glib-1")) { + if (!context.deprecated) { + Report.warning (null, "D-Bus GLib is deprecated, use GDBus"); +@@ -312,6 +319,9 @@ class Gtkaml.Compiler { + } else { + context.codegen = new GDBusServerModule (); + } ++#else ++ context.codegen = new GDBusServerModule (); ++#endif + } else if (context.profile == Profile.DOVA) { + context.codegen = new DovaErrorModule (); + } else {