Patch from upstream tracker for "Save As" crashing wrt #498898 by Helmut Jarausch

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 153 insertions, 10 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 799bbc6f6cd4..b05234c1ce82 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.128 2014/06/02 16:50:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.129 2014/07/22 10:36:03 ssuominen Exp $
+
+*midori-0.5.8-r1 (22 Jul 2014)
+
+  22 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> +midori-0.5.8-r1.ebuild:
+  Patch from upstream tracker for "Save As" crashing wrt #498898 by Helmut
+  Jarausch
 
   02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> midori-0.5.5.ebuild:
   Remove ~ppc keywording because of inactivity (can be restored if we get a
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index c253cdcaf638..0ae789a9c0a4 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST midori-0.5.8-save_as.patch.xz 7356 SHA256 29ab8718215cbbfa88a261da453736f3228fb1b618f1b541c3f4142f1a40233e SHA512 26ba30cd5c739921f3b44e50d0361f74e113ee75635efa4b2bb904442c71a5610178fb6989bd0101f7746bff04163bfe57bc142547306cf3539c99d87f971b6e WHIRLPOOL ecb57457303deacb73bfba2e88e7fcf0022b00b690aa74a8f222cdeeee47df5dd833c5f6a9fcfb705e67070f1eb9f1bd371ed8078ca1bdc4f0e1b936d228eaee
 DIST midori_0.5.5_all_.tar.bz2 1092309 SHA256 ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62 SHA512 89d1ddb461af460a83744cc761989d430750dcef9565ac98960c1c87e6082ebb35e61c4f21f28891a19119e2733dc8a6440bc51c0bd206c37ac068e434fc0231 WHIRLPOOL 699cf9792b6ce070cdaa29fe06db3c6d75bca23797252028925e1bee5a66704881653c39e2257bfcb861d4c82205605f2d4f38e8b708d559318284af81e1a73a
 DIST midori_0.5.8_all_.tar.bz2 1267130 SHA256 af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381 SHA512 3c1129324b05301502dfa4ad9147a160c7af269424451d2afba7ff2d455232274b2322699011950355cb406405bf2e38668e9cb56b748ecb87afdfd3a0e375e5 WHIRLPOOL fcc4a1c3e1b4968d0feb06b01742ba06b2ac1b0f28c17fb4369300a1cba94937a21e3aff5c2142e160fd54743ffb5d2996df38bbd88dd6aefd7a9e0a28a92a07
 EBUILD midori-0.5.5.ebuild 2471 SHA256 ee3f6aa40375a0fe4428aca28f7e9622d588c03a1f77f3a136ca348e062ffdb4 SHA512 5a6f1d32156945184e65329ec9dd7b00356bd15df8317d2864cc29a138667de6e706db9340f092fd154249dfb1a047d999473f2ff0c9ce291a4eb4227d30b3fe WHIRLPOOL 5155c9767c583f84847a93084e8e20891a73913072f52af0c0903169fa42e5397c98736826d9fcc799d2ff1bbdbb6a41aa810db948f03aaed3b1de268bfaf93d
+EBUILD midori-0.5.8-r1.ebuild 3103 SHA256 7ec9df34473a6e6a84664de5e9a381a1186131da692de0bc29125127de8ad0d5 SHA512 09a60d0e4979511d666025f654d58235af17be12197468922e5bc727c928319f908b8a857a0453ab40ce88cf74c5c6ef2440b6a7f756d21f2f40179a9913073d WHIRLPOOL 972c63e8a8ae709bb435d3d82ace51005612cdbf4621d78278bbd50c7bab5f48dfea2eb0ba95e50b21b1debea42538ff4f3f23899519d71095da5a69cb4fea6a
 EBUILD midori-0.5.8.ebuild 2992 SHA256 c1c825ecafc95a9fb04ccecb7eec2b3950f1fab85b5006a5b1a6b6e39a04ecfe SHA512 f60171751f3b241f93e7de2f5a1d9394ec12e552560509d32344137cc625eb8aa5b11e5fcff85849bff35faffcb45fe35e0218ca57f6c1e6e712fe316940b3c5 WHIRLPOOL e61d852df63c487c905d1619b08a054996e5dea9038f94b5acd485ad256a5be9b451c98a491886bab8701de590229d58cc9f48acbd79d3ec3406bf782e8269c3
-MISC ChangeLog 19279 SHA256 dda458fb0ac5dc8fc980d47d2e55f316570802f2a13931c4ddfa346cf8a75b10 SHA512 c404a7895e4bb5499c26084b0d8c70562433e5fe17df813155d24070ffccffc91f9ed649b6d9474dbcc0324edeb1873f9719c67c1b131cd814d92a468d2addbc WHIRLPOOL 99028c76ecae5f8e15ca7a375055f18c40b44282e4d6e15d4f491da34a90e99a74ab65ec9a252bdd68bab2137b6970e104b143b4deb19b405e1a3b0ef95cb557
+MISC ChangeLog 19477 SHA256 4a5595f2a3ebe0c7881bc1bd34c7fbdc62e5c13ac99c32e683a08640b96c255b SHA512 ee267e334f8bf7d41f7ee8d6640759749665233b02945543acd6c9038ac8dec8feb6d0fff4834321c659a9514aeb5323b235161abe0f5893f0a2d0016a4f6510 WHIRLPOOL ac9eba9f50cd76517f0789377c360cc6c392aa20f75787371a36f9c8bb691869906085e06cf79d6165bd830fa99115cbbb9f76a1f1765fc7206545a7579a31ca
 MISC metadata.xml 698 SHA256 e5159b309d3060133cc0776a8f5e936bf7bb27a8b4d382d122fc68c1d1745a35 SHA512 e8119fd0d98542eea6e654b1a33d9968ac385ab2d0a00b18908ac8d25dc6020251d905f1b8f272805082a78662ce192411394cdeed63ab1dab1bb680c7bae019 WHIRLPOOL 3d9a43fe94fd91851a1908f12fc1ba290603874bb3f9d0a609dd138b91f953fa0b608d82e5d629581df54b09231d05293e5aaad5b7e00d0d2d5a614dc1638b45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTjKrPAAoJEEdUh39IaPFNmhkH/jFG8F3iC8s2QYq+q0DjjOtA
-IeLU/4gucL4byi/ixwZvhB0Lv5t1mMiNcF2gQpWoiSGYaOuuda4zzvD234N2/YeL
-L40LaOxIFW6TI/H6mWnY2J7DV25GFVPGuMZnaziS9qGQAW2vJq2kCIXaeMXCgqSb
-Zd+b9RhxHi1FYKITQ0j6I7icH+e0r9hMM8v9wfoCpbpdePEXEf71yrECXP2Tnd3E
-kHedCckYYg7L/qiGEOtzeVbUf73lqrTTo07scMbdAmsgjHm5d/Iwk3HhB7cTFm3Z
-e0C5AOTAEACx/XQdgCxTH7Ov+akwxhN1jbwJdjqwxuNa/DLNmxyEP7I7eP5pAsI=
-=94DM
+iQEcBAEBCAAGBQJTzj1uAAoJEEdUh39IaPFNPD4H/izSS4l+yTL6CX4udKFPf1+T
+nC71thzSGU82CiqxzU7FOapbhTu3o+8QMsL39z4pjx909fDqY81y6uIEALU4PpCB
+IJ6jQowzASWMAAbBj5JX1b+GjJNHiv+GYqPJ9OLJ6pQo0bvTBS1TTMC8YGt1tnZA
+k5xjwtUSN7tL85A3XjBEQUuzr9ePxrCXF5QY/7CiyYPWhlEUmH0ohTy6HU9h36bP
+1iuKJfFmvg1kSUK3eNUsuRkykuT4lGWd5kdS1nCQi6hW8ZAEQwIhn1Rc6Jll67Gj
+BExjoCgyLzXc947t3h5t08ZhJ90TXgl/MiX2NHUSlwDJxTZXHbK5r6jPhqV2d/8=
+=Zz8w
 -----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-0.5.8-r1.ebuild b/www-client/midori/midori-0.5.8-r1.ebuild
new file mode 100644
index 000000000000..3cd566b1da9d
--- /dev/null
+++ b/www-client/midori/midori-0.5.8-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.8-r1.ebuild,v 1.1 2014/07/22 10:36:03 ssuominen Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.16
+
+PYTHON_COMPAT=( python2_7 )
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2
+		http://dev.gentoo.org/~ssuominen/${P}-save_as.patch.xz"
+fi
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 cmake-utils vala ${_live_inherits}
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.midori-browser.org/"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="deprecated doc granite introspection +jit +webkit2 zeitgeist"
+
+RDEPEND=">=dev-db/sqlite-3.6.19:3
+	>=dev-libs/glib-2.32.3
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.38:2.4
+	>=net-libs/libsoup-gnome-2.38:2.4
+	>=x11-libs/libnotify-0.7
+	x11-libs/libXScrnSaver
+	deprecated? (
+		>=net-libs/webkit-gtk-1.8.1:2[jit=]
+		>=x11-libs/gtk+-2.24:2
+		)
+	!deprecated? (
+		>=app-crypt/gcr-3
+		x11-libs/gtk+:3
+		webkit2? ( >=net-libs/webkit-gtk-1.11.91:3[jit=] )
+		!webkit2? ( >=net-libs/webkit-gtk-1.8.1:3[jit=] )
+		)
+	granite? ( >=dev-libs/granite-0.2 )
+	introspection? ( dev-libs/gobject-introspection )
+	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.14 )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/intltool
+	gnome-base/librsvg
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )"
+REQUIRED_USE="granite? ( !deprecated )
+	introspection? ( deprecated )
+	webkit2? ( !deprecated )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-save_as.patch #498898
+	vala_src_prepare
+	sed -i -e '/install/s:COPYING:HACKING TODO TRANSLATE:' CMakeLists.txt || die
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		$(cmake-utils_use_use doc APIDOCS)
+		$(cmake-utils_use_use introspection GIR)
+		$(cmake-utils_use_use granite)
+		$(cmake-utils_use_use zeitgeist)
+		-DVALA_EXECUTABLE="${VALAC}"
+		)
+
+	if use deprecated; then
+		mycmakeargs+=(
+			-DUSE_GTK3=OFF
+			-DHALF_BRO_INCOM_WEBKIT2=OFF
+			)
+	else
+		mycmakeargs+=(
+			-DUSE_GTK3=ON
+			$(cmake-utils_use webkit2 HALF_BRO_INCOM_WEBKIT2)
+			)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local jit_is_enabled
+	if use deprecated; then
+		has_version 'net-libs/webkit-gtk:2[jit]' && jit_is_enabled=yes
+	else
+		has_version 'net-libs/webkit-gtk:3[jit]' && jit_is_enabled=yes
+	fi
+	[[ ${jit_is_enabled} == yes ]] && pax-mark -m "${ED}"/usr/bin/${PN} #480290
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}