packages: libgxim/libgxim-fix-fontset.patch (NEW), libgxim/libgxim.spec (NE...
baggins
baggins at pld-linux.org
Sun Jul 17 14:52:53 CEST 2011
Author: baggins Date: Sun Jul 17 12:52:53 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
packages/libgxim:
libgxim-fix-fontset.patch (NONE -> 1.1) (NEW), libgxim.spec (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libgxim/libgxim-fix-fontset.patch
diff -u /dev/null packages/libgxim/libgxim-fix-fontset.patch:1.1
--- /dev/null Sun Jul 17 14:52:53 2011
+++ packages/libgxim/libgxim-fix-fontset.patch Sun Jul 17 14:52:48 2011
@@ -0,0 +1,86 @@
+2009-04-03 Akira TAGOH <akira at tagoh.org>
+
+ * libgxim/gximmisc.c (g_xim_fontset_put_to_stream): get rid of
+ processing a padding.
+ (g_xim_fontset_get_from_stream): likewise.
+ (g_xim_attribute_put_to_stream): deal with a padding here.
+
+ * libgxim/gximattr.c (g_xim_attr_get_attribute_from_stream): deal with
+ a padding here.
+
+ * libgxim/gximprotocol.c (g_xim_protocol_read_vformat): Stop obtaining
+ a value from NESTEDLIST if a remaining size is less than minimal.
+
+Index: libgxim/gximprotocol.c
+===================================================================
+--- libgxim/gximprotocol.c (リビジョン 204)
++++ libgxim/gximprotocol.c (リビジョン 205)
+@@ -2704,7 +2704,8 @@
+ conn = G_XIM_CONNECTION (proto);
+ /* XXX: NESTEDLIST is only used for IC attributes? */
+ list = g_xim_nested_list_new(G_XIM_ATTR (conn->default_icattr), size);
+- while (size > 0) {
++ /* try to fetch a value until remaining size is more than minimum requirement */
++ while (size > 3) {
+ goffset cur_pos = g_seekable_tell(G_SEEKABLE (istream)), pos;
+ gint16 attr_id;
+ guint16 n;
+Index: libgxim/gximattr.c
+===================================================================
+--- libgxim/gximattr.c (リビジョン 204)
++++ libgxim/gximattr.c (リビジョン 205)
+@@ -975,9 +975,10 @@
+ attr_id, name, g_xim_value_type_name(vtype));
+ g_free(name);
+ if (!g_xim_protocol_read_format(proto, stream, cancellable, error,
+- 2,
++ 3,
+ G_XIM_TYPE_MARKER_N_BYTES_2, vtype,
+- vtype, &value))
++ vtype, &value,
++ G_XIM_TYPE_AUTO_PADDING, 0))
+ return NULL;
+
+ new_attr = g_xim_attribute_new_with_value(attr_id, vtype, value);
+Index: libgxim/gximmisc.c
+===================================================================
+--- libgxim/gximmisc.c (リビジョン 204)
++++ libgxim/gximmisc.c (リビジョン 205)
+@@ -1370,9 +1370,8 @@
+ g_return_val_if_fail (G_IS_XIM_PROTOCOL (proto), 0);
+ g_return_val_if_fail (error != NULL, 0);
+
+- return g_xim_protocol_send_format(proto, cancellable, error, 2,
+- G_XIM_TYPE_GSTRING, fontset,
+- G_XIM_TYPE_AUTO_PADDING, 2);
++ return g_xim_protocol_send_format(proto, cancellable, error, 1,
++ G_XIM_TYPE_GSTRING, fontset);
+ }
+
+ gpointer
+@@ -1388,9 +1387,8 @@
+ g_return_val_if_fail (error != NULL, NULL);
+
+ if (!g_xim_protocol_read_format(proto, stream, cancellable, error,
+- 2,
+- G_XIM_TYPE_GSTRING, &retval,
+- G_XIM_TYPE_AUTO_PADDING, 2))
++ 1,
++ G_XIM_TYPE_GSTRING, &retval))
+ return NULL;
+
+ return retval;
+@@ -2212,10 +2210,11 @@
+ g_return_val_if_fail (attr != NULL, 0);
+ g_return_val_if_fail (error != NULL, 0);
+
+- return g_xim_protocol_send_format(proto, cancellable, error, 3,
++ return g_xim_protocol_send_format(proto, cancellable, error, 4,
+ G_XIM_TYPE_WORD, attr->id,
+ G_XIM_TYPE_MARKER_N_BYTES_2, attr->vtype,
+- attr->vtype, attr->v.pointer);
++ attr->vtype, attr->v.pointer,
++ G_XIM_TYPE_AUTO_PADDING, 0);
+ }
+
+ /* NESTEDLIST */
================================================================
Index: packages/libgxim/libgxim.spec
diff -u /dev/null packages/libgxim/libgxim.spec:1.1
--- /dev/null Sun Jul 17 14:52:53 2011
+++ packages/libgxim/libgxim.spec Sun Jul 17 14:52:48 2011
@@ -0,0 +1,133 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without apidocs # do not build and package API docs
+%bcond_without static_libs # don't build static libraries
+#
+Summary: GObject-based XIM protocol library
+Summary(pl.UTF-8): Biblioteka protokołu XIM oparta na GObject
+Name: libgxim
+Version: 0.3.3
+Release: 1
+License: LGPL
+Group: Libraries
+Source0: http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2
+# Source0-md5: 5fb6b86193b55c54a20c591188019bc3
+Patch0: %{name}-fix-fontset.patch
+URL: http://code.google.com/p/libgxim/
+BuildRequires: dbus-devel > 0.23
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: gettext
+BuildRequires: glib2-devel
+BuildRequires: gtk+2-devel
+BuildRequires: intltool
+BuildRequires: ruby
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+libgxim is a X Input Method protocol library that is implemented by
+GObject. this library helps you to implement XIM servers or client
+applications to communicate through XIM protocol without using Xlib
+API directly, particularly if your application uses GObject-based main
+loop.
+
+#%description -l pl.UTF-8
+
+%package devel
+Summary: Header files for libgxim library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libgxim
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel >= 2.16.0
+Requires: gtk+2-devel
+Requires: pkgconfig
+
+%description devel
+Header files for libgxim library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libgxim.
+
+%package static
+Summary: Static libgxim library
+Summary(pl.UTF-8): Statyczna biblioteka libgxim
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static libgxim library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka libgxim.
+
+%package apidocs
+Summary: libgxim API documentation
+Summary(pl.UTF-8): Dokumentacja API biblioteki libgxim
+Group: Documentation
+
+%description apidocs
+API and internal documentation for libgxim library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libgxim.
+
+%prep
+%setup -q
+%patch0 -p0
+
+%build
+%configure \
+ --with-html-dir=%{_gtkdocdir} \
+ %{!?with_static_libs:--disable-static}
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+# if library provides pkgconfig then remove .la pollution
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_libdir}/libgxim.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgxim.so.[0-9]
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/libgxim.so
+%{_includedir}/libgxim
+%{_pkgconfigdir}/libgxim.pc
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgxim.a
+%endif
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/libgxim
+%endif
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team <feedback at pld-linux.org>
+All persons listed below can be reached at <cvs_login>@pld-linux.org
+
+$Log$
+Revision 1.1 2011/07/17 12:52:48 baggins
+- initial revision
+
================================================================
More information about the pld-cvs-commit
mailing list