commit ba0ce30523fdab976c44f0081d18d6fdeb1858c7
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 25 18:23:53 2012 +0100
- updated to 0.4.0 (note: new soname)
- removed obsolete fix-fontset patch
libgxim-fix-fontset.patch | 86 -----------------------------------------------
libgxim.spec | 22 ++++++------
2 files changed, 11 insertions(+), 97 deletions(-)
---
diff --git a/libgxim.spec b/libgxim.spec
index 8acdaed..2997469 100644
--- a/libgxim.spec
+++ b/libgxim.spec
@@ -6,27 +6,27 @@
Summary: GObject-based XIM protocol library
Summary(pl.UTF-8): Biblioteka protokołu XIM oparta na GObject
Name: libgxim
-Version: 0.3.3
+Version: 0.4.0
Release: 1
License: LGPL v2+
Group: Libraries
#Source0Download: http://code.google.com/p/libgxim/downloads/list
Source0: http://libgxim.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 5fb6b86193b55c54a20c591188019bc3
-Patch0: %{name}-fix-fontset.patch
+# Source0-md5: bbe8ee379e68955a6f9ff2ac46b05024
URL: http://code.google.com/p/libgxim/
BuildRequires: dbus-devel >= 0.23
BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: gettext
-BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.26.0
BuildRequires: gtk-doc >= 1.8
BuildRequires: gtk+2-devel >= 2:2.2.0
BuildRequires: intltool
BuildRequires: pkgconfig
BuildRequires: ruby
+BuildRequires: xorg-lib-libX11-devel
Requires: dbus-libs >= 0.23
Requires: dbus-glib >= 0.74
-Requires: glib2 >= 1:2.16.0
+Requires: glib2 >= 1:2.26.0
Requires: gtk+2 >= 2:2.2.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,7 +51,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: dbus-devel >= 0.23
Requires: dbus-glib-devel >= 0.74
-Requires: glib2-devel >= 1:2.16.0
+Requires: glib2-devel >= 1:2.26.0
Requires: gtk+2-devel >= 2:2.2.0
%description devel
@@ -85,12 +85,12 @@ Dokumentacja API biblioteki libgxim.
%prep
%setup -q
-%patch0 -p0
%build
%configure \
- --with-html-dir=%{_gtkdocdir} \
- %{!?with_static_libs:--disable-static}
+ --disable-silent-rules \
+ %{!?with_static_libs:--disable-static} \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
@@ -114,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
%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.2
+%attr(755,root,root) %ghost %{_libdir}/libgxim.so.3
%files devel
%defattr(644,root,root,755)
diff --git a/libgxim-fix-fontset.patch b/libgxim-fix-fontset.patch
deleted file mode 100644
index 2503b22..0000000
--- a/libgxim-fix-fontset.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-2009-04-03 Akira TAGOH <[email protected]>
-
- * 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 */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgxim.git/commitdiff/ba0ce30523fdab976c44f0081d18d6fdeb1858c7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
