[csw-devel] SF.net SVN: gar:[4684] csw/mgar/pkg/x11/libX11/trunk

[dmichelsen at users.sourceforge.net]

Revision: 4684
          http://gar.svn.sourceforge.net/gar/?rev=4684&view=rev
Author:   dmichelsen
Date:     2009-05-05 13:24:11 +0000 (Tue, 05 May 2009)

Log Message:
-----------
x11/libx11: Add header fix for pango

Modified Paths:
--------------
    csw/mgar/pkg/x11/libX11/trunk/Makefile
    csw/mgar/pkg/x11/libX11/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff

Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11/libX11/trunk/Makefile	2009-05-05 13:22:27 UTC (rev 4683)
+++ csw/mgar/pkg/x11/libX11/trunk/Makefile	2009-05-05 13:24:11 UTC (rev 4684)
@@ -12,6 +12,8 @@
 MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = patch-stdint.diff
+# Add workaround for http://bugs.sourcemage.org/show_bug.cgi?id=13476
+PATCHFILES += patch-xlib-sentinel.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/x11/libX11/trunk/checksums
===================================================================
--- csw/mgar/pkg/x11/libX11/trunk/checksums	2009-05-05 13:22:27 UTC (rev 4683)
+++ csw/mgar/pkg/x11/libX11/trunk/checksums	2009-05-05 13:24:11 UTC (rev 4684)
@@ -1,2 +1,3 @@
 858e013fd4c37689a2a8d86c8765dab0  download/libX11-1.2.1.tar.gz
 667f63d38722e29d6fd36b6648bbb757  download/patch-stdint.diff
+918353b72ffab3f2cff4a8bcc65e9376  download/patch-xlib-sentinel.diff

Added: csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff
===================================================================
--- csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff	                        (rev 0)
+++ csw/mgar/pkg/x11/libX11/trunk/files/patch-xlib-sentinel.diff	2009-05-05 13:24:11 UTC (rev 4684)
@@ -0,0 +1,18 @@
+diff -Naur libX11-1.2.1.orig/include/X11/Xlib.h libX11-1.2.1.patched/include/X11/Xlib.h
+--- libX11-1.2.1.orig/include/X11/Xlib.h	2008-10-07 19:18:17.000000000 +0200
++++ libX11-1.2.1.patched/include/X11/Xlib.h	2009-05-05 13:49:27.444486000 +0200
+@@ -38,6 +38,14 @@
+ 
+ #define XlibSpecificationRelease 6
+ 
++#if defined(__GNUC__) && (__GNUC__ >= 4)
++# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
++# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
++#else
++# define _X_SENTINEL(x)
++# define _X_ATTRIBUTE_PRINTF(x,y)
++#endif /* GNUC >= 4 */
++
+ #ifdef USG
+ #ifndef __TYPES__
+ #include <sys/types.h>			/* forgot to protect it... */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.