From 59b0aa7a7ee327688a77dd5d01d0b2032f6535a2 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 14 Mar 2009 14:59:14 +0000 Subject: x11r7: update to 7.4 Patch by Dan Lykowski , closes #181. Minor fixups for kdrive by me. --- .../xapp_xrandr-1.2.2-clone-redef.patch | 29 ---------------------- .../xapp_xrandr-1.2.3-clone-redef.patch | 29 ++++++++++++++++++++++ package/x11r7/xapp_xrandr/xapp_xrandr.mk | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 package/x11r7/xapp_xrandr/xapp_xrandr-1.2.2-clone-redef.patch create mode 100644 package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch (limited to 'package/x11r7/xapp_xrandr') diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.2-clone-redef.patch b/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.2-clone-redef.patch deleted file mode 100644 index 6dc353466..000000000 --- a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.2-clone-redef.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/xrandr.c.orig 2008-02-02 17:09:45.000000000 -0500 -+++ b/xrandr.c 2008-02-02 17:04:51.000000000 -0500 -@@ -189,7 +189,7 @@ reflection_name (Rotation rotation) - - #if HAS_RANDR_1_2 - typedef enum _policy { -- clone, extend -+ clone1, extend - } policy_t; - - typedef enum _relation { -@@ -1602,7 +1602,7 @@ main (int argc, char **argv) - int ret = 0; - #if HAS_RANDR_1_2 - output_t *output = NULL; -- policy_t policy = clone; -+ policy_t policy = clone1; - Bool setit_1_2 = False; - Bool query_1_2 = False; - Bool modeit = False; -@@ -1863,7 +1863,7 @@ main (int argc, char **argv) - continue; - } - if (!strcmp ("--clone", argv[i])) { -- policy = clone; -+ policy = clone1; - setit_1_2 = True; - continue; - } diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch b/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch new file mode 100644 index 000000000..6dc353466 --- /dev/null +++ b/package/x11r7/xapp_xrandr/xapp_xrandr-1.2.3-clone-redef.patch @@ -0,0 +1,29 @@ +--- a/xrandr.c.orig 2008-02-02 17:09:45.000000000 -0500 ++++ b/xrandr.c 2008-02-02 17:04:51.000000000 -0500 +@@ -189,7 +189,7 @@ reflection_name (Rotation rotation) + + #if HAS_RANDR_1_2 + typedef enum _policy { +- clone, extend ++ clone1, extend + } policy_t; + + typedef enum _relation { +@@ -1602,7 +1602,7 @@ main (int argc, char **argv) + int ret = 0; + #if HAS_RANDR_1_2 + output_t *output = NULL; +- policy_t policy = clone; ++ policy_t policy = clone1; + Bool setit_1_2 = False; + Bool query_1_2 = False; + Bool modeit = False; +@@ -1863,7 +1863,7 @@ main (int argc, char **argv) + continue; + } + if (!strcmp ("--clone", argv[i])) { +- policy = clone; ++ policy = clone1; + setit_1_2 = True; + continue; + } diff --git a/package/x11r7/xapp_xrandr/xapp_xrandr.mk b/package/x11r7/xapp_xrandr/xapp_xrandr.mk index 3594e59b4..960e26f29 100644 --- a/package/x11r7/xapp_xrandr/xapp_xrandr.mk +++ b/package/x11r7/xapp_xrandr/xapp_xrandr.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XRANDR_VERSION = 1.2.2 +XAPP_XRANDR_VERSION = 1.2.3 XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2 XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XRANDR_AUTORECONF = NO -- cgit v1.2.3