Trivially modify port-to-xulrunner-2 patch for backwards compatibility with xulrunner-1.9, requested by robbat2.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

3 files changed, 13 insertions, 8 deletions

diff --git a/gnome-extra/yelp/ChangeLog b/gnome-extra/yelp/ChangeLog
index 09614a279166..18cf10564286 100644
--- a/gnome-extra/yelp/ChangeLog
+++ b/gnome-extra/yelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/yelp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.270 2011/11/04 06:02:36 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/ChangeLog,v 1.271 2011/11/24 03:49:04 tetromino Exp $
+
+  24 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  yelp-2.30.2-r6.ebuild, -files/yelp-2.30.2-port-to-xulrunner-2-r1.patch,
+  +files/yelp-2.30.2-port-to-xulrunner-2-r2.patch:
+  Trivially modify port-to-xulrunner-2 patch for backwards compatibility with
+  xulrunner-1.9, requested by robbat2.
 
 *yelp-3.2.1 (04 Nov 2011)
 
diff --git a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r1.patch b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch
index a4e7df9882ed..95904eae84d3 100644
--- a/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r1.patch
+++ b/gnome-extra/yelp/files/yelp-2.30.2-port-to-xulrunner-2-r2.patch
@@ -2,6 +2,7 @@ https://bugs.gentoo.org/show_bug.cgi?id=330847
 
 Patch by the OpenSUSE folks, found by pacho.
 Updated with https://build.opensuse.org/request/show/69983
+Updated to extend lower bound of greVersion in yelp_gecko_init() down to 1.9a
 
 Index: yelp-2.30.2/m4/gecko.m4
 ===================================================================
@@ -230,13 +231,11 @@ Index: yelp-2.30.2/src/yelp-gecko-utils.cpp
 ===================================================================
 --- yelp-2.30.2.orig/src/yelp-gecko-utils.cpp
 +++ yelp-2.30.2/src/yelp-gecko-utils.cpp
-@@ -213,8 +213,8 @@ yelp_gecko_init (void)
- 	nsresult rv;
+@@ -214,7 +214,7 @@ yelp_gecko_init (void)
  #ifdef XPCOM_GLUE
      static const GREVersionRange greVersion = {
--    "1.9a", PR_TRUE,
+     "1.9a", PR_TRUE,
 -    "2", PR_TRUE
-+    "2.0a", PR_TRUE,
 +    "2.0.*", PR_TRUE
      };
      char xpcomLocation[PATH_MAX];
diff --git a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
index 94322dece1c5..3463175cc5b1 100644
--- a/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
+++ b/gnome-extra/yelp/yelp-2.30.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.2 2011/08/09 18:56:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/yelp/yelp-2.30.2-r6.ebuild,v 1.3 2011/11/24 03:49:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -25,7 +25,7 @@ RDEPEND=">=gnome-base/gconf-2:2
 	>=dev-libs/libxslt-1.1.4
 	>=x11-libs/startup-notification-0.8
 	>=dev-libs/dbus-glib-0.71
-	>=net-libs/xulrunner-2.0:1.9
+	net-libs/xulrunner:1.9
 	sys-libs/zlib
 	app-arch/bzip2
 	>=app-text/rarian-0.7
@@ -56,7 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.28.1-system-nspr.patch"
 
 	# Fix build with xulrunner-2.0 (we really need to get rid of this package)
-	epatch "${FILESDIR}/${P}-port-to-xulrunner-2-r1.patch"
+	epatch "${FILESDIR}/${P}-port-to-xulrunner-2-r2.patch"
 
 	# Use g_build_filename to avoid missing slash problem
 	epatch "${FILESDIR}/${P}-missing-slash.patch"