commit 53fa112ef75d0083f784a2b0cd865b03b3a43060
Author: Jan Rękorajski <[email protected]>
Date: Wed Jan 9 12:36:49 2013 +0100
- updated to 18.0
- updated URLs in branding package
iceweasel-install.patch | 4 ++--
iceweasel-packaging.patch | 5 +++--
iceweasel.spec | 6 +++---
system-cairo.patch | 14 ++------------
4 files changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index 4a3f751..4660f38 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -26,14 +26,14 @@ Summary: Iceweasel web browser
Summary(hu.UTF-8): Iceweasel web böngésző
Summary(pl.UTF-8): Iceweasel - przeglądarka WWW
Name: iceweasel
-Version: 17.0.1
+Version: 18.0
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/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 13d616028eb77de927c29b6655c832c9
+# Source0-md5: 485d02563854c20a3788d89db07b0687
Source1: %{name}-branding.tar.bz2
-# Source1-md5: 816d926bd2c76a5bba5108979ba776ac
+# Source1-md5: 266f006f33249f7562f71dacac67157b
Source2: %{name}-rm_nonfree.sh
Source3: %{name}.desktop
Source4: %{name}.sh
diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index d7c670b..a0335ee 100644
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -100,8 +100,8 @@
cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
endif
$(NSINSTALL) -D $(DESTDIR)$(installdir)
-- (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
-+ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+- (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete
$(TAR_CREATE_FLAGS) - .) | \
++ (cd $(DESTDIR)/$(MOZ_PKG_DIR) && tar --exclude=precomplete
$(TAR_CREATE_FLAGS) - .) | \
(cd $(DESTDIR)$(installdir) && tar -xf -)
$(NSINSTALL) -D $(DESTDIR)$(bindir)
$(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 05f9e20..2b10960 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -64,11 +64,12 @@
#ifndef XP_OS2
#ifndef MOZ_NATIVE_SQLITE
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-@@ -126,12 +140,15 @@
+@@ -126,13 +140,16 @@
+ @BINPATH@/blocklist.xml
#ifdef XP_UNIX
- @BINPATH@/run-mozilla.sh
#ifndef XP_MACOSX
+#ifndef LIBXUL_SDK
+ @BINPATH@/run-mozilla.sh
@BINPATH@/mozilla-xremote-client
#endif
#endif
diff --git a/system-cairo.patch b/system-cairo.patch
index d395822..072173f 100644
--- a/system-cairo.patch
+++ b/system-cairo.patch
@@ -1,13 +1,8 @@
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,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface(
-
- cairo_user_data_key_t kSourceSurface;
-
- void SourceBufferDestroy(void *srcBuffer)
- {
- static_cast<SourceSurface*>(srcBuffer)->Release();
+@@ -448,11 +448,9 @@ gfxPlatform::CreateDrawTargetForSurface(
+ delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
}
-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
@@ -20,11 +15,6 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
origSurf->SetData(&kSourceSurface, NULL, NULL);
}
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface
*aSurface)
- {
- void *userData = aSurface->GetData(&kSourceSurface);
-
@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/53fa112ef75d0083f784a2b0cd865b03b3a43060
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
