[packages/iceape] Updated to 2.12 and engmail to 1.4.4 Build with (PLD compliant) system virtualenv
baggins
baggins at pld-linux.org
Wed Aug 29 13:57:47 CEST 2012
commit 888f80ab431a7e9d1f55ebab77591a2a6fa6a110
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Aug 29 13:57:14 2012 +0200
Updated to 2.12 and engmail to 1.4.4
Build with (PLD compliant) system virtualenv
iceape-branding.patch | 5 ++++-
iceape.spec | 18 ++++++++++++------
makefile.patch | 9 +--------
system-cairo.patch | 20 +++++---------------
system-virtualenv.patch | 24 ++++++++++++++++++++++++
5 files changed, 46 insertions(+), 30 deletions(-)
---
diff --git a/iceape.spec b/iceape.spec
index 50e7004..7a1205c 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -13,10 +13,10 @@
%undefine with_gnomeui
%endif
-%define enigmail_ver 1.4.3
+%define enigmail_ver 1.4.4
%define nspr_ver 4.9
%define nss_ver 3.13.3
-%define xulrunner_ver 14.0
+%define xulrunner_ver 15.0
%if %{without xulrunner}
# The actual sqlite version (see RHBZ#480989):
@@ -28,14 +28,14 @@ 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.11
+Version: 2.12
Release: 1
License: MPL 1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications/Networking
Source0: ftp://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}.source.tar.bz2
-# Source0-md5: 807e8993f8fe4a3a42e8f63ecfb0f15d
+# Source0-md5: a13f7286ce923556e3a05a8844694667
Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: 4a253db11436a32ef81d5917c4ee6e25
+# Source1-md5: 1bc36b5077f6b01b6acf0f75565dddc8
Source2: %{name}-branding.tar.bz2
# Source2-md5: 0bc28b4382aa8a961f8f7b2ba66d8f89
Source3: %{name}-rm_nonfree.sh
@@ -52,6 +52,8 @@ Patch3: %{name}-glueload-fix.patch
Patch4: system-mozldap.patch
Patch5: makefile.patch
Patch6: system-cairo.patch
+# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
+Patch7: system-virtualenv.patch
URL: http://www.pld-linux.org/Packages/Iceape
BuildRequires: GConf2-devel >= 1.2.1
BuildRequires: OpenGL-devel
@@ -90,6 +92,7 @@ BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
BuildRequires: python >= 1:2.5
BuildRequires: python-modules
+BuildRequires: python-virtualenv
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: sed >= 4.0
@@ -266,6 +269,7 @@ tar -jxf %{SOURCE2}
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
cd comm-release
@@ -591,7 +595,9 @@ fi
%dir %{_libdir}/%{name}/components
-%{_libdir}/%{name}/components/BrowserElementAPI.js
+%{_libdir}/%{name}/components/Aitc.js
+%{_libdir}/%{name}/components/AppsService.js
+%{_libdir}/%{name}/components/BrowserElementParent.js
%{_libdir}/%{name}/components/ContactManager.js
%{_libdir}/%{name}/components/FeedConverter.js
%{_libdir}/%{name}/components/FeedWriter.js
diff --git a/iceape-branding.patch b/iceape-branding.patch
index cfa520a..06d461e 100644
--- a/iceape-branding.patch
+++ b/iceape-branding.patch
@@ -86,7 +86,10 @@ diff --git a/suite/locales/en-US/chrome/branding/brand.properties b/suite/locale
index f068049..f4a29a9 100644
--- a/suite/locales/en-US/chrome/branding/brand.properties
+++ b/suite/locales/en-US/chrome/branding/brand.properties
-@@ -1,6 +1,6 @@
+@@ -1,9 +1,9 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
-brandFullName=SeaMonkey
-brandShortName=SeaMonkey
-vendorShortName=SeaMonkey
diff --git a/makefile.patch b/makefile.patch
index 6ba8cf6..46882cc 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,18 +1,11 @@
--- mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300
+++ mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300
-@@ -58,8 +58,6 @@
+@@ -26,21 +26,7 @@
include $(topsrcdir)/config/config.mk
-default alldep all:: $(topsrcdir)/configure config.status
-
- ifndef INCLUDED_BRIDGE_MK
- include $(topsrcdir)/bridge/bridge.mk
- endif
-@@ -67,19 +65,7 @@
- # workaround Bug 599809 by making these makefiles be generated here
- SUBMAKEFILES += $(addsuffix /Makefile, $(APP_LIBXUL_DIRS) $(APP_LIBXUL_STATICDIRS))
-
-$(topsrcdir)/configure: $(topsrcdir)/configure.in
- @echo "STOP! configure.in has changed, and your configure is out of date."
- @echo "Please rerun autoconf and configure."
diff --git a/system-cairo.patch b/system-cairo.patch
index 9ae0888..d395822 100644
--- a/system-cairo.patch
+++ b/system-cairo.patch
@@ -25,21 +25,16 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
{
void *userData = aSurface->GetData(&kSourceSurface);
-@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
- NS_RUNTIMEABORT("Invalid surface format!");
- }
+@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
- srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
- IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
- imgSurface->Stride(),
- format);
+ }
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
+- &kSourceSurface,
+- imgSurface,
+- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
@@ -47,8 +42,3 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
}
srcBuffer->AddRef();
- aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
-
- return srcBuffer;
- }
-
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
new file mode 100644
index 0000000..bc76d83
--- /dev/null
+++ b/system-virtualenv.patch
@@ -0,0 +1,24 @@
+Restore --system-site-packages when system virtualenv gets 1.7 upgrade
+
+--- xulrunner-15.0/mozilla/configure.in~ 2012-08-29 11:06:34.517985819 +0200
++++ xulrunner-15.0/mozilla/configure.in 2012-08-29 11:23:47.234616054 +0200
+@@ -9069,7 +9069,7 @@
+ AC_MSG_RESULT([Creating Python virtualenv])
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+ PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+--- xulrunner-15.0/mozilla/configure~ 2012-08-29 11:25:28.121279162 +0200
++++ xulrunner-15.0/mozilla/configure 2012-08-29 11:27:27.981274936 +0200
+@@ -25468,7 +25468,7 @@
+ echo "$ac_t""Creating Python virtualenv" 1>&6
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+ PYTHON=`pwd`/_virtualenv/Scripts/python.exe
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/888f80ab431a7e9d1f55ebab77591a2a6fa6a110
More information about the pld-cvs-commit
mailing list