aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-01-24 18:41:04 -0800
committerGregory M. Tuner <gmt@be-evil.net>2014-01-24 18:41:04 -0800
commita2399994d45968a06e5f94bf696e436bfc0fbbbc (patch)
treea937b108a0853bed0c35fc668a7f70cb40e54e9e /app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
parentkde-base/pykde4: use einstalldocs instead of base_src_install_docs -- the lat... (diff)
downloadgmt-a2399994d45968a06e5f94bf696e436bfc0fbbbc.tar.gz
gmt-a2399994d45968a06e5f94bf696e436bfc0fbbbc.tar.bz2
gmt-a2399994d45968a06e5f94bf696e436bfc0fbbbc.zip
app-i18n/ibus: clone upstream
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch')
-rw-r--r--app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
new file mode 100644
index 0000000..bdc1f20
--- /dev/null
+++ b/app-i18n/ibus/files/ibus-1.4.1-no-gconf.patch
@@ -0,0 +1,29 @@
+diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac
+--- ibus-1.4.1.orig/configure.ac 2012-02-05 23:04:15.000000000 +0900
++++ ibus-1.4.1/configure.ac 2012-02-06 01:20:18.303186786 +0900
+@@ -259,23 +259,8 @@
+ )
+ AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
+
+-if test x"$enable_gconf" = x"yes"; then
+- # check gconf
+- PKG_CHECK_MODULES(GCONF,
+- [gconf-2.0 >= 2.12],
+- )
+-
+- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+- if test x"$GCONFTOOL" = xno; then
+- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+- fi
+-
+- AM_GCONF_SOURCE_2
+- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
+-else
+- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+- enable_gconf="no (disabled, use --enable-gconf to enable)"
+-fi
++AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
++enable_gconf="no (disabled, use --enable-gconf to enable)"
+
+ # --enable-memconf option.
+ AC_ARG_ENABLE(memconf,