summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnustep-base/gnustep-back-cairo/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnustep-base/gnustep-back-cairo/files')
-rw-r--r--gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-cairo-scrolling.patch21
-rw-r--r--gnustep-base/gnustep-back-cairo/files/gnustep-back-cairo-0.24.0-format-security.patch15
2 files changed, 36 insertions, 0 deletions
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)
+ {