[compiz] re-work remove_mateconf_dbus_glib patch
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Sun Feb 16 17:17:48 UTC 2014
commit 089cd0aea0eb944e8d334432d971aa54a15307e7
Author: raveit65 <chat-to-me at raveit.de>
Date: Sun Feb 16 18:18:25 2014 +0100
re-work remove_mateconf_dbus_glib patch
...h => compiz_new_remove_mateconf_dbus_glib.patch | 58 --------------------
1 files changed, 0 insertions(+), 58 deletions(-)
---
diff --git a/compiz_remove_mateconf_dbus_glib.patch b/compiz_new_remove_mateconf_dbus_glib.patch
similarity index 98%
rename from compiz_remove_mateconf_dbus_glib.patch
rename to compiz_new_remove_mateconf_dbus_glib.patch
index 77a4897..a1cf617 100644
--- a/compiz_remove_mateconf_dbus_glib.patch
+++ b/compiz_new_remove_mateconf_dbus_glib.patch
@@ -79,64 +79,6 @@ diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
AC_ARG_ENABLE(inotify,
[ --disable-inotify Disable inotify plugin],
[use_inotify=$enableval], [use_inotify=yes])
-@@ -295,10 +234,6 @@ AC_ARG_ENABLE(mate,
- [ --disable-mate Disable mate settings module],
- [use_mate=$enableval], [use_mate=yes])
-
--AC_ARG_ENABLE(mate-keybindings,
-- [ --disable-mate-keybindings Disable mate keybindings],
-- [use_mate_keybindings=$enableval], [use_mate_keybindings=yes])
--
- if test "x$use_gtk" = "xyes"; then
- PKG_CHECK_MODULES(GTK_WINDOW_DECORATOR,
- xrender >= 0.8.4 \
-@@ -332,21 +267,6 @@ if test "x$use_gtk" = "xyes"; then
- PKG_CHECK_EXISTS(libmarco-private >= 2.23.2,
- [have_marco_2_23_2=yes], [have_marco_2_23_2=no])
- fi
--
-- if test "x$use_mate" = "xyes"; then
-- PKG_CHECK_MODULES(MATE_WINDOW_SETTINGS,
-- mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0,
-- [use_mate=yes], [use_mate=no])
-- fi
--
-- if test "x$use_mate_keybindings" = "xyes"; then
-- PKG_CHECK_MODULES(MATE_KEY_BINDINGS,
-- mate-keybindings,
-- [use_mate_keybindings=yes], [use_mate_keybindings=no])
-- fi
--
-- windowsettingsdatadir=`pkg-config --variable=prefix mate-window-settings-2.0`/share
-- windowsettingslibdir=`pkg-config --variable=libdir mate-window-settings-2.0` keybindingsdir=`pkg-config --variable=keysdir mate-keybindings`
- else
- use_marco="no"
- use_mate="no"
-@@ -356,10 +276,6 @@ else
- use_mate="no"
- fi
-
--AC_SUBST(windowsettingsdatadir)
--AC_SUBST(windowsettingslibdir)
--AC_SUBST(keybindingsdir)
--
- AM_CONDITIONAL(USE_GTK, test "x$use_gtk" = "xyes")
- if test "$use_gtk" = yes; then
- AC_DEFINE(USE_GTK, 1, [Build gtk window decorator])
-@@ -392,12 +308,7 @@ fi
-
- AM_CONDITIONAL(USE_MATE, test "x$use_mate" = "xyes")
- if test "$use_mate" = yes; then
-- AC_DEFINE(USE_MATE, 1, [Build mate settings module])
--fi
--
--AM_CONDITIONAL(USE_MATE_KEYBINDINGS, test "x$use_mate_keybindings" = "xyes")
--if test "$use_mate_keybindings" = yes; then
-- AC_DEFINE(USE_MATE_KEYBINDINGS, 1, [Install custom keybindings])
-+ AC_DEFINE(USE_MATE, 1, [Build mate compatibility plugin])
- fi
-
- AC_ARG_WITH(max-desktops,
@@ -451,7 +362,6 @@ AC_OUTPUT([
compiz.pc
compiz-cube.pc
More information about the scm-commits
mailing list