[packages/iceape] - updated to 2.26 - updated enable-addons,branding patches - removed outdated gyp-slashism patch - a
qboosh
qboosh at pld-linux.org
Fri May 16 19:57:46 CEST 2014
commit 2ded22a149c4454fdb7f2ec526923644b92c62b9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri May 16 20:00:31 2014 +0200
- updated to 2.26
- updated enable-addons,branding patches
- removed outdated gyp-slashism patch
- added pixman patch (fixes suite build after nsRegion changes)
enable-addons.patch | 25 ++++++--------
gyp-slashism.patch | 57 -------------------------------
iceape-branding.patch | 4 +++
iceape-pixman.patch | 11 ++++++
iceape.spec | 95 ++++++++++++++++++++++++++++-----------------------
5 files changed, 78 insertions(+), 114 deletions(-)
---
diff --git a/iceape.spec b/iceape.spec
index 14cc7e7..480f91e 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -1,16 +1,18 @@
#
# Conditional build:
%bcond_with enigmail # don't build enigmail - GPG/PGP support
+%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
+%bcond_with crashreporter # report crashes to crash-stats.mozilla.com
%bcond_with tests # enable tests (whatever they check)
-%bcond_without kerberos # disable krb5 support
%define enigmail_ver 1.6
-%define nspr_ver 4.9.3
-%define nss_ver 3.14.3
-%define xulrunner_ver 28.0
+%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):
@@ -22,12 +24,12 @@ Summary(es.UTF-8): Navegador de Internet Iceape
Summary(pl.UTF-8): Iceape - przeglądarka WWW
Summary(pt_BR.UTF-8): Navegador Iceape
Name: iceape
-Version: 2.25
+Version: 2.26
Release: 1
License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0: http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}.source.tar.bz2
-# Source0-md5: e9597622d2d843ed9095a9e1eeab01f1
+# Source0-md5: 1749f6350209e35e0bede3bf4e56c42c
Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
# Source1-md5: 4a2bbcb020bdb282a660fda8c70d5608
Source2: %{name}-branding.tar.bz2
@@ -45,9 +47,9 @@ Patch2: %{name}-agent.patch
Patch3: enable-addons.patch
Patch4: system-mozldap.patch
Patch5: makefile.patch
+Patch6: %{name}-pixman.patch
# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch7: system-virtualenv.patch
-Patch8: gyp-slashism.patch
Patch9: %{name}-system-xulrunner.patch
URL: http://www.pld-linux.org/Packages/Iceape
BuildRequires: GConf2-devel >= 1.2.1
@@ -58,8 +60,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
@@ -67,17 +70,17 @@ 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
-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
# rsvg-convert for iceape/branding
BuildRequires: librsvg
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}
@@ -91,15 +94,16 @@ BuildRequires: python-virtualenv
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.7.15.2
+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:19
+BuildRequires: xulrunner-devel < 2:30
%endif
BuildRequires: yasm
BuildRequires: zip
@@ -113,10 +117,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}
@@ -265,8 +272,8 @@ tar -jxf %{SOURCE2}
%patch3 -p2
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch7 -p1
-%patch8 -p1
%patch9 -p2
%build
@@ -328,45 +335,47 @@ ac_add_options --enable-tests
%else
ac_add_options --disable-tests
%endif
-ac_add_options --enable-gio
-ac_add_options --disable-gnomeui
-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-distribution-id=org.pld-linux
ac_add_options --with-branding=iceape/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-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 +387,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 \
@@ -453,14 +461,17 @@ cp -a mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \
# 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}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
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}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
+%if %{without xulrunner}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
+ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
+%endif
+
mv $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/* \
$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/
@@ -519,16 +530,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} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
-# nspr
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
# mozldap
%{__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
-# testpilot quiz
-#%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot at labs.mozilla.com.xpi
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -618,6 +625,7 @@ fi
%ghost %{_libdir}/%{name}/components/compreg.dat
%ghost %{_libdir}/%{name}/components/xpti.dat
+%if %{without xulrunner}
%{_libdir}/%{name}/isp
%dir %{_datadir}/%{name}/isp
%{_datadir}/%{name}/isp/Bogofilter.sfd
@@ -627,6 +635,7 @@ fi
%{_datadir}/%{name}/isp/SpamPal.sfd
%{_datadir}/%{name}/isp/movemail.rdf
%{_datadir}/%{name}/isp/rss.rdf
+%endif
%{_iconsdir}/hicolor/*/apps/iceape.png
%{_iconsdir}/hicolor/scalable/apps/iceape.svg
diff --git a/enable-addons.patch b/enable-addons.patch
index 78fa5a7..6eb395b 100644
--- a/enable-addons.patch
+++ b/enable-addons.patch
@@ -10,20 +10,17 @@ diff -up seamonkey-2.5/comm-release/mail/app/profile/all-thunderbird.js.old seam
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
-diff -up seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm
---- seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2011-11-21 11:28:32.000000000 +0100
-+++ seamonkey-2.5/comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm 2011-12-14 12:43:42.461184351 +0100
-@@ -1591,8 +1591,8 @@ var XPIProvider = {
- this.showUpgradeUI();
- flushCaches = true;
- }
-- else if (aAppChanged === undefined) {
-- // For new profiles we will never need to show the add-on selection UI
-+ else {
-+ // For all profiles we will never need to show the add-on selection UI
- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, 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 @@
diff --git a/gyp-slashism.patch b/gyp-slashism.patch
deleted file mode 100644
index 5100011..0000000
--- a/gyp-slashism.patch
+++ /dev/null
@@ -1,57 +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)
-@@ -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/iceape-branding.patch b/iceape-branding.patch
index 32ea3b1..b3e9086 100644
--- a/iceape-branding.patch
+++ b/iceape-branding.patch
@@ -135,3 +135,7 @@ index d20cb5b..4fa63af 100644
#ifdef MOZ_UPDATER
@BINPATH@/icons/updater.png
#endif
+--- comm-release/iceape/branding/moz.build.orig 2013-06-26 01:46:34.000000000 +0200
++++ comm-release/iceape/branding/moz.build 2014-05-14 19:15:04.603937775 +0200
+@@ -0,0 +1 @@
++JAR_MANIFESTS += ['jar.mn']
diff --git a/iceape-pixman.patch b/iceape-pixman.patch
new file mode 100644
index 0000000..c265c84
--- /dev/null
+++ b/iceape-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) \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/2ded22a149c4454fdb7f2ec526923644b92c62b9
More information about the pld-cvs-commit
mailing list