rpms/xvkbd/F-12 import.log, NONE, 1.1 xvkbd-3.0-fix-warn.patch, NONE, 1.1 xvkbd.desktop, NONE, 1.1 xvkbd.png, NONE, 1.1 xvkbd.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mon Feb 1 00:22:46 UTC 2010

Author: idak

Update of /cvs/pkgs/rpms/xvkbd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16403/F-12

Modified Files:
	.cvsignore sources 
Added Files:
	import.log xvkbd-3.0-fix-warn.patch xvkbd.desktop xvkbd.png 
	xvkbd.spec 
Log Message:
* Sun Jan 24 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-5
- Fix Icon permission

* Sun Jan 10 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-4
- Clarify Source2 license (CC BY-SA 3.0) and URL

* Fri Jan 8 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-3
- Add the lack of BuildRequires statements
- Fix build failure on x86_64
- Fix some trivial mistake

* Sat Dec 5 2009 Akio Idehara <zbe64533 at gmail.com> 3.0-2
- Add Desktop files

* Sat Dec 5 2009 Akio Idehara <zbe64533 at gmail.com> 3.0-1
- Initial RPM release

--- NEW FILE import.log ---
xvkbd-3_0-5_fc12:F-12:xvkbd-3.0-5.fc12.src.rpm:1264983607

xvkbd-3.0-fix-warn.patch:
 xvkbd.c |   31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

--- NEW FILE xvkbd-3.0-fix-warn.patch ---
--- xvkbd.c.3.0	2008-05-05 22:03:41.000000000 +0900
+++ xvkbd.c	2009-12-05 04:03:44.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.0)"
@@ -451,7 +449,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);
@@ -746,7 +744,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);
@@ -1300,9 +1300,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;
@@ -1973,7 +1973,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,
@@ -2156,7 +2159,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);
@@ -2320,9 +2323,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;
+            }
           }
         }
       }
@@ -3225,7 +3234,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;
 
@@ -3272,7 +3281,9 @@ int main(int argc, char *argv[])
 
   char ch;
   Window child;
+#ifdef USE_XTEST
   int op, ev, err;
+#endif
 
   argc1 = argc;
   argv1 = malloc(sizeof(char *) * (argc1 + 5));


--- NEW FILE xvkbd.desktop ---
[Desktop Entry]
Name=xvkbd
GenericName=Virtual Keyboard for X Window System
Comment=Virtual graphical keyboard
Exec=xvkbd
Icon=xvkbd
Terminal=false
Type=Application
Categories=Utility;


--- NEW FILE xvkbd.spec ---
Summary:       Virtual Keyboard for X Window System
Name:          xvkbd
Version:       3.0
Release:       5%{?dist}
License:       GPLv2+
Group:         User Interface/X
Source0:       http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
URL:           http://homepage3.nifty.com/tsato/xvkbd/index.html
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: libX11-devel
BuildRequires: Xaw3d-devel >= 1.5E-1
BuildRequires: libXaw-devel
BuildRequires: libXtst-devel
BuildRequires: imake
Source1:       %{name}.desktop
# The following icon is licensed under CC BY-SA 3.0.
Source2:       http://jaist.dl.sourceforge.jp/xvkbd-fedora/45371/%{name}.png
Patch0:        %{name}-3.0-fix-warn.patch

%description
xvkbd is a virtual (graphical) keyboard program for X Window System
which provides facility to enter characters onto other clients
(softwares) by clicking on a keyboard displayed on the screen. This
may be used for systems without a hardware keyboard such as kiosk
terminals or handheld devices. This program also has facility to send
characters specified as the command line option to another client.

%prep
%setup -q
%patch0 -p0 -b .3.0-fix-warn

%build
xmkmf -a
# Installed "normal" files should have 0644 permission, not 0444 permission.
# So I modify Makefile directly.
%{__sed} -i.mode -e 's|-m 0444|-m 0644|' Makefile
%{__make} CFLAGS="%{optflags}" %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
# By default this installs some file under /usr/lib/X11/app-defaults,
# even on 64 bit architecture. So I had to add "LIBDIR=%{_libdir}/X11".
%{__make} LIBDIR=%{_libdir}/X11 DESTDIR=%{buildroot} INSTALLFLAGS="-c -p" \
          install install.man
%{__rm} -rf %{buildroot}%{_libdir}/X11/app-defaults
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
%{__install} -d -m 755 %{buildroot}%{_datadir}/pixmaps
%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/pixmaps

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_datadir}/X11/app-defaults/XVkbd*
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop

%changelog
* Sun Jan 24 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-5
- Fix Icon permission

* Sun Jan 10 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-4
- Clarify Source2 license (CC BY-SA 3.0) and URL

* Fri Jan 8 2010 Akio Idehara <zbe64533 at gmail.com> 3.0-3
- Add the lack of BuildRequires statements
- Fix build failure on x86_64
- Fix some trivial mistake

* Sat Dec 5 2009 Akio Idehara <zbe64533 at gmail.com> 3.0-2
- Add Desktop files

* Sat Dec 5 2009 Akio Idehara <zbe64533 at gmail.com> 3.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	31 Jan 2010 18:28:06 -0000	1.1
+++ .cvsignore	1 Feb 2010 00:22:46 -0000	1.2
@@ -0,0 +1 @@
+xvkbd-3.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	31 Jan 2010 18:28:06 -0000	1.1
+++ sources	1 Feb 2010 00:22:46 -0000	1.2
@@ -0,0 +1 @@
+72fd96feeb2a589b2b68e9fa387afb0b  xvkbd-3.0.tar.gz

