Hello community, here is the log from the commit of package xvkbd for openSUSE:Factory checked in at Mon Dec 7 16:06:26 CET 2009. -------- --- xvkbd/xvkbd.changes 2008-12-18 18:18:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/xvkbd/xvkbd.changes 2009-12-04 15:05:54.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 4 15:04:04 CET 2009 - seife@opensuse.org + +- de-fuzz the compilerwarnings patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xvkbd-2.7a-compilerwarnings.diff xvkbd-2.8-fix-compilerwarnings.diff New: ---- xvkbd-3.0-compilerwarnings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xvkbd.spec ++++++ --- /var/tmp/diff_new_pack.YKl3Ch/_old 2009-12-07 16:05:57.000000000 +0100 +++ /var/tmp/diff_new_pack.YKl3Ch/_new 2009-12-07 16:05:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xvkbd (Version 3.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,8 @@ %endif Summary: Virtual Keyboard for the X Window System Version: 3.0 -Release: 29 -License: GPL v2 or later +Release: 30 +License: GPLv2+ Group: System/X11/Utilities BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://homepage3.nifty.com/tsato/xvkbd/ @@ -34,8 +34,7 @@ Source1: xvkbd.desktop Source2: xvkbd.png Source3: xvkbd.default -Patch0: %{name}-2.7a-compilerwarnings.diff -Patch1: %{name}-2.8-fix-compilerwarnings.diff +Patch1: xvkbd-3.0-compilerwarnings.diff %description Xvkbd is a virtual (graphical) keyboard program for the X Window System @@ -50,8 +49,7 @@ %prep %setup -q -%patch0 -%patch1 +%patch1 -p1 %build xmkmf -a ++++++ xvkbd-2.7a-compilerwarnings.diff -> xvkbd-3.0-compilerwarnings.diff ++++++ --- xvkbd/xvkbd-2.7a-compilerwarnings.diff 2007-01-16 00:44:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/xvkbd/xvkbd-3.0-compilerwarnings.diff 2009-12-04 15:05:54.000000000 +0100 @@ -1,6 +1,10 @@ ---- xvkbd.c -+++ xvkbd.c -@@ -440,7 +440,7 @@ +Index: b/xvkbd.c +=================================================================== +--- a/xvkbd.c ++++ b/xvkbd.c +@@ -449,11 +449,11 @@ static Window focused_window = None; + static Window focused_subwindow = None; + static Pixmap xvkbd_pixmap = None; static int AddKeysym(KeySym keysym, Boolean top); /* forward */ @@ -9,7 +13,11 @@ 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); -@@ -1289,9 +1289,9 @@ + static void MakeDeadkeyPanel(Widget form); + static void RefreshMainMenu(void); +@@ -1298,13 +1298,13 @@ static void PopupCompletionPanel(void) + * Send given string to the focused window as if the string + * is typed from a keyboard. */ static void KeyPressed(Widget w, char *key, char *data); @@ -20,8 +28,62 @@ + const char *cp, *cp2; /* I remember "unsigned" might be required for some systems */ char key[50]; int len; + int val; + Window target_root, child, junk_w; + int junk_i; +@@ -1971,11 +1971,13 @@ static void OpenRemoteDisplay(Widget w, + static void MenuSelected(Widget w, char *key) + { + Widget form; + + if (strcmp(key, "man") == 0) { +- if (!appres.secure) system(appres.show_manual_command); ++ if (!appres.secure) { ++ if (system(appres.show_manual_command) == -1) fprintf(stderr, "Error call: %s\n", appres.show_manual_command); ++ } + } else if (strcmp(key, "about") == 0) { + if (about_panel == None) { + about_panel = XtVaCreatePopupShell("about_panel", transientShellWidgetClass, + toplevel, NULL); + XtVaCreateManagedWidget("message", labelWidgetClass, about_panel, +@@ -2154,11 +2156,13 @@ static void KeyPressed(Widget w, char *k + value = FindFunctionKeyValue(key, TRUE); + if (value != NULL) { + 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) { ++ if (system(value + 1) == -1) fprintf(stderr, "Could not Launch: %s\n", value + 1); ++ } + } else { + if (value[0] == '\\') value = value + 1; + if (appres.debug) fprintf(stderr, "Sending: %s\n", value); + SendString(value); + } +@@ -2318,13 +2322,17 @@ static void KeyPressed(Widget w, char *k + AddToCompletionText(keysym); -@@ -2972,7 +2972,7 @@ + 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) { ++ if (system("xvidtune -next") == -1) fprintf(stderr, "Error call system(xvidtune -next)\n"); ++ } + } else if (strcmp(key1, "KP_Subtract") == 0) { +- if (!appres.secure) system("xvidtune -prev"); ++ if (!appres.secure) { ++ if (system("xvidtune -prev") == -1) fprintf(stderr, "Error call system(xvidtune -prev)\n"); ++ } + } + } + } + } + if (!appres.shift_lock) +@@ -3223,11 +3231,11 @@ static void SetIconBitmap(Widget w) + * when xvkbd window is hidden by other window. ** EXPERIMENTAL ** + */ static void VisibilityChanged(Widget w, XEvent *event, String *pars, Cardinal *n_pars) { @@ -30,3 +92,5 @@ static time_t t1 = 0; time_t t2; + if (!appres.always_on_top) return; + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org