1 |
tampakrap 10/03/31 16:40:34 |
2 |
|
3 |
Added: libdbusmenu-0.2.8-2-optional-tests.patch |
4 |
libdbusmenu-0.2.8-1-optional-gtk.patch |
5 |
libdbusmenu-0.2.8-no-gobject-introspection.patch |
6 |
Log: |
7 |
Initial commit, moved from kde overlay, thanks to Dennis Schridde |
8 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-2-optional-tests.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-2-optional-tests.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-2-optional-tests.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: libdbusmenu-0.2.8-2-optional-tests.patch |
17 |
=================================================================== |
18 |
--- configure.ac.orig 2010-03-31 12:56:17.483842274 +0200 |
19 |
+++ configure.ac 2010-03-31 13:08:36.291843605 +0200 |
20 |
@@ -56,7 +56,14 @@ |
21 |
|
22 |
JSON_GLIB_REQUIRED_VERSION=0.6.0 |
23 |
|
24 |
+AC_ARG_ENABLE([tests], |
25 |
+ AC_HELP_STRING([--disable-tests], [Disable tests]), |
26 |
+ [enable_tests=$enableval], enable_tests=auto) |
27 |
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) |
28 |
+ |
29 |
+if test "x$enable_tests" != "xno"; then |
30 |
PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION) |
31 |
+fi |
32 |
|
33 |
AC_SUBST(DBUSMENUTESTS_CFLAGS) |
34 |
AC_SUBST(DBUSMENUTESTS_LIBS) |
35 |
--- Makefile.am.orig 2010-03-31 13:01:21.871844609 +0200 |
36 |
+++ Makefile.am 2010-03-31 13:33:03.953843279 +0200 |
37 |
@@ -7,7 +7,10 @@ |
38 |
libdbusmenu-glib \ |
39 |
tools \ |
40 |
- tests \ |
41 |
po |
42 |
|
43 |
+if WANT_TESTS |
44 |
+SUBDIRS += tests |
45 |
+endif |
46 |
+ |
47 |
DISTCHECK_CONFIGURE_FLAGS = --enable-introspection |
48 |
|
49 |
--- tools/Makefile.am.orig 2010-03-31 13:44:57.924843955 +0200 |
50 |
+++ tools/Makefile.am 2010-03-31 13:47:19.073593832 +0200 |
51 |
@@ -1,5 +1,9 @@ |
52 |
|
53 |
-SUBDIRS = testapp |
54 |
+SUBDIRS = |
55 |
+ |
56 |
+if WANT_TESTS |
57 |
+SUBDIRS += testapp |
58 |
+endif |
59 |
|
60 |
libexec_PROGRAMS = dbusmenu-dumper |
61 |
|
62 |
|
63 |
|
64 |
|
65 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-1-optional-gtk.patch |
66 |
|
67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-1-optional-gtk.patch?rev=1.1&view=markup |
68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-1-optional-gtk.patch?rev=1.1&content-type=text/plain |
69 |
|
70 |
Index: libdbusmenu-0.2.8-1-optional-gtk.patch |
71 |
=================================================================== |
72 |
--- configure.ac.orig 2010-03-31 12:56:17.483842274 +0200 |
73 |
+++ configure.ac 2010-03-31 12:57:25.783592956 +0200 |
74 |
@@ -42,10 +42,17 @@ |
75 |
|
76 |
GTK_REQUIRED_VERSION=2.16 |
77 |
|
78 |
+AC_ARG_ENABLE([gtk], |
79 |
+ AC_HELP_STRING([--disable-gtk], [Disable libindicate-gtk library]), |
80 |
+ [enable_gtk=$enableval], enable_gtk=auto) |
81 |
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"]) |
82 |
+ |
83 |
+if test "x$enable_gtk" != "xno"; then |
84 |
PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION |
85 |
glib-2.0 >= $GLIB_REQUIRED_VERSION |
86 |
dbus-glib-1 >= $DBUS_REQUIRED_VERSION |
87 |
libxml-2.0 >= $XML_REQUIRED_VERSION) |
88 |
+fi |
89 |
|
90 |
AC_SUBST(DBUSMENUGTK_CFLAGS) |
91 |
AC_SUBST(DBUSMENUGTK_LIBS) |
92 |
--- Makefile.am.orig 2010-03-31 13:01:21.871844609 +0200 |
93 |
+++ Makefile.am 2010-03-31 13:19:34.896594837 +0200 |
94 |
@@ -5,10 +5,13 @@ |
95 |
|
96 |
SUBDIRS = \ |
97 |
libdbusmenu-glib \ |
98 |
- libdbusmenu-gtk \ |
99 |
tools \ |
100 |
tests \ |
101 |
po |
102 |
|
103 |
+if WANT_LIBDBUSMENUGTK |
104 |
+SUBDIRS += libdbusmenu-gtk |
105 |
+endif |
106 |
+ |
107 |
DISTCHECK_CONFIGURE_FLAGS = --enable-introspection |
108 |
|
109 |
|
110 |
|
111 |
|
112 |
1.1 dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-no-gobject-introspection.patch |
113 |
|
114 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-no-gobject-introspection.patch?rev=1.1&view=markup |
115 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libdbusmenu/files/libdbusmenu-0.2.8-no-gobject-introspection.patch?rev=1.1&content-type=text/plain |
116 |
|
117 |
Index: libdbusmenu-0.2.8-no-gobject-introspection.patch |
118 |
=================================================================== |
119 |
--- configure.ac.orig 2010-03-31 12:42:16.497596552 +0200 |
120 |
+++ configure.ac 2010-03-31 12:42:47.001595062 +0200 |
121 |
@@ -74,6 +74,6 @@ |
122 |
########################### |
123 |
|
124 |
-GOBJECT_INTROSPECTION_CHECK([0.6.7]) |
125 |
+AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) |
126 |
|
127 |
########################### |
128 |
# GTK Doc |