Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (02343ac05e18afbfb96abec2c554e36509b29e33)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (02343ac05e18afbfb96abec2c554e36509b29e33)
  • Date: Wed, 6 Jun 2007 10:33:49 -0500

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

http/firefox/DEPENDS | 6 ---
http/firefox/HISTORY | 4 ++
http/firefox/PRE_BUILD | 9 ----
http/firefox/visibility.patch | 81
------------------------------------------
4 files changed, 4 insertions(+), 96 deletions(-)

New commits:
commit 02343ac05e18afbfb96abec2c554e36509b29e33
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

firefox: Removing visibility patch for 2.0.0.4

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index eeef4f4..d044bf9 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -15,12 +15,6 @@ depends nss &&
depends gtk+2 '--enable-default-toolkit=gtk2 --enable-xft
--disable-freetype2' &&
depends libidl &&

-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] ||
- [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; 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' &&

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 0362e89..2223242 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2007-06-06 David Kowis <dkowis AT shlrm.org>
+ * PRE_BUILD, DEPENDS, visibility.patch: Don't need the visibility
patch anymore for
+ amd64 (probaby ppc)
+
2007-05-31 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0.0.4, SECURITY_PATCH=8

http://www.mozilla.org/projects/security/known-vulnerabilities.html#firefox2.0.0.4
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 27d41dc..042d15f 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -33,13 +33,4 @@ fi &&
cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
if [ "$FIREFOX_OFFICIAL" == "y" ]; then
sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
-fi &&
-
-# Apply visibility fix patch for amd64 and ppc.
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]] ||
- [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; then
- cd $SOURCE_DIRECTORY &&
- patch -p1 < $SCRIPT_DIRECTORY/visibility.patch &&
- # regenerate the ./configure using the right version of autoconf
- autoconf-2.13
fi
diff --git a/http/firefox/visibility.patch b/http/firefox/visibility.patch
deleted file mode 100644
index f157772..0000000
--- a/http/firefox/visibility.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- mozilla/configure.in- 2007-01-12 21:56:59.000000000 +0100
-+++ mozilla/configure.in 2007-01-12 21:58:08.000000000 +0100
-@@ -2518,7 +2518,7 @@
- EOF
- ac_cv_visibility_hidden=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
-- if grep '\.hidden.*foo' conftest.s >/dev/null; then
-+ if egrep '\.(hidden|private_extern).*foo' conftest.s
>/dev/null; then
- ac_cv_visibility_hidden=yes
- fi
- fi
-@@ -2534,7 +2534,7 @@
- EOF
- ac_cv_visibility_default=no
- if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c
-o conftest.s >/dev/null 2>&1; then
-- if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
-+ if ! egrep '\.(hidden|private_extern).*foo'
conftest.s >/dev/null; then
- ac_cv_visibility_default=yes
- fi
- fi
-@@ -2553,8 +2553,8 @@
- EOF
- ac_cv_visibility_pragma=no
- if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
-- if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
-- if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
-+ if egrep '\.(hidden|extern_private).*foo_hidden'
conftest.s >/dev/null; then
-+ if ! egrep
'\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
- ac_cv_visibility_pragma=yes
- fi
- fi
-@@ -2562,6 +2562,28 @@
- rm -f conftest.[cs]
- ])
- if test "$ac_cv_visibility_pragma" = "yes"; then
-+ AC_CACHE_CHECK(For gcc visibility bug with class-level attributes
(GCC bug 26905),
-+ ac_cv_have_visibility_class_bug,
-+ [cat > conftest.c <<EOF
-+#pragma GCC visibility push(hidden)
-+struct __attribute__ ((visibility ("default"))) TestStruct {
-+ static void Init();
-+};
-+__attribute__ ((visibility ("default"))) void TestFunc() {
-+ TestStruct::Init();
-+}
-+EOF
-+ ac_cv_have_visibility_class_bug=no
-+ if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS}
${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
-+ ac_cv_have_visibility_class_bug=yes
-+ else
-+ if test `grep -c "@PLT" conftest.S` = 0; then
-+ ac_cv_have_visibility_class_bug=yes
-+ fi
-+ fi
-+ rm -rf conftest.{c,S}
-+ ])
-+
- AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug
20297),
- ac_cv_have_visibility_builtin_bug,
- [cat > conftest.c <<EOF
-@@ -2576,12 +2598,17 @@
- }
- EOF
- ac_cv_have_visibility_builtin_bug=no
-- if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o
conftest.so conftest.c >/dev/null 2>&1; then
-+ if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS}
${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
- ac_cv_have_visibility_builtin_bug=yes
-+ else
-+ if test `grep -c "@PLT" conftest.S` = 0; then
-+ ac_cv_visibility_builtin_bug=yes
-+ fi
- fi
-- rm -f conftest.{c,so}
-+ rm -f conftest.{c,S}
- ])
-- if test "$ac_cv_have_visibility_builtin_bug" = "no"; then
-+ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
-+ "$ac_cv_have_visibility_class_bug" = "no"; then
- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include
$(topsrcdir)/config/gcc_hidden.h'
- WRAP_SYSTEM_INCLUDES=1
- else



  • [SM-Commit] GIT changes to master grimoire by David Kowis (02343ac05e18afbfb96abec2c554e36509b29e33), David Kowis, 06/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page