rpms/xulrunner/OLPC-2 xulrunner-1.9a6-no-native-theme.patch, 1.4, 1.5 xulrunner.spec, 1.44, 1.45
Marco Pesenti Gritti (mpg)
fedora-extras-commits at redhat.com
Thu Nov 29 13:40:58 UTC 2007
Author: mpg
Update of /cvs/pkgs/rpms/xulrunner/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3960
Modified Files:
xulrunner-1.9a6-no-native-theme.patch xulrunner.spec
Log Message:
* Thu Nov 29 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.beta1.4
- More comprehensive patch to disable native theming
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xulrunner-1.9a6-no-native-theme.patch 21 Nov 2007 16:25:29 -0000 1.4
+++ xulrunner-1.9a6-no-native-theme.patch 29 Nov 2007 13:40:54 -0000 1.5
@@ -1,99 +1,30 @@
---- widget/src/gtk2/nsNativeThemeGTK.cpp.old 2007-11-21 17:11:03.000000000 +0100
-+++ widget/src/gtk2/nsNativeThemeGTK.cpp 2007-11-21 17:19:10.000000000 +0100
-@@ -979,96 +979,6 @@
- nsIFrame* aFrame,
- PRUint8 aWidgetType)
+--- widget/src/gtk2/Makefile.in.old 2007-11-29 14:19:58.000000000 +0100
++++ widget/src/gtk2/Makefile.in 2007-11-29 14:20:03.000000000 +0100
+@@ -52,7 +52,7 @@
+
+ PACKAGE_FILE = widget_gtk2.pkg
+
+-NATIVE_THEME_SUPPORT = 1
++NATIVE_THEME_SUPPORT = 0
+
+ REQUIRES = xpcom \
+ string \
+--- widget/src/gtk2/nsLookAndFeel.cpp.old 2007-11-29 14:21:09.000000000 +0100
++++ widget/src/gtk2/nsLookAndFeel.cpp 2007-11-29 14:22:37.000000000 +0100
+@@ -83,6 +83,7 @@
+
+ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor& aColor)
{
-- if (IsWidgetTypeDisabled(mDisabledWidgetTypes, aWidgetType))
-- 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_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_STATUSBAR_RESIZER_PANEL:
-- case NS_THEME_RESIZER:
-- case NS_THEME_LISTBOX:
-- // case NS_THEME_LISTBOX_LISTITEM:
-- case NS_THEME_TREEVIEW:
-- // case NS_THEME_TREEVIEW_TREEITEM:
-- case NS_THEME_TREEVIEW_TWISTY:
-- // case NS_THEME_TREEVIEW_LINE:
-- // case NS_THEME_TREEVIEW_HEADER:
-- 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_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_UP_BUTTON:
-- case NS_THEME_SPINNER_DOWN_BUTTON:
-- // 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:
-- 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:
-- case NS_THEME_TEXTFIELD_MULTILINE:
-- // case NS_THEME_TEXTFIELD_CARET:
-- 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:
-- return !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
--
-- case NS_THEME_DROPDOWN_BUTTON:
-- // "Native" dropdown buttons cause padding and margin problems, but only
-- // in HTML so allow them in XUL.
-- return (!aFrame || aFrame->GetContent()->IsNodeOfType(nsINode::eXUL)) &&
-- !IsWidgetStyled(aPresContext, aFrame, aWidgetType);
--
-- }
--
- return PR_FALSE;
++#if 0
+ nsresult res = NS_OK;
+
+ switch (aID) {
+@@ -308,6 +309,8 @@
+ }
+
+ return res;
++#endif
++ return NS_ERROR_FAILURE;
}
+ static PRInt32 CheckWidgetStyle(GtkWidget* aWidget, const char* aStyle, PRInt32 aMetric) {
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/OLPC-2/xulrunner.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xulrunner.spec 24 Nov 2007 11:29:38 -0000 1.44
+++ xulrunner.spec 29 Nov 2007 13:40:54 -0000 1.45
@@ -11,7 +11,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.beta1.3%{?dist}
+Release: 0.beta1.4%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -400,6 +400,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Nov 29 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.beta1.4
+- More comprehensive patch to disable native theming
+
* Sat Nov 24 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.9-0.beta1.3
- Disable no-native-theme patch
More information about the fedora-extras-commits
mailing list