From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C4EF913800E for ; Thu, 18 Feb 2016 09:59:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F391E087D; Thu, 18 Feb 2016 09:59:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD7BCE087D for ; Thu, 18 Feb 2016 09:59:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C21933408EC for ; Thu, 18 Feb 2016 09:59:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7119A8E8 for ; Thu, 18 Feb 2016 09:59:44 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1455789579.57ebab71b3b347b1cc607ea6180f96fed188712b.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-web/files/, dev-java/icedtea-web/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/icedtea-web/files/icedtea-web-1.6-respect-ldflags.patch dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild dev-java/icedtea-web/icedtea-web-1.6.1.ebuild X-VCS-Directories: dev-java/icedtea-web/files/ dev-java/icedtea-web/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 57ebab71b3b347b1cc607ea6180f96fed188712b X-VCS-Branch: master Date: Thu, 18 Feb 2016 09:59:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3c87254a-470a-451e-a22b-337ae4687ba2 X-Archives-Hash: 6c481ff920c8787ad21b9c20cafb812b commit: 57ebab71b3b347b1cc607ea6180f96fed188712b Author: James Le Cuirot gentoo org> AuthorDate: Thu Feb 18 09:57:27 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Feb 18 09:59:39 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ebab71 dev-java/icedtea-web: Remove unnecessary lib checks, closes #574286 Also tighten the glib dependency. Package-Manager: portage-2.2.27 .../files/icedtea-web-1.6-respect-ldflags.patch | 29 ++++++++++++++-------- .../files/icedtea-web-1.6-unused-libs.patch | 20 +++++++++++++++ ...eb-1.6.1.ebuild => icedtea-web-1.6.1-r1.ebuild} | 5 ++-- 3 files changed, 42 insertions(+), 12 deletions(-) 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 index 1d03b7c..551bb9c 100644 --- 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 @@ -1,18 +1,27 @@ --- Makefile.am.orig 2015-09-11 14:02:04.245280051 +0100 -+++ Makefile.am 2015-12-18 21:37:43.328862431 +0000 -@@ -344,7 +344,7 @@ - $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc - mkdir -p $(PLUGIN_DIR) && \ ++++ Makefile.am.orig 2016-01-27 22:20:28.288032089 +0000 +@@ -362,7 +362,7 @@ + + $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) cd $(PLUGIN_DIR) && \ - $(CXX) $(CXXFLAGS) \ + $(CXX) $(CXXFLAGS) $(LDFLAGS) \ - $(DEFS) $(VERSION_DEFS) \ - -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ - -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ -@@ -362,7 +362,7 @@ + $(PLUGIN_OBJECTS) \ + $(GLIB_LIBS) \ + $(MOZILLA_LIBS) \ +@@ -419,7 +419,7 @@ + + $(CPP_UNITTEST_EXECUTABLE): $(CPP_UNITTEST_FRAMEWORK_LIB) stamps/cpp-unit-tests-compile.stamp + cd $(CPP_UNITTEST_DIR) && \ +- $(CXX) $(CXXFLAGS) \ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) \ + $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) \ + $(CPP_UNITTEST_DIR)/*.o \ + -lrt \ +@@ -1252,7 +1252,7 @@ - $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) - cd $(PLUGIN_DIR) && \ + $(COVERABLE_PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(COVERABLE_PLUGIN_DIR)/,$(PLUGIN_OBJECTS)) + cd $(COVERABLE_PLUGIN_DIR) && \ - $(CXX) $(CXXFLAGS) \ + $(CXX) $(CXXFLAGS) $(LDFLAGS) \ $(PLUGIN_OBJECTS) \ 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 new file mode 100644 index 0000000..b0dc15d --- /dev/null +++ b/dev-java/icedtea-web/files/icedtea-web-1.6-unused-libs.patch @@ -0,0 +1,20 @@ +--- configure.ac.orig 2015-09-11 14:02:04.250280108 +0100 ++++ configure.ac 2016-02-18 09:36:04.684624293 +0000 +@@ -55,17 +55,6 @@ + IT_SET_VERSION + IT_CHECK_XULRUNNER_VERSION + +-AC_CHECK_LIB(z, main,, [AC_MSG_ERROR("zlib not found - try installing zlib-devel")]) +-dnl Check for libX11 headers and libraries. +-PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) +-if test "x${X11_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find x11 - \ +- Try installing libX11-devel.]) +-fi +-AC_SUBST(X11_CFLAGS) +-AC_SUBST(X11_LIBS) +- + dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin + dnl IT563 - NetX uses sun.security code + dnl IT605 - NetX depends on sun.misc.HexDumpEncoder 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 similarity index 94% rename from dev-java/icedtea-web/icedtea-web-1.6.1.ebuild rename to dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild index 651a655..4ec469c 100644 --- a/dev-java/icedtea-web/icedtea-web-1.6.1.ebuild +++ b/dev-java/icedtea-web/icedtea-web-1.6.1-r1.ebuild @@ -18,7 +18,7 @@ IUSE="doc javascript nsplugin tagsoup test" RESTRICT="test" CDEPEND="javascript? ( dev-java/rhino:1.6 ) - nsplugin? ( >=dev-libs/glib-2.16 ) + nsplugin? ( >=dev-libs/glib-2.16:2= ) tagsoup? ( dev-java/tagsoup:0 )" DEPEND="${CDEPEND} @@ -39,7 +39,8 @@ RDEPEND="${CDEPEND} src_prepare() { # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2779 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2780 - epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags}.patch + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2855 + epatch "${FILESDIR}"/${PN}-1.6-{javadoc,no-hg,launchers,respect-ldflags,unused-libs}.patch if java-pkg_is-vm-version-ge "1.8" ; then sed -i 's/JAVADOC_OPTS=/\0-Xdoclint:none /g' Makefile.am || die