pyrox.dev
Fix tarball
+58
pkgs/applications/science/electronics/xoscope/gtkdepre.diff
+58
pkgs/applications/science/electronics/xoscope/gtkdepre.diff
···
1
+
diff -ru xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c
2
+
--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:42:24.000000000 +0200
3
+
+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/gtkdatabox.c 2010-06-07 10:45:40.000000000 +0200
4
+
@@ -661,7 +661,7 @@
5
+
static void
6
+
gtk_databox_calculate_hcanvas (GtkDatabox *box)
7
+
{
8
+
- if (!GTK_WIDGET_VISIBLE (box))
9
+
+ if (!gtk_widget_get_visible (box))
10
+
return;
11
+
12
+
if (box->priv->adjX->page_size == 1.0)
13
+
@@ -698,7 +698,7 @@
14
+
static void
15
+
gtk_databox_calculate_vcanvas (GtkDatabox *box)
16
+
{
17
+
- if (!GTK_WIDGET_VISIBLE (box))
18
+
+ if (!gtk_widget_get_visible (box))
19
+
return;
20
+
21
+
if (box->priv->adjY->page_size == 1.0)
22
+
@@ -780,7 +780,7 @@
23
+
gtk_databox_draw (box, event);
24
+
25
+
gdk_draw_drawable (widget->window,
26
+
- widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
27
+
+ widget->style->fg_gc[gtk_widget_get_state (widget)],
28
+
box->priv->canvas.pixmap, event->area.x, event->area.y,
29
+
event->area.x, event->area.y, event->area.width,
30
+
event->area.height);
31
+
@@ -940,7 +940,7 @@
32
+
GtkWidget *widget = GTK_WIDGET (box);
33
+
34
+
g_return_if_fail (GTK_IS_DATABOX (box));
35
+
- g_return_if_fail (GTK_WIDGET_VISIBLE (widget));
36
+
+ g_return_if_fail (gtk_widget_get_visible (widget));
37
+
38
+
gdk_draw_rectangle (box->priv->canvas.pixmap, widget->style->bg_gc[0],
39
+
TRUE, 0, 0,
40
+
@@ -1150,7 +1150,7 @@
41
+
/* Copy a part of the pixmap to the screen */
42
+
if (pixmapCopyRect)
43
+
gdk_draw_drawable (widget->window,
44
+
- widget->style->fg_gc[GTK_WIDGET_STATE (box)],
45
+
+ widget->style->fg_gc[gtk_widget_get_state (box)],
46
+
box->priv->canvas.pixmap,
47
+
pixmapCopyRect->x,
48
+
pixmapCopyRect->y,
49
+
--- xoscope-2.0-old//gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:43.000000000 +0200
50
+
+++ xoscope-2.0/gtkdatabox-0.6.0.0/gtk/Makefile.in 2011-09-02 16:43:57.000000000 +0200
51
+
@@ -196,7 +196,6 @@
52
+
-DG_DISABLE_DEPRECATED\
53
+
-DGDK_DISABLE_DEPRECATED\
54
+
-DGDK_PIXBUF_DISABLE_DEPRECATED\
55
+
- -DGTK_DISABLE_DEPRECATED\
56
+
`pkg-config gtk+-2.0 --cflags`
57
+
58
+
all: all-am