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

[dmichelsen at users.sourceforge.net]

Revision: 4645
          http://gar.svn.sourceforge.net/gar/?rev=4645&view=rev
Author:   dmichelsen
Date:     2009-05-02 06:48:26 +0000 (Sat, 02 May 2009)

Log Message:
-----------
x11/libX11: Update to 1.2.1

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-stdint.diff

Modified: csw/mgar/pkg/x11/libX11/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11/libX11/trunk/Makefile	2009-05-01 22:53:40 UTC (rev 4644)
+++ csw/mgar/pkg/x11/libX11/trunk/Makefile	2009-05-02 06:48:26 UTC (rev 4645)
@@ -1,5 +1,5 @@
 GARNAME = libX11
-GARVERSION = 1.2
+GARVERSION = 1.2.1
 CATEGORIES = x11
 
 DESCRIPTION = X11 client-side library
@@ -11,11 +11,12 @@
 
 MASTER_SITES =http://xorg.freedesktop.org/releases/individual/lib/
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = patch-stdint.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PREREQUSITE_PKGS = CSWxextproto CSWxtrans CSWkbproto CSWinputproto
+PREREQUISITE_PKGS = CSWxextproto CSWxtrans CSWkbproto CSWinputproto
 
 PACKAGES = CSWlibx11 CSWlibx11devel
 
@@ -34,5 +35,7 @@
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 
+EXTRA_CFLAGS = -D__solaris__
+
 include gar/category.mk
 

Modified: csw/mgar/pkg/x11/libX11/trunk/checksums
===================================================================
--- csw/mgar/pkg/x11/libX11/trunk/checksums	2009-05-01 22:53:40 UTC (rev 4644)
+++ csw/mgar/pkg/x11/libX11/trunk/checksums	2009-05-02 06:48:26 UTC (rev 4645)
@@ -1 +1,2 @@
-a8e045794665c9fb7486c0faa21e3211  download/libX11-1.2.tar.gz
+858e013fd4c37689a2a8d86c8765dab0  download/libX11-1.2.1.tar.gz
+667f63d38722e29d6fd36b6648bbb757  download/patch-stdint.diff

Added: csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff
===================================================================
--- csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff	                        (rev 0)
+++ csw/mgar/pkg/x11/libX11/trunk/files/patch-stdint.diff	2009-05-02 06:48:26 UTC (rev 4645)
@@ -0,0 +1,30 @@
+diff -Naur libX11-1.2.1.orig/src/Xxcbint.h libX11-1.2.1.patched/src/Xxcbint.h
+--- libX11-1.2.1.orig/src/Xxcbint.h	2008-11-19 07:42:01.000000000 +0100
++++ libX11-1.2.1.patched/src/Xxcbint.h	2009-05-02 08:10:56.519976514 +0200
+@@ -5,7 +5,11 @@
+ #define XXCBINT_H
+ 
+ #include <assert.h>
++#if defined(__solaris__)
++#include <inttypes.h>
++#else
+ #include <stdint.h>
++#endif
+ #include <X11/Xlibint.h>
+ #include <X11/Xlib-xcb.h>
+ #include "locking.h"
+diff -Naur libX11-1.2.1.orig/src/xcb_io.c libX11-1.2.1.patched/src/xcb_io.c
+--- libX11-1.2.1.orig/src/xcb_io.c	2009-02-24 04:29:22.000000000 +0100
++++ libX11-1.2.1.patched/src/xcb_io.c	2009-05-02 08:27:43.445731862 +0200
+@@ -9,7 +9,11 @@
+ 
+ #include <assert.h>
+ #include <inttypes.h>
++#if defined(__solaris__)
++#include <inttypes.h>
++#else
+ #include <stdint.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 


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