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

idak idak at fedoraproject.org
Fri Feb 5 18:10:06 UTC 2010 

Author: idak

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

Modified Files:
	import.log xvkbd-3.1-fix-warn.patch xvkbd.spec 
Added Files:
	xvkbd-3.1-fix-warn-64bit.patch 
Log Message:
* Sat Feb 6 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-3
- Separate patch related to 64-bit arch which depends on C99


xvkbd-3.1-fix-warn-64bit.patch:
 resources.h |    5 +++--
 xvkbd.c     |   12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

--- NEW FILE xvkbd-3.1-fix-warn-64bit.patch ---
--- a/xvkbd.c	2010-01-17 12:02:34.000000000 +0900
+++ b/xvkbd.c	2010-02-05 02:48:43.000000000 +0900
@@ -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
@@ -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,
--- a/resources.h	2010-01-17 09:39:37.000000000 +0900
+++ b/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: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/F-12/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	4 Feb 2010 18:05:08 -0000	1.4
+++ import.log	5 Feb 2010 18:10:05 -0000	1.5
@@ -2,3 +2,4 @@ xvkbd-3_0-5_fc12:F-12:xvkbd-3.0-5.fc12.s
 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-3_fc12:F-12:xvkbd-3.1-3.fc12.src.rpm:1265393378

xvkbd-3.1-fix-warn.patch:
 xvkbd.c |   33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xvkbd-3.1-fix-warn.patch	4 Feb 2010 18:05:08 -0000	1.2
+++ xvkbd-3.1-fix-warn.patch	5 Feb 2010 18:10:05 -0000	1.3
@@ -1,5 +1,5 @@
---- xvkbd.c.3.1-fix-warn	2010-01-17 12:02:34.000000000 +0900
-+++ xvkbd.c	2010-02-05 02:48:43.000000000 +0900
+--- a/xvkbd.c	2010-01-17 12:02:34.000000000 +0900
++++ b/xvkbd.c	2010-02-05 02:48:43.000000000 +0900
 @@ -49,9 +49,7 @@
  # include <X11/Xlocale.h>
  #endif
@@ -10,18 +10,6 @@
  
  #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;
  
@@ -53,35 +41,6 @@
    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;
    
@@ -149,24 +108,3 @@
  
    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.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xvkbd.spec	4 Feb 2010 18:05:08 -0000	1.4
+++ xvkbd.spec	5 Feb 2010 18:10:05 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:       Virtual Keyboard for X Window System
 Name:          xvkbd
 Version:       3.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       GPLv2+
 Group:         User Interface/X
 Source0:       http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@ 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.1-fix-warn.patch
+Patch1:        %{name}-3.1-fix-warn-64bit.patch
 
 %description
 xvkbd is a virtual (graphical) keyboard program for X Window System
@@ -28,7 +29,8 @@ characters specified as the command line
 
 %prep
 %setup -q
-%patch0 -p0 -b .3.1-fix-warn
+%patch0 -p1 -b .3.1-fix-warn
+%patch1 -p1 -b .3.1-fix-warn-64bit
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
@@ -64,9 +66,12 @@ desktop-file-install --dir=%{buildroot}%
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sat Feb 6 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-3
+- Separate patch related to 64-bit arch which depends on C99
+
 * Fri Feb 5 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-2
 - Fix default define
-- Fix warning for 64-bit arch
+- Fix warning on 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