Apply fixed PNGs from upstream git commit to fix cairo/libpng-1.6 crash (bug #465658)

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

2 files changed, 135 insertions, 1 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 204872472e80..4a16a7622c2d 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.61 2013/04/02 20:55:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.62 2013/04/13 06:02:03 yngwin Exp $
+
+*fcitx-4.2.7-r1 (13 Apr 2013)
+
+  13 Apr 2013; Ben de Groot <yngwin@gentoo.org> +fcitx-4.2.7-r1.ebuild:
+  Apply fixed PNGs from upstream git commit to fix cairo/libpng-1.6 crash (bug
+  #465658)
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> fcitx-4.2.7.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild b/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild
new file mode 100644
index 000000000000..c48a81a1ef6f
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild,v 1.1 2013/04/13 06:02:03 yngwin Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils gnome2-utils fdo-mime multilib readme.gentoo
+
+DESCRIPTION="Flexible Contect-aware Input Tool with eXtension support"
+HOMEPAGE="http://fcitx-im.org/"
+SRC_URI="http://fcitx.googlecode.com/files/${P}_dict.tar.xz
+	http://dev.gentoo.org/~yngwin/distfiles/${P}-fixed-pngs.tgz" #465658
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
+nls opencc +pango qt4 snooper static-libs +table test +xml"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXinerama
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		pango? ( x11-libs/pango[X] )
+		!pango? ( media-libs/fontconfig )
+	)
+	dbus? ( sys-apps/dbus )
+	enchant? ( app-text/enchant )
+	gtk? (
+		x11-libs/gtk+:2
+		dev-libs/glib:2
+		dev-libs/dbus-glib
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		dev-libs/glib:2
+		dev-libs/dbus-glib
+	)
+	icu? ( dev-libs/icu:= )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua )
+	opencc? ( app-i18n/opencc )
+	qt4? (
+		dev-qt/qtgui:4[dbus,glib]
+		dev-qt/qtdbus:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+		x11-libs/libxkbfile
+	)"
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog README THANKS TODO
+	doc/pinyin.txt doc/cjkvinput.txt doc/API.txt doc/Develop_Readme )
+HTML_DOCS=( doc/wb_fh.htm )
+
+src_prepare() {
+	use autostart && DOC_CONTENTS="You have enabled the autostart USE flag,
+	which will let fcitx start automatically on XDG compatible desktop
+	environments, such as Gnome, KDE, LXDE, Razor-qt and Xfce. If you use
+	~/.xinitrc to configure your desktop, make sure to include the fcitx
+	command to start it."
+
+	cp -a ../skin . || die 'copying fixed pngs failed' #465658
+	epatch "${FILESDIR}/${P}-gcc46-compatible.patch"
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		$(cmake-utils_use_enable X X11)
+		$(cmake-utils_use_enable autostart XDGAUTOSTART)
+		$(cmake-utils_use_enable cairo CAIRO)
+		$(cmake-utils_use_enable dbus DBUS)
+		$(cmake-utils_use_enable debug DEBUG)
+		$(cmake-utils_use_enable enchant ENCHANT)
+		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
+		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
+		$(cmake-utils_use_enable icu ICU)
+		$(cmake-utils_use_enable introspection GIR)
+		$(cmake-utils_use_enable lua LUA)
+		$(cmake-utils_use_enable nls GETTEXT)
+		$(cmake-utils_use_enable opencc OPENCC)
+		$(cmake-utils_use_enable pango PANGO)
+		$(cmake-utils_use_enable qt4 QT)
+		$(cmake-utils_use_enable qt4 QT_IM_MODULE)
+		$(cmake-utils_use_enable qt4 QT_GUI)
+		$(cmake-utils_use_enable snooper SNOOPER)
+		$(cmake-utils_use_enable static-libs STATIC)
+		$(cmake-utils_use_enable table TABLE)
+		$(cmake-utils_use_enable test TEST)
+		$(cmake-utils_use_enable xml LIBXML2)"
+	if use gtk || use gtk3 || use qt4 ; then
+		mycmakeargs+=" -DENABLE_GLIB2=ON "
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	use autostart && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use autostart && readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}