From b452d12644385bece689b1073ff70b901f29eca9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 31 Mar 2008 16:43:47 +0000 Subject: [PATCH 01/39] Initialize branch F-9 for xulrunner --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From a3bf527d8519de7e020eb78abb10624b379d871b Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 31 Mar 2008 23:28:12 +0000 Subject: [PATCH 02/39] - Beta 5 RC2 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5c747b1..2b9816f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mozilla-20080327.tar.bz2 +xulrunner-1.9b5-source.tar.bz2 diff --git a/sources b/sources index d1063ce..1e51738 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f43fd0bdbf2709ba05cec41f43d2a36 mozilla-20080327.tar.bz2 +cbb83017ed3c0e740a9128089a4f1b2d xulrunner-1.9b5-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index a7a53d0..bf23fd8 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -2,24 +2,26 @@ %define nss_version 3.11.99.5 %define cairo_version 0.5 -%define official_branding 0 +%define official_branding 1 %define version_internal 1.9pre %if ! %{official_branding} %define cvsdate 20080327 %define nightly .cvs%{cvsdate} +%else +%define version_pre .beta5rc2 %endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.50%{?nightly}%{?dist} +Release: 0.51%{?version_pre}%{?nightly}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet %if %{official_branding} -%define tarball xulrunner-%{version}-source.tar.bz2 +%define tarball xulrunner-1.9b5-source.tar.bz2 %else %define tarball mozilla-%{cvsdate}.tar.bz2 %endif @@ -398,6 +400,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Mar 31 2008 Christopher Aillon 1.9-0.51 +- Beta 5 RC2 + * Thu Mar 27 2008 Christopher Aillon 1.9-0.50 - Update to latest trunk (2008-03-27) From 20a0f9a8c59c617687b09671980207b4e1aa7b6d Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 31 Mar 2008 23:43:03 +0000 Subject: [PATCH 03/39] XR is unbranded --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index bf23fd8..ca4cd88 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -141,7 +141,7 @@ cd mozilla %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig %if %{official_branding} -%{__cat} %{SOURCE11} >> .mozconfig +#%{__cat} %{SOURCE11} >> .mozconfig %endif #--------------------------------------------------------------------- From 07ed678ca2a25d6ee9c36643e37cb17c3ca32e49 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 1 Apr 2008 00:40:59 +0000 Subject: [PATCH 04/39] Fully rip out the branding foo --- xulrunner.spec | 49 ++----------------------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index ca4cd88..21c3634 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -2,30 +2,18 @@ %define nss_version 3.11.99.5 %define cairo_version 0.5 -%define official_branding 1 - %define version_internal 1.9pre -%if ! %{official_branding} -%define cvsdate 20080327 -%define nightly .cvs%{cvsdate} -%else %define version_pre .beta5rc2 -%endif Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.51%{?version_pre}%{?nightly}%{?dist} +Release: 0.51%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -%if %{official_branding} -%define tarball xulrunner-1.9b5-source.tar.bz2 -%else -%define tarball mozilla-%{cvsdate}.tar.bz2 -%endif -Source0: %{tarball} +Source0: xulrunner-1.9b5-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js #Source21: %{name}.sh.in @@ -46,16 +34,8 @@ Patch6: xulrunner-version.patch # Other Patch107: mozilla-pkgconfig.patch -%if %{official_branding} -# Required by Mozilla Corporation -%else -# Not yet approved by Mozillla Corporation - - -%endif - # --------------------------------------------------- BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -125,24 +105,8 @@ cd mozilla %patch107 -p1 -b .pk - -# For branding specific patches. - -%if %{official_branding} -# Required by Mozilla Corporation - - -%else -# Not yet approved by Mozilla Corporation - - -%endif - %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig -%if %{official_branding} -#%{__cat} %{SOURCE11} >> .mozconfig -%endif #--------------------------------------------------------------------- @@ -211,15 +175,6 @@ cd $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; cd - -%if %{official_branding} -%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome/icons/default/ -%{__cp} other-licenses/branding/%{name}/default.xpm \ - $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome/icons/default/ -%{__cp} other-licenses/branding/%{name}/default.xpm \ - $RPM_BUILD_ROOT${MOZ_APP_DIR}/icons/ -%endif - - # system extensions and plugins support %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions From 298bbd35032bd47b91f5f6b244a0588d5cb8d37d Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 2 Apr 2008 04:17:49 +0000 Subject: [PATCH 05/39] no longer need curl-devel --- xulrunner.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 21c3634..49061a1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -57,7 +57,6 @@ BuildRequires: pango-devel BuildRequires: freetype-devel >= 2.1.9 BuildRequires: libXt-devel BuildRequires: libXrender-devel -BuildRequires: curl-devel BuildRequires: hunspell-devel BuildRequires: sqlite-devel >= 3.5 From 1d82a3d77b0b28ada9954ffde7c373bfaf85d615 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 2 Apr 2008 20:46:02 +0000 Subject: [PATCH 06/39] - Beta 5 --- xulrunner.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 49061a1..d768c92 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -4,12 +4,12 @@ %define version_internal 1.9pre -%define version_pre .beta5rc2 +%define version_pre .beta5 Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.51%{?version_pre}%{?dist} +Release: 0.52%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -354,6 +354,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Apr 2 2008 Christopher Aillon 1.9-0.52 +- Beta 5 + * Mon Mar 31 2008 Christopher Aillon 1.9-0.51 - Beta 5 RC2 From 74dca507096ad6022d531fa3d935c967c8564cf0 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 8 Apr 2008 00:59:09 +0000 Subject: [PATCH 07/39] - Spec cleanups --- find-external-requires | 23 ----------------------- xulrunner.spec | 24 ++++++------------------ 2 files changed, 6 insertions(+), 41 deletions(-) delete mode 100755 find-external-requires diff --git a/find-external-requires b/find-external-requires deleted file mode 100755 index d79db1d..0000000 --- a/find-external-requires +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -# Finds requirements provided outside of the current file set - -filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` - -provides=`echo $filelist | /usr/lib/rpm/find-provides` - -{ -for f in $filelist ; do - echo $f | /usr/lib/rpm/find-requires | while read req ; do - found=0 - for p in $provides ; do - if [ "$req" = "$p" ]; then - found=1 - fi - done - if [ "$found" = "0" ]; then - echo $req - fi - done -done -} | sort -u \ No newline at end of file diff --git a/xulrunner.spec b/xulrunner.spec index d768c92..afd5744 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,16 +9,14 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.52%{?version_pre}%{?dist} +Release: 0.53%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: xulrunner-1.9b5-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js -#Source21: %{name}.sh.in Source23: %{name}.1 -Source100: find-external-requires # build patches Patch4: mozilla-build.patch @@ -64,9 +62,6 @@ Requires: nspr >= %{nspr_version} Requires: nss >= %{nss_version} Provides: gecko-libs = %{version} -#define _use_internal_dependency_generator 0 -#define __find_requires %{SOURCE100} - %description XULRunner provides the XUL Runtime environment for Gecko applications. @@ -153,10 +148,6 @@ DESTDIR=$RPM_BUILD_ROOT make install %{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \ $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \ $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME} -#%{__install} -p -d dist/sdk/include $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME} -#%{__install} -p -d dist/sdk/idl $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} -#%{__install} -p dist/sdk/bin/* $RPM_BUILD_ROOT/$MOZ_APP_DIR -#%{__install} -p dist/sdk/lib/* $RPM_BUILD_ROOT/$MOZ_APP_SDK_DIR %{__install} -p dist/sdk/bin/regxpcom $RPM_BUILD_ROOT/$MOZ_APP_DIR %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} @@ -189,14 +180,8 @@ cd - %{__cp} -rL dist/include/* \ $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} -#%{__cp} -rL dist/idl/* \ -# $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} -#%{__mv} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}/* \ -# $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} -#%{__mv} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}/* \ -# $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} -install -c -m 755 dist/bin/xpcshell \ +%{__install} -p -c -m 755 dist/bin/xpcshell \ dist/bin/xpidl \ dist/bin/xpt_dump \ dist/bin/xpt_link \ @@ -251,7 +236,7 @@ ${MOZ_APP_DIR} EOF # Copy over the LICENSE -install -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR} +%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR} # Use the system hunspell dictionaries %{__rm} -rf ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries @@ -354,6 +339,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Apr 7 2008 Christopher Aillon 1.9-0.53 +- Spec cleanups + * Wed Apr 2 2008 Christopher Aillon 1.9-0.52 - Beta 5 From cd9edfe015efc83cb24978d30c24667382148429 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Sun, 13 Apr 2008 05:20:11 +0000 Subject: [PATCH 08/39] - Add upstream patches for dpi, toolbar buttons, and invalid keys - Re-enable system cairo --- mozilla-dpi.patch | 29 ++++++++++++++++ mozilla-keys.patch | 72 ++++++++++++++++++++++++++++++++++++++++ mozilla-wtfbuttons.patch | 57 +++++++++++++++++++++++++++++++ xulrunner-mozconfig | 1 + xulrunner.spec | 38 ++++++++++++--------- 5 files changed, 181 insertions(+), 16 deletions(-) create mode 100644 mozilla-dpi.patch create mode 100644 mozilla-keys.patch create mode 100644 mozilla-wtfbuttons.patch diff --git a/mozilla-dpi.patch b/mozilla-dpi.patch new file mode 100644 index 0000000..8fe1189 --- /dev/null +++ b/mozilla-dpi.patch @@ -0,0 +1,29 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=394103 + +Index: gfx/src/thebes/nsThebesDeviceContext.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v +retrieving revision 1.68 +diff -u -8 -p -r1.68 nsThebesDeviceContext.cpp +--- a/gfx/src/thebes/nsThebesDeviceContext.cpp 17 Feb 2008 21:23:37 -0000 1.68 ++++ b/gfx/src/thebes/nsThebesDeviceContext.cpp 25 Feb 2008 10:35:19 -0000 +@@ -232,18 +232,17 @@ nsThebesDeviceContext::SetDPI() + NS_ASSERTION(dpi != -1, "no dpi set"); + + if (dotsArePixels) { + // First figure out the closest multiple of 96, which is the number of + // dev pixels per CSS pixel. Then, divide that into AppUnitsPerCSSPixel() + // to get the number of app units per dev pixel. The PR_MAXes are to + // make sure we don't end up dividing by zero. + mAppUnitsPerDevNotScaledPixel = PR_MAX(1, AppUnitsPerCSSPixel() / +- PR_MAX(1, (dpi + 48) / 96)); +- ++ PR_MAX(1, dpi / 96)); + } else { + /* set mAppUnitsPerDevPixel so we're using exactly 72 dpi, even + * though that means we have a non-integer number of device "pixels" + * per CSS pixel + */ + mAppUnitsPerDevNotScaledPixel = (AppUnitsPerCSSPixel() * 96) / dpi; + } + diff --git a/mozilla-keys.patch b/mozilla-keys.patch new file mode 100644 index 0000000..ee6f2f4 --- /dev/null +++ b/mozilla-keys.patch @@ -0,0 +1,72 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=427081 + +Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp +=================================================================== +RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v +retrieving revision 1.163 +diff -u -u -8 -p -r1.163 nsNSSComponent.cpp +--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp 26 Mar 2008 03:06:56 -0000 1.163 ++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 4 Apr 2008 22:22:26 -0000 +@@ -2257,16 +2257,17 @@ nsNSSComponent::GetErrorClass(nsresult a + + switch (aNSPRCode) + { + case SEC_ERROR_UNKNOWN_ISSUER: + case SEC_ERROR_CA_CERT_INVALID: + case SEC_ERROR_UNTRUSTED_ISSUER: + case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: + case SEC_ERROR_UNTRUSTED_CERT: ++ case SEC_ERROR_INADEQUATE_KEY_USAGE: + case SSL_ERROR_BAD_CERT_DOMAIN: + case SEC_ERROR_EXPIRED_CERTIFICATE: + *aErrorClass = ERROR_CLASS_BAD_CERT; + break; + default: + *aErrorClass = ERROR_CLASS_SSL_PROTOCOL; + break; + } +Index: mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp +=================================================================== +RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp,v +retrieving revision 1.156 +diff -u -u -8 -p -r1.156 nsNSSIOLayer.cpp +--- mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 26 Mar 2008 03:06:56 -0000 1.156 ++++ mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 4 Apr 2008 22:22:26 -0000 +@@ -770,16 +770,19 @@ AppendErrorTextUntrusted(PRErrorCode err + } + } + + if (!errorID) { + switch (errTrust) { + case SEC_ERROR_UNKNOWN_ISSUER: + errorID = "certErrorTrust_UnknownIssuer"; + break; ++ case SEC_ERROR_INADEQUATE_KEY_USAGE: ++ // Should get an individual string in the future ++ // For now, use the same as CaInvalid + case SEC_ERROR_CA_CERT_INVALID: + errorID = "certErrorTrust_CaInvalid"; + break; + case SEC_ERROR_UNTRUSTED_ISSUER: + errorID = "certErrorTrust_Issuer"; + break; + case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: + errorID = "certErrorTrust_ExpiredIssuer"; +@@ -2816,16 +2819,17 @@ nsNSSBadCertHandler(void *arg, PRFileDes + { + switch (i_node->error) + { + case SEC_ERROR_UNKNOWN_ISSUER: + case SEC_ERROR_CA_CERT_INVALID: + case SEC_ERROR_UNTRUSTED_ISSUER: + case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: + case SEC_ERROR_UNTRUSTED_CERT: ++ case SEC_ERROR_INADEQUATE_KEY_USAGE: + // We group all these errors as "cert not trusted" + collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED; + if (errorCodeTrust == SECSuccess) { + errorCodeTrust = i_node->error; + } + break; + case SSL_ERROR_BAD_CERT_DOMAIN: + collected_errors |= nsICertOverrideService::ERROR_MISMATCH; diff --git a/mozilla-wtfbuttons.patch b/mozilla-wtfbuttons.patch new file mode 100644 index 0000000..14827bf --- /dev/null +++ b/mozilla-wtfbuttons.patch @@ -0,0 +1,57 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=425079 + +Index: mozilla/toolkit/content/widgets/toolbar.xml +=================================================================== +RCS file: /cvsroot/mozilla/toolkit/content/widgets/toolbar.xml,v +retrieving revision 1.46 +diff -u -8 -p -r1.46 toolbar.xml +--- mozilla/toolkit/content/widgets/toolbar.xml 22 Mar 2008 04:26:35 -0000 1.46 ++++ mozilla/toolkit/content/widgets/toolbar.xml 27 Mar 2008 20:03:31 -0000 +@@ -174,22 +174,24 @@ + } + + var firstChildID = this.firstPermanentChild ? this.firstPermanentChild.id : ""; + var lastChildID = this.lastPermanentChild ? this.lastPermanentChild.id : ""; + + if (val && val != "__empty") { + var itemIds = val.split(","); + var before = true; ++ this._trackInserted = {}; + for (var i = 0; i < itemIds.length; i++) { + if (itemIds[i] == firstChildID || itemIds[i] == lastChildID) + before = false; + else + this.insertItem(itemIds[i], null, null, before); + } ++ delete this._trackInserted; + } + + return val; + ]]> + + + + +@@ -218,16 +220,22 @@ + newItem.className = "chromeclass-toolbar-additional"; + } else if (aId == "spacer") { + newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", + "toolbarspacer"); + uniqueId = (new Date()).getTime()+this.childNodes.length; + newItem.id = "spacer" + uniqueId; + newItem.className = "chromeclass-toolbar-additional"; + } else if (this.parentNode.localName == "toolbox") { ++ if (this._trackInserted) { ++ // Protect against creating an item with the given id more than once. ++ if (aId in this._trackInserted) ++ return false; ++ this._trackInserted[aId] = null; ++ } + // Attempt to locate an item with a matching id within palette. + var paletteItem = this.parentNode.palette.firstChild; + while (paletteItem) { + var paletteId = paletteItem.id; + if (paletteId == aId) { + newItem = paletteItem.cloneNode(true); + break; + } diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index f60922f..10fc08b 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -11,6 +11,7 @@ ac_add_options --with-system-bz2 ac_add_options --enable-system-lcms ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite +ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-strip ac_add_options --disable-tests diff --git a/xulrunner.spec b/xulrunner.spec index afd5744..879bc55 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,7 +9,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.53%{?version_pre}%{?dist} +Release: 0.54%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -19,19 +19,17 @@ Source12: %{name}-redhat-default-prefs.js Source23: %{name}.1 # build patches -Patch4: mozilla-build.patch -Patch5: xulrunner-path.patch -Patch6: xulrunner-version.patch +Patch1: mozilla-build.patch +Patch2: xulrunner-path.patch +Patch3: xulrunner-version.patch -# customization patches - -# local bugfixes - -# font system fixes - -# Other -Patch107: mozilla-pkgconfig.patch +# Fedora specific patches +Patch10: mozilla-pkgconfig.patch +# Upstream patches +Patch20: mozilla-dpi.patch +Patch21: mozilla-wtfbuttons.patch +Patch22: mozilla-keys.patch # --------------------------------------------------- @@ -93,11 +91,15 @@ are not frozen and APIs can change at any time, so should not be relied on. %prep %setup -q -c cd mozilla -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -b .ver +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -b .ver -%patch107 -p1 -b .pk +%patch10 -p1 -b .pk + +%patch20 -p1 -b .dpi +%patch21 -p1 -b .wtfbuttons +%patch22 -p1 -b .keys %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -339,6 +341,10 @@ fi #--------------------------------------------------------------------- %changelog +* Sat Apr 12 2008 Christopher Aillon 1.9-0.54 +- Add upstream patches for dpi, toolbar buttons, and invalid keys +- Re-enable system cairo + * Mon Apr 7 2008 Christopher Aillon 1.9-0.53 - Spec cleanups From b8a38294a2eb7aa6d42f35eed08baf73b43f3abe Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 18 Apr 2008 09:22:45 +0000 Subject: [PATCH 09/39] - Fixed multilib issues, added starting script instead of a symlink to binary (#436393) --- xulrunner.sh.in | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 50 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 xulrunner.sh.in diff --git a/xulrunner.sh.in b/xulrunner.sh.in new file mode 100644 index 0000000..b776138 --- /dev/null +++ b/xulrunner.sh.in @@ -0,0 +1,62 @@ +#!/bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +## +## Usage: +## +## $ xulrunner +## +## This script is meant to run a xulrunner program from the xulrunner +## rpm installation. +## + +cmdname=`basename $0` + +## +## Variables +## +XUL_ARCH=$(uname -m) +case $XUL_ARCH in + x86_64 | ia64 | s390 ) + XUL_LIB_DIR="/usr/lib64" + SECONDARY_LIB_DIR="/usr/lib" + ;; + * ) + XUL_LIB_DIR="/usr/lib" + SECONDARY_LIB_DIR="/usr/lib64" + ;; +esac + +if [ ! -x $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then + if [ ! -x $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then + echo "Error: $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found" + if [ -d $SECONDARY_LIB_DIR ]; then + echo " $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found" + fi + exit 1 + fi + XUL_LIB_DIR="$SECONDARY_LIB_DIR" +fi +XUL_DIST_BIN="$XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION" +XUL_PROGRAM="$XUL_DIST_BIN/xulrunner" + +exec $XUL_PROGRAM "$@" diff --git a/xulrunner.spec b/xulrunner.spec index 879bc55..550a93d 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,13 +9,14 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.54%{?version_pre}%{?dist} +Release: 0.55%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: xulrunner-1.9b5-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js +Source21: %{name}.sh.in Source23: %{name}.1 # build patches @@ -159,6 +160,13 @@ DESTDIR=$RPM_BUILD_ROOT make install %{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js %{__rm} rh-default-prefs +# Start script install +%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/%{name} +%{__cat} %{SOURCE21} | %{__sed} -e 's,XULRUNNER_VERSION,%{version_internal},g' > \ + $RPM_BUILD_ROOT%{_bindir}/%{name} +%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} + +# Man page install %{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 %{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config @@ -183,6 +191,42 @@ cd - %{__cp} -rL dist/include/* \ $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} +# Fix multilib devel conflicts... +%ifarch x86_64 ia64 s390x ppc64 +%define mozbits 64 +%else +%define mozbits 32 +%endif + +function install_file() { +genheader=$* +mv ${genheader}.h ${genheader}%{mozbits}.h +cat > ${genheader}.h << EOF +// This file exists to fix multilib conflicts +#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__ppc64__) +#include "${genheader}64.h" +#else +#include "${genheader}32.h" +#endif +EOF +} + +pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} +install_file "mozilla-config" +popd + +pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable +install_file "mozilla-config" +popd + +pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/js +install_file "jsautocfg" +popd + +pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable +install_file "jsautocfg" +popd + %{__install} -p -c -m 755 dist/bin/xpcshell \ dist/bin/xpidl \ dist/bin/xpt_dump \ @@ -341,6 +385,10 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Apr 18 2008 Martin Stransky 1.9-0.55 +- Fixed multilib issues, added starting script instead of a symlink + to binary (#436393) + * Sat Apr 12 2008 Christopher Aillon 1.9-0.54 - Add upstream patches for dpi, toolbar buttons, and invalid keys - Re-enable system cairo From e53b7521dfb1ddded6dcd5f73b5b3684c38c36f1 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 23 Apr 2008 08:27:58 +0000 Subject: [PATCH 10/39] - Changed "__ppc64__" to "__powerpc64__", "__ppc64__" doesn't work anymore --- xulrunner.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 550a93d..db1f5ac 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,7 +9,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.55%{?version_pre}%{?dist} +Release: 0.56%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -203,7 +203,7 @@ genheader=$* mv ${genheader}.h ${genheader}%{mozbits}.h cat > ${genheader}.h << EOF // This file exists to fix multilib conflicts -#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__ppc64__) +#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) #include "${genheader}64.h" #else #include "${genheader}32.h" @@ -385,6 +385,10 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Apr 23 2008 Martin Stransky 1.9-0.56 +- Changed "__ppc64__" to "__powerpc64__", + "__ppc64__" doesn't work anymore + * Fri Apr 18 2008 Martin Stransky 1.9-0.55 - Fixed multilib issues, added starting script instead of a symlink to binary (#436393) From be7a9ceafebd3d648bd100e5c0f1660f4de7cc86 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 23 Apr 2008 08:33:50 +0000 Subject: [PATCH 11/39] - Added fix for #443725 - Critical hanging bug with fix available upstream (mozbz#429903) --- xulrunner-hang.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 4 ++++ 2 files changed, 47 insertions(+) create mode 100644 xulrunner-hang.patch diff --git a/xulrunner-hang.patch b/xulrunner-hang.patch new file mode 100644 index 0000000..c148316 --- /dev/null +++ b/xulrunner-hang.patch @@ -0,0 +1,43 @@ +diff -NprU8 mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp mozilla/dom/src/base/nsDOMClassInfo.cpp +--- mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp 2008-04-22 16:58:15.000000000 -0700 ++++ mozilla/dom/src/base/nsDOMClassInfo.cpp 2008-04-22 16:58:15.000000000 -0700 +@@ -8933,17 +8933,17 @@ nsHTMLPluginObjElementSH::SetupProtoChai + // Set 'this.__proto__' to pi + if (!::JS_SetPrototype(cx, obj, pi_obj)) { + return NS_ERROR_UNEXPECTED; + } + + if (pi_proto && JS_GET_CLASS(cx, pi_proto) != sObjectClass) { + // The plugin wrapper has a proto that's not Object.prototype, set + // 'pi.__proto__.__proto__' to the original 'this.__proto__' +- if (!::JS_SetPrototype(cx, pi_proto, my_proto)) { ++ if (pi_proto != my_proto && !::JS_SetPrototype(cx, pi_proto, my_proto)) { + return NS_ERROR_UNEXPECTED; + } + } else { + // 'pi' didn't have a prototype, or pi's proto was 'Object.prototype' + // (i.e. pi is an LiveConnect wrapped Java applet), set + // 'pi.__proto__' to the original 'this.__proto__' + if (!::JS_SetPrototype(cx, pi_obj, my_proto)) { + return NS_ERROR_UNEXPECTED; +diff -NprU8 mozilla.eded8fd350ce/js/src/jsapi.c mozilla/js/src/jsapi.c +--- mozilla.eded8fd350ce/js/src/jsapi.c 2008-04-22 16:58:15.000000000 -0700 ++++ mozilla/js/src/jsapi.c 2008-04-22 16:58:15.000000000 -0700 +@@ -2908,16 +2908,17 @@ JS_GetPrototype(JSContext *cx, JSObject + /* Beware ref to dead object (we may be called from obj's finalizer). */ + return proto && proto->map ? proto : NULL; + } + + JS_PUBLIC_API(JSBool) + JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto) + { + CHECK_REQUEST(cx); ++ JS_ASSERT(obj != proto); + #ifdef DEBUG + /* + * FIXME: bug 408416. The cycle-detection required for script-writeable + * __proto__ lives in js_SetProtoOrParent over in jsobj.c, also known as + * js_ObjectOps.setProto. This hook must detect cycles, to prevent scripts + * from ilooping SpiderMonkey trivially. But the overhead of detecting + * cycles is high enough, and the threat from JS-API-calling C++ code is + * low enough, that it's not worth burdening the non-DEBUG callers. Same diff --git a/xulrunner.spec b/xulrunner.spec index db1f5ac..1b6d002 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -31,6 +31,7 @@ Patch10: mozilla-pkgconfig.patch Patch20: mozilla-dpi.patch Patch21: mozilla-wtfbuttons.patch Patch22: mozilla-keys.patch +Patch23: xulrunner-hang.patch # --------------------------------------------------- @@ -101,6 +102,7 @@ cd mozilla %patch20 -p1 -b .dpi %patch21 -p1 -b .wtfbuttons %patch22 -p1 -b .keys +%patch23 -p1 -b .hang %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -388,6 +390,8 @@ fi * Wed Apr 23 2008 Martin Stransky 1.9-0.56 - Changed "__ppc64__" to "__powerpc64__", "__ppc64__" doesn't work anymore +- Added fix for #443725 - Critical hanging bug with fix + available upstream (mozbz#429903) * Fri Apr 18 2008 Martin Stransky 1.9-0.55 - Fixed multilib issues, added starting script instead of a symlink From 65765d876fc6021dae4bff49f3d3fb70d6acc5fb Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 25 Apr 2008 13:25:11 +0000 Subject: [PATCH 12/39] Enabled phishing protection (#443403) --- xulrunner-mozconfig | 1 + xulrunner.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 10fc08b..7551cb5 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -24,6 +24,7 @@ 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 export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/xulrunner.spec b/xulrunner.spec index 1b6d002..6ec5ae7 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,7 +9,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.56%{?version_pre}%{?dist} +Release: 0.57%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -387,6 +387,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Apr 25 2008 Martin Stransky 1.9-0.57 +- Enabled phishing protection (#443403) + * Wed Apr 23 2008 Martin Stransky 1.9-0.56 - Changed "__ppc64__" to "__powerpc64__", "__ppc64__" doesn't work anymore From 6bb64ec85fb61ed6175f3723606b18ffd4794799 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Sun, 27 Apr 2008 04:14:11 +0000 Subject: [PATCH 13/39] - Fix font scaling --- mozilla-resolution.patch | 32 ++++++++++++++++++++++++++++++++ xulrunner-hang.patch | 20 ++++++++++++++++++++ xulrunner.spec | 7 ++++++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 mozilla-resolution.patch diff --git a/mozilla-resolution.patch b/mozilla-resolution.patch new file mode 100644 index 0000000..0b85ac9 --- /dev/null +++ b/mozilla-resolution.patch @@ -0,0 +1,32 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=384090 + +Index: mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp +=================================================================== +RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v +retrieving revision 1.76 +diff -d -u -p -r1.76 nsThebesDeviceContext.cpp +--- mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp 16 Apr 2008 03:27:03 -0000 1.76 ++++ mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp 18 Apr 2008 18:41:21 -0000 +@@ -49,7 +49,9 @@ + + #ifdef MOZ_ENABLE_GTK2 + // for getenv +-#include ++#include ++// for round ++#include + + #include + #include +@@ -170,8 +172,9 @@ nsThebesDeviceContext::SetDPI() + } + + #if defined(MOZ_ENABLE_GTK2) +- float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f; +- PRInt32 OSVal = NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn); ++ GdkScreen *screen = gdk_screen_get_default(); ++ gtk_settings_get_for_screen(screen); // Make sure init is run so we have a resolution ++ PRInt32 OSVal = PRInt32(round(gdk_screen_get_resolution(screen))); + + if (prefDPI == 0) // Force the use of the OS dpi + dpi = OSVal; diff --git a/xulrunner-hang.patch b/xulrunner-hang.patch index c148316..65812d2 100644 --- a/xulrunner-hang.patch +++ b/xulrunner-hang.patch @@ -1,3 +1,5 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=429903 + diff -NprU8 mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp mozilla/dom/src/base/nsDOMClassInfo.cpp --- mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp 2008-04-22 16:58:15.000000000 -0700 +++ mozilla/dom/src/base/nsDOMClassInfo.cpp 2008-04-22 16:58:15.000000000 -0700 @@ -41,3 +43,21 @@ diff -NprU8 mozilla.eded8fd350ce/js/src/jsapi.c mozilla/js/src/jsapi.c * from ilooping SpiderMonkey trivially. But the overhead of detecting * cycles is high enough, and the threat from JS-API-calling C++ code is * low enough, that it's not worth burdening the non-DEBUG callers. Same +@@ -2951,16 +2952,17 @@ JS_GetParent(JSContext *cx, JSObject *ob + /* Beware ref to dead object (we may be called from obj's finalizer). */ + return parent && parent->map ? parent : NULL; + } + + JS_PUBLIC_API(JSBool) + JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent) + { + CHECK_REQUEST(cx); ++ JS_ASSERT(obj != parent); + #ifdef DEBUG + /* FIXME: bug 408416, see JS_SetPrototype just above. */ + if (obj->map->ops->setParent) + return obj->map->ops->setParent(cx, obj, JSSLOT_PARENT, parent); + #endif + OBJ_SET_PARENT(cx, obj, parent); + return JS_TRUE; + } diff --git a/xulrunner.spec b/xulrunner.spec index 6ec5ae7..16d136b 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,7 +9,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.57%{?version_pre}%{?dist} +Release: 0.58%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -32,6 +32,7 @@ Patch20: mozilla-dpi.patch Patch21: mozilla-wtfbuttons.patch Patch22: mozilla-keys.patch Patch23: xulrunner-hang.patch +Patch24: mozilla-resolution.patch # --------------------------------------------------- @@ -103,6 +104,7 @@ cd mozilla %patch21 -p1 -b .wtfbuttons %patch22 -p1 -b .keys %patch23 -p1 -b .hang +%patch24 -p1 -b .resolution %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -387,6 +389,9 @@ fi #--------------------------------------------------------------------- %changelog +* Sat Apr 26 2008 Christopher Aillon 1.9-0.58 +- Fix font scaling + * Fri Apr 25 2008 Martin Stransky 1.9-0.57 - Enabled phishing protection (#443403) From fdf396552b0cec4039e54519202e215b426fc76b Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 29 Apr 2008 04:06:13 +0000 Subject: [PATCH 14/39] - Clean up the %files list and get rid of the executable bit on some files --- xulrunner.spec | 76 ++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 16d136b..150b7d2 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -3,6 +3,7 @@ %define cairo_version 0.5 %define version_internal 1.9pre +%define mozappdir %{_libdir}/%{name}-%{version_internal} %define version_pre .beta5 @@ -69,7 +70,7 @@ XULRunner provides the XUL Runtime environment for Gecko applications. %package devel Summary: Development files for Gecko Group: Development/Libraries -Obsoletes: mozilla-devel +Obsoletes: mozilla-devel < 1.9 Obsoletes: firefox-devel < 2.1 Requires: xulrunner = %{version}-%{release} Requires: nspr-devel >= %{nspr_version} @@ -254,6 +255,9 @@ ln -s %{_includedir}/${INTERNAL_APP_SDK_NAME}/stable \ ln -s %{_datadir}/idl/${INTERNAL_APP_SDK_NAME}/stable \ $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/idl +find $RPM_BUILD_ROOT/%{_includedir} -type f -name "*.h" | xargs chmod 644 +find $RPM_BUILD_ROOT/%{_datadir}/idl -type f -name "*.idl" | xargs chmod 644 + %{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/*.so pushd $RPM_BUILD_ROOT${MOZ_APP_DIR} for i in *.so; do @@ -324,51 +328,52 @@ fi %{_datadir}/mozilla %dir /etc/gre.d /etc/gre.d/%{gre_conf_file} -%dir %{_libdir}/%{name}-* -%exclude %dir %{_libdir}/%{name}-sdk-* -%{_libdir}/%{name}-*/LICENSE -%{_libdir}/%{name}-*/README.txt -%{_libdir}/%{name}-*/chrome -%{_libdir}/%{name}-*/dictionaries -%dir %{_libdir}/%{name}-*/components -%ghost %{_libdir}/%{name}-*/components/compreg.dat -%ghost %{_libdir}/%{name}-*/components/xpti.dat -%{_libdir}/%{name}-*/components/* -%{_libdir}/%{name}-*/defaults -%{_libdir}/%{name}-*/greprefs -%{_libdir}/%{name}-*/icons -%{_libdir}/%{name}-*/modules -%{_libdir}/%{name}-*/plugins -%{_libdir}/%{name}-*/res -%{_libdir}/%{name}-*/*.so -%{_libdir}/%{name}-*/mozilla-xremote-client -%{_libdir}/%{name}-*/run-mozilla.sh -%{_libdir}/%{name}-*/regxpcom -%{_libdir}/%{name}-*/xulrunner -%{_libdir}/%{name}-*/xulrunner-bin -%{_libdir}/%{name}-*/xulrunner-stub -%{_libdir}/%{name}-*/platform.ini -%{_libdir}/%{name}-*/dependentlibs.list +%dir %{mozappdir} +%doc %attr(644, root, root) %{mozappdir}/LICENSE +%doc %attr(644, root, root) %{mozappdir}/README.txt +%{mozappdir}/chrome +%{mozappdir}/dictionaries +%dir %{mozappdir}/components +%ghost %{mozappdir}/components/compreg.dat +%ghost %{mozappdir}/components/xpti.dat +%{mozappdir}/components/*.so +%{mozappdir}/components/*.xpt +%attr(644, root, root) %{mozappdir}/components/*.js +%{mozappdir}/defaults +%{mozappdir}/greprefs +%dir %{mozappdir}/icons +%attr(644, root, root) %{mozappdir}/icons/* +%{mozappdir}/modules +%{mozappdir}/plugins +%{mozappdir}/res +%{mozappdir}/*.so +%{mozappdir}/mozilla-xremote-client +%{mozappdir}/run-mozilla.sh +%{mozappdir}/regxpcom +%{mozappdir}/xulrunner +%{mozappdir}/xulrunner-bin +%{mozappdir}/xulrunner-stub +%{mozappdir}/platform.ini +%{mozappdir}/dependentlibs.list %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf %{_sysconfdir}/skel/.mozilla # XXX See if these are needed still -%{_libdir}/%{name}-*/updater* +%{mozappdir}/updater* %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %dir %{_datadir}/idl/%{name}*%{version_internal} %{_datadir}/idl/%{name}*%{version_internal}/stable %{_includedir}/%{name}*%{version_internal} %exclude %{_includedir}/%{name}*%{version_internal}/unstable -%dir %{_libdir}/%{name}-* %dir %{_libdir}/%{name}-sdk-* %dir %{_libdir}/%{name}-sdk-*/sdk -%{_libdir}/%{name}-*/xpcshell -%{_libdir}/%{name}-*/xpidl -%{_libdir}/%{name}-*/xpt_dump -%{_libdir}/%{name}-*/xpt_link +%{mozappdir}/xpcshell +%{mozappdir}/xpidl +%{mozappdir}/xpt_dump +%{mozappdir}/xpt_link %{_libdir}/%{name}-sdk-*/*.h %{_libdir}/%{name}-sdk-*/sdk/* %exclude %{_libdir}/pkgconfig/*unstable*.pc @@ -376,7 +381,7 @@ fi %{_libdir}/pkgconfig/*.pc %files devel-unstable -%defattr(-,root,root) +%defattr(-,root,root,-) %{_datadir}/idl/%{name}*%{version_internal}/unstable %{_includedir}/%{name}*%{version_internal}/unstable %dir %{_libdir}/%{name}-sdk-* @@ -389,6 +394,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Apr 28 2008 Christopher Aillon 1.9-0.59 +- Clean up the %%files list and get rid of the executable bit on some files + * Sat Apr 26 2008 Christopher Aillon 1.9-0.58 - Fix font scaling From 410f0159a89e6b614e6f189e6bc06b181c9a9c26 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 29 Apr 2008 04:06:53 +0000 Subject: [PATCH 15/39] - Clean up the %files list and get rid of the executable bit on some files --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index 150b7d2..0cbded1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -10,7 +10,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.58%{?version_pre}%{?dist} +Release: 0.59%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet From d2c6214e1bbd8c516815d1cabac1591efe675f78 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 29 Apr 2008 04:19:28 +0000 Subject: [PATCH 16/39] the man page is for firefox, not xulrunner --- xulrunner.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 0cbded1..aa9945a 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -171,9 +171,6 @@ DESTDIR=$RPM_BUILD_ROOT make install $RPM_BUILD_ROOT%{_bindir}/%{name} %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name} -# Man page install -%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 - %{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config cd $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome @@ -323,7 +320,6 @@ fi %files %defattr(-,root,root,-) %{_bindir}/xulrunner -%{_mandir}/man1/* %{_libdir}/mozilla %{_datadir}/mozilla %dir /etc/gre.d From 9d2eab590f420a5f582ecf467b64d66ba1c0695a Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 30 Apr 2008 06:31:44 +0000 Subject: [PATCH 17/39] - Some files moved to mozilla-filesystem; kill them and add the Req --- xulrunner.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index aa9945a..1b8afa4 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -10,7 +10,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.59%{?version_pre}%{?dist} +Release: 0.60%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -60,6 +60,7 @@ BuildRequires: libXrender-devel BuildRequires: hunspell-devel BuildRequires: sqlite-devel >= 3.5 +Requires: mozilla-filesystem Requires: nspr >= %{nspr_version} Requires: nss >= %{nss_version} Provides: gecko-libs = %{version} @@ -177,14 +178,6 @@ cd $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; cd - -# system extensions and plugins support -%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions -%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions -%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mozilla/extensions -%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mozilla/plugins - - # Prepare our devel package %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} @@ -320,8 +313,6 @@ fi %files %defattr(-,root,root,-) %{_bindir}/xulrunner -%{_libdir}/mozilla -%{_datadir}/mozilla %dir /etc/gre.d /etc/gre.d/%{gre_conf_file} %dir %{mozappdir} @@ -352,8 +343,6 @@ fi %{mozappdir}/platform.ini %{mozappdir}/dependentlibs.list %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf -%{_sysconfdir}/skel/.mozilla - # XXX See if these are needed still %{mozappdir}/updater* @@ -390,6 +379,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Apr 30 2008 Christopher Aillon 1.0-0.60 +- Some files moved to mozilla-filesystem; kill them and add the Req + * Mon Apr 28 2008 Christopher Aillon 1.9-0.59 - Clean up the %%files list and get rid of the executable bit on some files From caf30f046d0e049619780cc8df926c0a2faf14e4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 8 May 2008 20:34:53 +0000 Subject: [PATCH 18/39] - Ensure we enable startup notification; add BR and modify config --- xulrunner-mozconfig | 1 + xulrunner.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 7551cb5..6149f5f 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -23,6 +23,7 @@ ac_add_options --enable-pango ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --disable-javaxpcom +ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter ac_add_options --enable-safe-browsing diff --git a/xulrunner.spec b/xulrunner.spec index 1b8afa4..0f8e5ae 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -10,7 +10,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.60%{?version_pre}%{?dist} +Release: 0.61%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -59,6 +59,7 @@ BuildRequires: libXt-devel BuildRequires: libXrender-devel BuildRequires: hunspell-devel BuildRequires: sqlite-devel >= 3.5 +BuildRequires: startup-notification-devel Requires: mozilla-filesystem Requires: nspr >= %{nspr_version} @@ -379,6 +380,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu May 08 2008 Colin Walters 1.0-0.61 +- Ensure we enable startup notification; add BR and modify config + * Wed Apr 30 2008 Christopher Aillon 1.0-0.60 - Some files moved to mozilla-filesystem; kill them and add the Req From c4d882914290c4b40f4e64fc687f3bfef6b3fce9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 8 May 2008 20:36:18 +0000 Subject: [PATCH 19/39] add bug ref --- xulrunner.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xulrunner.spec b/xulrunner.spec index 0f8e5ae..d17af32 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -382,6 +382,7 @@ fi %changelog * Thu May 08 2008 Colin Walters 1.0-0.61 - Ensure we enable startup notification; add BR and modify config + (bug #445543) * Wed Apr 30 2008 Christopher Aillon 1.0-0.60 - Some files moved to mozilla-filesystem; kill them and add the Req From 46e52a4848d8303d03e95bd5287c5786e84dc09a Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 22 May 2008 19:14:28 +0000 Subject: [PATCH 20/39] - Upstream patch to fsync() less --- mozilla-fsync.patch | 82 +++++++++++++++++++++++++++++++++++++++++++++ xulrunner.spec | 7 +++- 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 mozilla-fsync.patch diff --git a/mozilla-fsync.patch b/mozilla-fsync.patch new file mode 100644 index 0000000..c831dcc --- /dev/null +++ b/mozilla-fsync.patch @@ -0,0 +1,82 @@ +diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp +--- a/storage/src/mozStorageConnection.cpp ++++ b/storage/src/mozStorageConnection.cpp +@@ -48,6 +48,8 @@ + #include "nsAutoPtr.h" + #include "nsIFile.h" + #include "nsIVariant.h" ++#include "nsIPrefService.h" ++#include "nsIPrefBranch.h" + + #include "mozIStorageAggregateFunction.h" + #include "mozIStorageFunction.h" +@@ -65,6 +67,8 @@ + #ifdef PR_LOGGING + PRLogModuleInfo* gStorageLog = nsnull; + #endif ++ ++#define PREF_TS_SYNCHRONOUS "toolkit.storage.synchronous" + + NS_IMPL_ISUPPORTS1(mozStorageConnection, mozIStorageConnection) + +@@ -155,6 +159,28 @@ mozStorageConnection::Initialize(nsIFile + mDBConn = nsnull; + + return ConvertResultCode(srv); ++ } ++ ++ // Set the synchronous PRAGMA, according to the pref ++ nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); ++ PRInt32 synchronous = 1; // Default to NORMAL if pref not set ++ if (pref) ++ (void)pref->GetIntPref(PREF_TS_SYNCHRONOUS, &synchronous); ++ ++ switch (synchronous) { ++ case 2: ++ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING( ++ "PRAGMA synchronous = FULL;")); ++ break; ++ case 0: ++ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING( ++ "PRAGMA synchronous = OFF;")); ++ break; ++ case 1: ++ default: ++ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING( ++ "PRAGMA synchronous = NORMAL;")); ++ break; + } + + return NS_OK; +diff --git a/storage/test/unit/test_storage_connection.js b/storage/test/unit/test_storage_connection.js +--- a/storage/test/unit/test_storage_connection.js ++++ b/storage/test/unit/test_storage_connection.js +@@ -197,6 +197,20 @@ function test_createTable(){ + } + } + ++function test_defaultSynchronousAtNormal() ++{ ++ var msc = getOpenedDatabase(); ++ var stmt = createStatement("PRAGMA synchronous;"); ++ try { ++ stmt.executeStep(); ++ do_check_eq(1, stmt.getInt32(0)); ++ } ++ finally { ++ stmt.reset(); ++ stmt.finalize(); ++ } ++} ++ + var tests = [ + test_connectionReady_open, + test_connectionReady_closed, +@@ -216,6 +230,7 @@ var tests = [ + test_set_schemaVersion_same, + test_set_schemaVersion_negative, + test_createTable, ++ test_defaultSynchronousAtNormal, + ]; + + function run_test() diff --git a/xulrunner.spec b/xulrunner.spec index d17af32..e5bb38c 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -10,7 +10,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.61%{?version_pre}%{?dist} +Release: 0.62%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -34,6 +34,7 @@ Patch21: mozilla-wtfbuttons.patch Patch22: mozilla-keys.patch Patch23: xulrunner-hang.patch Patch24: mozilla-resolution.patch +Patch25: mozilla-fsync.patch # --------------------------------------------------- @@ -108,6 +109,7 @@ cd mozilla %patch22 -p1 -b .keys %patch23 -p1 -b .hang %patch24 -p1 -b .resolution +%patch25 -p1 -b .fsync %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -380,6 +382,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu May 22 2008 Christopher Aillon 1.0-0.62 +- Upstream patch to fsync() less + * Thu May 08 2008 Colin Walters 1.0-0.61 - Ensure we enable startup notification; add BR and modify config (bug #445543) From d9e6b9770288360ed9211578e667711e36463e10 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 29 May 2008 14:43:54 +0000 Subject: [PATCH 21/39] - Simplify PS/PDF operators --- mozilla-ps-pdf-simplify-operators.patch | 42 +++++++++++++++++++++++++ xulrunner.spec | 7 ++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 mozilla-ps-pdf-simplify-operators.patch diff --git a/mozilla-ps-pdf-simplify-operators.patch b/mozilla-ps-pdf-simplify-operators.patch new file mode 100644 index 0000000..cab1341 --- /dev/null +++ b/mozilla-ps-pdf-simplify-operators.patch @@ -0,0 +1,42 @@ +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/xulrunner.spec b/xulrunner.spec index e5bb38c..abb65e1 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -10,7 +10,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.62%{?version_pre}%{?dist} +Release: 0.63%{?version_pre}%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -35,6 +35,7 @@ Patch22: mozilla-keys.patch Patch23: xulrunner-hang.patch Patch24: mozilla-resolution.patch Patch25: mozilla-fsync.patch +Patch26: mozilla-ps-pdf-simplify-operators.patch # --------------------------------------------------- @@ -110,6 +111,7 @@ cd mozilla %patch23 -p1 -b .hang %patch24 -p1 -b .resolution %patch25 -p1 -b .fsync +%patch26 -p1 -b .ps-pdf-simplify-operators %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -382,6 +384,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu May 29 2008 Christopher Aillon 1.0-0.63 +- Simplify PS/PDF operators + * Thu May 22 2008 Christopher Aillon 1.0-0.62 - Upstream patch to fsync() less From 1000d783151152bf2b2e510a408d8f618dfe8a98 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 17 Jun 2008 16:15:18 +0000 Subject: [PATCH 22/39] - Update to 1.9 final --- .cvsignore | 2 +- mozilla-dpi.patch | 29 ----------- mozilla-fsync.patch | 82 ------------------------------- mozilla-keys.patch | 72 --------------------------- mozilla-mochitest.patch | 21 ++++++++ mozilla-resolution.patch | 32 ------------ mozilla-sqlite.patch | 32 ++++++++++++ mozilla-ssl-exception.patch | 14 ++++++ mozilla-wtfbuttons.patch | 57 --------------------- sources | 2 +- xulrunner-hang.patch | 63 ------------------------ xulrunner-mozconfig | 1 + xulrunner-redhat-default-prefs.js | 1 + xulrunner.spec | 46 ++++++++--------- 14 files changed, 92 insertions(+), 362 deletions(-) delete mode 100644 mozilla-dpi.patch delete mode 100644 mozilla-fsync.patch delete mode 100644 mozilla-keys.patch create mode 100644 mozilla-mochitest.patch delete mode 100644 mozilla-resolution.patch create mode 100644 mozilla-sqlite.patch create mode 100644 mozilla-ssl-exception.patch delete mode 100644 mozilla-wtfbuttons.patch delete mode 100644 xulrunner-hang.patch diff --git a/.cvsignore b/.cvsignore index 2b9816f..bd67bfe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9b5-source.tar.bz2 +xulrunner-1.9-source.tar.bz2 diff --git a/mozilla-dpi.patch b/mozilla-dpi.patch deleted file mode 100644 index 8fe1189..0000000 --- a/mozilla-dpi.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=394103 - -Index: gfx/src/thebes/nsThebesDeviceContext.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v -retrieving revision 1.68 -diff -u -8 -p -r1.68 nsThebesDeviceContext.cpp ---- a/gfx/src/thebes/nsThebesDeviceContext.cpp 17 Feb 2008 21:23:37 -0000 1.68 -+++ b/gfx/src/thebes/nsThebesDeviceContext.cpp 25 Feb 2008 10:35:19 -0000 -@@ -232,18 +232,17 @@ nsThebesDeviceContext::SetDPI() - NS_ASSERTION(dpi != -1, "no dpi set"); - - if (dotsArePixels) { - // First figure out the closest multiple of 96, which is the number of - // dev pixels per CSS pixel. Then, divide that into AppUnitsPerCSSPixel() - // to get the number of app units per dev pixel. The PR_MAXes are to - // make sure we don't end up dividing by zero. - mAppUnitsPerDevNotScaledPixel = PR_MAX(1, AppUnitsPerCSSPixel() / -- PR_MAX(1, (dpi + 48) / 96)); -- -+ PR_MAX(1, dpi / 96)); - } else { - /* set mAppUnitsPerDevPixel so we're using exactly 72 dpi, even - * though that means we have a non-integer number of device "pixels" - * per CSS pixel - */ - mAppUnitsPerDevNotScaledPixel = (AppUnitsPerCSSPixel() * 96) / dpi; - } - diff --git a/mozilla-fsync.patch b/mozilla-fsync.patch deleted file mode 100644 index c831dcc..0000000 --- a/mozilla-fsync.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/storage/src/mozStorageConnection.cpp b/storage/src/mozStorageConnection.cpp ---- a/storage/src/mozStorageConnection.cpp -+++ b/storage/src/mozStorageConnection.cpp -@@ -48,6 +48,8 @@ - #include "nsAutoPtr.h" - #include "nsIFile.h" - #include "nsIVariant.h" -+#include "nsIPrefService.h" -+#include "nsIPrefBranch.h" - - #include "mozIStorageAggregateFunction.h" - #include "mozIStorageFunction.h" -@@ -65,6 +67,8 @@ - #ifdef PR_LOGGING - PRLogModuleInfo* gStorageLog = nsnull; - #endif -+ -+#define PREF_TS_SYNCHRONOUS "toolkit.storage.synchronous" - - NS_IMPL_ISUPPORTS1(mozStorageConnection, mozIStorageConnection) - -@@ -155,6 +159,28 @@ mozStorageConnection::Initialize(nsIFile - mDBConn = nsnull; - - return ConvertResultCode(srv); -+ } -+ -+ // Set the synchronous PRAGMA, according to the pref -+ nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); -+ PRInt32 synchronous = 1; // Default to NORMAL if pref not set -+ if (pref) -+ (void)pref->GetIntPref(PREF_TS_SYNCHRONOUS, &synchronous); -+ -+ switch (synchronous) { -+ case 2: -+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING( -+ "PRAGMA synchronous = FULL;")); -+ break; -+ case 0: -+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING( -+ "PRAGMA synchronous = OFF;")); -+ break; -+ case 1: -+ default: -+ (void)ExecuteSimpleSQL(NS_LITERAL_CSTRING( -+ "PRAGMA synchronous = NORMAL;")); -+ break; - } - - return NS_OK; -diff --git a/storage/test/unit/test_storage_connection.js b/storage/test/unit/test_storage_connection.js ---- a/storage/test/unit/test_storage_connection.js -+++ b/storage/test/unit/test_storage_connection.js -@@ -197,6 +197,20 @@ function test_createTable(){ - } - } - -+function test_defaultSynchronousAtNormal() -+{ -+ var msc = getOpenedDatabase(); -+ var stmt = createStatement("PRAGMA synchronous;"); -+ try { -+ stmt.executeStep(); -+ do_check_eq(1, stmt.getInt32(0)); -+ } -+ finally { -+ stmt.reset(); -+ stmt.finalize(); -+ } -+} -+ - var tests = [ - test_connectionReady_open, - test_connectionReady_closed, -@@ -216,6 +230,7 @@ var tests = [ - test_set_schemaVersion_same, - test_set_schemaVersion_negative, - test_createTable, -+ test_defaultSynchronousAtNormal, - ]; - - function run_test() diff --git a/mozilla-keys.patch b/mozilla-keys.patch deleted file mode 100644 index ee6f2f4..0000000 --- a/mozilla-keys.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=427081 - -Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v -retrieving revision 1.163 -diff -u -u -8 -p -r1.163 nsNSSComponent.cpp ---- mozilla/security/manager/ssl/src/nsNSSComponent.cpp 26 Mar 2008 03:06:56 -0000 1.163 -+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp 4 Apr 2008 22:22:26 -0000 -@@ -2257,16 +2257,17 @@ nsNSSComponent::GetErrorClass(nsresult a - - switch (aNSPRCode) - { - case SEC_ERROR_UNKNOWN_ISSUER: - case SEC_ERROR_CA_CERT_INVALID: - case SEC_ERROR_UNTRUSTED_ISSUER: - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - case SEC_ERROR_UNTRUSTED_CERT: -+ case SEC_ERROR_INADEQUATE_KEY_USAGE: - case SSL_ERROR_BAD_CERT_DOMAIN: - case SEC_ERROR_EXPIRED_CERTIFICATE: - *aErrorClass = ERROR_CLASS_BAD_CERT; - break; - default: - *aErrorClass = ERROR_CLASS_SSL_PROTOCOL; - break; - } -Index: mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp -=================================================================== -RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp,v -retrieving revision 1.156 -diff -u -u -8 -p -r1.156 nsNSSIOLayer.cpp ---- mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 26 Mar 2008 03:06:56 -0000 1.156 -+++ mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp 4 Apr 2008 22:22:26 -0000 -@@ -770,16 +770,19 @@ AppendErrorTextUntrusted(PRErrorCode err - } - } - - if (!errorID) { - switch (errTrust) { - case SEC_ERROR_UNKNOWN_ISSUER: - errorID = "certErrorTrust_UnknownIssuer"; - break; -+ case SEC_ERROR_INADEQUATE_KEY_USAGE: -+ // Should get an individual string in the future -+ // For now, use the same as CaInvalid - case SEC_ERROR_CA_CERT_INVALID: - errorID = "certErrorTrust_CaInvalid"; - break; - case SEC_ERROR_UNTRUSTED_ISSUER: - errorID = "certErrorTrust_Issuer"; - break; - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - errorID = "certErrorTrust_ExpiredIssuer"; -@@ -2816,16 +2819,17 @@ nsNSSBadCertHandler(void *arg, PRFileDes - { - switch (i_node->error) - { - case SEC_ERROR_UNKNOWN_ISSUER: - case SEC_ERROR_CA_CERT_INVALID: - case SEC_ERROR_UNTRUSTED_ISSUER: - case SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE: - case SEC_ERROR_UNTRUSTED_CERT: -+ case SEC_ERROR_INADEQUATE_KEY_USAGE: - // We group all these errors as "cert not trusted" - collected_errors |= nsICertOverrideService::ERROR_UNTRUSTED; - if (errorCodeTrust == SECSuccess) { - errorCodeTrust = i_node->error; - } - break; - case SSL_ERROR_BAD_CERT_DOMAIN: - collected_errors |= nsICertOverrideService::ERROR_MISMATCH; diff --git a/mozilla-mochitest.patch b/mozilla-mochitest.patch new file mode 100644 index 0000000..5cc7f40 --- /dev/null +++ b/mozilla-mochitest.patch @@ -0,0 +1,21 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=429178 + +Index: mozilla/testing/mochitest/ssltunnel/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/testing/mochitest/ssltunnel/Makefile.in,v +retrieving revision 1.2 +diff -u -u -r1.2 Makefile.in +--- mozilla/testing/mochitest/ssltunnel/Makefile.in 11 Apr 2008 05:58:04 -0000 1.2 ++++ mozilla/testing/mochitest/ssltunnel/Makefile.in 3 Jun 2008 19:25:55 -0000 +@@ -55,6 +55,10 @@ + nss \ + $(NULL) + ++# Use local includes because they are inserted before INCLUDES ++# so that Mozilla's nss.h is used, not glibc's ++LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS) ++ + LIBS = \ + $(NSPR_LIBS) \ + $(NSS_LIBS) \ + diff --git a/mozilla-resolution.patch b/mozilla-resolution.patch deleted file mode 100644 index 0b85ac9..0000000 --- a/mozilla-resolution.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=384090 - -Index: mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp,v -retrieving revision 1.76 -diff -d -u -p -r1.76 nsThebesDeviceContext.cpp ---- mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp 16 Apr 2008 03:27:03 -0000 1.76 -+++ mozilla/gfx/src/thebes/nsThebesDeviceContext.cpp 18 Apr 2008 18:41:21 -0000 -@@ -49,7 +49,9 @@ - - #ifdef MOZ_ENABLE_GTK2 - // for getenv --#include -+#include -+// for round -+#include - - #include - #include -@@ -170,8 +172,9 @@ nsThebesDeviceContext::SetDPI() - } - - #if defined(MOZ_ENABLE_GTK2) -- float screenWidthIn = float(::gdk_screen_width_mm()) / 25.4f; -- PRInt32 OSVal = NSToCoordRound(float(::gdk_screen_width()) / screenWidthIn); -+ GdkScreen *screen = gdk_screen_get_default(); -+ gtk_settings_get_for_screen(screen); // Make sure init is run so we have a resolution -+ PRInt32 OSVal = PRInt32(round(gdk_screen_get_resolution(screen))); - - if (prefDPI == 0) // Force the use of the OS dpi - dpi = OSVal; diff --git a/mozilla-sqlite.patch b/mozilla-sqlite.patch new file mode 100644 index 0000000..6c40971 --- /dev/null +++ b/mozilla-sqlite.patch @@ -0,0 +1,32 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=424063 + +Index: mozilla/configure.in +=================================================================== +RCS file: /cvsroot/mozilla/configure.in,v +retrieving revision 1.1992 +diff -d -u -p -r1.1992 configure.in +--- mozilla/configure.in 5 May 2008 21:08:14 -0000 1.1992 ++++ mozilla/configure.in 17 May 2008 02:26:32 -0000 +@@ -5958,7 +5958,21 @@ then + SQLITE_CFLAGS= + SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)' + else +- PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION) ++ SQLITE_VERSION_NUMBER=3005004 ++ AC_MSG_CHECKING(sqlite version >= $SQLITE_VERSION) ++ AC_TRY_COMPILE([#include ], [ ++# if SQLITE_VERSION_NUMBER < $SQLITE_VERSION_NUMBER ++# error "sqlite version < $SQLITE_VERSION_NUMBER ++# endif ++ ] , [res=yes], [res=no]) ++ AC_MSG_RESULT([$res]) ++ if test "$res" != "yes"; then ++ AC_MSG_ERROR([sqlite version $SQLITE_VERSION or higher required]) ++ fi ++ SQLITE_CFLAGS=`$PKG_CONFIG --cflags sqlite3` ++ SQLITE_LIBS=`$PKG_CONFIG --libs sqlite3` ++ AC_SUBST(SQLITE_CFLAGS) ++ AC_SUBST(SQLITE_LIBS) + fi + + AC_SUBST(MOZ_NATIVE_SQLITE) diff --git a/mozilla-ssl-exception.patch b/mozilla-ssl-exception.patch new file mode 100644 index 0000000..f4640b3 --- /dev/null +++ b/mozilla-ssl-exception.patch @@ -0,0 +1,14 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=436870 + +diff --git a/security/manager/ssl/src/nsCertOverrideService.h b/security/manager/ssl/src/nsCertOverrideService.h +--- a/security/manager/ssl/src/nsCertOverrideService.h ++++ b/security/manager/ssl/src/nsCertOverrideService.h +@@ -109,6 +109,7 @@ + nsCertOverrideEntry(const nsCertOverrideEntry& toCopy) + { + mSettings = toCopy.mSettings; ++ mHostWithPort = toCopy.mHostWithPort; + } + + ~nsCertOverrideEntry() + diff --git a/mozilla-wtfbuttons.patch b/mozilla-wtfbuttons.patch deleted file mode 100644 index 14827bf..0000000 --- a/mozilla-wtfbuttons.patch +++ /dev/null @@ -1,57 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=425079 - -Index: mozilla/toolkit/content/widgets/toolbar.xml -=================================================================== -RCS file: /cvsroot/mozilla/toolkit/content/widgets/toolbar.xml,v -retrieving revision 1.46 -diff -u -8 -p -r1.46 toolbar.xml ---- mozilla/toolkit/content/widgets/toolbar.xml 22 Mar 2008 04:26:35 -0000 1.46 -+++ mozilla/toolkit/content/widgets/toolbar.xml 27 Mar 2008 20:03:31 -0000 -@@ -174,22 +174,24 @@ - } - - var firstChildID = this.firstPermanentChild ? this.firstPermanentChild.id : ""; - var lastChildID = this.lastPermanentChild ? this.lastPermanentChild.id : ""; - - if (val && val != "__empty") { - var itemIds = val.split(","); - var before = true; -+ this._trackInserted = {}; - for (var i = 0; i < itemIds.length; i++) { - if (itemIds[i] == firstChildID || itemIds[i] == lastChildID) - before = false; - else - this.insertItem(itemIds[i], null, null, before); - } -+ delete this._trackInserted; - } - - return val; - ]]> - - - - -@@ -218,16 +220,22 @@ - newItem.className = "chromeclass-toolbar-additional"; - } else if (aId == "spacer") { - newItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", - "toolbarspacer"); - uniqueId = (new Date()).getTime()+this.childNodes.length; - newItem.id = "spacer" + uniqueId; - newItem.className = "chromeclass-toolbar-additional"; - } else if (this.parentNode.localName == "toolbox") { -+ if (this._trackInserted) { -+ // Protect against creating an item with the given id more than once. -+ if (aId in this._trackInserted) -+ return false; -+ this._trackInserted[aId] = null; -+ } - // Attempt to locate an item with a matching id within palette. - var paletteItem = this.parentNode.palette.firstChild; - while (paletteItem) { - var paletteId = paletteItem.id; - if (paletteId == aId) { - newItem = paletteItem.cloneNode(true); - break; - } diff --git a/sources b/sources index 1e51738..f0cb27c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbb83017ed3c0e740a9128089a4f1b2d xulrunner-1.9b5-source.tar.bz2 +b514375509fd439e44def1e4a7873af4 xulrunner-1.9-source.tar.bz2 diff --git a/xulrunner-hang.patch b/xulrunner-hang.patch deleted file mode 100644 index 65812d2..0000000 --- a/xulrunner-hang.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=429903 - -diff -NprU8 mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp mozilla/dom/src/base/nsDOMClassInfo.cpp ---- mozilla.eded8fd350ce/dom/src/base/nsDOMClassInfo.cpp 2008-04-22 16:58:15.000000000 -0700 -+++ mozilla/dom/src/base/nsDOMClassInfo.cpp 2008-04-22 16:58:15.000000000 -0700 -@@ -8933,17 +8933,17 @@ nsHTMLPluginObjElementSH::SetupProtoChai - // Set 'this.__proto__' to pi - if (!::JS_SetPrototype(cx, obj, pi_obj)) { - return NS_ERROR_UNEXPECTED; - } - - if (pi_proto && JS_GET_CLASS(cx, pi_proto) != sObjectClass) { - // The plugin wrapper has a proto that's not Object.prototype, set - // 'pi.__proto__.__proto__' to the original 'this.__proto__' -- if (!::JS_SetPrototype(cx, pi_proto, my_proto)) { -+ if (pi_proto != my_proto && !::JS_SetPrototype(cx, pi_proto, my_proto)) { - return NS_ERROR_UNEXPECTED; - } - } else { - // 'pi' didn't have a prototype, or pi's proto was 'Object.prototype' - // (i.e. pi is an LiveConnect wrapped Java applet), set - // 'pi.__proto__' to the original 'this.__proto__' - if (!::JS_SetPrototype(cx, pi_obj, my_proto)) { - return NS_ERROR_UNEXPECTED; -diff -NprU8 mozilla.eded8fd350ce/js/src/jsapi.c mozilla/js/src/jsapi.c ---- mozilla.eded8fd350ce/js/src/jsapi.c 2008-04-22 16:58:15.000000000 -0700 -+++ mozilla/js/src/jsapi.c 2008-04-22 16:58:15.000000000 -0700 -@@ -2908,16 +2908,17 @@ JS_GetPrototype(JSContext *cx, JSObject - /* Beware ref to dead object (we may be called from obj's finalizer). */ - return proto && proto->map ? proto : NULL; - } - - JS_PUBLIC_API(JSBool) - JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto) - { - CHECK_REQUEST(cx); -+ JS_ASSERT(obj != proto); - #ifdef DEBUG - /* - * FIXME: bug 408416. The cycle-detection required for script-writeable - * __proto__ lives in js_SetProtoOrParent over in jsobj.c, also known as - * js_ObjectOps.setProto. This hook must detect cycles, to prevent scripts - * from ilooping SpiderMonkey trivially. But the overhead of detecting - * cycles is high enough, and the threat from JS-API-calling C++ code is - * low enough, that it's not worth burdening the non-DEBUG callers. Same -@@ -2951,16 +2952,17 @@ JS_GetParent(JSContext *cx, JSObject *ob - /* Beware ref to dead object (we may be called from obj's finalizer). */ - return parent && parent->map ? parent : NULL; - } - - JS_PUBLIC_API(JSBool) - JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent) - { - CHECK_REQUEST(cx); -+ JS_ASSERT(obj != parent); - #ifdef DEBUG - /* FIXME: bug 408416, see JS_SetPrototype just above. */ - if (obj->map->ops->setParent) - return obj->map->ops->setParent(cx, obj, JSSLOT_PARENT, parent); - #endif - OBJ_SET_PARENT(cx, obj, parent); - return JS_TRUE; - } diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig index 6149f5f..09327b4 100644 --- a/xulrunner-mozconfig +++ b/xulrunner-mozconfig @@ -15,6 +15,7 @@ ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --disable-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 diff --git a/xulrunner-redhat-default-prefs.js b/xulrunner-redhat-default-prefs.js index 6c75951..b25ecc3 100644 --- a/xulrunner-redhat-default-prefs.js +++ b/xulrunner-redhat-default-prefs.js @@ -6,3 +6,4 @@ pref("general.smoothScroll", true); pref("general.useragent.vendor", "Fedora"); pref("general.useragent.vendorSub", "RPM_VERREL"); pref("intl.locale.matchOS", true); +pref("toolkit.storage.synchronous", 0); diff --git a/xulrunner.spec b/xulrunner.spec index abb65e1..abdf6c6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -2,19 +2,17 @@ %define nss_version 3.11.99.5 %define cairo_version 0.5 -%define version_internal 1.9pre +%define version_internal 1.9 %define mozappdir %{_libdir}/%{name}-%{version_internal} -%define version_pre .beta5 - Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 0.63%{?version_pre}%{?dist} +Release: 1%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: xulrunner-1.9b5-source.tar.bz2 +Source0: xulrunner-1.9-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -23,19 +21,15 @@ Source23: %{name}.1 # build patches Patch1: mozilla-build.patch Patch2: xulrunner-path.patch -Patch3: xulrunner-version.patch +Patch4: mozilla-sqlite.patch +Patch5: mozilla-mochitest.patch # Fedora specific patches Patch10: mozilla-pkgconfig.patch # Upstream patches -Patch20: mozilla-dpi.patch -Patch21: mozilla-wtfbuttons.patch -Patch22: mozilla-keys.patch -Patch23: xulrunner-hang.patch -Patch24: mozilla-resolution.patch -Patch25: mozilla-fsync.patch Patch26: mozilla-ps-pdf-simplify-operators.patch +Patch27: mozilla-ssl-exception.patch # --------------------------------------------------- @@ -62,6 +56,8 @@ BuildRequires: libXrender-devel BuildRequires: hunspell-devel BuildRequires: sqlite-devel >= 3.5 BuildRequires: startup-notification-devel +# For -sqlite.patch +BuildRequires: autoconf213 Requires: mozilla-filesystem Requires: nspr >= %{nspr_version} @@ -99,19 +95,16 @@ are not frozen and APIs can change at any time, so should not be relied on. %prep %setup -q -c cd mozilla -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .ver +%patch1 -p1 -b .build +%patch2 -p1 -b .path +%patch4 -p1 -b .sqlite +autoconf-2.13 +%patch5 -p1 -b .mochitest %patch10 -p1 -b .pk -%patch20 -p1 -b .dpi -%patch21 -p1 -b .wtfbuttons -%patch22 -p1 -b .keys -%patch23 -p1 -b .hang -%patch24 -p1 -b .resolution -%patch25 -p1 -b .fsync %patch26 -p1 -b .ps-pdf-simplify-operators +%patch27 -p1 -b .ssl-exception %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -384,17 +377,20 @@ fi #--------------------------------------------------------------------- %changelog -* Thu May 29 2008 Christopher Aillon 1.0-0.63 +* Tue Jun 17 2008 Christopher Aillon 1.9-1 +- Update to 1.9 final + +* Thu May 29 2008 Christopher Aillon 1.9-0.63 - Simplify PS/PDF operators -* Thu May 22 2008 Christopher Aillon 1.0-0.62 +* Thu May 22 2008 Christopher Aillon 1.9-0.62 - Upstream patch to fsync() less -* Thu May 08 2008 Colin Walters 1.0-0.61 +* Thu May 08 2008 Colin Walters 1.9-0.61 - Ensure we enable startup notification; add BR and modify config (bug #445543) -* Wed Apr 30 2008 Christopher Aillon 1.0-0.60 +* Wed Apr 30 2008 Christopher Aillon 1.9-0.60 - Some files moved to mozilla-filesystem; kill them and add the Req * Mon Apr 28 2008 Christopher Aillon 1.9-0.59 From dfa54b32dad1e191eff18bd9c4ed71cb19111257 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 26 Jun 2008 11:52:57 +0000 Subject: [PATCH 23/39] Updated package config files - embedding files have to refer to nss/nspr --- mozilla-pkgconfig.patch | 118 +++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 56 deletions(-) diff --git a/mozilla-pkgconfig.patch b/mozilla-pkgconfig.patch index 1bc3e1d..57b57e8 100644 --- a/mozilla-pkgconfig.patch +++ b/mozilla-pkgconfig.patch @@ -1,6 +1,6 @@ diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in ---- mozilla/config/autoconf.mk.in.pk 2008-01-22 03:50:04.000000000 +0100 -+++ mozilla/config/autoconf.mk.in 2008-01-29 17:18:01.000000000 +0100 +--- mozilla/config/autoconf.mk.in.pk 2008-05-05 23:08:14.000000000 +0200 ++++ mozilla/config/autoconf.mk.in 2008-06-26 13:38:41.000000000 +0200 @@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -19,19 +19,46 @@ diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2008-01-10 10:17:49.000000000 +0100 -+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-01-29 17:19:25.000000000 +0100 -@@ -1,5 +1,6 @@ +diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in +--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 ++++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-06-26 13:41:12.000000000 +0200 +@@ -1,7 +1,7 @@ prefix=%prefix% sdkdir=%sdkdir% -+libdir=%libdir% includedir=%includedir% +-idldir=%idldir% ++idldir=%idldir%/stable + includetype=stable - Name: mozilla-gtkembedmoz + # Note: the default pkg-config cflags will only list include directories +@@ -11,5 +11,6 @@ includetype=stable + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% +-Libs: -L${sdkdir}/lib -lxpcomglue ++Requires: %NSPR_NAME% >= %NSPR_VERSION% ++Libs: -L${sdkdir}/sdk/lib -lxpcomglue + Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar +diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in +--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100 ++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-06-26 13:41:25.000000000 +0200 +@@ -1,11 +1,12 @@ + prefix=%prefix% + sdkdir=%sdkdir% + includedir=%includedir% +-idldir=%idldir% ++idldir=%idldir%/unstable + includetype=unstable + + Name: libxul-embedding-unstable + Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue + Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in --- mozilla/xulrunner/installer/libxul.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 -+++ mozilla/xulrunner/installer/libxul.pc.in 2008-01-29 17:18:01.000000000 +0100 ++++ mozilla/xulrunner/installer/libxul.pc.in 2008-06-26 13:38:41.000000000 +0200 @@ -1,7 +1,8 @@ prefix=%prefix% sdkdir=%sdkdir% @@ -50,20 +77,9 @@ diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer +Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom Cflags: -I${includedir}/${includetype} -fshort-wchar \ No newline at end of file -diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in ---- mozilla/xulrunner/installer/Makefile.in.pk 2008-01-29 17:18:01.000000000 +0100 -+++ mozilla/xulrunner/installer/Makefile.in 2008-01-29 17:18:01.000000000 +0100 -@@ -117,6 +117,7 @@ endif - -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|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in --- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100 -+++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-01-29 17:18:01.000000000 +0100 ++++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-06-26 13:38:41.000000000 +0200 @@ -1,7 +1,8 @@ prefix=%prefix% sdkdir=%sdkdir% @@ -74,40 +90,40 @@ diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/ includetype=unstable Name: libxul -diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in ---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk 2008-01-05 07:50:34.000000000 +0100 -+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-01-29 17:18:01.000000000 +0100 -@@ -1,7 +1,7 @@ +diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in +--- mozilla/xulrunner/installer/Makefile.in.pk 2008-04-10 16:50:48.000000000 +0200 ++++ mozilla/xulrunner/installer/Makefile.in 2008-06-26 13:38:41.000000000 +0200 +@@ -116,6 +116,7 @@ endif + -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|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ +diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in +--- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2008-01-10 10:17:49.000000000 +0100 ++++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% ++libdir=%libdir% includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/unstable - includetype=unstable - Name: libxul-embedding-unstable -diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in ---- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 -+++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-01-29 17:18:01.000000000 +0100 -@@ -1,7 +1,7 @@ + Name: mozilla-gtkembedmoz +diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in +--- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2008-01-10 10:17:49.000000000 +0100 ++++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-06-26 13:38:41.000000000 +0200 +@@ -1,5 +1,6 @@ prefix=%prefix% sdkdir=%sdkdir% ++libdir=%libdir% includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/stable - includetype=stable - # Note: the default pkg-config cflags will only list include directories -@@ -11,5 +11,5 @@ includetype=stable - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% --Libs: -L${sdkdir}/lib -lxpcomglue -+Libs: -L${sdkdir}/sdk/lib -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar + Name: mozilla-gtkembedmoz diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in --- mozilla/xulrunner/installer/mozilla-js.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 -+++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-01-29 17:18:01.000000000 +0100 ++++ mozilla/xulrunner/installer/mozilla-js.pc.in 2008-06-26 13:38:41.000000000 +0200 @@ -6,5 +6,5 @@ Name: JavaScript Description: The Mozilla JavaScript Library Version: %MOZILLA_VERSION% @@ -116,19 +132,9 @@ diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/insta -Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE +Libs: -L${sdkdir}/sdk/lib -lmozjs +Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE -diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2008-01-10 10:17:49.000000000 +0100 -+++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-01-29 17:19:04.000000000 +0100 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in --- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk 2007-08-03 16:46:28.000000000 +0200 -+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-01-29 17:18:01.000000000 +0100 ++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2008-06-26 13:38:41.000000000 +0200 @@ -6,4 +6,4 @@ Name: Mozilla Plug-In API Description: Mozilla Plug-In API Version: %MOZILLA_VERSION% From 85c414f669452ba55cdac862b6141e9c5df06e4f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 30 Jun 2008 16:57:27 +0000 Subject: [PATCH 24/39] handle sparc multilib --- xulrunner.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index abdf6c6..8f217b6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -8,7 +8,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9 -Release: 1%{?dist} +Release: 1%{?dist}.1 URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -185,7 +185,7 @@ cd - $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME} # Fix multilib devel conflicts... -%ifarch x86_64 ia64 s390x ppc64 +%ifarch x86_64 ia64 s390x ppc64 sparc64 %define mozbits 64 %else %define mozbits 32 @@ -196,7 +196,7 @@ genheader=$* mv ${genheader}.h ${genheader}%{mozbits}.h cat > ${genheader}.h << EOF // This file exists to fix multilib conflicts -#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) +#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) ||defined(__sparc__) && defined(__arch64__) #include "${genheader}64.h" #else #include "${genheader}32.h" @@ -254,7 +254,7 @@ done popd # GRE stuff -%ifarch x86_64 ia64 ppc64 s390x +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define gre_conf_file gre64.conf %else %define gre_conf_file gre.conf @@ -266,7 +266,7 @@ MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.` chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file} # Library path -%ifarch x86_64 ia64 ppc64 s390x +%ifarch x86_64 ia64 ppc64 s390x sparc64 %define ld_conf_file xulrunner-64.conf %else %define ld_conf_file xulrunner-32.conf @@ -377,6 +377,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Jun 30 2008 Dennis Gilmore 1.9-1.1 +- handle sparc arches + * Tue Jun 17 2008 Christopher Aillon 1.9-1 - Update to 1.9 final From 097436031a72a144a493ca76dc25dd6ea698b516 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 16 Jul 2008 19:18:54 +0000 Subject: [PATCH 25/39] - Update to 1.9.0.1 --- .cvsignore | 2 +- sources | 2 +- xulrunner-version.patch | 2 +- xulrunner.spec | 13 +++++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index bd67bfe..c960734 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9-source.tar.bz2 +xulrunner-1.9.0.1-source.tar.bz2 diff --git a/sources b/sources index f0cb27c..5d22025 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b514375509fd439e44def1e4a7873af4 xulrunner-1.9-source.tar.bz2 +a14e4ac2e9fc5b29f80995c97a1c9748 xulrunner-1.9.0.1-source.tar.bz2 diff --git a/xulrunner-version.patch b/xulrunner-version.patch index 9b6b5d1..c2ec610 100644 --- a/xulrunner-version.patch +++ b/xulrunner-version.patch @@ -6,7 +6,7 @@ diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="1.9pre" ++MOZ_APP_VERSION="1.9" + NO_PKG_FILES = \ xulrunner-config \ diff --git a/xulrunner.spec b/xulrunner.spec index 8f217b6..bdd6d63 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,12 +7,12 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9 -Release: 1%{?dist}.1 +Version: 1.9.0.1 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/xulrunner/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet -Source0: xulrunner-1.9-source.tar.bz2 +Source0: xulrunner-%{version}-source.tar.bz2 Source10: %{name}-mozconfig Source12: %{name}-redhat-default-prefs.js Source21: %{name}.sh.in @@ -21,6 +21,7 @@ Source23: %{name}.1 # build patches Patch1: mozilla-build.patch Patch2: xulrunner-path.patch +Patch3: xulrunner-version.patch Patch4: mozilla-sqlite.patch Patch5: mozilla-mochitest.patch @@ -97,6 +98,7 @@ are not frozen and APIs can change at any time, so should not be relied on. cd mozilla %patch1 -p1 -b .build %patch2 -p1 -b .path +%patch3 -p1 -b .version %patch4 -p1 -b .sqlite autoconf-2.13 %patch5 -p1 -b .mochitest @@ -104,7 +106,7 @@ autoconf-2.13 %patch10 -p1 -b .pk %patch26 -p1 -b .ps-pdf-simplify-operators -%patch27 -p1 -b .ssl-exception +#%patch27 -p1 -b .ssl-exception %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -377,6 +379,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 +- Update to 1.9.0.1 + * Mon Jun 30 2008 Dennis Gilmore 1.9-1.1 - handle sparc arches From ab23d282f73625629c9a3d32774ca48c0f7f2681 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 12 Sep 2008 13:03:25 +0000 Subject: [PATCH 26/39] fixed 430814 - broken URL in xulrunner package description --- xulrunner.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xulrunner.spec b/xulrunner.spec index bdd6d63..8bb395d 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -9,7 +9,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.0.1 Release: 1%{?dist} -URL: http://www.mozilla.org/projects/xulrunner/ +URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: xulrunner-%{version}-source.tar.bz2 From 1e5a5a7e476641902dee81257af381b662ce9424 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 23 Sep 2008 22:01:08 +0000 Subject: [PATCH 27/39] - Update to 1.9.0.2 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c960734..91e0613 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.1-source.tar.bz2 +xulrunner-1.9.0.2-source.tar.bz2 diff --git a/sources b/sources index 5d22025..fe5b179 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a14e4ac2e9fc5b29f80995c97a1c9748 xulrunner-1.9.0.1-source.tar.bz2 +0a6c68a5ab5b065fef221b586b8a3b8a xulrunner-1.9.0.2-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 8bb395d..6a3a8e9 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.1 +Version: 1.9.0.2 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -379,6 +379,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Sep 23 2008 Christopher Aillon 1.9.0.2-1 +- Update to 1.9.0.2 + * Wed Jul 16 2008 Christopher Aillon 1.9.0.1-1 - Update to 1.9.0.1 From 995b67f469fae1cf40f248341819acd97a7f49cd Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 23 Sep 2008 22:16:05 +0000 Subject: [PATCH 28/39] also update the nss/nspr requirements --- xulrunner.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xulrunner.spec b/xulrunner.spec index 6a3a8e9..c44769f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,5 +1,5 @@ -%define nspr_version 4.6.99 -%define nss_version 3.11.99.5 +%define nspr_version 4.7.1 +%define nss_version 3.12.1.1 %define cairo_version 0.5 %define version_internal 1.9 From 0eeb7bfa1c5d4b4d766ad0fb6e75e5d22a385eac Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 12 Nov 2008 22:38:02 +0000 Subject: [PATCH 29/39] - Update to 1.9.0.4 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 91e0613..d9a1307 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.2-source.tar.bz2 +xulrunner-1.9.0.4-source.tar.bz2 diff --git a/sources b/sources index fe5b179..8999bba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a6c68a5ab5b065fef221b586b8a3b8a xulrunner-1.9.0.2-source.tar.bz2 +ffbd03ef7a123db250c1775b22685447 xulrunner-1.9.0.4-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index c44769f..1352ac0 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.2 +Version: 1.9.0.4 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -379,6 +379,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Nov 12 2008 Christopher Aillon 1.9.0.4-1 +- Update to 1.9.0.4 + * Tue Sep 23 2008 Christopher Aillon 1.9.0.2-1 - Update to 1.9.0.2 From 42c1d63843e0f39d1dd2cabe64463f1dd00d68a3 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 17 Dec 2008 03:18:39 +0000 Subject: [PATCH 30/39] - Update to 1.9.0.5 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index d9a1307..cb16c9d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.4-source.tar.bz2 +xulrunner-1.9.0.5-source.tar.bz2 diff --git a/sources b/sources index 8999bba..9c002cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffbd03ef7a123db250c1775b22685447 xulrunner-1.9.0.4-source.tar.bz2 +78e988fca3f6b9a23db1bea638f1f5be xulrunner-1.9.0.5-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 1352ac0..b323dca 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.4 +Version: 1.9.0.5 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -379,6 +379,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Dec 16 2008 Christopher Aillon 1.9.0.5-1 +- Update to 1.9.0.5 + * Wed Nov 12 2008 Christopher Aillon 1.9.0.4-1 - Update to 1.9.0.4 From cc3a1b573100ee290d6d959caf3bf464770cac90 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Wed, 4 Feb 2009 15:41:12 +0000 Subject: [PATCH 31/39] - Update to 1.9.0.6 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index cb16c9d..04ba33a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.5-source.tar.bz2 +xulrunner-1.9.0.6-source.tar.bz2 diff --git a/sources b/sources index 9c002cc..036b61b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78e988fca3f6b9a23db1bea638f1f5be xulrunner-1.9.0.5-source.tar.bz2 +1b6063d29fe9785b929a36f249866360 xulrunner-1.9.0.6-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index b323dca..30be37f 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.5 +Version: 1.9.0.6 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -379,6 +379,9 @@ fi #--------------------------------------------------------------------- %changelog +* Wed Feb 4 2009 Christopher Aillon 1.9.0.6-1 +- Update to 1.9.0.6 + * Tue Dec 16 2008 Christopher Aillon 1.9.0.5-1 - Update to 1.9.0.5 From 9c31508bbca7d9de04bcfd47046507ec645382fb Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 26 Feb 2009 14:50:16 +0000 Subject: [PATCH 32/39] Resolves: 453980 --- mozilla-about-firefox-version.patch | 12 ++++++++++++ xulrunner.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 mozilla-about-firefox-version.patch diff --git a/mozilla-about-firefox-version.patch b/mozilla-about-firefox-version.patch new file mode 100644 index 0000000..e89ba29 --- /dev/null +++ b/mozilla-about-firefox-version.patch @@ -0,0 +1,12 @@ +diff -up mozilla/toolkit/content/Makefile.in.fix mozilla/toolkit/content/Makefile.in +--- mozilla/toolkit/content/Makefile.in.fix 2008-03-13 20:25:52.000000000 +0100 ++++ mozilla/toolkit/content/Makefile.in 2008-10-24 16:17:43.000000000 +0200 +@@ -45,7 +45,7 @@ CHROME_DEPS = buildconfig.html + + include $(DEPTH)/config/autoconf.mk + +-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) ++DEFINES += -DMOZ_APP_VERSION=$(FIREFOX_VERSION) + + ifdef ENABLE_TESTS + DIRS += tests diff --git a/xulrunner.spec b/xulrunner.spec index 30be37f..0977840 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -8,7 +8,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner Version: 1.9.0.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -24,6 +24,7 @@ Patch2: xulrunner-path.patch Patch3: xulrunner-version.patch Patch4: mozilla-sqlite.patch Patch5: mozilla-mochitest.patch +Patch6: mozilla-about-firefox-version.patch # Fedora specific patches Patch10: mozilla-pkgconfig.patch @@ -102,6 +103,7 @@ cd mozilla %patch4 -p1 -b .sqlite autoconf-2.13 %patch5 -p1 -b .mochitest +%patch6 -p1 -b .about-firefox-version %patch10 -p1 -b .pk @@ -379,6 +381,10 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Feb 26 2009 Jan Horak - 1.9.0.6-2 +- Fixed wrong version of Firefox when loading 'about:' as location + (#453980). + * Wed Feb 4 2009 Christopher Aillon 1.9.0.6-1 - Update to 1.9.0.6 From 9bad3b0cefcdd455b5c864de7f118607cd881143 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Thu, 5 Mar 2009 08:45:24 +0000 Subject: [PATCH 33/39] Update to 1.9.0.7 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 04ba33a..bad8626 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.6-source.tar.bz2 +xulrunner-1.9.0.7-source.tar.bz2 diff --git a/sources b/sources index 036b61b..abaf05c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b6063d29fe9785b929a36f249866360 xulrunner-1.9.0.6-source.tar.bz2 +9875c9237b532009df8e91c3785539a3 xulrunner-1.9.0.7-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 0977840..eeb6ee6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,8 +7,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.6 -Release: 2%{?dist} +Version: 1.9.0.7 +Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -381,6 +381,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Mar 3 2009 Jan Horak - 1.9.0.7-1 +- Update to 1.9.0.7 + * Thu Feb 26 2009 Jan Horak - 1.9.0.6-2 - Fixed wrong version of Firefox when loading 'about:' as location (#453980). From 2fc8949f1be9f10f0e8192b74e580cd9a86ed6cb Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 27 Mar 2009 17:46:34 +0000 Subject: [PATCH 34/39] - Update to 1.9.0.8 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bad8626..214c8b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.7-source.tar.bz2 +xulrunner-1.9.0.8-source.tar.bz2 diff --git a/sources b/sources index abaf05c..cb495a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9875c9237b532009df8e91c3785539a3 xulrunner-1.9.0.7-source.tar.bz2 +5fb6c6f3e973516df83a573348377a2f xulrunner-1.9.0.8-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index eeb6ee6..dad60d6 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.7 +Version: 1.9.0.8 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -381,6 +381,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Mar 27 2009 Christopher Aillon - 1.9.0.8-1 +- Update to 1.9.0.8 + * Tue Mar 3 2009 Jan Horak - 1.9.0.7-1 - Update to 1.9.0.7 From 748bb214c2162c13e1b990b80f60f7c8f082eecc Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Tue, 21 Apr 2009 19:16:31 +0000 Subject: [PATCH 35/39] - Update to 1.9.0.9 --- .cvsignore | 2 +- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 214c8b0..0b09c88 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xulrunner-1.9.0.8-source.tar.bz2 +xulrunner-1.9.0.9-source.tar.bz2 diff --git a/sources b/sources index cb495a8..2107be8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5fb6c6f3e973516df83a573348377a2f xulrunner-1.9.0.8-source.tar.bz2 +f80b085699db8201e5db6b30fc63c60d xulrunner-1.9.0.9-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index dad60d6..648da81 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.8 +Version: 1.9.0.9 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -381,6 +381,9 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Apr 21 2009 Christopher Aillon - 1.9.0.9-1 +- Update to 1.9.0.9 + * Fri Mar 27 2009 Christopher Aillon - 1.9.0.8-1 - Update to 1.9.0.8 From d4d57b67b9b78c0c32a2f356fdb2da99c5218744 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mon, 27 Apr 2009 12:10:24 +0000 Subject: [PATCH 36/39] Update to 1.9.0.10 --- .cvsignore | 1 + sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0b09c88..00b1db3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xulrunner-1.9.0.9-source.tar.bz2 +xulrunner-1.9.0.10-source.tar.bz2 diff --git a/sources b/sources index 2107be8..f1aa38d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f80b085699db8201e5db6b30fc63c60d xulrunner-1.9.0.9-source.tar.bz2 +1012e835a5c130d18479bccdee240640 xulrunner-1.9.0.10-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index 648da81..a437618 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.9 +Version: 1.9.0.10 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -381,6 +381,9 @@ fi #--------------------------------------------------------------------- %changelog +* Mon Apr 27 2009 Jan Horak - 1.9.0.10-1 +- Update to 1.9.0.10 + * Tue Apr 21 2009 Christopher Aillon - 1.9.0.9-1 - Update to 1.9.0.9 From 1a486f2181dc6eadef537ad3263d2298025ca93a Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 11 Jun 2009 22:16:34 +0000 Subject: [PATCH 37/39] - Update to 1.9.0.11 --- .cvsignore | 3 +-- sources | 2 +- xulrunner.spec | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 00b1db3..e31a5ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -xulrunner-1.9.0.9-source.tar.bz2 -xulrunner-1.9.0.10-source.tar.bz2 +xulrunner-1.9.0.11-source.tar.bz2 diff --git a/sources b/sources index f1aa38d..9cdd238 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1012e835a5c130d18479bccdee240640 xulrunner-1.9.0.10-source.tar.bz2 +b509f7c05e9566ed290e2c098316c7c3 xulrunner-1.9.0.11-source.tar.bz2 diff --git a/xulrunner.spec b/xulrunner.spec index a437618..e61ba1e 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -7,7 +7,7 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 1.9.0.10 +Version: 1.9.0.11 Release: 1%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -381,6 +381,9 @@ fi #--------------------------------------------------------------------- %changelog +* Thu Jun 11 2009 Christopher Aillon - 1.9.0.11-1 +- Update to 1.9.0.11 + * Mon Apr 27 2009 Jan Horak - 1.9.0.10-1 - Update to 1.9.0.10 From a689797266d2b7bfc8e56d70fcc01546cb6234a4 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:39 +0000 Subject: [PATCH 38/39] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e25ce9e..513ebfd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xulrunner -# $Id$ +# $Id: Makefile,v 1.1 2007/06/22 02:18:59 kevin Exp $ NAME := xulrunner SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3b3519488afc1f634641dcc8b69c426975c610b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:15:59 +0000 Subject: [PATCH 39/39] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 513ebfd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xulrunner -# $Id: Makefile,v 1.1 2007/06/22 02:18:59 kevin Exp $ -NAME := xulrunner -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9