Get rid of C++ symbol in Xrandr.h. (Bug #167714; Ginsu for the report, Doug

Goldstein for the patch)
Package-Manager: portage-2.1.2-r10

diff --git a/x11-libs/libXrandr/ChangeLog b/x11-libs/libXrandr/ChangeLog
index 2ebb99efbf4398e6c0540b7c1418eaf5ca105b29..6f14c5c006a5a288c647faaef49394593c373dab 100644 (file)
--- a/x11-libs/libXrandr/ChangeLog
+++ b/x11-libs/libXrandr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/libXrandr
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/ChangeLog,v 1.30 2007/02/19 22:55:08 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/ChangeLog,v 1.31 2007/02/21 00:51:35 joshuabaergen Exp $
+
+*libXrandr-1.2.0-r1 (21 Feb 2007)
+
+  21 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/libXrandr-1.2.0-delete-keyword-usage.patch,
+  -libXrandr-1.2.0.ebuild, +libXrandr-1.2.0-r1.ebuild:
+  Get rid of C++ symbol in Xrandr.h.  (Bug #167714; Ginsu for the report, Doug
+  Goldstein for the patch)
 
 *libXrandr-1.2.0 (19 Feb 2007)
 

diff --git a/x11-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
index a1d0267075290328d7401dd4d1788520cb77748b..522fbcf197f0bc1c8529e2a982de1ee84b9e723c 100644 (file)
--- a/x11-libs/libXrandr/Manifest
+++ b/x11-libs/libXrandr/Manifest
@@ -2,6 +2,10 @@ AUX drop-extra-unlockdisplay.patch 479 RMD160 4935a9f56f6fe6f616c17045fc472fadba
 MD5 31d901551e35755072841b9520283af2 files/drop-extra-unlockdisplay.patch 479
 RMD160 4935a9f56f6fe6f616c17045fc472fadba5d3d97 files/drop-extra-unlockdisplay.patch 479
 SHA256 d48044552a82912bd87441e0542a9354dfeef898db808d37a1401247b607d873 files/drop-extra-unlockdisplay.patch 479
+AUX libXrandr-1.2.0-delete-keyword-usage.patch 1507 RMD160 613a9d912d4f9801595b8c3378f7b26ffae756d4 SHA1 4ab5781cabd5c4195a5cbf1fb7c4892ef111196b SHA256 47109178a42b7c04cb64a68335a9d800778f97862eac6df5f0c16c510ac1d289
+MD5 ab832e9c297bef18f4a77f9f603f0b69 files/libXrandr-1.2.0-delete-keyword-usage.patch 1507
+RMD160 613a9d912d4f9801595b8c3378f7b26ffae756d4 files/libXrandr-1.2.0-delete-keyword-usage.patch 1507
+SHA256 47109178a42b7c04cb64a68335a9d800778f97862eac6df5f0c16c510ac1d289 files/libXrandr-1.2.0-delete-keyword-usage.patch 1507
 DIST libXrandr-1.1.1.tar.bz2 231984 RMD160 90377bb35682dd4fc0c171b92ad4fcb5efa10dfe SHA1 48fdb18667b9d9e1423a3dbb05be246fa6ec47b2 SHA256 4ffb4ca0af47eb88a1a4643acbae1c2257ce7a6b237f71e0a2ef14b81f396562
 DIST libXrandr-1.1.2.tar.bz2 235234 RMD160 0bef3ed77b1e477d8e012d87704ee253ba5ee9ec SHA1 8f328c8523f2290144d490a9f7709d14584979ce SHA256 ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50
 DIST libXrandr-1.2.0.tar.bz2 220762 RMD160 013249fc35e8a5d72a191fd9af0c6db06423880c SHA1 a32722ad9fcb6475533499b1646a125458fe142c SHA256 3ab7b69a34172993d4e6fe47f222f60000099dd1aef28c57a291fca702d35704
@@ -17,14 +21,14 @@ EBUILD libXrandr-1.1.2.ebuild 592 RMD160 87b8fd049e95403fd600aee231fd3cdbd0abbf5
 MD5 9dc5ebe3bb6443b16ceb8c5ec33550b6 libXrandr-1.1.2.ebuild 592
 RMD160 87b8fd049e95403fd600aee231fd3cdbd0abbf53 libXrandr-1.1.2.ebuild 592
 SHA256 0cb9398ae47d32ed9e752c2ee1fa69c6e624c29ef06f75a6636cb22d48c926cf libXrandr-1.1.2.ebuild 592
-EBUILD libXrandr-1.2.0.ebuild 598 RMD160 68a579c02b054295d7d83c13979ff8ba48acae4e SHA1 95e2262439acfbf1c203adf8bed020c8e16b07bd SHA256 8350705c90bdd6416cfa42da29c94103d308f8776843b16e95b5a5060c9aef5e
-MD5 f690062a4ae9d6f58654ff952aa5d6c5 libXrandr-1.2.0.ebuild 598
-RMD160 68a579c02b054295d7d83c13979ff8ba48acae4e libXrandr-1.2.0.ebuild 598
-SHA256 8350705c90bdd6416cfa42da29c94103d308f8776843b16e95b5a5060c9aef5e libXrandr-1.2.0.ebuild 598
-MISC ChangeLog 4101 RMD160 a7503d9994d3fdb103d35dda9ccc9af2a7c5072b SHA1 e0af2fd8c97a3b5affacd9cc885e6531fe980821 SHA256 ae7ad5e26950315446910483bbe435a6db7e8436f629d2441fa516d7fbaeed1a
-MD5 1665f0db83aa9aaee653c2ff6bb800e1 ChangeLog 4101
-RMD160 a7503d9994d3fdb103d35dda9ccc9af2a7c5072b ChangeLog 4101
-SHA256 ae7ad5e26950315446910483bbe435a6db7e8436f629d2441fa516d7fbaeed1a ChangeLog 4101
+EBUILD libXrandr-1.2.0-r1.ebuild 656 RMD160 611594090b888428f7f89fc72b92953ef87fd758 SHA1 1e1d2541f7568b1550fc79be21d5a6602f78a4fb SHA256 a736cb5f3f602c91a9ce125f4467bc29c41418249c95b85b9ada634a4a4e380f
+MD5 2402ca4d6d215f6778d07113daabc561 libXrandr-1.2.0-r1.ebuild 656
+RMD160 611594090b888428f7f89fc72b92953ef87fd758 libXrandr-1.2.0-r1.ebuild 656
+SHA256 a736cb5f3f602c91a9ce125f4467bc29c41418249c95b85b9ada634a4a4e380f libXrandr-1.2.0-r1.ebuild 656
+MISC ChangeLog 4408 RMD160 e516ccdb2236dfe3e20da7b1b2a6f866a45f2d31 SHA1 bf58bbbfd13042c2cf4b4bbec8f2b2c899bed46e SHA256 b56bb8b41422d9800313b7e727feb13290ad96005e1953211091ac49cff72d89
+MD5 cf4b4e639b183dd1549947bba33de357 ChangeLog 4408
+RMD160 e516ccdb2236dfe3e20da7b1b2a6f866a45f2d31 ChangeLog 4408
+SHA256 b56bb8b41422d9800313b7e727feb13290ad96005e1953211091ac49cff72d89 ChangeLog 4408
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -38,6 +42,6 @@ SHA256 85b0400b9040d825a1b395294e946e12fcac6cdb714f0e260d527727d0e26dc4 files/di
 MD5 988e53f5a338133120cb4a87d54600f9 files/digest-libXrandr-1.1.2 250
 RMD160 62b2d2741fe755cb812323554b14c5722b1757f4 files/digest-libXrandr-1.1.2 250
 SHA256 7c3cf5676402ee627f7522879155d8c1199693d742b9d85aa2053b530ff0ef4c files/digest-libXrandr-1.1.2 250
-MD5 5d5bb4bd9128d2bdc3c2124e9a4dbd89 files/digest-libXrandr-1.2.0 250
-RMD160 7d79b7e979011835e7de2d7711a2a954cd467996 files/digest-libXrandr-1.2.0 250
-SHA256 20ee80bfcd75e6b33a511ef5bac4d48581665f4eb1b8f0767aff75dfa608d8ad files/digest-libXrandr-1.2.0 250
+MD5 5d5bb4bd9128d2bdc3c2124e9a4dbd89 files/digest-libXrandr-1.2.0-r1 250
+RMD160 7d79b7e979011835e7de2d7711a2a954cd467996 files/digest-libXrandr-1.2.0-r1 250
+SHA256 20ee80bfcd75e6b33a511ef5bac4d48581665f4eb1b8f0767aff75dfa608d8ad files/digest-libXrandr-1.2.0-r1 250

diff --git a/x11-libs/libXrandr/files/digest-libXrandr-1.2.0 b/x11-libs/libXrandr/files/digest-libXrandr-1.2.0-r1
similarity index 100%
rename from x11-libs/libXrandr/files/digest-libXrandr-1.2.0
rename to x11-libs/libXrandr/files/digest-libXrandr-1.2.0-r1

diff --git a/x11-libs/libXrandr/files/libXrandr-1.2.0-delete-keyword-usage.patch b/x11-libs/libXrandr/files/libXrandr-1.2.0-delete-keyword-usage.patch
new file mode 100644 (file)
index 0000000..702b5b3
--- /dev/null
+++ b/x11-libs/libXrandr/files/libXrandr-1.2.0-delete-keyword-usage.patch
@@ -0,0 +1,33 @@
+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))

diff --git a/x11-libs/libXrandr/libXrandr-1.2.0.ebuild b/x11-libs/libXrandr/libXrandr-1.2.0-r1.ebuild
similarity index 82%
rename from x11-libs/libXrandr/libXrandr-1.2.0.ebuild
rename to x11-libs/libXrandr/libXrandr-1.2.0-r1.ebuild
index f2d786997246aedabea4ae6e4acc228e7e11483c..1c334c5f7e692275da2615135af7dfdaa2ef8278 100644 (file)
--- a/x11-libs/libXrandr/libXrandr-1.2.0.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.2.0.ebuild,v 1.1 2007/02/19 22:55:08 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.2.0-r1.ebuild,v 1.1 2007/02/21 00:51:35 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 # SNAPSHOT="yes"
@@ -18,3 +18,5 @@ RDEPEND="x11-libs/libX11
        x11-proto/xproto"
 DEPEND="${RDEPEND}
        x11-proto/renderproto"
+
+PATCHES="${FILESDIR}/${P}-delete-keyword-usage.patch"