dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch

   1 From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001
   2 From: Sobhan Mohammadpour <sobhan@gentoo.org>
   3 Date: Fri, 23 Feb 2018 15:27:33 +0330
   4 Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools
   5
   6 ---
   7  configure.ac                                       |  1 -
   8  docs/reference/gio/Makefile.am                     |  1 -
   9  gio/Makefile.am                                    |  2 +-
  10  gio/tests/Makefile.am                              |  6 ++----
  11  gio/tests/gdbus-object-manager-example/Makefile.am |  8 +++-----
  12  5 files changed, 6 insertions(+), 12 deletions(-)
  13
  14 diff --git a/configure.ac b/configure.ac
  15 index 0457c90..07166c9 100644
  16 --- a/configure.ac
  17 +++ b/configure.ac
  18 @@ -3469,7 +3469,6 @@ gobject/glib-mkenums
  19  gobject/tests/Makefile
  20  gthread/Makefile
  21  gio/Makefile
  22 -gio/gdbus-2.0/codegen/Makefile
  23  gio/gdbus-2.0/codegen/config.py
  24  gio/gnetworking.h
  25  gio/xdgmime/Makefile
  26 diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
  27 index 5741a3e..d38e768 100644
  28 --- a/docs/reference/gio/Makefile.am
  29 +++ b/docs/reference/gio/Makefile.am
  30 @@ -177,7 +177,6 @@ man_MANS +=                         \
  31         gsettings.1                     \
  32         gresource.1                     \
  33         gdbus.1                         \
  34 -       gdbus-codegen.1                 \
  35         gio.1                           \
  36         $(NULL)
  37
  38 diff --git a/gio/Makefile.am b/gio/Makefile.am
  39 index b2db995..53d7162 100644
  40 --- a/gio/Makefile.am
  41 +++ b/gio/Makefile.am
  42 @@ -1,6 +1,6 @@
  43  include $(top_srcdir)/glib.mk
  44
  45 -SUBDIRS = gdbus-2.0/codegen
  46 +SUBDIRS =
  47
  48  if OS_UNIX
  49  if !OS_COCOA
  50 diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
  51 index acc1da4..7c51eab 100644
  52 --- a/gio/tests/Makefile.am
  53 +++ b/gio/tests/Makefile.am
  54 @@ -460,10 +460,8 @@ gnotification_SOURCES                    = $(gdbus_sessionbus_sources) gnotifica
  55
  56  BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h
  57  gdbus-test-codegen.o: gdbus-test-codegen-generated.h
  58 -gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
  59 -       $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
  60 -               UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
  61 -               $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
  62 +gdbus-test-codegen-generated.h: test-codegen.xml Makefile
  63 +       $(AM_V_GEN) gdbus-codegen \
  64                 --interface-prefix org.project. \
  65                 --generate-c-code gdbus-test-codegen-generated \
  66                 --c-generate-object-manager \
  67 diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
  68 index 1d0464c..f390dca 100644
  69 --- a/gio/tests/gdbus-object-manager-example/Makefile.am
  70 +++ b/gio/tests/gdbus-object-manager-example/Makefile.am
  71 @@ -11,10 +11,8 @@ GDBUS_GENERATED = \
  72         gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml       \
  73         $(NULL)
  74
  75 -$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
  76 -       $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
  77 -               UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
  78 -               $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
  79 +$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile
  80 +       $(AM_V_GEN) gdbus-codegen \
  81                 --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
  82                 --c-namespace Example \
  83                 --c-generate-object-manager \
  84 @@ -46,4 +44,4 @@ EXTRA_DIST += gdbus-example-objectmanager.xml
  85
  86  CLEANFILES += $(GDBUS_GENERATED)
  87
  88 -check-TESTS:
  89 \ No newline at end of file
  90 +check-TESTS:
  91 --
  92 2.16.1
  93