| 1 |
pacho 13/03/28 16:05:07 |
| 2 |
|
| 3 |
Added: glib-2.35.x-external-gdbus-codegen.patch |
| 4 |
Log: |
| 5 |
Version bump for Gnome 3.8 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.35.x-external-gdbus-codegen.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: glib-2.35.x-external-gdbus-codegen.patch |
| 16 |
=================================================================== |
| 17 |
From 4a74adf19d7e46aef7c9ede87ffb0264193311dc Mon Sep 17 00:00:00 2001 |
| 18 |
From: Priit Laes <plaes@×××××.org> |
| 19 |
Date: Thu, 28 Feb 2013 08:28:01 +0200 |
| 20 |
Subject: [PATCH] Split out gdbus codegen |
| 21 |
|
| 22 |
--- |
| 23 |
configure.ac | 17 ++++++++--------- |
| 24 |
docs/reference/gio/Makefile.am | 3 +-- |
| 25 |
gio/Makefile.am | 2 +- |
| 26 |
gio/tests/Makefile.am | 6 ++---- |
| 27 |
gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
| 28 |
5 files changed, 14 insertions(+), 20 deletions(-) |
| 29 |
|
| 30 |
diff --git a/configure.ac b/configure.ac |
| 31 |
index f734b7c..8076e7f 100644 |
| 32 |
--- a/configure.ac |
| 33 |
+++ b/configure.ac |
| 34 |
@@ -374,14 +374,14 @@ AC_SUBST(PERL_PATH) |
| 35 |
# option to specify python interpreter to use; this just sets $PYTHON, so that |
| 36 |
# we will fallback to reading $PYTHON if --with-python is not given, and |
| 37 |
# python.m4 will get the expected input |
| 38 |
-AC_ARG_WITH(python, |
| 39 |
- AS_HELP_STRING([--with-python=PATH], |
| 40 |
- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
| 41 |
- [PYTHON="$withval"], []) |
| 42 |
-if test x"$PYTHON" = xyes; then |
| 43 |
- AC_MSG_ERROR([--with-python option requires a path or program argument]) |
| 44 |
-fi |
| 45 |
-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
| 46 |
+# AC_ARG_WITH(python, |
| 47 |
+# AS_HELP_STRING([--with-python=PATH], |
| 48 |
+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
| 49 |
+# [PYTHON="$withval"], []) |
| 50 |
+# if test x"$PYTHON" = xyes; then |
| 51 |
+# AC_MSG_ERROR([--with-python option requires a path or program argument]) |
| 52 |
+# fi |
| 53 |
+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
| 54 |
|
| 55 |
|
| 56 |
dnl *********************** |
| 57 |
@@ -3697,7 +3697,6 @@ gobject/glib-mkenums |
| 58 |
gobject/tests/Makefile |
| 59 |
gthread/Makefile |
| 60 |
gio/Makefile |
| 61 |
-gio/gdbus-2.0/codegen/Makefile |
| 62 |
gio/gdbus-2.0/codegen/config.py |
| 63 |
gio/gnetworking.h |
| 64 |
gio/xdgmime/Makefile |
| 65 |
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
| 66 |
index 99606d3..067cd50 100644 |
| 67 |
--- a/docs/reference/gio/Makefile.am |
| 68 |
+++ b/docs/reference/gio/Makefile.am |
| 69 |
@@ -152,8 +152,7 @@ man_MANS += \ |
| 70 |
glib-compile-resources.1 \ |
| 71 |
gsettings.1 \ |
| 72 |
gresource.1 \ |
| 73 |
- gdbus.1 \ |
| 74 |
- gdbus-codegen.1 |
| 75 |
+ gdbus.1 |
| 76 |
|
| 77 |
XSLTPROC_FLAGS = \ |
| 78 |
--nonet \ |
| 79 |
diff --git a/gio/Makefile.am b/gio/Makefile.am |
| 80 |
index 94d7f59..c07d00d 100644 |
| 81 |
--- a/gio/Makefile.am |
| 82 |
+++ b/gio/Makefile.am |
| 83 |
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl |
| 84 |
|
| 85 |
NULL = |
| 86 |
|
| 87 |
-SUBDIRS = gdbus-2.0/codegen |
| 88 |
+SUBDIRS = |
| 89 |
|
| 90 |
if OS_UNIX |
| 91 |
SUBDIRS += xdgmime |
| 92 |
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
| 93 |
index c8a4090..feece02 100644 |
| 94 |
--- a/gio/tests/Makefile.am |
| 95 |
+++ b/gio/tests/Makefile.am |
| 96 |
@@ -212,10 +212,8 @@ gdbus_bz627724_SOURCES = gdbus-bz627724.c gdbus-sessionbus.c gdbus-sessionbus.h |
| 97 |
gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-sessionbus.h gdbus-tests.h gdbus-tests.c |
| 98 |
|
| 99 |
if OS_UNIX |
| 100 |
-gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
| 101 |
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
| 102 |
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
| 103 |
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
| 104 |
+gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml Makefile |
| 105 |
+ $(AM_V_GEN) gdbus-codegen \ |
| 106 |
--interface-prefix org.project. \ |
| 107 |
--generate-c-code gdbus-test-codegen-generated \ |
| 108 |
--c-generate-object-manager \ |
| 109 |
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
| 110 |
index 6875210..264c3c1 100644 |
| 111 |
--- a/gio/tests/gdbus-object-manager-example/Makefile.am |
| 112 |
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
| 113 |
@@ -21,10 +21,8 @@ GDBUS_GENERATED = \ |
| 114 |
gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
| 115 |
$(NULL) |
| 116 |
|
| 117 |
-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
| 118 |
- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
| 119 |
- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
| 120 |
- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
| 121 |
+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
| 122 |
+ $(AM_V_GEN) gdbus-codegen \ |
| 123 |
--interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
| 124 |
--c-namespace Example \ |
| 125 |
--c-generate-object-manager \ |
| 126 |
-- |
| 127 |
1.8.1.2 |
Archives