pool/m17n-lib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 38559 from M17N

Browse Source 
Copy from M17N/m17n-lib based on submit request 38559 from user tiwai

OBS-URL: https://build.opensuse.org/request/show/38559
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/m17n-lib?expand=0&rev=10
This commit is contained in:
OBS User autobuild 2010-04-25 16:39:56 +00:00 committed by Git OBS Bridge
parent 965dbd3c20
commit 24bd303905
5 changed files with 19 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
m17n-lib-1.5.1.diff
View File

@ -1,73 +0,0 @@
--- 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 ());

3
m17n-lib-1.5.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1a73930850e46a7d700412d14e0aefeb1c5f96b7d3be835557ceb96689638a9
size 763713

3
m17n-lib-1.6.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e785eb18fceb20b74fc61685cb41eb6e6f53051267e1e7ad65f0a796bb980aaf
size 759479

6
m17n-lib.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 22 17:38:25 CEST 2010 - tiwai@suse.de
- updated to version 1.6.0:
requires the new libotf; plugin locations changed
-------------------------------------------------------------------
Mon Oct 27 15:57:18 CET 2008 - mfabian@suse.de

108
m17n-lib.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package m17n-lib (Version 1.5.3)
# spec file for package m17n-lib (Version 1.6.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,14 +19,10 @@
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
%if "%(xft-config --prefix)" == "/usr"
%define appdefdir /usr/share/X11
%else
%define appdefdir /usr/X11R6/lib/X11
%endif
Version: 1.5.3
Version: 1.6.0
Release: 1
License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
License: GPLv2+ ; LGPLv2.1+ ; MIT
Group: System/I18n/Japanese
AutoReqProv: on
Requires: m17n-db
@ -37,7 +33,6 @@ Url: http://www.m17n.org/m17n-lib/
# cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/m17n co m17n-db
Source0: http://www.m17n.org/m17n-lib/download/m17n-lib-%{version}.tar.bz2
Source1: m17n-lib-rpmlintrc
Patch: m17n-lib-1.5.1.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Multilingual Text Processing Library for the C Language
@ -54,7 +49,7 @@ Authors:
Satoru Tomura <tomura@m17n.org>
%package devel
License: GPL v2 or later; LGPL v2.1 or later; X11/MIT
License: GPLv2+ ; LGPLv2.1+ ; MIT
Summary: Multilingual text processing library for the C language
Group: Development/Libraries/Other
Requires: %{name} = %{version} glibc-devel xorg-x11-libX11-devel
@ -72,12 +67,11 @@ Authors:
Satoru Tomura <tomura@m17n.org>
%prep
%setup -q -n %{name}-%{version}
%patch
%setup -q
#find . -name CVS -type d | xargs rm -rf
%build
export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
export SUSE_ASNEEDED=0
%configure --disable-static --with-pic
%{__make}
@ -100,6 +94,7 @@ iconv -f EUC-JP -t SJIS < example/M17NEdit.ja \
> $RPM_BUILD_ROOT%{appdefdir}/ja_JP.SJIS/app-defaults/M17NEdit
iconv -f EUC-JP -t UTF-8 < example/M17NEdit.ja \
> $RPM_BUILD_ROOT%{appdefdir}/ja_JP.UTF-8/app-defaults/M17NEdit
rm -f %{buildroot}%{_libdir}/m17n/*/*.la
rm -f %{buildroot}%{_libdir}/*.la
%clean
@ -113,6 +108,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README ChangeLog
%{_libdir}/lib*.so.*
%{_libdir}/m17n
%{_bindir}/*
%dir %{appdefdir}/??
%dir %{appdefdir}/??_*
@ -121,92 +117,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-, root, root)
%{_includedir}/*
%{_libdir}/lib*.so
/usr/include/*
%{_libdir}/pkgconfig/*.pc
%changelog
* Mon Oct 27 2008 mfabian@suse.de
- update to m17n-lib 1.5.3.
• only bugfixes.
-
* Fri Jun 13 2008 crrodriguez@suse.de
- disable unusable static libraries
* 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
- update to 1.4.0:
• New function msymbol_put_func (), msymbol_get_func
(), mplist_put_func (), mplist_get_func (),
mface_put_hook (), and mface_get_hook () are
available to avoid unsafe casting of function
pointer. New macro M17N_FUNC and new type
M17NFunc are also introduced.
- remove bugzilla-232303-local-variable-used-before-set.patch
(was from upstream CVS).
- add -fno-strict-aliasing .
- add gd-devel to BuildRequires.
* Thu May 24 2007 ro@suse.de
- added ldconfig to post scripts
* Tue Jan 09 2007 mfabian@suse.de
- update to 1.3.4.
- fix bugzilla #32303.
* 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
- 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.
• New function mfont_list_family_names () returns a list of
available font family names.
• New functions mlanguage_list (), mlanguage_code (),
mlanguage_name (), and mlanguage_text () return various
language-related information.
• New functions mscript_list () and mscript_language_list ()
return various script-related information.
* Mon Aug 14 2006 mfabian@suse.de
- move app-defaults to /usr/share/X11 (for X11R7).
* 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
- converted neededforbuild to BuildRequires
* Fri Jan 13 2006 mfabian@suse.de
- update to 1.3.0.20060113 (CVS HEAD).
* Fri Jan 13 2006 mfabian@suse.de
- update to 1.3.0.
- add pkgconfig to # neededforbuild.
* 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
- update to 1.2.0.
* 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
- 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
- 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
- Bugzilla #44028: rename binaries from m* to m17n-* to remove
conflict with majordomo's /usr/bin/medit.
* 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
- new package: m17n-lib, version 1.0.2