[SM-Commit] GIT changes to master xorg-modular grimoire by Eric Sandall (c7aadc67b1e4f59af4f2e45e6d23e3d6d8a14c29)

Eric Sandall scm at mail.sourcemage.org
Mon Mar 5 11:37:41 EST 2007


GIT changes to master xorg-modular grimoire by Eric Sandall <sandalle at sourcemage.org>:

 xorg-lib/libxrandr/DETAILS                                    |    3 
 xorg-lib/libxrandr/HISTORY                                    |    6 +
 xorg-lib/libxrandr/PRE_BUILD                                  |    3 
 xorg-lib/libxrandr/libXrandr-1.2.0-delete-keyword-usage.patch |   34 ++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit c7aadc67b1e4f59af4f2e45e6d23e3d6d8a14c29
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libxrandr installs a header file with invalid usage of a C++ keyword as a variable
    See https://bugs.freedesktop.org/show_bug.cgi?id=10046

diff --git a/xorg-lib/libxrandr/DETAILS b/xorg-lib/libxrandr/DETAILS
index f85f858..5fd2a26 100755
--- a/xorg-lib/libxrandr/DETAILS
+++ b/xorg-lib/libxrandr/DETAILS
@@ -6,9 +6,10 @@
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
      SOURCE_HASH=sha512:9fb5577bf6cb88ebf38e3b1efbf3ff1c5237fe0207a577c70b075a7c20d1af9ffc89c9a66be29abc45638fd13d28003dff257b42073fa210ecb2a5812b839943
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+      PATCHLEVEL=1
+      LICENSE[0]=XCL
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
-      LICENSE[0]=XCL
            SHORT="Module libxrandr for xorg"
 cat << EOF
 The XOrg Foundation, (a.k.a. X.org) has changed to an Open Source model to
diff --git a/xorg-lib/libxrandr/HISTORY b/xorg-lib/libxrandr/HISTORY
index 4d00c6e..abc44f0 100644
--- a/xorg-lib/libxrandr/HISTORY
+++ b/xorg-lib/libxrandr/HISTORY
@@ -1,3 +1,9 @@
+2007-03-05 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Increment PATCHLEVEL to 1
+	* PRE_BUILD: Apply libXrandr-1.2.0-delete-keyword-usage.patch
+	* libXrandr-1.2.0-delete-keyword-usage.patch: Fix invalid usage of
+	  C++ keyword, see https://bugs.freedesktop.org/show_bug.cgi?id=10046
+
 2007-02-21 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: update to 1.2.0
 
diff --git a/xorg-lib/libxrandr/PRE_BUILD b/xorg-lib/libxrandr/PRE_BUILD
new file mode 100755
index 0000000..66ed5a1
--- /dev/null
+++ b/xorg-lib/libxrandr/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build                                                            &&
+cd  $SOURCE_DIRECTORY                                                        &&
+patch  -p1  <  $SCRIPT_DIRECTORY/libXrandr-1.2.0-delete-keyword-usage.patch
diff --git a/xorg-lib/libxrandr/libXrandr-1.2.0-delete-keyword-usage.patch b/xorg-lib/libxrandr/libXrandr-1.2.0-delete-keyword-usage.patch
new file mode 100644
index 0000000..c136220
--- /dev/null
+++ b/xorg-lib/libxrandr/libXrandr-1.2.0-delete-keyword-usage.patch
@@ -0,0 +1,34 @@
+diff -Nur libXrandr-1.2.0/include/X11/extensions/Xrandr.h libXrandr-1.2.0-fix/include/X11/extensions/Xrandr.h
+--- libXrandr-1.2.0/include/X11/extensions/Xrandr.h	2006-12-13 04:24:25.000000000 -0500
++++ libXrandr-1.2.0-fix/include/X11/extensions/Xrandr.h	2007-02-20 15:24:11.000000000 -0500
+@@ -296,7 +296,7 @@
+ int
+ XRRGetOutputProperty (Display *dpy, RROutput output,
+ 		      Atom property, long offset, long length,
+-		      Bool delete, Bool pending, Atom req_type, 
++		      Bool del, Bool pending, Atom req_type, 
+ 		      Atom *actual_type, int *actual_format,
+ 		      unsigned long *nitems, unsigned long *bytes_after,
+ 		      unsigned char **prop);
+diff -Nur libXrandr-1.2.0/src/XrrProperty.c libXrandr-1.2.0-fix/src/XrrProperty.c
+--- libXrandr-1.2.0/src/XrrProperty.c	2007-01-31 17:23:05.000000000 -0500
++++ libXrandr-1.2.0-fix/src/XrrProperty.c	2007-02-20 15:23:41.000000000 -0500
+@@ -250,7 +250,7 @@
+ int
+ XRRGetOutputProperty (Display *dpy, RROutput output,
+ 		      Atom property, long offset, long length,
+-		      Bool delete, Bool pending, Atom req_type, 
++		      Bool del, Bool pending, Atom req_type, 
+ 		      Atom *actual_type, int *actual_format,
+ 		      unsigned long *nitems, unsigned long *bytes_after,
+ 		      unsigned char **prop)
+@@ -273,7 +273,7 @@
+     req->type = req_type;
+     req->longOffset = offset;
+     req->longLength = length;
+-    req->delete = delete;
++    req->delete = del;
+     req->pending = pending;
+ 
+     if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
+



More information about the SM-Commit mailing list