rpms/tomoe/F-9 tomoe-0.6.0-bz502662.patch, NONE, 1.1 import.log, 1.2, 1.3 tomoe.spec, 1.24, 1.25
Ding-Yi Chen
dchen at fedoraproject.org
Tue Jun 2 05:14:56 UTC 2009
Author: dchen
Update of /cvs/pkgs/rpms/tomoe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22301/F-9
Modified Files:
import.log tomoe.spec
Added Files:
tomoe-0.6.0-bz502662.patch
Log Message:
Fix bug 502622
tomoe-0.6.0-bz502662.patch:
--- NEW FILE tomoe-0.6.0-bz502662.patch ---
diff -up ./lib/tomoe-dict-ptr-array.c.bz502662 ./lib/tomoe-dict-ptr-array.c
--- ./lib/tomoe-dict-ptr-array.c.bz502662 2007-06-21 11:48:57.000000000 +1000
+++ ./lib/tomoe-dict-ptr-array.c 2009-06-02 13:23:40.000000000 +1000
@@ -50,7 +50,7 @@ struct _TomoeDictPtrArrayPrivate
static TomoeDictClass *parent_class;
-G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, _tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
+G_DEFINE_ABSTRACT_TYPE (TomoeDictPtrArray, tomoe_dict_ptr_array, TOMOE_TYPE_DICT)
static void dispose (GObject *object);
static void set_property (GObject *object,
@@ -75,7 +75,7 @@ static gboolean is_editable
static gchar *get_available_private_utf8 (TomoeDict *dict);
static void
-_tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
+tomoe_dict_ptr_array_class_init (TomoeDictPtrArrayClass *klass)
{
GObjectClass *gobject_class;
TomoeDictClass *dict_class;
@@ -123,7 +123,7 @@ _tomoe_dict_ptr_array_class_init (TomoeD
}
static void
-_tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
+tomoe_dict_ptr_array_init (TomoeDictPtrArray *dict)
{
TomoeDictPtrArrayPrivate *priv = TOMOE_DICT_PTR_ARRAY_GET_PRIVATE (dict);
priv->chars = g_ptr_array_new();
@@ -196,7 +196,7 @@ char_compare_func (gconstpointer a, gcon
}
void
-_tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
+tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict)
{
TomoeDictPtrArrayPrivate *priv;
@@ -219,7 +219,7 @@ register_char (TomoeDict *dict, TomoeCha
unregister_char (dict, tomoe_char_get_utf8 (chr));
g_ptr_array_add (priv->chars, g_object_ref (G_OBJECT (chr)));
- _tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
+ tomoe_dict_ptr_array_sort (TOMOE_DICT_PTR_ARRAY (dict));
priv->modified = TRUE;
@@ -523,7 +523,7 @@ get_available_private_utf8 (TomoeDict *d
}
GPtrArray *
-_tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
+tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict)
{
g_return_val_if_fail (TOMOE_IS_DICT_PTR_ARRAY (dict), NULL);
diff -up ./lib/tomoe-dict-ptr-array.h.bz502662 ./lib/tomoe-dict-ptr-array.h
--- ./lib/tomoe-dict-ptr-array.h.bz502662 2007-06-21 11:48:57.000000000 +1000
+++ ./lib/tomoe-dict-ptr-array.h 2009-06-02 13:27:12.000000000 +1000
@@ -29,7 +29,7 @@ G_BEGIN_DECLS
#include "tomoe-dict.h"
-#define TOMOE_TYPE_DICT_PTR_ARRAY (_tomoe_dict_ptr_array_get_type ())
+#define TOMOE_TYPE_DICT_PTR_ARRAY (tomoe_dict_ptr_array_get_type ())
#define TOMOE_DICT_PTR_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArray))
#define TOMOE_DICT_PTR_ARRAY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TOMOE_TYPE_DICT_PTR_ARRAY, TomoeDictPtrArrayClass))
#define TOMOE_IS_DICT_PTR_ARRAY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOMOE_TYPE_DICT_PTR_ARRAY))
@@ -49,9 +49,11 @@ struct _TomoeDictPtrArrayClass
TomoeDictClass parent_class;
};
-GType _tomoe_dict_ptr_array_get_type (void) G_GNUC_CONST;
-void _tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict);
-GPtrArray *_tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict);
+GType tomoe_dict_ptr_array_get_type (void) G_GNUC_CONST;
+void tomoe_dict_ptr_array_sort (TomoeDictPtrArray *dict);
+#define _tomoe_dict_ptr_array_sort tomoe_dict_ptr_array_sort
+GPtrArray *tomoe_dict_ptr_array_get_array (TomoeDictPtrArray *dict);
+#define _tomoe_dict_ptr_array_get_array tomoe_dict_ptr_array_get_array
G_END_DECLS
diff -up ./lib/tomoe-xml-parser.c.bz502662 ./lib/tomoe-xml-parser.c
--- ./lib/tomoe-xml-parser.c.bz502662 2007-04-10 17:24:21.000000000 +1000
+++ ./lib/tomoe-xml-parser.c 2009-06-02 13:23:40.000000000 +1000
@@ -428,7 +428,7 @@ init_parse_data (ParseData *data, TomoeX
}
gboolean
-_tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
+tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
TomoeXMLParsedData *result)
{
GMarkupParseContext *context;
@@ -469,7 +469,7 @@ _tomoe_xml_parser_parse_dictionary_file
}
TomoeChar *
-_tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
+tomoe_xml_parser_parse_char_data (const gchar *xml, gssize len)
{
GMarkupParseContext *context;
TomoeXMLParsedData result;
diff -up ./lib/tomoe-xml-parser.h.bz502662 ./lib/tomoe-xml-parser.h
--- ./lib/tomoe-xml-parser.h.bz502662 2007-04-10 17:24:21.000000000 +1000
+++ ./lib/tomoe-xml-parser.h 2009-06-02 13:23:40.000000000 +1000
@@ -37,11 +37,12 @@ struct _TomoeXMLParsedData
GPtrArray *chars;
};
-gboolean _tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
+gboolean tomoe_xml_parser_parse_dictionary_file (const gchar *filename,
TomoeXMLParsedData *result);
-TomoeChar *_tomoe_xml_parser_parse_char_data (const gchar *xml,
+#define _tomoe_xml_parser_parse_dictionary_file tomoe_xml_parser_parse_dictionary_file
+TomoeChar *tomoe_xml_parser_parse_char_data (const gchar *xml,
gssize len);
-
+#define _tomoe_xml_parser_parse_char_data tomoe_xml_parser_parse_char_data
G_END_DECLS
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 19 Jan 2009 00:29:00 -0000 1.2
+++ import.log 2 Jun 2009 05:14:25 -0000 1.3
@@ -1,2 +1,3 @@
tomoe-0_6_0-9_fc10:F-9:tomoe-0.6.0-9.fc10.src.rpm:1232196797
tomoe-0_6_0-10_fc10:F-9:tomoe-0.6.0-10.fc10.src.rpm:1232324907
+tomoe-0_6_0-14_fc11:F-9:tomoe-0.6.0-14.fc11.src.rpm:1243919559
Index: tomoe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe/F-9/tomoe.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- tomoe.spec 19 Jan 2009 00:29:00 -0000 1.24
+++ tomoe.spec 2 Jun 2009 05:14:25 -0000 1.25
@@ -3,7 +3,7 @@
Name: tomoe
Version: 0.6.0
-Release: 10%{?dist}
+Release: 14%{?dist}
Summary: Handwritten input system for Japanese and Chinese
Group: System Environment/Libraries
@@ -11,6 +11,7 @@ License: LGPLv2+
URL: http://scim-imengine.sourceforge.jp/
Source0: http://downloads.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
Patch0: tomoe-0.6.0-multiarch-conflict.patch
+Patch1: tomoe-0.6.0-bz502662.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel, gettext, gtk-doc, libtool, intltool
BuildRequires: perl(XML::Parser), python
@@ -42,6 +43,7 @@ Install this package if you want to deve
%prep
%setup -q
%patch0 -p0 -b .multiarch-conflict
+%patch1 -p0 -b .bz502662
%build
autoreconf -vif
@@ -99,6 +101,12 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Jun 2 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-14
+- [Bug 502662] SCIM-tomoe doesn't load - no error msgs
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Mon Jan 19 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-10
- Fix [Bug 343321] multiarch conflicts in tomoe.
Maybe cause by bug in gtk-doc.
More information about the fedora-extras-commits
mailing list