diff --git a/debian/changelog b/debian/changelog index 117ee9a..2dea7c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11-xserver-utils (7.7-1) UNRELEASED; urgency=low * New upstream releases: * xrandr 1.4.0 + - Drop upstream patches. -- Robert Hooker Wed, 15 May 2013 12:08:34 -0400 diff --git a/debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff b/debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff deleted file mode 100644 index 06f2f2c..0000000 --- a/debian/patches/03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff +++ /dev/null @@ -1,76 +0,0 @@ -From 8ca08e32ee7daae75992cbf1f554ca9a389e5420 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Wed, 29 Feb 2012 16:26:25 +1300 -Subject: [PATCH] Update keystone program to run with new nichrome bits - -Will also work with old nichrome bits. - -Signed-off-by: Keith Packard ---- - keystone.5c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/xrandr/keystone.5c b/xrandr/keystone.5c -index 228c020..c616f12 100644 ---- a/xrandr/keystone.5c -+++ b/xrandr/keystone.5c -@@ -37,7 +37,7 @@ extend namespace Nichrome { - rgba_color_t corner_color; - bool down; - bool started; -- int active; -+ int active_corner; - void(&quad_t) callback; - } quad_t; - -@@ -49,6 +49,10 @@ extend namespace Nichrome { - } - } - -+ protected void natural (cairo_t cr, &quad_t quad) { -+ rectangle (cr, 0, 0, 256, 256); -+ } -+ - void text_at (cairo_t cr, point_t p, string text) { - text_extents_t e = text_extents (cr, text); - p.x = p.x - e.width / 2 - e.x_bearing; -@@ -102,7 +106,7 @@ extend namespace Nichrome { - enum switch (event.type) { - case press: - quad.down = true; -- quad.active = nearest (&quad, event); -+ quad.active_corner = nearest (&quad, event); - break; - case release: - quad.down = false; -@@ -116,8 +120,8 @@ extend namespace Nichrome { - if (quad.down) { - motion.x = max (0, min (quad.geometry.width, motion.x)); - motion.y = max (0, min (quad.geometry.height, motion.y)); -- quad.p[quad.active].x = motion.x; -- quad.p[quad.active].y = motion.y; -+ quad.p[quad.active_corner].x = motion.x; -+ quad.p[quad.active_corner].y = motion.y; - quad.callback (&quad); - Widget::reoutline (&quad); - Widget::redraw (&quad); -@@ -149,6 +153,7 @@ extend namespace Nichrome { - quad.button = button; - quad.motion = motion; - quad.configure = configure; -+ quad.natural = natural; - quad.p = (point_t[4]) { - { x = 0, y = 0 } ... - }; -@@ -161,7 +166,7 @@ extend namespace Nichrome { - }; - quad.corner_diameter = 20; - quad.down = false; -- quad.active = -1; -+ quad.active_corner = -1; - quad.callback = callback; - quad.started = false; - } --- -1.7.10 - diff --git a/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff b/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff deleted file mode 100644 index df2af15..0000000 --- a/debian/patches/04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff +++ /dev/null @@ -1,41 +0,0 @@ -From b9d260a49961b5e311e77e8600e7e5a8f2e8d475 Mon Sep 17 00:00:00 2001 -From: Keith Packard -Date: Tue, 1 May 2012 21:53:02 -0700 -Subject: [PATCH] keystone.5c: cairo-5 box semantics changed default layout - -cairo-5c version 1.6 includes a new 2D box layout widget that -needs widget stretch defined in both dimensions to create -the desired layout. - -Signed-off-by: Keith Packard ---- - keystone.5c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/xrandr/keystone.5c b/xrandr/keystone.5c -index c616f12..4b698ee 100644 ---- a/xrandr/keystone.5c -+++ b/xrandr/keystone.5c -@@ -543,15 +543,14 @@ void main () - &box_t hbox = Box::new (Box::dir_t.horizontal, - Box::widget_item (&doit, 0), - Box::widget_item (&show, 0), -- - Box::widget_item (&quit, 0), - Box::glue_item (1)); - &box_t box = Box::new (Box::dir_t.vertical, - Box::box_item (&hbox), -- Box::widget_item (label[0], 0), -- Box::widget_item (label[1], 0), -- Box::widget_item (label[2], 0), -- Box::widget_item (&space, 0), -+ Box::widget_item (label[0], 1, 0), -+ Box::widget_item (label[1], 1, 0), -+ Box::widget_item (label[2], 1, 0), -+ Box::widget_item (&space, 1, 0), - Box::widget_item (&quad, 1)); - Nichrome::set_box (&nichrome, &box); - Nichrome::main_loop (&nichrome); --- -1.7.10 - diff --git a/debian/patches/series b/debian/patches/series index 7b620cb..3b892b3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 01_sessreg_implement_hostname_hashing.diff 02_xmodmap-include-config.h-before-system-headers.diff -03_xrandr-Update-keystone-program-to-run-with-new-nichrome.diff -04_xrandr-keystone.5c-cairo-5-box-semantics-changed-default-la.diff