rpms/libXext/F-11 libXext-1.0.99.1-manpage.patch, NONE, 1.1 libXext-1.0.99.1-silence-xge.patch, NONE, 1.1 libXext-1.0.99.1-xsync.patch, NONE, 1.1 libXext.spec, 1.25, 1.26
Peter Hutterer
whot at fedoraproject.org
Sun Apr 19 23:34:41 UTC 2009
- Previous message: rpms/krusader/F-11 krusader-2.0.0-gcc-4.4.patch,NONE,1.1
- Next message: rpms/squid/F-11 .cvsignore, 1.38, 1.39 sources, 1.41, 1.42 squid.spec, 1.117, 1.118 squid-3.0.STABLE13-logfile-syslog.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: whot
Update of /cvs/pkgs/rpms/libXext/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21823
Modified Files:
libXext.spec
Added Files:
libXext-1.0.99.1-manpage.patch
libXext-1.0.99.1-silence-xge.patch
libXext-1.0.99.1-xsync.patch
Log Message:
* Mon Apr 20 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.0.99.1-3
- libXext-1.0.99.1-silence-xge.patch: don't print a warning if XGE is
missing (#477677).
- libXext-1.0.99.1-manpage.patch: fix XShmCreateImage(3) argument order
- libXext-1.0.99.1-xsync.patch: allocate the right size of counters in
XSyncListSystemCounters.
libXext-1.0.99.1-manpage.patch:
--- NEW FILE libXext-1.0.99.1-manpage.patch ---
>From cad77b1d6d1a344f2cb31c16401076c003bb97dd Mon Sep 17 00:00:00 2001
From: Imranullah Syed <freakabcd at gmail.com>
Date: Thu, 19 Feb 2009 18:02:26 +1000
Subject: [PATCH 2/2] Corrected order of arguments in man page for function: XShmCreateImage
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
man/XShm.man | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/man/XShm.man b/man/XShm.man
index 2e37997..64f292c 100644
--- a/man/XShm.man
+++ b/man/XShm.man
@@ -90,10 +90,11 @@ Status XShmDetach(
XImage *XShmCreateImage (
Display *display;
Visual *visual;
- unsigned int depth, width, height;
+ unsigned int depth;
int format;
char *data;
- XShmSegmentInfo *shminfo);
+ XShmSegmentInfo *shminfo;
+ unsigned int width, height);
.LP
Status XShmPutImage(
Display *display;
--
1.6.2.2.447.g4afa7
libXext-1.0.99.1-silence-xge.patch:
--- NEW FILE libXext-1.0.99.1-silence-xge.patch ---
>From 8a91fc6f72206362f399b5e29bf3d5f44f4eb822 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue, 10 Feb 2009 07:45:32 +1000
Subject: [PATCH 1/2] Silence "Generic Event Extension missing on display" warning.
If we're already doing a check anyway, we don't need to print an extra
warning.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
src/Xge.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/Xge.c b/src/Xge.c
index 90fbce5..6991553 100644
--- a/src/Xge.c
+++ b/src/Xge.c
@@ -161,8 +161,7 @@ cleanup:
static Bool
_xgeCheckExtension(Display* dpy, XExtDisplayInfo* info)
{
- XextCheckExtension(dpy, info, xge_extension_name, False);
- return True;
+ return XextHasExtension(info);
}
--
1.6.2.2.447.g4afa7
libXext-1.0.99.1-xsync.patch:
--- NEW FILE libXext-1.0.99.1-xsync.patch ---
>From f467d17ae5a89aa1a2b8c7260334f41e8ee2d08c Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim at woelders.dk>
Date: Fri, 17 Oct 2008 16:53:29 -0400
Subject: [PATCH] Bug #17774: Allocate the right size in XSyncListSystemCounters.
---
src/XSync.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/XSync.c b/src/XSync.c
index 61f8600..9f266a5 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -1,4 +1,3 @@
-/* $Xorg: XSync.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
/*
Copyright 1991, 1993, 1998 The Open Group
@@ -287,11 +286,10 @@ XSyncListSystemCounters(Display *dpy, int *n_counters_return)
int replylen;
int i;
- list = (XSyncSystemCounter *)Xmalloc(
- rep.nCounters * sizeof(XSyncSystemCounter));
+ list = Xmalloc(rep.nCounters * sizeof(XSyncSystemCounter));
replylen = rep.length << 2;
- pWireSysCounter = (xSyncSystemCounter *) Xmalloc ((unsigned) replylen + 1);
- /* +1 to leave room for last null-terminator */
+ pWireSysCounter = Xmalloc ((unsigned) replylen + sizeof(XSyncCounter));
+ /* +1 to leave room for last counter read-ahead */
if ((!list) || (!pWireSysCounter))
{
--
1.6.2.2.447.g4afa7
Index: libXext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libXext/F-11/libXext.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libXext.spec 25 Feb 2009 13:18:07 -0000 1.25
+++ libXext.spec 19 Apr 2009 23:34:07 -0000 1.26
@@ -1,7 +1,7 @@
Summary: X.Org X11 libXext runtime library
Name: libXext
Version: 1.0.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
@@ -10,6 +10,12 @@
#Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
Source0: http://cgit.freedesktop.org/xorg/lib/libXext/snapshot/libXext-1.0.99.1.tar.bz2
+# All three cherry-picked from upstream
+Patch1: libXext-1.0.99.1-manpage.patch
+Patch2: libXext-1.0.99.1-silence-xge.patch
+Patch3: libXext-1.0.99.1-xsync.patch
+
+
BuildRequires: xorg-x11-proto-devel >= 7.1-10
BuildRequires: libX11-devel
BuildRequires: libXau-devel
@@ -35,6 +41,9 @@
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
./autogen.sh
@@ -69,6 +78,13 @@
%{_mandir}/man3/*.3*
%changelog
+* Mon Apr 20 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.0.99.1-3
+- libXext-1.0.99.1-silence-xge.patch: don't print a warning if XGE is
+ missing (#477677).
+- libXext-1.0.99.1-manpage.patch: fix XShmCreateImage(3) argument order
+- libXext-1.0.99.1-xsync.patch: allocate the right size of counters in
+ XSyncListSystemCounters.
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.99.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- Previous message: rpms/krusader/F-11 krusader-2.0.0-gcc-4.4.patch,NONE,1.1
- Next message: rpms/squid/F-11 .cvsignore, 1.38, 1.39 sources, 1.41, 1.42 squid.spec, 1.117, 1.118 squid-3.0.STABLE13-logfile-syslog.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list