rpms/xulrunner/OLPC-2 .cvsignore, 1.10, 1.11 sources, 1.12, 1.13 xulrunner-1.9a5pre-build.patch, 1.3, 1.4 xulrunner-1.9a6-no-native-theme.patch, 1.9, 1.10 xulrunner.spec, 1.53, 1.54 mozilla-xulrunner-pkgconfig.patch, 1.1, NONE

Wed Jan 30 15:09:52 UTC 2008

Author: mpg

Update of /cvs/pkgs/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9970

Modified Files:
	.cvsignore sources xulrunner-1.9a5pre-build.patch 
	xulrunner-1.9a6-no-native-theme.patch xulrunner.spec 
Removed Files:
	mozilla-xulrunner-pkgconfig.patch 
Log Message:
* Wed Jan 30 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.beta2.16
- Update to latest trunk (2008-01-30)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-2/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11

--- .cvsignore	11 Jan 2008 11:24:21 -0000	1.10
+++ .cvsignore	30 Jan 2008 15:09:06 -0000	1.11
@@ -1 +1 @@
-xulrunner-20071212.tar.bz2
+xulrunner-20080130.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-2/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	11 Jan 2008 11:24:21 -0000	1.12
+++ sources	30 Jan 2008 15:09:06 -0000	1.13
@@ -1 +1 @@
-f5eece8470fee0d0d83d85141ff074e1  xulrunner-20071212.tar.bz2
+d2c1c2f39df3b0b5666a602cf73aee94  xulrunner-20080130.tar.bz2

xulrunner-1.9a5pre-build.patch:

Index: xulrunner-1.9a5pre-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-2/xulrunner-1.9a5pre-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xulrunner-1.9a5pre-build.patch	21 Aug 2007 22:41:06 -0000	1.3
+++ xulrunner-1.9a5pre-build.patch	30 Jan 2008 15:09:06 -0000	1.4
@@ -1,20 +1,3 @@
-Index: extensions/python/dom/src/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/extensions/python/dom/src/Makefile.in,v
-retrieving revision 1.3
-diff -u -r1.3 Makefile.in
---- extensions/python/dom/src/Makefile.in	5 Oct 2006 10:44:02 -0000	1.3
-+++ extensions/python/dom/src/Makefile.in	21 May 2007 00:23:40 -0000
-@@ -22,7 +22,7 @@
- # We always need the Python and pyxpcom includes and libs.
- LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
- EXTRA_LIBS += $(MOZ_PYTHON_LIBS) \
--              $(DIST)/lib/$(LIB_PREFIX)pyxpcom.$(LIB_SUFFIX) \
-+              $(DIST)/lib/$(DLL_PREFIX)pyxpcom$(DLL_SUFFIX) \
-               $(NULL)
- 
- # In the shorter term we need JS too.
-? config/system_wrappers
 Index: config/rules.mk
 ===================================================================
 RCS file: /cvsroot/mozilla/config/rules.mk,v
@@ -63,19 +46,19 @@
  
  clobber::
  	rm -rf $(DIST)/bin/python/xpcom
-Index: extensions/python/dom/test/pyxultest/application.ini
+Index: extensions/python/xpcom/src/PyIInterfaceInfo.cpp
 ===================================================================
-RCS file: /cvsroot/mozilla/extensions/python/dom/test/pyxultest/application.ini,v
-retrieving revision 1.2
-diff -u -r1.2 application.ini
---- extensions/python/dom/test/pyxultest/application.ini	29 Apr 2006 01:56:36 -0000	1.2
-+++ extensions/python/dom/test/pyxultest/application.ini	21 Aug 2007 22:36:44 -0000
-@@ -15,7 +15,7 @@
- 
- ; This field specifies your application's build ID (timestamp).  This field is
- ; required.
--BuildID=@BUILD_ID@
-+BuildID=20070625
- 
- ; This field specifies a compact copyright notice for your application.  This
- ; field is optional.
+RCS file: /cvsroot/mozilla/extensions/python/xpcom/src/PyIInterfaceInfo.cpp,v
+retrieving revision 1.14
+diff -u -r1.14 PyIInterfaceInfo.cpp
+--- extensions/python/xpcom/src/PyIInterfaceInfo.cpp	12 Jan 2008 04:30:44 -0000	1.14
++++ extensions/python/xpcom/src/PyIInterfaceInfo.cpp	30 Jan 2008 13:58:59 -0000
+@@ -88,7 +88,7 @@
+ 	if (pI==NULL)
+ 		return NULL;
+ 
+-	nsIID *iid_ret;
++	const nsIID *iid_ret;
+ 	nsresult r;
+ 	Py_BEGIN_ALLOW_THREADS;
+ 	r = pI->GetIIDShared(&iid_ret);

xulrunner-1.9a6-no-native-theme.patch:

Index: xulrunner-1.9a6-no-native-theme.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-2/xulrunner-1.9a6-no-native-theme.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xulrunner-1.9a6-no-native-theme.patch	11 Jan 2008 11:24:21 -0000	1.9
+++ xulrunner-1.9a6-no-native-theme.patch	30 Jan 2008 15:09:06 -0000	1.10
@@ -1,6 +1,11 @@
---- /tmp/nsNativeThemeGTK.cpp	2008-01-09 10:51:55.000000000 +0100
-+++ widget/src/gtk2/nsNativeThemeGTK.cpp	2008-01-09 11:29:02.000000000 +0100
-@@ -1070,48 +1070,6 @@
+Index: widget/src/gtk2/nsNativeThemeGTK.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/widget/src/gtk2/nsNativeThemeGTK.cpp,v
+retrieving revision 1.141
+diff -u -r1.141 nsNativeThemeGTK.cpp
+--- widget/src/gtk2/nsNativeThemeGTK.cpp	27 Jan 2008 05:11:15 -0000	1.141
++++ widget/src/gtk2/nsNativeThemeGTK.cpp	30 Jan 2008 14:13:05 -0000
+@@ -1181,92 +1181,6 @@
      return PR_FALSE;
  
    switch (aWidgetType) {
@@ -14,7 +19,7 @@
 -  case NS_THEME_TOOLBAR:
 -  case NS_THEME_TOOLBAR_BUTTON:
 -  case NS_THEME_TOOLBAR_DUAL_BUTTON: // so we can override the border with 0
--    // case NS_THEME_TOOLBAR_DUAL_BUTTON_DROPDOWN:
+-  case NS_THEME_TOOLBAR_BUTTON_DROPDOWN:
 -  case NS_THEME_TOOLBAR_SEPARATOR:
 -  case NS_THEME_TOOLBAR_GRIPPER:
 -  case NS_THEME_STATUSBAR:
@@ -37,22 +42,22 @@
 -    case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
 -    case NS_THEME_TAB:
 -    // case NS_THEME_TAB_PANEL:
--    case NS_THEME_TAB_LEFT_EDGE:
--    case NS_THEME_TAB_RIGHT_EDGE:
 -    case NS_THEME_TAB_PANELS:
 -  case NS_THEME_TOOLTIP:
--    // case NS_THEME_SPINNER:
+-  case NS_THEME_SPINNER:
 -  case NS_THEME_SPINNER_UP_BUTTON:
 -  case NS_THEME_SPINNER_DOWN_BUTTON:
+-  case NS_THEME_SPINNER_TEXTFIELD:
 -    // case NS_THEME_SCROLLBAR:  (n/a for gtk)
 -    // case NS_THEME_SCROLLBAR_SMALL: (n/a for gtk)
-   case NS_THEME_SCROLLBAR_BUTTON_UP:
-   case NS_THEME_SCROLLBAR_BUTTON_DOWN:
-   case NS_THEME_SCROLLBAR_BUTTON_LEFT:
-@@ -1120,42 +1078,7 @@
-   case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
-   case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
-   case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
+-  case NS_THEME_SCROLLBAR_BUTTON_UP:
+-  case NS_THEME_SCROLLBAR_BUTTON_DOWN:
+-  case NS_THEME_SCROLLBAR_BUTTON_LEFT:
+-  case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
+-  case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
+-  case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
+-  case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
+-  case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
 -    // case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL:  (n/a for gtk)
 -    // case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL:  (n/a for gtk)
 -  case NS_THEME_TEXTFIELD:
@@ -77,11 +82,12 @@
 -  case NS_THEME_MENUSEPARATOR:
 -  case NS_THEME_CHECKMENUITEM:
 -  case NS_THEME_RADIOMENUITEM:
+-  case NS_THEME_SPLITTER:
 -  case NS_THEME_WINDOW:
 -  case NS_THEME_DIALOG:
 -  case NS_THEME_DROPDOWN:
 -  case NS_THEME_DROPDOWN_TEXT:
-     return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
+-    return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
 -
 -  case NS_THEME_DROPDOWN_BUTTON:
 -    // "Native" dropdown buttons cause padding and margin problems, but only


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- xulrunner.spec	11 Jan 2008 11:39:35 -0000	1.53
+++ xulrunner.spec	30 Jan 2008 15:09:06 -0000	1.54
@@ -11,14 +11,14 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.beta2.1%{?dist}
+Release:        0.beta2.16.nightly20080130%{?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 xulrunner-20071212.tar.bz2
+%define tarball xulrunner-20080130.tar.bz2
 %endif
 Source0:        %{tarball}
 Source10:       %{name}-mozconfig
@@ -47,15 +47,12 @@
 # Other
 Patch105:       mozilla-sqlite-build.patch
 Patch106:       mozilla-gtkmozembed.patch
-Patch107:       mozilla-xulrunner-pkgconfig.patch
 
 # OLPC
 Patch201:       xulrunner-1.9a6-no-native-theme.patch
 Patch202:       xulrunner-1.9a3pre-dpi.patch
 Patch203:       xulrunner-1.9a5pre-build.patch
 Patch204:       xulrunner-1.9a6-xds.patch
-Patch205:	xulrunner-pango-bofa.patch
-Patch206:	xulrunner-perms.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -129,7 +126,7 @@
 #---------------------------------------------------------------------
 
 %prep
-%setup -q -n mozilla
+%setup -q -n xulrunner-20080130
 %patch1   -p1 -b .link-layout
 %patch2   -R -p1 -b .camellia256
 %patch3   -p1
@@ -142,8 +139,6 @@
 %patch202 -p0 -b .dpi
 %patch203 -p0 -b .build
 %patch204 -p0 -b .xds
-%patch205 -p0 -b .pango-bofa
-%patch206 -p0 -b .perms
 
 # Install missing *.pc files
 pushd xulrunner/installer
@@ -160,9 +155,6 @@
 cp mozilla-gtkmozembed.pc.in xulrunner-gtkmozembed.pc.in
 popd
 
-%patch107 -p1 -b .old
-
-
 # For branding specific patches.
 
 %if %{official_branding}
@@ -402,6 +394,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan 30 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.beta2.16
+- Update to latest trunk (2008-01-30)
+
 * Fri Jan 11 2008 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.beta2.1
 - Update to beta2
 - Remove obsolete patches


--- mozilla-xulrunner-pkgconfig.patch DELETED ---


