summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2011-08-05 22:25:07 -0500
committerGeorge Sherwood2011-08-05 22:25:07 -0500
commit1df0a2bf3765ad50f957ec761302ca6e546b6b93 (patch)
treeadcb5b01da0c2a2fa4cf5f084259afae1eaa8ca5
parent6f78ff9700b7d386035fccc8ada9e45350d5f833 (diff)
firefox: Few cleanups including patch to remove extra glyph in
title bar.
-rw-r--r--http/firefox/HISTORY2
-rwxr-xr-xhttp/firefox/PRE_BUILD4
-rw-r--r--http/firefox/glyph.patch15
-rw-r--r--http/firefox/mozconfig53
4 files changed, 23 insertions, 1 deletions
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index df2e447b99..607205ff80 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -7,11 +7,13 @@
Added optional for wireless tools and alsa-lib
* INSTALL: Removed ln -s for xulrunnerplugins
* PRE_BUILD: Added curl patch and options to setup .mozconfig file
+ Added glyph.patch
* curl.patch: Added patch for curl-7.21.7
* mozconfig3: Removed old file
* mozconfig4: Removed old file
* mozconfig5: Updated and added new .mozconfig file
* firefox-xulrunner.patch: Removed un-needed patch
+ * glyph.patch: Fedora patch to removed char in title bar
2011-07-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 9a5a1af6c1..735c7a5ff2 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -7,6 +7,10 @@ cd mozilla* &&
# https://bug673072.bugzilla.mozilla.org/attachment.cgi?id=547353
patch -p0 < $SPELL_DIRECTORY/curl.patch &&
+#Fedora patch to remove glyph in title bar
+# http://osdir.com/ml/scm-fedora-commits/2011-06/msg10320.html
+patch -p0 < $SPELL_DIRECTORY/glyph.patch &&
+
cp -v $SPELL_DIRECTORY/mozconfig5 .mozconfig &&
if is_depends_enabled $SPELL wireless_tools; then
diff --git a/http/firefox/glyph.patch b/http/firefox/glyph.patch
new file mode 100644
index 0000000000..420205ccff
--- /dev/null
+++ b/http/firefox/glyph.patch
@@ -0,0 +1,15 @@
+diff -up browser/base/Makefile.in.fu browser/base/Makefile.in
+--- browser/base/Makefile.in.fu 2011-07-01 22:40:52.048773336 -0300
++++ browser/base/Makefile.in 2011-07-01 22:42:30.866213879 -0300
+@@ -62,10 +62,9 @@ EXTRA_JS_MODULES = \
+
+ include $(topsrcdir)/config/rules.mk
+
+-PRE_RELEASE_SUFFIX := ""
++PRE_RELEASE_SUFFIX :=
+
+ DEFINES += \
+- -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+ -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html \
+ -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)" \
+ $(NULL)
diff --git a/http/firefox/mozconfig5 b/http/firefox/mozconfig5
index 4aa3f097a6..25aef0c46e 100644
--- a/http/firefox/mozconfig5
+++ b/http/firefox/mozconfig5
@@ -11,12 +11,13 @@ mk_add_options AUTOCONF=autoconf2.13
ac_add_options --with-pthreads
ac_add_options --with-system-jpeg=/usr/lib
ac_add_options --with-system-zlib=/usr/lib
+ac_add_options --disable-system-png
ac_add_options --enable-application=browser
ac_add_options --disable-system-cairo
ac_add_options --enable-default-toolkit=cairo-gtk2
ac_add_options --disable-freetype2
ac_add_options --enable-pango
-ac_add_opitons --envable-svg
+ac_add_options --enable-svg
ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater