Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 285663 Details for
Bug 381957
dev-java/icedtea-web: please support building against npapi-sdk
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to the ebuild
0002-dev-java-icedtea-web-Add-a-test-ebuild-for-icedtea-w.patch (text/plain), 5.25 KB, created by
Michał Górny
on 2011-09-05 17:11:10 UTC
(
hide
)
Description:
Patch to the ebuild
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2011-09-05 17:11:10 UTC
Size:
5.25 KB
patch
obsolete
>From bc4008eacc242598ee4f7cdf059dc0a1ee9a4d06 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 09:45:14 +0200 >Subject: [PATCH 2/3] dev-java/icedtea-web: Add a test ebuild for icedtea-web, > building against NPAPI-SDK. > >(Portage version: 2.2.0_alpha51_p82/git/Linux x86_64, signed Manifest commit with key 42B9401D) >--- > dev-java/icedtea-web/Manifest | 13 ++++--- > ...ng-NPAPI-SDK-headers-instead-of-whole-xul.patch | 38 ++++++++++++++++++++ > dev-java/icedtea-web/icedtea-web-1.1.1.ebuild | 19 ++++++++-- > 3 files changed, 60 insertions(+), 10 deletions(-) > create mode 100644 dev-java/icedtea-web/files/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch > >diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest >index 7ed6481..922279b 100644 >--- a/dev-java/icedtea-web/Manifest >+++ b/dev-java/icedtea-web/Manifest >@@ -1,15 +1,16 @@ > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > >+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 >-EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 5c9b89c18766dde518b8f6f5a442464a5cff1d80 SHA1 cab1ac9021a1adcb1d237dc11224c08143481423 SHA256 cf529d6217d81edfbe9bdf40e4a36bfef0e84352c553e2120b76814a661e63b4 >+EBUILD icedtea-web-1.1.1.ebuild 4135 RMD160 c46e54bb74408834370f820a99dc2e71a6e40c55 SHA1 f5b58d296b2a8b06a0d313466396dfc27f1ca68d SHA256 f7e914de1d7d3ab99f9a7b53b726162fdce056b280507980e1f79a14bc64c861 > MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6 > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.18 (GNU/Linux) > >-iJwEAQEIAAYFAk5j/L4ACgkQfXuS5UK5QB1gOwP+ISk3tSUNS450W+KlQ271xwcZ >-LJQ5dT/M5bwj9OwO0Jy+MVelbA21npcwSlstlxhezITd+HrdIiz9KTPf1X3rpsDg >-tZrA8FyVLcsgxEmgQ3CbSWu+2pQAS91TfZHx9Ms1z2SMIqrPXGv5Mk2mrUj8daF8 >-arYINW608mr6Qkg7ykw= >-=LlwC >+iJwEAQEIAAYFAk5kj2YACgkQfXuS5UK5QB0PeQP9F8ZYxcPrc6emsos1xFMuKk1y >+9zQTy5LNgx0hN1jUTNbHhD6Udvuincy+ysb0D81NqdhBY5kvJtbZxFh8EIiH3vqD >+C/ndtk3rYIkJQfvLlh9J04GiZfhG1IAoL79FHaunARXVETiYB38SJkvh3R2LPJAz >+y1nl0phlAcCMJKZffWA= >+=5v6N > -----END PGP SIGNATURE----- >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 0000000..5e85961 >--- /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 >+ >diff --git a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild >index a9fe311..968ba5f 100644 >--- a/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild >+++ b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild >@@ -5,7 +5,7 @@ > > EAPI="2" > >-inherit eutils java-pkg-2 java-vm-2 >+inherit autotools base eutils java-pkg-2 java-vm-2 > > LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" > SLOT="6" >@@ -17,9 +17,11 @@ HOMEPAGE="http://icedtea.classpath.org" > > IUSE="build doc +nsplugin" > >-RDEPEND="dev-java/icedtea:${SLOT} >- nsplugin? ( >=net-libs/xulrunner-1.9.1 )" >-DEPEND="${RDEPEND}" >+RDEPEND="dev-java/icedtea:${SLOT}" >+DEPEND="${RDEPEND} >+ nsplugin? ( >+ || ( net-misc/npapi-sdk >+ >=net-libs/xulrunner-1.9.1 ) )" > > # a bit of hack so the VM switching is triggered without causing dependency troubles > JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" >@@ -60,6 +62,15 @@ src_unpack() { > default > } > >+src_prepare() { >+ local PATCHES=( >+ "${FILESDIR}"/0001-Support-using-NPAPI-SDK-headers-instead-of-whole-xul.patch >+ ) >+ >+ base_src_prepare >+ eautoreconf >+} >+ > src_configure() { > local vmhome=$(java-config -O) > >-- >1.7.6.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 381957
: 285663