summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-02-15 02:05:02 +0200
committerJeremy Blosser2007-02-18 16:52:59 -0600
commit55c4dc2506b0350a9c3b24593123692b82f17ac4 (patch)
tree3520963daef91f2baca09a86c5ceb18eb7ce110c
parent86b9a5d232289bc8b251510a8803542247ba3ecc (diff)
firefox: removed obsolete gtk version conditional
(cherry picked from commit 73b76543e7b10e5eed355ef3565454fc110308e4)
-rwxr-xr-xhttp/firefox/DEPENDS22
-rw-r--r--http/firefox/HISTORY3
2 files changed, 13 insertions, 12 deletions
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 429983f827..39fdabea65 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -10,21 +10,19 @@ depends zip &&
depends zlib '--with-system-zlib' &&
depends nss &&
+# These were the GTK+2 option in the GTK version conditional, perhaps
+# the flags need a closer look.
+depends gtk+2 '--enable-default-toolkit=gtk2 --enable-xft --disable-freetype2' &&
+depends libidl &&
+
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ #need this bad boy to rebuild the ./configure so it works
+ depends autoconf-2.13
+fi &&
+
suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar' &&
-if [ "$FIREFOX_GTK" == "2.x" ]; then
- depends gtk+2 \
- '--enable-default-toolkit=gtk2 --enable-xft --disable-freetype2' &&
- depends libidl
-else
-#
-# Else FIREFOX_GTK="1.x"
-#
- depends gtk+ '--enable-default-toolkit=gtk' &&
- depends orbit
-fi &&
-
if [ "$FIREFOX_CVS" == "y" ]; then
depends CVS
fi &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 31c0e80524..70ff66af98 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2007-02-15 Juuso Alasuutari <iuso@sourcemage.org>
+ * DEPENDS: Removed GTK version conditional, only GTK+2 used now.
+
2007-01-21 George Sherwood <george@beernabeer.com>
* DETAILS: Updated to version 2.0.0.1
* PREPARE: Removed choice for gtk. Only could test with gtk+2