- updated to 18.0

diff --git a/system-cairo.patch b/system-cairo.patch
index d3958220f1295df279a2d71fcddc17ede1739685..072173fe3e09ed4758dbb39bf87e2fcc843d9a78 100644 (file)
--- 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(
  
      }

diff --git a/xulrunner-install.patch b/xulrunner-install.patch
index 5a4d34ccc7ee84d8b84e7737afa85f6d44807f20..e7412718e0a0281886362b02e23db7ed522c9f40 100644 (file)
--- a/xulrunner-install.patch
+++ b/xulrunner-install.patch
@@ -10,10 +10,10 @@
  else
        @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 @@ -725,27 +725,30 @@
- endif
+       $(error "make install" is not supported on this platform. Use "make package" instead.)
  endif
        $(NSINSTALL) -D $(DESTDIR)$(installdir)
--      (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \
+-      (cd $(DIST)/$(MOZ_PKG_DIR) && tar --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \
 -        (cd $(DESTDIR)$(installdir) && tar -xf -)
 +      cp -rfLp $(DIST)/$(MOZ_PKG_DIR)/* $(DESTDIR)$(installdir)
        $(NSINSTALL) -D $(DESTDIR)$(bindir)

diff --git a/xulrunner-rpath.patch b/xulrunner-rpath.patch
index b5ddcabd0c5f9a8cf05e43f7429ad6a71fc886f0..28932bed9d0324634a6f3c482cdb287f236f935d 100644 (file)
--- a/xulrunner-rpath.patch
+++ b/xulrunner-rpath.patch
@@ -26,8 +26,8 @@
  
  # Silence the unzip step so we don't print any binary data from the comment field.
  GENERATE_CACHE = \
--  $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \
-+  LD_PRELOAD=$(LIBXUL_DIST)/lib/libxpcom.so:$(LIBXUL_DIST)/lib/libmozalloc.so:$(LIBXUL_DIST)/lib/libxul.so:$(LIBXUL_DIST)/lib/libmozjs.so $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('$(PRECOMPILE_DIR)', '$(OMNIJAR_NAME)', 'startupCache.zip');" && \
+-  $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('startupCache.zip');" && \
++  LD_PRELOAD=$(LIBXUL_DIST)/lib/libxpcom.so:$(LIBXUL_DIST)/lib/libmozalloc.so:$(LIBXUL_DIST)/lib/libxul.so:$(LIBXUL_DIST)/lib/libmozjs.so $(_ABS_RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) -g "$(PRECOMPILE_GRE)" -a "$$PWD" -f $(call core_abspath,$(MOZILLA_DIR)/toolkit/mozapps/installer/precompile_cache.js) -e "populate_startupcache('startupCache.zip');" && \
    rm -rf jsloader jssubloader && \
    $(UNZIP) -q startupCache.zip && \
    rm startupCache.zip && \

diff --git a/xulrunner.spec b/xulrunner.spec
index 54958f9be9d08fb38440d4f78faa12aff54e5b68..b470853a6f537da6153e59585a0154230d7bce45 100644 (file)
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,7 +23,7 @@
 Summary:       XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):     XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:          xulrunner
-Version:       17.0.1
+Version:       18.0
 Release:       1
 Epoch:         2
 License:       MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -31,7 +31,7 @@ Group:                X11/Applications
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
 Source0:       http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 13d616028eb77de927c29b6655c832c9
+# Source0-md5: 485d02563854c20a3788d89db07b0687
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-rpath.patch
 Patch4:                %{name}-paths.patch