Fix compilation with format-security, bug #536120 by ago. Also fix a scrolling bug with >=cairo-1.14

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

5 files changed, 109 insertions, 16 deletions

diff --git a/gnustep-base/gnustep-back-cairo/ChangeLog b/gnustep-base/gnustep-back-cairo/ChangeLog
index 06f2c3ec5225..ce46119306a4 100644
--- a/gnustep-base/gnustep-back-cairo/ChangeLog
+++ b/gnustep-base/gnustep-back-cairo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-base/gnustep-back-cairo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/ChangeLog,v 1.42 2014/12/27 19:28:06 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/ChangeLog,v 1.43 2015/02/20 12:09:50 voyageur Exp $
+
+*gnustep-back-cairo-0.24.0-r1 (20 Feb 2015)
+
+  20 Feb 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  +gnustep-back-cairo-0.24.0-r1.ebuild,
+  +files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch,
+  +files/gnustep-back-cairo-0.24.0-format-security.patch:
+  Fix compilation with format-security, bug #536120 by ago. Also fix a
+  scrolling bug with >=cairo-1.14
 
   27 Dec 2014; Agostino Sarubbo <ago@gentoo.org>
   gnustep-back-cairo-0.24.0.ebuild:
diff --git a/gnustep-base/gnustep-back-cairo/Manifest b/gnustep-base/gnustep-back-cairo/Manifest
index 137dd92d1e17..059410f20c0e 100644
--- a/gnustep-base/gnustep-back-cairo/Manifest
+++ b/gnustep-base/gnustep-back-cairo/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnustep-back-cairo-0.24.0-cairo-scrolling.patch 747 SHA256 7ab675fdc4e35a06735ecebdd5f39df36f89aeefcfa3138aa0fa85572803922b SHA512 de7844a9743978a2ff050155a9f1b7dd923d824ea1f9b74e24acd2050e0c1baca77564d15d653be9ebecfa39f8d85a7db0f63987a9ff87d91267888910a28668 WHIRLPOOL b23e4764734c208154821b38130bd9c8895da7c40aa646cb29d9e076684966bb288c4d3d91c982f43bf5e22a488f7fcf0c9592f18ab0b9ee1edc3d9baed984fb
+AUX gnustep-back-cairo-0.24.0-format-security.patch 391 SHA256 ed146bd8b2fdb20b769e5c4baee1f1ffc5b620be572501747a779e4fcb259ec1 SHA512 c756a50526136998c27fd60325de9adac446c5c1061c51f33620b0663a9b6fe03667c337c03c113bab5a361fc2c314d002a33ed9ec73b36d893fe1d8fc6a246b WHIRLPOOL 7a121620f7b2af73e1d88f44ac5abc8cdbdaf8b3bef226507fa98bb236bd844be37b0f9117200f37dd2b175ad95566132979da4b826dde65078d55a1567a1cf0
 DIST gnustep-back-0.22.0.tar.gz 935034 SHA256 b9bf26346737d87160af669c3073b4eb511c743056af90aedb631e1537513608 SHA512 849078bd6c93df7177569d8d4d9b6ecf02e5aac6b60e51c8ae60f08bf45b30fe5abcc2c519d80c593c051d7eead31c219d32d24d95e2db8021fadea638d98478 WHIRLPOOL b21ebccb1afe84a144896312a6f7fc8403da2b39b92952ac9e5f1de02b7dfa218de0289c9333d4f9a21746739ac46ee22d1139d6df98e6d3c09063667d9ee6d6
 DIST gnustep-back-0.23.0.tar.gz 942380 SHA256 7e897849bf0359d2401a426c75bda89117b5506910892b4eb15262edfb26bbdc SHA512 8789e738b18e4eb1996024c449c4550a392404eb71693569a4b561df22652840a06ca4681b3ec7d47ff3d3d36755a065e956de9203f380c0cc60c76bb412b99c WHIRLPOOL 7b46d1a066889f40c00aa949b65d113027b6e0689349d686db83fd68a7c3a25d03a15c6b04f6c2b4d04ab7b61454bba428d2a3cbdea87541898ce68ec41e7017
 DIST gnustep-back-0.24.0.tar.gz 966735 SHA256 5fc2ed70076d1cd9d51bf3ad85c71a42bfd29e3fd7c22421cc1de739695c3d62 SHA512 d27ae170ad23ee18a5471f41ee67bcde6ee4ba3e7fa522dac72a1f7fdb363d64a15432e6abbf972089483b356959d060df91d797ab820a01ca4bd85af700bf57 WHIRLPOOL ef713f8ef84db12a75a2c1d1a56666c64edbf11ea302b1ed1f55a556eaecdbad74853ef736e665c5a2849210d7c273277c9a3d47ef5f7ca4a7544525367589e9
 EBUILD gnustep-back-cairo-0.22.0.ebuild 1231 SHA256 ab43dcec5fa78aa01b8f2ce2e0417e5531a512e2c4520ec0889226bf13d53fc5 SHA512 19f9a13c7ea653a1ae2120aeb9a435c9a40d4624760e7d3528fc8a89fc9fb561557d0bae5e00351e72ecaed7011d4dfc18ec535d3151b8521b8e7b0ed5aac021 WHIRLPOOL aa01dbe37608e83f17e1365f9aacd94705c7953acca50b156c21a8b1a93314557ecd55eada300bd45938e365db81e921ff7d74b9ac2219c714a060d88c05aaee
 EBUILD gnustep-back-cairo-0.23.0.ebuild 1235 SHA256 ba7119994e5538f99f2aec3f394866add7e9070ba527905fe8baf9b1fcd82ef2 SHA512 188051787029d6adc1c06ae004b6b3834faa81bf2606193e03b69d2d64f0389e17fb28f245a6082a1e7daa79d3cf67c1e979b0968a406040bb5968112c512db3 WHIRLPOOL d8c54d1a06e18462b69c8651c057f7e0a1b1b26719a626d7441be1d5e9e67bba4245a707d372ce01db17d1fdc6aa11675cb5aa346daac9c98e61db0630a9cf86
+EBUILD gnustep-back-cairo-0.24.0-r1.ebuild 1390 SHA256 23731fb1d47b20fc0489505f3cbbda6507b2e464f8275c56e18d4227cd54bbd0 SHA512 9bafe5e146188a3d86fa0c81c31d069d0d2a92d6fbf65bab6c79362db6199b4b52624805b121ad8b320df1d94e0dc7d1b31fc9f47eb1b817a5d8cad84631a199 WHIRLPOOL a161064d58b042d84b8fd3739b51f6a63c07b9a60af8765c3139c2cbd91fbdbfb4b5e0e8e8e12d5feac877e52688d02d6fe6bb7fd38b7c6b799ca98f8bcdd111
 EBUILD gnustep-back-cairo-0.24.0.ebuild 1231 SHA256 21b1cdac000ce4e1ec782487ee79d986cee135bc1936c232fe0d90dab3b8086a SHA512 894c1a1df5a7f4a0e2545b2c763f08f302f355d6060a3894ab3f3eac35fee21cfdf8951da7aa3c0884c43cc4056479e0eb67a34460932703c6e060040bc64ac2 WHIRLPOOL 4718daa80727330c140b2164855d54ba63b2f47189228ed5e57f27b21bf4817026a708a42e08c2127f3de247356055026d78de85271e4494f8b67b64afc3dbfe
-MISC ChangeLog 6534 SHA256 ef9cdc7e4b2a3110d5d197c5480809556bb1e5a48115bc28f27257536ea4fa24 SHA512 a73e89ee0c53adf53de60eb5e051253e9bdecad2a7e70f30792123d53bab7130ace161d5b1673468e7d8dd61313688e97e9cc0534bef02cb4ec9d8875cad07c8 WHIRLPOOL ef37a6e9b1f835f3ab56a88d70bbadef336ad075a1b3c6ee87fc3547125976a056c7eaebcbceafe95018d44708cd5b9d4e39010050ad51c43093696a49690cfb
+MISC ChangeLog 6901 SHA256 9e24669bb61ccdecde1a1dc37a8ee1bd7512704b8c5d25637d38d160d528167c SHA512 ba0975dfed74ed9700e4729c5c6614f237c2812cab8df41d02bcf57b58df31bb0a88134c4f2b3d3b90088a9ca197de51e14141a6c259c1cc0b091574f4e7737c WHIRLPOOL b4a087169d2cd99b1ab7b03b7ee3b05ce9c1731181cef8bc6b214f9567579d68c18fa2d11f3bbc5c456057da4251bfe043594b19f2942f3d98ee317a8d4c4240
 MISC metadata.xml 318 SHA256 9dc36a71b7dcb69b00ee1ccf7b12f7cfbb803b656915664fc02579d03704b495 SHA512 dfb251f2d00c026d462642d21c48d062fa784198de449b8721f1dbf383695fd5129e69d7f2faa35bb07e0655260d56b3adb453d56e28f846672f4531c4801e76 WHIRLPOOL 61ebdfd73ba9d458178a0927ccc2a0746cfcc05a68499ad0f54feab0d47e3ef66781441481dfcad03049236433cbb63a90b46aada5a48593d20eefd3f7cded38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnwhHAAoJELp701BxlEWftGcP/A9yIzJrA88ombODk98ZF1qo
-BUQdPZnjmInZO1tbKB4kqzq+8Kh1QDntvvfiA/7W6NOwegzarvjoXtBn2hJdmfua
-Xbj/BSD465Kw6sPTxyq3T5ZfeJCndEeTWWWt+pV2j0UA5570xKRZE3ZLn1i9GoTi
-dA8OxhrZZNTU6KW7/ZAKzWW0b8NuzrG+Blqsf92E3xrqOIPhdsBz3eKu08bgRwBw
-vYVfQWbupcsI2wOSzljzBxxuNHW/FdGtZNo/S07s2OaasaGbUnjgGsyxyihEUAac
-HKL2HurVk3xwqaX+++NnmYvAo9dW7wOvtrHjdPG65iwW0CPWUJhGbDImjkDFMHjE
-GNyJScW70Chi1H+GFyCN6igJpBRkzXHRsDITMNlPVncMgXLkj8ubp41eZYxAnkgi
-qyRCqP7cBLYGVS4jCJWYBhv8hXBfaQ9/tWTHf5iBNGZExAtjlDVh78pArY9HXEvj
-3IB/5eFeHRoBVOMRd4oaby/J+uA8mH77GeZ2GJ2BGbw87HteCuG4+YR6AXHAfkLe
-Js0Cta8XPrOe0VwHXZH/hF7SRpSdb/Pc3PXERzhJ2ilSZdZjfs56y/MvV/s36cnD
-gOGHA7Nul5RbIJSvD06Mq4Cj7+US1vWmvWvOHmX1boC3gGkBZ11zbRo3fHC8fCPt
-8k8dvljwqs41C9bfi4AS
-=JeYW
+iF4EAREIAAYFAlTnJBMACgkQFYEBGcdFJfJYsgD+Je51kDgpl+mZxNrOBJbT/F1N
+0f8rvgXT3Hx5Sh9uxlMA/3qfPSEwD+YK0dpEPxQTXIyyW59eTgDx6IUKuHeW5SMF
+=eOd7
 -----END PGP SIGNATURE-----
diff --git a/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch b/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch
new file mode 100644
index 000000000000..055fbab8db11
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch
@@ -0,0 +1,21 @@
+Description: Disable workaround for a cairo bug fixed in 1.14.0.
+Bug-Debian: http://bugs.debian.org/770141
+Origin: upstream, commit: r38135
+Last-Update: 2014-11-19
+---
+
+--- gnustep-back-0.24.0.orig/Source/cairo/CairoGState.m
++++ gnustep-back-0.24.0/Source/cairo/CairoGState.m
+@@ -1316,9 +1316,10 @@
+       ssize = [source->_surface size];
+     }
+ 
+-  if (cairo_version() >= CAIRO_VERSION_ENCODE(1, 8, 0))
++  if ((cairo_version() >= CAIRO_VERSION_ENCODE(1, 8, 0))
++      && (cairo_version() <= CAIRO_VERSION_ENCODE(1, 13, 0)))
+     {      
+-      // For cairo > 1.8 we seem to need this adjustment
++      // For cairo > 1.8 and < 1.13 we seem to need this adjustment
+       srcRectInBase.origin.y -= 2 * (source->offset.y - ssize.height);
+     }
+ 
diff --git a/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch b/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch
new file mode 100644
index 000000000000..c773b734af75
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch
@@ -0,0 +1,15 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Pass a proper format string to syslog()
+Last-Update: 2011-11-17
+
+--- gnustep-back.orig/Tools/gpbs.m
++++ gnustep-back/Tools/gpbs.m
+@@ -64,7 +64,7 @@
+ {
+   if (is_daemon)
+     {
+-      syslog (log_priority | prio, ebuf);
++      syslog (log_priority | prio, "%s", ebuf);
+     }
+   else if (prio == LOG_INFO)
+     {
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.24.0-r1.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.24.0-r1.ebuild
new file mode 100644
index 000000000000..2d0ac31cf5fa
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.24.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.24.0-r1.ebuild,v 1.1 2015/02/20 12:09:50 voyageur Exp $
+
+EAPI=5
+inherit eutils gnustep-base
+
+DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="opengl xim"
+
+RDEPEND="${GNUSTEP_CORE_DEPEND}
+	=gnustep-base/gnustep-gui-${PV%.*}*
+	opengl? ( virtual/opengl virtual/glu )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXft
+	x11-libs/libXrender
+	>=media-libs/freetype-2.1.9
+
+	>=x11-libs/cairo-1.2.0[X]
+
+	!gnustep-base/gnustep-back-art
+	!gnustep-base/gnustep-back-xlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/gnustep-back-${PV}
+
+src_prepare() {
+	gnustep-base_src_prepare
+	epatch "${FILESDIR}"/${P}-cairo-scrolling.patch
+	epatch "${FILESDIR}"/${P}-format-security.patch
+}
+
+src_configure() {
+	egnustep_env
+
+	myconf="$(use_enable opengl glx)"
+	myconf="$myconf $(use_enable xim)"
+	myconf="$myconf --enable-server=x11"
+	myconf="$myconf --enable-graphics=cairo"
+
+	econf $myconf
+}