commit: 3b09964833956a36718c1aec177ee9c5252a4858 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Sep 11 18:51:42 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Sep 11 18:56:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b099648
media-libs/silgraphite: Remove last-rited pkg Bug: https://bugs.gentoo.org/594314 media-libs/silgraphite/Manifest | 1 - .../files/silgraphite-2.3.1-aligned_access.patch | 63 ---------------------- media-libs/silgraphite/metadata.xml | 14 ----- media-libs/silgraphite/silgraphite-2.3.1.ebuild | 44 --------------- profiles/package.mask | 5 -- 5 files changed, 127 deletions(-) diff --git a/media-libs/silgraphite/Manifest b/media-libs/silgraphite/Manifest deleted file mode 100644 index 069bc42cd28..00000000000 --- a/media-libs/silgraphite/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST silgraphite-2.3.1.tar.gz 3239482 SHA256 9b07c6e91108b1fa87411af4a57e25522784cfea0deb79b34ced608444f2ed65 SHA512 6b0fa29e0ee507da17509ed6374b64d51360b3012bba512785186348c153047c2e6f28114e36d133f3c05dd319919bd79e9ed97fc9e29ad6bf2f7a032eb22df2 WHIRLPOOL fd49e74303f22a58e04d9792d17ec80f33c2c357d4377df851e526a7d5e7858fb4d3cca31654f37bf8016697709001625b1d54063fd1db60eb3ff68eea7f9bb7 diff --git a/media-libs/silgraphite/files/silgraphite-2.3.1-aligned_access.patch b/media-libs/silgraphite/files/silgraphite-2.3.1-aligned_access.patch deleted file mode 100644 index ee5c1702e92..00000000000 --- a/media-libs/silgraphite/files/silgraphite-2.3.1-aligned_access.patch +++ /dev/null @@ -1,63 +0,0 @@ -Fix unaligned reads. -https://bugs.gentoo.org/show_bug.cgi?id=304921 - -Upstream: -https://sourceforge.net/tracker/?func=detail&aid=2995413&group_id=66144&atid=513479 - -Index: silgraphite-2.3.1/engine/src/segment/FileInput.cpp -=================================================================== ---- silgraphite-2.3.1.orig/engine/src/segment/FileInput.cpp -+++ silgraphite-2.3.1/engine/src/segment/FileInput.cpp -@@ -41,6 +41,10 @@ DEFINE_THIS_FILE - - //:End Ignore - -+#define RAW_READ(var,size,buf) \ -+ for(int i = 0; i < isizeof(size);i++){\ -+ var |= buf[i]<<8*(isizeof(size)-i-1);\ -+ } - //:>******************************************************************************************** - //:> Forward declarations - //:>******************************************************************************************** -@@ -133,11 +137,11 @@ byte GrBufferIStream::ReadByteFromFont() - ----------------------------------------------------------------------------------------------*/ - short GrBufferIStream::ReadShortFromFont() - { -- short snInput = *(short *)m_pbNext; -+ short snInput = 0; -+ RAW_READ(snInput,short,m_pbNext); - m_pbNext += isizeof(short); - if (m_pbLim && m_pbNext > m_pbLim) - THROW(kresReadFault); -- snInput = lsbf(snInput); - return snInput; - } - -@@ -147,11 +151,11 @@ short GrBufferIStream::ReadShortFromFont - ----------------------------------------------------------------------------------------------*/ - utf16 GrBufferIStream::ReadUShortFromFont() - { -- utf16 chwInput = *(utf16 *)m_pbNext; -+ utf16 chwInput = 0; -+ RAW_READ(chwInput,utf16,m_pbNext); - m_pbNext += isizeof(utf16); - if (m_pbLim && m_pbNext > m_pbLim) - THROW(kresReadFault); -- chwInput = lsbf(chwInput); - return chwInput; - } - -@@ -161,11 +165,11 @@ utf16 GrBufferIStream::ReadUShortFromFon - ----------------------------------------------------------------------------------------------*/ - int GrBufferIStream::ReadIntFromFont() - { -- int nInput = *(int *)m_pbNext; -+ int nInput = 0; -+ RAW_READ(nInput,int,m_pbNext); - m_pbNext += isizeof(int); - if (m_pbLim && m_pbNext > m_pbLim) - THROW(kresReadFault); -- nInput = lsbf(nInput); - return nInput; - } - diff --git a/media-libs/silgraphite/metadata.xml b/media-libs/silgraphite/metadata.xml deleted file mode 100644 index bd3da2387cc..00000000000 --- a/media-libs/silgraphite/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo TeX Project</name> - </maintainer> - <use> - <flag name="pango">Enables the pango-graphite pango module.</flag> - </use> - <upstream> - <remote-id type="sourceforge">silgraphite</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-libs/silgraphite/silgraphite-2.3.1.ebuild b/media-libs/silgraphite/silgraphite-2.3.1.ebuild deleted file mode 100644 index 469fb9d86fb..00000000000 --- a/media-libs/silgraphite/silgraphite-2.3.1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils - -DESCRIPTION="Rendering engine for complex non-Roman writing systems" -HOMEPAGE="http://graphite.sil.org/"; -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - -LICENSE="|| ( CPL-0.5 LGPL-2.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="pango static-libs truetype xft" - -RDEPEND=" - pango? ( x11-libs/pango media-libs/fontconfig ) - truetype? ( media-libs/freetype:2 ) - xft? ( x11-libs/libXft )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-aligned_access.patch" - - # Drop DEPRECATED flags, bug #385533 - sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \ - wrappers/pangographite/Makefile.am wrappers/pangographite/Makefile.in \ - wrappers/pangographite/graphite/Makefile.am || die -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_with xft) \ - $(use_with truetype freetype) \ - $(use_with pango pangographite) -} - -src_install() { - default - find "${ED}" -name '*.la' -exec rm -f {} + -} diff --git a/profiles/package.mask b/profiles/package.mask index f9a6e1919db..679da79c026 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -384,11 +384,6 @@ dev-php/PEAR-Translation2 # with it, bug #626292 =dev-libs/libfilezilla-0.10.0 -# Michał Górny <[email protected]> (04 Aug 2017) -# Obsolete. Replaced by media-gfx/graphite2. No longer used -# by anything. Removal in 30 days. Bug #594314. -media-libs/silgraphite - # Alexey Shvetsov <[email protected]> (26 Jul 2017) # Its pre release so better to mask it =media-gfx/freecad-0.17_pre*
