dist-git conversion

#2781)

.gitignore

@@ -33,3 +33,5 @@ anthy-9011.tar.gz
 anthy-9100.tar.gz
 alt-cannadic-070805.tar.bz2
 anthy-9100b.tar.gz
+anthy-9100d.tar.gz
+anthy-9100e.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: anthy
-# $Id: Makefile,v 1.1 2005/07/29 05:34:35 tagoh Exp $
-NAME := anthy
-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),)
-# attempt 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)

anthy-9100e-fix-segfault-vu.patch

@@ -0,0 +1,56 @@
+diff -pruN anthy-9100e.orig/src-splitter/metaword.c anthy-9100e/src-splitter/metaword.c
+--- anthy-9100e.orig/src-splitter/metaword.c	2007-06-18 08:27:38.000000000 +0900
++++ anthy-9100e/src-splitter/metaword.c	2008-06-27 11:53:55.000000000 +0900
+@@ -17,6 +17,7 @@
+ 
+ #include <anthy/record.h>
+ #include <anthy/splitter.h>
++#include <anthy/xchar.h>
+ #include <anthy/xstr.h>
+ #include <anthy/segment.h>
+ #include <anthy/segclass.h>
+@@ -158,6 +159,18 @@ get_surrounding_text(struct splitter_con
+     xs_post->len = post_len;
+ }
+ 
++static int
++count_vu(xstr *xs)
++{
++  int i, r = 0;
++  for (i = 0; i < xs->len; i++) {
++    if (xs->str[i] == KK_VU) {
++      r++;
++    }
++  }
++  return r;
++}
++
+ /*
+  * 複合語であるwlからn番めの部分を取り出してmwにする
+  */
+@@ -177,8 +190,12 @@ make_compound_nth_metaword(struct splitt
+   get_surrounding_text(sc, wl, &xs_pre, &xs_post);
+ 
+   for (i = 0; i <= nth; ++i) {
++    xstr part;
+     from += len;
+     len = anthy_compound_get_nth_segment_len(ce, i);
++    part.str = sc->ce[from].c;
++    part.len = len;
++    len -= count_vu(&part);
+     if (i == 0) {
+       len += xs_pre.len;
+     }
+@@ -742,7 +759,11 @@ make_metaword_with_depchar(struct splitt
+   int len = mw ? mw->len : 0;
+ 
+   /* metawordの直後の文字の種類を調べる */
+-  int type = anthy_get_xchar_type(*sc->ce[from + len].c);
++  int type;
++  if (sc->char_count <= from + len) {
++    return;
++  }
++  type = anthy_get_xchar_type(*sc->ce[from + len].c);
+   if (!(type & XCT_SYMBOL) &&
+       !(type & XCT_PART)) {
+     return;

anthy-enable-dict-gtankan.patch

@@ -1,15 +0,0 @@
-diff -ruN anthy-9100b.orig/mkworddic/dict.args.in anthy-9100b/mkworddic/dict.args.in
---- anthy-9100b.orig/mkworddic/dict.args.in	2007-09-16 21:38:40.000000000 +0900
-+++ anthy-9100b/mkworddic/dict.args.in	2007-09-18 19:53:52.000000000 +0900
-@@ -10,9 +10,9 @@
- read @top_srcdir@/alt-cannadic/gcanna.ctd
- #
- read @top_srcdir@/alt-cannadic/gcannaf.ctd
--#read @top_srcdir@/alt-cannadic/gtankan.ctd
-+read @top_srcdir@/alt-cannadic/gtankan.ctd
- #
--read @top_srcdir@/mkworddic/gtankan.ctd
-+#read @top_srcdir@/mkworddic/gtankan.ctd
- read @top_srcdir@/mkworddic/adjust.t
- read @top_srcdir@/mkworddic/name.t
- read @top_srcdir@/mkworddic/compound.t

anthy.spec

@@ -1,8 +1,6 @@
-%define		altcannadicver	070805
-
 Name:		anthy
-Version:	9100b
-Release:	1%{?dist}
+Version:	9100e
+Release:	3%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2.
 License:	LGPLv2+ and GPLv2
 URL:		http://sourceforge.jp/projects/anthy/
@@ -11,10 +9,9 @@ BuildRequires:	automake autoconf
 BuildRequires:	emacs
 BuildRequires:	xemacs
 
-Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
+Source0:	http://prdownloads.sourceforge.jp/anthy/29142/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
-Source2:	http://prdownloads.sourceforge.jp/alt-cannadic/26595/alt-cannadic-%{altcannadicver}.tar.bz2
-Patch0:		anthy-enable-dict-gtankan.patch
+Patch0:		anthy-9100e-fix-segfault-vu.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -53,9 +50,9 @@ The anthy-el-xemacs package contains the emacs lisp to be able to input Japanese
 character set on XEmacs.
 
 %prep
-%setup -q -a 2
-%patch0 -p1 -b .gtankan
-cp alt-cannadic-%{altcannadicver}/* alt-cannadic/
+%setup -q #-a 2
+%patch0 -p1 -b 0-vu
+#cp alt-cannadic-%{altcannadicver}/* alt-cannadic/
 
 %build
 %configure --disable-static
@@ -117,6 +114,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Fri Jun 27 2008 Akira TAGOH <tagoh@redhat.com> - 9100e-3
+- Fix a segfault with some words containing vu. (#452779)
+
+* Tue Feb 12 2008 Akira TAGOH <tagoh@redhat.com> - 9100e-2
+- Rebuild for gcc-4.3.
+
+* Tue Jan 29 2008 Akira TAGOH <tagoh@redhat.com> - 9100e-1
+- New upstream release.
+
+* Mon Oct 29 2007 Akira TAGOH <tagoh@redhat.com> - 9100d-1
+- New upstream release.
+- anthy-enable-dict-gtankan.patch: removed. no need to be applied anymore.
+
 * Tue Sep 18 2007 Akira TAGOH <tagoh@redhat.com> - 9100b-1
 - New upstream release.
 

sources

@@ -1,2 +1 @@
-17f849584baa5ae025542035b429f1b4  alt-cannadic-070805.tar.bz2
-0ad3873646255a2ca1c8576350fabb27  anthy-9100b.tar.gz
+1c328986005e61f503adc118909e12ac  anthy-9100e.tar.gz