--- scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp +++ scim-anthy-1.2.4/src/scim_anthy_setup.cpp @@ -30,6 +30,8 @@ #include #include +#include + #define Uses_SCIM_CONFIG_BASE #define Uses_SCIM_EVENT #define SCIM_ANTHY_USE_GTK --- scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp +++ scim-anthy-1.2.4/src/scim_anthy_kana.cpp @@ -23,6 +23,8 @@ #include "scim_anthy_default_tables.h" #include "scim_anthy_utils.h" +#include + using namespace scim_anthy; static bool --- scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp +++ scim-anthy-1.2.4/src/scim_anthy_preedit.cpp @@ -26,6 +26,8 @@ #include "scim_anthy_preedit.h" #include "scim_anthy_utils.h" +#include + using namespace scim_anthy; static ConvRule *get_period_rule (TypingMethod method, --- scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp +++ scim-anthy-1.2.4/src/scim_anthy_utils.cpp @@ -24,6 +24,8 @@ #include "scim_anthy_utils.h" #include "scim_anthy_default_tables.h" +#include + namespace scim_anthy { bool --- scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp +++ scim-anthy-1.2.4/src/scim_anthy_prefs.cpp @@ -23,6 +23,8 @@ #include "scim_anthy_prefs.h" #include "scim_anthy_intl.h" +#include + namespace scim_anthy { BoolConfigData config_bool_common [] = --- scim-anthy-1.2.4.orig/config.guess +++ scim-anthy-1.2.4/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-08-03' +timestamp='2007-03-06' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -160,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -206,8 +208,11 @@ *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -764,12 +769,19 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -779,9 +791,15 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; @@ -817,6 +835,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -851,7 +872,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +895,11 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -919,9 +948,15 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -964,7 +999,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -974,7 +1009,11 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1176,6 +1215,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1185,7 +1233,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1264,6 +1311,9 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 --- scim-anthy-1.2.4.orig/config.sub +++ scim-anthy-1.2.4/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-07-08' +timestamp='2007-01-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,15 +241,16 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,28 +268,27 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; - m32c) - basic_machine=$basic_machine-unknown - ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -286,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -305,18 +318,18 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ @@ -336,31 +349,30 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; - m32c-*) - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -696,6 +708,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +818,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +880,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -885,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -896,6 +925,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1101,7 +1133,7 @@ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1174,21 +1206,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1340,6 +1374,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1349,9 +1389,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1377,6 +1417,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; --- scim-anthy-1.2.4.orig/debian/patches/11-gcc43.dpatch +++ scim-anthy-1.2.4/debian/patches/11-gcc43.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11-gcc43.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +--- scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_setup.cpp +@@ -30,6 +30,8 @@ + #include + #include + ++#include ++ + #define Uses_SCIM_CONFIG_BASE + #define Uses_SCIM_EVENT + #define SCIM_ANTHY_USE_GTK +--- scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_kana.cpp +@@ -23,6 +23,8 @@ + #include "scim_anthy_default_tables.h" + #include "scim_anthy_utils.h" + ++#include ++ + using namespace scim_anthy; + + static bool +--- scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_preedit.cpp +@@ -26,6 +26,8 @@ + #include "scim_anthy_preedit.h" + #include "scim_anthy_utils.h" + ++#include ++ + using namespace scim_anthy; + + static ConvRule *get_period_rule (TypingMethod method, +--- scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_utils.cpp +@@ -24,6 +24,8 @@ + #include "scim_anthy_utils.h" + #include "scim_anthy_default_tables.h" + ++#include ++ + namespace scim_anthy { + + bool +--- scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_prefs.cpp +@@ -23,6 +23,8 @@ + #include "scim_anthy_prefs.h" + #include "scim_anthy_intl.h" + ++#include ++ + namespace scim_anthy { + + BoolConfigData config_bool_common [] = --- scim-anthy-1.2.4.orig/debian/patches/00list +++ scim-anthy-1.2.4/debian/patches/00list @@ -0,0 +1 @@ + --- scim-anthy-1.2.4.orig/debian/patches/10_scim-plugin-module-install-dir.dpatch +++ scim-anthy-1.2.4/debian/patches/10_scim-plugin-module-install-dir.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_scim-plugin-module-install-dir.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-anthy-0.8.0~/src/Makefile.am scim-anthy-0.8.0/src/Makefile.am +--- scim-anthy-0.8.0~/src/Makefile.am 2005-12-06 23:07:41.000000000 +0900 ++++ scim-anthy-0.8.0/src/Makefile.am 2005-12-06 23:08:47.000000000 +0900 +@@ -36,7 +36,7 @@ + # + # IMEngine Module + # +-moduledir = @SCIM_MODULEDIR@/IMEngine ++moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/IMEngine + module_LTLIBRARIES = anthy.la + + anthy_la_SOURCES = \ +@@ -73,7 +73,7 @@ + SETUP_MODULE = anthy-imengine-setup.la + endif + +-setupmoduledir = @SCIM_MODULEDIR@/SetupUI ++setupmoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/SetupUI + setupmodule_LTLIBRARIES = $(SETUP_MODULE) + + anthy_imengine_setup_la_SOURCES = \ +diff -urNad scim-anthy-0.8.0~/src/Makefile.in scim-anthy-0.8.0/src/Makefile.in +--- scim-anthy-0.8.0~/src/Makefile.in 2005-12-06 23:07:41.000000000 +0900 ++++ scim-anthy-0.8.0/src/Makefile.in 2005-12-06 23:09:35.000000000 +0900 +@@ -324,7 +324,7 @@ + # + # IMEngine Module + # +-moduledir = @SCIM_MODULEDIR@/IMEngine ++moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/IMEngine + module_LTLIBRARIES = anthy.la + anthy_la_SOURCES = \ + scim_anthy_factory.cpp \ +@@ -356,7 +356,7 @@ + # Setup Module + # + @SCIM_BUILD_SETUP_TRUE@SETUP_MODULE = anthy-imengine-setup.la +-setupmoduledir = @SCIM_MODULEDIR@/SetupUI ++setupmoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/SetupUI + setupmodule_LTLIBRARIES = $(SETUP_MODULE) + anthy_imengine_setup_la_SOURCES = \ + scim_anthy_setup.cpp \ --- scim-anthy-1.2.4.orig/debian/patches/02_atok_sty_predict_key.dpatch +++ scim-anthy-1.2.4/debian/patches/02_atok_sty_predict_key.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_atok_sty_predict_key.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-anthy-0.9.0~/data/atok.sty scim-anthy-0.9.0/data/atok.sty +--- scim-anthy-0.9.0~/data/atok.sty 2006-01-20 04:04:42.000000000 +0000 ++++ scim-anthy-0.9.0/data/atok.sty 2006-01-20 04:11:56.000000000 +0000 +@@ -33,6 +33,8 @@ + CircleTypingMethodKey = Romaji,Alt+Romaji + + ConvertKey = space,Shift+space ++ConvertKey = space,Henkan,Shift+space,Shift+Henkan ++PredictKey = Tab + CancelKey = Escape,BackSpace,Control+h,Control+bracketleft + CommitKey = Return,Control+m + ReconvertKey = Shift+Henkan +@@ -57,7 +59,7 @@ + + CandidatesPageUpKey = Shift+Henkan + CandidatesPageDownKey = Henkan +-SelectNextCandidateKey = space,Henkan,Shift+space,Shift+Henkan ++SelectNextCandidateKey = space,Tab,Henkan,Shift+space,Shift+Henkan + SelectPrevCandidateKey = Up + + SelectCandidates1Key = 1 --- scim-anthy-1.2.4.orig/debian/patches/01_fix_scim-setup_crash_bug.dpatch +++ scim-anthy-1.2.4/debian/patches/01_fix_scim-setup_crash_bug.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_scim-setup_crash_bug.dpatch by Ikuya Awashiro +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad scim-anthy-0.7.0~/src/scim_anthy_table_editor.cpp scim-anthy-0.7.0/src/scim_anthy_table_editor.cpp +--- scim-anthy-0.7.0~/src/scim_anthy_table_editor.cpp 2005-08-10 12:35:39.000000000 +0000 ++++ scim-anthy-0.7.0/src/scim_anthy_table_editor.cpp 2005-10-04 14:23:40.403200536 +0000 +@@ -173,7 +173,7 @@ + static void + scim_anthy_table_editor_dispose (GObject *object) + { +- ScimAnthyTableEditor *editor = SCIM_ANTHY_TABLE_EDITOR (editor); ++ ScimAnthyTableEditor *editor = SCIM_ANTHY_TABLE_EDITOR (object); + + if (editor->entries) { + g_list_free (editor->entries); --- scim-anthy-1.2.4.orig/debian/changelog +++ scim-anthy-1.2.4/debian/changelog @@ -0,0 +1,304 @@ +scim-anthy (1.2.4-1ubuntu1) gutsy; urgency=low + + * Fix build failures with g++-4.3. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 10 Sep 2007 15:57:50 +0200 + +scim-anthy (1.2.4-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sun, 03 Jun 2007 01:39:53 +0900 + +scim-anthy (1.2.3-1) unstable; urgency=low + + * New upstream release + * debian/patches/10_scim-plugin-module-install-dir: removed. + (Closes: #422950) + + -- Ikuya Awashiro Sat, 12 May 2007 22:28:13 +0900 + +scim-anthy (1.2.2-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Tue, 14 Nov 2006 22:37:40 +0900 + +scim-anthy (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sat, 30 Sep 2006 15:55:00 +0900 + +scim-anthy (1.2.0-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sun, 30 Jul 2006 00:19:14 +0900 + +scim-anthy (1.0.0-3) unstable; urgency=low + + * Acknowledge the NMU fix (Closes: #368173) + * Standards-Version bumped to 3.7.2 (no changes requied) + + -- Ikuya Awashiro Sun, 18 Jun 2006 21:58:20 +0900 + +scim-anthy (1.0.0-2.0.1) unstable; urgency=low + + * NMU + * im-switch configuration files are moved to scim (and scim-bridge) + packages. + + -- Osamu Aoki Sat, 17 Jun 2006 06:32:37 +0900 + +scim-anthy (1.0.0-2) unstable; urgency=low + + * debian/im-switch/scim-anthy: scim-bridge support. + + -- Ikuya Awashiro Mon, 10 Apr 2006 22:02:19 +0900 + +scim-anthy (1.0.0-1) unstable; urgency=low + + * New upstream release + * debian/im-switch/scim-anthy: auto-detect for libqscim.so. + + -- Ikuya Awashiro Thu, 30 Mar 2006 23:31:23 +0900 + +scim-anthy (0.9.0-1) unstable; urgency=low + + * New upstream release + * debian/patches/02_atok_sty_predict_key.dpatch: + Removed. Already included by upstream. + + -- Ikuya Awashiro Fri, 20 Jan 2006 04:20:17 +0000 + +scim-anthy (0.8.0-1) unstable; urgency=low + + * New upstream release + * debian/patches/10_scim-plugin-module-install-dir.dpatch: + Updated. + * debian/patches/02_atok_sty_predict_key.dpatch: + Add predict keys to data/atok.sty. + + -- Ikuya Awashiro Wed, 14 Dec 2005 15:39:01 +0900 + +scim-anthy (0.7.1-1) unstable; urgency=low + + * New upstream release + * debian/patches/01_fix_scim-setup_crash_bug: removed. + New release contains this fix. + * fixed build issue. (closes: #336579) + + -- Ikuya Awashiro Tue, 1 Nov 2005 11:35:55 +0900 + +scim-anthy (0.7.0-1) unstable; urgency=low + + * New upstream release + * debian/patches/01_fix_scim-setup_crash_bug.dpatch: + fix scim-setup crash bug. + + -- Ikuya Awashiro Tue, 4 Oct 2005 14:24:11 +0000 + +scim-anthy (0.6.1-3) unstable; urgency=low + + * debian/im-switch/scim-anthy: Quoted DEPENDS line. + (closes: #324956) + + -- Ikuya Awashiro Thu, 25 Aug 2005 13:51:03 +0000 + +scim-anthy (0.6.1-2) unstable; urgency=low + + * closes: #323394 (ITP) + + -- Ikuya Awashiro Thu, 18 Aug 2005 14:40:28 +0000 + +scim-anthy (0.6.1-1) unstable; urgency=low + + * New upstream release + * debian/rules: do not make wrong directory. + * Bump Standards-Version to 3.6.2 (no changes required). + + -- Ikuya Awashiro Tue, 16 Aug 2005 13:26:27 +0900 + +scim-anthy (0.5.3-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sun, 31 Jul 2005 12:51:31 +0000 + +scim-anthy (0.5.2-3) unstable; urgency=low + + * add im-switch support. + + -- Ikuya Awashiro Thu, 28 Jul 2005 17:43:51 +0900 + +scim-anthy (0.5.2-2) unstable; urgency=low + + * This package is for SCIM 1.3.x or later. + * debian/control: changed Depends and Build-Depends for SCIM 1.3.x. + + -- Ikuya Awashiro Tue, 19 Jul 2005 17:43:33 +0900 + +scim-anthy (0.5.2-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Mon, 18 Jul 2005 12:51:57 +0000 + +scim-anthy (0.5.1-1) unstable; urgency=low + + * New upstream release + * debian/rules: get SCIM's version automatically. + * debian/control: add pkg-config to Build-depends. + * debian/patches/01_henkan_muhenkan.dpatch: dropped. + This fix contains 0.5.1. + + -- Ikuya Awashiro Sun, 10 Jul 2005 15:58:00 +0900 + +scim-anthy (0.5.0-4) unstable; urgency=low + + * rebuild on gcc 4.0. + + -- Ikuya Awashiro Thu, 7 Jul 2005 12:23:42 +0900 + +scim-anthy (0.5.0-3) unstable; urgency=low + + * debian/01_henkan_muhenkan.dpatch: + added. Because fixed some bugs like: + Fixed typo. + Raise priority of PageUp and PageDown. + Thanks AWASHIRO Ikuya. + and improve Henkan and Muhenkan key bind on ATOK style. + + -- Ikuya Awashiro Mon, 4 Jul 2005 01:13:17 +0900 + +scim-anthy (0.5.0-2) unstable; urgency=low + + * debian/rules: enable dh_strip. + Thanks to Yukiharu Yabuki . + + -- Ikuya Awashiro Fri, 1 Jul 2005 15:12:22 +0900 + +scim-anthy (0.5.0-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Thu, 30 Jun 2005 22:17:46 +0900 + +scim-anthy (0.4.3-1) unstable; urgency=low + + * New upstream release + * debian/control: changed Build-dep and Depends for SCIM 1.2.x. + + -- Ikuya Awashiro Mon, 6 Jun 2005 22:28:11 +0900 + +scim-anthy (0.4.2-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Wed, 18 May 2005 00:22:30 +0900 + +scim-anthy (0.4.0-1) unstable; urgency=low + + * New upstream release + * debian/rules: add the copy of config.sub and config.guess files + from /usr/share/misc, and the CFLAGS to the configure call. + * debian/control: add autotools-dev to Build-depends. + * debian/patches/10_scim-plugin-module-install-dir.dpatch: + fixed SetupUI files are misplaced probrem. + above all Thanks to Mike Hommey + of cource except New upstream release. + * debian/control: add scim (<< 1.1) to Depends. + This binary is for 1.0.x only. + + -- Ikuya Awashiro Sun, 15 May 2005 21:35:28 +0900 + +scim-anthy (0.3.2-1) unstable; urgency=low + + * New upstream release + * debian/patches/01_scim-plugin-module-install-dir.dpatch + get scim's version automatically. thanks to zoe + + -- Ikuya Awashiro Mon, 9 May 2005 18:03:29 +0900 + +scim-anthy (0.3.1-5) unstable; urgency=low + + * debian/control: add libgtk2.0-dev to Build-Depends. + + -- Ikuya Awashiro Tue, 19 Apr 2005 13:26:02 +0000 + +scim-anthy (0.3.1-4) unstable; urgency=low + + * delete some build errors. + + -- Ikuya Awashiro Sun, 3 Apr 2005 09:06:27 +0000 + +scim-anthy (0.3.1-3) unstable; urgency=low + + * debian/control: delete libanthy-dev's version. + + -- Ikuya Awashiro Sun, 3 Apr 2005 08:45:11 +0000 + +scim-anthy (0.3.1-2) unstable; urgency=low + + * debian/control: depends on anthy. + + -- Ikuya Awashiro Sun, 3 Apr 2005 17:25:00 +0900 + +scim-anthy (0.3.1-1) unstable; urgency=low + + * New upstream release + * Delete NEWS and COPYING in debian/docs + * add Suggests: kasumi to debian/control + + -- Ikuya Awashiro Wed, 2 Feb 2005 20:48:36 +0900 + +scim-anthy (0.2.0+cvs20050109-2) unstable; urgency=low + + * Use make update-gmo instead msgfmt -o po/ja.gmo po/ja.po + + -- Ikuya Awashiro Tue, 11 Jan 2005 23:17:58 +0900 + +scim-anthy (0.2.0+cvs20050109-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Sun, 9 Jan 2005 01:04:04 +0900 + +scim-anthy (0.2.0-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Mon, 29 Nov 2004 10:47:30 +0900 + +scim-anthy (0.1.8-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Mon, 22 Nov 2004 08:40:51 +0900 + +scim-anthy (0.1.5-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Fri, 19 Nov 2004 11:25:45 +0900 + +scim-anthy (0.1.4-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Thu, 18 Nov 2004 19:02:46 +0900 + +scim-anthy (0.1.3-1) unstable; urgency=low + + * New upstream release + + -- Ikuya Awashiro Wed, 17 Nov 2004 11:14:36 +0900 + +scim-anthy (0.1.2-1) unstable; urgency=low + + * Initial Release. + + -- Ikuya Awashiro Tue, 16 Nov 2004 16:18:17 +0900 + --- scim-anthy-1.2.4.orig/debian/copyright +++ scim-anthy-1.2.4/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by Ikuya Awashiro on +Tue, 16 Nov 2004 16:18:17 +0900. + +It was downloaded from http://sourceforge.jp/projects/scim-imengine/ + +Copyright: + +Upstream Author: + Hiroyuki Ikezoe + Takuro Ashie + +License: + + You are free to distribute this software under the terms of + the GNU General Public License. + On Debian systems, the complete text of the GNU General Public + License can be found in the file `/usr/share/common-licenses/GPL'. + --- scim-anthy-1.2.4.orig/debian/control +++ scim-anthy-1.2.4/debian/control @@ -0,0 +1,19 @@ +Source: scim-anthy +Section: utils +Priority: optional +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Ikuya Awashiro +Uploaders: Akira TAGOH +Build-Depends: debhelper (>= 4.0.0), dpatch (>= 1.11), libanthy-dev, scim (>= 1.4.6), libscim-dev (>= 1.4.6), autotools-dev, pkg-config +Standards-Version: 3.7.2 + +Package: scim-anthy +Architecture: any +Depends: ${shlibs:Depends}, anthy, scim (<< 1.5) +Suggests: kasumi +Description: SCIM IMEngine module for Anthy + Smart Common Input Method platform (SCIM) is an input method server + and a development platform to make Input Method developers' lives + easier. + Anthy is simple and secure input method in Japanese. + scim-anthy connects Anthy to SCIM. --- scim-anthy-1.2.4.orig/debian/rules +++ scim-anthy-1.2.4/debian/rules @@ -0,0 +1,113 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: configure +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + # Add here commands to configure the package. + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #msgfmt -o po/ja.gmo po/ja.po + cd po; make update-gmo; cd ../ + #docbook-to-man debian/scim-anthy.sgml > scim-anthy.1 + + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + rm -f po/*.gmo + + # Add here commands to clean up after the build process. + -$(MAKE) distclean + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/scim-anthy. + $(MAKE) install DESTDIR=$(CURDIR)/debian/scim-anthy + mv $(CURDIR)/debian/scim-anthy/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/IMEngine/anthy.a \ + $(CURDIR)/debian/scim-anthy/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/IMEngine/libanthy.a + mv $(CURDIR)/debian/scim-anthy/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/anthy-imengine-setup.a \ + $(CURDIR)/debian/scim-anthy/usr/lib/scim-1.0/`pkg-config --variable=scim_binary_version scim`/SetupUI/libanthy-imengine-setup.a + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install patch unpatch --- scim-anthy-1.2.4.orig/debian/compat +++ scim-anthy-1.2.4/debian/compat @@ -0,0 +1 @@ +4 --- scim-anthy-1.2.4.orig/debian/docs +++ scim-anthy-1.2.4/debian/docs @@ -0,0 +1,2 @@ +README +AUTHORS --- scim-anthy-1.2.4.orig/xxx +++ scim-anthy-1.2.4/xxx @@ -0,0 +1,55 @@ +--- scim-anthy-1.2.4.orig/src/scim_anthy_setup.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_setup.cpp +@@ -30,6 +30,8 @@ + #include + #include + ++#include ++ + #define Uses_SCIM_CONFIG_BASE + #define Uses_SCIM_EVENT + #define SCIM_ANTHY_USE_GTK +--- scim-anthy-1.2.4.orig/src/scim_anthy_kana.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_kana.cpp +@@ -23,6 +23,8 @@ + #include "scim_anthy_default_tables.h" + #include "scim_anthy_utils.h" + ++#include ++ + using namespace scim_anthy; + + static bool +--- scim-anthy-1.2.4.orig/src/scim_anthy_preedit.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_preedit.cpp +@@ -26,6 +26,8 @@ + #include "scim_anthy_preedit.h" + #include "scim_anthy_utils.h" + ++#include ++ + using namespace scim_anthy; + + static ConvRule *get_period_rule (TypingMethod method, +--- scim-anthy-1.2.4.orig/src/scim_anthy_utils.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_utils.cpp +@@ -24,6 +24,8 @@ + #include "scim_anthy_utils.h" + #include "scim_anthy_default_tables.h" + ++#include ++ + namespace scim_anthy { + + bool +--- scim-anthy-1.2.4.orig/src/scim_anthy_prefs.cpp ++++ scim-anthy-1.2.4/src/scim_anthy_prefs.cpp +@@ -23,6 +23,8 @@ + #include "scim_anthy_prefs.h" + #include "scim_anthy_intl.h" + ++#include ++ + namespace scim_anthy { + + BoolConfigData config_bool_common [] =