[SM-Commit] GIT changes to master xorg-modular grimoire by Ladislav Hagara (dec821ab80f26eca4e41af04a5d1eadf141fc696)

Ladislav Hagara scm at sourcemage.org
Fri Jun 15 04:17:54 EDT 2007


GIT changes to master xorg-modular grimoire by Ladislav Hagara <ladislav.hagara at unob.cz>:

 dev/null                                           |binary
 xorg-lib/libx11/DETAILS                            |    4 
 xorg-lib/libx11/HISTORY                            |    4 
 xorg-lib/libx11/PRE_BUILD                          |    3 
 xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff  |   87 ---------------------
 xorg-lib/libxtst/DETAILS                           |   13 +--
 xorg-lib/libxtst/HISTORY                           |    4 
 xorg-lib/libxtst/libXtst-X11R7.0-1.0.1.tar.bz2.sig |    0 
 8 files changed, 16 insertions(+), 99 deletions(-)

New commits:
commit dec821ab80f26eca4e41af04a5d1eadf141fc696
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    libxtst 1.0.2

commit 407d901af88f273b91b628b8dce4ce04e13c6cc4
Author: Ladislav Hagara <ladislav.hagara at unob.cz>
Commit: Ladislav Hagara <ladislav.hagara at unob.cz>

    libx11 1.1.2

diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS
index 176980f..a8db35c 100755
--- a/xorg-lib/libx11/DETAILS
+++ b/xorg-lib/libx11/DETAILS
@@ -1,10 +1,10 @@
            SPELL=libx11
              PKG=libX11
-         VERSION=1.1.1
+         VERSION=1.1.2
         XORG_VER=X11R7.0
           SOURCE=${PKG}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-     SOURCE_HASH=sha512:dd12245ce57ac0648b41dba9d8462b0a031675c243a7ffb965ed06fa20647f4b98ad8d8355571c23e32a9957566e921c4ffaafd534fa256713c4065656d1c40a
+     SOURCE_HASH=sha512:a10f28a59f9436703072c1dd24de5d1b418f46e5c344751641dfe04f1dd5539fcfbce78f83c01eae9b86606e60814d0513140fdefa44cb81c46c25c82a37488a
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index cf72336..95d62cf 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,7 @@
+2007-06-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.1.2
+	* PRE_BUILD, xorg-libX11-1.1.1-xinitimage.diff: removed patch
+
 2007-04-24 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* xorg-libX11-1.1.1-xinitimage.diff: added security
 	* PRE_BUILD: security patch apply
diff --git a/xorg-lib/libx11/PRE_BUILD b/xorg-lib/libx11/PRE_BUILD
deleted file mode 100755
index dc7790a..0000000
--- a/xorg-lib/libx11/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build      &&
-cd $SOURCE_DIRECTORY   &&
-patch -p1 < $SPELL_DIRECTORY/xorg-libX11-1.1.1-xinitimage.diff
diff --git a/xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff b/xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff
deleted file mode 100644
index 2ba968d..0000000
--- a/xorg-lib/libx11/xorg-libX11-1.1.1-xinitimage.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/src/ImUtil.c b/src/ImUtil.c
-index 83fd030..9e667bb 100644
---- a/src/ImUtil.c
-+++ b/src/ImUtil.c
-@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth
- {
- 	register XImage *image;
- 	int bits_per_pixel = 1;
-+	int min_bytes_per_line;
- 
- 	if (depth == 0 || depth > 32 ||
- 	    (format != XYBitmap && format != XYPixmap && format != ZPixmap) ||
- 	    (format == XYBitmap && depth != 1) ||
- 	    (xpad != 8 && xpad != 16 && xpad != 32) ||
--	    offset < 0 || image_bytes_per_line < 0)
-+	    offset < 0)
- 	    return (XImage *) NULL;
- 	if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL)
- 	    return (XImage *) NULL;
-@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth
- 	/*
- 	 * compute per line accelerator.
- 	 */
--	if (image_bytes_per_line == 0)
- 	{
- 	if (format == ZPixmap)
--	    image->bytes_per_line = 
-+	    min_bytes_per_line = 
- 	       ROUNDUP((bits_per_pixel * width), image->bitmap_pad);
- 	else
--	    image->bytes_per_line =
-+	    min_bytes_per_line =
- 	        ROUNDUP((width + offset), image->bitmap_pad);
- 	}
--	else image->bytes_per_line = image_bytes_per_line;
-+	if (image_bytes_per_line == 0) {
-+	    image->bytes_per_line = min_bytes_per_line;
-+	} else if (image_bytes_per_line < min_bytes_per_line) {
-+	    return 0;
-+	} else {
-+	    image->bytes_per_line = image_bytes_per_line;
-+	}
- 
- 	image->bits_per_pixel = bits_per_pixel;
- 	image->obdata = NULL;
-@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth
- Status XInitImage (image)
-     XImage *image;
- {
-+	int min_bytes_per_line;
-+
- 	if (image->depth == 0 || image->depth > 32 ||
-+	    image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
-+	    image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
- 	    (image->format != XYBitmap &&
- 	     image->format != XYPixmap &&
- 	     image->format != ZPixmap) ||
-@@ -392,21 +402,24 @@ Status XInitImage (image)
- 	    (image->bitmap_pad != 8 &&
- 	     image->bitmap_pad != 16 &&
- 	     image->bitmap_pad != 32) ||
--	    image->xoffset < 0 || image->bytes_per_line < 0)
-+	    image->xoffset < 0)
- 	    return 0;
- 
- 	/*
- 	 * compute per line accelerator.
- 	 */
--	if (image->bytes_per_line == 0)
--	{
- 	if (image->format == ZPixmap)
--	    image->bytes_per_line = 
-+	    min_bytes_per_line = 
- 	       ROUNDUP((image->bits_per_pixel * image->width),
- 		       image->bitmap_pad);
- 	else
--	    image->bytes_per_line =
-+	    min_bytes_per_line =
- 	        ROUNDUP((image->width + image->xoffset), image->bitmap_pad);
-+
-+	if (image->bytes_per_line == 0) {
-+	    image->bytes_per_line = min_bytes_per_line;
-+	} else if (image->bytes_per_line < min_bytes_per_line) {
-+	    return 0;
- 	}
- 
- 	_XInitImageFuncPtrs (image);
diff --git a/xorg-lib/libxtst/DETAILS b/xorg-lib/libxtst/DETAILS
index 7f86217..2e9a974 100755
--- a/xorg-lib/libxtst/DETAILS
+++ b/xorg-lib/libxtst/DETAILS
@@ -1,16 +1,15 @@
            SPELL=libxtst
              PKG=libXtst
-         VERSION=1.0.1
+         VERSION=1.0.2
         XORG_VER=X11R7.0
-          SOURCE=${PKG}-${XORG_VER}-${VERSION}.tar.bz2
-   SOURCE_URL[0]=http://xorg.freedesktop.org/releases/${XORG_VER}/src/lib/${SOURCE}
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${XORG_VER}-${VERSION}
+          SOURCE=${PKG}-${VERSION}.tar.bz2
+   SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
+     SOURCE_HASH=sha512:71d1e591e7d54e85c59a36c22a966fe0dda69d8aae349f98d8d57cd7c71a17902e6a37a7027b692501350bde190f1c59a5ee5df13061a540b017280b56dff8b7
+#      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
-         UPDATED=20051125
       LICENSE[0]=XCL
-       BUILD_API=2
            SHORT="Module libxtst 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/libxtst/HISTORY b/xorg-lib/libxtst/HISTORY
index b42b018..03078bf 100644
--- a/xorg-lib/libxtst/HISTORY
+++ b/xorg-lib/libxtst/HISTORY
@@ -1,3 +1,7 @@
+2007-06-15 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.0.2, removed BUILD_API=2 and UPDATED
+	  updated SOURCE, SOURCE_URL and SOURCE_DIRECTORY
+
 2005-12-22 Robin Cook <rcook at wyrms.net>
 	* DETAILS: Updated VERSION to 1.0.1
 	  added XORG_VER
diff --git a/xorg-lib/libxtst/libXtst-X11R7.0-1.0.1.tar.bz2.sig b/xorg-lib/libxtst/libXtst-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100644
index 389e6cd..0000000
Binary files a/xorg-lib/libxtst/libXtst-X11R7.0-1.0.1.tar.bz2.sig and /dev/null differ



More information about the SM-Commit mailing list