[packages/iceweasel] - cleanup, unified with mozilla-firefox.spec - dropped gcc3 patch (gcc >= 4.4 is required anyway) -
qboosh
qboosh at pld-linux.org
Wed Nov 13 18:45:45 CET 2013
commit 4dc7b9b35ca5ac77da971088ee4568580b23ba64
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Nov 13 18:46:01 2013 +0100
- cleanup, unified with mozilla-firefox.spec
- dropped gcc3 patch (gcc >= 4.4 is required anyway)
- spelling in PLD-specific bookmarks
iceweasel-gcc3.patch | 41 ---------------------------------
iceweasel-pld-branding.patch | 4 ++--
iceweasel.spec | 54 ++++++++++++++++----------------------------
3 files changed, 22 insertions(+), 77 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index ec6be08..6ac5ec5 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -1,10 +1,11 @@
# TODO:
-# - provide proper $DISPLAY for PGO (Xvfb, Xdummy...) for unattended builds
+# - /usr/share/iceweasel/browser/extensions symlink is arch-dependent (is it needed at all?)
+# - provide proper $DISPLAY for PGO (Xvfb, Xdummy...) for unattended builds
#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
%bcond_without kerberos # disable krb5 support
-%bcond_without xulrunner # build with system xulrunner
+%bcond_without xulrunner # system xulrunner
%bcond_with pgo # PGO-enabled build (requires working $DISPLAY == :100)
# convert firefox release number to platform version: 15.0.x -> 15.0.x
@@ -37,14 +38,11 @@ Source4: %{name}.sh
Source5: vendor.js
Source6: vendor-ac.js
Patch0: %{name}-branding.patch
-Patch2: %{name}-gcc3.patch
Patch7: %{name}-prefs.patch
Patch8: %{name}-pld-branding.patch
Patch9: %{name}-no-subshell.patch
-
Patch11: %{name}-middle_click_paste.patch
Patch12: %{name}-packaging.patch
-# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch13: system-virtualenv.patch
Patch14: gyp-slashism.patch
Patch15: Disable-Firefox-Health-Report.patch
@@ -160,15 +158,9 @@ cd mozilla
/bin/sh %{SOURCE2}
%patch0 -p1
-
-%if "%{cc_version}" < "3.4"
-%patch2 -p2
-%endif
-
%patch7 -p1
%patch8 -p1
%patch9 -p2
-
%patch11 -p2
%patch12 -p2
%patch13 -p2
@@ -233,9 +225,6 @@ ac_add_options --enable-tests
%else
ac_add_options --disable-tests
%endif
-%if %{with xulrunner}
-ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
-%endif
ac_add_options --disable-crashreporter
ac_add_options --disable-elf-dynstr-gc
ac_add_options --disable-gconf
@@ -266,6 +255,9 @@ ac_add_options --enable-url-classifier
ac_add_options --with-branding=iceweasel/branding
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
ac_add_options --with-distribution-id=org.pld-linux
+%if %{with xulrunner}
+ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
+%endif
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
ac_add_options --with-system-jpeg
@@ -300,7 +292,7 @@ install -d \
$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
$RPM_BUILD_ROOT%{_desktopdir} \
$RPM_BUILD_ROOT%{_datadir}/%{name}/browser \
- $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins
@@ -332,10 +324,10 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults $RPM_BUILD_ROOT%{_datadir}
%endif
ln -s ../../../share/%{name}/browser/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome
+ln -s ../../../share/%{name}/browser/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults
ln -s ../../../share/%{name}/browser/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons
ln -s ../../../share/%{name}/browser/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/searchplugins
ln -s ../../../%{_lib}/%{name}/browser/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions
-ln -s ../../../share/%{name}/browser/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults
%if %{without xulrunner}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
@@ -358,10 +350,10 @@ done
cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
# install our settings
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
-
%if "%{pld_release}" == "ac"
cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
+%else
+cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
%endif
# files created by iceweasel -register
@@ -417,6 +409,9 @@ fi
%attr(755,root,root) %{_bindir}/mozilla-firefox
%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
+%{_desktopdir}/iceweasel.desktop
+%{_iconsdir}/hicolor/*/apps/iceweasel.png
+
# browser plugins v2
%{_browserpluginsconfdir}/browsers.d/%{name}.*
%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
@@ -430,6 +425,7 @@ fi
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/browser
%{_datadir}/%{name}/browser/chrome
+%{_datadir}/%{name}/browser/defaults
%{_datadir}/%{name}/browser/icons
%{_datadir}/%{name}/browser/searchplugins
@@ -442,37 +438,27 @@ fi
%{_libdir}/%{name}/xulrunner
%endif
%{_libdir}/%{name}/browser/defaults
-%{_datadir}/%{name}/browser/defaults
+%attr(755,root,root) %{_libdir}/%{name}/iceweasel
+%attr(755,root,root) %{_libdir}/%{name}/iceweasel-bin
+%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
%{_libdir}/%{name}/application.ini
%{_libdir}/%{name}/browser/blocklist.xml
%{_libdir}/%{name}/browser/chrome.manifest
+%{_libdir}/%{name}/browser/components/components.manifest
+%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so
# the signature of the default theme
%{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
%{_libdir}/%{name}/browser/omni.ja
-%{_libdir}/%{name}/browser/components/components.manifest
-%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so
-%attr(755,root,root) %{_libdir}/%{name}/iceweasel
-%attr(755,root,root) %{_libdir}/%{name}/iceweasel-bin
-%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
%{_libdir}/%{name}/webapprt
%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
-%{_iconsdir}/hicolor/*/*/iceweasel.png
-%{_desktopdir}/iceweasel.desktop
-
# files created by iceweasel -register
%ghost %{_libdir}/%{name}/browser/components/compreg.dat
%ghost %{_libdir}/%{name}/browser/components/xpti.dat
-%if %{with crashreporter}
-%{_libdir}/%{name}/crashreporter
-%{_libdir}/%{name}/crashreporter-override.ini
-%{_libdir}/%{name}/crashreporter.ini
-%{_libdir}/%{name}/Throbber-small.gif
-%endif
-
%if %{without xulrunner}
+# private xulrunner instance
%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/platform.ini
%dir %{_libdir}/%{name}/components
diff --git a/iceweasel-gcc3.patch b/iceweasel-gcc3.patch
deleted file mode 100644
index 5f4efc6..0000000
--- a/iceweasel-gcc3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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=''
diff --git a/iceweasel-pld-branding.patch b/iceweasel-pld-branding.patch
index 0886535..020ea21 100644
--- a/iceweasel-pld-branding.patch
+++ b/iceweasel-pld-branding.patch
@@ -9,8 +9,8 @@ diff -ur mozilla.orig/browser/locales/generic/profile/bookmarks.html.in mozilla/
+ <DL><p>
+ <DT><A HREF="http://www.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Home Page</A>
+ <DT><A HREF="http://www.pld-users.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Users Wiki</A>
-+ <DT><A HREF="http://docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in english</A>
-+ <DT><A HREF="http://pl.docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in polish</A>
++ <DT><A HREF="http://docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in English</A>
++ <DT><A HREF="http://pl.docs.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">PLD Documentation in Polish</A>
+ <DT><A HREF="http://planet.pld-linux.org/" ICON_URI="http://www.pld-linux.org/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHUlEQVQ4jc1SwWqDQBB91pyFpsWLSGklRVHw7CnJLyTpzaMf4Dck5Feay4bc96T4BQkevCTiXc0nTA9lxbIJ2FP7YFh2Zt+bN8MCfw1lyKPmWhNjDACwWq3w9Pjc8UZDBBhj4JxjPB5j97n7UXu4RTjlR2quNYk75xwA0LYtJu8T9GsSNts1KSrIcW3aHxg115oM0yDHtUlRQcuPxX2ywGw+JUUFGaZBaZaQoqKLQQKiq3DSF0iz5L7AKT92RTFKPxzXlsjdEtMsId/3ISzqui41iONYyo2E5eViiSiKEIYhLMui8/l802VZXUjTNOR5Ds/zvhOb7ZrK6iLZ2x8YzeZTMkxDOsWSlbK60OvL26Af2R+3KAoEQfAb2n/FF3KJkR/xf7tGAAAAAElFTkSuQmCC">Planet PLD</A>
+ </DL><p>
</DL><p>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/4dc7b9b35ca5ac77da971088ee4568580b23ba64
More information about the pld-cvs-commit
mailing list