rpms/xulrunner/OLPC-2 xulrunner-1.9a6-no-native-theme.patch, 1.1, 1.2 xulrunner.spec, 1.17, 1.18
Marco Pesenti Gritti (mpg)
fedora-extras-commits at redhat.com
Sat Jul 21 12:15:24 UTC 2007
Author: mpg
Update of /cvs/extras/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv338
Modified Files:
xulrunner-1.9a6-no-native-theme.patch xulrunner.spec
Log Message:
* Sat Jul 21 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.5.a6
- Better no theme patch to preserve native scrollbars.
xulrunner-1.9a6-no-native-theme.patch:
Index: xulrunner-1.9a6-no-native-theme.patch
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner-1.9a6-no-native-theme.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xulrunner-1.9a6-no-native-theme.patch 18 Jul 2007 13:36:27 -0000 1.1
+++ xulrunner-1.9a6-no-native-theme.patch 21 Jul 2007 12:15:22 -0000 1.2
@@ -1,16 +1,128 @@
-Index: widget/src/gtk2/nsWidgetFactory.cpp
+Index: widget/src/gtk2/nsNativeThemeGTK.cpp
===================================================================
-RCS file: /cvsroot/mozilla/widget/src/gtk2/nsWidgetFactory.cpp,v
-retrieving revision 1.39
-diff -u -r1.39 nsWidgetFactory.cpp
---- widget/src/gtk2/nsWidgetFactory.cpp 15 Apr 2007 22:23:00 -0000 1.39
-+++ widget/src/gtk2/nsWidgetFactory.cpp 18 Jul 2007 12:18:37 -0000
-@@ -242,7 +242,7 @@
- NS_SCREENMANAGER_CID,
- "@mozilla.org/gfx/screenmanager;1",
- nsScreenManagerGtkConstructor },
--#ifdef NATIVE_THEME_SUPPORT
-+#if 0
- { "Native Theme Renderer",
- NS_THEMERENDERER_CID,
- "@mozilla.org/chrome/chrome-native-theme;1",
+RCS file: /cvsroot/mozilla/widget/src/gtk2/nsNativeThemeGTK.cpp,v
+retrieving revision 1.97
+diff -u -r1.97 nsNativeThemeGTK.cpp
+--- widget/src/gtk2/nsNativeThemeGTK.cpp 27 Jun 2007 06:38:51 -0000 1.97
++++ widget/src/gtk2/nsNativeThemeGTK.cpp 21 Jul 2007 11:59:59 -0000
+@@ -925,23 +925,23 @@
+ return PR_FALSE;
+
+ switch (aWidgetType) {
+- case NS_THEME_BUTTON:
+- case NS_THEME_BUTTON_FOCUS:
+- case NS_THEME_RADIO:
+- case NS_THEME_RADIO_SMALL:
+- case NS_THEME_CHECKBOX:
+- case NS_THEME_CHECKBOX_SMALL:
+- case NS_THEME_TOOLBOX: // N/A
+- 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_BUTTON:
++// case NS_THEME_BUTTON_FOCUS:
++// case NS_THEME_RADIO:
++// case NS_THEME_RADIO_SMALL:
++// case NS_THEME_CHECKBOX:
++// case NS_THEME_CHECKBOX_SMALL:
++// case NS_THEME_TOOLBOX: // N/A
++// 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_SEPARATOR:
+- case NS_THEME_TOOLBAR_GRIPPER:
+- case NS_THEME_STATUSBAR:
+- case NS_THEME_STATUSBAR_PANEL:
++// case NS_THEME_TOOLBAR_GRIPPER:
++// case NS_THEME_STATUSBAR:
++// case NS_THEME_STATUSBAR_PANEL:
+ // case NS_THEME_RESIZER: (n/a for gtk)
+- case NS_THEME_LISTBOX:
++// case NS_THEME_LISTBOX:
+ // case NS_THEME_LISTBOX_LISTITEM:
+ // case NS_THEME_TREEVIEW:
+ // case NS_THEME_TREEVIEW_TREEITEM:
+@@ -951,19 +951,19 @@
+ // case NS_THEME_TREEVIEW_HEADER_CELL:
+ // case NS_THEME_TREEVIEW_HEADER_SORTARROW:
+ // case NS_THEME_TREEVIEW_TWISTY_OPEN:
+- case NS_THEME_PROGRESSBAR:
+- case NS_THEME_PROGRESSBAR_CHUNK:
+- case NS_THEME_PROGRESSBAR_VERTICAL:
+- case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
+- case NS_THEME_TAB:
++// case NS_THEME_PROGRESSBAR:
++// case NS_THEME_PROGRESSBAR_CHUNK:
++// case NS_THEME_PROGRESSBAR_VERTICAL:
++// 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_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_UP_BUTTON:
+- case NS_THEME_SPINNER_DOWN_BUTTON:
++// case NS_THEME_SPINNER_UP_BUTTON:
++// case NS_THEME_SPINNER_DOWN_BUTTON:
+ // case NS_THEME_SCROLLBAR: (n/a for gtk)
+ case NS_THEME_SCROLLBAR_BUTTON_UP:
+ case NS_THEME_SCROLLBAR_BUTTON_DOWN:
+@@ -975,31 +975,31 @@
+ 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:
+- case NS_THEME_TEXTFIELD_MULTILINE:
++// case NS_THEME_TEXTFIELD:
++// case NS_THEME_TEXTFIELD_MULTILINE:
+ // case NS_THEME_TEXTFIELD_CARET:
+ // case NS_THEME_DROPDOWN_BUTTON:
+- case NS_THEME_DROPDOWN_TEXTFIELD:
+- case NS_THEME_SCALE_HORIZONTAL:
+- case NS_THEME_SCALE_THUMB_HORIZONTAL:
+- case NS_THEME_SCALE_VERTICAL:
+- case NS_THEME_SCALE_THUMB_VERTICAL:
++// case NS_THEME_DROPDOWN_TEXTFIELD:
++// case NS_THEME_SCALE_HORIZONTAL:
++// case NS_THEME_SCALE_THUMB_HORIZONTAL:
++// case NS_THEME_SCALE_VERTICAL:
++// case NS_THEME_SCALE_THUMB_VERTICAL:
+ // case NS_THEME_SCALE_THUMB_START:
+ // case NS_THEME_SCALE_THUMB_END:
+ // case NS_THEME_SCALE_TICK:
+- case NS_THEME_CHECKBOX_CONTAINER:
+- case NS_THEME_RADIO_CONTAINER:
+- case NS_THEME_CHECKBOX_LABEL:
+- case NS_THEME_RADIO_LABEL:
+- case NS_THEME_MENUBAR:
+- case NS_THEME_MENUPOPUP:
+- case NS_THEME_MENUITEM:
+- case NS_THEME_CHECKMENUITEM:
+- case NS_THEME_RADIOMENUITEM:
+- case NS_THEME_WINDOW:
+- case NS_THEME_DIALOG:
+- case NS_THEME_DROPDOWN:
+- case NS_THEME_DROPDOWN_TEXT:
++// case NS_THEME_CHECKBOX_CONTAINER:
++// case NS_THEME_RADIO_CONTAINER:
++// case NS_THEME_CHECKBOX_LABEL:
++// case NS_THEME_RADIO_LABEL:
++// case NS_THEME_MENUBAR:
++// case NS_THEME_MENUPOPUP:
++// case NS_THEME_MENUITEM:
++// case NS_THEME_CHECKMENUITEM:
++// case NS_THEME_RADIOMENUITEM:
++// case NS_THEME_WINDOW:
++// case NS_THEME_DIALOG:
++// case NS_THEME_DROPDOWN:
++// case NS_THEME_DROPDOWN_TEXT:
+ return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
+ }
+
Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xulrunner.spec 18 Jul 2007 13:49:23 -0000 1.17
+++ xulrunner.spec 21 Jul 2007 12:15:22 -0000 1.18
@@ -7,7 +7,7 @@
Summary: XUL Runner
Name: xulrunner
Version: 1.9
-Release: 0.4.%{prerelease}
+Release: 0.5.%{prerelease}
URL: http://dev.laptop.org/pub/sugar/xulrunner
License: MPL/LGPL
Group: Applications/Internet
@@ -145,6 +145,9 @@
%{_datadir}/aclocal/nspr.m4
%changelog
+* Sat Jul 21 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.5.a6
+- Better no theme patch to preserve native scrollbars.
+
* Wed Jul 18 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.4.a6
- Add patch to disable native theme
More information about the scm-commits
mailing list