[gabedit/f13/master] - fixed build with current F13 GTK2
Dominik Mierzejewski
rathann at fedoraproject.org
Thu Aug 26 20:19:33 UTC 2010
commit ca94e978a00018cb8e7ea6b14487054366ae7e78
Author: Dominik Mierzejewski <dominik at greysector.net>
Date: Thu Aug 26 22:18:59 2010 +0200
- fixed build with current F13 GTK2
gabedit-gtk.patch | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gabedit.spec | 5 +-
2 files changed, 229 insertions(+), 1 deletions(-)
---
diff --git a/gabedit-gtk.patch b/gabedit-gtk.patch
new file mode 100644
index 0000000..28032fc
--- /dev/null
+++ b/gabedit-gtk.patch
@@ -0,0 +1,225 @@
+diff -up GabeditSrc230/src/Common/SplashScreen.c.gtk GabeditSrc230/src/Common/SplashScreen.c
+--- GabeditSrc230/src/Common/SplashScreen.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Common/SplashScreen.c 2010-08-26 22:15:26.000000000 +0200
+@@ -352,7 +352,7 @@ static gint expose_event(GtkWidget *wid
+ pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
+ if(pixmap)
+ gdk_draw_drawable(widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state(widget)],
+ pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+diff -up GabeditSrc230/src/Geometry/DrawGeom.c.gtk GabeditSrc230/src/Geometry/DrawGeom.c
+--- GabeditSrc230/src/Geometry/DrawGeom.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/DrawGeom.c 2010-08-26 22:16:54.000000000 +0200
+@@ -6841,7 +6841,7 @@ gint motion_notify(GtkWidget *widget, Gd
+ static void redraw()
+ {
+ gdk_draw_drawable(ZoneDessin->window,
+- ZoneDessin->style->fg_gc[GTK_WIDGET_STATE (ZoneDessin)],
++ ZoneDessin->style->fg_gc[gtk_widget_get_state(ZoneDessin)],
+ pixmap,
+ 0,0,
+ 0,0,
+@@ -6890,7 +6890,7 @@ static gint expose_event( GtkWidget *wid
+ {
+ if(event->count >0) return FALSE;
+ gdk_draw_drawable(widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state(widget)],
+ pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+diff -up GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk GabeditSrc230/src/Geometry/EnergiesCurves.c
+--- GabeditSrc230/src/Geometry/EnergiesCurves.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/EnergiesCurves.c 2010-08-26 22:15:26.000000000 +0200
+@@ -156,7 +156,7 @@ static gint expose_event (GtkWidget *wid
+ {
+ GdkPixmap *pixmap = (GdkPixmap*)(g_object_get_data(G_OBJECT(widget),"Pixmap"));
+ gdk_draw_drawable(widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state(widget)],
+ pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+@@ -181,7 +181,7 @@ void set_point(GtkWidget *widget, gint x
+
+
+ gdk_draw_drawable(widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state(widget)],
+ pixmap,
+ 0,0,
+ 0,0,
+diff -up GabeditSrc230/src/Geometry/PreviewGeom.c.gtk GabeditSrc230/src/Geometry/PreviewGeom.c
+--- GabeditSrc230/src/Geometry/PreviewGeom.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Geometry/PreviewGeom.c 2010-08-26 22:15:26.000000000 +0200
+@@ -729,7 +729,7 @@ static void redraw(GtkWidget *drawingAre
+ PrevData* prevData = (PrevData*)g_object_get_data(G_OBJECT (drawingArea), "PrevData");
+ if(!prevData)return;
+ gdk_draw_drawable(drawingArea->window,
+- drawingArea->style->fg_gc[GTK_WIDGET_STATE (drawingArea)],
++ drawingArea->style->fg_gc[gtk_widget_get_state(drawingArea)],
+ prevData->pixmap,
+ 0,0,
+ 0,0,
+@@ -902,7 +902,7 @@ static gboolean expose_event( GtkWidget
+ if(event->count >0) return FALSE;
+ if(!prevData)return FALSE;
+ gdk_draw_drawable(widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state(widget)],
+ prevData->pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+diff -up GabeditSrc230/src/OpenGL/ColorMap.c.gtk GabeditSrc230/src/OpenGL/ColorMap.c
+--- GabeditSrc230/src/OpenGL/ColorMap.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/ColorMap.c 2010-08-26 22:15:26.000000000 +0200
+@@ -643,7 +643,7 @@ static gint expose_event(GtkWidget *wid
+ pixmap = (GdkPixmap *)g_object_get_data(G_OBJECT(widget), "Pixmap");
+ if(pixmap)
+ gdk_draw_drawable(widget->window,
+- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
++ widget->style->fg_gc[gtk_widget_get_state(widget)],
+ pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+diff -up GabeditSrc230/src/OpenGL/GLArea.c.gtk GabeditSrc230/src/OpenGL/GLArea.c
+--- GabeditSrc230/src/OpenGL/GLArea.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/GLArea.c 2010-08-26 22:15:26.000000000 +0200
+@@ -781,7 +781,7 @@ gint init(GtkWidget *widget)
+ {
+ /* OpenGL functions can be called only if make_current returns true */
+ if(!GTK_IS_WIDGET(widget)) return TRUE;
+- if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++ if(!gtk_widget_get_realized(widget)) return TRUE;
+ if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
+ {
+ glViewport(0,0, widget->allocation.width, widget->allocation.height);
+@@ -1029,7 +1029,7 @@ gint redrawGL2PS()
+ GLdouble m[4][4];
+ GtkWidget *widget = GLArea;
+ if(!GTK_IS_WIDGET(widget)) return TRUE;
+- if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++ if(!gtk_widget_get_realized(widget)) return TRUE;
+
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+@@ -1088,7 +1088,7 @@ gint redraw(GtkWidget *widget, gpointer
+ {
+ GLdouble m[4][4];
+ if(!GTK_IS_WIDGET(widget)) return TRUE;
+- if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++ if(!gtk_widget_get_realized(widget)) return TRUE;
+ if (!gtk_gl_area_make_current(GTK_GL_AREA(widget))) return FALSE;
+
+ glMatrixMode(GL_PROJECTION);
+@@ -1153,7 +1153,7 @@ gint draw(GtkWidget *widget, GdkEventExp
+ static gint i = 0;
+ i++;
+ if (!GTK_IS_WIDGET(widget)) return TRUE;
+- if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++ if(!gtk_widget_get_realized(widget)) return TRUE;
+ /* Draw only last expose. */
+ if (event->count > 0) return FALSE;
+
+@@ -1167,7 +1167,7 @@ gint draw(GtkWidget *widget, GdkEventExp
+ gint reshape(GtkWidget *widget, GdkEventConfigure *event)
+ {
+ if (!GTK_IS_WIDGET(widget)) return TRUE;
+- if(!GTK_WIDGET_REALIZED(widget)) return TRUE;
++ if(!gtk_widget_get_realized(widget)) return TRUE;
+
+ /* OpenGL functions can be called only if make_current returns true */
+ if (gtk_gl_area_make_current(GTK_GL_AREA(widget)))
+diff -up GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk GabeditSrc230/src/OpenGL/UtilsOrb.c
+--- GabeditSrc230/src/OpenGL/UtilsOrb.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/OpenGL/UtilsOrb.c 2010-08-26 22:15:26.000000000 +0200
+@@ -2320,7 +2320,7 @@ static void resetGridColorMap()
+ g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
+ g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
+ color_map_refresh(handleBoxColorMapGrid);
+- if(GTK_WIDGET_VISIBLE(handleBoxColorMapGrid))
++ if(gtk_widget_get_visible(handleBoxColorMapGrid))
+ {
+ gtk_widget_hide(handleBoxColorMapGrid);
+ gtk_widget_show(handleBoxColorMapGrid);
+@@ -2351,7 +2351,7 @@ static void resetPlanesMappedColorMap()
+ g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
+ g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
+ color_map_refresh(handleBoxColorMapPlanesMapped);
+- if(GTK_WIDGET_VISIBLE(handleBoxColorMapPlanesMapped))
++ if(gtk_widget_get_visible(handleBoxColorMapPlanesMapped))
+ {
+ gtk_widget_hide(handleBoxColorMapPlanesMapped);
+ gtk_widget_show(handleBoxColorMapPlanesMapped);
+@@ -2384,7 +2384,7 @@ static void resetContoursColorMap()
+ g_object_set_data(G_OBJECT(entryRight),"ColorMap", colorMap);
+ g_object_set_data(G_OBJECT(darea),"ColorMap", colorMap);
+ color_map_refresh(handleBoxColorMapContours);
+- if(GTK_WIDGET_VISIBLE(handleBoxColorMapContours))
++ if(gtk_widget_get_visible(handleBoxColorMapContours))
+ {
+ gtk_widget_hide(handleBoxColorMapContours);
+ gtk_widget_show(handleBoxColorMapContours);
+diff -up GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc230/src/Utils/GabeditContoursPlot.c
+--- GabeditSrc230/src/Utils/GabeditContoursPlot.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Utils/GabeditContoursPlot.c 2010-08-26 22:15:26.000000000 +0200
+@@ -7501,7 +7501,7 @@ static void gabedit_contoursplot_size_al
+ widget->allocation = *allocation;
+ contoursplot=GABEDIT_ContoursPLOT(widget);
+
+- if (GTK_WIDGET_REALIZED (widget))
++ if (gtk_widget_get_realized(widget))
+ gdk_window_move_resize (widget->window,
+ allocation->x,
+ allocation->y,
+@@ -8531,7 +8531,7 @@ static void set_old_area(GtkWidget *widg
+ if (contoursplot->old_area!=NULL) g_object_unref(G_OBJECT(contoursplot->old_area));
+ contoursplot->old_area=NULL;
+
+- if (GTK_WIDGET_REALIZED(widget) && widget->window)
++ if (gtk_widget_get_realized(widget) && widget->window)
+ {
+ contoursplot->old_area=gdk_pixmap_copy(widget->window);
+ }
+@@ -10530,7 +10530,7 @@ static void contoursplot_calculate_sizes
+ if (contoursplot->cairo_widget!=NULL) cairo_destroy (contoursplot->cairo_widget);
+ if (contoursplot->cairo_area!=NULL) cairo_destroy (contoursplot->cairo_area);
+
+- if (GTK_WIDGET_REALIZED(widget))
++ if (gtk_widget_get_realized(widget))
+ {
+ contoursplot->plotting_area=gdk_pixmap_new(widget->window, contoursplot->plotting_rect.width, contoursplot->plotting_rect.height, -1);
+ contoursplot->cairo_area = gdk_cairo_create (contoursplot->plotting_area);
+diff -up GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk GabeditSrc230/src/Utils/GabeditXYPlot.c
+--- GabeditSrc230/src/Utils/GabeditXYPlot.c.gtk 2010-07-12 09:11:42.000000000 +0200
++++ GabeditSrc230/src/Utils/GabeditXYPlot.c 2010-08-26 22:15:26.000000000 +0200
+@@ -6607,7 +6607,7 @@ static void gabedit_xyplot_size_allocate
+ widget->allocation = *allocation;
+ xyplot=GABEDIT_XYPLOT(widget);
+
+- if (GTK_WIDGET_REALIZED (widget))
++ if (gtk_widget_get_realized(widget))
+ gdk_window_move_resize (widget->window,
+ allocation->x,
+ allocation->y,
+@@ -7381,7 +7381,7 @@ static void set_old_area(GtkWidget *widg
+ if (xyplot->old_area!=NULL) g_object_unref(G_OBJECT(xyplot->old_area));
+ xyplot->old_area=NULL;
+
+- if (GTK_WIDGET_REALIZED(widget) && widget->window)
++ if (gtk_widget_get_realized(widget) && widget->window)
+ {
+ xyplot->old_area=gdk_pixmap_copy(widget->window);
+ }
+@@ -9244,7 +9244,7 @@ static void xyplot_calculate_sizes (Gabe
+ if (xyplot->cairo_widget!=NULL) cairo_destroy (xyplot->cairo_widget);
+ if (xyplot->cairo_area!=NULL) cairo_destroy (xyplot->cairo_area);
+
+- if (GTK_WIDGET_REALIZED(widget))
++ if (gtk_widget_get_realized(widget))
+ {
+ xyplot->plotting_area=gdk_pixmap_new(widget->window, xyplot->plotting_rect.width, xyplot->plotting_rect.height, -1);
+ xyplot->cairo_area = gdk_cairo_create (xyplot->plotting_area);
diff --git a/gabedit.spec b/gabedit.spec
index 6483c56..11290ef 100644
--- a/gabedit.spec
+++ b/gabedit.spec
@@ -8,6 +8,7 @@ Release: 1%{?dist}
Source0: http://downloads.sourceforge.net/sourceforge/gabedit/GabeditSrc%{tarver}.tar.gz
Patch0: %{name}-ld.patch
Patch2: %{name}-csh.patch
+Patch3: %{name}-gtk.patch
URL: http://gabedit.sourceforge.net/home.html
License: MIT
Group: Applications/Engineering
@@ -34,6 +35,7 @@ file formats are supported.
%setup -q -n GabeditSrc%{tarver}
%patch0 -p1 -b .ld
%patch2 -p1
+%patch3 -p1 -b .gtk
# remove Win32-specific files
%{__rm} -r utils/InnosSetupScriptWin32
echo "external_gtkglarea=1" >> CONFIG
@@ -83,8 +85,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*.png
%changelog
-* Mon Aug 23 2010 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-1
+* Thu Aug 26 2010 Dominik Mierzejewski <rpm at greysector.net> 2.3.0-1
- updated to latest stable version (2.3.0)
+- fixed build with current F13 GTK2
* Mon Feb 15 2010 Dominik Mierzejewski <rpm at greysector.net> 2.2.9-2
- fixed FTBFS with the new ld (rhbz#564993)
More information about the scm-commits
mailing list