56 lines
2.3 KiB
Plaintext
56 lines
2.3 KiB
Plaintext
$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 {
|