dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-xulrunner-1.9.1b3-source.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+xulrunner-1.9.1.9.source.tar.bz2
+xulrunner-1.9.1.10.source.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xulrunner
-# $Id$
-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
-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)

mfsa-2009-12.patch

@@ -1,57 +0,0 @@
-# HG changeset patch
-# User Blake Kaplan <mrbkap@gmail.com>
-# Date 1238011664 25200
-# Node ID 167d03699cdb98daa726b9024dd80ac3d9e80e06
-# Parent c8c6ed1b96a72df7d47fb0ce014b18ec3f71abc7
-Bug 485217 - Pop the eval context before returning. r+sr=peterv
-
---- a/content/xslt/src/xslt/txKeyFunctionCall.cpp	Wed Mar 25 22:10:03 2009 +0200
-+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp	Wed Mar 25 13:07:44 2009 -0700
-@@ -395,9 +395,9 @@ nsresult txXSLKey::testNode(const txXPat
-             nsRefPtr<txAExprResult> exprResult;
-             rv = mKeys[currKey].useExpr->evaluate(&evalContext,
-                                                   getter_AddRefs(exprResult));
--            NS_ENSURE_SUCCESS(rv, rv);
- 
-             aEs.popEvalContext();
-+            NS_ENSURE_SUCCESS(rv, rv);
- 
-             if (exprResult->getResultType() == txAExprResult::NODESET) {
-                 txNodeSet* res = static_cast<txNodeSet*>
-
-# HG changeset patch
-# User Blake Kaplan <mrbkap@gmail.com>
-# Date 1238052189 25200
-# Node ID 4552d789ad8ff607e2596ad3107d33a3d0e92654
-# Parent f087a48da189d0d6404040bc90a97f2624ab544f
-Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking (a=ss for checkin into a CLOSED TREE).
-
---- a/content/xslt/src/xslt/txKeyFunctionCall.cpp	Wed Mar 25 16:59:14 2009 -0500
-+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp	Thu Mar 26 00:23:09 2009 -0700
-@@ -388,16 +388,19 @@ nsresult txXSLKey::testNode(const txXPat
-     PRUint32 currKey, numKeys = mKeys.Length();
-     for (currKey = 0; currKey < numKeys; ++currKey) {
-         if (mKeys[currKey].matchPattern->matches(aNode, &aEs)) {
--            txSingleNodeContext evalContext(aNode, &aEs);
--            nsresult rv = aEs.pushEvalContext(&evalContext);
-+            txSingleNodeContext *evalContext =
-+                new txSingleNodeContext(aNode, &aEs);
-+            NS_ENSURE_TRUE(evalContext, NS_ERROR_OUT_OF_MEMORY);
-+
-+            nsresult rv = aEs.pushEvalContext(evalContext);
-             NS_ENSURE_SUCCESS(rv, rv);
- 
-             nsRefPtr<txAExprResult> exprResult;
--            rv = mKeys[currKey].useExpr->evaluate(&evalContext,
-+            rv = mKeys[currKey].useExpr->evaluate(evalContext,
-                                                   getter_AddRefs(exprResult));
-+            NS_ENSURE_SUCCESS(rv, rv);
- 
--            aEs.popEvalContext();
--            NS_ENSURE_SUCCESS(rv, rv);
-+            delete aEs.popEvalContext();
- 
-             if (exprResult->getResultType() == txAExprResult::NODESET) {
-                 txNodeSet* res = static_cast<txNodeSet*>
-
-

mfsa-2009-13.patch

@@ -1,20 +0,0 @@
-# HG changeset patch
-# User Olli Pettay <Olli.Pettay@helsinki.fi>
-# Date 1237909358 -7200
-# Node ID 60caf43ff9c21e7b4d6b07e3d2d8413196a86b25
-# Parent 726d6e0d61def97cd6f9d72949ab283b83902d53
-Bug 484320, r=dveditz, sr=mrbkap, a=blocking1.9.1
-
---- a/layout/xul/base/src/tree/src/nsTreeSelection.cpp	Wed Mar 18 11:00:20 2009 +0000
-+++ b/layout/xul/base/src/tree/src/nsTreeSelection.cpp	Tue Mar 24 17:42:38 2009 +0200
-@@ -268,6 +268,8 @@ nsTreeSelection::~nsTreeSelection()
- nsTreeSelection::~nsTreeSelection()
- {
-   delete mFirstRange;
-+  if (mSelectTimer)
-+    mSelectTimer->Cancel();
- }
- 
- // QueryInterface implementation for nsBoxObject
-
-

mozilla-191-pkgconfig.patch

@@ -138,5 +138,5 @@ diff -r f1af606531f5 xulrunner/installer/mozilla-plugin.pc.in
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
--Cflags: -I${includedir}/stable
-+Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin
+-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
++Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -I${includedir}/java -I${includedir}/plugin

mozilla-about-firefox-version.patch

@@ -0,0 +1,12 @@
+diff -up mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version mozilla-1.9.1/toolkit/content/Makefile.in
+--- mozilla-1.9.1/toolkit/content/Makefile.in.about-firefox-version	2009-06-29 18:15:23.000000000 +0200
++++ mozilla-1.9.1/toolkit/content/Makefile.in	2009-07-07 13:43:54.000000000 +0200
+@@ -46,7 +46,7 @@ CHROME_DEPS = buildconfig.html
+ include $(DEPTH)/config/autoconf.mk
+ 
+ DEFINES += \
+-  -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
++  -DMOZ_APP_VERSION=$(FIREFOX_VERSION) \
+   -Dtarget="$(target)" \
+   -Dac_configure_args="$(ac_configure_args)" \
+   -DCC="$(CC)" \

sources

@@ -1 +1 @@
-61cd1a7fc587f6d2a33c564033198e2c  xulrunner-1.9.1b3-source.tar.bz2
+38527ad16be09eb932b659df9ab3fb82  xulrunner-1.9.1.10.source.tar.bz2

xulrunner-elif.patch

@@ -1,12 +0,0 @@
-diff -up xulrunner-1.9.1/mozilla-central/toolkit/xre/nsAppRunner.cpp.old xulrunner-1.9.1/mozilla-central/toolkit/xre/nsAppRunner.cpp
---- mozilla-central/toolkit/xre/nsAppRunner.cpp.old	2008-12-10 20:07:01.000000000 +0100
-+++ mozilla-central/toolkit/xre/nsAppRunner.cpp	2009-02-27 17:17:59.000000000 +0100
-@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
-   if (NS_FAILED(rv))
-     return rv;
- 
--#elif
-+#else
- #error Oops, you need platform-specific code here
- #endif
- 

xulrunner-mozconfig

@@ -13,8 +13,8 @@ ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
-#ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-hunspell
+#Temporary disabled: ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-strip

xulrunner-pango.patch

@@ -1,30 +0,0 @@
-diff -up xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old xulrunner-1.9.1/mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp
---- mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp.old	2009-02-27 16:19:07.000000000 +0100
-+++ mozilla-central/gfx/thebes/src/gfxPangoFonts.cpp	2009-02-27 16:37:30.000000000 +0100
-@@ -1299,12 +1299,11 @@ gfx_pango_font_map_context_substitute(Pa
- 
- static PangoFcFont *
- gfx_pango_font_map_create_font(PangoFcFontMap *fontmap,
--                               PangoContext *context,
--                               const PangoFontDescription *desc,
--                               FcPattern *pattern)
-+                               PangoFcFontKey *fontkey)
- {
-+    const FcPattern *p_pattern = pango_fc_font_key_get_pattern(fontkey);
-     return PANGO_FC_FONT(g_object_new(GFX_TYPE_PANGO_FC_FONT,
--                                      "pattern", pattern, NULL));
-+                                      "pattern", p_pattern, NULL));
- }
- 
- static void
-@@ -1324,9 +1323,8 @@ gfx_pango_font_map_class_init(gfxPangoFo
-     // context_key_* virtual functions are only necessary if we want to
-     // dynamically respond to changes in the screen cairo_font_options_t.
- 
--    // context_substitute and get_font are not likely to be used but
-+    // get_font is not likely to be used but
-     //   implemented because the class makes them available.
--    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
-     fcfontmap_class->create_font = gfx_pango_font_map_create_font;
- }
- 

xulrunner.spec

@@ -1,9 +1,9 @@
-%define nspr_version 4.7.1
+%define nspr_version 4.8
 %define nss_version 3.12.1.1
 %define cairo_version 1.6.0
 %define lcms_version 1.17
 %define freetype_version 2.1.9
-%define sqlite_version 3.6.7
+%define sqlite_version 3.6.16
 %define tarballdir mozilla-1.9.1
 
 %define version_internal  1.9.1
@@ -11,12 +11,12 @@
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9.1
-Release:        0.11.beta3%{?dist}
+Version:        1.9.1.10
+Release:        1%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}b3-source.tar.bz2
+Source0:        xulrunner-%{version}.source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -27,16 +27,13 @@ Patch0:         xulrunner-version.patch
 Patch1:         mozilla-build.patch
 Patch2:         mozilla-191-path.patch
 Patch3:         mozilla-jemalloc.patch
-Patch4:         xulrunner-pango.patch
-Patch5:         xulrunner-elif.patch
+Patch4:         mozilla-about-firefox-version.patch
 
 # Fedora specific patches
 Patch10:        mozilla-191-pkgconfig.patch
 
 # Upstream patches
 Patch100:       mozilla-ps-pdf-simplify-operators.patch
-Patch101:       mfsa-2009-12.patch
-Patch102:       mfsa-2009-13.patch
 
 # ---------------------------------------------------
 
@@ -61,7 +58,7 @@ BuildRequires:  freetype-devel >= %{freetype_version}
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  hunspell-devel
-BuildRequires:  sqlite-devel >= %{sqlite_version}
+#sqlite >= 3.6.16 still missing in F11: BuildRequires:  sqlite-devel >= %{sqlite_version} 
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 
@@ -100,7 +97,7 @@ Requires: freetype-devel >= %{freetype_version}
 Requires: libXt-devel
 Requires: libXrender-devel
 Requires: hunspell-devel
-Requires: sqlite-devel >= ${sqlite_version}
+#Temporary removed: Requires: sqlite-devel >= ${sqlite_version}
 Requires: startup-notification-devel
 Requires: alsa-lib-devel
 
@@ -151,15 +148,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
 %patch1  -p1 -b .build
 %patch2  -p1 -b .path
 %patch3  -p1 -b .jemalloc
-%patch4  -p1 -b .pango
-%patch5  -p1 -b .elif
+%patch4  -p1 -b .about-firefox-version
 
 %patch10 -p1 -b .pk
 
 %patch100 -p1 -b .ps-pdf-simplify-operators
 
-%patch101 -p1 -b .mfsa-2009-12
-%patch102 -p1 -b .mfsa-2009-13
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -283,6 +277,10 @@ pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable
 install_file "jsautocfg"
 popd
 
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/js
+install_file "js-config"
+popd
+
 %{__install} -p -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
@@ -409,6 +407,8 @@ fi
 # XXX See if these are needed still
 %{mozappdir}/updater*
 
+%exclude %{mozappdir}/update.locale
+
 %files devel
 %defattr(-,root,root,-)
 %dir %{_datadir}/idl/%{name}*%{version_internal}
@@ -452,6 +452,51 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jun 22 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.10-1
+- Update to 1.9.1.10
+
+* Tue Mar 30 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.9-1
+- Update to 1.9.1.9
+
+* Tue Feb 16 2010 Jan Horak <jhorak@redhat.com> - 1.9.1.8-1
+- Update to 1.9.1.8
+
+* Wed Dec 16 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.6-1
+- Update to 1.9.1.6
+
+* Thu Nov  5 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.5-1
+- Update to 1.9.1.5
+
+* Mon Oct 26 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.4-1
+- Update to 1.9.1.4
+
+* Mon Sep  7 2009 Jan Horak <jhorak@redhat.com> - 1.9.1.3-1
+- Update to 1.9.1.3
+
+* Mon Aug 3 2009 Martin Stransky <stransky@redhat.com> 1.9.1.2-1
+- Update to 1.9.1.2
+
+* Fri Jul 17 2009 Martin Stransky <stransky@redhat.com> 1.9.1.1-1
+- Update to 1.9.1.1
+
+* Thu Jul 16 2009 Christopher Aillon <caillon@redhat.com> - 1.9.1-5
+- Fix for milw0rm 9137
+
+* Tue Jul 14 2009 Jan Horak <jhorak@redhat.com> - 1.9.1-4
+- Fixed multilib issues
+
+* Tue Jul  7 2009 Jan Horak <jhorak@redhat.com> - 1.9.1-3
+- Fixed wrong version of Firefox when loading 'about:' as location
+
+* Tue Jun 30 2009 Yanko Kaneti <yaneti@declera.com> - 1.9.1-2
+- Build using system hunspell
+
+* Tue Jun 30 2009 Christopher Aillon <caillon@redhat.com> 1.9.1-1
+- Update to 1.9.1 final release
+
+* Mon Apr 27 2009 Christopher Aillon <caillon@redhat.com> 1.9.1-0.20
+- 1.9.1 beta 4
+
 * Fri Mar 27 2009 Christopher Aillon <caillon@redhat.com> 1.9.1-0.11
 - Add patches for MFSA-2009-12, MFSA-2009-13