eva 14/04/27 16:17:10 Added: glib-2.40.0-external-gdbus-codegen.patch Log: Version bump for Gnome 3.12. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Revision Changes Path 1.1 dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch?rev=1.1&content-type=text/plain Index: glib-2.40.0-external-gdbus-codegen.patch =================================================================== diff --git a/configure.ac b/configure.ac index a01e58d..59d4527 100644 --- a/configure.ac +++ b/configure.ac @@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH) # option to specify python interpreter to use; this just sets $PYTHON, so that # we will fallback to reading $PYTHON if --with-python is not given, and # python.m4 will get the expected input -AC_ARG_WITH(python, - AS_HELP_STRING([--with-python=PATH], - [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"]), - [PYTHON="$withval"], []) -if test x"$PYTHON" = xyes; then - AC_MSG_ERROR([--with-python option requires a path or program argument]) -fi -AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") +# AC_ARG_WITH(python, +# AS_HELP_STRING([--with-python=PATH], +# [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"]), +# [PYTHON="$withval"], []) +# if test x"$PYTHON" = xyes; then +# AC_MSG_ERROR([--with-python option requires a path or program argument]) +# fi +# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") dnl *********************** @@ -3580,7 +3580,6 @@ gobject/glib-mkenums gobject/tests/Makefile gthread/Makefile gio/Makefile -gio/gdbus-2.0/codegen/Makefile gio/gdbus-2.0/codegen/config.py gio/gnetworking.h gio/xdgmime/Makefile diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index 47fdd38..c7eb136 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -157,8 +157,7 @@ man_MANS += \ glib-compile-resources.1 \ gsettings.1 \ gresource.1 \ - gdbus.1 \ - gdbus-codegen.1 + gdbus.1 XSLTPROC_FLAGS = \ --nonet \ diff --git a/gio/Makefile.am b/gio/Makefile.am index e993e2f..025ad94 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/glib.mk -SUBDIRS = gdbus-2.0/codegen +SUBDIRS = if OS_UNIX SUBDIRS += xdgmime diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am index 2c54e59..3cd3c5a 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am @@ -437,10 +437,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h gdbus-test-codegen.o: gdbus-test-codegen-generated.h -gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ +gdbus-test-codegen-generated.h: test-codegen.xml Makefile + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.project. \ --generate-c-code gdbus-test-codegen-generated \ --c-generate-object-manager \ diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am index d6d1412..62ef706 100644 --- a/gio/tests/gdbus-object-manager-example/Makefile.am +++ b/gio/tests/gdbus-object-manager-example/Makefile.am @@ -11,10 +11,8 @@ GDBUS_GENERATED = \ gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ $(NULL) -$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen - $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ - UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ - $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ +$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile + $(AM_V_GEN) gdbus-codegen \ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ --c-namespace Example \ --c-generate-object-manager \
