rpms/xvkbd/F-12 import.log, 1.3, 1.4 xvkbd-3.1-fix-warn.patch, 1.1, 1.2 xvkbd.spec, 1.3, 1.4

idak idak at fedoraproject.org
Thu Feb 4 18:05:08 UTC 2010


Author: idak

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

Modified Files:
	import.log xvkbd-3.1-fix-warn.patch xvkbd.spec 
Log Message:
* Fri Feb 5 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-2
- Fix default define
- Fix warning for 64-bit arch



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/F-12/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	3 Feb 2010 15:19:38 -0000	1.3
+++ import.log	4 Feb 2010 18:05:08 -0000	1.4
@@ -1,3 +1,4 @@
 xvkbd-3_0-5_fc12:F-12:xvkbd-3.0-5.fc12.src.rpm:1264983607
 xvkbd-3_0-6_fc12:F-12:xvkbd-3.0-6.fc12.src.rpm:1265017613
 xvkbd-3_1-1_fc12:F-12:xvkbd-3.1-1.fc12.src.rpm:1265210354
+xvkbd-3_1-2_fc12:F-12:xvkbd-3.1-2.fc12.src.rpm:1265306667

xvkbd-3.1-fix-warn.patch:
 resources.h |    5 +++--
 xvkbd.c     |   45 ++++++++++++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 19 deletions(-)

Index: xvkbd-3.1-fix-warn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/F-12/xvkbd-3.1-fix-warn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xvkbd-3.1-fix-warn.patch	3 Feb 2010 15:19:39 -0000	1.1
+++ xvkbd-3.1-fix-warn.patch	4 Feb 2010 18:05:08 -0000	1.2
@@ -1,5 +1,5 @@
---- xvkbd.c.3.0-fix-warn	2010-01-17 12:02:34.000000000 +0900
-+++ xvkbd.c	2010-02-03 23:52:56.000000000 +0900
+--- xvkbd.c.3.1-fix-warn	2010-01-17 12:02:34.000000000 +0900
++++ xvkbd.c	2010-02-05 02:48:43.000000000 +0900
 @@ -49,9 +49,7 @@
  # include <X11/Xlocale.h>
  #endif
@@ -10,6 +10,18 @@
  
  #include "resources.h"
  #define PROGRAM_NAME_WITH_VERSION "xvkbd (v3.1)"
+@@ -371,9 +369,9 @@ static XtResource application_resources[
+ 
+   { "keyClickPitch", "KeyClickPitch", XtRInt, sizeof(int),
+      Offset(key_click_pitch), XtRImmediate, (XtPointer)1000 },
+-  { "keyClickDuration", "KeyClickDuration", XtRInt, sizeof(int),
++  { "keyClickDuration", "KeyClickDuration", XtRInt, sizeof(intptr_t),
+      Offset(key_click_duration), XtRImmediate, (XtPointer)1 },
+-  { "autoClickDelay", "AutoClickDelay", XtRInt, sizeof(int),
++  { "autoClickDelay", "AutoClickDelay", XtRInt, sizeof(intptr_t),
+      Offset(autoclick_delay), XtRImmediate, (XtPointer)0 },
+ };
+ #undef Offset
 @@ -461,7 +459,7 @@ static Window focused_subwindow = None;
  static Pixmap xvkbd_pixmap = None;
  
@@ -41,6 +53,35 @@
    char key[50];
    int len;
    int val;
+@@ -1807,8 +1807,8 @@ static void PropsItemToggled(Widget w, c
+   XtVaGetValues(XtNameToWidget(props_panel, "*jump_pointer"),
+ 		XtNstate, &appres.jump_pointer, NULL);
+ 
+-  appres.key_click_duration = (int)XawToggleGetCurrent(click_buttons);
+-  appres.autoclick_delay = (int)XawToggleGetCurrent(autoclick_buttons);
++  appres.key_click_duration = (intptr_t)XawToggleGetCurrent(click_buttons);
++  appres.autoclick_delay = (intptr_t)XawToggleGetCurrent(autoclick_buttons);
+ 
+   SaveFunctionKey();
+ }
+@@ -1864,7 +1864,7 @@ static void PopupPropsPanel(void)
+     Widget label, button;
+     Widget form, w;
+     int i;
+-    int val;
++    intptr_t val;
+ 
+     props_panel = XtVaCreatePopupShell("props_panel", transientShellWidgetClass,
+ 				       toplevel, NULL);
+@@ -1889,7 +1889,7 @@ static void PopupPropsPanel(void)
+     click_buttons = button;
+     for (val = 1; val <= 50; val *= 2) {
+       char s1[10];
+-      sprintf(s1, "%dms", val);
++      sprintf(s1, "%"PRIdPTR"ms", val);
+       button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
+ 			       form, XtNfromVert, w, XtNfromHoriz, button,
+ 			       XtNradioData, (XtPointer)val,
 @@ -1988,7 +1988,10 @@ static void MenuSelected(Widget w, char 
    Widget form;
    
@@ -53,6 +94,15 @@
    } else if (strcmp(key, "about") == 0) {
      if (about_panel == None) {
        about_panel = XtVaCreatePopupShell("about_panel", transientShellWidgetClass,
+@@ -2146,7 +2149,7 @@ static void IconifyWindow(Widget w, Bool
+   }
+ }
+ 
+-void SignalUser1(void)
++void SignalUser1(int ignore)
+ {
+   XWindowAttributes attr;
+   XGetWindowAttributes(dpy, XtWindow(toplevel), &attr);
 @@ -2179,7 +2182,7 @@ static void KeyPressed(Widget w, char *k
      if (appres.debug) fprintf(stderr, "Assigned string: %s\n", value);
      if (value[0] == '!') {
@@ -99,3 +149,24 @@
  
    argc1 = argc;
    argv1 = malloc(sizeof(char *) * (argc1 + 5));
+--- resources.h.3.1-fix-warn	2010-01-17 09:39:37.000000000 +0900
++++ resources.h	2010-02-05 02:37:18.000000000 +0900
+@@ -18,6 +18,7 @@
+ #ifndef PROGRAM_NAME
+ # define PROGRAM_NAME "xvkbd"
+ #endif
++#include <inttypes.h> 
+ 
+ struct appres_struct {
+   String description;
+@@ -98,8 +99,8 @@ struct appres_struct {
+   float max_height_ratio;
+   int text_delay;
+   int key_click_pitch;
+-  int key_click_duration;
+-  int autoclick_delay;
++  intptr_t key_click_duration;
++  intptr_t autoclick_delay;
+ } appres;
+ 
+ 


Index: xvkbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/F-12/xvkbd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xvkbd.spec	3 Feb 2010 15:19:39 -0000	1.3
+++ xvkbd.spec	4 Feb 2010 18:05:08 -0000	1.4
@@ -1,7 +1,7 @@
 Summary:       Virtual Keyboard for X Window System
 Name:          xvkbd
 Version:       3.1
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPLv2+
 Group:         User Interface/X
 Source0:       http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
@@ -28,14 +28,17 @@ characters specified as the command line
 
 %prep
 %setup -q
-%patch0 -p0 -b .3.0-fix-warn
+%patch0 -p0 -b .3.1-fix-warn
 
 %build
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
+FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ;
 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}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -61,6 +64,10 @@ desktop-file-install --dir=%{buildroot}%
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Fri Feb 5 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-2
+- Fix default define
+- Fix warning for 64-bit arch
+
 * Wed Feb 3 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-1
 - Update to 3.1
 



More information about the scm-commits mailing list