From eb38157cbf70e5686d8935b5db8213022a73b85f Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Wed, 31 Jan 2007 17:52:11 +0000 Subject: [PATCH] Stefan Fiedler: dbus: downgrade to 0.62 (latest version with qt3 bindings) update dbus-glib dbus-glib: remove CORE flag [2006123116304952450] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8177 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/dbus-glib/dbus-glib.desc | 5 +- package/base/dbus-glib/dbus-introspect.patch | 57 -------------------- package/base/dbus-glib/glib-linkage.patch | 23 ++++++++ package/base/dbus/dbus.conf | 6 +-- package/base/dbus/dbus.desc | 6 +-- 5 files changed, 31 insertions(+), 66 deletions(-) delete mode 100644 package/base/dbus-glib/dbus-introspect.patch create mode 100644 package/base/dbus-glib/glib-linkage.patch diff --git a/package/base/dbus-glib/dbus-glib.desc b/package/base/dbus-glib/dbus-glib.desc index 5737e9d1a..95a08763c 100644 --- a/package/base/dbus-glib/dbus-glib.desc +++ b/package/base/dbus-glib/dbus-glib.desc @@ -39,12 +39,11 @@ [M] Stefan Fiedler [C] extra/configuration -[F] CORE [L] GPL [S] Beta -[V] 0.71 +[V] 0.72 [P] X -----5---9 140.450 -[D] 1479977990 dbus-glib-0.71.tar.gz http://dbus.freedesktop.org/releases/ +[D] 3338596711 dbus-glib-0.72.tar.gz http://dbus.freedesktop.org/releases/dbus-glib/ diff --git a/package/base/dbus-glib/dbus-introspect.patch b/package/base/dbus-glib/dbus-introspect.patch deleted file mode 100644 index 53f4b4389..000000000 --- a/package/base/dbus-glib/dbus-introspect.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -dur dbus-glib-0.71/tools/Makefile.in build/crystal-distro-k6III-TRUNK-x86-k6-3-32-crystal-expert/ROCK/src.dbus-glib.1154591626.24357.3315736450/dbus-glib-0.71/tools/Makefile.in ---- dbus-glib-0.71/tools/Makefile.in 2006-07-24 20:41:57.000000000 +0200 -+++ build/crystal-distro-k6III-TRUNK-x86-k6-3-32-crystal-expert/ROCK/src.dbus-glib.1154591626.24357.3315736450/dbus-glib-0.71/tools/Makefile.in 2006-08-03 10:20:14.000000000 +0200 -@@ -487,7 +487,7 @@ - $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml - - dbus-bus-introspect.xml: -- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -+ DBUS_TOP_BUILDDIR=$(top_builddir) ./run-with-tmp-session-bus.sh dbus-send --session --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -dur dbus-glib-0.71/tools/session.conf build/crystal-distro-k6III-TRUNK-x86-k6-3-32-crystal-expert/ROCK/src.dbus-glib.1154591626.24357.3315736450/dbus-glib-0.71/tools/session.conf ---- dbus-glib-0.71/tools/session.conf 2006-08-03 10:20:39.000000000 +0200 -+++ build/crystal-distro-k6III-TRUNK-x86-k6-3-32-crystal-expert/ROCK/src.dbus-glib.1154591626.24357.3315736450/dbus-glib-0.71/tools/session.conf 2006-07-28 21:00:04.000000000 +0200 -@@ -0,0 +1,30 @@ -+ -+ -+ -+ -+ -+ session -+ -+ unix:tmpdir=/tmp -+ -+ /usr/share/dbus-1/services -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ session-local.conf -+ -+ contexts/dbus_contexts -+ -+ ---- dbus-glib-0.71/tools/Makefile.am 2006-07-17 19:00:39.000000000 +0200 -+++ build/crystal-distro-k6III-TRUNK-x86-k6-3-32-crystal-expert/ROCK/src.dbus-glib.1154591626.24357.3315736450/dbus-glib-0.71/tools/Makefile.am 2006-08-03 10:24:54.000000000 +0200 -@@ -9,7 +9,7 @@ - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - - dbus-bus-introspect.xml: -- DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml -+ DBUS_TOP_BUILDDIR=$(top_builddir) ./run-with-tmp-session-bus.sh dbus-send --session --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml - - EXTRA_DIST = run-with-tmp-session-bus.sh - diff --git a/package/base/dbus-glib/glib-linkage.patch b/package/base/dbus-glib/glib-linkage.patch new file mode 100644 index 000000000..6b9bdc03b --- /dev/null +++ b/package/base/dbus-glib/glib-linkage.patch @@ -0,0 +1,23 @@ +diff -dur dbus-glib-0.72/test/core/Makefile.in dbus-glib-0.72-p/test/core/Makefile.in +--- dbus-glib-0.72/test/core/Makefile.in 2006-10-25 23:14:32.000000000 +0200 ++++ dbus-glib-0.72-p/test/core/Makefile.in 2006-12-30 00:49:47.000000000 +0100 +@@ -389,7 +389,7 @@ + $(LINK) $(test_dbus_glib_LDFLAGS) $(test_dbus_glib_OBJECTS) $(test_dbus_glib_LDADD) $(LIBS) + test-profile$(EXEEXT): $(test_profile_OBJECTS) $(test_profile_DEPENDENCIES) + @rm -f test-profile$(EXEEXT) +- $(LINK) $(test_profile_LDFLAGS) $(test_profile_OBJECTS) $(test_profile_LDADD) $(LIBS) ++ $(LINK) $(test_profile_LDFLAGS) $(test_profile_OBJECTS) $(test_profile_LDADD) $(LIBS) $(DBUS_GLIB_LIBS) + test-service-glib$(EXEEXT): $(test_service_glib_OBJECTS) $(test_service_glib_DEPENDENCIES) + @rm -f test-service-glib$(EXEEXT) + $(LINK) $(test_service_glib_LDFLAGS) $(test_service_glib_OBJECTS) $(test_service_glib_LDADD) $(LIBS) +--- dbus-glib-0.72/dbus/examples/Makefile.in 2006-10-25 23:14:31.000000000 +0200 ++++ dbus-glib-0.72-p/dbus/examples/Makefile.in 2006-12-30 00:47:24.000000000 +0100 +@@ -343,7 +343,7 @@ + done + example-client$(EXEEXT): $(example_client_OBJECTS) $(example_client_DEPENDENCIES) + @rm -f example-client$(EXEEXT) +- $(LINK) $(example_client_LDFLAGS) $(example_client_OBJECTS) $(example_client_LDADD) $(LIBS) ++ $(LINK) $(example_client_LDFLAGS) $(example_client_OBJECTS) $(example_client_LDADD) $(LIBS) $(DBUS_GLIB_LIBS) + example-service$(EXEEXT): $(example_service_OBJECTS) $(example_service_DEPENDENCIES) + @rm -f example-service$(EXEEXT) + $(LINK) $(example_service_LDFLAGS) $(example_service_OBJECTS) $(example_service_LDADD) $(LIBS) diff --git a/package/base/dbus/dbus.conf b/package/base/dbus/dbus.conf index 012a8b9b2..1b3836e8b 100644 --- a/package/base/dbus/dbus.conf +++ b/package/base/dbus/dbus.conf @@ -20,8 +20,8 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -pkginstalled qt33 && var_append confopt " " "--enable-qt3" -# pkginstalled qt40 && var_append confopt " " "--enable-qt" -var_append confopt " " "--disable-mono" +pkginstalled qt33 && var_append extraconfopt " " "--enable-qt3" +# pkginstalled qt40 && var_append extraconfopt " " "--enable-qt" +var_append extraconfopt " " "--disable-mono" hook_add postmake 3 "install_init dbus $confdir/dbus.init" diff --git a/package/base/dbus/dbus.desc b/package/base/dbus/dbus.desc index aec8f4d8e..016423f2a 100644 --- a/package/base/dbus/dbus.desc +++ b/package/base/dbus/dbus.desc @@ -42,9 +42,9 @@ [F] CORE [L] GPL -[S] Beta -[V] 0.91 +[S] Stable +[V] 0.62 [P] X -----5---9 140.400 -[D] 2572513694 dbus-0.91.tar.gz http://dbus.freedesktop.org/releases/ +[D] 3130955499 dbus-0.62.tar.gz http://dbus.freedesktop.org/releases/dbus/