From 9f77ecf4df139338cda8cefa7830b1c2bdc24259 Mon Sep 17 00:00:00 2001 From: tnut Date: Wed, 13 Oct 2010 22:42:35 +0200 Subject: xulrunner, suppression patch du dossier --- extra/xulrunner/Pkgfile | 10 +- extra/xulrunner/mozconfig | 35 ------- extra/xulrunner/mozilla-pkgconfig.patch | 70 -------------- .../mozilla-ps-pdf-simplify-operators.patch | 42 --------- extra/xulrunner/xulrunner-png14.patch | 11 --- extra/xulrunner/xulrunner-version.patch | 13 --- extra/xulrunner/xulrunner.diff | 101 --------------------- 7 files changed, 5 insertions(+), 277 deletions(-) delete mode 100644 extra/xulrunner/mozconfig delete mode 100644 extra/xulrunner/mozilla-pkgconfig.patch delete mode 100644 extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch delete mode 100644 extra/xulrunner/xulrunner-png14.patch delete mode 100644 extra/xulrunner/xulrunner-version.patch delete mode 100644 extra/xulrunner/xulrunner.diff (limited to 'extra/xulrunner') diff --git a/extra/xulrunner/Pkgfile b/extra/xulrunner/Pkgfile index d1d239623..0fe131f7a 100644 --- a/extra/xulrunner/Pkgfile +++ b/extra/xulrunner/Pkgfile @@ -8,11 +8,11 @@ name=xulrunner version=1.9.2.10 release=1 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/source/firefox-3.6.10.source.tar.bz2 \ - mozconfig - mozilla-pkgconfig.patch - mozilla-ps-pdf-simplify-operators.patch - xulrunner-version.patch - xulrunner-png14.patch) + http://nutyx.meticul.eu/files/patchs/$name/mozconfig \ + http://nutyx.meticul.eu/files/patchs/$name/mozilla-pkgconfig.patch \ + http://nutyx.meticul.eu/files/patchs/$name/mozilla-ps-pdf-simplify-operators.patch \ + http://nutyx.meticul.eu/files/patchs/$name/xulrunner-version.patch \ + http://nutyx.meticul.eu/files/patchs/$name/xulrunner-png14.patch ) build() { unset MAKEFLAGS diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig deleted file mode 100644 index e52659ee0..000000000 --- a/extra/xulrunner/mozconfig +++ /dev/null @@ -1,35 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --enable-system-hunspell -#disabled: mozilla is broken with recent versions of sqlite -#ac_add_options --enable-system-sqlite -ac_add_options --enable-system-cairo -ac_add_options --with-pthreads -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-extensions=default - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index a42d2a3e6..000000000 --- a/extra/xulrunner/mozilla-pkgconfig.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 22:27:17.000000000 +0200 -@@ -6,5 +6,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in mozilla-1.9.2/xulrunner/installer/libxul.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in 2010-01-21 22:27:56.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - idldir=%idldir% - -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/Makefile.in mozilla-1.9.2/xulrunner/installer/Makefile.in ---- mozilla-1.9.2.orig/xulrunner/installer/Makefile.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/Makefile.in 2010-01-21 22:25:04.000000000 +0200 -@@ -121,6 +121,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 22:28:15.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 22:28:27.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in 2010-01-21 22:29:30.000000000 +0200 -@@ -7,4 +7,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lmozjs --Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 22:29:58.000000000 +0200 -@@ -5,5 +5,5 @@ - Name: Mozilla Plug-In API - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% --Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -+Cflags: -I${includedir} -DXP_UNIX %ojidef% - diff --git a/extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch b/extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch deleted file mode 100644 index cab134158..000000000 --- a/extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=435313 - -Index: mozilla/gfx/thebes/public/gfxPDFSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPDFSurface.h ---- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; -Index: mozilla/gfx/thebes/public/gfxPSSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPSSurface.h ---- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr mStream; diff --git a/extra/xulrunner/xulrunner-png14.patch b/extra/xulrunner/xulrunner-png14.patch deleted file mode 100644 index f512416ad..000000000 --- a/extra/xulrunner/xulrunner-png14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 -+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 -@@ -135,7 +135,7 @@ - - // initialize - mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -+ NULL, - ErrorCallback, - ErrorCallback); - if (! mPNG) diff --git a/extra/xulrunner/xulrunner-version.patch b/extra/xulrunner/xulrunner-version.patch deleted file mode 100644 index 418b7c758..000000000 --- a/extra/xulrunner/xulrunner-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module -diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in ---- mozilla/xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100 -+++ mozilla/xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100 -@@ -44,6 +44,8 @@ VPATH = @srcdir@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="1.9.2" -+ - NO_PKG_FILES = \ - xulrunner-config \ - regchrome* \ diff --git a/extra/xulrunner/xulrunner.diff b/extra/xulrunner/xulrunner.diff deleted file mode 100644 index f961dd7c5..000000000 --- a/extra/xulrunner/xulrunner.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- - xulrunner/installer/Makefile.in | 15 ++++++++++++--- - xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +- - xulrunner/installer/libxul-embedding.pc.in | 2 +- - xulrunner/installer/mozilla-nss.pc.in | 6 +++--- - 4 files changed, 17 insertions(+), 8 deletions(-) - -Index: mozilla/xulrunner/installer/Makefile.in -=================================================================== ---- mozilla.orig/xulrunner/installer/Makefile.in -+++ mozilla/xulrunner/installer/Makefile.in -@@ -91,29 +91,38 @@ - mozilla-plugin.pc \ - mozilla-gtkmozembed.pc \ - mozilla-gtkmozembed-embedding.pc \ - $(NULL) - - ifdef MOZ_NATIVE_NSPR - NSPR_NAME=nspr - NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) -+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags) -+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs) - else --pkg_config_files += mozilla-nspr.pc - NSPR_NAME=mozilla-nspr - FULL_NSPR_CFLAGS=-I\$${includedir}/stable - FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) - NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) - endif -+pkg_config_files += mozilla-nspr.pc - - $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS)) - --ifndef MOZ_NATIVE_NSS --pkg_config_files += mozilla-nss.pc -+ifdef MOZ_NATIVE_NSS -+NSPR_VERSION=$(shell $(NSS_CONFIG) --version) -+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags) -+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs) -+else -+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version) -+FULL_NSS_CFLAGS=-I\$${includedir}/stable -+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs)) - endif -+pkg_config_files += mozilla-nss.pc - - ifdef MOZ_OJI - OJIDEF=-DOJI - else - OJIDEF= - endif - - %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) -Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in -+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in -@@ -3,9 +3,9 @@ - includedir=%includedir% - idldir=%idldir% - includetype=unstable - - Name: libxul-embedding-unstable - Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) - Version: %MOZILLA_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue --Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% -+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% %FULL_NSPR_CFLAGS% -Index: mozilla/xulrunner/installer/libxul-embedding.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in -+++ mozilla/xulrunner/installer/libxul-embedding.pc.in -@@ -7,9 +7,9 @@ - # Note: the default pkg-config cflags will only list include directories - # that contain stable (frozen or safe for linking) header files. To include - # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable - - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue --Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% -+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% %FULL_NSPR_CFLAGS% -Index: mozilla/xulrunner/installer/mozilla-nss.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in -+++ mozilla/xulrunner/installer/mozilla-nss.pc.in -@@ -1,10 +1,10 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - - Name: NSS - Description: Mozilla Network Security Services --Version: %MOZILLA_VERSION% -+Version: %NSS_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3 --Cflags: -I${includedir}/stable -+Libs: %FULL_NSS_LIBS% -+Cflags: %FULL_NSS_CFLAGS% -- cgit v1.2.3-70-g09d2