| 1 |
caster 11/09/06 11:56:40 |
| 2 |
|
| 3 |
Added: |
| 4 |
0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch |
| 5 |
Log: |
| 6 |
Add missing patch, thanks to marienz |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch |
| 17 |
=================================================================== |
| 18 |
From 7544a3364642a820737ba8d943e8deb2e39b6aa6 Mon Sep 17 00:00:00 2001 |
| 19 |
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
| 20 |
Date: Mon, 5 Sep 2011 00:26:38 +0200 |
| 21 |
Subject: [PATCH] Support using NPAPI-SDK headers instead of whole xulrunner. |
| 22 |
|
| 23 |
The first NPAPI-SDK header package with npapi-sdk.pc comes with libxul 2.0 |
| 24 |
headers, thus hardcoded that version into it. But the code should be modified |
| 25 |
to use NPAPI versioning rather than Mozilla one. Or just drop compat with |
| 26 |
ancient versions. |
| 27 |
--- |
| 28 |
acinclude.m4 | 11 +++++++++-- |
| 29 |
1 files changed, 9 insertions(+), 2 deletions(-) |
| 30 |
|
| 31 |
diff --git a/acinclude.m4 b/acinclude.m4 |
| 32 |
index 3c3803b..58482f1 100644 |
| 33 |
--- a/acinclude.m4 |
| 34 |
+++ b/acinclude.m4 |
| 35 |
@@ -346,8 +346,15 @@ if test "x${enable_plugin}" = "xyes" ; then |
| 36 |
AC_SUBST(GTK_CFLAGS) |
| 37 |
AC_SUBST(GTK_LIBS) |
| 38 |
|
| 39 |
- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin) |
| 40 |
- |
| 41 |
+ PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [ |
| 42 |
+ AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[ |
| 43 |
+ # XXX: use NPAPI versions instead |
| 44 |
+ xulrunner_cv_collapsed_version=20000000 |
| 45 |
+ ]) |
| 46 |
+ ], [ |
| 47 |
+ PKG_CHECK_MODULES(MOZILLA, mozilla-plugin) |
| 48 |
+ ]) |
| 49 |
+ |
| 50 |
AC_SUBST(MOZILLA_CFLAGS) |
| 51 |
AC_SUBST(MOZILLA_LIBS) |
| 52 |
fi |
| 53 |
-- |
| 54 |
1.7.6.1 |
Archives