[packages/iceape] - up to 2.25 - disabled enigmail, does not build with current build system

baggins baggins at pld-linux.org
Thu Mar 20 12:03:24 CET 2014


commit e6c8435947d7084c5d83a27c155a57f1335128c0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 20 12:02:42 2014 +0100

    - up to 2.25
    - disabled enigmail, does not build with current build system

 iceape-branding.patch   |  4 ++--
 iceape.spec             | 12 ++++++------
 system-virtualenv.patch |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/iceape.spec b/iceape.spec
index 30447e5..14cc7e7 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	enigmail	# don't build enigmail - GPG/PGP support
+%bcond_with	enigmail	# don't build enigmail - GPG/PGP support
 %bcond_without	ldap		# disable e-mail address lookups in LDAP directories
 %bcond_without	lightning	# disable Sunbird/Lightning calendar
 %bcond_with	xulrunner	# build with system xulrunner
@@ -10,7 +10,7 @@
 %define		enigmail_ver	1.6
 %define		nspr_ver	4.9.3
 %define		nss_ver		3.14.3
-%define		xulrunner_ver	23.0
+%define		xulrunner_ver	28.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -22,12 +22,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.22
+Version:	2.25
 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:	49b92ed98c23efdbdafa39b9dee920a7
+# Source0-md5:	e9597622d2d843ed9095a9e1eeab01f1
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5:	4a2bbcb020bdb282a660fda8c70d5608
 Source2:	%{name}-branding.tar.bz2
@@ -397,12 +397,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}"
diff --git a/iceape-branding.patch b/iceape-branding.patch
index 06d461e..32ea3b1 100644
--- a/iceape-branding.patch
+++ b/iceape-branding.patch
@@ -15,8 +15,8 @@ index 1e3799e..ae4cb1f 100644
  pref("browser.doorhanger.enabled", true);
  
  // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/");
-+pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search-engines/");
+-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search/?atype=4");
++pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/seamonkey/search/?atype=4");
  
  // pointer to the default engine name
  pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index a2d150f..3650d56 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,5 +1,5 @@
---- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~	2013-05-11 21:19:23.000000000 +0200
-+++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py	2013-05-14 22:51:32.136719267 +0200
+--- 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):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/e6c8435947d7084c5d83a27c155a57f1335128c0



More information about the pld-cvs-commit mailing list