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 5CCB413827E for ; Wed, 11 Dec 2013 14:41:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14669E0B85; Wed, 11 Dec 2013 14:41:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BF7AE0B85 for ; Wed, 11 Dec 2013 14:41:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9232833FA64 for ; Wed, 11 Dec 2013 14:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1E1CED0045 for ; Wed, 11 Dec 2013 14:40:58 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1386772822.e676864fd940e7f07f4762e5d01ddbde0b765420.polynomial-c@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/files/ X-VCS-Repository: proj/mozilla X-VCS-Files: www-client/seamonkey/files/8000_allow_system_icu.patch www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch www-client/seamonkey/files/moz25-drop-Wl-build-id.patch X-VCS-Directories: www-client/seamonkey/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: e676864fd940e7f07f4762e5d01ddbde0b765420 X-VCS-Branch: master Date: Wed, 11 Dec 2013 14:40:58 +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: b80e87ef-0b7a-4b85-88b6-ac5de0bdef10 X-Archives-Hash: a258606f8dcb7a442df2ad0985ca34a6 commit: e676864fd940e7f07f4762e5d01ddbde0b765420 Author: Lars Wendler gentoo org> AuthorDate: Wed Dec 11 14:40:22 2013 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed Dec 11 14:40:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=e676864f seamonkey: Removed obsolete files. --- .../seamonkey/files/8000_allow_system_icu.patch | 243 --------------------- .../enigmail_mailnews_extensions_genxpi.patch | 19 -- .../seamonkey/files/moz25-drop-Wl-build-id.patch | 34 --- 3 files changed, 296 deletions(-) diff --git a/www-client/seamonkey/files/8000_allow_system_icu.patch b/www-client/seamonkey/files/8000_allow_system_icu.patch deleted file mode 100644 index 7271524..0000000 --- a/www-client/seamonkey/files/8000_allow_system_icu.patch +++ /dev/null @@ -1,243 +0,0 @@ ---- comm-beta/mozilla/config/Makefile.in -+++ comm-beta/mozilla/config/Makefile.in -@@ -98,6 +98,7 @@ - -DMOZ_NATIVE_JPEG=$(MOZ_NATIVE_JPEG) \ - -DMOZ_NATIVE_LIBEVENT=$(MOZ_NATIVE_LIBEVENT) \ - -DMOZ_NATIVE_LIBVPX=$(MOZ_NATIVE_LIBVPX) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - ---- comm-beta/mozilla/config/system-headers -+++ comm-beta/mozilla/config/system-headers -@@ -1132,3 +1132,16 @@ - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/uclean.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+unicode/utypes.h -+#endif ---- comm-beta/mozilla/configure.in -+++ comm-beta/mozilla/configure.in -@@ -4113,6 +4113,22 @@ - fi - - dnl ======================================================== -+dnl System ICU Support -+dnl ======================================================== -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system ICU (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+ MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS" -+fi -+ -+AC_SUBST(MOZ_NATIVE_ICU) -+ -+dnl ======================================================== - dnl Java SDK support - dnl ======================================================== - ---- comm-beta/mozilla/js/src/config/Makefile.in -+++ comm-beta/mozilla/js/src/config/Makefile.in -@@ -59,6 +59,7 @@ - $(call mkdir_deps,system_wrappers_js) \ - $(NULL) - $(PYTHON) $(srcdir)/Preprocessor.py $(DEFINES) $(ACDEFINES) \ -+ -DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \ - $(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js - $(INSTALL) system_wrappers_js $(DIST) - ---- comm-beta/mozilla/js/src/config/system-headers -+++ comm-beta/mozilla/js/src/config/system-headers -@@ -1132,3 +1132,16 @@ - spawn.h - err.h - xlocale.h -+#if MOZ_NATIVE_ICU==1 -+unicode/locid.h -+unicode/numsys.h -+unicode/ucal.h -+unicode/uclean.h -+unicode/ucol.h -+unicode/udat.h -+unicode/udatpg.h -+unicode/uenum.h -+unicode/unum.h -+unicode/ustring.h -+unicode/utypes.h -+#endif ---- comm-beta/mozilla/js/src/configure.in -+++ comm-beta/mozilla/js/src/configure.in -@@ -4247,6 +4247,17 @@ - dnl ECMAScript Internationalization API Support (uses ICU) - dnl ======================================================== - -+ICU_LIB_NAMES= -+MOZ_NATIVE_ICU= -+MOZ_ARG_WITH_BOOL(system-icu, -+[ --with-system-icu -+ Use system ICU (located with pkgconfig)], -+ MOZ_NATIVE_ICU=1) -+ -+if test -n "$MOZ_NATIVE_ICU"; then -+ PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1) -+fi -+ - ENABLE_INTL_API=1 - MOZ_ARG_DISABLE_BOOL(intl-api, - [ --disable-intl-api Disable the ECMAScript Internationalization API], -@@ -4255,37 +4266,36 @@ - dnl Settings for the implementation of the ECMAScript Internationalization API - if test -n "$ENABLE_INTL_API"; then - AC_DEFINE(ENABLE_INTL_API) -- # We build ICU as a static library. -- AC_DEFINE(U_STATIC_IMPLEMENTATION) -- -- case "$OS_TARGET" in -- WINNT) -- ICU_LIB_NAMES="icuin icuuc icudt" -- ;; -- Darwin|Linux) -- ICU_LIB_NAMES="icui18n icuuc icudata" -- ;; -- *) -- AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -- esac -- -- ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' --else -- ICU_LIB_NAMES= -- ICU_LIBS= -+ if test -z "$MOZ_NATIVE_ICU"; then -+ case "$OS_TARGET" in -+ WINNT) -+ ICU_LIB_NAMES="icuin icuuc icudt" -+ ;; -+ Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD) -+ ICU_LIB_NAMES="icui18n icuuc icudata" -+ ;; -+ *) -+ AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform]) -+ esac -+ MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/lib)' -+ fi - fi - - AC_SUBST(ENABLE_INTL_API) - AC_SUBST(ICU_LIB_NAMES) --AC_SUBST(ICU_LIBS) -- --dnl Source files that use ICU should have control over which parts of the ICU --dnl namespace they want to use. --AC_DEFINE(U_USING_ICU_NAMESPACE,0) -+AC_SUBST(MOZ_ICU_LIBS) -+AC_SUBST(MOZ_NATIVE_ICU) - - - dnl Settings for ICU --if test -n "$ENABLE_INTL_API" ; then -+if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then -+ dnl We build ICU as a static library. -+ AC_DEFINE(U_STATIC_IMPLEMENTATION) -+ -+ dnl Source files that use ICU should have control over which parts of the I -+ dnl namespace they want to use. -+ AC_DEFINE(U_USING_ICU_NAMESPACE,0) -+ - # Set ICU compile options - ICU_CPPFLAGS="" - # don't use icu namespace automatically in client code ---- comm-beta/mozilla/js/src/gdb/Makefile.in -+++ comm-beta/mozilla/js/src/gdb/Makefile.in -@@ -19,6 +19,10 @@ - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+XTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - # Place a GDB Python auto-load file next to the gdb-tests executable, both ---- comm-beta/mozilla/js/src/jsapi-tests/Makefile.in -+++ comm-beta/mozilla/js/src/jsapi-tests/Makefile.in -@@ -20,6 +20,10 @@ - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif -+ - EXTRA_LIBS += $(MOZ_FFI_LIBS) - - ifdef QEMU_EXE ---- comm-beta/mozilla/js/src/Makefile.in -+++ comm-beta/mozilla/js/src/Makefile.in -@@ -232,12 +232,17 @@ - # ICU headers need to be available whether we build with the complete - # Internationalization API or not - ICU stubs rely on them. - -+ifdef MOZ_NATIVE_ICU -+LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) -+else - LOCAL_INCLUDES += \ - -I$(topsrcdir)/../../intl/icu/source/common \ - -I$(topsrcdir)/../../intl/icu/source/i18n \ - $(NULL) -+endif - - ifdef ENABLE_INTL_API -+ifndef MOZ_NATIVE_ICU - - ifeq ($(OS_ARCH),WINNT) - # Parallel gmake is buggy on Windows -@@ -266,6 +271,7 @@ - $(call SUBMAKE,$@,intl/icu) - - endif -+endif - - # - # END ECMAScript Internationalization API -@@ -389,7 +395,11 @@ - DEFINES += -DUSE_ZLIB - endif - --SHARED_LIBRARY_LIBS += $(ICU_LIBS) -+ifdef MOZ_NATIVE_ICU -+EXTRA_DSO_LDOPTS += $(MOZ_ICU_LIBS) -+else -+SHARED_LIBRARY_LIBS += $(MOZ_ICU_LIBS) -+endif - - # Prevent floating point errors caused by VC++ optimizations - ifdef _MSC_VER ---- comm-beta/mozilla/js/src/shell/Makefile.in -+++ comm-beta/mozilla/js/src/shell/Makefile.in -@@ -27,6 +27,9 @@ - ifdef MOZ_NATIVE_FFI - EXTRA_LIBS += $(MOZ_FFI_LIBS) - endif -+ifdef MOZ_NATIVE_ICU -+EXTRA_LIBS += $(MOZ_ICU_LIBS) -+endif - - LOCAL_INCLUDES += -I$(topsrcdir) -I.. - diff --git a/www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch b/www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch deleted file mode 100644 index a945cf2..0000000 --- a/www-client/seamonkey/files/enigmail_mailnews_extensions_genxpi.patch +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD$ -https://bugzilla.mozilla.org/show_bug.cgi?id=886095 ---- mailnews/extensions/enigmail/genxpi.orig Wed Jul 3 13:21:33 2013 -+++ mailnews/extensions/enigmail/genxpi Thu Jul 11 09:33:44 2013 -@@ -78,6 +78,7 @@ fi - subprocessDll=${libPrefix}subprocess${dllSuffix} - spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix} - -+cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save - # Prepare chrome.manifest - cat ${srcDir}/package/chrome.manifest | \ - sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \ -@@ -151,4 +152,5 @@ zip ${xpiFile} \ - chrome.manifest \ - install.rdf - --rm install.rdf chrome.manifest -+rm install.rdf -+mv chrome.manifest.save chrome.manifest diff --git a/www-client/seamonkey/files/moz25-drop-Wl-build-id.patch b/www-client/seamonkey/files/moz25-drop-Wl-build-id.patch deleted file mode 100644 index 221566c..0000000 --- a/www-client/seamonkey/files/moz25-drop-Wl-build-id.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- comm-beta/mozilla/configure.in -+++ comm-beta/mozilla/configure.in -@@ -1285,15 +1285,6 @@ - AC_MSG_RESULT([no]) - LDFLAGS=$_SAVE_LDFLAGS) - -- AC_MSG_CHECKING([for --build-id option to ld]) -- _SAVE_LDFLAGS=$LDFLAGS -- LDFLAGS="$LDFLAGS -Wl,--build-id" -- AC_TRY_LINK(,,AC_MSG_RESULT([yes]) -- [NSPR_LDFLAGS="$NSPR_LDFLAGS -Wl,--build-id"], -- AC_MSG_RESULT([no]) -- LDFLAGS=$_SAVE_LDFLAGS) -- -- - # Check for -mssse3 on $CC - AC_MSG_CHECKING([if toolchain supports -mssse3 option]) - HAVE_TOOLCHAIN_SUPPORT_MSSSE3= ---- comm-beta/mozilla/js/src/configure.in -+++ comm-beta/mozilla/js/src/configure.in -@@ -1096,13 +1096,6 @@ - AC_MSG_RESULT([no]) - LDFLAGS=$_SAVE_LDFLAGS) - -- AC_MSG_CHECKING([for --build-id option to ld]) -- _SAVE_LDFLAGS=$LDFLAGS -- LDFLAGS="$LDFLAGS -Wl,--build-id" -- AC_TRY_LINK(,,AC_MSG_RESULT([yes]), -- AC_MSG_RESULT([no]) -- LDFLAGS=$_SAVE_LDFLAGS) -- - # Turn on GNU-specific warnings: - # -Wall - turn on a lot of warnings - # -Wpointer-arith - good to have