pinkbyte 15/02/01 09:11:15 Modified: splashutils-1.5.4.4-ft25.patch Added: splashutils-1.5.4.4-sys-queue.patch Log: Revision bump: correct freetype 2.5 patch, wrt bug #506124. Add support for user patches, add include for queue.h kernel header explicitly, prune unnecessary libtool files (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
Revision Changes Path 1.2 media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch?r1=1.1&r2=1.2 Index: splashutils-1.5.4.4-ft25.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- splashutils-1.5.4.4-ft25.patch 26 Aug 2014 10:22:31 -0000 1.1 +++ splashutils-1.5.4.4-ft25.patch 1 Feb 2015 09:11:15 -0000 1.2 @@ -1,5 +1,6 @@ Gentoo-bug: https://bugs.gentoo.org/506124 Signed-off-by: Lars Wendler (Polynomial-C) +Modified-by: Sergey Popov (Pinkbyte) --- miscsplashutils-0.1.8/fbtruetype/ttf.c +++ miscsplashutils-0.1.8/fbtruetype/ttf.c @@ -13,8 +13,8 @@ @@ -13,3 +14,29 @@ #include "ttf.h" +--- splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:04.330595381 +0300 ++++ splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:24.287596342 +0300 +@@ -25,8 +25,8 @@ + #include <assert.h> + + #include <ft2build.h> +-#include <freetype/ftoutln.h> +-#include <freetype/ttnameid.h> ++#include FT_OUTLINE_H ++#include FT_TRUETYPE_IDS_H + + #include "common.h" + #include "render.h" +--- splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:33.852605470 +0300 ++++ splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:52.504606368 +0300 +@@ -1,8 +1,8 @@ + #ifndef _TTF_H + #define _TTF_H + #include <ft2build.h> +-#include <freetype/ftoutln.h> +-#include <freetype/ttnameid.h> ++#include FT_OUTLINE_H ++#include FT_TRUETYPE_IDS_H + + #define CACHED_METRICS 0x10 + #define CACHED_BITMAP 0x01 1.1 media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch?rev=1.1&content-type=text/plain Index: splashutils-1.5.4.4-sys-queue.patch =================================================================== --- splash.c 2011-06-13 04:45:59.000000000 +0700 +++ splash.c 2014-11-14 20:04:43.000000000 +0700 @@ -21,4 +21,5 @@ #include <sys/wait.h> #include <sys/ioctl.h> +#include <sys/queue.h> #include <linux/kd.h> #include <linux/fb.h>
