commit 2d46ab2557836da3a41554919aa3f07cfaef02b5 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

gtkdatabox: update from 0.9.1.3 to 0.9.2.0

Vincent Laporte 11 years ago 2d46ab25 478e4b46

+2 -198

2 changed files

expand all

unified split

pkgs

development

libraries

gtkdatabox

default.nix

deprecated_GTK.patch

+2 -4

pkgs/development/libraries/gtkdatabox/default.nix

··· 1 1 { stdenv, fetchurl, pkgconfig, gtk }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "gtkdatabox-0.9.1.3"; 4 + name = "gtkdatabox-0.9.2.0"; 5 5 6 6 src = fetchurl { 7 7 url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz"; 8 - sha256 = "90ff9fc20ea1541dfe75ae04ff98e02c3aa7ad1735d8f0e3b3352910a3f7427c"; 8 + sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; 9 9 }; 10 - 11 - patches = [ ./deprecated_GTK.patch ]; 12 10 13 11 buildInputs = [ pkgconfig gtk ]; 14 12

-194

pkgs/development/libraries/gtkdatabox/deprecated_GTK.patch

··· 1 - # Fixes compilation errors. Stolen from Debian. 2 - Index: libgtkdatabox-0.9.1.1/examples/addremove.c 3 - =================================================================== 4 - --- libgtkdatabox-0.9.1.1.orig/examples/addremove.c 2011-05-21 12:39:01.703594722 +0200 5 - +++ libgtkdatabox-0.9.1.1/examples/addremove.c 2011-05-21 12:36:16.739594810 +0200 6 - @@ -203,7 +203,7 @@ 7 - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", 8 - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); 9 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 10 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 11 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 12 - gtk_widget_grab_default (close_button); 13 - 14 - gtk_widget_show_all (window); 15 - Index: libgtkdatabox-0.9.1.1/examples/basics.c 16 - =================================================================== 17 - --- libgtkdatabox-0.9.1.1.orig/examples/basics.c 2011-05-21 12:39:02.075594722 +0200 18 - +++ libgtkdatabox-0.9.1.1/examples/basics.c 2011-05-21 12:36:16.759594820 +0200 19 - @@ -113,7 +113,7 @@ 20 - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", 21 - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); 22 - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); 23 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 24 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 25 - gtk_widget_grab_default (close_button); 26 - gtk_widget_grab_focus (close_button); 27 - 28 - Index: libgtkdatabox-0.9.1.1/examples/basics2.c 29 - =================================================================== 30 - --- libgtkdatabox-0.9.1.1.orig/examples/basics2.c 2011-05-21 12:39:01.911594722 +0200 31 - +++ libgtkdatabox-0.9.1.1/examples/basics2.c 2011-05-21 12:36:16.747594818 +0200 32 - @@ -225,7 +225,7 @@ 33 - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", 34 - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); 35 - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); 36 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 37 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 38 - gtk_widget_grab_default (close_button); 39 - gtk_widget_grab_focus (close_button); 40 - 41 - Index: libgtkdatabox-0.9.1.1/examples/colors.c 42 - =================================================================== 43 - --- libgtkdatabox-0.9.1.1.orig/examples/colors.c 2011-05-21 12:39:02.115594722 +0200 44 - +++ libgtkdatabox-0.9.1.1/examples/colors.c 2011-05-21 12:36:16.763594819 +0200 45 - @@ -194,7 +194,7 @@ 46 - g_signal_connect (G_OBJECT (close_button), "clicked", 47 - G_CALLBACK (gtk_main_quit), (gpointer) NULL); 48 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 49 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 50 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 51 - gtk_widget_grab_default (close_button); 52 - 53 - 54 - Index: libgtkdatabox-0.9.1.1/examples/enable_disable.c 55 - =================================================================== 56 - --- libgtkdatabox-0.9.1.1.orig/examples/enable_disable.c 2011-05-21 12:39:01.787594722 +0200 57 - +++ libgtkdatabox-0.9.1.1/examples/enable_disable.c 2011-05-21 12:36:16.743594812 +0200 58 - @@ -145,7 +145,7 @@ 59 - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", 60 - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); 61 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 62 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 63 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 64 - for (i = 0; i < noEnableSets; ++i) 65 - { 66 - GtkWidget *vbox = gtk_vbox_new (FALSE, 10); 67 - Index: libgtkdatabox-0.9.1.1/examples/grid.c 68 - =================================================================== 69 - --- libgtkdatabox-0.9.1.1.orig/examples/grid.c 2011-05-21 12:39:01.995594722 +0200 70 - +++ libgtkdatabox-0.9.1.1/examples/grid.c 2011-05-21 12:36:16.755594821 +0200 71 - @@ -133,7 +133,7 @@ 72 - G_CALLBACK (gtk_main_quit), 73 - GTK_OBJECT (box)); 74 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 75 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 76 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 77 - gtk_widget_grab_default (close_button); 78 - 79 - gtk_widget_show_all (window); 80 - Index: libgtkdatabox-0.9.1.1/examples/grid_array.c 81 - =================================================================== 82 - --- libgtkdatabox-0.9.1.1.orig/examples/grid_array.c 2011-05-21 12:39:01.951594722 +0200 83 - +++ libgtkdatabox-0.9.1.1/examples/grid_array.c 2011-05-21 12:36:16.751594821 +0200 84 - @@ -134,7 +134,7 @@ 85 - G_CALLBACK (gtk_main_quit), 86 - GTK_OBJECT (box)); 87 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 88 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 89 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 90 - gtk_widget_grab_default (close_button); 91 - 92 - gtk_widget_show_all (window); 93 - Index: libgtkdatabox-0.9.1.1/examples/keycontrol.c 94 - =================================================================== 95 - --- libgtkdatabox-0.9.1.1.orig/examples/keycontrol.c 2011-05-21 12:39:02.155594722 +0200 96 - +++ libgtkdatabox-0.9.1.1/examples/keycontrol.c 2011-05-21 12:37:15.211595055 +0200 97 - @@ -133,7 +133,8 @@ 98 - gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table, 99 - TRUE, TRUE, TRUE, TRUE); 100 - gtk_widget_add_events (box, GDK_KEY_PRESS_MASK); 101 - - GTK_WIDGET_SET_FLAGS (box, GTK_CAN_FOCUS | GTK_CAN_DEFAULT); 102 - + gtk_widget_set_can_focus(box, GTK_CAN_FOCUS); 103 - + gtk_widget_set_can_default(box, GTK_CAN_DEFAULT); 104 - 105 - gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); 106 - 107 - Index: libgtkdatabox-0.9.1.1/examples/lissajous.c 108 - =================================================================== 109 - --- libgtkdatabox-0.9.1.1.orig/examples/lissajous.c 2011-05-21 12:39:02.035594722 +0200 110 - +++ libgtkdatabox-0.9.1.1/examples/lissajous.c 2011-05-21 12:36:16.759594820 +0200 111 - @@ -154,7 +154,7 @@ 112 - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); 113 - 114 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 115 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 116 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 117 - gtk_widget_grab_default (close_button); 118 - lissajous_idle = g_idle_add ((GSourceFunc) lissajous_idle_func, box); 119 - 120 - Index: libgtkdatabox-0.9.1.1/examples/logarithmic.c 121 - =================================================================== 122 - --- libgtkdatabox-0.9.1.1.orig/examples/logarithmic.c 2011-05-21 12:39:01.827594722 +0200 123 - +++ libgtkdatabox-0.9.1.1/examples/logarithmic.c 2011-05-21 12:36:16.743594812 +0200 124 - @@ -207,7 +207,7 @@ 125 - g_signal_connect (GTK_OBJECT (close_button), "clicked", 126 - G_CALLBACK (gtk_main_quit), NULL); 127 - gtk_box_pack_start (GTK_BOX (vbox), close_button, FALSE, FALSE, 0); 128 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 129 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 130 - gtk_widget_grab_default (close_button); 131 - gtk_widget_grab_focus (close_button); 132 - 133 - Index: libgtkdatabox-0.9.1.1/examples/markers.c 134 - =================================================================== 135 - --- libgtkdatabox-0.9.1.1.orig/examples/markers.c 2011-05-21 12:39:01.871594722 +0200 136 - +++ libgtkdatabox-0.9.1.1/examples/markers.c 2011-05-21 12:36:16.747594818 +0200 137 - @@ -220,7 +220,7 @@ 138 - g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", 139 - G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); 140 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 141 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 142 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 143 - gtk_widget_grab_default (close_button); 144 - 145 - gtk_widget_show_all (window); 146 - Index: libgtkdatabox-0.9.1.1/examples/signals.c 147 - =================================================================== 148 - --- libgtkdatabox-0.9.1.1.orig/examples/signals.c 2011-05-21 12:39:01.751594722 +0200 149 - +++ libgtkdatabox-0.9.1.1/examples/signals.c 2011-05-21 12:36:16.743594812 +0200 150 - @@ -287,7 +287,7 @@ 151 - g_signal_connect_swapped (G_OBJECT (close_button), "clicked", 152 - G_CALLBACK (gtk_main_quit), G_OBJECT (box)); 153 - gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); 154 - - GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT); 155 - + gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); 156 - gtk_widget_grab_default (close_button); 157 - 158 - g_signal_connect (G_OBJECT (box), "zoomed", 159 - Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 160 - =================================================================== 161 - --- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2011-05-21 12:39:01.583594722 +0200 162 - +++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-05-21 12:38:43.523595004 +0200 163 - @@ -453,7 +453,8 @@ 164 - gint width; 165 - gint height; 166 - 167 - - gdk_drawable_get_size (widget->window, &width, &height); 168 - + width = gdk_window_get_width(widget->window); 169 - + height = gdk_window_get_height(widget->window); 170 - x = MAX (0, MIN (width - 1, x)); 171 - y = MAX (0, MIN (height - 1, y)); 172 - 173 - @@ -587,7 +588,7 @@ 174 - gint attributes_mask; 175 - 176 - box = GTK_DATABOX (widget); 177 - - GTK_WIDGET_SET_FLAGS (box, GTK_REALIZED); 178 - + gtk_widget_set_realized(box, GTK_REALIZED); 179 - 180 - attributes.window_type = GDK_WINDOW_CHILD; 181 - attributes.x = widget->allocation.x; 182 - Index: libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 183 - =================================================================== 184 - --- libgtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2011-05-21 12:39:01.631594722 +0200 185 - +++ libgtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-05-21 12:38:59.963594710 +0200 186 - @@ -842,7 +842,7 @@ 187 - gint attributes_mask; 188 - 189 - ruler = GTK_DATABOX_RULER (widget); 190 - - GTK_WIDGET_SET_FLAGS (ruler, GTK_REALIZED); 191 - + gtk_widget_set_realized(ruler, GTK_REALIZED); 192 - 193 - attributes.window_type = GDK_WINDOW_CHILD; 194 - attributes.x = widget->allocation.x;