1 |
matsuu 12/02/05 16:33:17 |
2 |
|
3 |
Added: ibus-1.4.1-no-gconf.patch |
4 |
Log: |
5 |
Version bumped. |
6 |
|
7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: ibus-1.4.1-no-gconf.patch |
16 |
=================================================================== |
17 |
diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac |
18 |
--- ibus-1.4.1.orig/configure.ac 2012-02-05 23:04:15.000000000 +0900 |
19 |
+++ ibus-1.4.1/configure.ac 2012-02-06 01:20:18.303186786 +0900 |
20 |
@@ -259,23 +259,8 @@ |
21 |
) |
22 |
AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"]) |
23 |
|
24 |
-if test x"$enable_gconf" = x"yes"; then |
25 |
- # check gconf |
26 |
- PKG_CHECK_MODULES(GCONF, |
27 |
- [gconf-2.0 >= 2.12], |
28 |
- ) |
29 |
- |
30 |
- AC_PATH_PROG(GCONFTOOL, gconftool-2, no) |
31 |
- if test x"$GCONFTOOL" = xno; then |
32 |
- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) |
33 |
- fi |
34 |
- |
35 |
- AM_GCONF_SOURCE_2 |
36 |
- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2 |
37 |
-else |
38 |
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) |
39 |
- enable_gconf="no (disabled, use --enable-gconf to enable)" |
40 |
-fi |
41 |
+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) |
42 |
+enable_gconf="no (disabled, use --enable-gconf to enable)" |
43 |
|
44 |
# --enable-memconf option. |
45 |
AC_ARG_ENABLE(memconf, |