summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Mike Kelly <pioto@exherbo.org> 2009-11-05 12:23:02 -0500
committerAvatar Mike Kelly <pioto@exherbo.org> 2009-11-05 12:23:02 -0500
commitf2b9263ffe40f3350be0193323fa0a25eb9943c8 (patch)
tree042153564e9e30ec776a1c7b87c9483bb1f4d7f9
parent7e78a9f15c02e8d1d6bb61311d6f513cf2541c67 (diff)
downloadmozilla-f2b9263ffe40f3350be0193323fa0a25eb9943c8.tar.gz
mozilla-f2b9263ffe40f3350be0193323fa0a25eb9943c8.tar.xz
Clean xulrunner/firefox up a bit.
Remove firefox 3.0.x / xulrunner 1.9.0.x support.
-rw-r--r--packages/dev-libs/xulrunner/files/gcc44-compat.patch16
-rw-r--r--packages/dev-libs/xulrunner/files/ssltunnel_test.patch17
-rw-r--r--packages/dev-libs/xulrunner/xulrunner-1.9.0.13.exheres-08
-rw-r--r--packages/dev-libs/xulrunner/xulrunner.exlib31
-rw-r--r--packages/net-www/firefox/firefox.exlib17
5 files changed, 8 insertions, 81 deletions
diff --git a/packages/dev-libs/xulrunner/files/gcc44-compat.patch b/packages/dev-libs/xulrunner/files/gcc44-compat.patch
deleted file mode 100644
index f2a781c..0000000
--- a/packages/dev-libs/xulrunner/files/gcc44-compat.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: Makoto Kato, https://bugzilla.mozilla.org/show_bug.cgi?id=478843
-Upstream: Yes.
-Reason: gcc 4.4 compile fix
-
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -1421,7 +1421,7 @@
- if (NS_FAILED(rv))
- return rv;
-
--#elif
-+#else
- #error Oops, you need platform-specific code here
- #endif
-
diff --git a/packages/dev-libs/xulrunner/files/ssltunnel_test.patch b/packages/dev-libs/xulrunner/files/ssltunnel_test.patch
deleted file mode 100644
index 496a840..0000000
--- a/packages/dev-libs/xulrunner/files/ssltunnel_test.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: Kai Engert, https://bugzilla.mozilla.org/show_bug.cgi?id=429178
-Upstream: Yes.
-Reason: Use system provided headers/libraries rather than internal.
-
---- mozilla/testing/mochitest/ssltunnel/Makefile.in 2008-04-11 05:58:04.000000000 +0000
-+++ mozilla/testing/mochitest/ssltunnel/Makefile.in.new 2009-02-23 23:56:02.000000000 +0000
-@@ -55,6 +55,10 @@
- nss \
- $(NULL)
-
-+# Use local includes because they are inserted before INCLUDES
-+# so that Mozilla's nss.h is used, not glibc's
-+LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS)
-+
- LIBS = \
- $(NSPR_LIBS) \
- $(NSS_LIBS) \
diff --git a/packages/dev-libs/xulrunner/xulrunner-1.9.0.13.exheres-0 b/packages/dev-libs/xulrunner/xulrunner-1.9.0.13.exheres-0
deleted file mode 100644
index 89d857b..0000000
--- a/packages/dev-libs/xulrunner/xulrunner-1.9.0.13.exheres-0
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2008 Ingmar Vanhassel <ingmar@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-require xulrunner
-
-SLOT="0"
-PLATFORMS="~amd64 ~ppc64 ~x86"
-
diff --git a/packages/dev-libs/xulrunner/xulrunner.exlib b/packages/dev-libs/xulrunner/xulrunner.exlib
index 04cc90b..753bea7 100644
--- a/packages/dev-libs/xulrunner/xulrunner.exlib
+++ b/packages/dev-libs/xulrunner/xulrunner.exlib
@@ -6,12 +6,10 @@ if ever at_least '1.9.2_beta' ; then
FIREFOX_PV="${MY_PV/#1.9.2/3.6}"
NSPR_VER="[>=4.8]"
NSS_VER="[>=3.12.3]"
-elif ever at_least '1.9.1_beta' ; then
+else
FIREFOX_PV="${MY_PV/#1.9.1/3.5}"
NSPR_VER="[>=4.8]"
NSS_VER="[>=3.12.3]"
-else
- FIREFOX_PV="${MY_PV/#1.9/3}"
fi
require multilib mozilla [ co_project=xulrunner supported_nspr="${NSPR_VER}" supported_nss="${NSS_VER}" ]
@@ -25,12 +23,7 @@ XULRunner will also provide libxul, a solution which allows the embedding of
Mozilla technologies in other projects and products.
"
HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner"
-MY_SOURCE_SUFFIX="-source"
-if ever at_least '1.9.1.3' ; then
- # ... hate
- MY_SOURCE_SUFFIX=".source"
-fi
-DOWNLOADS="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FIREFOX_PV}/source/firefox-${FIREFOX_PV}${MY_SOURCE_SUFFIX}.tar.bz2"
+DOWNLOADS="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FIREFOX_PV}/source/firefox-${FIREFOX_PV}.source.tar.bz2"
LICENCES="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
MYOPTIONS="dbus ogg wav"
@@ -50,31 +43,17 @@ DEPENDENCIES="
x11-libs/gtk+:2[>=2.10.0]
x11-libs/pango[>=1.10.0][X]
dbus? ( dev-libs/dbus-glib )
+ ogg? ( sys-sound/alsa-lib )
+ wav? ( sys-sound/alsa-lib )
"
# app-spell/hunspell
-ever at_least 1.9.1 &&
-DEPENDENCIES+="
- build+run:
- ogg? ( sys-sound/alsa-lib )
- wav? ( sys-sound/alsa-lib )"
-
-ECONF_SOURCE="${WORKBASE}"/mozilla
-if ever at_least '1.9.1_beta' ; then
- ECONF_SOURCE+="-$(ever range 1-3 ${PV})"
-fi
+ECONF_SOURCE="${WORKBASE}/mozilla-$(ever range 1-3 ${PV})"
src_prepare() {
mozilla_src_prepare
cd "${ECONF_SOURCE}"
- if ! ever at_least '1.9.1_beta' ; then
- expatch "${FILES}"/ssltunnel_test.patch
- fi
-
- if ever at_least '1.9.0.10' && ! ever at_least '1.9.0.12' ; then
- expatch "${FILES}"/gcc44-compat.patch
- fi
}
# FIXME:
diff --git a/packages/net-www/firefox/firefox.exlib b/packages/net-www/firefox/firefox.exlib
index 80b786a..f349902 100644
--- a/packages/net-www/firefox/firefox.exlib
+++ b/packages/net-www/firefox/firefox.exlib
@@ -21,22 +21,14 @@ MY_PV="${MY_PV:-${PV/_beta/b}}"
if ever at_least '3.6_beta' ; then
XULRUNNER_PV="${PV/#3.6/1.9.2}"
XULRUNNER_MY_PV="${MY_PV/#3.6/1.9.2}"
-elif ever at_least '3.1_beta' ; then
+else
XULRUNNER_PV="${PV/#3.5/1.9.1}"
XULRUNNER_MY_PV="${MY_PV/#3.5/1.9.1}"
-else
- XULRUNNER_PV="${PV/#3/1.9}"
- XULRUNNER_MY_PV="${MY_PV/#3/1.9}"
fi
SUMMARY="Mozilla's standalone web browser"
HOMEPAGE="http://www.mozilla.com/en-US/${PN}/"
-MY_SOURCE_SUFFIX="-source"
-if ever at_least '1.9.1.3' ; then
- # ... hate
- MY_SOURCE_SUFFIX=".source"
-fi
-DOWNLOADS="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}/source/${PN}-${MY_PV}${MY_SOURCE_SUFFIX}.tar.bz2"
+DOWNLOADS="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}/source/${PN}-${MY_PV}.source.tar.bz2"
UPSTREAM_RELEASE_NOTES="${HOMEPAGE}${MY_PV}/releasenotes/"
@@ -54,10 +46,7 @@ DEPENDENCIES="
x11-libs/gtk+:2
"
-ECONF_SOURCE="${WORKBASE}"/mozilla
-if ever at_least '3.1_beta' ; then
- ECONF_SOURCE+="-$(ever range 1-3 ${XULRUNNER_PV})"
-fi
+ECONF_SOURCE="${WORKBASE}/mozilla-$(ever range 1-3 ${XULRUNNER_PV})"
MOZILLA_SRC_CONFIGURE_PARAMS=(
--disable-dbus