Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils/files: splashutils-1.5.4.4-ft25.patch splashutils-1.5.4.4-sys-queue.patch
Date: Sun, 01 Feb 2015 09:11:19
Message-Id: 20150201091115.7BB9410D03@oystercatcher.gentoo.org
1 pinkbyte 15/02/01 09:11:15
2
3 Modified: splashutils-1.5.4.4-ft25.patch
4 Added: splashutils-1.5.4.4-sys-queue.patch
5 Log:
6 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
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
9
10 Revision Changes Path
11 1.2 media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch
12
13 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
14 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
15 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
16
17 Index: splashutils-1.5.4.4-ft25.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-ft25.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- splashutils-1.5.4.4-ft25.patch 26 Aug 2014 10:22:31 -0000 1.1
24 +++ splashutils-1.5.4.4-ft25.patch 1 Feb 2015 09:11:15 -0000 1.2
25 @@ -1,5 +1,6 @@
26 Gentoo-bug: https://bugs.gentoo.org/506124
27 Signed-off-by: Lars Wendler (Polynomial-C)
28 +Modified-by: Sergey Popov (Pinkbyte)
29 --- miscsplashutils-0.1.8/fbtruetype/ttf.c
30 +++ miscsplashutils-0.1.8/fbtruetype/ttf.c
31 @@ -13,8 +13,8 @@
32 @@ -13,3 +14,29 @@
33
34 #include "ttf.h"
35
36 +--- splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:04.330595381 +0300
37 ++++ splashutils-1.5.4.4/src/ttf.c 2015-02-01 11:35:24.287596342 +0300
38 +@@ -25,8 +25,8 @@
39 + #include <assert.h>
40 +
41 + #include <ft2build.h>
42 +-#include <freetype/ftoutln.h>
43 +-#include <freetype/ttnameid.h>
44 ++#include FT_OUTLINE_H
45 ++#include FT_TRUETYPE_IDS_H
46 +
47 + #include "common.h"
48 + #include "render.h"
49 +--- splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:33.852605470 +0300
50 ++++ splashutils-1.5.4.4/src/ttf.h 2015-02-01 11:38:52.504606368 +0300
51 +@@ -1,8 +1,8 @@
52 + #ifndef _TTF_H
53 + #define _TTF_H
54 + #include <ft2build.h>
55 +-#include <freetype/ftoutln.h>
56 +-#include <freetype/ttnameid.h>
57 ++#include FT_OUTLINE_H
58 ++#include FT_TRUETYPE_IDS_H
59 +
60 + #define CACHED_METRICS 0x10
61 + #define CACHED_BITMAP 0x01
62
63
64
65 1.1 media-gfx/splashutils/files/splashutils-1.5.4.4-sys-queue.patch
66
67 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
68 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
69
70 Index: splashutils-1.5.4.4-sys-queue.patch
71 ===================================================================
72 --- splash.c 2011-06-13 04:45:59.000000000 +0700
73 +++ splash.c 2014-11-14 20:04:43.000000000 +0700
74 @@ -21,4 +21,5 @@
75 #include <sys/wait.h>
76 #include <sys/ioctl.h>
77 +#include <sys/queue.h>
78 #include <linux/kd.h>
79 #include <linux/fb.h>