rpms/gabedit/devel gabedit-gtk.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gabedit.spec, 1.9, 1.10 sources, 1.7, 1.8
Dominik Mierzejewski
rathann at fedoraproject.org
Mon May 24 16:53:47 UTC 2010
- Previous message: rpms/nautilus/devel .cvsignore, 1.107, 1.108 nautilus.spec, 1.312, 1.313 sources, 1.117, 1.118
- Next message: rpms/kernel/F-13 iwlwifi-recover_from_tx_stall.patch, NONE, 1.1 kernel.spec, 1.2043, 1.2044
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rathann
Update of /cvs/pkgs/rpms/gabedit/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12557
Modified Files:
.cvsignore gabedit.spec sources
Added Files:
gabedit-gtk.patch
Log Message:
* Mon May 24 2010 Dominik Mierzejewski <rpm at greysector.net> 2.2.12-1
- updated to latest development version (2.2.12)
- fixed build with gtk2-2.20 (replaced deprecated macro calls)
- fixed wrong end-of-line-encoding rpmlint warning
gabedit-gtk.patch:
Common/SplashScreen.c | 2 +-
Geometry/DrawGeom.c | 4 ++--
Geometry/EnergiesCurves.c | 4 ++--
Geometry/PreviewGeom.c | 4 ++--
OpenGL/ColorMap.c | 2 +-
OpenGL/GLArea.c | 10 +++++-----
OpenGL/UtilsOrb.c | 6 +++---
Utils/GabeditContoursPlot.c | 6 +++---
Utils/GabeditXYPlot.c | 6 +++---
9 files changed, 22 insertions(+), 22 deletions(-)
--- NEW FILE gabedit-gtk.patch ---
diff -up GabeditSrc2212/src/Common/SplashScreen.c.gtk GabeditSrc2212/src/Common/SplashScreen.c
--- GabeditSrc2212/src/Common/SplashScreen.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/Common/SplashScreen.c 2010-05-24 18:15:32.441575852 +0200
@@ -353,7 +353,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 GabeditSrc2212/src/Geometry/DrawGeom.c.gtk GabeditSrc2212/src/Geometry/DrawGeom.c
--- GabeditSrc2212/src/Geometry/DrawGeom.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/Geometry/DrawGeom.c 2010-05-24 18:16:23.057577200 +0200
@@ -6976,7 +6976,7 @@ static void redraw()
/* gtk_signal_emit_by_name(GTK_OBJECT (ZoneDessin),"hide");*/
/* gtk_signal_emit_by_name(GTK_OBJECT (ZoneDessin),"show");*/
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,
@@ -7026,7 +7026,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 GabeditSrc2212/src/Geometry/EnergiesCurves.c.gtk GabeditSrc2212/src/Geometry/EnergiesCurves.c
--- GabeditSrc2212/src/Geometry/EnergiesCurves.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/Geometry/EnergiesCurves.c 2010-05-24 18:16:59.672326101 +0200
@@ -207,7 +207,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,
@@ -232,7 +232,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 GabeditSrc2212/src/Geometry/PreviewGeom.c.gtk GabeditSrc2212/src/Geometry/PreviewGeom.c
--- GabeditSrc2212/src/Geometry/PreviewGeom.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/Geometry/PreviewGeom.c 2010-05-24 18:18:13.337575403 +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 GabeditSrc2212/src/OpenGL/ColorMap.c.gtk GabeditSrc2212/src/OpenGL/ColorMap.c
--- GabeditSrc2212/src/OpenGL/ColorMap.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/OpenGL/ColorMap.c 2010-05-24 18:18:32.413327122 +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 GabeditSrc2212/src/OpenGL/GLArea.c.gtk GabeditSrc2212/src/OpenGL/GLArea.c
--- GabeditSrc2212/src/OpenGL/GLArea.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/OpenGL/GLArea.c 2010-05-24 18:20:31.316325720 +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);
@@ -1152,7 +1152,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;
@@ -1166,7 +1166,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 GabeditSrc2212/src/OpenGL/UtilsOrb.c.gtk GabeditSrc2212/src/OpenGL/UtilsOrb.c
--- GabeditSrc2212/src/OpenGL/UtilsOrb.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/OpenGL/UtilsOrb.c 2010-05-24 18:21:32.483325951 +0200
@@ -2311,7 +2311,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);
@@ -2342,7 +2342,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);
@@ -2375,7 +2375,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 GabeditSrc2212/src/Utils/GabeditContoursPlot.c.gtk GabeditSrc2212/src/Utils/GabeditContoursPlot.c
--- GabeditSrc2212/src/Utils/GabeditContoursPlot.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/Utils/GabeditContoursPlot.c 2010-05-24 18:19:53.438577857 +0200
@@ -6612,7 +6612,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,
@@ -7434,7 +7434,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);
}
@@ -9105,7 +9105,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 GabeditSrc2212/src/Utils/GabeditXYPlot.c.gtk GabeditSrc2212/src/Utils/GabeditXYPlot.c
--- GabeditSrc2212/src/Utils/GabeditXYPlot.c.gtk 2010-05-06 09:15:36.000000000 +0200
+++ GabeditSrc2212/src/Utils/GabeditXYPlot.c 2010-05-24 18:20:11.309577115 +0200
@@ -5742,7 +5742,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,
@@ -6397,7 +6397,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);
}
@@ -7944,7 +7944,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);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 16 Jan 2010 00:07:45 -0000 1.7
+++ .cvsignore 24 May 2010 16:53:47 -0000 1.8
@@ -1 +1 @@
-GabeditSrc229.tar.gz
+GabeditSrc2212.tar.gz
Index: gabedit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/gabedit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- gabedit.spec 15 Feb 2010 21:42:52 -0000 1.9
+++ gabedit.spec 24 May 2010 16:53:47 -0000 1.10
@@ -1,13 +1,14 @@
-%define version 2.2.9
-%define tarver 229
+%define version 2.2.12
+%define tarver 2212
Name: gabedit
Summary: GUI for computational chemistry
Version: %{version}
-Release: 2%{?dist}
+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,11 +35,16 @@ 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
echo "external_gl2ps=1" >> CONFIG
+pushd utils/Others
+tr -d '\r' < isotopNIST.txt > isotopNIST.txt.unix && touch -r isotopNIST.txt isotopNIST.txt.unix && mv isotopNIST.txt.unix isotopNIST.txt
+popd
+
%build
%{__make} %{?_smp_mflags} COMMONCFLAGS="$RPM_OPT_FLAGS"
@@ -81,6 +87,11 @@ fi
%{_datadir}/icons/hicolor/*/apps/*.png
%changelog
+* Mon May 24 2010 Dominik Mierzejewski <rpm at greysector.net> 2.2.12-1
+- updated to latest development version (2.2.12)
+- fixed build with gtk2-2.20 (replaced deprecated macro calls)
+- fixed wrong end-of-line-encoding rpmlint warning
+
* Mon Feb 15 2010 Dominik Mierzejewski <rpm at greysector.net> 2.2.9-2
- fixed FTBFS with the new ld (rhbz#564993)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gabedit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 16 Jan 2010 00:07:45 -0000 1.7
+++ sources 24 May 2010 16:53:47 -0000 1.8
@@ -1 +1 @@
-ee90ea516faf706a1d4677fb36a4d3c6 GabeditSrc229.tar.gz
+dd34437e8522d844107825658b9c1387 GabeditSrc2212.tar.gz
- Previous message: rpms/nautilus/devel .cvsignore, 1.107, 1.108 nautilus.spec, 1.312, 1.313 sources, 1.117, 1.118
- Next message: rpms/kernel/F-13 iwlwifi-recover_from_tx_stall.patch, NONE, 1.1 kernel.spec, 1.2043, 1.2044
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list