voyageur 15/02/20 12:09:50
Added: gnustep-back-cairo-0.24.0-cairo-scrolling.patch
gnustep-back-cairo-0.24.0-format-security.patch
Log:
Fix compilation with format-security, bug #536120 by ago. Also fix a
scrolling bug with >=cairo-1.14
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
C74525F2)
Revision Changes Path
1.1
gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch?rev=1.1&content-type=text/plain
Index: gnustep-back-cairo-0.24.0-cairo-scrolling.patch
===================================================================
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);
}
1.1
gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch?rev=1.1&content-type=text/plain
Index: gnustep-back-cairo-0.24.0-format-security.patch
===================================================================
From: Mathieu Trudel-Lapierre <[email protected]>
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)
{
