| 1 |
commit: 57ebab71b3b347b1cc607ea6180f96fed188712b |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 18 09:57:27 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 18 09:59:39 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ebab71 |
| 7 |
|
| 8 |
dev-java/icedtea-web: Remove unnecessary lib checks, closes #574286 |
| 9 |
|
| 10 |
Also tighten the glib dependency. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
|
| 14 |
.../files/icedtea-web-1.6-respect-ldflags.patch | 29 ++++++++++++++-------- |
| 15 |
.../files/icedtea-web-1.6-unused-libs.patch | 20 +++++++++++++++ |
| 16 |
...eb-1.6.1.ebuild => icedtea-web-1.6.1-r1.ebuild} | 5 ++-- |
| 17 |
3 files changed, 42 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch |
| 20 |
index 1d03b7c..551bb9c 100644 |
| 21 |
--- a/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch |
| 22 |
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch |
| 23 |
@@ -1,18 +1,27 @@ |
| 24 |
--- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100 |
| 25 |
-+++ Makefile.am 2015-12-18 21:37:43.328862431 +0000 |
| 26 |
-@@ -344,7 +344,7 @@ |
| 27 |
- $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc |
| 28 |
- mkdir -p $(PLUGIN_DIR) && \ |
| 29 |
++++ Makefile.am.orig 2016-01-27 22:20:28.288032089 +0000 |
| 30 |
+@@ -362,7 +362,7 @@ |
| 31 |
+ |
| 32 |
+ $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
| 33 |
cd $(PLUGIN_DIR) && \ |
| 34 |
- $(CXX) $(CXXFLAGS) \ |
| 35 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
| 36 |
- $(DEFS) $(VERSION_DEFS) \ |
| 37 |
- -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ |
| 38 |
- -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ |
| 39 |
-@@ -362,7 +362,7 @@ |
| 40 |
+ $(PLUGIN_OBJECTS) \ |
| 41 |
+ $(GLIB_LIBS) \ |
| 42 |
+ $(MOZILLA_LIBS) \ |
| 43 |
+@@ -419,7 +419,7 @@ |
| 44 |
+ |
| 45 |
+ $(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp |
| 46 |
+ cd $(CPP_UNITTEST_DIR) && \ |
| 47 |
+- $(CXX) $(CXXFLAGS) \ |
| 48 |
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
| 49 |
+ $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \ |
| 50 |
+ $(CPP_UNITTEST_DIR)/*.o \ |
| 51 |
+ -lrt \ |
| 52 |
+@@ -1252,7 +1252,7 @@ |
| 53 |
|
| 54 |
- $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
| 55 |
- cd $(PLUGIN_DIR) && \ |
| 56 |
+ $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) |
| 57 |
+ cd $(COVERABLE_PLUGIN_DIR) && \ |
| 58 |
- $(CXX) $(CXXFLAGS) \ |
| 59 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ |
| 60 |
$(PLUGIN_OBJECTS) \ |
| 61 |
|
| 62 |
diff --git a/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch |
| 63 |
new file mode 100644 |
| 64 |
index 0000000..b0dc15d |
| 65 |
--- /dev/null |
| 66 |
+++ b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch |
| 67 |
@@ -0,0 +1,20 @@ |
| 68 |
+--- configure.ac.orig 2015-09-11 14:02:04.250280108 +0100 |
| 69 |
++++ configure.ac 2016-02-18 09:36:04.684624293 +0000 |
| 70 |
+@@ -55,17 +55,6 @@ |
| 71 |
+ IT_SET_VERSION |
| 72 |
+ IT_CHECK_XULRUNNER_VERSION |
| 73 |
+ |
| 74 |
+-AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")]) |
| 75 |
+-dnl Check for libX11 headers and libraries. |
| 76 |
+-PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) |
| 77 |
+-if test "x${X11_FOUND}" = xno |
| 78 |
+-then |
| 79 |
+- AC_MSG_ERROR([Could not find x11 - \ |
| 80 |
+- Try installing libX11-devel.]) |
| 81 |
+-fi |
| 82 |
+-AC_SUBST(X11_CFLAGS) |
| 83 |
+-AC_SUBST(X11_LIBS) |
| 84 |
+- |
| 85 |
+ dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin |
| 86 |
+ dnl IT563 - NetX uses sun.security code |
| 87 |
+ dnl IT605 - NetX depends on sun.misc.HexDumpEncoder |
| 88 |
|
| 89 |
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild |
| 90 |
similarity index 94% |
| 91 |
rename from dev-java/icedtea-web/icedtea-web-1.6.1.ebuild |
| 92 |
rename to dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild |
| 93 |
index 651a655..4ec469c 100644 |
| 94 |
--- a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild |
| 95 |
+++ b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild |
| 96 |
@@ -18,7 +18,7 @@ IUSE="doc javascript nsplugin tagsoup test" |
| 97 |
RESTRICT="test" |
| 98 |
|
| 99 |
CDEPEND="javascript? ( dev-java/rhino:1.6 ) |
| 100 |
- nsplugin? ( >=dev-libs/glib-2.16 ) |
| 101 |
+ nsplugin? ( >=dev-libs/glib-2.16:2= ) |
| 102 |
tagsoup? ( dev-java/tagsoup:0 )" |
| 103 |
|
| 104 |
DEPEND="${CDEPEND} |
| 105 |
@@ -39,7 +39,8 @@ RDEPEND="${CDEPEND} |
| 106 |
src_prepare() { |
| 107 |
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779 |
| 108 |
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780 |
| 109 |
- epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags}.patch |
| 110 |
+ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855 |
| 111 |
+ epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch |
| 112 |
|
| 113 |
if java-pkg_is-vm-version-ge "1.8" ; then |
| 114 |
sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die |
Archives