Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (73b76543e7b10e5eed355ef3565454fc110308e4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (73b76543e7b10e5eed355ef3565454fc110308e4)
  • Date: Wed, 14 Feb 2007 18:07:57 -0600

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

http/firefox/DEPENDS | 18 ++++++------------
http/firefox/HISTORY | 3 +++
2 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit 73b76543e7b10e5eed355ef3565454fc110308e4
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

firefox: removed obsolete gtk version conditional

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index bc9734b..39fdabe 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -9,6 +9,12 @@ depends perl &
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
@@ -17,18 +23,6 @@ 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 ef2d46b..5deb23e 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2007-02-15 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Removed GTK version conditional, only GTK+2 used now.
+
2007-02-06 David Kowis <dkowis AT shlrm.org>
* visibility.patch: solution to exploding firefox build on amd64
* PRE_BUILD: added application of patch and regen of ./configure



  • [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (73b76543e7b10e5eed355ef3565454fc110308e4), Juuso Alasuutari, 02/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page