rpms/iiimf/devel gimlet-missing-static.patch, NONE, 1.1 iiimp-not-supported-F_UNLKSYS.patch, NONE, 1.1 iiimf.spec, 1.68, 1.69 EIMIL-fix-uninitialized-value.patch, 1.1, NONE gimlet-default-icon-r2665-159121.patch, 1.2, NONE iiimgcf-deadkey.patch, 1.1, NONE iiimgcf-fix-hang-r2757.patch, 1.1, NONE iiimgcf-fix-memory-leak-r2660.patch, 1.1, NONE iiimp-fix-memory-leak-r2770.patch, 1.1, NONE iiimsf-fix-memory-leak-r2764.patch, 1.1, NONE leif-unit-fix-deadkey-sequence-r2729.patch, 1.1, NONE leif-unit-fix-freeze-with-flipping-focus-r2664.patch, 1.1, NONE leif-unit-fix-key-twice-r2614-162646.patch, 1.1, NONE xiiimp-fix-infinite-loop-property-notify-event-r2661.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 16 07:08:50 UTC 2005
- Previous message (by thread): rpms/dia/FC-4 dia-0.94-rh165337.patch,NONE,1.1 dia.spec,1.27,1.28
- Next message (by thread): rpms/openoffice.org/devel .cvsignore, 1.79, 1.80 openoffice.org.spec, 1.470, 1.471 sources, 1.116, 1.117 openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch, 1.6, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tagoh
Update of /cvs/dist/rpms/iiimf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26306
Modified Files:
iiimf.spec
Added Files:
gimlet-missing-static.patch
iiimp-not-supported-F_UNLKSYS.patch
Removed Files:
EIMIL-fix-uninitialized-value.patch
gimlet-default-icon-r2665-159121.patch iiimgcf-deadkey.patch
iiimgcf-fix-hang-r2757.patch
iiimgcf-fix-memory-leak-r2660.patch
iiimp-fix-memory-leak-r2770.patch
iiimsf-fix-memory-leak-r2764.patch
leif-unit-fix-deadkey-sequence-r2729.patch
leif-unit-fix-freeze-with-flipping-focus-r2664.patch
leif-unit-fix-key-twice-r2614-162646.patch
xiiimp-fix-infinite-loop-property-notify-event-r2661.patch
Log Message:
* Wed Sep 14 2005 Akira TAGOH <tagoh at redhat.com> - 1:12.3.91-1.svn2814
- New upstream release.
- Removed the unnecessary patches:
- gimlet-default-icon-r2665-159121.patch
- iiimgcf-fix-memory-leak-r2660.patch
- iiimgcf-fix-hang-r2757.patch
- iiimgcf-deadkey.patch
- iiimsf-fix-memory-leak-r2764.patch
- xiiimp-fix-infinite-loop-property-notify-event-r2661.patch
- iiimp-fix-memory-leak-r2770.patch
- iiimgcf-revert-to-r2562-for-slowness-workaround.patch
- iiimcf-revert-to-r2562-for-slowness-workaround.patch
- EIMIL-fix-uninitialized-value.patch
- leif-unit-fix-key-twice-r2614-162646.patch
- leif-unit-fix-freeze-with-flipping-focus-r2664.patch
- leif-unit-fix-deadkey-sequence-r2729.patch
- Added new patches:
- gimlet-missing-static.patch: applied to fix the build fails.
- iiimp-not-supported-F_UNLKSYS.patch: likewise.
gimlet-missing-static.patch:
iiim-interface.c | 4 ++--
language.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE gimlet-missing-static.patch ---
diff --exclude '*.in' --exclude '*.server' --exclude '*.gmo' --exclude '.intl*' --exclude '*.o' --exclude '*.out' --exclude '*.schemas' --exclude '*.desktop' --exclude .deps --exclude .libs -ruN iiimf-12.3.91-svn2814.orig/gnome-im-switcher/src/iiim-interface.c iiimf-12.3.91-svn2814/gnome-im-switcher/src/iiim-interface.c
--- iiimf-12.3.91-svn2814.orig/gnome-im-switcher/src/iiim-interface.c 2005-08-12 13:38:14.000000000 +0900
+++ iiimf-12.3.91-svn2814/gnome-im-switcher/src/iiim-interface.c 2005-09-15 19:13:24.000000000 +0900
@@ -32,8 +32,8 @@
#include "iiim-interface.h"
#include "quick-access-menu.h"
-void process_hotkey (GimletWindow *, gpointer, int);
-char *change_hotkey_with_trigger (char *, char *);
+static void process_hotkey (GimletWindow *, gpointer, int);
+static char *change_hotkey_with_trigger (char *, char *);
static void
process_language_list (GimletWindow *gimlet,
diff --exclude '*.in' --exclude '*.server' --exclude '*.gmo' --exclude '.intl*' --exclude '*.o' --exclude '*.out' --exclude '*.schemas' --exclude '*.desktop' --exclude .deps --exclude .libs -ruN iiimf-12.3.91-svn2814.orig/gnome-im-switcher/src/language.c iiimf-12.3.91-svn2814/gnome-im-switcher/src/language.c
--- iiimf-12.3.91-svn2814.orig/gnome-im-switcher/src/language.c 2005-08-12 13:38:14.000000000 +0900
+++ iiimf-12.3.91-svn2814/gnome-im-switcher/src/language.c 2005-09-15 19:13:44.000000000 +0900
@@ -56,8 +56,8 @@
/*
* Utility stuff
*/
-void gconf_set_conversion_keys (GtkWidget *, GSList *);
-char *gconf_get_conversion_keys (GimletWindow *);
+static void gconf_set_conversion_keys (GtkWidget *, GSList *);
+static char *gconf_get_conversion_keys (GimletWindow *);
static GSList *active_languages = NULL;
iiimp-not-supported-F_UNLKSYS.patch:
comp-file-operation.c | 6 ++++++
1 files changed, 6 insertions(+)
--- NEW FILE iiimp-not-supported-F_UNLKSYS.patch ---
diff -ruN iiimf-12.3.91-svn2814.orig/lib/iiimp/data/comp-file-operation.c iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c
--- iiimf-12.3.91-svn2814.orig/lib/iiimp/data/comp-file-operation.c 2005-08-24 16:23:16.000000000 +0900
+++ iiimf-12.3.91-svn2814/lib/iiimp/data/comp-file-operation.c 2005-09-15 12:56:51.000000000 +0900
@@ -134,8 +134,10 @@
return F_WRLCK;
case IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLCK:
return F_UNLCK;
+#if !defined(__linux__)
case IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLKSYS:
return F_UNLKSYS;
+#endif
default:
return -1;
}
@@ -153,8 +155,10 @@
return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_WRLCK;
case F_UNLCK:
return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLCK;
+#if !defined(__linux__)
case F_UNLKSYS:
return IIIMP_FILE_OPERATION_FCNTL_FLOCK_TYPE_F_UNLKSYS;
+#endif
default:
return -1;
}
@@ -7319,8 +7323,10 @@
return "F_WRLCK";
case F_UNLCK:
return "F_UNLCK";
+#if !defined(__linux__)
case F_UNLKSYS:
return "F_UNLKSYS";
+#endif
default:
return "UNKNOWN";
}
Index: iiimf.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf/devel/iiimf.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- iiimf.spec 16 Aug 2005 12:15:53 -0000 1.68
+++ iiimf.spec 16 Sep 2005 07:08:47 -0000 1.69
@@ -1,5 +1,5 @@
# openi18n upstream svn revision number
-%define revision 2612
+%define revision 2814
## 1 to bootstrap tarball
## 0 for already bootstrapped tarball
@@ -9,8 +9,10 @@
#%%define branch trunk
#%%define srclabel %{branch}-svn%{revision}
+# for beta
+%define srclabel %{version}-svn%{revision}
# for releases
-%define srclabel %{version}
+#%%define srclabel %{version}
## if macro _with_<subdir> is defined, it means subdir is to be built
#%%define _with_chewing_le %{nil}
@@ -33,10 +35,10 @@
Summary: IIIMF multilingual Unicode input method framework
Name: iiimf
Epoch: 1
-Version: 12.2
+Version: 12.3.91
## for builds suffixed with the svn release please only increment the leading release number when updating
# append .svn%{revision} for snapshots
-Release: 10
+Release: 1.svn%{revision}
License: Distributable
Source: %{name}-src-%{srclabel}.tar.bz2
Source2: iiimd-init.d
@@ -69,7 +71,7 @@
## GIMLET patches (100-)
Patch100: gimlet-desktop-dir-149226.patch
-Patch101: gimlet-default-icon-r2665-159121.patch
+Patch101: gimlet-missing-static.patch
### RH-specific (+50~)
## IIIMECF patches (200-)
@@ -78,9 +80,6 @@
## IIIMGCF patches (300-)
Patch300: im-sdk-iiimgcf-warning.patch
Patch301: iiimgcf-event-status-done.patch
-Patch302: iiimgcf-fix-memory-leak-r2660.patch
-Patch303: iiimgcf-fix-hang-r2757.patch
-Patch304: iiimgcf-deadkey.patch
### RH-specific (+50~)
Patch350: iiimgcf-revert-to-r2562-for-slowness-workaround.patch
@@ -93,7 +92,6 @@
## IIIMSF patches (600-)
Patch600: im-sdk-11.4-iiimsf-daemon.patch
-Patch601: iiimsf-fix-memory-leak-r2764.patch
### RH-specific (+50~)
Patch650: iiimsf-rh-debuginfo.patch
Patch651: iiimsf-rh-per-user-hotkey.patch
@@ -106,7 +104,6 @@
Patch750: htt_xbe-rh-fix-build-20040203.patch
## IIIMXCF(xiiimp) patches (800-)
-Patch800: xiiimp-fix-infinite-loop-property-notify-event-r2661.patch
### RH-specific (+50~)
Patch850: xiiimp-rh-fix-build-20040203.patch
Patch851: xiiimp-pango.patch
@@ -117,7 +114,7 @@
#Patch854: xiiimp-xft-statusarea-147457.patch
## IIIMP patches (900-)
-Patch900: iiimp-fix-memory-leak-r2770.patch
+Patch900: iiimp-not-supported-F_UNLKSYS.patch
### RH-specific (+50~)
Patch950: iiimp-revert-to-r2562-for-slowness-workaround.patch
@@ -126,7 +123,6 @@
Patch1050: iiimcf-revert-to-r2562-for-slowness-workaround.patch
## EIMIL patches (1100-)
-Patch1100: EIMIL-fix-uninitialized-value.patch
### RH-specific (+50~)
## LEIF toplevel patches (1900-)
@@ -158,9 +154,6 @@
### RH-specific (+50~)
## LEIF(UNIT) patches (2800-)
-Patch2800: leif-unit-fix-key-twice-r2614-162646.patch
-Patch2801: leif-unit-fix-freeze-with-flipping-focus-r2664.patch
-Patch2802: leif-unit-fix-deadkey-sequence-r2729.patch
### RH-specific (+50~)
Patch2850: leif-unit-rh-fix-build-20040203.patch
Patch2851: leif-unit-xdict-silence-txt2bin.patch
@@ -417,16 +410,13 @@
### RH-specific (+50~)
## GIMLET patches (100-)
%patch100 -p1 -b .100-gnomecc
-%patch101 -p0 -b .101-default-icon
+%patch101 -p1 -b .101-missing-static
### RH-specific (+50~)
## IIIMECF patches (200-)
### RH-specific (+50~)
## IIIMGCF patches (300-)
%patch300 -p1 -b .300-warnings
%patch301 -p1 -b .301-status_end
-%patch302 -p0 -b .302-memleak
-%patch303 -p0 -b .303-fix-hang
-%patch304 -p1 -b .304-deadkey
### RH-specific (+50~)
%patch350 -p0 -R -b .350-revert-to-r2562
## IIIMJCF patches (400-)
@@ -436,7 +426,6 @@
%patch550 -p1 -b .550-build
## IIIMSF patches (600-)
%patch600 -p1 -b .600-rh-daemon
-%patch601 -p0 -b .601-fix-memleak
### RH-specific (+50~)
%patch650 -p1 -b .650-rh-debuginfo
%patch651 -p1 -b .651-rh-per-user-hotkey
@@ -447,7 +436,6 @@
### RH-specific (+50~)
%patch750 -p1 -b .750-rh-build-20040203
## IIIMXCF(xiiimp) patches (800-)
-%patch800 -p0 -b .800-loop-property-notify
### RH-specific (+50~)
%patch850 -p1 -b .850-rh-build-20040203
%patch851 -p1 -b .851-pango
@@ -455,14 +443,13 @@
#%%patch853 -p1 -b .853-xft-highlight
#%%patch854 -p1 -b .854-xft-statusarea
## IIIMP patches (900-)
-%patch900 -p0 -b .900-fix-memleak
+%patch900 -p1 -b .900-not-supported-F_UNLKSYS
### RH-specific (+50~)
-%patch950 -p0 -R -b .950-revert-to-r2562
+#%%patch950 -p0 -R -b .950-revert-to-r2562
## IIIMCF patches (1000-)
### RH-specific (+50~)
-%patch1050 -p0 -R -b .1050-revert-to-r2562
+#%%patch1050 -p0 -R -b .1050-revert-to-r2562
## EIMIL patches (1100-)
-%patch1100 -p1 -b .1100-uninit-val
### RH-specific (+50~)
## LEIF toplevel patches (1900-)
### RH-specific (+50~)
@@ -484,9 +471,6 @@
## LEIF(Sun Traditional Chinese) patches (2700-)
### RH-specific (+50~)
## LEIF(UNIT) patches (2800-)
-%patch2800 -p0 -b .2800-twice
-%patch2801 -p0 -b .2801-freeze
-%patch2802 -p0 -b .2802-deadkey-seq
### RH-specific (+50~)
%patch2850 -p1 -b .2850-rh-build-20040203
%patch2851 -p1 -b .2851-verbose
@@ -1019,6 +1003,26 @@
%endif
%changelog
+* Wed Sep 14 2005 Akira TAGOH <tagoh at redhat.com> - 1:12.3.91-1.svn2814
+- New upstream release.
+- Removed the unnecessary patches:
+ - gimlet-default-icon-r2665-159121.patch
+ - iiimgcf-fix-memory-leak-r2660.patch
+ - iiimgcf-fix-hang-r2757.patch
+ - iiimgcf-deadkey.patch
+ - iiimsf-fix-memory-leak-r2764.patch
+ - xiiimp-fix-infinite-loop-property-notify-event-r2661.patch
+ - iiimp-fix-memory-leak-r2770.patch
+ - iiimgcf-revert-to-r2562-for-slowness-workaround.patch
+ - iiimcf-revert-to-r2562-for-slowness-workaround.patch
+ - EIMIL-fix-uninitialized-value.patch
+ - leif-unit-fix-key-twice-r2614-162646.patch
+ - leif-unit-fix-freeze-with-flipping-focus-r2664.patch
+ - leif-unit-fix-deadkey-sequence-r2729.patch
+- Added new patches:
+ - gimlet-missing-static.patch: applied to fix the build fails.
+ - iiimp-not-supported-F_UNLKSYS.patch: likewise.
+
* Tue Aug 16 2005 Akira TAGOH <tagoh at redhat.com> - 1:12.2-10
- Rebuild
--- EIMIL-fix-uninitialized-value.patch DELETED ---
--- gimlet-default-icon-r2665-159121.patch DELETED ---
--- iiimgcf-deadkey.patch DELETED ---
--- iiimgcf-fix-hang-r2757.patch DELETED ---
--- iiimgcf-fix-memory-leak-r2660.patch DELETED ---
--- iiimp-fix-memory-leak-r2770.patch DELETED ---
--- iiimsf-fix-memory-leak-r2764.patch DELETED ---
--- leif-unit-fix-deadkey-sequence-r2729.patch DELETED ---
--- leif-unit-fix-freeze-with-flipping-focus-r2664.patch DELETED ---
--- leif-unit-fix-key-twice-r2614-162646.patch DELETED ---
--- xiiimp-fix-infinite-loop-property-notify-event-r2661.patch DELETED ---
- Previous message (by thread): rpms/dia/FC-4 dia-0.94-rh165337.patch,NONE,1.1 dia.spec,1.27,1.28
- Next message (by thread): rpms/openoffice.org/devel .cvsignore, 1.79, 1.80 openoffice.org.spec, 1.470, 1.471 sources, 1.116, 1.117 openoffice.org-1.9.125.ooo53699.uzipunused.postprocess.patch, 1.6, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list