commit 9084fc2b71c29eca2898cc304c434426ae3e31a3
Author: Jan Rękorajski <[email protected]>
Date: Tue Nov 5 08:14:15 2013 +0100
- updated to 2.22, enigmail to 1.6
- system-cairo applied upstream
enigmail-moz.build.patch | 14 ++++++++------
iceape.spec | 12 +++++-------
system-cairo.patch | 34 ----------------------------------
3 files changed, 13 insertions(+), 47 deletions(-)
---
diff --git a/iceape.spec b/iceape.spec
index 2b68a62..34c181f 100644
--- a/iceape.spec
+++ b/iceape.spec
@@ -7,7 +7,7 @@
%bcond_with tests # enable tests (whatever they check)
%bcond_without kerberos # disable krb5 support
-%define enigmail_ver 1.5.2
+%define enigmail_ver 1.6
%define nspr_ver 4.9.3
%define nss_ver 3.14.3
%define xulrunner_ver 23.0
@@ -22,16 +22,16 @@ 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.20
+Version: 2.22
Release: 0.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: 04b961790658233b7dafb5222b251bf5
+# Source0-md5: 49b92ed98c23efdbdafa39b9dee920a7
Source1:
http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: 4e79cc5bb289cb292b4d40885f45cd33
+# Source1-md5: 4a2bbcb020bdb282a660fda8c70d5608
Source2: %{name}-branding.tar.bz2
-# Source2-md5: 3feee544ef515f1dbf19b14479916784
+# Source2-md5: 0bc28b4382aa8a961f8f7b2ba66d8f89
Source3: %{name}-rm_nonfree.sh
Source4: %{name}.desktop
Source5: %{name}-composer.desktop
@@ -45,7 +45,6 @@ Patch2: %{name}-agent.patch
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
Patch8: gyp-slashism.patch
@@ -267,7 +266,6 @@ tar -jxf %{SOURCE2}
#patch3 -p1
#patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p2
diff --git a/enigmail-moz.build.patch b/enigmail-moz.build.patch
index 60ab0c8..78d0540 100644
--- a/enigmail-moz.build.patch
+++ b/enigmail-moz.build.patch
@@ -13,7 +13,7 @@ diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/build.orig/Makef
diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefile.in
iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/Makefile.in
--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefile.in
2013-01-20 18:08:40.000000000 +0100
+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/Makefile.in
2013-08-08 21:08:25.191537344 +0200
-@@ -41,10 +41,4 @@
+@@ -41,12 +41,6 @@
include $(DEPTH)/config/autoconf.mk
@@ -23,7 +23,9 @@ diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefil
- DIRS += src
-endif
-
- include $(topsrcdir)/config/rules.mk
+ .PHONY: dirs $(DIRS)
+
+ all: dirs
diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/moz.build
iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/moz.build
--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/moz.build
1970-01-01 01:00:00.000000000 +0100
+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/moz.build
2013-08-08 21:07:45.667761563 +0200
@@ -46,9 +48,9 @@ diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in.orig
-
+STANDALONE_MAKEFILE := 1
+
- include $(topsrcdir)/config/config.mk
+ PLATFORM_STR = unknown
- include $(topsrcdir)/config/rules.mk
+ # Edit the lines below as needed, depending upon your platform(s)
diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build.orig
iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build
--- iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build.orig
1970-01-01 01:00:00.000000000 +0100
+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build
2013-08-08 21:11:28.480250891 +0200
@@ -63,9 +65,9 @@ diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/Makefile
-DIRS = content
-
- MYJARFILE = enigmail.jar
+ .PHONY: dirs $(DIRS)
- include $(DEPTH)/config/autoconf.mk
+ all: dirs jar
diff -urN
iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/moz.build
iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/moz.build
--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/moz.build
1970-01-01 01:00:00.000000000 +0100
+++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/moz.build
2013-08-08 21:10:29.579593990 +0200
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();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceape.git/commitdiff/9084fc2b71c29eca2898cc304c434426ae3e31a3
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
