diff --git a/m17n-lib-1.4.0.tar.bz2 b/m17n-lib-1.4.0.tar.bz2 deleted file mode 100644 index c8aae3a..0000000 --- a/m17n-lib-1.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebc00ae24ac43b40dde49a26b1cbe91a5e00ba4d1039477bfb8e132e40e88b02 -size 469706 diff --git a/m17n-lib-1.5.1.diff b/m17n-lib-1.5.1.diff new file mode 100644 index 0000000..61aa512 --- /dev/null +++ b/m17n-lib-1.5.1.diff @@ -0,0 +1,73 @@ +--- example/medit.c ++++ example/medit.c +@@ -351,11 +351,12 @@ update_scroll_bar (int from, int to) + { + float top = (float) from / nchars; + float shown = (float) (to - from) / nchars; +- XtArgVal *l_top = (XtArgVal *) ⊤ +- XtArgVal *l_shown = (XtArgVal *) &shown; ++ union { float f; XtArgVal xav; } u; + +- XtSetArg (arg[0], XtNtopOfThumb, *l_top); +- XtSetArg (arg[1], XtNshown, *l_shown); ++ u.f = top; ++ XtSetArg (arg[0], XtNtopOfThumb, u.xav); ++ u.f = shown; ++ XtSetArg (arg[1], XtNshown, u.xav); + XtSetValues (SbarWidget, arg, 2); + } + +@@ -1927,7 +1928,7 @@ FilterProc (Widget w, XtPointer client_d + handle = dlopen (filter_module, RTLD_NOW); + if (! handle) + return; +- *(void **) (&func) = dlsym (handle, "filter"); ++ func = (void (*) (MText *, int, int)) dlsym (handle, "filter"); + if (func) + (*func) (mt, mtext_property_start (selection), + mtext_property_end (selection)); +--- src/face.c ++++ src/face.c +@@ -1852,7 +1852,7 @@ mface_get_prop (MFace *face, MSymbol key + { + if (key == Mhook_func) + /* This unsafe code is for backward compatiblity. */ +- return *(void **) &face->hook; ++ return (void *) face->hook; + MERROR (MERROR_FACE, NULL); + } + return face->property[index]; +@@ -1937,9 +1937,9 @@ mface_put_prop (MFace *face, MSymbol key + if (key == Mhook_func) + { + /* This unsafe code is for backward compatiblity. */ +- if (*(void **) &face->hook == val) ++ if (face->hook == (MFaceHookFunc) val) + return 0; +- *(void **) &face->hook = val; ++ face->hook = (MFaceHookFunc) val; + } + else + { +--- src/m17n-gui.c ++++ src/m17n-gui.c +@@ -657,12 +657,13 @@ mframe (MPlist *plist) + if (! interface->handle) + { + if (! (interface->handle = dlopen (interface->library, RTLD_NOW)) +- || ! (*(void **) (&interface->init) +- = dlsym (interface->handle, "device_init")) +- || ! (*(void **) (&interface->open) +- = dlsym (interface->handle, "device_open")) +- || ! (*(void **) (&interface->fini) +- = dlsym (interface->handle, "device_fini")) ++ || ! (interface->init ++ = (int (*) ()) dlsym (interface->handle, "device_init")) ++ || ! (interface->open ++ = ((int (*) (MFrame *, MPlist *)) ++ dlsym (interface->handle, "device_open"))) ++ || ! (interface->fini ++ = (int (*) ()) dlsym (interface->handle, "device_fini")) + || (*interface->init) () < 0) + { + fprintf (stderr, "%s\n", (char *) dlerror ()); diff --git a/m17n-lib-1.5.1.tar.gz b/m17n-lib-1.5.1.tar.gz new file mode 100644 index 0000000..2c2df1c --- /dev/null +++ b/m17n-lib-1.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e06ba9e2b39553c50c903667e164b4cc2e3a44dea5a20b75c8b5799141f435f5 +size 990729 diff --git a/m17n-lib.changes b/m17n-lib.changes index 3d9ddc6..52e64dc 100644 --- a/m17n-lib.changes +++ b/m17n-lib.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Feb 28 13:44:11 CET 2008 - schwab@suse.de + +- Update to m17n-lib 1.5.1. + * New API layer FLT is created. + * New environment variable MDEBUG_FLT is available to turn on + printing debug information for FLT, and these are now obsolete; + MDEBUG_FONT_FLT, MDEBUG_FONT_OTF. + * New functions mchartable_min_char () returns the mininum character. + that is set some value in a char-table. New funcion + mchartable_min_char () is for the maximum character. + ------------------------------------------------------------------- Wed Sep 05 18:48:43 CEST 2007 - mfabian@suse.de diff --git a/m17n-lib.spec b/m17n-lib.spec index 47a07ec..d9b97a5 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -1,14 +1,14 @@ # -# spec file for package m17n-lib (Version 1.4.0) +# spec file for package m17n-lib (Version 1.5.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: m17n-lib BuildRequires: anthy-devel freetype2-devel fribidi-devel gd-devel ispell ispell-british libotf-devel libxml2 m17n-db pkgconfig wordcut-devel xorg-x11-devel @@ -20,18 +20,19 @@ BuildRequires: libjpeg-devel libpng-devel %else %define appdefdir /usr/X11R6/lib/X11 %endif -Version: 1.4.0 -Release: 19 -License: GPL v2 or later, LGPL v2 or later +Version: 1.5.1 +Release: 1 +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT Group: System/I18n/Japanese -Autoreqprov: on +AutoReqProv: on Requires: m17n-db -URL: http://www.m17n.org/m17n-lib/ +Url: http://www.m17n.org/m17n-lib/ # CVS: # cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n login # cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-lib # cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-db -Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-1.4.0.tar.bz2 +Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-%{version}.tar.gz +Patch: m17n-lib-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Multilingual Text Processing Library for the C Language @@ -66,22 +67,21 @@ Authors: %prep %setup -q -n %{name}-%{version} -find . -name CVS -type d | xargs rm -rf +%patch +#find . -name CVS -type d | xargs rm -rf %build -./bootstrap.sh -libtoolize --force --automake -autoreconf --force --install --verbose -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \ -CXXFLAGS="$RPM_OPT_FLAGS-fno-strict-aliasing " \ -./configure --prefix=/usr \ +#./bootstrap.sh +#libtoolize --force --automake +#autoreconf --force --install --verbose +./configure CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ + --prefix=/usr \ --sysconfdir=%{_sysconfdir} \ --libdir=%{_libdir} \ --with-pic make %install -[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; make DESTDIR=${RPM_BUILD_ROOT} install # Japanese app-defaults: mkdir -p $RPM_BUILD_ROOT%{appdefdir}/{ja,ja_JP,ja_JP.eucJP,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults @@ -97,7 +97,7 @@ iconv -f EUC-JP -t UTF-8 < example/M17NEdit.ja \ > $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit %clean -rm -rf $RPM_BUILD_ROOT; +rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig @@ -106,8 +106,7 @@ rm -rf $RPM_BUILD_ROOT; %files %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog -%dir %{_libdir}/lib*.so.* -%{_libdir}/lib*.so +%{_libdir}/lib*.so* %{_bindir}/* %dir %{appdefdir}/?? %dir %{appdefdir}/??_* @@ -121,10 +120,19 @@ rm -rf $RPM_BUILD_ROOT; %{_libdir}/pkgconfig/*.pc %changelog -* Wed Sep 05 2007 - mfabian@suse.de +* Thu Feb 28 2008 schwab@suse.de +- Update to m17n-lib 1.5.1. + * New API layer FLT is created. + * New environment variable MDEBUG_FLT is available to turn on + printing debug information for FLT, and these are now obsolete; + MDEBUG_FONT_FLT, MDEBUG_FONT_OTF. + * New functions mchartable_min_char () returns the mininum character. + that is set some value in a char-table. New funcion + mchartable_min_char () is for the maximum character. +* Wed Sep 05 2007 mfabian@suse.de - add extra BuildRequires for SUSE_Linux_10.0 repository in the openSUSE build service. -* Wed Aug 01 2007 - mfabian@suse.de +* Wed Aug 01 2007 mfabian@suse.de - update to 1.4.0: • New function msymbol_put_func (), msymbol_get_func (), mplist_put_func (), mplist_get_func (), @@ -136,14 +144,14 @@ rm -rf $RPM_BUILD_ROOT; (was from upstream CVS). - add -fno-strict-aliasing . - add gd-devel to BuildRequires. -* Thu May 24 2007 - ro@suse.de +* Thu May 24 2007 ro@suse.de - added ldconfig to post scripts -* Tue Jan 09 2007 - mfabian@suse.de +* Tue Jan 09 2007 mfabian@suse.de - update to 1.3.4. - fix bugzilla #32303. -* Sun Oct 29 2006 - meissner@suse.de +* Sun Oct 29 2006 meissner@suse.de - build with RPM_OPT_FLAGS. Added some requires to -devel package. -* Mon Aug 28 2006 - mfabian@suse.de +* Mon Aug 28 2006 mfabian@suse.de - update to 1.3.3.20060828 (fixes bugzilla #199870). • If the environment variable "M17NDIR" is not set, the directory "~/.m17n.d" is serched for database files. @@ -154,39 +162,39 @@ rm -rf $RPM_BUILD_ROOT; language-related information. • New functions mscript_list () and mscript_language_list () return various script-related information. -* Mon Aug 14 2006 - mfabian@suse.de +* Mon Aug 14 2006 mfabian@suse.de - move app-defaults to /usr/share/X11 (for X11R7). -* Tue Jun 20 2006 - mfabian@suse.de +* Tue Jun 20 2006 mfabian@suse.de - update to 1.3.3.20060620: fixes bugzilla #185572 and some other small bugs. - install Japanese app-defaults. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 13 2006 - mfabian@suse.de +* Fri Jan 13 2006 mfabian@suse.de - update to 1.3.0.20060113 (CVS HEAD). -* Fri Jan 13 2006 - mfabian@suse.de +* Fri Jan 13 2006 mfabian@suse.de - update to 1.3.0. - add pkgconfig to # neededforbuild. -* Fri Jan 14 2005 - mfabian@suse.de +* Fri Jan 14 2005 mfabian@suse.de - add "ispell words ispell-british" to "# neededforbuild" to make the ispell input method work. -* Tue Dec 28 2004 - mfabian@suse.de +* Tue Dec 28 2004 mfabian@suse.de - update to 1.2.0. -* Tue Dec 21 2004 - mfabian@suse.de +* Tue Dec 21 2004 mfabian@suse.de - update to 1.1.0.20041221 (cvs version) to test the new minput_reset_ic() function. -* Thu Sep 30 2004 - mfabian@suse.de +* Thu Sep 30 2004 mfabian@suse.de - add "Requires: m17n-db". m17n-lib is almost useless without m17n-db and scim-m17n doesn't work at all without m17n-db. -* Mon Sep 20 2004 - mfabian@suse.de +* Mon Sep 20 2004 mfabian@suse.de - Bugzilla #45562: move .so files to main package. scim-m17n needs the .so files but it should not need to require m17n-devel. -* Fri Aug 20 2004 - mfabian@suse.de +* Fri Aug 20 2004 mfabian@suse.de - Bugzilla #44028: rename binaries from m* to m17n-* to remove conflict with majordomo's /usr/bin/medit. -* Tue Aug 17 2004 - mfabian@suse.de +* Tue Aug 17 2004 mfabian@suse.de - update to 1.1.0. - remove Zhe Su's patch m17n-lib-typedef.diff (included upstream). - remove my useless-header.patch (included upstream). -* Mon Aug 16 2004 - mfabian@suse.de +* Mon Aug 16 2004 mfabian@suse.de - new package: m17n-lib, version 1.0.2 diff --git a/rpmlintrc b/rpmlintrc new file mode 100644 index 0000000..e1f196e --- /dev/null +++ b/rpmlintrc @@ -0,0 +1,2 @@ +addFilter(".*devel-file-in-non-devel-package.*so") +addFilter(".*shlib-policy-missing-suffix")