SPECS (DEVEL): mozilla-firefox.spec - remove commented out patches...

Sat Mar 15 23:26:21 CET 2008

Author: arekm                        Date: Sat Mar 15 22:26:21 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remove commented out patches; drop visibility hacks; use -Os instead of -O2; disable strip, xprint; enable startup notification, xinerama, pthreads

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.228.4.21 -> 1.228.4.22) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.228.4.21 SPECS/mozilla-firefox.spec:1.228.4.22

--- SPECS/mozilla-firefox.spec:1.228.4.21	Tue Mar 11 13:23:09 2008
+++ SPECS/mozilla-firefox.spec	Sat Mar 15 23:26:16 2008
@@ -21,7 +21,7 @@
 
 %define		ver		3.0
 %define		subver	b4
-%define		rel		0.1
+%define		rel		0.2
 
 Summary:	Firefox Community Edition web browser
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
@@ -36,19 +36,7 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-install.patch
-#Patch1:	%{name}-lib_path.patch
-#Patch2:	%{name}-fonts.patch
-Patch3:		%{name}-agent.patch
-#Patch4:	%{name}-myspell.patch
-#Patch5:	%{name}-pango-cursor-position.patch
-#Patch6:	%{name}-pango-ligatures.patch
-#Patch7:	%{name}-pango-cursor-position-more.patch
-#Patch8:	%{name}-pango-justified-range.patch
-#Patch9:	%{name}-pango-printing.patch
-#Patch10:	%{name}-pango-underline.patch
-#Patch11:	%{name}-xft-randewidth.patch
-# if ac rebuild is needed...
-#PatchX: %{name}-ac.patch
+Patch1:		%{name}-agent.patch
 URL:		http://www.mozilla.org/projects/firefox/
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -72,6 +60,7 @@
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.356
+BuildRequires:	startup-notification-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel >= 2.1
 BuildRequires:	xorg-lib-libXinerama-devel
@@ -118,35 +107,7 @@
 %setup -qc -n %{name}-%{version}%{?subver}
 cd mozilla
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1 # applied in sources
-%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
-#%patch8 -p1
-#%patch9 -p0
-#%patch10 -p1
-#%patch11 -p1
-
-#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
-%{__sed} -i -e '/Wl,-z,defs/s,^,: #,' configure{,.in}
+%patch1 -p1
 
 %build
 cd mozilla
@@ -157,7 +118,6 @@
 . $topsrcdir/browser/config/mozconfig
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
-ac_cv_visibility_pragma=no
 
 # Options for 'configure' (same as command-line options).
 ac_add_options --prefix=%{_prefix}
@@ -183,7 +143,7 @@
 ac_add_options --disable-debug
 ac_add_options --disable-debug-modules
 ac_add_options --disable-logging
-ac_add_options --enable-optimize="%{rpmcflags}"
+ac_add_options --enable-optimize="%{rpmcflags} -Os"
 %endif
 %if %{with tests}
 ac_add_options --enable-tests
@@ -205,13 +165,18 @@
 ac_add_options --disable-installer
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-updater
+ac_add_options --disable-strip
+ac_add_options --disable-xprint
 ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-startup-notification
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
 ac_add_options --enable-system-myspell
 ac_add_options --enable-xft
 ac_add_options --enable-libxul
+ac_add_options --enable-xinerama
 ac_add_options --with-distribution-id=org.pld-linux
+ac_add_options --with-pthreads
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -221,6 +186,7 @@
 EOF
 
 %{__make} -j1 -f client.mk build \
+	STRIP="/bin/true" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
@@ -449,6 +415,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.228.4.22  2008-03-15 22:26:16  arekm
+- remove commented out patches; drop visibility hacks; use -Os instead of -O2; disable strip, xprint; enable startup notification, xinerama, pthreads
+
 Revision 1.228.4.21  2008-03-11 12:23:09  glen
 - official tarball
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.228.4.21&r2=1.228.4.22&f=u

