Skip to content
Browse files

removed outdated ebuilds of net-libs/xulrunner via auto-sync

  • Loading branch information...
1 parent a5a31f7 commit 9b037cec71678e80231d5a8bbfe55820e70971bf @ahuemer ahuemer committed Mar 26, 2011
View
28 net-libs/xulrunner/Manifest
@@ -1,26 +1,16 @@
-AUX 1009-armv4t-nanojit-v2.patch 12251 RMD160 9e9d862879d4897067605879245c1a6d50cf32fe SHA1 dcfe3da40dc822f2769e244571b721b59e59f322 SHA256 68c4df9c5313b93e8c5d7c7e8ed8375a88e9afa28c05e3965180058ba06cf05b
AUX bug-606109.patch 1243 RMD160 ec262eed0480d8a13c914c4781329e3ea1c23b0f SHA1 0c0cc40ee0a663422b107cc3ae5d1412b8c45ac7 SHA256 266d9c7218cc04c3badadc54f8f31b1238326b9c3052aed057ffce40c69541dc
-AUX cups-1.4.4-fixup.patch 5439 RMD160 e907f65012a88b0810979c0beda4244e817835e6 SHA1 4099626a22b61802c958faad8171d506a95f9fca SHA256 501f95e278c2fdf3dec2b5586a2dc5ae35d78557a0db9939a1501c4782e54be5
AUX fix-animated-gifs.patch 7789 RMD160 a8889110a2daea27e07f92a70df6cb1e39e05546 SHA1 05b335feeefff4f06004a20182f821d998b44879 SHA256 6d85d3c103b0dcdbb073302a4041a37bea97c715384d04d299c1fb49a5da7443
-AUX fix_crash_in_windowwatcher.patch 1102 RMD160 d539f5d8d82b389a8b2969a294821fd2d1184dd4 SHA1 0c2a8a36cdff57ba45166c76def0950cce297470 SHA256 5dd5145c1f3c0de1267384f0d68aa48c7cf50ba080d5074144f5b706af85d737
+AUX libnotify-0.7.patch 1777 RMD160 1669210dd704fd4cb84be3fbb8ced8bd10133abb SHA1 981a0cf66608e1b441c21db73a7203711de56fe0 SHA256 153d129004e63baca57182ce2ec381a9103feef9e5fbdf631339bce25cde9489
AUX xulrunner-1.9.2-gtk+-2.21.patch 663 RMD160 20e2465da0e6c884527fd7cfebd3bdb2f8f015a9 SHA1 f2b9c26ed255bde672ccc8cb7ae4ae014f52d6f5 SHA256 79c11dc4304d748f3c2d6e451aa6d44dd1bb450d1db671e7fa4a83420c6f2c05
-AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
-AUX xulrunner-1.9.2-solaris-madvise.patch 339 RMD160 50228123c1e85a5bbbe9b53d669f219916addac4 SHA1 363f9a62cd28bc4c0a326b73041c0b9f76909079 SHA256 8380ccd3153e9f31a1c6dcd45cc3ca8a772b2f7663d2839e92831c0198d3f90c
-AUX xulrunner-1.9_beta5-prefix.patch 1824 RMD160 e784c2fe11620a39699aea341d2e363ca4ce9e1e SHA1 6992f18c0ea289a28bcf2ea23f00bec88a791af0 SHA256 0d3c6f761dfce8d86be4af75c994100152e889065ad3aa78d5ff7cdfad0a86ad
AUX xulrunner-default-prefs.js 677 RMD160 73ec130da332c1d6517a6f838d5fab0cc134289a SHA1 b9efc3ef5e95ad3081f6b68d771e32e848b4b9ac SHA256 53493080276f221f1619153c114caf268206a6fa107972b33a4eb7f1c1cf6fe8
-DIST firefox-3.6.11.source.tar.bz2 51423291 RMD160 25f327d3cc32fa14792325b4f120cf308a37e659 SHA1 d5443a07243a771fb4c69c08cd6a0f5320a888c4 SHA256 16de496afb41400c8a6f5929cfc8d2c967afe30e99251d1752bc794453d28db4
DIST firefox-3.6.12.source.tar.bz2 51423668 RMD160 196e32a4cd9c6725e115aabcf320d7d8df5bca6e SHA1 1cc3885687dd5ad21167d9d45f76eb1458f46bdd SHA256 dd478c653070f451b76befc798cfa1d6b61745d8badf831a3bae453c32e68c2d
-DIST firefox-3.6.13.source.tar.bz2 51478675 RMD160 658409db60a8f412ac74ff15a8c1d8c4ed85b71e SHA1 1d1bc70d651bce4006687f5762638563c0494267 SHA256 4b90775c0f29cb7e170a80894311d8c7a2cd794c50e2124b70d1b83011c45f63
-DIST firefox-3.6.8.source.tar.bz2 51238976 RMD160 14e245c643d41a1da25fe4dbc15d6ae466a19e5b SHA1 4936e543f6c7492c5954cbd5b30ddda6b20e3797 SHA256 fc609cc6a0ddaa2a9ebd8511ec39ae4a404e1107a12e07b233e2afca51d9a10e
-DIST firefox-3.6.9.source.tar.bz2 51240588 RMD160 530b1d64cc02ba0433c3a39d1c97c569dad090ef SHA1 2429154c8d50bb5eeef80233b56fb26dcf727ea3 SHA256 9f7f09e2d064a5835d719ccb59a70d2d32a1860f67cb9cc88c4b693668580503
-DIST xulrunner-1.9.2-patches-0.6.tar.bz2 16308 RMD160 6066ea0b01f8b6c9eae1a0692ad9a07f04ab7327 SHA1 ebba861e23ef36256dc29d7d04820222be8e4241 SHA256 6a9d709f9ee15d6c139a35f8a6826cd7b473188290bd5e81e56297d8f36e2235
+DIST firefox-3.6.15.source.tar.bz2 51552828 RMD160 faa15978cc8e492833130910c243a585ff78ee3f SHA1 bfb69ae49b2def7482543d4d982fa58993a458e9 SHA256 405aa411a8ddb456017564522cbb486850e34fe14485b1c31fa93fc5c750870f
+DIST firefox-3.6.16.source.tar.bz2 51492728 RMD160 fdb7b41f25a5b8ba6eb1c5672ecc668c962b0af8 SHA1 38124597440b7d60aa568adeef23659575841e92 SHA256 e0a56db439484538d7a1156304b74249a8f1108be23fb4b0dc4fb94777ae29cc
+DIST firefox-4.0.source.tar.bz2 66024327 RMD160 2d1a3cf0f37ddbf4a5be9b83949f8f8236e2081d SHA1 403da9dd65662e5c4dd34299214e04cb6f80575e SHA256 78b1e0a66be3604af49b81193e557c27ffaee16b8c26fead052455dd42c9150f
DIST xulrunner-1.9.2-patches-0.7.tar.bz2 16366 RMD160 2bfa5f56d58d5bb4508512190cf07454814fb0b5 SHA1 2c6e2cfb0c50a5595795561126de26941dbed576 SHA256 3e25e9b8d5fe9109f03889bca9240f92acd502fd68efe0e7eda304f5487b6bf0
DIST xulrunner-1.9.2-patches-0.9.tar.bz2 15320 RMD160 2dfb86650c0a9a1f0c5bf86df7434c7c286658d6 SHA1 a2276c708eec2e92611ac1e7a2eaf25c39263d30 SHA256 5cca685442f1ab920eb1ba86719a38a437ae05bd5cefc42ababc2556425ebf5a
-EBUILD xulrunner-1.9.2.11.ebuild 8384 RMD160 685b6371294aedd1b983528418a3991d2a6b76b0 SHA1 9052619b4cca13c91270ee9f95f8cb0b768dba42 SHA256 e5d21eb2f6538b824695af6b1b819a6e1aa9a8b7bb615a8d1b5e1649a32cf7fd
-EBUILD xulrunner-1.9.2.12-r1.ebuild 8488 RMD160 7a5d2b466a8a4352e5050bac3ad9cb8758fa1a78 SHA1 45981057a5d598129b43450d363fee46ba18eec9 SHA256 2380a5b0119482553d09481eb06b0aaffc119068d34a3474de48839ad93a6865
-EBUILD xulrunner-1.9.2.12.ebuild 8430 RMD160 b3479c42035c9be499a914fbdf954733e9b7a650 SHA1 5e5522ccae8db26b95c9e4b17816f518d4d0e16a SHA256 fd85e34ee02a261426c9069a10a118fb54d0109f97d00143c57088b3be72b3b1
-EBUILD xulrunner-1.9.2.13-r1.ebuild 8421 RMD160 4dab57d69a4e2fb6272fa43ae060e0e8912f7d22 SHA1 6dfe209bee240eff30832ac18985a0d7ef453f96 SHA256 f4a05f311bfb2b6380bb9f8752b62deefef99f7be6c6a55cc4012d085ec94b66
-EBUILD xulrunner-1.9.2.13.ebuild 8362 RMD160 ffe735afa361f59e38ac5ff8cd9b193264f4df33 SHA1 c488cc969a7fc22284fa49afea68c2a4e9905647 SHA256 489b83d9dd1411bba3542c1048317db7c2939726168dc7a6addc8c6e8d670358
-EBUILD xulrunner-1.9.2.8.ebuild 8196 RMD160 4078f2a4447da288909c61d87cc8237f96332641 SHA1 228bd3f5413a5205229130f87a433fbdca7bc40f SHA256 a360e10e3f3250136c0bb6d51f4b1ea1bbb8dced597c07eda6b2108bd0def50d
-EBUILD xulrunner-1.9.2.9-r1.ebuild 8385 RMD160 73915a57925362552d1cac276eb4f823d6468a90 SHA1 924265319205df0a5a387340aefa1d12584d703f SHA256 249373ed2e7b4982a2977d93260bb2d914943aa88b5a1b8b00ed99ed4041b1d7
-EBUILD xulrunner-1.9.2.9.ebuild 8318 RMD160 cd9bd41d7b337137a3785e3a90babe1ca7d6954c SHA1 fb4356a68029c4a9b899f02d0174b06b825e2861 SHA256 93ecb24a439672c36ef61e56392d115b9426660a219b311badde7edb1b84893f
+DIST xulrunner-2.0-patches-1.3.tar.bz2 63693 RMD160 aaa6901e5dc94cbe88a2e0b5cfacbf7325ef97d2 SHA1 e3968f710e018b2c0ce017cea3e9152d157cd39b SHA256 f91949ef2cc61d9d7f7ccd242c3b0da730acb99e68a612d6ff3dfa9e7fd2aa25
+EBUILD xulrunner-1.9.2.12.ebuild 8715 RMD160 338596b6131345a2b4f871c53a3ba48208b701ce SHA1 ef544144e80b8712d840838603a3cd50dce88002 SHA256 2f7675357632ecd419c8637f8aa298801a2941b82e8915091c1ce68f8c38eb6d
+EBUILD xulrunner-1.9.2.15.ebuild 8512 RMD160 5b22a4203c1243dcfa9e684daa260184ca181e2a SHA1 e94f4135d8853ddbffe6626f71e7ea60058ffb8d SHA256 8dcc28b7b9347b23739f6f654a1a603a8321c8f95b5c28e60f92bd2eaa6ab978
+EBUILD xulrunner-1.9.2.16.ebuild 8519 RMD160 1e0fe8e76518ee7b571765637fbdc935fa4ad5aa SHA1 13a8ae006eaabc7237d5c545bc6f0ed7b9e264fd SHA256 e3208523105614f8fc5a55a751d92beccccada8fa1257b45c99952a6d1d03649
+EBUILD xulrunner-2.0.ebuild 5760 RMD160 4cdee93af394b2938d440baa956e1c75c682fa42 SHA1 61a2c895ac3b56f953b61552a89c57d514d69991 SHA256 f120dd244e59ca47b1cc80a44674da70147d03ae8dfc42116d21ae1a32ea8e93
View
320 net-libs/xulrunner/files/1009-armv4t-nanojit-v2.patch
@@ -1,320 +0,0 @@
-From: Mike Hommey <glandium@debian.org>
-Date: Fri, 30 Apr 2010 14:32:41 +0200
-Subject: Add nanojit support for ARMv4T
-
-Thanks Albin Tonnerre for the initial patch.
-https://bugzilla.mozilla.org/show_bug.cgi?id=552624
----
- js/src/nanojit/NativeARM.cpp | 105 ++++++++++++++++++++++------------------
- js/src/nanojit/avmplus.h | 2 +
- js/src/nanojit/njcpudetect.h | 111 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 170 insertions(+), 48 deletions(-)
- create mode 100644 js/src/nanojit/njcpudetect.h
-
-diff --git a/js/src/nanojit/NativeARM.cpp b/js/src/nanojit/NativeARM.cpp
-index 9387191..a50898c 100644
---- a/js/src/nanojit/NativeARM.cpp
-+++ b/js/src/nanojit/NativeARM.cpp
-@@ -61,6 +61,8 @@ extern "C" void __clear_cache(void *BEG, void *END);
-
- #ifdef FEATURE_NANOJIT
-
-+#define ARM_ARCH_AT_LEAST(wanted) ((NJ_COMPILER_ARM_ARCH >= wanted) || (ARM_ARCH >= wanted))
-+
- namespace nanojit
- {
-
-@@ -114,49 +116,50 @@ Assembler::CountLeadingZeroes(uint32_t data)
- {
- uint32_t leading_zeroes;
-
-- // We can't do CLZ on anything earlier than ARMv5. Architectures as early
-- // as that aren't supported, but assert that we aren't running on one
-- // anyway.
-- // If ARMv4 support is required in the future for some reason, we can do a
-- // run-time check on config.arch and fall back to the C routine, but for
-- // now we can avoid the cost of the check as we don't intend to support
-- // ARMv4 anyway.
-- NanoAssert(ARM_ARCH >= 5);
--
- #if defined(__ARMCC__)
- // ARMCC can do this with an intrinsic.
- leading_zeroes = __clz(data);
-
--// current Android GCC compiler incorrectly refuses to compile 'clz' for armv5
--// (even though this is a legal instruction there). Since we currently only compile for ARMv5
--// for emulation, we don't care too much (but we DO care for ARMv6+ since those are "real"
--// devices).
--#elif defined(__GNUC__) && !(defined(ANDROID) && __ARM_ARCH__ <= 5)
-+ if (0) // We don't need the fallback
-+#elif defined(__GNUC__)
- // GCC can use inline assembler to insert a CLZ instruction.
-- __asm (
-- " clz %0, %1 \n"
-- : "=r" (leading_zeroes)
-- : "r" (data)
-- );
-+ // Targetting armv5t allows a toolchain with armv4t default target to
-+ // still build with clz. On Android gcc compiler, clz is not supported
-+ // with a target smaller than armv7.
-+ if (ARM_ARCH_AT_LEAST(5))
-+ __asm (
-+#if defined(ANDROID) && NJ_COMPILER_ARM_ARCH <= 5
-+ ".arch armv7\n"
-+#elif (NJ_COMPILER_ARM_ARCH < 5)
-+ ".arch armv5t\n"
-+#endif
-+ " clz %0, %1 \n"
-+ : "=r" (leading_zeroes)
-+ : "r" (data)
-+ );
-+ else
- #elif defined(WINCE)
- // WinCE can do this with an intrinsic.
- leading_zeroes = _CountLeadingZeros(data);
--#else
-- // Other platforms must fall back to a C routine. This won't be as
-- // efficient as the CLZ instruction, but it is functional.
-- uint32_t try_shift;
--
-- leading_zeroes = 0;
--
-- // This loop does a bisection search rather than the obvious rotation loop.
-- // This should be faster, though it will still be no match for CLZ.
-- for (try_shift = 16; try_shift != 0; try_shift /= 2) {
-- uint32_t shift = leading_zeroes + try_shift;
-- if (((data << shift) >> shift) == data) {
-- leading_zeroes = shift;
-+
-+ if (0) // We don't need the fallback
-+#endif
-+ {
-+ // Other platforms must fall back to a C routine. This won't be as
-+ // efficient as the CLZ instruction, but it is functional.
-+ uint32_t try_shift;
-+
-+ leading_zeroes = 0;
-+
-+ // This loop does a bisection search rather than the obvious rotation loop.
-+ // This should be faster, though it will still be no match for CLZ.
-+ for (try_shift = 16; try_shift != 0; try_shift /= 2) {
-+ uint32_t shift = leading_zeroes + try_shift;
-+ if (((data << shift) >> shift) == data) {
-+ leading_zeroes = shift;
-+ }
- }
- }
--#endif
-
- // Assert that the operation worked!
- NanoAssert(((0xffffffff >> leading_zeroes) & data) == data);
-@@ -555,13 +558,18 @@ NIns*
- Assembler::genEpilogue()
- {
- // On ARMv5+, loading directly to PC correctly handles interworking.
-- // Note that we don't support anything older than ARMv5.
-- NanoAssert(ARM_ARCH >= 5);
--
-- RegisterMask savingMask = rmask(FP) | rmask(PC);
-+ // On ARMv4T, interworking is not handled properly, therefore, we pop
-+ // lr into ip and use bx ip to avoid that.
-+ if (ARM_ARCH_AT_LEAST(5)) {
-+ RegisterMask savingMask = rmask(FP) | rmask(PC);
-
-- POP_mask(savingMask); // regs
-+ POP_mask(savingMask); // regs
-+ } else {
-+ RegisterMask savingMask = rmask(FP) | rmask(IP);
-
-+ BX(IP);
-+ POP_mask(savingMask); // regs
-+ }
- return _nIns;
- }
-
-@@ -1502,7 +1510,7 @@ Assembler::BranchWithLink(NIns* addr)
-
- // ARMv5 and above can use BLX <imm> for branches within ±32MB of the
- // PC and BLX Rm for long branches.
-- if (isS24(offs>>2)) {
-+ if (isS24(offs>>2) && (ARM_ARCH_AT_LEAST(5))) {
- // the value we need to stick in the instruction; masked,
- // because it will be sign-extended back to 32 bits.
- intptr_t offs2 = (offs>>2) & 0xffffff;
-@@ -1519,7 +1527,6 @@ Assembler::BranchWithLink(NIns* addr)
- // We need to emit an ARMv5+ instruction, so assert that we have a
- // suitable processor. Note that we don't support ARMv4(T), but
- // this serves as a useful sanity check.
-- NanoAssert(ARM_ARCH >= 5);
-
- // The (pre-shifted) value of the "H" bit in the BLX encoding.
- uint32_t H = (offs & 0x2) << 23;
-@@ -1543,11 +1550,6 @@ Assembler::BranchWithLink(NIns* addr)
- inline void
- Assembler::BLX(Register addr, bool chk /* = true */)
- {
-- // We need to emit an ARMv5+ instruction, so assert that we have a suitable
-- // processor. Note that we don't support ARMv4(T), but this serves as a
-- // useful sanity check.
-- NanoAssert(ARM_ARCH >= 5);
--
- NanoAssert(IsGpReg(addr));
- // There is a bug in the WinCE device emulator which stops "BLX LR" from
- // working as expected. Assert that we never do that!
-@@ -1558,8 +1560,15 @@ Assembler::BLX(Register addr, bool chk /* = true */)
- }
-
- // BLX IP
-- *(--_nIns) = (NIns)( (COND_AL) | (0x12<<20) | (0xFFF<<8) | (0x3<<4) | (addr) );
-- asm_output("blx ip");
-+ if (ARM_ARCH_AT_LEAST(5)) {
-+ *(--_nIns) = (NIns)( (COND_AL) | (0x12<<20) | (0xFFF<<8) | (0x3<<4) | (addr) );
-+ asm_output("blx %s", gpn(addr));
-+ } else {
-+ *(--_nIns) = (NIns)( (COND_AL) | (0x12fff1 << 4) | (addr) );
-+ asm_output("bx %s", gpn(addr));
-+ *(--_nIns) = (NIns)( (COND_AL) | (0x1A0 << 16) | (0xE << 12) | 0xF );
-+ asm_output("mov lr, pc");
-+ }
- }
-
- // Emit the code required to load a memory address into a register as follows:
-@@ -2177,7 +2186,7 @@ Assembler::asm_arith(LInsp ins)
- // common for (rr == ra) and is thus likely to be the most
- // efficient case; if ra is no longer used after this LIR
- // instruction, it is re-used for the result register (rr).
-- if ((ARM_ARCH > 5) || (rr != rb)) {
-+ if ((ARM_ARCH_AT_LEAST(6)) || (rr != rb)) {
- // Newer cores place no restrictions on the registers used in a
- // MUL instruction (compared to other arithmetic instructions).
- MUL(rr, rb, ra);
-diff --git a/js/src/nanojit/avmplus.h b/js/src/nanojit/avmplus.h
-index ffc0873..e86f22e 100644
---- a/js/src/nanojit/avmplus.h
-+++ b/js/src/nanojit/avmplus.h
-@@ -50,6 +50,8 @@
- #include "jstypes.h"
- #include "jsstdint.h"
-
-+#include "njcpudetect.h"
-+
- #ifdef AVMPLUS_ARM
- #define ARM_ARCH config.arch
- #define ARM_VFP config.vfp
-diff --git a/js/src/nanojit/njcpudetect.h b/js/src/nanojit/njcpudetect.h
-new file mode 100644
-index 0000000..79ea90b
---- /dev/null
-+++ b/js/src/nanojit/njcpudetect.h
-@@ -0,0 +1,111 @@
-+/* -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4 -*- */
-+/* vi: set ts=4 sw=4 expandtab: (add to ~/.vimrc: set modeline modelines=5) */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is [Open Source Virtual Machine].
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Adobe System Incorporated.
-+ * Portions created by the Initial Developer are Copyright (C) 2004-2007
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ * Adobe AS3 Team
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef __njcpudetect__
-+#define __njcpudetect__
-+
-+/***
-+ * Note: this file should not include *any* other files, nor should it wrap
-+ * itself in ifdef FEATURE_NANOJIT, nor should it do anything other than
-+ * define preprocessor symbols.
-+ */
-+
-+/***
-+ * NJ_COMPILER_ARM_ARCH attempts to specify the minimum ARM architecture
-+ * that the C++ compiler has specified. Note that although Config::arm_arch
-+ * is initialized to this value by default, there is no requirement that they
-+ * be in sync.
-+ *
-+ * Note, this is done via #define so that downstream preprocessor usage can
-+ * examine it, but please don't attempt to redefine it.
-+ *
-+ * Note, this is deliberately not encased in "ifdef NANOJIT_ARM", as this file
-+ * may be included before that is defined. On non-ARM platforms we will hit the
-+ * "Unable to determine" case.
-+ */
-+
-+// GCC and RealView usually define __ARM_ARCH__
-+#if defined(__ARM_ARCH__)
-+
-+ #define NJ_COMPILER_ARM_ARCH __ARM_ARCH__
-+
-+// ok, try well-known GCC flags ( see http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html )
-+#elif defined(__ARM_ARCH_7__) || \
-+ defined(__ARM_ARCH_7A__) || \
-+ defined(__ARM_ARCH_7M__) || \
-+ defined(__ARM_ARCH_7R__) || \
-+ defined(_ARM_ARCH_7)
-+
-+ #define NJ_COMPILER_ARM_ARCH 7
-+
-+#elif defined(__ARM_ARCH_6__) || \
-+ defined(__ARM_ARCH_6J__) || \
-+ defined(__ARM_ARCH_6T2__) || \
-+ defined(__ARM_ARCH_6Z__) || \
-+ defined(__ARM_ARCH_6ZK__) || \
-+ defined(__ARM_ARCH_6M__) || \
-+ defined(_ARM_ARCH_6)
-+
-+ #define NJ_COMPILER_ARM_ARCH 6
-+
-+#elif defined(__ARM_ARCH_5__) || \
-+ defined(__ARM_ARCH_5T__) || \
-+ defined(__ARM_ARCH_5E__) || \
-+ defined(__ARM_ARCH_5TE__)
-+
-+ #define NJ_COMPILER_ARM_ARCH 5
-+
-+#elif defined(__ARM_ARCH_4__) || \
-+ defined(__ARM_ARCH_4T__)
-+
-+ #define NJ_COMPILER_ARM_ARCH 4
-+
-+// Visual C has its own mojo
-+#elif defined(_MSC_VER) && defined(_M_ARM)
-+
-+ #define NJ_COMPILER_ARM_ARCH _M_ARM
-+
-+#else
-+
-+ // non-numeric value
-+ #define NJ_COMPILER_ARM_ARCH "Unable to determine valid NJ_COMPILER_ARM_ARCH (nanojit only supports ARMv5 or later)"
-+
-+#endif
-+
-+#endif // __njcpudetect__
View
161 net-libs/xulrunner/files/cups-1.4.4-fixup.patch
@@ -1,161 +0,0 @@
-# HG changeset patch
-# User Matthew Gregan <kinetik@flim.org>
-# Date 1293624205 -3600
-# Node ID ffa1ef8ab52b4081e27aa2b24d14a550386f90db
-# Parent 9e561d402701f46eb56dbadb96b6963f4518cdd0
-Bug 573039 - Construct nsCUPSShim statically and avoid calling PR_UnloadLibrary on libcups after it has been initialized. r=karlt a=clegnitto
-
-diff --git a/mozilla/gfx/src/psshared/nsCUPSShim.cpp b/mozilla/gfx/src/psshared/nsCUPSShim.cpp
---- a/mozilla/gfx/src/psshared/nsCUPSShim.cpp
-+++ b/mozilla/gfx/src/psshared/nsCUPSShim.cpp
-@@ -83,14 +83,8 @@ nsCUPSShim::Init()
- #endif
- PR_UnloadLibrary(mCupsLib);
- mCupsLib = nsnull;
- return PR_FALSE;
- }
- }
- return PR_TRUE;
- }
--
--nsCUPSShim::~nsCUPSShim()
--{
-- if (mCupsLib)
-- PR_UnloadLibrary(mCupsLib);
--}
-diff --git a/mozilla/gfx/src/psshared/nsCUPSShim.h b/mozilla/gfx/src/psshared/nsCUPSShim.h
---- a/mozilla/gfx/src/psshared/nsCUPSShim.h
-+++ b/mozilla/gfx/src/psshared/nsCUPSShim.h
-@@ -81,17 +81,16 @@ typedef int (PR_CALLBACK *CupsAddOptionT
- int num_options,
- cups_option_t **options);
-
- struct PRLibrary;
-
- class NS_PSSHARED nsCUPSShim {
- public:
- nsCUPSShim() : mCupsLib(nsnull) { }
-- ~nsCUPSShim();
-
- /**
- * Initialize this object. Attempt to load the CUPS shared
- * library and find function pointers for the supported
- * functions (see below).
- * @return PR_FALSE if the shared library could not be loaded, or if
- * any of the functions could not be found.
- * PR_TRUE for successful initialization.
-diff --git a/mozilla/gfx/src/psshared/nsPSPrinters.cpp b/mozilla/gfx/src/psshared/nsPSPrinters.cpp
---- a/mozilla/gfx/src/psshared/nsPSPrinters.cpp
-+++ b/mozilla/gfx/src/psshared/nsPSPrinters.cpp
-@@ -51,32 +51,34 @@
- #include "plstr.h"
-
- #define NS_CUPS_PRINTER "CUPS/"
- #define NS_CUPS_PRINTER_LEN (sizeof(NS_CUPS_PRINTER) - 1)
-
- /* dummy printer name for the gfx/src/ps driver */
- #define NS_POSTSCRIPT_DRIVER_NAME "PostScript/"
-
-+nsCUPSShim gCupsShim;
-+
- /* Initialize the printer manager object */
- nsresult
- nsPSPrinterList::Init()
- {
- nsresult rv;
-
- mPrefSvc = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
- if (NS_SUCCEEDED(rv))
- rv = mPrefSvc->GetBranch("print.", getter_AddRefs(mPref));
- NS_ENSURE_SUCCESS(rv, NS_ERROR_NOT_INITIALIZED);
-
- // Should we try cups?
- PRBool useCups = PR_TRUE;
- rv = mPref->GetBoolPref("postscript.cups.enabled", &useCups);
-- if (useCups)
-- mCups.Init();
-+ if (useCups && !gCupsShim.IsInitialized())
-+ gCupsShim.Init();
- return NS_OK;
- }
-
-
- /* Check whether the PostScript module has been disabled at runtime */
- PRBool
- nsPSPrinterList::Enabled()
- {
-@@ -94,35 +96,35 @@ nsPSPrinterList::Enabled()
- /* Fetch a list of printers handled by the PostsScript module */
- void
- nsPSPrinterList::GetPrinterList(nsTArray<nsCString>& aList)
- {
- aList.Clear();
-
- // Query CUPS for a printer list. The default printer goes to the
- // head of the output list; others are appended.
-- if (mCups.IsInitialized()) {
-+ if (gCupsShim.IsInitialized()) {
- cups_dest_t *dests;
-
-- int num_dests = (mCups.mCupsGetDests)(&dests);
-+ int num_dests = (gCupsShim.mCupsGetDests)(&dests);
- if (num_dests) {
- for (int i = 0; i < num_dests; i++) {
- nsCAutoString fullName(NS_CUPS_PRINTER);
- fullName.Append(dests[i].name);
- if (dests[i].instance != NULL) {
- fullName.Append("/");
- fullName.Append(dests[i].instance);
- }
- if (dests[i].is_default)
- aList.InsertElementAt(0, fullName);
- else
- aList.AppendElement(fullName);
- }
- }
-- (mCups.mCupsFreeDests)(num_dests, dests);
-+ (gCupsShim.mCupsFreeDests)(num_dests, dests);
- }
-
- // Build the "classic" list of printers -- those accessed by running
- // an opaque command. This list always contains a printer named "default".
- // In addition, we look for either an environment variable
- // MOZILLA_POSTSCRIPT_PRINTER_LIST or a preference setting
- // print.printer_list, which contains a space-separated list of printer
- // names.
-diff --git a/mozilla/gfx/src/psshared/nsPSPrinters.h b/mozilla/gfx/src/psshared/nsPSPrinters.h
---- a/mozilla/gfx/src/psshared/nsPSPrinters.h
-+++ b/mozilla/gfx/src/psshared/nsPSPrinters.h
-@@ -37,17 +37,16 @@
- * ***** END LICENSE BLOCK ***** */
-
- #ifndef nsPSPrinters_h___
- #define nsPSPrinters_h___
-
- #include "nsString.h"
- #include "nsTArray.h"
- #include "prtypes.h"
--#include "nsCUPSShim.h"
- #include "psSharedCore.h"
-
- class nsIPrefService;
- class nsIPrefBranch;
- class nsCUPSShim;
-
- class NS_PSSHARED nsPSPrinterList {
- public:
-@@ -91,12 +90,11 @@ class NS_PSSHARED nsPSPrinterList {
- * the <type> portion as described for GetPrinterList().
- * @return The PrinterType value for this name.
- */
- static PrinterType GetPrinterType(const nsACString& aName);
-
- private:
- nsCOMPtr<nsIPrefService> mPrefSvc;
- nsCOMPtr<nsIPrefBranch> mPref;
-- nsCUPSShim mCups;
- };
-
- #endif /* nsPSPrinters_h___ */
-
-
View
28 net-libs/xulrunner/files/fix_crash_in_windowwatcher.patch
@@ -1,28 +0,0 @@
-# HG changeset patch
-# Parent e981d93d6534b48a75655ad886d494bd3bbe3ff2
-# User Blake Kaplan <mrbkap@gmail.com>
-Bug 594699 - Null check this to return to pre-bug 532730 behavior in pathological cases.
-
-diff --git a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
---- a/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
-+++ b/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
-@@ -517,17 +517,17 @@ nsWindowWatcher::OpenWindowJSInternal(ns
- nsCOMPtr<nsIDocShellTreeItem> newDocShellItem; // from the new window
- JSContextAutoPopper callerContextGuard;
-
- NS_ENSURE_ARG_POINTER(_retval);
- *_retval = 0;
-
- nsCOMPtr<nsIContentUtils> utils =
- do_GetService("@mozilla.org/content/contentutils;1");
-- if (!utils->IsSafeToRunScript()) {
-+ if (utils && !utils->IsSafeToRunScript()) {
- return NS_ERROR_FAILURE;
- }
-
- GetWindowTreeOwner(aParent, getter_AddRefs(parentTreeOwner));
-
- if (aUrl) {
- rv = URIfromURL(aUrl, aParent, getter_AddRefs(uriToLoad));
- if (NS_FAILED(rv))
-
View
56 net-libs/xulrunner/files/libnotify-0.7.patch
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User Priit Laes <plaes@plaes.org>
+# Parent 194dd9a57615185c998a87148fac65df51600758
+Bug 628222 - Add support for libnotify-0.7+. r=karlt
+
+diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp
+--- a/toolkit/system/gnome/nsAlertsIconListener.cpp
++++ b/toolkit/system/gnome/nsAlertsIconListener.cpp
+@@ -42,16 +42,21 @@
+ #include "nsNetUtil.h"
+ #include "nsIImageToPixbuf.h"
+ #include "nsIStringBundle.h"
+
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <libnotify/notify.h>
+ #include <gdk/gdk.h>
+
++// Compatibility macro for <libnotify-0.7
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static PRBool gHasActions = PR_FALSE;
+
+ static void notify_action_cb(NotifyNotification *notification,
+ gchar *action, gpointer user_data)
+ {
+ nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data);
+ alert->SendCallback();
+ }
+@@ -199,17 +204,23 @@ nsAlertsIconListener::OnStopFrame(imgIRe
+ return NS_OK;
+ }
+
+ nsresult
+ nsAlertsIconListener::ShowAlert(GdkPixbuf* aPixbuf)
+ {
+ NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
+ mAlertText.get(),
+- NULL, NULL);
++ NULL
++// >=libnotify-0.7.0 has no support for attaching to widgets
++#if !NOTIFY_CHECK_VERSION(0,7,0)
++ , NULL
++#endif
++ );
++
+ if (!notify)
+ return NS_ERROR_OUT_OF_MEMORY;
+
+ if (aPixbuf)
+ notify_notification_set_icon_from_pixbuf(notify, aPixbuf);
+
+ NS_ADDREF(this);
+ if (mAlertHasAction) {
+
View
26 net-libs/xulrunner/files/xulrunner-1.9.2-noalsa-fixup.patch
@@ -1,26 +0,0 @@
-diff -urN mozilla-1.9.2-orig/content/base/src/nsDocument.cpp mozilla-1.9.2/content/base/src/nsDocument.cpp
---- mozilla-1.9.2-orig/content/base/src/nsDocument.cpp 2010-01-28 22:16:08.683135912 -0600
-+++ mozilla-1.9.2/content/base/src/nsDocument.cpp 2010-01-28 22:17:57.605126833 -0600
-@@ -169,7 +169,9 @@
- #include "nsIPropertyBag2.h"
- #include "nsIDOMPageTransitionEvent.h"
- #include "nsFrameLoader.h"
-+#ifdef MOZ_MEDIA
- #include "nsHTMLMediaElement.h"
-+#endif
-
- #include "mozAutoDocUpdate.h"
-
-diff -urN mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp mozilla-1.9.2/content/base/src/nsNodeUtils.cpp
---- mozilla-1.9.2-orig/content/base/src/nsNodeUtils.cpp 2010-01-28 22:16:08.686138846 -0600
-+++ mozilla-1.9.2/content/base/src/nsNodeUtils.cpp 2010-01-28 22:17:14.618150370 -0600
-@@ -55,7 +55,9 @@
- #endif
- #include "nsBindingManager.h"
- #include "nsGenericHTMLElement.h"
-+#ifdef MOZ_MEDIA
- #include "nsHTMLMediaElement.h"
-+#endif
-
- // This macro expects the ownerDocument of content_ to be in scope as
- // |nsIDocument* doc|
View
13 net-libs/xulrunner/files/xulrunner-1.9.2-solaris-madvise.patch
@@ -1,13 +0,0 @@
---- layout/base/nsPresArena.cpp
-+++ layout/base/nsPresArena.cpp
-@@ -73,6 +73,10 @@
- #else
- # include <unistd.h>
- # include <sys/mman.h>
-+# ifdef SOLARIS
-+/* madvise is not declared for C++ */
-+extern "C" int madvise(void *addr, size_t len, int behav);
-+# endif
- # ifndef MAP_ANON
- # ifdef MAP_ANONYMOUS
- # define MAP_ANON MAP_ANONYMOUS
View
59 net-libs/xulrunner/files/xulrunner-1.9_beta5-prefix.patch
@@ -1,59 +0,0 @@
-* gre conf location is a bit hardcoded unfortunately :(
-
---- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
-+++ extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java
-@@ -470,8 +470,8 @@
-
- final String greUserConfFile = ".gre.config";
- final String greUserConfDir = ".gre.d";
-- final String greConfPath = "/etc/gre.conf";
-- final String greConfDir = "/etc/gre.d";
-+ final String greConfPath = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.conf";
-+ final String greConfDir = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
-
- env = System.getProperty("user.home");
- if (env != null) {
---- xpcom/build/nsXPCOMPrivate.h
-+++ xpcom/build/nsXPCOMPrivate.h
-@@ -245,8 +245,8 @@
- #endif
-
- #define GRE_CONF_NAME ".gre.config"
--#define GRE_CONF_PATH "/etc/gre.conf"
--#define GRE_CONF_DIR "/etc/gre.d"
-+#define GRE_CONF_PATH "@GENTOO_PORTAGE_EPREFIX@/etc/gre.conf"
-+#define GRE_CONF_DIR "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d"
- #define GRE_USER_CONF_DIR ".gre.d"
- #endif
-
---- xulrunner/installer/Makefile.in
-+++ xulrunner/installer/Makefile.in
-@@ -73,7 +73,7 @@
-
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
--regdir = /etc/gre.d
-+regdir = @sysconfdir@/gre.d
-
- install:: $(MOZILLA_VERSION).system.conf
- $(NSINSTALL) -D $(DESTDIR)$(regdir)
---- xulrunner/app/nsRegisterGREUnix.cpp
-+++ xulrunner/app/nsRegisterGREUnix.cpp
-@@ -130,7 +130,7 @@
-
- nsresult rv;
-
-- char root[MAXPATHLEN] = "/etc/gre.d";
-+ char root[MAXPATHLEN] = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
-
- if (!aRegisterGlobally) {
- char *home = PR_GetEnv("HOME");
-@@ -222,7 +222,7 @@
- {
- nsresult rv;
-
-- char root[MAXPATHLEN] = "/etc/gre.d";
-+ char root[MAXPATHLEN] = "@GENTOO_PORTAGE_EPREFIX@/etc/gre.d";
-
- if (!aRegisterGlobally) {
- char *home = PR_GetEnv("HOME");
View
252 net-libs/xulrunner/xulrunner-1.9.2.11.ebuild
@@ -1,252 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.11.ebuild,v 1.7 2010/10/25 00:31:24 fauli Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils multilib-native
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.7"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
-
-RDEPEND="
- >=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.8[lib32?]
- >=dev-libs/nspr-4.8.6[lib32?]
- system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,lib32?] )
- alsa? ( media-libs/alsa-lib[lib32?] )
- >=app-text/hunspell-1.2[lib32?]
- >=x11-libs/cairo-1.8.8[X,lib32?]
- x11-libs/pango[X,lib32?]
- x11-libs/libXt[lib32?]
- x11-libs/pixman[lib32?]
- >=dev-libs/libevent-1.4.7
- wifi? ( net-wireless/wireless-tools )
- libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
- ${RDEPEND}
- =dev-lang/python-2*[threads,lib32?]
- dev-util/pkgconfig[lib32?]"
-
-# virtual/jre should not be in DEPEND. bug 325981
-RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-multilib-native_pkg_setup_internal() {
- # Ensure we always build with C locale.
- export LANG="C"
- export LC_ALL="C"
- export LC_MESSAGES="C"
- export LC_CTYPE="C"
-
- java-pkg-opt-2_pkg_setup
-
- python_set_active_version 2
-}
-
-multilib-native_src_prepare_internal() {
- # Apply our patches
- EPATCH_EXCLUDE="2001_mozilla_ps_pdf_simplify_operators.patch" \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- epatch "${FILESDIR}/bug-606109.patch"
-
- eprefixify \
- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
- xpcom/build/nsXPCOMPrivate.h \
- xulrunner/installer/Makefile.in \
- xulrunner/app/nsRegisterGREUnix.cpp
-
- # fix double symbols due to double -ljemalloc
- sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
- xulrunner/stub/Makefile.in || die
-
- # Allow user to apply additional patches without modifing ebuild
- epatch_user
-
- # Same as in config/autoconf.mk.in
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- # Gentoo install dirs
- sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
- || die "${MAJ_PV} sed failed!"
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- eautoreconf
-
- cd js/src
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- MEXTENSIONS="default"
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-application=xulrunner
- mozconfig_annotate '' --disable-mailnews
- mozconfig_annotate 'broken' --disable-crashreporter
- mozconfig_annotate '' --enable-image-encoder=all
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
- # Bug 60668: Galeon doesn't build without oji enabled, so enable it
- # regardless of java setting.
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'places' --enable-storage --enable-places
- mozconfig_annotate '' --enable-safe-browsing
-
- # Build mozdevelop permately
- mozconfig_annotate '' --enable-jsd --enable-xpctools
-
- # System-wide install specs
- mozconfig_annotate '' --disable-installer
- mozconfig_annotate '' --disable-updater
- mozconfig_annotate '' --disable-strip
- mozconfig_annotate '' --disable-install-strip
-
- # Use system libraries
- mozconfig_annotate '' --enable-system-cairo
- mozconfig_annotate '' --enable-system-hunspell
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --with-system-bz2
- mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-
- mozconfig_use_enable ipc # +ipc, upstream default
- mozconfig_use_enable libnotify
- mozconfig_use_enable java javaxpcom
- mozconfig_use_enable wifi necko-wifi
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
- mozconfig_use_enable system-sqlite
-
- # Debug
- if use debug ; then
- mozconfig_annotate 'debug' --disable-optimize
- mozconfig_annotate 'debug' --enable-debug=-ggdb
- mozconfig_annotate 'debug' --enable-debug-modules=all
- mozconfig_annotate 'debug' --enable-debugger-info-modules
- fi
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-flags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
- # hack added to workaround bug 299905 on hosts with libc that doesn't
- # support tls, (probably will only hit this condition with Gentoo Prefix)
- tc-has-tls -l || export ac_cv_thread_keyword=no
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-multilib-native_src_install_internal() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- rm "${ED}"/usr/bin/xulrunner
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- if has_multilib_profile; then
- local config
- for config in "${ED}"/etc/gre.d/*.system.conf ; do
- mv "${config}" "${config%.conf}.${CHOST}.conf"
- done
- fi
-
- dodir /usr/bin
- dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
- # env.d file for ld search path
- dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
-
- # Add our defaults to xulrunner and out of firefox
- cp "${FILESDIR}"/xulrunner-default-prefs.js \
- "${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
- die "failed to cp xulrunner-default-prefs.js"
-
- pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
-
- if use java ; then
- java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
- java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
- fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
-}
-
-multilib-native_pkg_postinst_internal() {
- ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
- ewarn "If that does not fix the problem, rebuild dev-libs/nss"
- ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
- einfo
- einfo "All prefs can be overridden by the user. The preferences are to make"
- einfo "use of xulrunner out of the box on an average system without the user"
- einfo "having to go through and enable the basics."
-
- einfo
- ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
- ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
- ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
-}
View
254 net-libs/xulrunner/xulrunner-1.9.2.12-r1.ebuild
@@ -1,254 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12-r1.ebuild,v 1.1 2010/12/03 12:55:59 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils multilib-native
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.7"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
-
-RDEPEND="
- >=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.8[lib32?]
- >=dev-libs/nspr-4.8.6[lib32?]
- system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,lib32?] )
- alsa? ( media-libs/alsa-lib[lib32?] )
- >=app-text/hunspell-1.2[lib32?]
- >=x11-libs/cairo-1.8.8[X,lib32?]
- x11-libs/pango[X,lib32?]
- x11-libs/libXt[lib32?]
- x11-libs/pixman[lib32?]
- >=dev-libs/libevent-1.4.7
- wifi? ( net-wireless/wireless-tools )
- libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
- ${RDEPEND}
- =dev-lang/python-2*[threads,lib32?]
- dev-util/pkgconfig[lib32?]"
-
-# virtual/jre should not be in DEPEND. bug 325981
-RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-multilib-native_pkg_setup_internal() {
- # Ensure we always build with C locale.
- export LANG="C"
- export LC_ALL="C"
- export LC_MESSAGES="C"
- export LC_CTYPE="C"
-
- java-pkg-opt-2_pkg_setup
-
- python_set_active_version 2
-}
-
-multilib-native_src_prepare_internal() {
- # Apply our patches
- EPATCH_EXCLUDE="2001_mozilla_ps_pdf_simplify_operators.patch" \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- epatch "${FILESDIR}/bug-606109.patch"
- epatch "${FILESDIR}/${PN}-1.9.2-gtk+-2.21.patch"
- epatch "${FILESDIR}/fix-animated-gifs.patch"
-
- eprefixify \
- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
- xpcom/build/nsXPCOMPrivate.h \
- xulrunner/installer/Makefile.in \
- xulrunner/app/nsRegisterGREUnix.cpp
-
- # fix double symbols due to double -ljemalloc
- sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
- xulrunner/stub/Makefile.in || die
-
- # Allow user to apply additional patches without modifing ebuild
- epatch_user
-
- # Same as in config/autoconf.mk.in
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- # Gentoo install dirs
- sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
- || die "${MAJ_PV} sed failed!"
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- eautoreconf
-
- cd js/src
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- MEXTENSIONS="default"
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-application=xulrunner
- mozconfig_annotate '' --disable-mailnews
- mozconfig_annotate 'broken' --disable-crashreporter
- mozconfig_annotate '' --enable-image-encoder=all
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
- # Bug 60668: Galeon doesn't build without oji enabled, so enable it
- # regardless of java setting.
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'places' --enable-storage --enable-places
- mozconfig_annotate '' --enable-safe-browsing
-
- # Build mozdevelop permately
- mozconfig_annotate '' --enable-jsd --enable-xpctools
-
- # System-wide install specs
- mozconfig_annotate '' --disable-installer
- mozconfig_annotate '' --disable-updater
- mozconfig_annotate '' --disable-strip
- mozconfig_annotate '' --disable-install-strip
-
- # Use system libraries
- mozconfig_annotate '' --enable-system-cairo
- mozconfig_annotate '' --enable-system-hunspell
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --with-system-bz2
- mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-
- mozconfig_use_enable ipc # +ipc, upstream default
- mozconfig_use_enable libnotify
- mozconfig_use_enable java javaxpcom
- mozconfig_use_enable wifi necko-wifi
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
- mozconfig_use_enable system-sqlite
-
- # Debug
- if use debug ; then
- mozconfig_annotate 'debug' --disable-optimize
- mozconfig_annotate 'debug' --enable-debug=-ggdb
- mozconfig_annotate 'debug' --enable-debug-modules=all
- mozconfig_annotate 'debug' --enable-debugger-info-modules
- fi
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-flags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
- # hack added to workaround bug 299905 on hosts with libc that doesn't
- # support tls, (probably will only hit this condition with Gentoo Prefix)
- tc-has-tls -l || export ac_cv_thread_keyword=no
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-multilib-native_src_install_internal() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- rm "${ED}"/usr/bin/xulrunner
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- if has_multilib_profile; then
- local config
- for config in "${ED}"/etc/gre.d/*.system.conf ; do
- mv "${config}" "${config%.conf}.${CHOST}.conf"
- done
- fi
-
- dodir /usr/bin
- dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
- # env.d file for ld search path
- dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
-
- # Add our defaults to xulrunner and out of firefox
- cp "${FILESDIR}"/xulrunner-default-prefs.js \
- "${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
- die "failed to cp xulrunner-default-prefs.js"
-
- pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
-
- if use java ; then
- java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
- java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
- fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
-}
-
-multilib-native_pkg_postinst_internal() {
- ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
- ewarn "If that does not fix the problem, rebuild dev-libs/nss"
- ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
- einfo
- einfo "All prefs can be overridden by the user. The preferences are to make"
- einfo "use of xulrunner out of the box on an average system without the user"
- einfo "having to go through and enable the basics."
-
- einfo
- ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
- ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
- ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
-}
View
13 net-libs/xulrunner/xulrunner-1.9.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.8 2010/11/14 12:44:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.9 2011/03/14 06:54:45 nirbheek Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -20,7 +20,7 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/s
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="1.9"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
+IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
RDEPEND="
>=sys-devel/binutils-2.16.1
@@ -34,6 +34,10 @@ RDEPEND="
x11-libs/libXt[lib32?]
x11-libs/pixman[lib32?]
>=dev-libs/libevent-1.4.7
+ gnome? ( >=gnome-base/gnome-vfs-2.16.3[lib32?]
+ >=gnome-base/libgnomeui-2.16.1[lib32?]
+ >=gnome-base/gconf-2.16.0[lib32?]
+ >=gnome-base/libgnome-2.16.0[lib32?] )
wifi? ( net-wireless/wireless-tools )
libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
@@ -119,6 +123,7 @@ multilib-native_src_configure_internal() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
+ mozconfig_annotate '' --enable-crypto
mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
mozconfig_annotate '' --enable-application=xulrunner
@@ -151,6 +156,8 @@ multilib-native_src_configure_internal() {
mozconfig_annotate '' --with-system-bz2
mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+ mozconfig_use_enable gnome gnomevfs
+ mozconfig_use_enable gnome gnomeui
mozconfig_use_enable ipc # +ipc, upstream default
mozconfig_use_enable libnotify
mozconfig_use_enable java javaxpcom
View
19 net-libs/xulrunner/xulrunner-1.9.2.13.ebuild → net-libs/xulrunner/xulrunner-1.9.2.15.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.13.ebuild,v 1.8 2011/01/01 19:53:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.15.ebuild,v 1.8 2011/03/18 17:17:33 armin76 Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -20,7 +20,7 @@ SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/s
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="1.9"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
+IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
RDEPEND="
>=sys-devel/binutils-2.16.1
@@ -34,6 +34,10 @@ RDEPEND="
x11-libs/libXt[lib32?]
x11-libs/pixman[lib32?]
>=dev-libs/libevent-1.4.7
+ gnome? ( >=gnome-base/gnome-vfs-2.16.3[lib32?]
+ >=gnome-base/libgnomeui-2.16.1[lib32?]
+ >=gnome-base/gconf-2.16.0[lib32?]
+ >=gnome-base/libgnome-2.16.0[lib32?] )
wifi? ( net-wireless/wireless-tools )
libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
@@ -67,6 +71,7 @@ multilib-native_src_prepare_internal() {
epatch "${FILESDIR}/bug-606109.patch"
epatch "${FILESDIR}/fix-animated-gifs.patch"
+ epatch "${FILESDIR}/libnotify-0.7.patch"
eprefixify \
extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
@@ -118,6 +123,7 @@ multilib-native_src_configure_internal() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
+ mozconfig_annotate '' --enable-crypto
mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
mozconfig_annotate '' --enable-application=xulrunner
@@ -150,6 +156,8 @@ multilib-native_src_configure_internal() {
mozconfig_annotate '' --with-system-bz2
mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+ mozconfig_use_enable gnome gnomevfs
+ mozconfig_use_enable gnome gnomeui
mozconfig_use_enable ipc # +ipc, upstream default
mozconfig_use_enable libnotify
mozconfig_use_enable java javaxpcom
@@ -213,7 +221,7 @@ multilib-native_src_install_internal() {
# env.d file for ld search path
dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
+ echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
# Add our defaults to xulrunner and out of firefox
cp "${FILESDIR}"/xulrunner-default-prefs.js \
@@ -228,11 +236,6 @@ multilib-native_src_install_internal() {
java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
}
multilib-native_pkg_postinst_internal() {
View
22 ...bs/xulrunner/xulrunner-1.9.2.13-r1.ebuild → net-libs/xulrunner/xulrunner-1.9.2.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.13-r1.ebuild,v 1.1 2011/01/02 22:28:37 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.16.ebuild,v 1.2 2011/03/25 18:07:42 angelos Exp $
EAPI="3"
WANT_AUTOCONF="2.1"
@@ -17,10 +17,10 @@ HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="1.9"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
+IUSE="+alsa debug gnome +ipc libnotify system-sqlite wifi"
RDEPEND="
>=sys-devel/binutils-2.16.1
@@ -34,6 +34,10 @@ RDEPEND="
x11-libs/libXt[lib32?]
x11-libs/pixman[lib32?]
>=dev-libs/libevent-1.4.7
+ gnome? ( >=gnome-base/gnome-vfs-2.16.3[lib32?]
+ >=gnome-base/libgnomeui-2.16.1[lib32?]
+ >=gnome-base/gconf-2.16.0[lib32?]
+ >=gnome-base/libgnome-2.16.0[lib32?] )
wifi? ( net-wireless/wireless-tools )
libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
@@ -67,7 +71,7 @@ multilib-native_src_prepare_internal() {
epatch "${FILESDIR}/bug-606109.patch"
epatch "${FILESDIR}/fix-animated-gifs.patch"
- epatch "${FILESDIR}/cups-1.4.4-fixup.patch"
+ epatch "${FILESDIR}/libnotify-0.7.patch"
eprefixify \
extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
@@ -119,6 +123,7 @@ multilib-native_src_configure_internal() {
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
+ mozconfig_annotate '' --enable-crypto
mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
mozconfig_annotate '' --enable-application=xulrunner
@@ -151,6 +156,8 @@ multilib-native_src_configure_internal() {
mozconfig_annotate '' --with-system-bz2
mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
+ mozconfig_use_enable gnome gnomevfs
+ mozconfig_use_enable gnome gnomeui
mozconfig_use_enable ipc # +ipc, upstream default
mozconfig_use_enable libnotify
mozconfig_use_enable java javaxpcom
@@ -214,7 +221,7 @@ multilib-native_src_install_internal() {
# env.d file for ld search path
dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
+ echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner || die "env.d failed"
# Add our defaults to xulrunner and out of firefox
cp "${FILESDIR}"/xulrunner-default-prefs.js \
@@ -229,11 +236,6 @@ multilib-native_src_install_internal() {
java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
}
multilib-native_pkg_postinst_internal() {
View
247 net-libs/xulrunner/xulrunner-1.9.2.8.ebuild
@@ -1,247 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.8.ebuild,v 1.12 2010/10/28 15:06:59 polynomial-c Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix multilib-native
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.6"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
-
-RDEPEND="java? ( >=virtual/jre-1.4 )
- >=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.6[lib32?]
- >=dev-libs/nspr-4.8[lib32?]
- system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete,lib32?] )
- alsa? ( media-libs/alsa-lib[lib32?] )
- >=app-text/hunspell-1.2[lib32?]
- >=x11-libs/cairo-1.8.8[X,lib32?]
- x11-libs/pango[X,lib32?]
- x11-libs/libXt[lib32?]
- x11-libs/pixman[lib32?]
- wifi? ( net-wireless/wireless-tools )
- libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
- ${RDEPEND}
- =dev-lang/python-2*[threads,lib32?]
- dev-util/pkgconfig[lib32?]"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-multilib-native_pkg_setup_internal() {
- # Ensure we always build with C locale.
- export LANG="C"
- export LC_ALL="C"
- export LC_MESSAGES="C"
- export LC_CTYPE="C"
-
- java-pkg-opt-2_pkg_setup
-
- python_set_active_version 2
-}
-
-multilib-native_src_prepare_internal() {
- # Apply our patches
- EPATCH_EXCLUDE="1009-armv4t-nanojit.patch" \
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- epatch "${FILESDIR}"/1009-armv4t-nanojit-v2.patch
-
- eprefixify \
- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
- xpcom/build/nsXPCOMPrivate.h \
- xulrunner/installer/Makefile.in \
- xulrunner/app/nsRegisterGREUnix.cpp
-
- # fix double symbols due to double -ljemalloc
- sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
- xulrunner/stub/Makefile.in || die
-
- # Allow user to apply additional patches without modifing ebuild
- epatch_user
-
- # Same as in config/autoconf.mk.in
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- # Gentoo install dirs
- sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
- || die "${MAJ_PV} sed failed!"
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- eautoreconf
-
- cd js/src
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- MEXTENSIONS="default"
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-application=xulrunner
- mozconfig_annotate '' --disable-mailnews
- mozconfig_annotate 'broken' --disable-crashreporter
- mozconfig_annotate '' --enable-image-encoder=all
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
- # Bug 60668: Galeon doesn't build without oji enabled, so enable it
- # regardless of java setting.
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'places' --enable-storage --enable-places
- mozconfig_annotate '' --enable-safe-browsing
-
- # Build mozdevelop permately
- mozconfig_annotate '' --enable-jsd --enable-xpctools
-
- # System-wide install specs
- mozconfig_annotate '' --disable-installer
- mozconfig_annotate '' --disable-updater
- mozconfig_annotate '' --disable-strip
- mozconfig_annotate '' --disable-install-strip
-
- # Use system libraries
- mozconfig_annotate '' --enable-system-cairo
- mozconfig_annotate '' --enable-system-hunspell
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --with-system-bz2
-
- mozconfig_use_enable ipc # +ipc, upstream default
- mozconfig_use_enable libnotify
- mozconfig_use_enable java javaxpcom
- mozconfig_use_enable wifi necko-wifi
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
- mozconfig_use_enable system-sqlite
-
- # Debug
- if use debug ; then
- mozconfig_annotate 'debug' --disable-optimize
- mozconfig_annotate 'debug' --enable-debug=-ggdb
- mozconfig_annotate 'debug' --enable-debug-modules=all
- mozconfig_annotate 'debug' --enable-debugger-info-modules
- fi
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-flags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
- # hack added to workaround bug 299905 on hosts with libc that doesn't
- # support tls, (probably will only hit this condition with Gentoo Prefix)
- tc-has-tls -l || export ac_cv_thread_keyword=no
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-multilib-native_src_install_internal() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- rm "${ED}"/usr/bin/xulrunner
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- if has_multilib_profile; then
- local config
- for config in "${ED}"/etc/gre.d/*.system.conf ; do
- mv "${config}" "${config%.conf}.${CHOST}.conf"
- done
- fi
-
- dodir /usr/bin
- dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
- # env.d file for ld search path
- dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
-
- # Add our defaults to xulrunner and out of firefox
- cp "${FILESDIR}"/xulrunner-default-prefs.js \
- "${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
- die "failed to cp xulrunner-default-prefs.js"
-
- if use java ; then
- java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
- java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
- fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
-}
-
-multilib-native_pkg_postinst_internal() {
- if is_final_abi ; then
- ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
- ewarn "If that does not fix the problem, rebuild dev-libs/nss"
- ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
- einfo
- einfo "All prefs can be overridden by the user. The preferences are to make"
- einfo "use of xulrunner out of the box on an average system without the user"
- einfo "having to go through and enable the basics."
-
- einfo
- ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
- ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
- ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
- fi
-}
View
253 net-libs/xulrunner/xulrunner-1.9.2.9-r1.ebuild
@@ -1,253 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.9-r1.ebuild,v 1.2 2010/10/13 00:08:43 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils multilib-native
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.7"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
-
-RDEPEND="
- >=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.7[lib32?]
- >=dev-libs/nspr-4.8.6[lib32?]
- system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete,lib32?] )
- alsa? ( media-libs/alsa-lib[lib32?] )
- >=app-text/hunspell-1.2[lib32?]
- >=x11-libs/cairo-1.8.8[X,lib32?]
- x11-libs/pango[X,lib32?]
- x11-libs/libXt[lib32?]
- x11-libs/pixman[lib32?]
- >=dev-libs/libevent-1.4.7
- wifi? ( net-wireless/wireless-tools )
- libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
- ${RDEPEND}
- =dev-lang/python-2*[threads,lib32?]
- dev-util/pkgconfig[lib32?]"
-
-# virtual/jre should not be in DEPEND. bug 325981
-RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-multilib-native_pkg_setup_internal() {
- # Ensure we always build with C locale.
- export LANG="C"
- export LC_ALL="C"
- export LC_MESSAGES="C"
- export LC_CTYPE="C"
-
- java-pkg-opt-2_pkg_setup
-
- python_set_active_version 2
-}
-
-multilib-native_src_prepare_internal() {
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- epatch "${FILESDIR}/fix_crash_in_windowwatcher.patch"
-
- eprefixify \
- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
- xpcom/build/nsXPCOMPrivate.h \
- xulrunner/installer/Makefile.in \
- xulrunner/app/nsRegisterGREUnix.cpp
-
- # fix double symbols due to double -ljemalloc
- sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
- xulrunner/stub/Makefile.in || die
-
- # Allow user to apply additional patches without modifing ebuild
- epatch_user
-
- # Same as in config/autoconf.mk.in
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- # Gentoo install dirs
- sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
- || die "${MAJ_PV} sed failed!"
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- eautoreconf
-
- cd js/src
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- MEXTENSIONS="default"
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-application=xulrunner
- mozconfig_annotate '' --disable-mailnews
- mozconfig_annotate 'broken' --disable-crashreporter
- mozconfig_annotate '' --enable-image-encoder=all
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
- # Bug 60668: Galeon doesn't build without oji enabled, so enable it
- # regardless of java setting.
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'places' --enable-storage --enable-places
- mozconfig_annotate '' --enable-safe-browsing
-
- # Build mozdevelop permately
- mozconfig_annotate '' --enable-jsd --enable-xpctools
-
- # System-wide install specs
- mozconfig_annotate '' --disable-installer
- mozconfig_annotate '' --disable-updater
- mozconfig_annotate '' --disable-strip
- mozconfig_annotate '' --disable-install-strip
-
- # Use system libraries
- mozconfig_annotate '' --enable-system-cairo
- mozconfig_annotate '' --enable-system-hunspell
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --with-system-bz2
- mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-
- mozconfig_use_enable ipc # +ipc, upstream default
- mozconfig_use_enable libnotify
- mozconfig_use_enable java javaxpcom
- mozconfig_use_enable wifi necko-wifi
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
- mozconfig_use_enable system-sqlite
-
- # Debug
- if use debug ; then
- mozconfig_annotate 'debug' --disable-optimize
- mozconfig_annotate 'debug' --enable-debug=-ggdb
- mozconfig_annotate 'debug' --enable-debug-modules=all
- mozconfig_annotate 'debug' --enable-debugger-info-modules
- fi
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-flags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
- # hack added to workaround bug 299905 on hosts with libc that doesn't
- # support tls, (probably will only hit this condition with Gentoo Prefix)
- tc-has-tls -l || export ac_cv_thread_keyword=no
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-multilib-native_src_install_internal() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- rm "${ED}"/usr/bin/xulrunner
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- if has_multilib_profile; then
- local config
- for config in "${ED}"/etc/gre.d/*.system.conf ; do
- mv "${config}" "${config%.conf}.${CHOST}.conf"
- done
- fi
-
- dodir /usr/bin
- dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
- # env.d file for ld search path
- dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
-
- # Add our defaults to xulrunner and out of firefox
- cp "${FILESDIR}"/xulrunner-default-prefs.js \
- "${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
- die "failed to cp xulrunner-default-prefs.js"
-
- pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
-
- if use java ; then
- java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
- java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
- fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
-}
-
-multilib-native_pkg_postinst_internal() {
- if is_final_abi ; then
- ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
- ewarn "If that does not fix the problem, rebuild dev-libs/nss"
- ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
- einfo
- einfo "All prefs can be overridden by the user. The preferences are to make"
- einfo "use of xulrunner out of the box on an average system without the user"
- einfo "having to go through and enable the basics."
-
- einfo
- ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
- ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
- ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
- fi
-}
View
251 net-libs/xulrunner/xulrunner-1.9.2.9.ebuild
@@ -1,251 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.9.ebuild,v 1.9 2010/10/13 00:08:43 anarchy Exp $
-
-EAPI="3"
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib java-pkg-opt-2 autotools python prefix pax-utils multilib-native
-
-MY_PV="${PV/_rc/rc}" # Handle beta
-MY_PV="${MY_PV/1.9.2/3.6}"
-MAJ_PV="1.9.2" # from mozilla-* branch name
-PATCH="${PN}-1.9.2-patches-0.7"
-
-DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
-HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
- http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="1.9"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa debug +ipc libnotify system-sqlite wifi"
-
-RDEPEND="
- >=sys-devel/binutils-2.16.1
- >=dev-libs/nss-3.12.7[lib32?]
- >=dev-libs/nspr-4.8.6[lib32?]
- system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete,lib32?] )
- alsa? ( media-libs/alsa-lib[lib32?] )
- >=app-text/hunspell-1.2[lib32?]
- >=x11-libs/cairo-1.8.8[X,lib32?]
- x11-libs/pango[X,lib32?]
- x11-libs/libXt[lib32?]
- x11-libs/pixman[lib32?]
- >=dev-libs/libevent-1.4.7
- wifi? ( net-wireless/wireless-tools )
- libnotify? ( >=x11-libs/libnotify-0.4[lib32?] )"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )
- ${RDEPEND}
- =dev-lang/python-2*[threads,lib32?]
- dev-util/pkgconfig[lib32?]"
-
-# virtual/jre should not be in DEPEND. bug 325981
-RDEPEND="java? ( >=virtual/jre-1.4 ) ${RDEPEND}"
-
-S="${WORKDIR}/mozilla-${MAJ_PV}"
-
-multilib-native_pkg_setup_internal() {
- # Ensure we always build with C locale.
- export LANG="C"
- export LC_ALL="C"
- export LC_MESSAGES="C"
- export LC_CTYPE="C"
-
- java-pkg-opt-2_pkg_setup
-
- python_set_active_version 2
-}
-
-multilib-native_src_prepare_internal() {
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- eprefixify \
- extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
- xpcom/build/nsXPCOMPrivate.h \
- xulrunner/installer/Makefile.in \
- xulrunner/app/nsRegisterGREUnix.cpp
-
- # fix double symbols due to double -ljemalloc
- sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
- xulrunner/stub/Makefile.in || die
-
- # Allow user to apply additional patches without modifing ebuild
- epatch_user
-
- # Same as in config/autoconf.mk.in
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- # Gentoo install dirs
- sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \
- || die "${MAJ_PV} sed failed!"
-
- # Enable gnomebreakpad
- if use debug ; then
- sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
- "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
- fi
-
- eautoreconf
-
- cd js/src
- eautoreconf
-}
-
-multilib-native_src_configure_internal() {
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- mozconfig_init
- mozconfig_config
-
- MEXTENSIONS="default"
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
- mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
- mozconfig_annotate '' --enable-application=xulrunner
- mozconfig_annotate '' --disable-mailnews
- mozconfig_annotate 'broken' --disable-crashreporter
- mozconfig_annotate '' --enable-image-encoder=all
- mozconfig_annotate '' --enable-canvas
- mozconfig_annotate 'gtk' --enable-default-toolkit=cairo-gtk2
- # Bug 60668: Galeon doesn't build without oji enabled, so enable it
- # regardless of java setting.
- mozconfig_annotate '' --enable-oji --enable-mathml
- mozconfig_annotate 'places' --enable-storage --enable-places
- mozconfig_annotate '' --enable-safe-browsing
-
- # Build mozdevelop permately
- mozconfig_annotate '' --enable-jsd --enable-xpctools
-
- # System-wide install specs
- mozconfig_annotate '' --disable-installer
- mozconfig_annotate '' --disable-updater
- mozconfig_annotate '' --disable-strip
- mozconfig_annotate '' --disable-install-strip
-
- # Use system libraries
- mozconfig_annotate '' --enable-system-cairo
- mozconfig_annotate '' --enable-system-hunspell
- mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
- mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
- mozconfig_annotate '' --with-system-bz2
- mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
-
- mozconfig_use_enable ipc # +ipc, upstream default
- mozconfig_use_enable libnotify
- mozconfig_use_enable java javaxpcom
- mozconfig_use_enable wifi necko-wifi
- mozconfig_use_enable alsa ogg
- mozconfig_use_enable alsa wave
- mozconfig_use_enable system-sqlite
-
- # Debug
- if use debug ; then
- mozconfig_annotate 'debug' --disable-optimize
- mozconfig_annotate 'debug' --enable-debug=-ggdb
- mozconfig_annotate 'debug' --enable-debug-modules=all
- mozconfig_annotate 'debug' --enable-debugger-info-modules
- fi
-
- # Finalize and report settings
- mozconfig_final
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-flags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build
- #
- ####################################
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- # Ensure that are plugins dir is enabled as default
- sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/nsbrowser/plugins:" \
- "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path!"
-
- # hack added to workaround bug 299905 on hosts with libc that doesn't
- # support tls, (probably will only hit this condition with Gentoo Prefix)
- tc-has-tls -l || export ac_cv_thread_keyword=no
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" PYTHON="$(PYTHON)" econf
-}
-
-multilib-native_src_install_internal() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- rm "${ED}"/usr/bin/xulrunner
-
- MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_PV}"
- SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_PV}/sdk"
-
- if has_multilib_profile; then
- local config
- for config in "${ED}"/etc/gre.d/*.system.conf ; do
- mv "${config}" "${config%.conf}.${CHOST}.conf"
- done
- fi
-
- dodir /usr/bin
- dosym "${MOZLIBDIR}/xulrunner" "/usr/bin/xulrunner-${MAJ_PV}" || die
-
- # env.d file for ld search path
- dodir /etc/env.d
- echo "LDPATH=${EPREFIX}/${MOZLIBDIR}" > "${ED}"/etc/env.d/08xulrunner-${ABI} || die "env.d failed"
-
- # Add our defaults to xulrunner and out of firefox
- cp "${FILESDIR}"/xulrunner-default-prefs.js \
- "${ED}/${MOZLIBDIR}/defaults/pref/all-gentoo.js" || \
- die "failed to cp xulrunner-default-prefs.js"
-
- pax-mark m "${D}"/${MOZLIBDIR}/plugin-container
-
- if use java ; then
- java-pkg_regjar "${ED}/${MOZLIBDIR}/javaxpcom.jar"
- java-pkg_regso "${ED}/${MOZLIBDIR}/libjavaxpcomglue.so"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaGlue.jar"
- java-pkg_regjar "${ED}/${SDKDIR}/lib/MozillaInterfaces.jar"
- fi
-
- # each ABI should generate exactly one /etc/gre.d/*.system.conf file
- for conf in "${D}"/etc/gre.d/*.system.conf ; do
- mv "${conf}" "${conf%.conf}-${ABI}.conf"
- done
-}
-
-multilib-native_pkg_postinst_internal() {
- if is_final_abi ; then
- ewarn "If firefox fails to start with \"failed to load xpcom\", run revdep-rebuild"
- ewarn "If that does not fix the problem, rebuild dev-libs/nss"
- ewarn "Try dev-util/lafilefixer if you get build failures related to .la files"
-
- einfo
- einfo "All prefs can be overridden by the user. The preferences are to make"
- einfo "use of xulrunner out of the box on an average system without the user"
- einfo "having to go through and enable the basics."
-
- einfo
- ewarn "Any package that requires xulrunner:1.9 slot could and most likely will"
- ewarn "have issues. These issues should be reported to maintainer, and mozilla herd"
- ewarn "should be cc'd on the bug report. Thank you anarchy@gentoo.org ."
- fi
-}
View
189 net-libs/xulrunner/xulrunner-2.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.ebuild,v 1.2 2011/03/23 01:05:11 nirbheek Exp $
+
+EAPI="3"
+WANT_AUTOCONF="2.1"
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib autotools python versionator pax-utils prefix multilib-native
+
+MAJ_XUL_PV="$(get_version_component_range 1-2)" # from mozilla-* branch name
+MAJ_FF_PV="4.0"
+FF_PV="${PV/${MAJ_XUL_PV}/${MAJ_FF_PV}}" # 3.7_alpha6, 3.6.3, etc.
+FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI
+FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI
+FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI
+CHANGESET="e56ecd8b3a68"
+PATCH="${PN}-2.0-patches-1.3"
+
+DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications"
+HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="1.9"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+crashreporter +ipc system-sqlite +webm"
+
+REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
+# More URIs appended below...
+SRC_URI="http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2"
+
+# XXX: GConf is used for setting the default browser
+# revisit to make it optional with GNOME 3
+RDEPEND="
+ >=sys-devel/binutils-2.16.1
+ >=dev-libs/nss-3.12.9[lib32?]
+ >=dev-libs/nspr-4.8.7[lib32?]
+ >=dev-libs/glib-2.26[lib32?]
+ >=gnome-base/gconf-1.2.1:2[lib32?]
+ x11-libs/pango[X,lib32?]
+ system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=,lib32?] )
+ webm? ( media-libs/libvpx
+ media-libs/alsa-lib[lib32?] )
+ !www-plugins/weave"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig[lib32?]
+ dev-lang/yasm"
+
+if [[ ${PV} =~ alpha|beta ]]; then
+ # hg snapshot tarball
+ SRC_URI="${SRC_URI}
+ http://dev.gentoo.org/~anarchy/mozilla/firefox/firefox-${FF_PV}_${CHANGESET}.source.tar.bz2"
+ S="${WORKDIR}/mozilla-central"
+else
+ SRC_URI="${SRC_URI}
+ ${REL_URI}/${FF_PV}/source/firefox-${FF_PV}.source.tar.bz2"
+ S="${WORKDIR}/mozilla-${MAJ_XUL_PV}"
+fi
+
+multilib-native_pkg_setup_internal() {
+ moz_pkgsetup
+}
+
+multilib-native_src_prepare_internal() {
+ # Apply our patches
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}"
+
+ # Allow user to apply any additional patches without modifing ebuild
+ epatch_user
+
+ eprefixify \
+ extensions/java/xpcom/interfaces/org/mozilla/xpcom/Mozilla.java \
+ xpcom/build/nsXPCOMPrivate.h \
+ xulrunner/installer/Makefile.in \
+ xulrunner/app/nsRegisterGREUnix.cpp
+
+ # fix double symbols due to double -ljemalloc
+ sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
+ xulrunner/stub/Makefile.in || die
+
+ # Same as in config/autoconf.mk.in
+ MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
+ SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_XUL_PV}/sdk"
+
+ # Gentoo install dirs
+ sed -i -e "s:@PV@:${MAJ_XUL_PV}:" "${S}"/config/autoconf.mk.in \
+ || die "${MAJ_XUL_PV} sed failed!"
+
+ # Enable gnomebreakpad
+ if use debug ; then
+ sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+ "${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+ fi
+
+ # Disable gnomevfs extension
+ sed -i -e "s:gnomevfs::" "${S}/"xulrunner/confvars.sh \
+ || die "Failed to remove gnomevfs extension"
+
+ eautoreconf
+
+ cd js/src
+ eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+ mozconfig_config
+
+ MEXTENSIONS="default"
+
+ MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
+
+ # It doesn't compile on alpha without this LDFLAGS
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ mozconfig_annotate '' --with-default-mozilla-five-home="${MOZLIBDIR}"
+ mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+ mozconfig_annotate '' --disable-mailnews
+ mozconfig_annotate '' --enable-canvas
+ mozconfig_annotate '' --enable-safe-browsing
+
+ mozconfig_use_enable system-sqlite
+
+ # Finalize and report settings
+ mozconfig_final
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ append-flags -fno-stack-protector
+ fi
+
+ ####################################
+ #
+ # Configure and build
+ #
+ ####################################
+
+ # Disable no-print-directory
+ MAKEOPTS=${MAKEOPTS/--no-print-directory/}