rpms/xvkbd/devel xvkbd-3.1-fix-warn.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3 xvkbd.spec, 1.2, 1.3 xvkbd-3.0-fix-warn.patch, 1.1, NONE
idak
idak at fedoraproject.org
Wed Feb 3 15:07:29 UTC 2010
Author: idak
Update of /cvs/pkgs/rpms/xvkbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3153/devel
Modified Files:
.cvsignore import.log sources xvkbd.spec
Added Files:
xvkbd-3.1-fix-warn.patch
Removed Files:
xvkbd-3.0-fix-warn.patch
Log Message:
* Wed Feb 3 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-1
- Update to 3.1
xvkbd-3.1-fix-warn.patch:
xvkbd.c | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
--- NEW FILE xvkbd-3.1-fix-warn.patch ---
--- xvkbd.c.3.0-fix-warn 2010-01-17 12:02:34.000000000 +0900
+++ xvkbd.c 2010-02-03 23:52:56.000000000 +0900
@@ -49,9 +49,7 @@
# include <X11/Xlocale.h>
#endif
-#ifdef USE_XTEST
# include <X11/extensions/XTest.h>
-#endif
#include "resources.h"
#define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.1)"
@@ -461,7 +459,7 @@ static Window focused_subwindow = None;
static Pixmap xvkbd_pixmap = None;
static int AddKeysym(KeySym keysym, Boolean top); /* forward */
-static void SendString(const unsigned char *str);
+static void SendString(const char *str);
static void MakeKeyboard(Boolean remake);
static void MakeKeypad(Widget form, Widget from_vert, Widget from_horiz);
static void MakeSunFunctionKey(Widget form, Widget from_vert, Widget from_horiz);
@@ -756,7 +754,9 @@ static int MyErrorHandler(Display *my_dp
*/
static void SendEvent(XKeyEvent *event)
{
+#ifdef USE_XTEST
static Boolean first = TRUE;
+#endif
if (!appres.no_sync) {
XSync(event->display, FALSE);
@@ -1310,9 +1310,9 @@ static void PopupCompletionPanel(void)
*/
static void KeyPressed(Widget w, char *key, char *data);
-static void SendString(const unsigned char *str)
+static void SendString(const char *str)
{
- const unsigned char *cp, *cp2; /* I remember "unsigned" might be required for some systems */
+ const char *cp, *cp2; /* I remember "unsigned" might be required for some systems */
char key[50];
int len;
int val;
@@ -1988,7 +1988,10 @@ static void MenuSelected(Widget w, char
Widget form;
if (strcmp(key, "man") == 0) {
- if (!appres.secure) system(appres.show_manual_command);
+ if (!appres.secure) {
+ int ret = system(appres.show_manual_command);
+ (void) ret;
+ }
} else if (strcmp(key, "about") == 0) {
if (about_panel == None) {
about_panel = XtVaCreatePopupShell("about_panel", transientShellWidgetClass,
@@ -2179,7 +2182,7 @@ static void KeyPressed(Widget w, char *k
if (appres.debug) fprintf(stderr, "Assigned string: %s\n", value);
if (value[0] == '!') {
if (appres.debug) fprintf(stderr, "Launching: %s\n", value + 1);
- if (!appres.secure) system(value + 1);
+ if (!appres.secure) { int ret = system(value + 1); (void) ret; }
} else {
if (value[0] == '\\') value = value + 1;
if (appres.debug) fprintf(stderr, "Sending: %s\n", value);
@@ -2343,9 +2346,15 @@ static void KeyPressed(Widget w, char *k
if ((cur_shift & ControlMask) && (cur_shift & alt_mask)) {
if (strstr(XServerVendor(dpy), "XFree86") != NULL) {
if (strcmp(key1, "KP_Add") == 0) {
- if (!appres.secure) system("xvidtune -next");
+ if (!appres.secure) {
+ int ret = system("xvidtune -next");
+ (void) ret;
+ }
} else if (strcmp(key1, "KP_Subtract") == 0) {
- if (!appres.secure) system("xvidtune -prev");
+ if (!appres.secure) {
+ int ret = system("xvidtune -prev");
+ (void) ret;
+ }
}
}
}
@@ -3253,7 +3262,7 @@ static void SetIconBitmap(Widget w)
static void VisibilityChanged(Widget w, XEvent *event,
String *pars, Cardinal *n_pars)
{
- static cnt = 0;
+ static int cnt = 0;
static time_t t1 = 0;
time_t t2;
@@ -3301,7 +3310,9 @@ int main(int argc, char *argv[])
Boolean open_keypad_panel = FALSE;
char ch;
Window child;
+#ifdef USE_XTEST
int op, ev, err;
+#endif
argc1 = argc;
argv1 = malloc(sizeof(char *) * (argc1 + 5));
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 1 Feb 2010 00:28:28 -0000 1.2
+++ .cvsignore 3 Feb 2010 15:07:28 -0000 1.3
@@ -1 +1 @@
-xvkbd-3.0.tar.gz
+xvkbd-3.1.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 1 Feb 2010 09:46:05 -0000 1.2
+++ import.log 3 Feb 2010 15:07:28 -0000 1.3
@@ -1,2 +1,3 @@
xvkbd-3_0-5_fc12:HEAD:xvkbd-3.0-5.fc12.src.rpm:1264984077
xvkbd-3_0-6_fc12:HEAD:xvkbd-3.0-6.fc12.src.rpm:1265017482
+xvkbd-3_1-1_fc12:HEAD:xvkbd-3.1-1.fc12.src.rpm:1265209589
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 1 Feb 2010 00:28:28 -0000 1.2
+++ sources 3 Feb 2010 15:07:28 -0000 1.3
@@ -1 +1 @@
-72fd96feeb2a589b2b68e9fa387afb0b xvkbd-3.0.tar.gz
+d1905b22bf134b9abba27444adc2bec0 xvkbd-3.1.tar.gz
Index: xvkbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/xvkbd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xvkbd.spec 1 Feb 2010 09:46:05 -0000 1.2
+++ xvkbd.spec 3 Feb 2010 15:07:28 -0000 1.3
@@ -1,7 +1,7 @@
Summary: Virtual Keyboard for X Window System
Name: xvkbd
-Version: 3.0
-Release: 6%{?dist}
+Version: 3.1
+Release: 1%{?dist}
License: GPLv2+
Group: User Interface/X
Source0: http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
@@ -16,7 +16,7 @@ BuildRequires: imake
Source1: %{name}.desktop
# The following icon is licensed under CC BY-SA 3.0.
Source2: http://jaist.dl.sourceforge.jp/xvkbd-fedora/45742/%{name}.png
-Patch0: %{name}-3.0-fix-warn.patch
+Patch0: %{name}-3.1-fix-warn.patch
%description
xvkbd is a virtual (graphical) keyboard program for X Window System
@@ -61,6 +61,9 @@ desktop-file-install --dir=%{buildroot}%
%{_datadir}/applications/%{name}.desktop
%changelog
+* Wed Feb 3 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-1
+- Update to 3.1
+
* Sun Feb 1 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-6
- Change Icon size
--- xvkbd-3.0-fix-warn.patch DELETED ---
More information about the scm-commits
mailing list