From: Vlastimil Babka <caster@gentoo.org>
Date: Tue, 6 Sep 2011 11:56:40 +0000 (+0000)
Subject: Add missing patch, thanks to marienz
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d4757f8d7f3e1cb93716927e67c42169af5916a0;p=gentoo.git

Add missing patch, thanks to marienz

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
---

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index a1f03cacae95..4c4e986b9ccf 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.8 2011/09/06 09:57:09 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.9 2011/09/06 11:56:40 caster Exp $
+
+  06 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  +files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch:
+  Add missing patch, thanks to marienz
 
 *icedtea-web-1.1.2 (06 Sep 2011)
 
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 78dd03430373..d6fa1eb85547 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,6 +1,7 @@
+AUX 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch 1210 RMD160 d151ee610070429d73d676e07a4bc9b876f1b5b0 SHA1 3a9983dabe0387e9bc396326d937e98830fdaf34 SHA256 90ad27ff80dc42159aef9f4950511328f4ed78941911ce1f89608c08632808c7
 DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7
 DIST icedtea-web-1.1.2.tar.gz 807736 RMD160 7ca33e6759aec27567a22b07f02afc775339d513 SHA1 f862220b4504e688706b743f68f62c81e57bc183 SHA256 3051f3bf1e1d07ad7aaa28b204821a7c0631848d20ba7942fc23440e774649e4
 EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 b3eef443697d0cafb9e1a70c6bb9c93c33038584 SHA1 ff96d27e0bb41d218706a41ad5350d77d17ac2dd SHA256 25a42a88413bdd32f83517ed201ccccfb216407f3e2ac6e2653bb57c91b0ea43
 EBUILD icedtea-web-1.1.2.ebuild 4097 RMD160 4afc897e9040e85afc810a82e21632cfbc8641da SHA1 49521a25026cf2d15b37270e251e3a8fe1a35258 SHA256 d42f088e62c25c0fa3b134c364a5b941d360f4bfe78cc292e31bbb94222420b4
-MISC ChangeLog 1740 RMD160 a27b4c7a3fab4d24430b4ed0260b41cbe0c684c9 SHA1 cd869f27eba7eb755b47335cec5d753cede9d2b5 SHA256 f234970c180a4a2f18d707f4458b5df0eacf0c1ba8d0873bf2923d19c1af5e57
+MISC ChangeLog 1905 RMD160 69a263de259eca4ed578fbb584337c878a1b6e14 SHA1 80e81b644ddeb558f888e9bd21ffa6a0a20942c1 SHA256 888f5321dfb2d1a01926b4fd7561890ed676479ff7c2cfa7fcac6da5946af0ee
 MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
diff --git a/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch b/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
new file mode 100644
index 000000000000..5e8596146c17
--- /dev/null
+++ b/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch
@@ -0,0 +1,38 @@
+From 7544a3364642a820737ba8d943e8deb2e39b6aa6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 5 Sep 2011 00:26:38 +0200
+Subject: [PATCH] Support using NPAPI-SDK headers instead of whole xulrunner.
+
+The first NPAPI-SDK header package with npapi-sdk.pc comes with libxul 2.0
+headers, thus hardcoded that version into it. But the code should be modified
+to use NPAPI versioning rather than Mozilla one. Or just drop compat with
+ancient versions.
+---
+ acinclude.m4 |   11 +++++++++--
+ 1 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 3c3803b..58482f1 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -346,8 +346,15 @@ if test "x${enable_plugin}" = "xyes" ; then
+   AC_SUBST(GTK_CFLAGS)
+   AC_SUBST(GTK_LIBS)
+ 
+-  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+-    
++  PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
++    AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
++      # XXX: use NPAPI versions instead
++      xulrunner_cv_collapsed_version=20000000
++    ])
++  ], [
++    PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
++  ])
++
+   AC_SUBST(MOZILLA_CFLAGS)
+   AC_SUBST(MOZILLA_LIBS)
+ fi
+-- 
+1.7.6.1
+