xulrunner: updated to 1.9.1.4.

This commit is contained in:
Predrag Ivanovic 2009-11-04 19:23:42 +01:00 committed by Tilman Sauerbeck
parent 88953393b4
commit 3dc7f2cb02
4 changed files with 3922 additions and 3955 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
ca167e69180ab1230aea0763da270a95 firefox-3.5.3.source.tar.bz2
0b6ccb1e50d96b7127a18a69399fcf05 firefox-3.5.4.source.tar.bz2
7456e211e085c64d0a7dabccc9044a22 mozconfig
766231296c5e03d6ba68342628183805 xulrunner.diff
b5bf5923cb771e4b3577a9ce7fdebc3c xulrunner.diff

View File

@ -4,9 +4,9 @@
# Depends on: libidl, nss, gtk, perl, python, dbus-glib, alsa-lib
name=xulrunner
version=1.9.1.3
release=2
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.5.3/source/firefox-3.5.3.source.tar.bz2
version=1.9.1.4
release=1
source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.5.4/source/firefox-3.5.4.source.tar.bz2
mozconfig $name.diff)
build() {

View File

@ -1,20 +1,25 @@
---
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)
diff -Naur mozilla-1.9.1/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.1.new/xulrunner/installer/libxul-embedding.pc.in
--- mozilla-1.9.1/xulrunner/installer/libxul-embedding.pc.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/libxul-embedding.pc.in 2009-10-29 23:12:07.687729216 +0100
@@ -12,4 +12,4 @@
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%
diff -Naur mozilla-1.9.1/xulrunner/installer/libxul-embedding-unstable.pc.in mozilla-1.9.1.new/xulrunner/installer/libxul-embedding-unstable.pc.in
--- mozilla-1.9.1/xulrunner/installer/libxul-embedding-unstable.pc.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/libxul-embedding-unstable.pc.in 2009-10-29 23:12:07.686727554 +0100
@@ -8,4 +8,4 @@
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%
diff -Naur mozilla-1.9.1/xulrunner/installer/Makefile.in mozilla-1.9.1.new/xulrunner/installer/Makefile.in
--- mozilla-1.9.1/xulrunner/installer/Makefile.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/Makefile.in 2009-10-29 23:12:07.685747405 +0100
@@ -96,19 +96,28 @@
ifdef MOZ_NATIVE_NSPR
NSPR_NAME=nspr
NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
@ -46,56 +51,17 @@ Index: mozilla/xulrunner/installer/Makefile.in
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%
diff -Naur mozilla-1.9.1/xulrunner/installer/mozilla-nss.pc.in mozilla-1.9.1.new/xulrunner/installer/mozilla-nss.pc.in
--- mozilla-1.9.1/xulrunner/installer/mozilla-nss.pc.in 2009-10-16 17:14:30.000000000 +0200
+++ mozilla-1.9.1.new/xulrunner/installer/mozilla-nss.pc.in 2009-10-29 23:21:10.524863538 +0100
@@ -4,7 +4,7 @@
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
-Libs: -L${sdkdir}/lib -lsmime3 -lssl3 -lnss3 -lnssutil3
-Cflags: -I${includedir}/stable
+Libs: %FULL_NSS_LIBS%
+Cflags: %FULL_NSS_CFLAGS%