| 1 |
eva 09/05/02 22:29:10 |
| 2 |
|
| 3 |
Added: run-tests libunique-1.0.8-automagic-dbus.patch |
| 4 |
Log: |
| 5 |
Original ebuild is courtesy of Christoph Brill <egore@×××.de>, closes bug #236899. |
| 6 |
(Portage version: 2.2_rc31/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-libs/libunique/files/run-tests |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libunique/files/run-tests?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libunique/files/run-tests?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: run-tests |
| 15 |
=================================================================== |
| 16 |
BINARY = ./test-unique |
| 17 |
TESTS = --new --activate --open-uri=http://localhost --foo |
| 18 |
|
| 19 |
all: |
| 20 |
for test in $(TESTS); do \ |
| 21 |
rm -f test_result; \ |
| 22 |
$(BINARY) > test_result & \ |
| 23 |
main_pid=$$!; \ |
| 24 |
sleep 5; \ |
| 25 |
$(BINARY) $$test & \ |
| 26 |
test_pid=$$!; \ |
| 27 |
sleep 5; \ |
| 28 |
while ! test -s test_result; do sleep 0.5; done; \ |
| 29 |
sleep 5; \ |
| 30 |
kill $${test_pid} || exit 1; \ |
| 31 |
kill $${main_pid} || exit 1; \ |
| 32 |
grep -q 'Message received from.*' test_result || { echo "Test failed at $$test"; exit 1; }; \ |
| 33 |
done |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.1 dev-libs/libunique/files/libunique-1.0.8-automagic-dbus.patch |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libunique/files/libunique-1.0.8-automagic-dbus.patch?rev=1.1&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libunique/files/libunique-1.0.8-automagic-dbus.patch?rev=1.1&content-type=text/plain |
| 41 |
|
| 42 |
Index: libunique-1.0.8-automagic-dbus.patch |
| 43 |
=================================================================== |
| 44 |
# Make dbus support configurable |
| 45 |
# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=578777 |
| 46 |
# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=265828 |
| 47 |
diff -Naur a/configure.ac b/configure.ac |
| 48 |
--- a/configure.ac 2009-03-22 05:42:31.000000000 +0530 |
| 49 |
+++ b/configure.ac 2009-04-12 16:27:06.816454299 +0530 |
| 50 |
@@ -76,16 +76,24 @@ |
| 51 |
glib-2.0 >= $GLIB_REQUIRED dnl |
| 52 |
gtk+-2.0 >= $GTK_REQUIRED) |
| 53 |
|
| 54 |
-dnl D-Bus backend dependencies |
| 55 |
-if $PKG_CONFIG --atleast-version $DBUS_GLIB_REQUIRED dbus-glib-1; then |
| 56 |
- have_dbus=yes |
| 57 |
- PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_GLIB_REQUIRED) |
| 58 |
- AC_SUBST(DBUS_CFLAGS) |
| 59 |
- AC_SUBST(DBUS_LIBS) |
| 60 |
- AC_DEFINE([HAVE_DBUS], [1], [Building with D-Bus support]) |
| 61 |
- AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) |
| 62 |
-else |
| 63 |
- have_dbus=no |
| 64 |
+AC_ARG_ENABLE([dbus], |
| 65 |
+ [AC_HELP_STRING([--enable-dbus], |
| 66 |
+ [Enable with D-Bus support @<:@default=yes@:>@])], |
| 67 |
+ [have_dbus=$enableval], |
| 68 |
+ [have_dbus=yes]) |
| 69 |
+ |
| 70 |
+if test x$have_dbus == xyes; then |
| 71 |
+ dnl D-Bus backend dependencies |
| 72 |
+ if $PKG_CONFIG --atleast-version $DBUS_GLIB_REQUIRED dbus-glib-1; then |
| 73 |
+ have_dbus=yes |
| 74 |
+ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_GLIB_REQUIRED) |
| 75 |
+ AC_SUBST(DBUS_CFLAGS) |
| 76 |
+ AC_SUBST(DBUS_LIBS) |
| 77 |
+ AC_DEFINE([HAVE_DBUS], [1], [Building with D-Bus support]) |
| 78 |
+ AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) |
| 79 |
+ else |
| 80 |
+ have_dbus=no |
| 81 |
+ fi |
| 82 |
fi |
| 83 |
|
| 84 |
AM_CONDITIONAL([HAVE_DBUS], [test x$have_dbus = xyes]) |
| 85 |
@@ -171,7 +179,8 @@ |
| 86 |
|
| 87 |
echo " |
| 88 |
Configuration: |
| 89 |
- Maintainer flags: $enable_maintainer_flags |
| 90 |
- Debug level: $enable_debug |
| 91 |
- Build documentation: $enable_gtk_doc |
| 92 |
+ Maintainer flags: $enable_maintainer_flags |
| 93 |
+ Debug level: $enable_debug |
| 94 |
+ Build documentation: $enable_gtk_doc |
| 95 |
+ D-Bus support: $have_dbus |
| 96 |
" |
Archives