diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..69d55b1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +tomoe-0.6.0.tar.gz +/tomoe-stripped-0.6.0.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 1de2012..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: tomoe -# $Id$ -NAME := tomoe -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index e69de29..64360bb 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (tomoe-0.6.0.tar.gz) = eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8 +SHA512 (tomoe-stripped-0.6.0.tar.gz) = feb168805c804abe5c276e1f1668fb2580f67686d271d6ff8b70a1aa525bc11cc74b7baaeb88a7f38a4b09c10fad54cdf204af4b8fac3be90b1c52ecfad11ad0 diff --git a/strip.sh b/strip.sh new file mode 100755 index 0000000..dee2888 --- /dev/null +++ b/strip.sh @@ -0,0 +1,38 @@ +#!/bin/sh -x + +pkgname=tomoe +litepkgname=tomoe-stripped + +if test "x$1" = x; then + echo "help: $0 " + exit 1 +fi + +#compute file/path name +tarfile=$1 +expandpath=${tarfile%.tar.gz} +newtarfile="$litepkgname${tarfile#$pkgname}" + +#prepare tmp directory +rm -f $newtarfile +mkdir ./tmp + +pushd "./tmp" + tar xf ../$tarfile + + pushd "$expandpath/data" + # remove the skip code from kanjidic2-original.xml + sed -i s/\[0-9]*-[0-9]*-[0-9]*\<\\/q_code\>//g kanjidic2-original.xml + mv kanjidic2.xml kanjidic2.xml.orig + xsltproc kanjidic2-original.xsl kanjidic2-original.xml > kanjidic2.xml + # check the changes in kanjidic2.xml + diff kanjidic2.xml.orig kanjidic2.xml + mv kanjidic2.xml.orig kanjidic2.xml + popd + + tar zcf ${newtarfile} $expandpath + rm -r $expandpath +popd + +mv ./tmp/$newtarfile . +rmdir ./tmp diff --git a/tomoe-0.6.0-bz502662.patch b/tomoe-0.6.0-bz502662.patch new file mode 100644 index 0000000..a6b797c --- /dev/null +++ b/tomoe-0.6.0-bz502662.patch @@ -0,0 +1,124 @@ +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 + diff --git a/tomoe-0.6.0-fixes-glib-includes.patch b/tomoe-0.6.0-fixes-glib-includes.patch new file mode 100644 index 0000000..68685db --- /dev/null +++ b/tomoe-0.6.0-fixes-glib-includes.patch @@ -0,0 +1,26 @@ +Index: tomoe-0.6.0/lib/glib-utils.h +=================================================================== +--- tomoe-0.6.0.orig/lib/glib-utils.h ++++ tomoe-0.6.0/lib/glib-utils.h +@@ -28,7 +28,7 @@ + #include "config.h" + #endif /* HAVE_CONFIG_H */ + +-#include ++#include + #include + #include "glib-compat-file-utilities.h" + #include "glib-compat-key-file.h" +Index: tomoe-0.6.0/lib/tomoe.c +=================================================================== +--- tomoe-0.6.0.orig/lib/tomoe.c ++++ tomoe-0.6.0/lib/tomoe.c +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include "tomoe.h" + + static gboolean initialized = FALSE; diff --git a/tomoe-0.6.0-fixes-set-parse-error.patch b/tomoe-0.6.0-fixes-set-parse-error.patch new file mode 100644 index 0000000..c860c74 --- /dev/null +++ b/tomoe-0.6.0-fixes-set-parse-error.patch @@ -0,0 +1,17 @@ +Index: tomoe-0.6.0/lib/tomoe-xml-parser.c +=================================================================== +--- tomoe-0.6.0.orig/lib/tomoe-xml-parser.c ++++ tomoe-0.6.0/lib/tomoe-xml-parser.c +@@ -80,9 +80,9 @@ set_parse_error (GMarkupParseContext *co + "Invalid content at line %d char %d of %s.", + line, chr, data->filename); + +- *error = g_error_new (G_MARKUP_ERROR, +- G_MARKUP_ERROR_INVALID_CONTENT, +- buf); ++ *error = g_error_new_literal (G_MARKUP_ERROR, ++ G_MARKUP_ERROR_INVALID_CONTENT, ++ buf); + } + + static void diff --git a/tomoe-0.6.0-multiarch-conflict.patch b/tomoe-0.6.0-multiarch-conflict.patch new file mode 100644 index 0000000..73ab145 --- /dev/null +++ b/tomoe-0.6.0-multiarch-conflict.patch @@ -0,0 +1,45 @@ +diff -up ./doc/reference/tomoe-docs.sgml.multiarch-conflict ./doc/reference/tomoe-docs.sgml +--- ./doc/reference/tomoe-docs.sgml.multiarch-conflict 2007-04-10 17:24:20.000000000 +1000 ++++ ./doc/reference/tomoe-docs.sgml 2009-01-19 09:57:04.000000000 +1000 +@@ -40,7 +40,7 @@ + &tomoe-Writing; + + +- ++ + Index + +