[packages/seamonkey] - updated to 2.26, sync with iceape.spec
qboosh
qboosh at pld-linux.org
Sat May 17 14:21:32 CEST 2014
commit c7d608a7e65b71bf058ad869bb6880d243f40490
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 17 14:24:17 2014 +0200
- updated to 2.26, sync with iceape.spec
seamonkey-enable-addons.patch | 45 +++++++
seamonkey-glueload-fix.patch | 21 ----
seamonkey-gyp-slashism.patch | 66 ----------
seamonkey-pixman.patch | 11 ++
seamonkey-system-virtualenv.patch | 60 ++-------
seamonkey.spec | 259 ++++++++++----------------------------
system-cairo.patch | 34 -----
system-mozldap.patch | 59 +++++++--
8 files changed, 181 insertions(+), 374 deletions(-)
---
diff --git a/seamonkey.spec b/seamonkey.spec
index 407119d..5b58c8b 100644
--- a/seamonkey.spec
+++ b/seamonkey.spec
@@ -1,22 +1,18 @@
#
# Conditional build:
-%bcond_without enigmail # don't build enigmail - GPG/PGP support
-%bcond_without gnomeui # disable gnomeui support
-%bcond_without gnome # disable gnomeui (alias)
+%bcond_with enigmail # enigmail - GPG/PGP support [broken as of 2.26]
+%bcond_with gtk3 # GTK+ 3.x instead of 2.x
%bcond_without ldap # disable e-mail address lookups in LDAP directories
%bcond_without lightning # disable Sunbird/Lightning calendar
+%bcond_without kerberos # disable krb5 support
%bcond_with xulrunner # build with system xulrunner (incomplete? enigmail not supported)
+%bcond_with crashreporter # report crashes to crash-stats.mozilla.com
%bcond_with tests # enable tests (whatever they check)
-%bcond_without kerberos # disable krb5 support
-
-%if %{without gnome}
-%undefine with_gnomeui
-%endif
-%define enigmail_ver 1.5.1
-%define nspr_ver 4.9.3
-%define nss_ver 3.14.1
-%define xulrunner_ver 19.0
+%define enigmail_ver 1.6
+%define nspr_ver 4.10.3
+%define nss_ver 3.16
+%define xulrunner_ver 29.0
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -28,14 +24,14 @@ Summary(es.UTF-8): Navegador de Internet SeaMonkey Community Edition
Summary(pl.UTF-8): SeaMonkey Community Edition - przeglądarka WWW
Summary(pt_BR.UTF-8): Navegador SeaMonkey Community Edition
Name: seamonkey
-Version: 2.16
+Version: 2.26
Release: 1
-License: MPL 1.1 or GPL v2+ or LGPL v2.1+
+License: MPL v2.0
Group: X11/Applications/Networking
Source0: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/%{name}-%{version}.source.tar.bz2
-# Source0-md5: 29e360eae42d7a9cca7f25c1ad44f1d5
+# Source0-md5: 1749f6350209e35e0bede3bf4e56c42c
Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: 3e71f84ed2c11471282412ebe4f5eb2d
+# Source1-md5: 4a2bbcb020bdb282a660fda8c70d5608
Source4: %{name}.desktop
Source5: %{name}-composer.desktop
Source6: %{name}-chat.desktop
@@ -44,13 +40,12 @@ Source8: %{name}-venkman.desktop
Source9: %{name}.sh
Patch1: %{name}-pld-branding.patch
Patch2: %{name}-agent.patch
-Patch3: %{name}-glueload-fix.patch
+Patch3: %{name}-enable-addons.patch
Patch4: system-mozldap.patch
Patch5: makefile.patch
-Patch6: system-cairo.patch
+Patch6: %{name}-pixman.patch
# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch7: %{name}-system-virtualenv.patch
-Patch8: %{name}-gyp-slashism.patch
Patch9: %{name}-system-xulrunner.patch
URL: http://www.seamonkey-project.org/
BuildRequires: GConf2-devel >= 1.2.1
@@ -61,8 +56,9 @@ BuildRequires: bzip2-devel
BuildRequires: cairo-devel >= 1.10.2-5
BuildRequires: dbus-glib-devel >= 0.60
BuildRequires: freetype-devel >= 1:2.1.8
-BuildRequires: glib2-devel >= 1:2.18
-BuildRequires: gtk+2-devel >= 2:2.10
+BuildRequires: glib2-devel >= 1:2.20
+%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.18}
+%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0.0}
%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
BuildRequires: hunspell-devel
BuildRequires: libIDL-devel >= 0.8.0
@@ -70,18 +66,16 @@ BuildRequires: libdnet-devel
BuildRequires: libevent-devel >= 1.4.7
# standalone libffi 3.0.9 or gcc's from 4.5(?)+
BuildRequires: libffi-devel >= 6:3.0.9
-%{?with_gnomeui:BuildRequires: libgnome-devel >= 2.0}
-%{?with_gnomeui:BuildRequires: libgnome-keyring-devel}
-%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
-BuildRequires: libiw-devel
+BuildRequires: libicu-devel >= 50.1
# requires libjpeg-turbo implementing at least libjpeg 6b API
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libjpeg-turbo-devel
BuildRequires: libnotify-devel >= 0.4
BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 1.4.1
+BuildRequires: libpng-devel >= 2:1.6.7
BuildRequires: libstdc++-devel
-BuildRequires: libvpx-devel >= 1.0.0
+BuildRequires: libvpx-devel >= 1.3.0
+BuildRequires: mozldap-devel
BuildRequires: nspr-devel >= 1:%{nspr_ver}
BuildRequires: nss-devel >= 1:%{nss_ver}
BuildRequires: pango-devel >= 1:1.14.0
@@ -94,14 +88,16 @@ BuildRequires: python-virtualenv
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.7.10
+BuildRequires: sqlite3-devel >= 3.8.2
BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXt-devel
%if %{with xulrunner}
BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
+BuildRequires: xulrunner-devel < 2:30
%endif
BuildRequires: yasm
BuildRequires: zip
@@ -115,10 +111,13 @@ Requires: hicolor-icon-theme
Requires: browser-plugins >= 2.0
Requires: cairo >= 1.10.2-5
Requires: dbus-glib >= 0.60
-Requires: gtk+2 >= 2:2.18
+Requires: glib2 >= 1:2.20
+%{!?with_gtk3:Requires: gtk+2 >= 2:2.18}
+%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
Requires: libjpeg-turbo
-Requires: libpng >= 1.4.1
+Requires: libpng >= 2:1.6.7
Requires: libpng(APNG) >= 0.10
+Requires: libvpx >= 1.3.0
Requires: myspell-common
Requires: nspr >= 1:%{nspr_ver}
Requires: nss >= 1:%{nss_ver}
@@ -189,7 +188,6 @@ funkcjonalność kalendarza.
Summary: Enigmail %{enigmail_ver} - PGP/GPG support for SeaMonkey Community Edition
Summary(pl.UTF-8): Enigmail %{enigmail_ver} - obsługa PGP/GPG dla SeaMonkey Community Edition
Group: X11/Applications/Networking
-Requires(post,postun): %{name} = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
Requires: gnupg >= 1.4.2.2
@@ -258,12 +256,11 @@ cd comm-release
tar -C mailnews/extensions -zxf %{SOURCE1}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+%patch3 -p2
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p2
-%patch8 -p1
+%patch7 -p1
%patch9 -p2
%build
@@ -306,7 +303,6 @@ ac_add_options --localstatedir=%{_localstatedir}
ac_add_options --sharedstatedir=%{_sharedstatedir}
ac_add_options --mandir=%{_mandir}
ac_add_options --infodir=%{_infodir}
-ac_add_options --disable-elf-hack
%if %{?debug:1}0
ac_add_options --disable-optimize
ac_add_options --enable-debug
@@ -326,47 +322,46 @@ ac_add_options --enable-tests
%else
ac_add_options --disable-tests
%endif
-ac_add_options --enable-gio
-%if %{with gnomeui}
-ac_add_options --enable-gnomeui
-%else
-ac_add_options --disable-gnomeui
-%endif
-ac_add_options --disable-gnomevfs
-%if %{with ldap}
-ac_add_options --enable-ldap
-ac_add_options --with-system-ldap
+%if %{with lightning}
+ac_add_options --enable-calendar
%else
-ac_add_options --disable-ldap
+ac_add_options --disable-calendar
%endif
%if %{with crashreporter}
ac_add_options --enable-crashreporter
%else
ac_add_options --disable-crashreporter
%endif
-ac_add_options --disable-xterm-updates
-ac_add_options --enable-postscript
-%if %{with lightning}
-ac_add_options --enable-calendar
-%else
-ac_add_options --disable-calendar
-%endif
+ac_add_options --disable-elf-dynstr-gc
+ac_add_options --disable-gnomeui
+ac_add_options --disable-gnomevfs
ac_add_options --disable-installer
ac_add_options --disable-javaxpcom
ac_add_options --disable-updater
+ac_add_options --disable-xterm-updates
+ac_add_options --enable-application=suite
ac_add_options --enable-crypto
+ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
+ac_add_options --enable-gio
+%if %{with ldap}
+ac_add_options --enable-ldap
+ac_add_options --with-system-ldap
+%else
+ac_add_options --disable-ldap
+%endif
ac_add_options --enable-libxul
ac_add_options --enable-pango
+ac_add_options --enable-postscript
ac_add_options --enable-shared-js
ac_add_options --enable-startup-notification
ac_add_options --enable-system-cairo
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
-ac_add_options --enable-application=suite
+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-system-libxul
ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
+ac_add_options --with-system-libxul
%endif
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
@@ -378,7 +373,6 @@ ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-png
ac_add_options --with-system-zlib
-ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
EOF
%{__make} -j1 -f client.mk build \
@@ -397,12 +391,12 @@ EOF
%if %{with enigmail}
cd mailnews/extensions/enigmail
./makemake -r -o %{objdir}
-%{__make} -C %{objdir}/mailnews/extensions/enigmail \
+%{__make} -j1 -C %{objdir}/mailnews/extensions/enigmail \
STRIP="/bin/true" \
CC="%{__cc}" \
CXX="%{__cxx}"
-%{__make} -C %{objdir}/mailnews/extensions/enigmail xpi \
+%{__make} -j1 -C %{objdir}/mailnews/extensions/enigmail xpi \
STRIP="/bin/true" \
CC="%{__cc}" \
CXX="%{__cxx}"
@@ -420,7 +414,9 @@ install -d \
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
cd %{objdir}
+cwd=`pwd`
%{__make} -C suite/installer stage-package \
+ LD_LIBRARY_PATH=$cwd/mozilla/dist/lib \
DESTDIR=$RPM_BUILD_ROOT \
installdir=%{_libdir}/%{name} \
PKG_SKIP_STRIP=1
@@ -442,29 +438,21 @@ cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip $R
%endif
# copy manually lightning files, somewhy they are not installed by make
-cp -a mozilla/dist/bin/extensions/calendar-timezones at mozilla.org \
- mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \
+cp -a mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \
$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
-
+
# move arch independant ones to datadir
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
-%if %{without xulrunner}
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs.js
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
-%endif
ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
-ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
+
%if %{without xulrunner}
-ln -s ../../share/%{name}/greprefs.js $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
-ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
%endif
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/* \
@@ -478,8 +466,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
%if %{without xulrunner}
%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
-ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
%endif
sed 's, at LIBDIR@,%{_libdir},' %{SOURCE9} > $RPM_BUILD_ROOT%{_bindir}/seamonkey
@@ -525,15 +511,12 @@ cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/install.rdf $e
cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest
%endif
+%if %{without xulrunner}
# never package these. always remove
-# nss
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
-# nspr
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
# mozldap
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
-# testpilot quiz
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot at labs.mozilla.com.xpi
+%{__sed} -i '/lib\(ldap\|ldif\|prldap\)60.so/d' $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap}60.so
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -560,11 +543,11 @@ fi
%if %{without xulrunner}
%attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
-%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
%endif
%{_libdir}/%{name}/blocklist.xml
+%{_libdir}/%{name}/omni.ja
%attr(755,root,root) %{_libdir}/%{name}/register
%if %{with crashreporter}
@@ -579,109 +562,12 @@ fi
%{_libdir}/%{name}/chrome.manifest
%dir %{_libdir}/%{name}/components
-
-%{_libdir}/%{name}/components/Aitc.js
-%{_libdir}/%{name}/components/FeedConverter.js
-%{_libdir}/%{name}/components/FeedWriter.js
-%{_libdir}/%{name}/components/Weave.js
-%{_libdir}/%{name}/components/WebContentConverter.js
-%{_libdir}/%{name}/components/nsAbout.js
-%{_libdir}/%{name}/components/nsBrowserContentHandler.js
-%{_libdir}/%{name}/components/nsComposerCmdLineHandler.js
-%{_libdir}/%{name}/components/nsSessionStartup.js
-%{_libdir}/%{name}/components/nsSessionStore.js
-%{_libdir}/%{name}/components/nsSetDefault.js
-%{_libdir}/%{name}/components/nsSidebar.js
-%{_libdir}/%{name}/components/nsSuiteDownloadManagerUI.js
-%{_libdir}/%{name}/components/nsSuiteGlue.js
-%{_libdir}/%{name}/components/nsTypeAheadFind.js
-%{_libdir}/%{name}/components/smileApplication.js
-
-%{_libdir}/%{name}/components/browser.xpt
%{_libdir}/%{name}/components/components.manifest
-%{_libdir}/%{name}/components/interfaces.manifest
-
%attr(755,root,root) %{_libdir}/%{name}/components/libsuite.so
%if %{without xulrunner}
%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/platform.ini
-%{_libdir}/%{name}/components/AlarmsManager.js
-%{_libdir}/%{name}/components/AppsService.js
-%{_libdir}/%{name}/components/BrowserElementParent.js
-%{_libdir}/%{name}/components/ColorAnalyzer.js
-%{_libdir}/%{name}/components/ContactManager.js
-%{_libdir}/%{name}/components/ConsoleAPI.js
-%{_libdir}/%{name}/components/FeedProcessor.js
-%{_libdir}/%{name}/components/GPSDGeolocationProvider.js
-%{_libdir}/%{name}/components/NetworkGeolocationProvider.js
-%{_libdir}/%{name}/components/PermissionSettings.js
-%{_libdir}/%{name}/components/PlacesCategoriesStarter.js
-%{_libdir}/%{name}/components/SettingsManager.js
-%{_libdir}/%{name}/components/SiteSpecificUserAgent.js
-%{_libdir}/%{name}/components/TCPSocket.js
-%{_libdir}/%{name}/components/TCPSocketParentIntermediary.js
-%{_libdir}/%{name}/components/TelemetryPing.js
-%{_libdir}/%{name}/components/Webapps.js
-%{_libdir}/%{name}/components/addonManager.js
-%{_libdir}/%{name}/components/amContentHandler.js
-%{_libdir}/%{name}/components/amWebInstallListener.js
-%{_libdir}/%{name}/components/contentAreaDropListener.js
-%{_libdir}/%{name}/components/contentSecurityPolicy.js
-%{_libdir}/%{name}/components/crypto-SDR.js
-%{_libdir}/%{name}/components/glautocomp.js
-%{_libdir}/%{name}/components/jsconsole-clhandler.js
-%{_libdir}/%{name}/components/jsmimeemitter.js
-%{_libdir}/%{name}/components/mdn-service.js
-%{_libdir}/%{name}/components/messageWakeupService.js
-%{_libdir}/%{name}/components/msgAsyncPrompter.js
-%{_libdir}/%{name}/components/newMailNotificationService.js
-%{_libdir}/%{name}/components/newsblog.js
-%{_libdir}/%{name}/components/nsAbAutoCompleteMyDomain.js
-%{_libdir}/%{name}/components/nsAbAutoCompleteSearch.js
-%{_libdir}/%{name}/components/nsAbLDAPAttributeMap.js
-%{_libdir}/%{name}/components/nsBadCertHandler.js
-%{_libdir}/%{name}/components/nsBlocklistService.js
-%{_libdir}/%{name}/components/nsContentDispatchChooser.js
-%{_libdir}/%{name}/components/nsContentPrefService.js
-%{_libdir}/%{name}/components/nsDOMIdentity.js
-%{_libdir}/%{name}/components/nsDefaultCLH.js
-%{_libdir}/%{name}/components/nsFilePicker.js
-%{_libdir}/%{name}/components/nsFormAutoComplete.js
-%{_libdir}/%{name}/components/nsFormHistory.js
-%{_libdir}/%{name}/components/nsHandlerService.js
-%{_libdir}/%{name}/components/nsHelperAppDlg.js
-%{_libdir}/%{name}/components/nsIDService.js
-%{_libdir}/%{name}/components/nsINIProcessor.js
-%{_libdir}/%{name}/components/nsInputListAutoComplete.js
-%{_libdir}/%{name}/components/nsLDAPProtocolHandler.js
-%{_libdir}/%{name}/components/nsLivemarkService.js
-%{_libdir}/%{name}/components/nsLoginInfo.js
-%{_libdir}/%{name}/components/nsLoginManager.js
-%{_libdir}/%{name}/components/nsLoginManagerPrompter.js
-%{_libdir}/%{name}/components/nsMailNewsCommandLineHandler.js
-%{_libdir}/%{name}/components/nsMsgTraitService.js
-%{_libdir}/%{name}/components/nsPlacesAutoComplete.js
-%{_libdir}/%{name}/components/nsPlacesExpiration.js
-%{_libdir}/%{name}/components/nsPrompter.js
-%{_libdir}/%{name}/components/nsSMTPProtocolHandler.js
-%{_libdir}/%{name}/components/nsSearchService.js
-%{_libdir}/%{name}/components/nsSearchSuggestions.js
-%{_libdir}/%{name}/components/nsTaggingService.js
-%{_libdir}/%{name}/components/nsUpdateTimerManager.js
-%{_libdir}/%{name}/components/nsUrlClassifierHashCompleter.js
-%{_libdir}/%{name}/components/nsUrlClassifierLib.js
-%{_libdir}/%{name}/components/nsUrlClassifierListManager.js
-%{_libdir}/%{name}/components/nsURLFormatter.js
-%{_libdir}/%{name}/components/nsWebHandlerApp.js
-%{_libdir}/%{name}/components/offlineStartup.js
-%{_libdir}/%{name}/components/smime-service.js
-%{_libdir}/%{name}/components/storage-Legacy.js
-%{_libdir}/%{name}/components/storage-mozStorage.js
-%{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
-
-%{_libdir}/%{name}/components/mail.xpt
-
%attr(755,root,root) %{_libdir}/%{name}/components/libdbusservice.so
%attr(755,root,root) %{_libdir}/%{name}/components/libmozgnome.so
%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
@@ -696,35 +582,17 @@ fi
# symlinks
%{_libdir}/%{name}/chrome
%{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/modules
%{_libdir}/%{name}/searchplugins
%if %{with xulrunner}
%{_libdir}/%{name}/xulrunner
%else
%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/hyphenation
-%{_libdir}/%{name}/greprefs.js
-%{_libdir}/%{name}/res
%endif
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/chrome
%{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/modules
-%if %{with enigmail}
-%exclude %{_datadir}/%{name}/modules/commonFuncs.jsm
-%exclude %{_datadir}/%{name}/modules/enigmailCommon.jsm
-%exclude %{_datadir}/%{name}/modules/keyManagement.jsm
-%exclude %{_datadir}/%{name}/modules/pipeConsole.jsm
-%exclude %{_datadir}/%{name}/modules/subprocess.jsm
-%exclude %{_datadir}/%{name}/modules/subprocess_worker_unix.js
-%exclude %{_datadir}/%{name}/modules/subprocess_worker_win.js
-%endif
%{_datadir}/%{name}/searchplugins
-%if %{without xulrunner}
-%{_datadir}/%{name}/greprefs.js
-%{_datadir}/%{name}/res
-%endif
%dir %{_datadir}/%{name}/extensions
%dir %{_libdir}/%{name}/extensions
@@ -770,7 +638,6 @@ fi
%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules
%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js
%{_libdir}/%{name}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones.sqlite
-%{_libdir}/%{name}/extensions/calendar-timezones at mozilla.org
%endif
%if %{with enigmail}
diff --git a/seamonkey-enable-addons.patch b/seamonkey-enable-addons.patch
new file mode 100644
index 0000000..6eb395b
--- /dev/null
+++ b/seamonkey-enable-addons.patch
@@ -0,0 +1,45 @@
+diff -up seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js
+--- seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old 2011-11-21 11:20:08.000000000 +0100
++++ seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js 2011-12-14 12:40:24.074179826 +0100
+@@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
+ // Disable add-ons installed into the shared user and shared system areas by
+ // default. This does not include the application directory. See the SCOPE
+ // constants in AddonManager.jsm for values to use here
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
+
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true);
+--- iceape-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.orig 2014-05-14 18:10:44.574018230 +0200
++++ iceape-2.26/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm 2014-05-14 18:13:00.020682073 +0200
+@@ -2051,7 +2051,7 @@
+ this.showUpgradeUI();
+ flushCaches = true;
+ }
+- else if (aAppChanged === undefined) {
++ else {
+ // For new profiles we will never need to show the add-on selection UI
+ Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
+ }
+--- iceape-2.22/comm-release/suite/browser/browser-prefs.js~ 2013-11-06 19:54:38.789734061 +0100
++++ iceape-2.22/comm-release/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935 +0100
+@@ -616,7 +616,7 @@
+ // Disable add-ons installed into the shared user and shared system areas by
+ // default. This does not include the application directory. See the SCOPE
+ // constants in AddonManager.jsm for values to use here.
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
+
+ // Preferences for AMO integration
+ pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations
+--- iceape-2.22/comm-release/mozilla/browser/app/profile/firefox.js~ 2013-10-29 02:20:40.000000000 +0100
++++ iceape-2.22/comm-release/mozilla/browser/app/profile/firefox.js 2013-11-06 20:56:58.633092070 +0100
+@@ -62,7 +62,7 @@
+
+ // Disable add-ons that are not installed by the user in all scopes by default.
+ // See the SCOPE constants in AddonManager.jsm for values to use here.
+-pref("extensions.autoDisableScopes", 15);
++pref("extensions.autoDisableScopes", 0);
+
+ // Dictionary download preference
+ pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
diff --git a/seamonkey-glueload-fix.patch b/seamonkey-glueload-fix.patch
deleted file mode 100644
index 0da2ee4..0000000
--- a/seamonkey-glueload-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- seamonkey-1.1.11/mozilla/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp 2006-02-22 22:57:09.000000000 +0100
-+++ seamonkey-1.1.11/mozilla/xpcom/glue/standalone/nsGlueLinkingDlopen.cpp.fixed 2008-09-23 21:15:21.000000000 +0200
-@@ -86,8 +86,8 @@
- GetFrozenFunctionsFunc
- XPCOMGlueLoad(const char *xpcomFile)
- {
-- char xpcomDir[MAXPATHLEN];
-- if (realpath(xpcomFile, xpcomDir)) {
-+ char * xpcomDir;
-+ if (xpcomDir = realpath(xpcomFile, NULL)) {
- char *lastSlash = strrchr(xpcomDir, '/');
- if (lastSlash) {
- *lastSlash = '\0';
-@@ -98,6 +98,7 @@
-
- sXULLibHandle = dlopen(xpcomDir, RTLD_GLOBAL | RTLD_LAZY);
- }
-+ free( xpcomDir );
- }
-
- // RTLD_DEFAULT is not defined in non-GNU toolchains, and it is
diff --git a/seamonkey-gyp-slashism.patch b/seamonkey-gyp-slashism.patch
deleted file mode 100644
index ccab456..0000000
--- a/seamonkey-gyp-slashism.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig 2013-01-05 00:44:41.000000000 +0100
-+++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-13 20:13:40.033894757 +0100
-@@ -114,6 +114,12 @@
- if dir and not os.path.exists(dir):
- os.makedirs(dir)
-
-+def append_relative(base, rel):
-+ if rel == '':
-+ return base
-+ else:
-+ return base + '/' + rel
-+
- def GetFlavor(params):
- """Returns |params.flavor| if it's set, the system's default flavor else."""
- flavors = {
-@@ -142,9 +148,9 @@
-
- def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None):
- if not os.path.isabs(topsrcdir):
-- topsrcdir = depth + "/" + topsrcdir
-+ topsrcdir = append_relative(depth, topsrcdir)
- if not os.path.isabs(srcdir):
-- srcdir = depth + "/" + srcdir
-+ srcdir = append_relative(depth, srcdir)
- #TODO: should compare with the existing file and not overwrite it if the
- # contents are the same!
- ensure_directory_exists(filename)
-@@ -261,7 +267,7 @@
- qualified_target)
- build_file = os.path.abspath(build_file)
- rel_path, output_file = self.CalculateMakefilePath(build_file, target)
-- subdepth = self.depth + "/" + getdepth(rel_path)
-+ subdepth = append_relative(self.depth, getdepth(rel_path))
- if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
- # If WriteTargetMakefile returns True, then this is a useful target
- dirs.append(rel_path)
-@@ -376,7 +382,7 @@
- WriteMakefile(output_file, data, build_file, depth, top,
- # we set srcdir up one directory, since the subdir
- # doesn't actually exist in the source directory
-- swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
-+ swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
- self.relative_srcdir)
- return True
-
-@@ -399,7 +405,7 @@
- # The relative path from objdir to gyp_file_dir
- srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
- # The absolute path to the source dir
-- abs_srcdir = topsrcdir + "/" + relative_srcdir
-+ abs_srcdir = append_relative(topsrcdir, relative_srcdir)
- # The path to get up to the root of the objdir from the output dir.
- depth = getdepth(relative_srcdir)
- # The output directory.
-@@ -408,9 +414,9 @@
- makefile_path = os.path.join(output_dir, "Makefile")
-
- def topsrcdir_path(path):
-- return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir))
-+ return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir)))
- def objdir_path(path):
-- return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir))
-+ return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir)))
-
- # Find the list of targets that derive from the gyp file(s) being built.
- needed_targets = set()
diff --git a/seamonkey-pixman.patch b/seamonkey-pixman.patch
new file mode 100644
index 0000000..c265c84
--- /dev/null
+++ b/seamonkey-pixman.patch
@@ -0,0 +1,11 @@
+--- comm-release/config/config.mk.orig 2014-04-29 06:55:06.000000000 +0200
++++ comm-release/config/config.mk 2014-05-15 19:16:52.358801349 +0200
+@@ -411,7 +411,7 @@
+ #
+ CCC = $(CXX)
+
+-OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
++OS_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
+
+ INCLUDES = \
+ $(LOCAL_INCLUDES) \
diff --git a/seamonkey-system-virtualenv.patch b/seamonkey-system-virtualenv.patch
index b3c0241..3650d56 100644
--- a/seamonkey-system-virtualenv.patch
+++ b/seamonkey-system-virtualenv.patch
@@ -1,48 +1,12 @@
---- seamonkey-2.16/comm-release/configure.in.orig 2013-02-26 17:12:02.382212561 +0100
-+++ seamonkey-2.16/comm-release/configure.in 2013-02-26 17:27:28.185507042 +0100
-@@ -138,8 +138,7 @@
- dnl This verifies our Python version is sane and ensures the Python
- dnl virtualenv is present and up to date. It sanitizes the environment
- dnl for us, so we don't need to clean anything out.
--$PYTHON $_topsrcdir/mozilla/build/virtualenv/populate_virtualenv.py \
-- $_topsrcdir/mozilla $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
-
- dnl Create a virtualenv where we can install local Python packages
- case "$host_os" in
---- seamonkey-2.16/comm-release/configure.orig 2013-02-26 17:12:02.408879226 +0100
-+++ seamonkey-2.16/comm-release/configure 2013-02-26 17:28:26.278837941 +0100
-@@ -1096,8 +1096,7 @@
- fi
-
- echo "$ac_t""Creating Python environment" 1>&6
--$PYTHON $_topsrcdir/mozilla/build/virtualenv/populate_virtualenv.py \
-- $_topsrcdir/mozilla $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
-
- case "$host_os" in
- mingw*)
---- xulrunner-19.0/comm-release/mozilla/configure.in~ 2013-02-20 12:29:36.493788864 +0100
-+++ xulrunner-19.0/comm-release/mozilla/configure.in 2013-02-20 12:46:55.030421705 +0100
-@@ -132,8 +132,7 @@
- dnl This verifies our Python version is sane and ensures the Python
- dnl virtualenv is present and up to date. It sanitizes the environment
- dnl for us, so we don't need to clean anything out.
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
-- $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
-
- dnl Create a virtualenv where we can install local Python packages
- case "$host_os" in
---- xulrunner-19.0/comm-release/mozilla/configure~ 2013-02-20 12:39:40.270435866 +0100
-+++ xulrunner-19.0/comm-release/mozilla/configure 2013-02-20 12:39:58.623768601 +0100
-@@ -1336,8 +1336,7 @@
- fi
-
- echo "$ac_t""Creating Python environment" 1>&6
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
-- $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
-
- case "$host_os" in
- mingw*)
+--- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py 2013-05-14 22:51:32.136719267 +0200
+@@ -37,8 +37,7 @@
+ @property
+ def virtualenv_script_path(self):
+ """Path to virtualenv's own populator script."""
+- return os.path.join(self.topsrcdir, 'python', 'virtualenv',
+- 'virtualenv.py')
++ return '/usr/bin/virtualenv'
+
+ @property
+ def python_path(self):
diff --git a/system-cairo.patch b/system-cairo.patch
deleted file mode 100644
index 072173f..0000000
--- a/system-cairo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
---- a/mozilla/gfx/thebes/gfxPlatform.cpp Sun Mar 04 00:38:41 2012 +0000
-+++ b/mozilla/gfx/thebes/gfxPlatform.cpp Wed May 16 17:37:10 2012 +0200
-@@ -448,11 +448,9 @@ gfxPlatform::CreateDrawTargetForSurface(
- delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
- }
-
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
-- gfxImageSurface* origSurf =
-- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-
-@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
-
- }
-
-- cairo_surface_t *nullSurf =
-- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
-- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-- cairo_surface_destroy(nullSurf);
-+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
- }
-
- srcBuffer->AddRef();
diff --git a/system-mozldap.patch b/system-mozldap.patch
index 74a57b3..65a95bb 100644
--- a/system-mozldap.patch
+++ b/system-mozldap.patch
@@ -1,8 +1,8 @@
--- mozilla/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
+++ mozilla/configure.in 2010-07-06 11:14:54.350499449 +0200
-@@ -5032,6 +5032,13 @@
- MOZ_LDAP_XPCOM=,
- MOZ_LDAP_XPCOM=1)
+@@ -134,6 +134,13 @@
+ AC_MSG_RESULT([no])
+ fi
+dnl system LDAP Support
+dnl ========================================================
@@ -14,12 +14,53 @@
dnl ========================================================
dnl = Trademarked Branding
dnl ========================================================
-@@ -7612,7 +7619,7 @@
+--- mozilla/mail/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
++++ mozilla/mail/configure.in 2010-07-06 11:14:54.350499449 +0200
+@@ -59,7 +59,12 @@
+ MOZ_LDAP_XPCOM=,
+ MOZ_LDAP_XPCOM=1)
+
+-if test "$MOZ_LDAP_XPCOM"; then
++if test "$MOZ_LDAP_DIR" ; then
++ LDAP_CFLAGS=$(pkg-config --cflags mozldap)
++ LDAP_LIBS=$(pkg-config --libs mozldap)
++ LDAP_COMPONENT=mozldap
++ LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
++elif test "$MOZ_LDAP_XPCOM"; then
+ LDAP_CFLAGS='-I${DIST}/public/ldap'
+ if test "$OS_ARCH" = "WINNT"; then
+ if test -n "$GNU_CC"; then
+@@ -118,7 +130,7 @@
+
+ # if we're building the LDAP XPCOM component, we need to build
+ # the c-sdk first.
+-if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
++if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
+ # Save configure args so we can restore them after configuring LDAP.
+ _save_ac_configure_args="$ac_configure_args"
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+--- mozilla/suite/configure.in.orig 2010-06-23 19:43:07.000000000 +0200
++++ mozilla/suite/configure.in 2010-07-06 11:14:54.350499449 +0200
+@@ -59,7 +59,12 @@
+ MOZ_LDAP_XPCOM=,
+ MOZ_LDAP_XPCOM=1)
+
+-if test "$MOZ_LDAP_XPCOM"; then
++if test "$MOZ_LDAP_DIR" ; then
++ LDAP_CFLAGS=$(pkg-config --cflags mozldap)
++ LDAP_LIBS=$(pkg-config --libs mozldap)
++ LDAP_COMPONENT=mozldap
++ LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
++elif test "$MOZ_LDAP_XPCOM"; then
+ LDAP_CFLAGS='-I${DIST}/public/ldap'
+ if test "$OS_ARCH" = "WINNT"; then
+ if test -n "$GNU_CC"; then
+@@ -113,7 +125,7 @@
- # if we're building the LDAP XPCOM component, we need to build
- # the c-sdk first.
+ # if we're building the LDAP XPCOM component, we need to build
+ # the c-sdk first.
-if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
+if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM" -a -z "$MOZ_LDAP_DIR"; then
- # these subdirs may not yet have been created in the build tree.
- # don't use the "-p" switch to mkdir, since not all platforms have it
- if test ! -d "directory/c-sdk/ldap"; then
+ # Save configure args so we can restore them after configuring LDAP.
+ _save_ac_configure_args="$ac_configure_args"
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/seamonkey.git/commitdiff/c7d608a7e65b71bf058ad869bb6880d243f40490
More information about the pld-cvs-commit
mailing list