Author: hawk Date: Mon Jun 23 10:18:26 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- taken from firefox 3.0 for iceweasel 3.0
---- Files affected:
SOURCES:
iceweasel-ac-agent.patch (NONE -> 1.1) (NEW), iceweasel-agent.patch (NONE
-> 1.1) (NEW), iceweasel-gcc3.patch (NONE -> 1.1) (NEW),
iceweasel-nss_cflags.patch (NONE -> 1.1) (NEW), iceweasel-ti-agent.patch (NONE
-> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/iceweasel-ac-agent.patch
diff -u /dev/null SOURCES/iceweasel-ac-agent.patch:1.1
--- /dev/null Mon Jun 23 12:18:26 2008
+++ SOURCES/iceweasel-ac-agent.patch Mon Jun 23 12:18:19 2008
@@ -0,0 +1,12 @@
+--- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21
17:21:55.000000000 +0100
++++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21
17:23:53.000000000 +0100
+@@ -163,6 +163,9 @@
+ pref("general.useragent.locale", "@AB_CD@");
+ pref("general.skins.selectedSkin", "classic/1.0");
+ pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
++pref("general.useragent.vendor", "PLD");
++pref("general.useragent.vendorSub", "2.0");
++pref("general.useragent.vendorComment", "Ac");
+
+ pref("general.smoothScroll", false);
+ #ifdef UNIX_BUT_NOT_MAC
================================================================
Index: SOURCES/iceweasel-agent.patch
diff -u /dev/null SOURCES/iceweasel-agent.patch:1.1
--- /dev/null Mon Jun 23 12:18:27 2008
+++ SOURCES/iceweasel-agent.patch Mon Jun 23 12:18:19 2008
@@ -0,0 +1,12 @@
+--- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21
17:21:55.000000000 +0100
++++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21
17:23:53.000000000 +0100
+@@ -163,6 +163,9 @@
+ pref("general.useragent.locale", "@AB_CD@");
+ pref("general.skins.selectedSkin", "classic/1.0");
+ pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
++pref("general.useragent.vendor", "PLD");
++pref("general.useragent.vendorSub", "3.0");
++pref("general.useragent.vendorComment", "Th");
+
+ pref("general.smoothScroll", false);
+ #ifdef UNIX_BUT_NOT_MAC
================================================================
Index: SOURCES/iceweasel-gcc3.patch
diff -u /dev/null SOURCES/iceweasel-gcc3.patch:1.1
--- /dev/null Mon Jun 23 12:18:27 2008
+++ SOURCES/iceweasel-gcc3.patch Mon Jun 23 12:18:19 2008
@@ -0,0 +1,41 @@
+in short: that '-z defs' makes tls symbols invisible on gcc 3.3.6
+
+gmake[1]: Entering directory
`/home/glen/rpm/pld/BUILD/mozilla-firefox-3.0/mozilla/obj-amd64/memory/jemalloc'
+rm -f libjemalloc.so
+ccache amd64-pld-linux-g++ -I/usr/X11R6/include -fno-rtti -fno-exceptions
-Wall -Wconversion -Wpointer-arith -Woverloaded-virtual -Wsynth
-Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wcast-align -Wno-long-long
-pedantic -fno-strict-aliasing -fshort-wchar -pthread -pipe -DNDEBUG -DTRIMMED
-O2 -fno-strict-aliasing -fPIC -shared -Wl,-z,defs -Wl,-h,libjemalloc.so -o
libjemalloc.so jemalloc.o -lpthread -Wl,-rpath-link,../../dist/bin
-ldl -lm
+jemalloc.o(.text+0x1b5c): In function `choose_arena_hard':
+jemalloc.c: undefined reference to `__tls_get_addr'
+jemalloc.o(.text+0x3cf1): In function `arena_ralloc':
+jemalloc.c: undefined reference to `__tls_get_addr'
+jemalloc.o(.text+0x4921): In function `malloc_init_hard':
+jemalloc.c: undefined reference to `__tls_get_addr'
+jemalloc.o(.text+0x4ce1): In function `malloc':
+jemalloc.c: undefined reference to `__tls_get_addr'
+jemalloc.o(.text+0x4eb7): In function `calloc':
+jemalloc.c: undefined reference to `__tls_get_addr'
+jemalloc.o(.text+0x5051):jemalloc.c: more undefined references to
`__tls_get_addr' follow
+collect2: ld returned 1 exit status
+gmake[1]: *** [libjemalloc.so] Error 1
+
+--- mozilla-firefox-3.0rc1/mozilla/configure~ 2008-05-06 00:11:03.000000000
+0300
++++ mozilla-firefox-3.0rc1/mozilla/configure 2008-05-27 08:09:43.180357890
+0300
+@@ -5444,7 +5444,7 @@
+ DSO_LDOPTS='-shared'
+ if test "$GCC_USE_GNU_LD"; then
+ # Don't allow undefined symbols in libraries
+- DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
++: # DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
+ fi
+ WARNINGS_AS_ERRORS='-Werror'
+ DSO_CFLAGS=''
+--- mozilla-firefox-3.0rc1/mozilla/configure.in~ 2008-05-06
00:08:14.000000000 +0300
++++ mozilla-firefox-3.0rc1/mozilla/configure.in 2008-05-27
08:09:43.210357726 +0300
+@@ -1273,7 +1273,7 @@
+ DSO_LDOPTS='-shared'
+ if test "$GCC_USE_GNU_LD"; then
+ # Don't allow undefined symbols in libraries
+- DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
++: # DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
+ fi
+ WARNINGS_AS_ERRORS='-Werror'
+ DSO_CFLAGS=''
================================================================
Index: SOURCES/iceweasel-nss_cflags.patch
diff -u /dev/null SOURCES/iceweasel-nss_cflags.patch:1.1
--- /dev/null Mon Jun 23 12:18:28 2008
+++ SOURCES/iceweasel-nss_cflags.patch Mon Jun 23 12:18:20 2008
@@ -0,0 +1,42 @@
+--- mozilla/config/autoconf.mk.in.orig 2008-06-19 17:55:40.000000000 +0200
++++ mozilla/config/autoconf.mk.in 2008-06-19 18:45:18.000000000 +0200
+@@ -276,7 +276,7 @@
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
+
+-OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
$(LCMS_CFLAGS)
++OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS)
$(ZLIB_CFLAGS) $(LCMS_CFLAGS)
+ OS_LIBS = @LIBS@
+ ACDEFINES = @MOZ_DEFINES@
+
+--- mozilla/config/rules.mk.orig 2008-06-19 18:45:00.000000000 +0200
++++ mozilla/config/rules.mk 2008-06-19 18:42:40.000000000 +0200
+@@ -1235,23 +1235,23 @@
+ # Rules for building native targets must come first because of the host_
prefix
+ host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
+ $(REPORT_BUILD)
+- $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES)
$(NSPR_CFLAGS) $(_VPATH_SRCS)
++ $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES)
$(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+
+ host_%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
+ $(REPORT_BUILD)
+- $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES)
$(NSPR_CFLAGS) $(_VPATH_SRCS)
++ $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES)
$(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+
+ host_%.$(OBJ_SUFFIX): %.cc Makefile Makefile.in
+ $(REPORT_BUILD)
+- $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES)
$(NSPR_CFLAGS) $(_VPATH_SRCS)
++ $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES)
$(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+
+ host_%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
+ $(REPORT_BUILD)
+- $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS)
$(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++ $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS)
$(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+
+ host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
+ $(REPORT_BUILD)
+- $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS)
$(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
++ $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS)
$(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
+
+ %: %.c Makefile Makefile.in
+ $(REPORT_BUILD)
================================================================
Index: SOURCES/iceweasel-ti-agent.patch
diff -u /dev/null SOURCES/iceweasel-ti-agent.patch:1.1
--- /dev/null Mon Jun 23 12:18:28 2008
+++ SOURCES/iceweasel-ti-agent.patch Mon Jun 23 12:18:20 2008
@@ -0,0 +1,11 @@
+--- mozilla-firefox/browser/app/profile/firefox.js.orig 2007-03-21
17:21:55.000000000 +0100
++++ mozilla-firefox/browser/app/profile/firefox.js 2007-03-21
17:23:53.000000000 +0100
+@@ -163,6 +163,8 @@
+ pref("general.useragent.locale", "@AB_CD@");
+ pref("general.skins.selectedSkin", "classic/1.0");
+ pref("general.useragent.extra.firefox", "@APP_UA_NAME@/@APP_VERSION@");
++pref("general.useragent.vendor", "PLD");
++pref("general.useragent.vendorSub", "Titanium");
+
+ pref("general.smoothScroll", false);
+ #ifdef UNIX_BUT_NOT_MAC
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
