From ead1d07e9fd3bd0953d774968f8ced620dbeed17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 14 Feb 2013 11:39:26 +0100 Subject: [PATCH] - initial from fc --- 0001-Fix-build-issues-with-MSVC.patch | 28 +++++++++ liblangtag-Werror.patch | 31 ++++++++++ liblangtag.spec | 88 +++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 0001-Fix-build-issues-with-MSVC.patch create mode 100644 liblangtag-Werror.patch create mode 100644 liblangtag.spec diff --git a/0001-Fix-build-issues-with-MSVC.patch b/0001-Fix-build-issues-with-MSVC.patch new file mode 100644 index 0000000..61834cc --- /dev/null +++ b/0001-Fix-build-issues-with-MSVC.patch @@ -0,0 +1,28 @@ +From 89108f5856b455640e288e2ce29d8c5904c12a3b Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Sun, 25 Nov 2012 17:49:56 +0900 +Subject: [PATCH] Fix build issues with MSVC + +--- + configure.ac | 12 +++++++++++- + data/Makefile.am | 9 ++++++++- + liblangtag/lt-ext-module.c | 6 +++++- + liblangtag/lt-macros.h | 11 +++++++++++ + liblangtag/lt-messages.h | 7 +++++++ + 5 files changed, 42 insertions(+), 3 deletions(-) + +diff --git a/liblangtag/lt-macros.h b/liblangtag/lt-macros.h +index a7dfcc2..6ff22c9 100644 +--- a/liblangtag/lt-macros.h ++++ b/liblangtag/lt-macros.h +@@ -200,6 +202,7 @@ + # define LT_BREAKPOINT() \ + LT_STMT_START {__asm__ __volatile__ ("bpt");} LT_STMT_END + #else ++#include + # define LT_BREAKPOINT() \ + LT_STMT_START {raise(SIGTRAP);} LT_STMT_END + #endif +-- +1.8.0 + diff --git a/liblangtag-Werror.patch b/liblangtag-Werror.patch new file mode 100644 index 0000000..529b307 --- /dev/null +++ b/liblangtag-Werror.patch @@ -0,0 +1,31 @@ +--- liblangtag-0.4.0/liblangtag/lt-ext-module.c~ 2012-10-16 04:48:31.000000000 +0200 ++++ liblangtag-0.4.0/liblangtag/lt-ext-module.c 2013-02-14 11:35:35.138119334 +0100 +@@ -258,7 +258,7 @@ + (lt_destroy_func_t)dlclose); + func = dlsym(module->module, "module_get_version"); + if (!func) { +- lt_warning(dlerror()); ++ lt_warning("%s", dlerror()); + break; + } + if (((lt_ext_module_version_func_t)func)() != LT_EXT_MODULE_VERSION) { +@@ -268,7 +268,7 @@ + } + func = dlsym(module->module, "module_get_funcs"); + if (!func) { +- lt_warning(dlerror()); ++ lt_warning("%s", dlerror()); + break; + } + if (!(module->funcs = ((lt_ext_module_get_funcs_func_t)func)())) { +--- liblangtag-0.4.0/tests/main.c~ 2012-10-09 11:44:06.000000000 +0200 ++++ liblangtag-0.4.0/tests/main.c 2013-02-14 11:36:53.860009569 +0100 +@@ -37,7 +37,7 @@ + const char *message, + lt_pointer_t user_data) + { +- lt_error_set(&error, type, message); ++ lt_error_set(&error, type, "%s", message); + } + + static void diff --git a/liblangtag.spec b/liblangtag.spec new file mode 100644 index 0000000..252a946 --- /dev/null +++ b/liblangtag.spec @@ -0,0 +1,88 @@ +Summary: An interface library to access tags for identifying languages +Name: liblangtag +Version: 0.4.0 +Release: 1 +License: LGPLv3+ +Group: Libraries +URL: http://tagoh.bitbucket.org/liblangtag/ +Source0: https://bitbucket.org/tagoh/liblangtag/downloads/%{name}-%{version}.tar.bz2 +# Source0-md5: 54e578c91b1b68e69c72be22adcb2195 +Patch0: 0001-Fix-build-issues-with-MSVC.patch +Patch1: %{name}-Werror.patch +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: libxml2-devel +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +%{name} is an interface library to access tags for identifying +languages. + +Features: +- several subtag registry database supports: + - language + - extlang + - script + - region + - variant + - extension + - grandfathered + - redundant +- handling of the language tags + - parser + - matching + - canonicalizing + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%configure \ + --disable-static \ + --enable-shared \ + --disable-introspection \ + +%{__make} V=1 \ + LD_LIBRARY_PATH=`pwd`/liblangtag/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc AUTHORS COPYING NEWS README +%attr(755,root,root) %{_libdir}/%{name}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/%{name}.so.1 +%dir %{_libdir}/%{name} +%attr(755,root,root) %{_libdir}/%{name}/liblangtag-ext-ldml-t.so +%attr(755,root,root) %{_libdir}/%{name}/liblangtag-ext-ldml-u.so +%{_datadir}/%{name} + +%files devel +%defattr(644,root,root,755) +%doc docs/html/* +%attr(755,root,root) %{_libdir}/%{name}.so +%{_includedir}/%{name} +%{_pkgconfigdir}/%{name}.pc -- 2.44.0