summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2018-01-13 13:27:06 +0100
committerAlexis Ballier <aballier@gentoo.org>2018-01-13 13:27:06 +0100
commita72c679f14ef5c5b7ff157493917241bb699ec95 (patch)
tree34bad5f4121e6c595ee19b07d9c0a5080c33d4a8 /app-text/ttf2pt1
parentmedia-video/xine-ui: bump to 0.99.10 (diff)
downloadgentoo-a72c679f14ef5c5b7ff157493917241bb699ec95.tar.gz
gentoo-a72c679f14ef5c5b7ff157493917241bb699ec95.tar.bz2
gentoo-a72c679f14ef5c5b7ff157493917241bb699ec95.zip
app-text/ttf2pt1: remove broken freetype patch.
Closes: https://bugs.gentoo.org/581332 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-text/ttf2pt1')
-rw-r--r--app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch20
-rw-r--r--app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild3
2 files changed, 1 insertions, 22 deletions
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
deleted file mode 100644
index 613da6c7339b..000000000000
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4.orig/ft.c 2014-07-02 14:19:32.000000000 -0700
-+++ ttf2pt1-3.4.4/ft.c 2014-07-02 14:20:22.794538869 -0700
-@@ -13,11 +13,11 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftsnames.h>
--#include <freetype/ttnameid.h>
--#include <freetype/ftoutln.h>
-+#include <freetype2/freetype.h>
-+#include <freetype2/ftglyph.h>
-+#include <freetype2/ftsnames.h>
-+#include <freetype2/ttnameid.h>
-+#include <freetype2/ftoutln.h>
- #include "pt1.h"
- #include "global.h"
-
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
index 624146104adb..ed543c6808a4 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -22,7 +22,6 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-LDFLAGS.patch
epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
epatch "${FILESDIR}"/${P}-freetype.patch
- epatch "${FILESDIR}"/${P}-freetype-2.5.patch
sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile