[marco] 02/03: debian/patches: Drop patches shipped with this upstream release.
Mike Gabriel
sunweaver at debian.org
Mon Mar 9 12:54:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to annotated tag debian/1.8.3+dfsg1-1
in repository marco.
commit 1b625fe463e421941acb155a2b3a939555b0fc07
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Mar 9 13:53:07 2015 +0100
debian/patches: Drop patches shipped with this upstream release.
Drop 0001_use-zenity-instead-of-mate-dialogs.patch.
Drop 0002_update-keybindings-files-with-new-name.patch.
Drop 0003_no-shadows-to-ARGB-windows.patch.
Drop 0005_fix-resizing-csd-windows.patch.
---
.../0001_use-zenity-instead-of-mate-dialogs.patch | 34 ------------
...02_update-keybindings-files-with-new-name.patch | 38 --------------
.../patches/0003_no-shadows-to-ARGB-windows.patch | 26 ---------
debian/patches/0005_fix-resizing-csd-windows.patch | 61 ----------------------
debian/patches/series | 4 --
5 files changed, 163 deletions(-)
diff --git a/debian/patches/0001_use-zenity-instead-of-mate-dialogs.patch b/debian/patches/0001_use-zenity-instead-of-mate-dialogs.patch
deleted file mode 100644
index 91cd40b..0000000
--- a/debian/patches/0001_use-zenity-instead-of-mate-dialogs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Use zenity instead of mate-dialogs
-Author: Stefano Karapetsas <stefano at karapetsas.com>
-Origin: vendor, http://git.mate-desktop.org/marco/patch/?id=22cec78be5c7a3887e695e9a787fc462102e0509
----
-diff --git a/configure.ac b/configure.ac
-index 938cf13..76fe288 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -489,9 +489,9 @@ fi
-
- AC_SUBST(GDK_PIXBUF_CSOURCE)
-
--AC_PATH_PROG(MATEDIALOG, matedialog, no)
--if test x"$MATEDIALOG" = xno; then
-- AC_MSG_ERROR([matedialog not found in your path - needed for dialogs])
-+AC_PATH_PROG(ZENITY, zenity, no)
-+if test x"$ZENITY" = xno; then
-+ AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
- fi
-
- AC_ARG_ENABLE(debug,
-diff --git a/src/core/util.c b/src/core/util.c
-index 9b29d2d..ac72100 100644
---- a/src/core/util.c
-+++ b/src/core/util.c
-@@ -559,7 +559,7 @@ meta_show_dialog (const char *type,
- g_slist_length (columns)*2 +
- g_slist_length (entries)));
-
-- argvl[i++] = "matedialog";
-+ argvl[i++] = "zenity";
- argvl[i++] = type;
- argvl[i++] = "--screen";
- argvl[i++] = screen_number_text;
diff --git a/debian/patches/0002_update-keybindings-files-with-new-name.patch b/debian/patches/0002_update-keybindings-files-with-new-name.patch
deleted file mode 100644
index b158918..0000000
--- a/debian/patches/0002_update-keybindings-files-with-new-name.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c2cbcaa90d88d3d74dc7b79cae17964f4243a51d Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano at karapetsas.com>
-Date: Thu, 2 Oct 2014 14:51:29 +0200
-Subject: [PATCH] Update keybindings files with new name
-
----
- src/50-marco-desktop-key.xml.in | 2 +-
- src/50-marco-global-key.xml.in | 2 +-
- src/50-marco-window-key.xml.in | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/50-marco-desktop-key.xml.in
-+++ b/src/50-marco-desktop-key.xml.in
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8" ?>
--<KeyListEntries _name="Desktop" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
-+<KeyListEntries _name="Desktop" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
-
- <KeyListEntry name="panel-run-dialog" _description="Show the panel's "Run Application" dialog box" />
-
---- a/src/50-marco-global-key.xml.in
-+++ b/src/50-marco-global-key.xml.in
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8" ?>
--<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.global-keybindings">
-+<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.global-keybindings">
-
- <KeyListEntry name="switch-windows" _description="Move between windows, using a popup window" />
-
---- a/src/50-marco-window-key.xml.in
-+++ b/src/50-marco-window-key.xml.in
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8" ?>
--<KeyListEntries _name="Window Management" wm_name="Marco" package="marco" schema="org.mate.Marco.window-keybindings">
-+<KeyListEntries _name="Window Management" wm_name="Metacity (Marco)" package="marco" schema="org.mate.Marco.window-keybindings">
-
- <KeyListEntry
- name="activate-window-menu"
diff --git a/debian/patches/0003_no-shadows-to-ARGB-windows.patch b/debian/patches/0003_no-shadows-to-ARGB-windows.patch
deleted file mode 100644
index 55f1987..0000000
--- a/debian/patches/0003_no-shadows-to-ARGB-windows.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a85010e3060ac3852a16afb8803102d5c1702758 Mon Sep 17 00:00:00 2001
-From: Martin Wimpress <code at flexion.org>
-Date: Tue, 21 Oct 2014 16:32:10 +0100
-Subject: [PATCH] compositor-xrender: don't add shadows to ARGB windows
-
----
- src/compositor/compositor-xrender.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
-index 6294e9d..2eff883 100644
---- a/src/compositor/compositor-xrender.c
-+++ b/src/compositor/compositor-xrender.c
-@@ -911,6 +911,12 @@ window_has_shadow (MetaCompWindow *cw)
- }
- }
-
-+ /* Do not add shadows to ARGB windows */
-+ if (cw->mode == WINDOW_ARGB) {
-+ meta_verbose ("Window has no shadow as it is ARGB\n");
-+ return FALSE;
-+ }
-+
- /* Never put a shadow around shaped windows */
- if (cw->shaped) {
- meta_verbose ("Window has no shadow as it is shaped\n");
diff --git a/debian/patches/0005_fix-resizing-csd-windows.patch b/debian/patches/0005_fix-resizing-csd-windows.patch
deleted file mode 100644
index 1e18049..0000000
--- a/debian/patches/0005_fix-resizing-csd-windows.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d4969fe7d0f80f3c5989ace682ddb50b4df26715 Mon Sep 17 00:00:00 2001
-From: monsta <monsta at inbox.ru>
-Date: Fri, 24 Oct 2014 15:19:23 +0400
-Subject: [PATCH] Fix the resizing of CSD windows
-
----
- src/ui/frames.c | 33 ++++++++++-----------------------
- 1 file changed, 10 insertions(+), 23 deletions(-)
-
-diff --git a/src/ui/frames.c b/src/ui/frames.c
-index 5c19bd4..2f0f433 100644
---- a/src/ui/frames.c
-+++ b/src/ui/frames.c
-@@ -1630,7 +1630,6 @@ meta_frames_button_press_event (GtkWidget *widget,
- control == META_FRAME_CONTROL_RESIZE_W))
- {
- MetaGrabOp op;
-- gboolean titlebar_is_onscreen;
-
- op = META_GRAB_OP_NONE;
-
-@@ -1665,28 +1664,16 @@ meta_frames_button_press_event (GtkWidget *widget,
- break;
- }
-
-- meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow,
-- META_CORE_IS_TITLEBAR_ONSCREEN, &titlebar_is_onscreen,
-- META_CORE_GET_END);
--
-- if (!titlebar_is_onscreen)
-- meta_core_show_window_menu (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-- frame->xwindow,
-- event->x_root,
-- event->y_root,
-- event->button,
-- event->time);
-- else
-- meta_core_begin_grab_op (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-- frame->xwindow,
-- op,
-- TRUE,
-- TRUE,
-- event->button,
-- 0,
-- event->time,
-- event->x_root,
-- event->y_root);
-+ meta_core_begin_grab_op (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+ frame->xwindow,
-+ op,
-+ TRUE,
-+ TRUE,
-+ event->button,
-+ 0,
-+ event->time,
-+ event->x_root,
-+ event->y_root);
- }
- else if (control == META_FRAME_CONTROL_TITLE &&
- event->button == 1)
-
diff --git a/debian/patches/series b/debian/patches/series
index 41733c7..f943b3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
-0001_use-zenity-instead-of-mate-dialogs.patch
-0002_update-keybindings-files-with-new-name.patch
-0003_no-shadows-to-ARGB-windows.patch
0004_dont-switch-workspace-when-switching-to-sticky-window.patch
-0005_fix-resizing-csd-windows.patch
0006_correct-name-for-missing-icon.patch
0007_correct-name-for-missing-icon-in-preview-widget.patch
2001_omit-gfdl-licensed-theme-documentation.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/marco.git
More information about the pkg-mate-commits
mailing list