diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-02-01 14:48:35 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-02-01 14:48:35 +0100 |
| commit | 278b2eb1ee58d4f3a83b8aac45718ebced5b9f5b (patch) | |
| tree | f8a866e833f205a51609351da1a218a434bd2d78 | |
| parent | Merge git://github.com/Keruspe/Keruspe-overlay (diff) | |
| download | keruspe-278b2eb1ee58d4f3a83b8aac45718ebced5b9f5b.tar.gz keruspe-278b2eb1ee58d4f3a83b8aac45718ebced5b9f5b.tar.bz2 keruspe-278b2eb1ee58d4f3a83b8aac45718ebced5b9f5b.zip | |
fix glib patch
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
| -rw-r--r-- | dev-libs/glib/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/glib/files/external-gdbus-codegen.patch | 137 |
2 files changed, 116 insertions, 23 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 48c3d4b5..573587ca 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,4 +1,4 @@ -AUX external-gdbus-codegen.patch 3612 RMD160 506da8f95bad3d7e8dd8a003cc392eb9b668f8de SHA1 05a3a26a2e2d3ecdaedf197f2c2ed27a6c23d3e5 SHA256 85237884fac821f704926adf43de478eece95d919e688c6a3bcf065f7dea8257 +AUX external-gdbus-codegen.patch 7074 RMD160 1e6c81155351b5a39124bdc4bb8d319da49d05fe SHA1 123503cab8ea589c58521ed2a10b084d2b776af8 SHA256 5284c1bdc53a3cb742538b92185d866ba5023d93157162a71197e2f9fd06703a AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af diff --git a/dev-libs/glib/files/external-gdbus-codegen.patch b/dev-libs/glib/files/external-gdbus-codegen.patch index e30fbac3..3031e2d2 100644 --- a/dev-libs/glib/files/external-gdbus-codegen.patch +++ b/dev-libs/glib/files/external-gdbus-codegen.patch @@ -1,22 +1,24 @@ -From 368d34fc06c4472a2240ccbe7f0669c7c51a2acd Mon Sep 17 00:00:00 2001 +From 33d3c8b0eaf0635e9db94bca13db92bc31ac25c0 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Fri, 26 Aug 2011 12:08:09 +0200 -Subject: [PATCH] external gdbus-codegen +Date: Wed, 1 Feb 2012 14:46:28 +0100 +Subject: [PATCH] extrernal gdbus-codegen Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> --- - configure.ac | 4 +--- - docs/reference/gio/Makefile.am | 3 +-- + configure.ac | 4 +- + docs/reference/gio/Makefile.am | 1 - gio/Makefile.am | 2 +- - gio/tests/Makefile.am | 6 ++---- - gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- - 5 files changed, 7 insertions(+), 14 deletions(-) + gio/tests/Makefile.am | 6 +-- + gio/tests/{Makefile.am => Makefile.am.orig} | 44 +------------------- + gio/tests/gdbus-object-manager-example/Makefile.am | 6 +-- + 6 files changed, 8 insertions(+), 55 deletions(-) + copy gio/tests/{Makefile.am => Makefile.am.orig} (90%) diff --git a/configure.ac b/configure.ac -index e4235e0..f957b50 100644 +index 4cf04a1..0bb18c8 100644 --- a/configure.ac +++ b/configure.ac -@@ -358,7 +358,7 @@ fi +@@ -356,7 +356,7 @@ fi AC_SUBST(PERL_PATH) # Need suitable python path for greport @@ -25,9 +27,9 @@ index e4235e0..f957b50 100644 dnl *********************** -@@ -3642,8 +3642,6 @@ gobject/tests/Makefile +@@ -3525,8 +3525,6 @@ gobject/glib-mkenums + gobject/tests/Makefile gthread/Makefile - gthread/tests/Makefile gio/Makefile -gio/gdbus-2.0/codegen/Makefile -gio/gdbus-2.0/codegen/config.py @@ -35,21 +37,19 @@ index e4235e0..f957b50 100644 gio/inotify/Makefile gio/fen/Makefile diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 96dcadb..c7eece6 100644 +index 535aa26..f062ffc 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am -@@ -138,8 +138,7 @@ man_MANS = \ - gio-querymodules.1 \ - glib-compile-schemas.1 \ +@@ -145,7 +145,6 @@ man_MANS = \ gsettings.1 \ -- gdbus.1 \ + gresource.1 \ + gdbus.1 \ - gdbus-codegen.1 -+ gdbus.1 if ENABLE_MAN diff --git a/gio/Makefile.am b/gio/Makefile.am -index 698fa92..00fc32e 100644 +index d9227b9..ca4a75c 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl @@ -62,10 +62,10 @@ index 698fa92..00fc32e 100644 if OS_UNIX SUBDIRS += xdgmime diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index e354528..1a363ad 100644 +index f11a992..39a60b9 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -268,10 +268,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses +@@ -275,10 +275,8 @@ gdbus_close_pending_SOURCES = gdbus-close-pending.c gdbus-sessionbus.c gdbus-ses gdbus_close_pending_LDADD = $(progs_ldadd) if OS_UNIX @@ -78,6 +78,99 @@ index e354528..1a363ad 100644 --interface-prefix org.project. \ --generate-c-code gdbus-test-codegen-generated \ --c-generate-object-manager \ +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am.orig +similarity index 90% +copy from gio/tests/Makefile.am +copy to gio/tests/Makefile.am.orig +index f11a992..7c7bded 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am.orig +@@ -22,7 +22,6 @@ progs_ldadd = \ + $(top_builddir)/glib/libglib-2.0.la \ + $(top_builddir)/gthread/libgthread-2.0.la \ + $(top_builddir)/gobject/libgobject-2.0.la \ +- $(top_builddir)/gmodule/libgmodule-2.0.la \ + $(top_builddir)/gio/libgio-2.0.la + + TEST_PROGS += \ +@@ -60,7 +59,6 @@ TEST_PROGS += \ + network-monitor \ + fileattributematcher \ + gmenumodel \ +- resources \ + $(NULL) + + if OS_UNIX +@@ -394,10 +392,6 @@ gdbus_connection_flush_helper_LDADD = $(progs_ldadd) + appinfo_SOURCES = appinfo.c + appinfo_LDADD = $(progs_ldadd) + +-resources_SOURCES = resources.c test_resources.c test_resources2.c test_resources2.h +-resources_DEPENDENCIES = test.gresource +-resources_LDADD = $(progs_ldadd) +- + appinfo_test_SOURCES = appinfo-test.c + appinfo_test_LDADD = $(progs_ldadd) + +@@ -566,56 +560,22 @@ EXTRA_DIST += \ + cert-key.pem \ + cert-list.pem \ + nothing.pem \ +- test.gresource.xml \ +- test1.txt \ +- test2.gresource.xml \ +- test2.txt \ +- test3.gresource.xml \ +- test3.txt \ +- test4.gresource.xml \ + $(NULL) + +-MISC_STUFF = test.mo test.gresource ++MISC_STUFF = test.mo + + test.mo: de.po + $(MSGFMT) -o test.mo $(srcdir)/de.po; \ + $(MKDIR_P) de/LC_MESSAGES; \ + cp -f test.mo de/LC_MESSAGES + +-if CROSS_COMPILING +- glib_compile_resources=$(GLIB_COMPILE_RESOURCES) +-else +- glib_compile_resources=$(top_builddir)/gio/glib-compile-resources +-endif +- +-BUILT_SOURCES += test_resources.c test_resources2.c test_resources2.h +-test_resources.c: test2.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test2.gresource.xml) +- $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_test1 $< +- +-test_resources2.h test_resources2.c: test3.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test3.gresource.xml) +- $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) --generate --c-name _g_test2 --manual-register $< +- +-plugin_resources.c: test4.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test4.gresource.xml) +- $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) --generate-source --c-name _g_plugin $< +- +-test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) --generate-dependencies test.gresource.xml) +- $(AM_V_GEN) $(glib_compile_resources) --target=$@ --sourcedir=$(srcdir) $< +- +-noinst_LTLIBRARIES = libresourceplugin.la +- +-libresourceplugin_la_SOURCES = resourceplugin.c plugin_resources.c +-libresourceplugin_la_LDFLAGS = -avoid-version -module $(no_undefined) -rpath $(libdir) +-libresourceplugin_la_LIBADD = $(progs_ldadd) +- +-CLEANFILES = gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml test_resources2.[ch] plugin_resources.c ++CLEANFILES = gdbus-test-codegen-generated.[ch] gdbus-test-codegen-generated-doc-*.xml + + DISTCLEANFILES = \ + applications/mimeinfo.cache \ + org.gtk.test.enums.xml \ + de/LC_MESSAGES/test.mo \ + test.mo \ +- test.gresource \ +- test_resources.c \ + gsettings.store \ + gschemas.compiled \ + schema-source/gschemas.compiled diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am index 9861d0e..9ca6eb9 100644 --- a/gio/tests/gdbus-object-manager-example/Makefile.am @@ -96,5 +189,5 @@ index 9861d0e..9ca6eb9 100644 --c-namespace Example \ --c-generate-object-manager \ -- -1.7.7.138.g7f41b6.dirty +1.7.9.106.g2a2aa.dirty |