libxrender: Changes to 'debian-unstable'
ChangeLog | 41 ++++++++++++++++++
configure.ac | 10 ----
debian/changelog | 12 +++++
debian/compat | 2
debian/control | 14 ++----
debian/rules | 91 ++++------------------------------------
debian/upstream/signing-key.asc | 60 ++++++++++++++++++++++++++
debian/watch | 1
src/Glyph.c | 2
src/Xrenderint.h | 14 ------
10 files changed, 134 insertions(+), 113 deletions(-)
New commits:
commit cf46e667144a879ed3929211a25d34569f597c30
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:54:18 2015 +0000
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 317f48d..b324ec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
+libxrender (1:0.9.9-1) sid; urgency=medium
+ * Team upload.
* New upstream release.
* Let uscan verify upstream tarball signatures.
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
@@ -7,7 +8,7 @@ libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
* Remove Cyril from Uploaders.
* Bump Standards-Version to 3.9.6, update Vcs-* control fields.
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:43:34 +0000
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:53:59 +0000
libxrender (1:0.9.8-1) sid; urgency=low
commit 844ba1e56a8a03092321a83a5479ec920d667a06
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:50:33 2015 +0000
Bump Standards-Version to 3.9.6, update Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 240d58b..317f48d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
* Switch to dh and dh-autoreconf.
* Remove Cyril from Uploaders.
+ * Bump Standards-Version to 3.9.6, update Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:43:34 +0000
diff --git a/debian/control b/debian/control
index 0cb20b9..afcf98c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5+4),
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrender
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrender.git
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/git/pkg-xorg/lib/libxrender
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/lib/libxrender.git
Package: libxrender1
Section: libs
commit 7d9163736bba56a8b71f484063466309881a1077
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:49:55 2015 +0000
Remove Cyril from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index b1e3603..240d58b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
* Let uscan verify upstream tarball signatures.
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
* Switch to dh and dh-autoreconf.
+ * Remove Cyril from Uploaders.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:43:34 +0000
diff --git a/debian/control b/debian/control
index 9ad07f3..0cb20b9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: libxrender
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
commit 45a5545483a4bdcb9fd48bce50e25ee062e8f8a5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:48:35 2015 +0000
Switch to dh and dh-autoreconf.
diff --git a/debian/changelog b/debian/changelog
index 8096adb..b1e3603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify upstream tarball signatures.
* Bump libx11-dev build-dep to 2:1.6 per configure.ac.
+ * Switch to dh and dh-autoreconf.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:43:34 +0000
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index ce8bbf5..9ad07f3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,8 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 8.1.3),
-# dpkg-buildflags --export=configure
- dpkg-dev (>= 1.16.1),
+ debhelper (>= 9),
+ dh-autoreconf,
pkg-config,
libx11-dev (>= 2:1.6),
x11proto-render-dev,
diff --git a/debian/rules b/debian/rules
index dcdb587..baa9e92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,93 +1,22 @@
#!/usr/bin/make -f
# debian/rules for the Debian libxrender package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
# set this to the name of the main shlib's binary package
PACKAGE = libxrender1
-include debian/xsfbs/xsfbs.mk
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure)
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep:
-.PHONY: build build-arch build-indep
-
-build-stamp:
- dh_testdir
- autoreconf -vfi
- mkdir -p build
- cd build && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
- --infodir=\$${prefix}/share/info \
- --disable-silent-rules \
- $(confflags)
- cd build && $(MAKE)
- >$@
+%:
+ dh $@ --with autoreconf --parallel
-clean:
- dh_testdir
- rm -f build-stamp
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf build
- rm -f aclocal.m4 config.guess config.h.in config.sub configure
- rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
- find -name Makefile.in -delete
- dh_clean
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --disable-silent-rules
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
+override_dh_install:
dh_install --list-missing
- dh_installchangelogs
- dh_link
+
+override_dh_strip:
dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
dh_strip -N$(PACKAGE)
- dh_compress
- dh_fixperms
- dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install
+override_dh_makeshlibs:
+ dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
commit 6d0fe750d047922c167c4bff402e2de8422d6ea9
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:45:25 2015 +0000
Bump libx11-dev build-dep to 2:1.6 per configure.ac.
diff --git a/debian/changelog b/debian/changelog
index a1b0625..8096adb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
* New upstream release.
* Let uscan verify upstream tarball signatures.
+ * Bump libx11-dev build-dep to 2:1.6 per configure.ac.
-- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:43:34 +0000
diff --git a/debian/control b/debian/control
index 60fce1f..ce8bbf5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
# dpkg-buildflags --export=configure
dpkg-dev (>= 1.16.1),
pkg-config,
- libx11-dev (>= 2:1.3.3-2),
+ libx11-dev (>= 2:1.6),
x11proto-render-dev,
x11proto-core-dev,
automake,
commit b66f30480b9d211885121c52ba657feb767e137b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:45:06 2015 +0000
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 8e733a4..06d256e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+commit bb890936bcc6053cb7a46cd9225c257ff1be389f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 30 22:29:55 2015 -0700
+
+ libXrender 0.9.9
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7887382e59b7a06d6b02501205d543fdf76c8249
+Author: Clemens Eisserer <linuxhippy@gmail.com>
+Date: Sat Nov 23 22:15:52 2013 -0800
+
+ Fix request length calculation for XRenderCompositeText32
+
+ Request length calculation inside XRenderCompositeText32 is broken for
+ the case where the number of glyphs fits exactky inside the last
+ xGlyphElt.
+
+ In XRenderCompositeText8 and XRenderCompositeText16 this case is
+ handled properly, somehow the "-1" got missing in
+ XRenderCompositeText32.
+
+ Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 2222b0fbff96b9f0324bb1e2f56416c84be23c3b
+Author: Michael Joost <mehl@michael-joost.de>
+Date: Mon Nov 18 16:11:26 2013 +0100
+
+ Remove fallback for _XEatDataWords, require libX11 1.6 for it
+
+ _XEatDataWords was orignally introduced with the May 2013 security
+ patches, and in order to ease the process of delivering those,
+ fallback versions of _XEatDataWords were included in the X extension
+ library patches so they could be applied to older versions that didn't
+ have libX11 1.6 yet. Now that we're past that hurdle, we can drop
+ the fallbacks and just require libX11 1.6 for building new versions
+ of the extension libraries.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 61236e831f8cc0761b26b49e37a4df9c187aa0ba
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 13 22:41:00 2013 -0700
diff --git a/debian/changelog b/debian/changelog
index 5d90452..a1b0625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libxrender (1:0.9.8-2) UNRELEASED; urgency=medium
+libxrender (1:0.9.9-1) UNRELEASED; urgency=medium
+ * New upstream release.
* Let uscan verify upstream tarball signatures.
- -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:38:47 +0000
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:43:34 +0000
libxrender (1:0.9.8-1) sid; urgency=low
commit c3e594a750bf2005cf836fd0393ad0c11073852b
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Oct 28 10:39:06 2015 +0000
Let uscan verify upstream tarball signatures.
diff --git a/debian/changelog b/debian/changelog
index 8196d8d..5d90452 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxrender (1:0.9.8-2) UNRELEASED; urgency=medium
+
+ * Let uscan verify upstream tarball signatures.
+
+ -- Julien Cristau <jcristau@debian.org> Wed, 28 Oct 2015 10:38:47 +0000
+
libxrender (1:0.9.8-1) sid; urgency=low
* New upstream release.
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..863981f
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,60 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n
+Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g
+EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE
+a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9
+8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV
+Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ
+xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG
+CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE
+TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w
+ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRAgAoAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAUCUXnRYgUJFEPYeAAKCRCi+54IHy0TDonxAKCP
+cAgXNojuujUg5Wqi6v0RBFVSUgCggq1SsVEdq9NDWvXvkeGyNaBivSK0K0FsYW4g
+Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQIAJgIb
+AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJRedFiBQkUQ9h4AAoJEKL7nggfLRMO
+6sUAn0jl3h9rY4OJ13Lu7nsKclyhDpOqAKCFgTmaDGRuDRxloLg9jftrn7a7vrQu
+QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr
+BBMRAgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUXnRYgUJFEPY
+eAAKCRCi+54IHy0TDtBZAJ9IgVVNoFIPRjTsNjcSFaLznuDRJgCcC/WgV312IrxS
+Q8PRAyEgozSB9Ke5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0
+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
+=tc6G
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index b5bad45..fda398b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/lib/libXrender
version=3
+opts=pgpsigurlmangle=s/$/.sig/ \
http://xorg.freedesktop.org/releases/individual/lib/ libXrender-(.*)\.tar\.gz
commit bb890936bcc6053cb7a46cd9225c257ff1be389f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 30 22:29:55 2015 -0700
libXrender 0.9.9
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index b5726f0..ff83023 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# digit in the version number to track changes which don't affect the
# protocol, so Xrender version l.n.m corresponds to protocol version l.n
#
-AC_INIT(libXrender, [0.9.8],
+AC_INIT(libXrender, [0.9.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrender])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 7887382e59b7a06d6b02501205d543fdf76c8249
Author: Clemens Eisserer <linuxhippy@gmail.com>
Date: Sat Nov 23 22:15:52 2013 -0800
Fix request length calculation for XRenderCompositeText32
Request length calculation inside XRenderCompositeText32 is broken for
the case where the number of glyphs fits exactky inside the last
xGlyphElt.
In XRenderCompositeText8 and XRenderCompositeText16 this case is
handled properly, somehow the "-1" got missing in
XRenderCompositeText32.
Reviewed-by: Keith Packard <keithp@keithp.com>
diff --git a/src/Glyph.c b/src/Glyph.c
index dbeb77e..48e40c3 100644
--- a/src/Glyph.c
+++ b/src/Glyph.c
@@ -665,7 +665,7 @@ XRenderCompositeText32 (Display *dpy,
len += (SIZEOF (xGlyphElt) + 4) >> 2;
}
nchars = elts[i].nchars;
- elen = SIZEOF(xGlyphElt) * ((nchars + MAX_32) / MAX_32) + nchars *4;
+ elen = SIZEOF(xGlyphElt) * ((nchars + MAX_32-1) / MAX_32) + nchars *4;
len += (elen + 3) >> 2;
}
commit 2222b0fbff96b9f0324bb1e2f56416c84be23c3b
Author: Michael Joost <mehl@michael-joost.de>
Date: Mon Nov 18 16:11:26 2013 +0100
Remove fallback for _XEatDataWords, require libX11 1.6 for it
_XEatDataWords was orignally introduced with the May 2013 security
patches, and in order to ease the process of delivering those,
fallback versions of _XEatDataWords were included in the X extension
library patches so they could be applied to older versions that didn't
have libX11 1.6 yet. Now that we're past that hurdle, we can drop
the fallbacks and just require libX11 1.6 for building new versions
of the extension libraries.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 4e6b271..b5726f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,13 +56,7 @@ RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RENDER_VERSION)
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION)
-
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$RENDER_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
+PKG_CHECK_MODULES(RENDER, [x11 >= 1.6] renderproto >= $RENDER_VERSION)
AC_CONFIG_FILES([Makefile
src/Makefile
diff --git a/src/Xrenderint.h b/src/Xrenderint.h
index daaa6fe..57b13da 100644
--- a/src/Xrenderint.h
+++ b/src/Xrenderint.h
@@ -109,18 +109,4 @@ XRenderFindDisplay (Display *dpy);
#define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len)
#endif
-#ifndef HAVE__XEATDATAWORDS
-#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */
-#include <limits.h>
-
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
- if (n >= (ULONG_MAX >> 2))
- _XIOError(dpy);
-# endif
- _XEatData (dpy, n << 2);
-}
-#endif
-
#endif /* _XRENDERINT_H_ */
Reply to: