Author: baggins Date: Wed Apr 18 18:04:19 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 4 - fixed build with glib 2.32+
---- Files affected: packages/tomoe: tomoe.spec (1.3 -> 1.4) , tomoe-glib2.32.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/tomoe/tomoe.spec diff -u packages/tomoe/tomoe.spec:1.3 packages/tomoe/tomoe.spec:1.4 --- packages/tomoe/tomoe.spec:1.3 Fri Mar 30 17:28:44 2012 +++ packages/tomoe/tomoe.spec Wed Apr 18 20:04:14 2012 @@ -8,7 +8,7 @@ Summary: Handwritten input system for Japanese and Chinese Name: tomoe Version: 0.6.0 -Release: 3 +Release: 4 License: LGPL v2+ Group: Libraries Source0: http://downloads.sourceforge.net/tomoe/%{name}-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch0: %{name}-multiarch-conflict.patch Patch1: %{name}-bz502662.patch Patch2: %{name}-svn-libs.patch +Patch3: %{name}-glib2.32.patch URL: http://tomoe.sourceforge.jp/ BuildRequires: gettext BuildRequires: glib2-devel @@ -105,6 +106,7 @@ %patch0 -p0 %patch1 -p0 %patch2 -p1 +%patch3 -p1 %{__sed} 's|#!/usr/bin/env ruby|#!/usr/bin/ruby|' data/xml2est.rb @@ -207,6 +209,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2012/04/18 18:04:14 baggins +- rel 4 +- fixed build with glib 2.32+ + Revision 1.3 2012/03/30 15:28:44 arekm - release 3 ================================================================ Index: packages/tomoe/tomoe-glib2.32.patch diff -u /dev/null packages/tomoe/tomoe-glib2.32.patch:1.1 --- /dev/null Wed Apr 18 20:04:20 2012 +++ packages/tomoe/tomoe-glib2.32.patch Wed Apr 18 20:04:14 2012 @@ -0,0 +1,22 @@ +--- tomoe-0.6.0/lib/glib-utils.h~ 2007-04-25 09:35:58.000000000 +0200 ++++ tomoe-0.6.0/lib/glib-utils.h 2012-04-18 19:56:43.196658521 +0200 +@@ -28,7 +28,7 @@ + #include "config.h" + #endif /* HAVE_CONFIG_H */ + +-#include <glib/garray.h> ++#include <glib.h> + #include <glib/gi18n-lib.h> + #include "glib-compat-file-utilities.h" + #include "glib-compat-key-file.h" +--- tomoe-0.6.0/lib/tomoe.c~ 2007-06-06 09:35:53.000000000 +0200 ++++ tomoe-0.6.0/lib/tomoe.c 2012-04-18 19:58:11.336657883 +0200 +@@ -26,7 +26,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <glib/garray.h> ++#include <glib.h> + #include "tomoe.h" + + static gboolean initialized = FALSE; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/tomoe/tomoe.spec?r1=1.3&r2=1.4 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
