rpms/xulrunner/devel mozilla-mochitest.patch, NONE, 1.1 mozilla-ps-pdf-simplify-operators.patch, NONE, 1.1 mozilla-ssl-exception.patch, NONE, 1.1 .cvsignore, 1.59, 1.60 mozilla-sqlite.patch, 1.4, 1.5 sources, 1.62, 1.63 xulrunner-redhat-default-prefs.js, 1.2, 1.3 xulrunner.spec, 1.127, 1.128 mozilla-fsync.patch, 1.1, NONE xulrunner-version.patch, 1.1, NONE

Christopher Aillon (caillon) fedora-extras-commits at redhat.com
Wed Jun 18 00:50:23 UTC 2008 

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25482

Modified Files:
	.cvsignore mozilla-sqlite.patch sources 
	xulrunner-redhat-default-prefs.js xulrunner.spec 
Added Files:
	mozilla-mochitest.patch 
	mozilla-ps-pdf-simplify-operators.patch 
	mozilla-ssl-exception.patch 
Removed Files:
	mozilla-fsync.patch xulrunner-version.patch 
Log Message:
* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 1.9-1
- Update to 1.9 final


mozilla-mochitest.patch:

--- NEW FILE mozilla-mochitest.patch ---
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) \


mozilla-ps-pdf-simplify-operators.patch:

--- NEW FILE mozilla-ps-pdf-simplify-operators.patch ---
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<nsIOutputStream> 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<nsIOutputStream> mStream;

mozilla-ssl-exception.patch:

--- NEW FILE mozilla-ssl-exception.patch ---
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()



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- .cvsignore	17 May 2008 03:24:14 -0000	1.59
+++ .cvsignore	18 Jun 2008 00:49:32 -0000	1.60
@@ -1 +1 @@
-mozilla-20080516.tar.bz2
+xulrunner-1.9-source.tar.bz2

mozilla-sqlite.patch:

Index: mozilla-sqlite.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/mozilla-sqlite.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mozilla-sqlite.patch	19 May 2008 17:19:28 -0000	1.4
+++ mozilla-sqlite.patch	18 Jun 2008 00:49:32 -0000	1.5
@@ -12,7 +12,7 @@
      SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
  else
 -    PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
-+    SQLITE_VERSION_NUMBER=3005007
++    SQLITE_VERSION_NUMBER=3005004
 +    AC_MSG_CHECKING(sqlite version >= $SQLITE_VERSION)
 +    AC_TRY_COMPILE([#include <sqlite3.h>], [
 +#                   if SQLITE_VERSION_NUMBER < $SQLITE_VERSION_NUMBER


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	22 May 2008 17:55:01 -0000	1.62
+++ sources	18 Jun 2008 00:49:32 -0000	1.63
@@ -1 +1 @@
-cbe123d9c1e8f26e03965d741980817f  mozilla-20080416.tar.bz2
+b514375509fd439e44def1e4a7873af4  xulrunner-1.9-source.tar.bz2


Index: xulrunner-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner-redhat-default-prefs.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xulrunner-redhat-default-prefs.js	13 Jan 2008 23:57:38 -0000	1.2
+++ xulrunner-redhat-default-prefs.js	18 Jun 2008 00:49:32 -0000	1.3
@@ -6,3 +6,4 @@
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "RPM_VERREL");
 pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- xulrunner.spec	22 May 2008 17:55:01 -0000	1.127
+++ xulrunner.spec	18 Jun 2008 00:49:32 -0000	1.128
@@ -2,48 +2,35 @@
 %define nss_version 3.11.99.5
 %define cairo_version 0.5
 
-%define official_branding 0
-
-%define version_internal  1.9pre
-
-%if ! %{official_branding}
-%define cvsdate 20080416
-%define nightly .cvs%{cvsdate}
-%endif
+%define version_internal  1.9
+%define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.65%{?nightly}%{?dist}
+Release:        1%{?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
-%else
-%define tarball mozilla-%{cvsdate}.tar.bz2
-%endif
-Source0:        %{tarball}
+Source0:        xulrunner-1.9-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
 Source23:       %{name}.1
 
 # build patches
-Patch1:         mozilla-sqlite.patch
-Patch4:         mozilla-build.patch
-Patch5:         xulrunner-path.patch
-Patch6:         xulrunner-version.patch
-
-# customization patches
-
-# local bugfixes
+Patch1:         mozilla-build.patch
+Patch2:         xulrunner-path.patch
+Patch4:         mozilla-sqlite.patch
+Patch5:         mozilla-mochitest.patch
+
+# Fedora specific patches
+Patch10:        mozilla-pkgconfig.patch
+
+# Upstream patches
+Patch26:        mozilla-ps-pdf-simplify-operators.patch
+Patch27:        mozilla-ssl-exception.patch
 
-# font system fixes
-
-# Other
-Patch100:       mozilla-fsync.patch
-Patch107:       mozilla-pkgconfig.patch
 
 # ---------------------------------------------------
 
@@ -67,9 +54,12 @@
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
-BuildRequires:  sqlite-devel >= 3.5.7
+BuildRequires:  sqlite-devel >= 3.5
+BuildRequires:  startup-notification-devel
+# For -sqlite.patch
 BuildRequires:  autoconf213
 
+Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
 Provides:       gecko-libs = %{version}
@@ -80,7 +70,7 @@
 %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}
@@ -105,12 +95,16 @@
 %prep
 %setup -q -c
 cd mozilla
-%patch1   -p1 -b .sqlite
-%patch4   -p1
-%patch5   -p1
-%patch6   -p1 -b .ver
-%patch100 -p1 -b .fsync
-%patch107 -p1 -b .pk
+%patch1  -p1 -b .build
+%patch2  -p1 -b .path
+%patch4  -p1 -b .sqlite
+autoconf-2.13
+%patch5  -p1 -b .mochitest
+
+%patch10 -p1 -b .pk
+
+%patch26 -p1 -b .ps-pdf-simplify-operators
+%patch27 -p1 -b .ssl-exception
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -119,7 +113,6 @@
 
 %build
 cd mozilla
-autoconf-2.13
 
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
@@ -177,22 +170,12 @@
   $RPM_BUILD_ROOT%{_bindir}/%{name}
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
 
-%{__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
 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}
@@ -260,6 +243,9 @@
 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
@@ -325,56 +311,52 @@
 %files
 %defattr(-,root,root,-)
 %{_bindir}/xulrunner
-%{_mandir}/man1/*
-%{_libdir}/mozilla
-%{_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
@@ -382,7 +364,7 @@
 %{_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-*
@@ -395,53 +377,53 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Thu May 22 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.65
-- Revert to 2008-04-16 trunk
-- Use in-tree sqlite for now due to severe performance problems in
-  sqlite 3.5.8
+* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 1.9-1
+- Update to 1.9 final
 
-* Mon May 19 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.64
-- Upstream patch to fsync() less
+* Thu May 29 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
+- Simplify PS/PDF operators
 
-* Thu May 16 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
-- Update to latest trunk (2008-05-16)
-
-* Fri Apr 18 2008 Martin Stransky <stransky at redhat.com> 1.9-0.62
-- Fixed multilib issues, added starting script instead of a symlink
-  to binary (#436393)
+* Thu May 22 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.62
+- Upstream patch to fsync() less
 
-* Wed Apr 16 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.61
-- Update to latest trunk (2008-04-16)
+* Thu May 08 2008 Colin Walters <walters at redhat.com> 1.9-0.61
+- Ensure we enable startup notification; add BR and modify config
+  (bug #445543)
 
-* Mon Apr 14 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.60
-- Update to latest trunk (2008-04-14)
+* Wed Apr 30 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.60
+- Some files moved to mozilla-filesystem; kill them and add the Req
 
-* Tue Apr  8 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.59
-- Update to latest trunk (2008-04-08)
+* Mon Apr 28 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.59
+- Clean up the %%files list and get rid of the executable bit on some files
 
-* Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.58
-- Update to latest trunk (2008-04-07)
+* Sat Apr 26 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.58
+- Fix font scaling
 
-* Sun Apr  6 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.57
-- Update to latest trunk (2008-04-06)
+* Fri Apr 25 2008 Martin Stransky <stransky at redhat.com> 1.9-0.57
+- Enabled phishing protection (#443403)
 
-* Sat Apr  5 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.56
-- Update to latest trunk (2008-04-05)
+* Wed Apr 23 2008 Martin Stransky <stransky at redhat.com> 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  4 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.55
-- Update to latest trunk (2008-04-04)
+* Fri Apr 18 2008 Martin Stransky <stransky at redhat.com> 1.9-0.55
+- Fixed multilib issues, added starting script instead of a symlink
+  to binary (#436393)
 
-* Thu Apr  3 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.54
-- Update to latest trunk (2008-04-03)
+* Sat Apr 12 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.54
+- Add upstream patches for dpi, toolbar buttons, and invalid keys
+- Re-enable system cairo
 
-* Wed Apr  2 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.53
-- Update to latest trunk (2008-04-02)
+* Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.53
+- Spec cleanups
 
-* Tue Apr  1 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.52
-- Update to latest trunk (2008-04-01)
+* Wed Apr  2 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.52
+- Beta 5
 
 * Mon Mar 31 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.51
-- Update to latest trunk (2008-03-31)
+- Beta 5 RC2
 
 * Thu Mar 27 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.50
 - Update to latest trunk (2008-03-27)


--- mozilla-fsync.patch DELETED ---


--- xulrunner-version.patch DELETED ---

More information about the fedora-extras-commits mailing list