rpms/xvkbd/devel import.log, 1.5, 1.6 xvkbd-3.1-fix-warn-64bit.patch, 1.1, 1.2 xvkbd.spec, 1.5, 1.6
idak
idak at fedoraproject.org
Sat Feb 6 11:58:22 UTC 2010
Author: idak
Update of /cvs/pkgs/rpms/xvkbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16820/devel
Modified Files:
import.log xvkbd-3.1-fix-warn-64bit.patch xvkbd.spec
Log Message:
* Sat Feb 6 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-4
- Fix build withtout optflags (#562381)
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log 5 Feb 2010 18:03:58 -0000 1.5
+++ import.log 6 Feb 2010 11:58:22 -0000 1.6
@@ -3,3 +3,4 @@ xvkbd-3_0-6_fc12:HEAD:xvkbd-3.0-6.fc12.s
xvkbd-3_1-1_fc12:HEAD:xvkbd-3.1-1.fc12.src.rpm:1265209589
xvkbd-3_1-2_fc12:HEAD:xvkbd-3.1-2.fc12.src.rpm:1265306300
xvkbd-3_1-3_fc12:HEAD:xvkbd-3.1-3.fc12.src.rpm:1265392876
+xvkbd-3_1-4_fc12:HEAD:xvkbd-3.1-4.fc12.src.rpm:1265457434
xvkbd-3.1-fix-warn-64bit.patch:
resources.h | 5 +++--
xvkbd.c | 20 ++++++++++----------
2 files changed, 13 insertions(+), 12 deletions(-)
Index: xvkbd-3.1-fix-warn-64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/xvkbd-3.1-fix-warn-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xvkbd-3.1-fix-warn-64bit.patch 5 Feb 2010 18:03:58 -0000 1.1
+++ xvkbd-3.1-fix-warn-64bit.patch 6 Feb 2010 11:58:22 -0000 1.2
@@ -1,6 +1,6 @@
---- 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[
+--- a/xvkbd.c 2010-02-06 20:32:15.000000000 +0900
++++ b/xvkbd.c 2010-02-06 20:43:59.000000000 +0900
+@@ -369,9 +369,9 @@ static XtResource application_resources[
{ "keyClickPitch", "KeyClickPitch", XtRInt, sizeof(int),
Offset(key_click_pitch), XtRImmediate, (XtPointer)1000 },
@@ -41,13 +41,42 @@
button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
form, XtNfromVert, w, XtNfromHoriz, button,
XtNradioData, (XtPointer)val,
+@@ -1911,7 +1911,7 @@ static void PopupPropsPanel(void)
+ autoclick_buttons = button;
+ for (val = 500; val <= 1000; val += 100) {
+ char s1[10];
+- sprintf(s1, "%dms", val);
++ sprintf(s1, "%"PRIdPTR"ms", val);
+ button = XtVaCreateManagedWidget(s1, toggleWidgetClass,
+ form, XtNfromVert, w, XtNfromHoriz, button,
+ XtNradioData, (XtPointer)val,
+@@ -3025,8 +3025,8 @@ static void SaveFunctionKey(void)
+ fprintf(fp, "#shift_lock %d\n", appres.shift_lock);
+ fprintf(fp, "#altgr_lock %d\n", appres.altgr_lock);
+ fprintf(fp, "#modifiers_lock %d\n", appres.modifiers_lock);
+- fprintf(fp, "#key_click %d\n", appres.key_click_duration);
+- fprintf(fp, "#autoclick %d\n", appres.autoclick_delay);
++ fprintf(fp, "#key_click %"PRIdPTR"\n", appres.key_click_duration);
++ fprintf(fp, "#autoclick %"PRIdPTR"\n", appres.autoclick_delay);
+ fprintf(fp, "#always_on_top %d\n", appres.always_on_top);
+ fprintf(fp, "#jump_pointer %d\n", appres.jump_pointer);
+ for (sp = fkey_list; sp != NULL; sp = sp->next) {
+@@ -3198,7 +3198,7 @@ static void ShowBalloon(Widget w, XEvent
+ autoclick_id = XtAppAddTimeOut(app_con, (long)appres.autoclick_delay,
+ (XtTimerCallbackProc)Autoclick, (XtPointer)w);
+
+- if (appres.debug) fprintf(stderr, "ShowBalloon: auto click triggerd: %lx, %d\n",
++ if (appres.debug) fprintf(stderr, "ShowBalloon: auto click triggerd: %lx, %"PRIdPTR"\n",
+ (long)autoclick_id, appres.autoclick_delay);
+ }
+ value = FindFunctionKeyValue(XtName(w), TRUE);
--- a/resources.h 2010-01-17 09:39:37.000000000 +0900
-+++ b/resources.h 2010-02-05 02:37:18.000000000 +0900
++++ b/resources.h 2010-02-06 20:32:15.000000000 +0900
@@ -18,6 +18,7 @@
#ifndef PROGRAM_NAME
# define PROGRAM_NAME "xvkbd"
#endif
-+#include <inttypes.h>
++#include <inttypes.h>
struct appres_struct {
String description;
Index: xvkbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xvkbd/devel/xvkbd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- xvkbd.spec 5 Feb 2010 18:03:58 -0000 1.5
+++ xvkbd.spec 6 Feb 2010 11:58:22 -0000 1.6
@@ -1,7 +1,7 @@
Summary: Virtual Keyboard for X Window System
Name: xvkbd
Version: 3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
Group: User Interface/X
Source0: http://homepage3.nifty.com/tsato/xvkbd/%{name}-%{version}.tar.gz
@@ -33,14 +33,11 @@ characters specified as the command line
%patch1 -p1 -b .3.1-fix-warn-64bit
%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} %{?_smp_mflags}
+%{__make} CCOPTIONS="%{optflags}" %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
@@ -66,6 +63,9 @@ desktop-file-install --dir=%{buildroot}%
%{_datadir}/applications/%{name}.desktop
%changelog
+* Sat Feb 6 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-4
+- Fix build withtout optflags (#562381)
+
* Sat Feb 6 2010 Akio Idehara <zbe64533 at gmail.com> 3.1-3
- Separate patch related to 64-bit arch which depends on C99
More information about the scm-commits
mailing list