[compiz] re-work keybindings_and_mate-windows-settings patch
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Sun Feb 16 17:14:27 UTC 2014
commit 6db1e94d8ffdac7d91a5463a778886aa4daff8ac
Author: raveit65 <chat-to-me at raveit.de>
Date: Sun Feb 16 18:15:01 2014 +0100
re-work keybindings_and_mate-windows-settings patch
...ybindings-and-mate-windows-settings-files.patch | 89 +++++++++++++++++---
1 files changed, 77 insertions(+), 12 deletions(-)
---
diff --git a/compiz_remove_keybindings_and_mate-windows-settings_files.patch b/compiz_new_remove-keybindings-and-mate-windows-settings-files.patch
similarity index 86%
rename from compiz_remove_keybindings_and_mate-windows-settings_files.patch
rename to compiz_new_remove-keybindings-and-mate-windows-settings-files.patch
index 495d5a5..9bcaf64 100644
--- a/compiz_remove_keybindings_and_mate-windows-settings_files.patch
+++ b/compiz_new_remove-keybindings-and-mate-windows-settings-files.patch
@@ -1,6 +1,71 @@
+diff -uprN compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac
+--- compiz-0.8.8-orig/configure.ac 2014-02-16 14:11:06.698095000 +0100
++++ compiz-0.8.8/configure.ac 2014-02-16 14:28:05.084172227 +0100
+@@ -292,13 +292,9 @@ AC_ARG_ENABLE(marco,
+ [use_marco=$enableval], [use_marco=yes])
+
+ AC_ARG_ENABLE(mate,
+- [ --disable-mate Disable mate settings module],
++ [ --disable-mate Disable mate compatibility plugin],
+ [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 +328,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 +337,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 +369,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_ENABLE(kde,
diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in
---- compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in 2013-04-18 16:34:54.580781000 +0200
-+++ compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in 1970-01-01 01:00:00.000000000 +0100
+--- compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in 2014-02-16 14:11:06.631094000 +0100
++++ compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in 2014-02-16 14:13:23.474729118 +0100
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
@@ -19,8 +84,8 @@ diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in compiz-0.8.8/
-
-</KeyListEntries>
diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-key.xml.in
---- compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in 2013-04-18 16:34:54.580781000 +0200
-+++ compiz-0.8.8/gtk/mate/50-compiz-key.xml.in 1970-01-01 01:00:00.000000000 +0100
+--- compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in 2014-02-16 14:11:06.632094000 +0100
++++ compiz-0.8.8/gtk/mate/50-compiz-key.xml.in 2014-02-16 14:13:44.649989404 +0100
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries _name="Window Management" wm_name="compiz" package="compiz">
@@ -48,8 +113,8 @@ diff -uprN compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in compiz-0.8.8/gtk/mate
- <KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
-</KeyListEntries>
diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c
---- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 1970-01-01 01:00:00.000000000 +0100
+--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2014-02-16 14:11:06.632094000 +0100
++++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2014-02-16 14:14:19.707412176 +0100
@@ -1,559 +0,0 @@
-/*
- * Copyright © 2005 Novell, Inc.
@@ -611,8 +676,8 @@ diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/m
- return compiz_window_manager_type;
-}
diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h compiz-0.8.8/gtk/mate/compiz-window-manager.h
---- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h 2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/compiz-window-manager.h 1970-01-01 01:00:00.000000000 +0100
+--- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h 2014-02-16 14:11:06.632094000 +0100
++++ compiz-0.8.8/gtk/mate/compiz-window-manager.h 2014-02-16 14:14:33.122571569 +0100
@@ -1,39 +0,0 @@
-#ifndef COMPIZ_WINDOW_MANAGER_H
-#define COMPIZ_WINDOW_MANAGER_H
@@ -654,8 +719,8 @@ diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h compiz-0.8.8/gtk/m
-
-#endif
diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in compiz-0.8.8/gtk/mate/compiz-wm.desktop.in
---- compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in 2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/compiz-wm.desktop.in 1970-01-01 01:00:00.000000000 +0100
+--- compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in 2014-02-16 14:11:06.632094000 +0100
++++ compiz-0.8.8/gtk/mate/compiz-wm.desktop.in 2014-02-16 14:14:50.331774101 +0100
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Application
@@ -675,8 +740,8 @@ diff -uprN compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in compiz-0.8.8/gtk/mate
-[Window Manager]
-SessionManaged=false
diff -uprN compiz-0.8.8-orig/gtk/mate/Makefile.am compiz-0.8.8/gtk/mate/Makefile.am
---- compiz-0.8.8-orig/gtk/mate/Makefile.am 2013-04-18 16:34:54.581781000 +0200
-+++ compiz-0.8.8/gtk/mate/Makefile.am 2013-04-18 16:42:02.755120789 +0200
+--- compiz-0.8.8-orig/gtk/mate/Makefile.am 2014-02-16 14:11:06.633094000 +0100
++++ compiz-0.8.8/gtk/mate/Makefile.am 2014-02-16 14:18:40.226337544 +0100
@@ -1,97 +1,27 @@
-moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
-
More information about the scm-commits
mailing list