Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-plugins/wmmaiload/files: wmmaiload-2.2.1-gtk.patch digest-wmmaiload-2.2.1-r1
Date: Sat, 12 Jan 2008 10:13:58
Message-Id: E1JDdND-00055I-If@stork.gentoo.org
1 drac 08/01/12 10:13:55
2
3 Added: wmmaiload-2.2.1-gtk.patch digest-wmmaiload-2.2.1-r1
4 Log:
5 Use GTK+-2.
6 (Portage version: 2.1.4_rc14, RepoMan options: --force)
7
8 Revision Changes Path
9 1.1 x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmaiload/files/wmmaiload-2.2.1-gtk.patch?rev=1.1&content-type=text/plain
13
14 Index: wmmaiload-2.2.1-gtk.patch
15 ===================================================================
16 diff -ur wmmaiload-2.2.1.orig/wmmaiload/dockapp.c wmmaiload-2.2.1/wmmaiload/dockapp.c
17 --- wmmaiload-2.2.1.orig/wmmaiload/dockapp.c 2005-07-12 22:39:47.000000000 +0300
18 +++ wmmaiload-2.2.1/wmmaiload/dockapp.c 2008-01-12 11:53:00.000000000 +0200
19 @@ -27,6 +27,7 @@
20 #include <sys/time.h>
21 #include <sys/types.h>
22 #include <unistd.h>
23 +#include <stdlib.h>
24
25 #define WINDOWED_SIZE_W 64
26 #define WINDOWED_SIZE_H 64
27 diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/actions.c wmmaiload-2.2.1/wmmaiload-config/actions.c
28 --- wmmaiload-2.2.1.orig/wmmaiload-config/actions.c 2005-07-13 22:54:46.000000000 +0300
29 +++ wmmaiload-2.2.1/wmmaiload-config/actions.c 2008-01-12 11:54:15.000000000 +0200
30 @@ -3,6 +3,7 @@
31 */
32
33 #include <stdlib.h>
34 +#include <string.h>
35 #include "defines.h"
36 #include "variables.h"
37 #include "dialogs.h"
38 diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c wmmaiload-2.2.1/wmmaiload-config/dialogs.c
39 --- wmmaiload-2.2.1.orig/wmmaiload-config/dialogs.c 2005-07-07 21:54:17.000000000 +0300
40 +++ wmmaiload-2.2.1/wmmaiload-config/dialogs.c 2008-01-12 11:47:42.000000000 +0200
41 @@ -38,7 +38,6 @@
42 bouton, TRUE, TRUE, 0);
43 GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
44 gtk_widget_grab_default(GTK_WIDGET(bouton));
45 - gtk_widget_draw_default(GTK_WIDGET(bouton));
46 gtk_widget_show(bouton);
47
48 bouton = gtk_button_new_with_label("No");
49 @@ -97,7 +96,6 @@
50 bouton, TRUE, TRUE, 0);
51 GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
52 gtk_widget_grab_default(GTK_WIDGET(bouton));
53 - gtk_widget_draw_default(GTK_WIDGET(bouton));
54 gtk_widget_show(bouton);
55
56 gtk_container_set_border_width(GTK_CONTAINER
57 diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/Init.make wmmaiload-2.2.1/wmmaiload-config/Init.make
58 --- wmmaiload-2.2.1.orig/wmmaiload-config/Init.make 2005-08-26 21:37:33.000000000 +0300
59 +++ wmmaiload-2.2.1/wmmaiload-config/Init.make 2008-01-12 11:48:12.000000000 +0200
60 @@ -35,9 +35,9 @@
61 #
62
63 CROSS_COMPILE =
64 -USER_CPPFLAGS = `gtk-config --cflags`
65 +USER_CPPFLAGS = `pkg-config gtk+-2.0 --cflags`
66 USER_CFLAGS =
67 -USER_LDFLAGS = `gtk-config --libs` -lX11
68 +USER_LDFLAGS = `pkg-config gtk+-2.0 --libs` -lX11
69
70
71 #*****************************************************************
72 Only in wmmaiload-2.2.1/wmmaiload-config: Init.make.orig
73 diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/main.c wmmaiload-2.2.1/wmmaiload-config/main.c
74 --- wmmaiload-2.2.1.orig/wmmaiload-config/main.c 2005-07-13 22:51:28.000000000 +0300
75 +++ wmmaiload-2.2.1/wmmaiload-config/main.c 2008-01-12 11:54:01.000000000 +0200
76 @@ -3,6 +3,8 @@
77 */
78
79 #include <stdio.h>
80 +#include <stdlib.h>
81 +#include <string.h>
82 #include <gtk/gtk.h>
83 #include "config.h"
84 #include "defines.h"
85 diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c wmmaiload-2.2.1/wmmaiload-config/mainwindow.c
86 --- wmmaiload-2.2.1.orig/wmmaiload-config/mainwindow.c 2005-07-13 22:51:52.000000000 +0300
87 +++ wmmaiload-2.2.1/wmmaiload-config/mainwindow.c 2008-01-12 11:47:42.000000000 +0200
88 @@ -10,9 +10,9 @@
89 #include "actions.h"
90
91
92 -static GtkWidget *edit;
93 -static GtkWidget *set;
94 -static GtkWidget *remove;
95 +static GtkWidget *b_edit;
96 +static GtkWidget *b_set;
97 +static GtkWidget *b_remove;
98
99 static gint list_sel_cb (GtkCList *clist,
100 gint row,
101 @@ -21,9 +21,9 @@
102 void *data)
103 {
104 selected_row = row;
105 - gtk_widget_set_sensitive(edit, TRUE);
106 - gtk_widget_set_sensitive(set, TRUE);
107 - gtk_widget_set_sensitive(remove, TRUE);
108 + gtk_widget_set_sensitive(b_edit, TRUE);
109 + gtk_widget_set_sensitive(b_set, TRUE);
110 + gtk_widget_set_sensitive(b_remove, TRUE);
111 return TRUE;
112 }
113
114 @@ -35,9 +35,9 @@
115 void *data)
116 {
117 selected_row = -1;
118 - gtk_widget_set_sensitive(edit, FALSE);
119 - gtk_widget_set_sensitive(set, FALSE);
120 - gtk_widget_set_sensitive(remove, FALSE);
121 + gtk_widget_set_sensitive(b_edit, FALSE);
122 + gtk_widget_set_sensitive(b_set, FALSE);
123 + gtk_widget_set_sensitive(b_remove, FALSE);
124 return TRUE;
125 }
126
127 @@ -230,7 +230,7 @@
128 gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 0, 1);
129 gtk_widget_set_sensitive(bouton, FALSE);
130 gtk_widget_show(bouton);
131 - edit = bouton;
132 + b_edit = bouton;
133
134 bouton = gtk_button_new_with_label(" Set default ");
135 gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
136 @@ -238,7 +238,7 @@
137 gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
138 gtk_widget_set_sensitive(bouton, FALSE);
139 gtk_widget_show(bouton);
140 - set = bouton;
141 + b_set = bouton;
142
143 bouton = gtk_button_new_with_label(" Remove box ");
144 gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
145 @@ -246,7 +246,7 @@
146 gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1);
147 gtk_widget_set_sensitive(bouton, FALSE);
148 gtk_widget_show(bouton);
149 - remove = bouton;
150 + b_remove = bouton;
151
152 /*--- Frame 5 ---*/
153 frame = gtk_frame_new(NULL);
154 @@ -322,7 +322,6 @@
155 gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
156 GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
157 gtk_widget_grab_default(GTK_WIDGET(bouton));
158 - gtk_widget_draw_default(GTK_WIDGET(bouton));
159 gtk_widget_show(bouton);
160
161 bouton = gtk_button_new_with_label(" Cancel ");
162 diff -ur wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c wmmaiload-2.2.1/wmmaiload-config/popedit.c
163 --- wmmaiload-2.2.1.orig/wmmaiload-config/popedit.c 2005-07-07 21:54:17.000000000 +0300
164 +++ wmmaiload-2.2.1/wmmaiload-config/popedit.c 2008-01-12 11:47:42.000000000 +0200
165 @@ -68,7 +68,6 @@
166 bouton, TRUE, TRUE, 0);
167 GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
168 gtk_widget_grab_default(GTK_WIDGET(bouton));
169 - gtk_widget_draw_default(GTK_WIDGET(bouton));
170 gtk_widget_show(bouton);
171
172 bouton = gtk_button_new_with_label("Cancel");
173
174
175
176 1.1 x11-plugins/wmmaiload/files/digest-wmmaiload-2.2.1-r1
177
178 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmaiload/files/digest-wmmaiload-2.2.1-r1?rev=1.1&view=markup
179 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmaiload/files/digest-wmmaiload-2.2.1-r1?rev=1.1&content-type=text/plain
180
181 Index: digest-wmmaiload-2.2.1-r1
182 ===================================================================
183 MD5 4ad615d763e6346aec72e856676ad28a wmmaiload-2.2.1.tar.gz 183538
184 RMD160 913ff65ce2c6bc208fcff617d986d23c458c8a4b wmmaiload-2.2.1.tar.gz 183538
185 SHA256 f8f281590c238a713d38825b698931bf73459125eb47bbba8c2e1d8ff1b11d3f wmmaiload-2.2.1.tar.gz 183538
186
187
188
189 --
190 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups