From 61791d5d29845b816a111d3ebefb47a91298324c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:17:29 +0000 Subject: [PATCH 1/6] Initialize branch F-12 for libXrandr --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 3a69bbfe82cbf79bc8159551db0c99d9b5bf58ae Mon Sep 17 00:00:00 2001 From: Soren Sandmann Pedersen Date: Wed, 4 Nov 2009 17:21:25 +0000 Subject: [PATCH 2/6] Require libXext-devel --- libXrandr.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libXrandr.spec b/libXrandr.spec index 27d21fd..6da52bc 100644 --- a/libXrandr.spec +++ b/libXrandr.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXrandr runtime library Name: libXrandr Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -24,6 +24,7 @@ Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: pkgconfig(randrproto) >= 1.2.1 +Requires: libXext-devel %description devel X.Org X11 libXrandr development package @@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Wed Nov 4 2009 Soren Sandmann 1.3.0-4 +- Add requirement on libXext-devel + * Fri Jul 24 2009 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 21659538e87c667977f1610156dab50f5a117eaf Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 10 Nov 2009 20:39:29 +0000 Subject: [PATCH 3/6] - randr-git.patch: Update to git --- libXrandr.spec | 7 ++-- randr-git.patch | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 randr-git.patch diff --git a/libXrandr.spec b/libXrandr.spec index 6da52bc..abbb205 100644 --- a/libXrandr.spec +++ b/libXrandr.spec @@ -8,6 +8,7 @@ URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +Patch0: randr-git.patch BuildRequires: xorg-x11-proto-devel BuildRequires: pkgconfig(randrproto) >= 1.3.0 @@ -24,13 +25,13 @@ Requires: %{name} = %{version}-%{release} Requires: pkgconfig Requires: pkgconfig(randrproto) >= 1.2.1 -Requires: libXext-devel %description devel X.Org X11 libXrandr development package %prep %setup -q +%patch0 -p1 -b .git %build %configure --disable-static @@ -64,8 +65,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog -* Wed Nov 4 2009 Soren Sandmann 1.3.0-4 -- Add requirement on libXext-devel +* Tue Nov 10 2009 Adam Jackson 1.3.0-4 +- randr-git.patch: Update to git * Fri Jul 24 2009 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/randr-git.patch b/randr-git.patch new file mode 100644 index 0000000..44f8ca9 --- /dev/null +++ b/randr-git.patch @@ -0,0 +1,102 @@ +diff --git a/configure.ac b/configure.ac +index a018667..09c5d8d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,7 @@ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n + dnl + AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr) + AC_CONFIG_AUX_DIR(.) +-AM_INIT_AUTOMAKE([dist-bzip2]) ++AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + + # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h +index a411321..6b756a7 100644 +--- a/include/X11/extensions/Xrandr.h ++++ b/include/X11/extensions/Xrandr.h +@@ -197,6 +197,7 @@ Time XRRTimes (Display *dpy, int screen, Time *config_timestamp); + + /* Version 1.2 additions */ + ++/* despite returning a Status, this returns 1 for success */ + Status + XRRGetScreenSizeRange (Display *dpy, Window window, + int *minWidth, int *minHeight, +diff --git a/src/XrrConfig.c b/src/XrrConfig.c +index db7a1ae..34ff3ef 100644 +--- a/src/XrrConfig.c ++++ b/src/XrrConfig.c +@@ -409,6 +409,7 @@ Status XRRSetScreenConfigAndRate (Display *dpy, + + (void) _XReply (dpy, (xReply *) &rep, 0, xTrue); + ++ /* actually .errorCode in struct xError */ + if (rep.status == RRSetConfigSuccess) { + /* if we succeed, set our view of reality to what we set it to */ + config->config_timestamp = rep.newConfigTimestamp; +diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c +index db9d0b4..697987a 100644 +--- a/src/XrrCrtc.c ++++ b/src/XrrCrtc.c +@@ -167,7 +167,7 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc) + req->crtc = crtc; + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) +- rep.status = RRSetConfigFailed; ++ rep.size = 0; + UnlockDisplay (dpy); + SyncHandle (); + return rep.size; +@@ -179,7 +179,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc) + XExtDisplayInfo *info = XRRFindDisplay(dpy); + xRRGetCrtcGammaReply rep; + xRRGetCrtcGammaReq *req; +- XRRCrtcGamma *crtc_gamma; ++ XRRCrtcGamma *crtc_gamma = NULL; + long nbytes; + long nbytesRead; + +@@ -192,7 +192,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc) + req->crtc = crtc; + + if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) +- rep.status = RRSetConfigFailed; ++ goto out; + + nbytes = (long) rep.length << 2; + +@@ -204,9 +204,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc) + if (!crtc_gamma) + { + _XEatData (dpy, (unsigned long) nbytes); +- UnlockDisplay (dpy); +- SyncHandle (); +- return NULL; ++ goto out; + } + _XRead16 (dpy, crtc_gamma->red, rep.size * 2); + _XRead16 (dpy, crtc_gamma->green, rep.size * 2); +@@ -214,7 +212,8 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc) + + if (nbytes > nbytesRead) + _XEatData (dpy, (unsigned long) (nbytes - nbytesRead)); +- ++ ++out: + UnlockDisplay (dpy); + SyncHandle (); + return crtc_gamma; +diff --git a/src/XrrProperty.c b/src/XrrProperty.c +index 9554f9a..1a125b2 100644 +--- a/src/XrrProperty.c ++++ b/src/XrrProperty.c +@@ -272,7 +272,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output, + { + UnlockDisplay (dpy); + SyncHandle (); +- return 1; ++ return ((xError *)&rep)->errorCode; + } + + *prop = (unsigned char *) NULL; From a03a00431986e4c7441444480c17165003739668 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 10 Nov 2009 20:42:54 +0000 Subject: [PATCH 4/6] - randr-git.patch: Update to git --- libXrandr.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libXrandr.spec b/libXrandr.spec index abbb205..be9f72b 100644 --- a/libXrandr.spec +++ b/libXrandr.spec @@ -1,7 +1,7 @@ Summary: X.Org X11 libXrandr runtime library Name: libXrandr Version: 1.3.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.x.org @@ -23,9 +23,6 @@ Summary: X.Org X11 libXrandr development package Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -Requires: pkgconfig(randrproto) >= 1.2.1 - %description devel X.Org X11 libXrandr development package @@ -65,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog -* Tue Nov 10 2009 Adam Jackson 1.3.0-4 +* Tue Nov 10 2009 Adam Jackson 1.3.0-5 - randr-git.patch: Update to git * Fri Jul 24 2009 Fedora Release Engineering - 1.3.0-3 From dc68d74a9a67f9078959d4a3511eca08b1a28f9d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:56:15 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e03e7f1..9c021e3 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: libXrandr -# $Id: Makefile,v 1.1 2005/08/26 21:35:29 mharris Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:58:39 notting Exp $ NAME := libXrandr SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From cb05093bbd9de10bb8f2a34c492a7c51e3752202 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 17:40:12 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9c021e3..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXrandr -# $Id: Makefile,v 1.2 2007/10/15 18:58:39 notting Exp $ -NAME := libXrandr -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12