diff -Nru ibus-chewing-1.3.6.20100730/ABOUT-NLS ibus-chewing-1.3.7.20100910/ABOUT-NLS --- ibus-chewing-1.3.6.20100730/ABOUT-NLS 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/ABOUT-NLS 1970-01-01 00:00:00.000000000 +0000 @@ -1,1101 +0,0 @@ -1 Notes on the Free Translation Project -*************************************** - -Free software is going international! The Free Translation Project is -a way to get maintainers of free software, translators, and users all -together, so that free software will gradually become able to speak many -languages. A few packages already provide translations for their -messages. - - If you found this `ABOUT-NLS' file inside a distribution, you may -assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do _not_ -need to install GNU `gettext' prior to configuring, installing or using -this package with messages translated. - - Installers will find here some useful hints. These notes also -explain how users should proceed for getting the programs to use the -available translations. They tell how people wanting to contribute and -work on translations can contact the appropriate team. - - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters -=================== - -Some packages are "localizable" when properly installed; the programs -they contain can be made to speak your own native language. Most such -packages use GNU `gettext'. Other packages have their own ways to -internationalization, predating GNU `gettext'. - - By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: - - ./configure --with-included-gettext - ./configure --disable-nls - -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. - - When you already have GNU `gettext' installed on your system and run -configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. - - Internationalized packages usually have many `po/LL.po' files, where -LL gives an ISO 639 two-letter code identifying the language. Unless -translations have been forbidden at `configure' time by using the -`--disable-nls' switch, all available translations are installed -together with the package. However, the environment variable `LINGUAS' -may be set, prior to configuration, to limit the installed set. -`LINGUAS' should then contain a space separated list of two-letter -codes, stating which languages are allowed. - -1.3 Using This Package -====================== - -As a user, if your language has been installed for this package, you -only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's -suppose that you speak German and live in Germany. At the shell -prompt, merely execute `setenv LANG de_DE' (in `csh'), -`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). -This can be done from your `.login' or `.profile' file, once and for -all. - - You might think that the country code specification is redundant. -But in fact, some languages have dialects in different countries. For -example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The -country code serves to distinguish the dialects. - - The locale naming convention of `LL_CC', with `LL' denoting the -language and `CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your language by running the -command `locale -a | grep '^LL''. - - Not all programs have translations for all languages. By default, an -English message is shown in place of a nonexistent translation. If you -understand other languages, you can set up a priority list of languages. -This is done through a different environment variable, called -`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' -for the purpose of message handling, but you still need to have `LANG' -set to the primary language; this is required by other parts of the -system libraries. For example, some Swedish users who would rather -read translations in German than English for when Swedish is not -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. - - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from `no' to `nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under `nb' and some older ones under `no', it's recommended -for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and -older translations are used. - - In the `LANGUAGE' environment variable, but not in the `LANG' -environment variable, `LL_CC' combinations can be abbreviated as `LL' -to denote the language's main dialect. For example, `de' is equivalent -to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' -(Portuguese as spoken in Portugal) in this context. - -1.4 Translating Teams -===================== - -For the Free Translation Project to be a success, we need interested -people who like their own language and write it well, and who are also -able to synergize with other translators speaking the same language. -Each translation team has its own mailing list. The up-to-date list of -teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. - - If you'd like to volunteer to _work_ at translating messages, you -should become a member of the translating team for your own language. -The subscribing address is _not_ the same as the list itself, it has -`-request' appended. For example, speakers of Swedish can send a -message to `sv-request@li.org', having this message body: - - subscribe - - Keep in mind that team members are expected to participate -_actively_ in translations, or at solving translational difficulties, -rather than merely lurking around. If your team does not exist yet and -you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. - - The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skills are praised more than -programming skills, here. - -1.5 Available Packages -====================== - -Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of October -2006. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a -translation percentage of at least 50%. - - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - GNUnet | [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] [] | - bash | [] [] [] | - batchelor | [] | - bfd | | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bison-runtime | | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | [] | - gliv | [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | - gnuedu | | - gnulib | [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | - gsasl | | - gss | | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | () | - gtkam | [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | - iso_3166_2 | | - iso_4217 | [] | - iso_639 | [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | | - keytouch-editor | | - keytouch-keyboa... | | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] [] | - mysecretdiary | [] [] | - nano | [] [] [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | | - pilot-qof | [] | - psmisc | [] | - pwdutils | | - python | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - silky | | - skencil | [] () | - sketch | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] [] [] [] [] | - xkeyboard-config | | - xpad | [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16 - - es et eu fa fi fr ga gl gu he hi hr hu id is it - +--------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnucash-glossary | [] [] | - gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | () () [] () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] | - gss | [] | - gst-plugins | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] [] | - ld | [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | - skencil | [] [] | - sketch | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tp-robot | [] [] [] [] | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 - - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +-------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | - gnubiff | | - gnucash | () () | - gnucash-glossary | [] | - gnuedu | | - gnulib | [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | | - hello | [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | - libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | - lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | - shishi | | - silky | [] | - skencil | | - sketch | | - solfege | | - soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | - +-------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 - - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 - - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - +---------------------------------------------------+ - GNUnet | [] | 2 - a2ps | [] [] [] | 19 - aegis | | 0 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 15 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 - bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 15 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 5 - clisp | | 6 - console-tools | [] [] | 5 - coreutils | [] [] | 16 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - error | [] [] [] [] | 18 - fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 - flex | [] [] | 15 - fslint | [] | 9 - gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 - gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 27 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 - gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] | 3 - gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] | 14 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 20 - gpe-filemanager | [] | 6 - gpe-go | [] [] | 15 - gpe-login | [] [] [] [] [] | 21 - gpe-ownerinfo | [] [] [] [] | 21 - gpe-package | [] | 6 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 20 - gpe-taskmanager | [] [] [] | 20 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] | 7 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 - gramadoir | [] | 7 - grep | [] [] [] [] | 34 - gretl | | 4 - gsasl | [] [] | 8 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] [] [] | 20 - gstreamer | [] [] [] | 17 - gtick | [] | 3 - gtkam | [] | 13 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 37 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] [] | 16 - iso_3166_2 | | 2 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | [] | 3 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 - libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] | 7 - libidn | [] [] | 10 - lifelines | | 4 - lilypond | | 2 - lingoteach | [] | 6 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailutils | [] | 8 - make | [] [] [] | 20 - man-db | [] | 6 - minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 17 - nano_1_0 | [] [] [] | 18 - opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 - pwdutils | [] | 3 - python | | 0 - qof | [] | 4 - radius | [] | 6 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 24 - sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 - skencil | [] | 7 - sketch | | 6 - solfege | | 2 - soundtracker | [] [] | 9 - sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 20 - texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 - tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 - unicode-han-tra... | | 0 - unicode-transla... | | 2 - util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 - wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 - xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 - +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 - - Some counters in the preceding matrix are higher than the number of -visible blocks let us expect. This is because a few extra PO files are -used for implementing regional variants of languages, or language -dialects. - - For a PO file in the matrix above to be effective, the package to -which it applies should also have been internationalized and -distributed as such by its maintainer. There might be an observable -lag between the mere existence a PO file and its wide availability in a -distribution. - - If October 2006 seems to be old, you may fetch a more recent copy of -this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date -matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. - -1.6 Using `gettext' in new packages -=================================== - -If you are writing a freely available program and want to -internationalize it you are welcome to use GNU `gettext' in your -package. Of course you have to respect the GNU Library General Public -License which covers the use of the GNU `gettext' library. This means -in particular that even non-free programs can use `libintl' as a shared -library, whereas only free software can use `libintl' as a static -library or use modified versions of `libintl'. - - Once the sources are changed appropriately and the setup can handle -the use of `gettext' the only thing missing are the translations. The -Free Translation Project is also available for packages which are not -developed inside the GNU project. Therefore the information given above -applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. - diff -Nru ibus-chewing-1.3.6.20100730/ChangeLog ibus-chewing-1.3.7.20100910/ChangeLog --- ibus-chewing-1.3.6.20100730/ChangeLog 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/ChangeLog 2010-09-10 14:02:04.000000000 +0000 @@ -1,3 +1,17 @@ +* Sat Sep 11 2010 - Ding-Yi Chen - 1.3.7.20100910 +- Input style of ibus-chewing is decommissioned under ibus >=1.3. + Now the input style is determined solely on the setting of + "Embed preedit in application window" in IBus. +- Resolves: #608991, #632043 +- Fixed Issue 1022: chewing commit some text in reset method + (patched by Peng Huang). +- Fixed Issue 1032: [ibus-chewing] Chewing not commit some single Chinese + char into application when press enter. +- Rewrite CMake modules to make them cleaner, and documents in cmake module + help format. +- [For developer and distro maintainer] + Various targets changed. Use 'make help' to obtain a list of available + targets. * Fri Jul 30 2010 - Ding-Yi Chen - 1.3.6.20100730 - Resolves: #608991 - Sort of fix upstream issue 993. @@ -181,18 +195,3 @@ - This is a barely working version for with IBus C. - The build system is converted from autotool to CMake. - - - - - - - - - - - - - - - diff -Nru ibus-chewing-1.3.6.20100730/ChangeLog.in ibus-chewing-1.3.7.20100910/ChangeLog.in --- ibus-chewing-1.3.6.20100730/ChangeLog.in 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/ChangeLog.in 2010-09-10 14:02:04.000000000 +0000 @@ -1,4 +1,4 @@ -* @DATE@ - @MAINTAINER@ - @PRJ_VER@ +* @TODAY_CHANGELOG@ - @MAINTAINER@ - @PRJ_VER@ @CHANGELOG_ITEMS@ @CHANGELOG_PREV@ diff -Nru ibus-chewing-1.3.6.20100730/ChangeLog.prev ibus-chewing-1.3.7.20100910/ChangeLog.prev --- ibus-chewing-1.3.6.20100730/ChangeLog.prev 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/ChangeLog.prev 2010-09-10 14:02:04.000000000 +0000 @@ -1,3 +1,15 @@ +* Fri Jul 30 2010 - Ding-Yi Chen - 1.3.6.20100730 +- Resolves: #608991 +- Sort of fix upstream issue 993. +- Include USER-GUIDE +- Remove NEWS, as this project does not use it. +- Fix upstream Issue 1016: [ibus-chewing] Chewing should commit the complete string before disable chewing. But only for ibus-1.3.0 and later. +- Mouse candidate selection now work in plain Zhuyin mode. +- Default setting changes: (Won't affect current user though). + + Auto move cursor: TRUE + + Add phrases in front: TRUE + + spaceAsSelection: FALSE + * Wed Jul 14 2010 Ding-Yi Chen - 1.3.5.20100714 - Resolves: #608991 - Removes Ctrl-v/V Hotkey @@ -169,17 +181,3 @@ - This is a barely working version for with IBus C. - The build system is converted from autotool to CMake. - - - - - - - - - - - - - - diff -Nru ibus-chewing-1.3.6.20100730/CMakeLists.txt ibus-chewing-1.3.7.20100910/CMakeLists.txt --- ibus-chewing-1.3.6.20100730/CMakeLists.txt 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/CMakeLists.txt 2010-09-10 14:02:04.000000000 +0000 @@ -13,105 +13,49 @@ SET(RELEASE_FILE ${CMAKE_SOURCE_DIR}/RELEASE-NOTES.txt) SET(RPM_RELEASE_FILE ${CMAKE_SOURCE_DIR}/SPECS/RPM-RELEASE-NOTES.txt) -SETTING_FILE_GET_ATTRIBUTE(PRJ_VER_PATTERN "PRJ_VER" ${RELEASE_FILE}) +#SETTING_FILE_GET_ATTRIBUTE(PRJ_VER "PRJ_VER" ${RELEASE_FILE}) #MESSAGE("PRJ_VER_PATTERN=${PRJ_VER_PATTERN}") -SETTING_FILE_GET_ATTRIBUTE(PRJ_VER_RELEASE "RPM_RELEASE" ${RPM_RELEASE_FILE}) +#SETTING_FILE_GET_ATTRIBUTE(PRJ_VER_RELEASE "RPM_RELEASE" ${RPM_RELEASE_FILE}) SET(SO_VER_MAJOR "1") SET(SO_VER_MINOR "0") SET(AUTHORS "Peng Huang, Ding-Yi Chen") SET(MAINTAINER "Ding-Yi Chen ") - -# For CVS/SVN/GIT change message -SETTING_FILE_GET_ATTRIBUTE(CHANGE_SUMMARY "SUMMARY" ${RELEASE_FILE}) -#MESSAGE("### CHANGE_SUMMARY=${CHANGE_SUMMARY}") - -# Changelog items -COMMAND_OUTPUT_TO_VARIABLE(CHANGELOG_ITEMS tail -n +4 ${RELEASE_FILE}) -#MESSAGE("### CHANGELOG_ITEMS=${CHANGELOG_ITEMS}|") - -STRING(COMPARE GREATER "${PRJ_VER_RELEASE}" "1" NEED_RPM_RELEASE_INFO) -IF(${NEED_RPM_RELEASE_INFO}) - SETTING_FILE_GET_ATTRIBUTE(RPM_RELEASE_SUMMARY "RPM_RELEASE_SUMMARY" ${RPM_RELEASE_FILE}) - COMMAND_OUTPUT_TO_VARIABLE(RPM_CHANGELOG_ITEMS tail -n +5 ${RPM_RELEASE_FILE}) -ELSE(${NEED_RPM_RELEASE_INFO}) - SET(RPM_RELEASE_SUMMARY ${CHANGE_SUMMARY}) - SET(RPM_CHANGELOG_ITEMS ${CHANGELOG_ITEMS}) -ENDIF(${NEED_RPM_RELEASE_INFO}) -#MESSAGE("### RPM_RELEASE_SUMMARY=${RPM_RELEASE_SUMMARY}") -#MESSAGE("### RPM_CHANGELOG_ITEMS=|${RPM_CHANGELOG_ITEMS}|") - - -#================================================================== -# Developer setting. -# -SET(HOSTING_SERVICE_PROVIDER "GitHub") -SET(DEVELOPER_SETTING_FILE "DEVELOPER_SETTING_NO_PACK") -SET(DEVELOPER_DEPENDS UploadPkg.batch.in) -ADD_CUSTOM_TARGET(commit - COMMAND git commit -a -m "${CHANGE_SUMMARY}" - COMMAND git tag -a "${PRJ_VER}" -m "Ver ${PRJ_VER}" HEAD - COMMENT "Commit and tag the changes" - VERBATIM - ) - +INCLUDE(ManageVersion) +LOAD_RELEASE_FILE("${RELEASE_FILE}") +INCLUDE(CompileFlags) +SET_USUAL_COMPILE_ENV() #################################################################### # Includes #################################################################### -INCLUDE(Gettext) -#================================================================== -# Include common.CMakeLists.txt -# -INCLUDE(common.CMakeLists.txt) - -#################################################################### -# Post Include setting -#################################################################### - -#################################################################### -# RPM configuration -#################################################################### -FILE(READ ${CMAKE_SOURCE_DIR}/SPECS/RPM-ChangeLog RPM_CHANGELOG) -GENERATE_SPEC(SPECS/${PROJECT_NAME}.spec.in) #################################################################### # Definitions #################################################################### -ADD_DEFINITIONS(-DPRJ_VERSION='"${PRJ_VER_FULL}"') -ADD_DEFINITIONS(-DPKGDATADIR='"${PROJECT_DATADIR}"') -ADD_DEFINITIONS(-DSYSTEMDIR='"${PROJECT_DATADIR}"') CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/data/chewing.xml.in ${CMAKE_BINARY_DIR}/data/chewing.xml) +INCLUDE(UseUninstall) #################################################################### # Required #################################################################### FIND_PACKAGE(PkgConfig) PKG_CHECK_MODULES(GTK2 REQUIRED gtk+-2.0) PKG_CHECK_MODULES(IBUS REQUIRED ibus-1.0) -STRING(REGEX MATCH "[1-9][0-9]*\\.[1-9][0-9]*\\.[0-9]*" IBUS_COMPAT_VERSION "${IBUS_VERSION}") +STRING(REGEX REPLACE "([1-9][0-9]*)\\.([0-9][0-9]?)[0-9]*\\.([0-9][0-9]?)" "\\1" IBUS_VERSION_MAJOR "${IBUS_VERSION}") +STRING(REGEX REPLACE "([1-9][0-9]*)\\.([0-9][0-9]?)[0-9]*\\.([0-9][0-9]?)" "\\2" IBUS_VERSION_MINOR "${IBUS_VERSION}") +STRING(REGEX REPLACE "([1-9][0-9]*)\\.([0-9][0-9]?)[0-9]*\\.([0-9][0-9]?)" "\\3" IBUS_VERSION_PATCH "${IBUS_VERSION}") +MATH(EXPR IBUS_COMPAT_VERSION + "${IBUS_VERSION_MAJOR}*10000+${IBUS_VERSION_MINOR}*100+${IBUS_VERSION_PATCH}") MESSAGE("IBUS_VERSION=${IBUS_VERSION} IBUS_COMPAT_VERSION=${IBUS_COMPAT_VERSION}") -IF ( IBUS_COMPAT_VERSION VERSION_GREATER 1.2.999 ) - ADD_DEFINITIONS(-DIBUS_VERSION=10300) - MESSAGE("IBus 1.3 detected! -DIBUS_VERSION=10300") -ELSEIF ( IBUS_COMPAT_VERSION VERSION_GREATER 1.2.98 ) - ADD_DEFINITIONS(-DIBUS_VERSION=10299) - MESSAGE("IBus 1.2.99 detected! -DIBUS_VERSION=10299") -ELSEIF ( IBUS_COMPAT_VERSION VERSION_GREATER 1.1.98 ) - ADD_DEFINITIONS(-DIBUS_VERSION=10200) - MESSAGE("IBus 1.2 detected! -DIBUS_VERSION=10200") -ELSEIF ( IBUS_COMPAT_VERSION VERSION_GREATER 1.0.98 ) - ADD_DEFINITIONS(-DIBUS_VERSION=10100) - MESSAGE("IBus 1.1 detected! -DIBUS_VERSION=10100") -ELSE() - MESSAGE(FATAL "IBus development package is not installed!") -ENDIF() -PKG_CHECK_MODULES(XTST REQUIRED xtst x11) +ADD_DEFINITIONS(-DIBUS_VERSION=${IBUS_COMPAT_VERSION}) +MESSAGE("ADD_DEFINITIONS(-DIBUS_VERSION=${IBUS_COMPAT_VERSION})") +PKG_CHECK_MODULES(XTST REQUIRED xtst x11) PKG_CHECK_MODULES(CHEWING chewing>=0.3.2) -COMMAND_OUTPUT_TO_VARIABLE(CHEWING_DATADIR ${PKG_CONFIG_EXECUTABLE} --variable=datadir chewing) -ADD_DEFINITIONS(-DCHEWING_DATADIR='"${CHEWING_DATADIR}"') +COMMAND_OUTPUT_TO_VARIABLE(CHEWING_DATA_DIR ${PKG_CONFIG_EXECUTABLE} --variable=datadir chewing) +ADD_DEFINITIONS(-DCHEWING_DATA_DIR='"${CHEWING_DATA_DIR}"') FIND_PROGRAM(GOB2 gob2) IF(${GOB2} STREQUAL "GOB2-NOTFOUND") @@ -122,6 +66,7 @@ # Sub directories #################################################################### SET(TRANSLATED zh_CN zh_TW) +INCLUDE(UseGettext) ADD_SUBDIRECTORY(po) ADD_SUBDIRECTORY(src bin) @@ -132,50 +77,66 @@ #==================================================================== # Files to be install. # -SET(MAIN_DOCS AUTHORS README ChangeLog NEWS COPYING) +SET(MAIN_DOCS AUTHORS README ChangeLog NEWS COPYING USER-GUIDE) #INSTALL(FILES ${MAIN_DOCS} -# DESTINATION "${PROJECT_DOCDIR}") +# DESTINATION "${PROJECT_DOC_DIR}") INSTALL(DIRECTORY icons - DESTINATION ${PROJECT_DATADIR}) + DESTINATION ${PROJECT_DATA_DIR}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/data/chewing.xml - DESTINATION "${datadir}/ibus/component") + DESTINATION "${DATA_DIR}/ibus/component") #==================================================================== # Schemas # SET(GCONF_SCHEMAS_FILE ${CMAKE_BINARY_DIR}/data/${PROJECT_NAME}.schemas) -INCLUDE(GConf) +INCLUDE(UseGConf) #==================================================================== -# CPack configuration +# Hosting Service # +INCLUDE(UseHostingService) +USE_HOSTING_SERVICE_READ_SETTING_FILE("MAINTAINER_SETTING_NO_PACK") -SET(CPACK_RESOURCE_FILE_LICENSE - ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) +#==================================================================== +# Pack configuration +# +SET(CPACK_PACKAGE_VENDOR "Red Hat, APAC, Inc.") -SET(PRJ_COMMON_IGNORE_FILES - "/docs/" - "\\\\.cache$" "\\\\.spec$" - "messages.po$" +INCLUDE(PackSource) +INCLUDE(PackRPM) +INCLUDE(UseFedpkg) + +SET(MY_IGNORE_FILES_COMMON + "/docs/" "\\\\.spec$" "messages.po$" "\\\\.orig$" ) # GOB_GENERATED source codes are now excluded, # As Bug 519108 (https://bugzilla.redhat.com/show_bug.cgi?id=519108) # Is fixed from Fedora 11 -SET(PRJ_COMMON_IGNORE_FILES - ${PRJ_COMMON_IGNORE_FILES} "src/maker-dialog.*\\\\.[ch]" "src/ibus-chewing-engine.*\\\\.[ch]" +SET(PRJ_IGNORE_FILES_COMMON + ${MY_IGNORE_FILES_COMMON} "src/maker-dialog.*\\\\.[ch]" + "src/ibus-chewing-engine.*\\\\.[ch]" ) -SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES} ${PRJ_COMMON_IGNORE_FILES} "/bin/" - "\\\\.xml$" "\\\\.schemas") -SET(CPACK_PACKAGE_IGNORE_FILES ${CPACK_BINARY_IGNORE_FILES} ${PRJ_COMMON_IGNORE_FILES} "/src/" - "\\\\.spec$" "\\\\.in$" "\\\\.pot$") +SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} + ${PRJ_IGNORE_FILES_COMMON} "/bin/" "\\\\.xml$" "\\\\.schemas") +#MESSAGE("PACK_SOURCE_IGNORE_FILES=${PACK_SOURCE_IGNORE_FILES}") + +PACK_SOURCE(PACK_SOURCE_FILE_NAME "${RPM_BUILD_SOURCES}") +PACK_RPM(PRJ_SRPM_FILE_NAME "${RPM_BUILD_SPECS}/ibus-chewing.spec.in" "${PACK_SOURCE_FILE_NAME}") + +# If mock exists, then add mock related targets. +FIND_PROGRAM(MOCK_CMD mock) +IF(NOT MOCK_CMD STREQUAL "MOCK_CMD-NOTFOUND") + USE_MOCK("${RPM_BUILD_SPECS}/ibus-chewing.spec.in") +ENDIF(NOT MOCK_CMD STREQUAL "MOCK_CMD-NOTFOUND") + +USE_FEDPKG("${RPM_BUILD_SRPMS}/${PRJ_SRPM_FILE_NAME}") +USE_BODHI() -INCLUDE(CPack) +ADD_DEPENDENCIES(pack_src pot_file) -# Avoid [Bug 519108]: [gob2] class and enum names convert incorrectly in mock / koji. -ADD_DEPENDENCIES(pack_src pot_file gob2) diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/BasicMacros.cmake ibus-chewing-1.3.7.20100910/cmake_modules/BasicMacros.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/BasicMacros.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/BasicMacros.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -# BasicMacros: Macros which are needed by other modules. -# -# To use: INCLUDE(BasicMacros) -# -#=================================================================== -# Macros: -# STRING_TRIM(var str) -# var: A variable that stores the result. -# str: A string. -# -# Trim a string. This macro is needed as CMake 2.4 does not support STRING(STRIP ..) -#------------------------------------------------------------------- -# COMMAND_OUTPUT_TO_VARIABLE(var cmd): -# var: A variable that stores the result. -# cmd: A command. -# -# Store command output to a variable, without new line characters (\n and \r). -# This macro is suitable for command that output one line result. -# Note that the var will be set to ${var_name}-NOVALUE if cmd does not have -# any output. -# -#------------------------------------------------------------------- -# SETTING_FILE_GET_ATTRIBUTE(var attr_name setting_file [UNQUOTED] [setting_sign]): -# var: Variable to store the attribute value. -# attr_name: Name of the attribute. -# setting_file: Setting filename. -# setting_sign: (Optional) The symbol that separate attribute name and its value. -# Default value: "=" -# -# Get attribute value from a setting file. -# New line characters will be stripped. -# Use "#" to comment out lines. -# -#------------------------------------------------------------------- -# SETTING_FILE_GET_ALL_ATTRIBUTES(setting_file [UNQUOTED] [setting_sign]): -# setting_file: Setting filename. -# -# Get all attributes and corresponding from a setting file. -# New line characters will be stripped. -# Use "#" to comment out lines. -# -#------------------------------------------------------------------- -# DATE_FORMAT(date_var format [locale]) -# date_var: Result date string -# format: date format for date(1) -# locale: locale of the string. -# Use current locale setting if locale is not given. -# -# Get date in specified format and locale. -# -#------------------------------------------------------------------- -# GET_ENV(var default_value [env]) -# var: Variable to be set -# default_value: Default value of the var -# env: The name of environment variable. Only need if different from var. -# -# Get the value of a environment variable, or use default -# if the environment variable does not exist or is empty. -# -#------------------------------------------------------------------- -# SET_ENV(var default_value [env]) -# var: Variable to be set -# default_value: Default value of the var -# env: The name of environment variable. Only need if different from var. -# -# Add compiler environment with a variable and its value. -# If the variable is not defined yet, then a default value is assigned to it first. -# -#------------------------------------------------------------------- -# SET_VAR(var untrimmed_value) -# var: Variable to be set -# untrimmed_value: Untrimmed values that may have space, \t, \n, \r in the front or back of the string. -# -# Trim an set the value to a variable. -# - -IF(NOT DEFINED _BASIC_MACROS_CMAKE_) - SET(CMAKE_LOWEST_SUPPORTED_VERSION 2.4) - SET(_BASIC_MACROS_CMAKE_ "DEFINED") - IF(NOT DEFINED READ_TXT_CMD) - SET(READ_TXT_CMD cat) - ENDIF(NOT DEFINED READ_TXT_CMD) - - IF(CMAKE_VERSION) - IF(CMAKE_VERSION VERSION_LESS 2.6) - MESSAGE("SET CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION}") - SET(CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION}) - ENDIF() - ELSE() - # CMAKE_VERSION may not available in 2.4 - MESSAGE("SET CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_LOWEST_SUPPORTED_VERSION}") - SET(CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_LOWEST_SUPPORTED_VERSION}) - SET(CMAKE_VERSION ${CMAKE_LOWEST_SUPPORTED_VERSION}) - ENDIF() - - MACRO(STRING_TRIM var str) - IF ("${ARGN}" STREQUAL "UNQUOTED") - SET(_unquoted 1) - ELSE("${ARGN}" STREQUAL "UNQUOTED") - SET(_unquoted 0) - ENDIF("${ARGN}" STREQUAL "UNQUOTED") - SET(_var_1 "\r${str}\r") - STRING(REPLACE "\r[ \t]*" "" _var_2 "${_var_1}" ) - STRING(REGEX REPLACE "[ \t\r\n]*\r" "" _var_3 "${_var_2}" ) - IF (${_unquoted}) - STRING(REGEX REPLACE "^\"" "" _var_4 "${_var_3}" ) - STRING(REGEX REPLACE "\"$" "" ${var} "${_var_4}" ) - ELSE(${_unquoted}) - SET(${var} "${_var_3}") - ENDIF(${_unquoted}) - ENDMACRO(STRING_TRIM var str) - - MACRO(COMMAND_OUTPUT_TO_VARIABLE var cmd) - EXECUTE_PROCESS( - COMMAND ${cmd} ${ARGN} - OUTPUT_VARIABLE _cmd_output - ) - IF(_cmd_output) - STRING_TRIM(${var} ${_cmd_output}) - ELSE(_cmd_output) - SET(var "${var}-NOVALUE") - ENDIF(_cmd_output) - # MESSAGE("var=${var} _cmd_output=${_cmd_output}") - ENDMACRO(COMMAND_OUTPUT_TO_VARIABLE var cmd) - - MACRO(SETTING_FILE_GET_ATTRIBUTE var attr_name setting_file) - SET(setting_sign "=") - SET(_UNQUOTED "") - FOREACH(_arg ${ARGN}) - IF (${_arg} STREQUAL "UNQUOTED") - SET(_UNQUOTED "UNQUOTED") - ELSE(${_arg} STREQUAL "UNQUOTED") - SET(setting_sign ${_arg}) - ENDIF(${_arg} STREQUAL "UNQUOTED") - ENDFOREACH(_arg) - SET(_find_pattern "\n[ \\t]*(${attr_name}\)[ \\t]*${setting_sign}\([^\n]*\)") - - FILE(READ ${setting_file} _txt_content) - SET(_txt_content "\n${_txt_content}\n") - - # Escape ';' - STRING(REPLACE ";" "\\;" _txt_content "${_txt_content}") - - STRING(REGEX MATCHALL "${_find_pattern}" _matched_lines "${_txt_content}") - - #MESSAGE("_matched_lines=|${_matched_lines}|") - SET(_result_line) - - FOREACH(_line ${_matched_lines}) - #MESSAGE("### _line=|${_line}|") - STRING(REGEX REPLACE "${_find_pattern}" "\\2" _result_line "${_line}") - SET_VAR(${var} "${_result_line}") - ENDFOREACH() - ENDMACRO(SETTING_FILE_GET_ATTRIBUTE var attr_name setting_file) - - MACRO(SETTING_FILE_GET_ALL_ATTRIBUTES setting_file) - SET(setting_sign "=") - SET(_UNQUOTED "") - FOREACH(_arg ${ARGN}) - IF (${_arg} STREQUAL "UNQUOTED") - SET(_UNQUOTED "UNQUOTED") - ELSE(${_arg} STREQUAL "UNQUOTED") - SET(setting_sign ${_arg}) - ENDIF(${_arg} STREQUAL "UNQUOTED") - ENDFOREACH(_arg) - SET(_find_pattern "\n[ \\t]*([A-Za-z0-9_]*\)[ \\t]*${setting_sign}\([^\n]*\)") - - FILE(READ ${setting_file} _txt_content) - SET(_txt_content "\n${_txt_content}\n") - - # Escape ';' - STRING(REPLACE ";" "\\;" _txt_content "${_txt_content}") - - STRING(REGEX MATCHALL "${_find_pattern}" _matched_lines "${_txt_content}") - - #MESSAGE("_matched_lines=|${_matched_lines}|") - SET(_result_line) - SET(_var) - - FOREACH(_line ${_matched_lines}) - #MESSAGE("### _line=|${_line}|") - STRING(REGEX REPLACE "${_find_pattern}" "\\1" _var "${_line}") - STRING(REGEX REPLACE "${_find_pattern}" "\\2" _result_line "${_line}") - IF ( NOT "${_var}" STREQUAL "") - #MESSAGE("### _var=${_var} _result_line=|${_result_line}|") - SET_VAR(var "${_result_line}") - ENDIF() - ENDFOREACH() - ENDMACRO(SETTING_FILE_GET_ALL_ATTRIBUTES setting_file) - - MACRO(DATE_FORMAT date_var format) - SET(_locale ${ARGV2}) - IF(_locale) - SET(ENV{LC_ALL} ${_locale}) - ENDIF(_locale) - COMMAND_OUTPUT_TO_VARIABLE(${date_var} date "${format}") - ENDMACRO(DATE_FORMAT date_var format) - - MACRO(GET_ENV var default_value) - IF(${ARGV2}) - SET(_env "${ARGV2}") - ELSE() - SET(_env "${var}") - ENDIF() - IF ("$ENV{${_env}}" STREQUAL "") - SET(${var} "${default_value}") - ELSE() - SET(${var} "$ENV{${_env}}") - ENDIF() - # MESSAGE("Variable ${var}=${${var}}") - ENDMACRO(GET_ENV var default_value) - - MACRO(SET_ENV var default_value) - IF(${ARGV2}) - SET(_env ${ARGV2}) - ELSE() - SET(_env ${var}) - ENDIF() - IF(NOT DEFINED ${var}) - SET(${var} "${default_value}") - ENDIF(NOT DEFINED ${var}) - #MESSAGE("Variable Set to ${var},${_env}=${${var}}") - ADD_DEFINITIONS(-D${_env}='"${${var}}"') - ENDMACRO(SET_ENV var default_value) - - MACRO(SET_VAR var untrimmedValue) - IF ("${untrimmedValue}" STREQUAL "") - SET(${var} "") - ELSE("${untrimmedValue}" STREQUAL "") - STRING_TRIM(trimmedValue "${untrimmedValue}" ${_UNQUOTED}) - SET(${var} "${trimmedValue}") - ENDIF("${untrimmedValue}" STREQUAL "") - #SET(value "${${var}}") - #MESSAGE("### ${var}=|${value}|") - ENDMACRO(SET_VAR var untrimmedValue) - -ENDIF(NOT DEFINED _BASIC_MACROS_CMAKE_) - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/cmake_uninstall.cmake.in ibus-chewing-1.3.7.20100910/cmake_modules/cmake_uninstall.cmake.in --- ibus-chewing-1.3.6.20100730/cmake_modules/cmake_uninstall.cmake.in 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/cmake_uninstall.cmake.in 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,21 @@ +IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") +ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") + +FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +STRING(REGEX REPLACE "\n" ";" files "${files}") +FOREACH(file ${files}) + MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") + IF(EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval + ) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSE(EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") + ENDIF(EXISTS "$ENV{DESTDIR}${file}") +ENDFOREACH(file) diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/CompileFlags.cmake ibus-chewing-1.3.7.20100910/cmake_modules/CompileFlags.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/CompileFlags.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/CompileFlags.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,88 @@ +# - Set flags for compile environment. +# This module sets flags for compile environment. +# +# Defines following macros: +# SET_COMPILE_ENV(var default_value [env]) +# - Add compiler environment with a variable and its value. +# If the variable is not defined yet, then a default value is assigned to it first. +# Parameters: +# + var: Variable to be set +# + default_value: Default value of the var +# + env: (Optional)The name of environment variable. Only need if different from var. +# +# SET_USUAL_COMPILE_ENV() +# - Set the most often used variable and compile flags. +# It defines compile flags according to the values of corresponding variables, +# usually under the same or similar name. +# If a corresponding variable is not defined yet, then a default value is assigned +# to that variable, then define the flag. +# +# Defines following flags according to the variable with same name. +# + CMAKE_INSTALL_PREFIX: Compile flag whose value is ${CMAKE_INSTALL_PREFIX}. +# + DATA_DIR: Directory for architecture independent data files. +# Default: ${CMAKE_INSTALL_PREFIX}/share +# + DOC_DIR: Directory for documentation +# Default: ${DATA_DIR}/doc +# + SYSCONF_DIR: System wide configuration files. +# Default: /etc +# + LIB_DIR: System wide library path. +# Default: ${CMAKE_INSTALL_PREFIX}/lib for 32 bit, +# ${CMAKE_INSTALL_PREFIX}/lib64 for 64 bit. +# + LIBEXEC_DIR: Executables that are not meant to be executed by user directly. +# Default: ${CMAKE_INSTALL_PREFIX}/libexec +# + PROJECT_NAME: Project name +# + PRJ_VER: Project version +# + PROJECT_DATA_DIR: Data directory for the project. +# Default: ${DATA_DIR}/${PROJECT_NAME} +# + PROJECT_DOC_DIR: Documentation for the project. +# Default: ${DOC_DIR}/${PROJECT_NAME}-${PRJ_VER} +# + + +IF(NOT DEFINED _COMPILE_FLAGS_CMAKE_) + SET(_COMPILE_FLAGS_CMAKE_ "DEFINED") + + MACRO(SET_COMPILE_ENV var default_value) + IF(${ARGC} GREATER 2) + SET(_env ${ARGV2}) + ELSE(${ARGC} GREATER 2) + SET(_env ${var}) + ENDIF(${ARGC} GREATER 2) + IF(NOT DEFINED ${var}) + SET(${var} "${default_value}") + ENDIF(NOT DEFINED ${var}) + ADD_DEFINITIONS(-D${_env}='"${${var}}"') + ENDMACRO(SET_COMPILE_ENV var default_value) + + MACRO(SET_USUAL_COMPILE_ENV) + ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX='"${CMAKE_INSTALL_PREFIX}"') + + SET_COMPILE_ENV(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share") + SET_COMPILE_ENV(DOC_DIR "${DATA_DIR}/doc") + SET_COMPILE_ENV(SYSCONF_DIR "/etc" ) + SET_COMPILE_ENV(LIBEXEC_DIR "${CMAKE_INSTALL_PREFIX}/libexec") + + IF(NOT DEFINED LIB_DIR) + IF( $ENV{MACHTYPE} MATCHES "64") + SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib64") + ELSE($ENV{MACHTYPE} MATCHES "64") + SET(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + ENDIF($ENV{MACHTYPE} MATCHES "64") + ENDIF() + ADD_DEFINITIONS(-DIS_64='"${IS64}"') + + IF(DEFINED PROJECT_NAME) + ADD_DEFINITIONS(-DPROJECT_NAME='"${PROJECT_NAME}"') + + SET_COMPILE_ENV(PROJECT_DATA_DIR "${DATA_DIR}/${PROJECT_NAME}") + + IF(DEFINED PRJ_VER) + ADD_DEFINITIONS(-DPRJ_VER='"${PRJ_VER}"') + SET_COMPILE_ENV(PROJECT_DOC_DIR "${DOC_DIR}/${PROJECT_NAME}-${PRJ_VER}") + ENDIF(DEFINED PRJ_VER) + ENDIF(DEFINED PROJECT_NAME) + ENDMACRO(SET_USUAL_COMPILE_ENV) + +ENDIF(NOT DEFINED _COMPILE_FLAGS_CMAKE_) + + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/DateTimeFormat.cmake ibus-chewing-1.3.7.20100910/cmake_modules/DateTimeFormat.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/DateTimeFormat.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/DateTimeFormat.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,33 @@ +# - Date/time format module. +# Defines the following macros: +# TODAY(date_var format [locale]) +# - Get date of today in specified format and locale. +# * Parameters: +# date_var: Result date string +# format: date format for date(1) +# locale: locale of the string. Use current locale setting if +# locale is not given. + +# Provides the following variables: +# TODAY_CHANGELOG: Today in the format that is used in RPM Changelog. +# e.g. Wed 08 Aug 2010 +# +# TODAY_SHORT: Short presentation of today, e.g. 20100818. +# + +IF(NOT DEFINED _DATE_TIME_FORMAT_CMAKE_) + SET(_DATE_TIME_FORMAT_CMAKE_ "DEFINED") + + MACRO(TODAY date_var format) + INCLUDE(ManageVariable) + SET(_locale ${ARGV2}) + IF(_locale) + SET(ENV{LC_ALL} ${_locale}) + ENDIF(_locale) + COMMAND_OUTPUT_TO_VARIABLE(${date_var} date "${format}") + ENDMACRO(TODAY date_var format) + + TODAY(TODAY_CHANGELOG "+%a %b %d %Y" "C") + TODAY(TODAY_SHORT "+%Y%m%d" "C") +ENDIF(NOT DEFINED _DATE_TIME_FORMAT_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/Developer.cmake ibus-chewing-1.3.7.20100910/cmake_modules/Developer.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/Developer.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/Developer.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,154 +0,0 @@ -# Developers helper target such as commit and upload. -# -# To use: INCLUDE(Developer) -# -# To hide the developer only targets, -# only include this modules when DEVELOPER_SETTING_FILE defined and file exists. -# -# Example of a developer setting file: -# SSH_USER= -# SSH_ARGS= -# KOJI_CVS_PATH= -# -# -#=================================================================== -# Variables: -# DEVELOPER_SETTING_FILE: the file that contain developer information. -# Required. -# DEVELOPER_DEPENDS: Files that the developer targets depends on. -# HOSTING_SERVICE_PROVIDER: Name of hosting service provider for display. -#=================================================================== -# Macro: -# DEVELOPER_UPLOAD([SERVER_TYPE] server_type -# [USER user] -# [BATCH batchfile] -# [SITE hosting_site] -# [OPTIONS upload_options] -# [COMMAND upload_command] -# ) -# Generate an upload_pkg_release target for uploading releases to hosting -# service. -# -# Parameters: -# server_type: Server type of hosting service. Current "sftp" and "custom" -# are supported. -# Note that type "sftp" ignores "COMMAND" option, while type -# "custom" only recognizes "COMMAND", but other type recognize -# everything else. -# user: User name used to upload. -# batchfile: File that contain batch command to upload. -# hosting_site: Domain name of hosting service. -# upload_options: Parameters of uploading command. No use if type is -# "custom" -# upload_command: Custom upload command. -# * Produced targets: upload_pkg_release -# - -INCLUDE(BasicMacros) -IF(NOT DEFINED HOSTING_SERVICE_PROVIDER) - SET(HOSTING_SERVICE_PROVIDER "hosting service provider") -ENDIF(NOT DEFINED HOSTING_SERVICE_PROVIDER) - -MACRO(DEVELOPER_UPLOAD arg_0 arg_list) - SET(_stage SERVER_TYPE) - SET(_type) - SET(_user) - SET(_batch) - SET(_site) - SET(_options) - SET(_command) - FOREACH(_arg_0 ${arg_list} ${ARGN}) - IF(_arg_0 STREQUAL "SERVER_TYPE") - SET(_stage "SERVER_TYPE") - ELSEIF(_arg_0 STREQUAL "USER") - SET(_stage "USER") - ELSEIF(_arg_0 STREQUAL "BATCH") - SET(_stage "BATCH") - ELSEIF(_arg_0 STREQUAL "SITE") - SET(_stage "SITE") - ELSEIF(_arg_0 STREQUAL "OPTIONS") - SET(_stage "OPTIONS") - ELSEIF(_arg_0 STREQUAL "COMMAND") - SET(_stage "COMMAND") - ELSE(_arg_0 STREQUAL "SERVER_TYPE") - IF(_stage STREQUAL "SERVER_TYPE") - SET(_type ${_arg_0}) - ELSEIF(_stage STREQUAL "USER") - SET(_user ${_arg_0}) - ELSEIF(_stage STREQUAL "BATCH") - SET(_batch ${_arg_0}) - ELSEIF(_stage STREQUAL "SITE") - SET(_site ${_arg_0}) - ELSEIF(_stage STREQUAL "OPTIONS") - SET(_options ${_options} ${_arg_0}) - ELSEIF(_stage STREQUAL "COMMAND") - SET(_command ${_arg_0}) - ELSE(_stage STREQUAL "SERVER_TYPE") - ENDIF(_stage STREQUAL "SERVER_TYPE") - ENDIF(_arg_0 STREQUAL "SERVER_TYPE") - ENDFOREACH(_arg_0) - - SET(_developer_upload_cmd) - IF(_type STREQUAL "sftp") - SET(_developer_upload_cmd "sftp") - IF(_batch) - SET(_developer_upload_cmd "${_developer_upload_cmd} -b ${_batch}" ) - ENDIF(_batch) - IF(_options) - SET(_developer_upload_cmd "${_developer_upload_cmd} -F ${_options}" ) - ENDIF(_options) - IF(_user) - SET(_developer_upload_cmd "${_developer_upload_cmd} ${_user}@" ) - ELSE(_user) - SET(_developer_upload_cmd "${_developer_upload_cmd} " ) - ENDIF(_user) - IF(_site) - SET(_developer_upload_cmd "${_developer_upload_cmd}${_site}" ) - ENDIF(_site) - ELSE(_type STREQUAL "sftp") - SET(_developer_upload_cmd ${_command} ) - ENDIF(_type STREQUAL "sftp") - - #MESSAGE("_developer_upload_cmd=${_developer_upload_cmd}") - IF(EXISTS ${DEVELOPER_SETTING_FILE}) - ADD_CUSTOM_TARGET(upload_pkg_release - COMMAND ${DEVELOPER_UPLOAD_CMD} - DEPENDS ${DEVELOPER_DEPENDS} - COMMENT "Uploading the package releases to ${HOSTING_SERVICE_PROVIDER}..." - VERBATIM - ) - ENDIF(EXISTS ${DEVELOPER_SETTING_FILE}) -ENDMACRO(DEVELOPER_UPLOAD arg_0 arg_list) - - -#=================================================================== -# Targets: -# version_lock: -# Lock in the current version, so the version won't be changed until unlocked. -# Useful for time-based version. -# Note that the PRJ_VER is locked but PRJ_VER_FULL is not, thus RPM -# maintainer can do some maintenances without affecting source version. -# -# version_unlock: -# Unlock the version. -# -# To enable these two targets, need to: -# SET(VERSION_NEED_LOCK) -# - -#IF (DEFINED VERSION_NEED_LOCK) -# ADD_CUSTOM_TARGET(version_lock -# COMMAND grep "PRJ_VER=" ${RELEASE_FILE} -# || ${CMAKE_COMMAND} -E echo "PRJ_VER=${PRJ_VER}" > ${RELEASE_FILE} -# COMMAND cmake ${CMAKE_SOURCE_DIR} -# COMMENT "Lock version" -# ) -# -# ADD_CUSTOM_TARGET(version_unlock -# COMMAND ${RM} ${RELEASE_FILE} -# COMMAND ${CMAKE_COMMAND} -E touch ${RELEASE_FILE} -# COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} -# COMMENT "Unlock version" -# ) -#ENDIF(DEFINED VERSION_NEED_LOCK) - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/FedoraDeveloper.cmake ibus-chewing-1.3.7.20100910/cmake_modules/FedoraDeveloper.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/FedoraDeveloper.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/FedoraDeveloper.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,170 +0,0 @@ -# Koji and Bodhi operation for Fedora developers. -# -# To use: INCLUDE(FedoraDeveloper), and DEVELOPER_SETTING file exists -# Include: RPM -# -#=================================================================== -# Variables: -# KOJI_DEPENDS: Files that koji build targets depend on. -# KOJI_CVS_PATH: The path for KOJI build. -# Default: ./ -# -# RPM_RELEASE_SUMMARY: Summary of latest change, used in CVS message and Bodhi -# comment. -# -# FEDORA_DIST_TAGS: Distribution tags such as F-10, EL-5 to be committed to CVS -# for koji or plague build. By default, devel is always built, -# so no need to explicitly declare it. -# Default: built devel. -# -# BODHI_DEPENDS: Files that bodhi targets depends on. -# BODHI_DIST_TAGS: Distribution tags such as fc9, fc10 to be committed to -# Bodhi. -# Default: Derived from FEDORA_DIST_TAGS. -# -#=================================================================== -# Targets: -# koji_build_scratch: koji scratch build. -# koji_submit: Submit to koji -# koji_build: Start koji build -# bodhi_new: Submit to bodhi -# - -INCLUDE(RPM) -SET(RAWHIDE_VER 14) -SET(FEDORA_DIST_TAGS F-12 F-13) - -IF(NOT DEFINED KOJI_CVS_PATH) - SET(KOJI_CVS_PATH "./") -ELSEIF (KOJI_CVS_PATH STREQUAL "") - SET(KOJI_CVS_PATH "./") -ENDIF(NOT DEFINED KOJI_CVS_PATH) - -#==================================================================== -# Koji (Fedora build system) -# - -# Koji submit -SET (KOJI_SUBMISSION_CMD "") -IF (DEFINED RPM_RELEASE_SUMMARY) - SET (KOJI_SUBMISSION_CMD - "${KOJI_CVS_PATH}/${PROJECT_NAME}/common/cvs-import.sh -m \"${RPM_RELEASE_SUMMARY}\" ${SRPM_FILE}" - ) - - FOREACH(_dist_tag ${FEDORA_DIST_TAGS}) - SET (KOJI_SUBMISSION_CMD - "${KOJI_SUBMISSION_CMD}\;" - "${KOJI_CVS_PATH}/${PROJECT_NAME}/common/cvs-import.sh -b ${_dist_tag} -m \"${RPM_RELEASE_SUMMARY}\" ${SRPM_FILE}" - ) - ENDFOREACH(_dist_tag) -ELSE(DEFINED RPM_RELEASE_SUMMARY) - SET (KOJI_SUBMISSION_CMD - "${KOJI_CVS_PATH}/${PROJECT_NAME}/common/cvs-import.sh ${SRPM_FILE}" - ) - FOREACH(_dist_tag ${FEDORA_DIST_TAGS}) - SET (KOJI_SUBMISSION_CMD - "${KOJI_SUBMISSION_CMD}\;" - "${KOJI_CVS_PATH}/${PROJECT_NAME}/common/cvs-import.sh -b ${_dist_tag} ${SRPM_FILE}" - ) - ENDFOREACH(_dist_tag) -ENDIF(DEFINED RPM_RELEASE_SUMMARY) - -SET (KOJI_BUILD_CMD - "cd ${KOJI_CVS_PATH}/${PROJECT_NAME} && cvs up && cd devel && make build && cd .." - ) - -SET (KOJI_SCRATCH_BUILD_CMD - "koji build --scratch dist-f${RAWHIDE_VER} ${SRPM_FILE}" - ) - - -FOREACH(_dist_tag ${FEDORA_DIST_TAGS}) - SET (KOJI_BUILD_CMD - "${KOJI_BUILD_CMD} && cd ${_dist_tag} && make build && cd .." - ) - STRING(REGEX MATCH "F-([0-9]*)" - _is_fedora_tag ${_dist_tag}) - STRING(REGEX MATCH "EL-([0-9]*)" - _is_epel_tag ${_dist_tag}) - IF (_is_fedora_tag) - STRING(REGEX REPLACE "F-([0-9]*)" "\\1" - _curr_tag ${_dist_tag}) - SET (KOJI_SCRATCH_BUILD_CMD - "${KOJI_SCRATCH_BUILD_CMD} && koji build --scratch dist-f${_curr_tag} ${SRPM_FILE}" - ) - IF(NOT DEFINED BODHI_DIST_TAGS) - SET(_bodhi_dist_tags ${_bodhi_dist_tags} "fc${_curr_tag}") - ENDIF(NOT DEFINED BODHI_DIST_TAGS) - ELSEIF (_is_epel_tag) - STRING(REGEX REPLACE "EL-([0-9]*)" "\\1" - _curr_tag ${_dist_tag}) - SET (KOJI_SCRATCH_BUILD_CMD - "${KOJI_SCRATCH_BUILD_CMD} && koji build --scratch dist-${_curr_tag}E-epel-testing-candidate ${SRPM_FILE}" - ) - IF(NOT DEFINED BODHI_DIST_TAGS) - SET(_bodhi_dist_tags ${_bodhi_dist_tags} "el${_curr_tag}") - ENDIF(NOT DEFINED BODHI_DIST_TAGS) - ENDIF(_is_fedora_tag) -ENDFOREACH(_dist_tag) - -#MESSAGE(KOJI_SCRATCH_BUILD_CMD=${KOJI_SCRATCH_BUILD_CMD}) -ADD_CUSTOM_TARGET(koji_scratch_build - COMMAND eval ${KOJI_SCRATCH_BUILD_CMD} - DEPENDS ${KOJI_DEPENDS} ${SRPM_FILE} ${KOJI_CVS_PATH} - COMMENT "Start Koji scratch build" - VERBATIM - ) - -#MESSAGE(KOJI_SUBMISSION_CMD=${KOJI_SUBMISSION_CMD}) -ADD_CUSTOM_TARGET(koji_submit - COMMAND eval ${KOJI_SUBMISSION_CMD} - COMMAND cd ${KOJI_CVS_PATH}/${PROJECT_NAME} && cvs up - DEPENDS ${KOJI_DEPENDS} ${SRPM_FILE} ${KOJI_CVS_PATH} - COMMENT "Submitting to Koji" - VERBATIM - ) - -#MESSAGE("KOJI_BUILD_CMD=${KOJI_BUILD_CMD}") -ADD_CUSTOM_TARGET(koji_build - COMMAND eval "${KOJI_BUILD_CMD}" - COMMENT "Building on Koji" - VERBATIM - ) - -#==================================================================== -# Bodhi (Fedora update system) -# - -IF(DEFINED BODHI_DIST_TAGS) - SET(${_bodhi_dist_tags} ${BODHI_DIST_TAGS}) -ENDIF(DEFINED BODHI_DIST_TAGS) - -FOREACH(_bodhi_tag ${_bodhi_dist_tags}) - IF (DEFINED BODHI_NEW_CMD) - SET (BODHI_NEW_CMD "${BODHI_NEW_CMD} ; ") - ELSE () - SET (BODHI_NEW_CMD "") - ENDIF () - IF(DEFINED RPM_RELEASE_SUMMARY) - SET(commentArg "--comment=\"${RPM_RELEASE_SUMMARY}\"") - ELSEIF(DEFINED CHANGE_SUMMARY) - SET(commentArg "--comment=\"${CHANGE_SUMMARY}\"") - ENDIF() - SET (BODHI_NEW_CMD - "${BODHI_NEW_CMD} bodhi --new --type=bugfix ${commentArg} ${PROJECT_NAME}-${PRJ_VER_FULL}.${_bodhi_tag}") -ENDFOREACH(_bodhi_tag) - -#MESSAGE(BODHI_NEW_CMD=${BODHI_NEW_CMD}) -IF(DEFINED BODHI_NEW_CMD) - ADD_CUSTOM_TARGET(bodhi_new - COMMAND eval "${BODHI_NEW_CMD}" - DEPENDS ${BODHI_DEPENDS} - COMMENT "Send new package to bodhi" - VERBATIM - ) -ENDIF(DEFINED BODHI_NEW_CMD) - -ADD_DEPENDENCIES(koji_scratch_build srpm) -ADD_DEPENDENCIES(koji_submit srpm) -ADD_DEPENDENCIES(koji_build srpm) - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/GConf.cmake ibus-chewing-1.3.7.20100910/cmake_modules/GConf.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/GConf.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/GConf.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -# GConf relative setting such as install/unstall schemas. -# -# It will find gconftool-2. -# -# To use: INCLUDE(GConf) -# -#=================================================================== -# Variables: -# GCONF_SCHEMAS_FILE: Schema file. -# Default: "${PROJECT_NAME}.schemas" -# GCONF_SCHEMAS_INSTALLED_DIR: Direct of installed schemas files. -# Default: "${SYSCONF_INSTALL_DIR}/gconf/schemas" -# GCONF_CONFIG_SOURCE: configuration source. -# Default: "" (Use the system default) -# -#=================================================================== -# Targets: -# install_schemas: install schemas -# uninstall_schemas: uninstall schemas - -FIND_PROGRAM(GCONFTOOL NAMES gconftool-2 gconftool) - -IF(${GCONFTOOL} STREQUAL "GCONFTOOL-NOTFOUND") - MESSAGE(FATAL_ERROR "gconftool and gconftool-2 are not found, please install GConf or GConf2.") -ENDIF() - -IF (NOT DEFINED GCONF_SCHEMAS_FILE) - SET(GCONF_SCHEMAS_FILE "${PROJECT_NAME}.schemas") -ENDIF(NOT DEFINED GCONF_SCHEMAS_FILE) - -GET_FILENAME_COMPONENT(_gconf_schemas_basename ${GCONF_SCHEMAS_FILE} NAME) - -IF (NOT DEFINED GCONF_SCHEMAS_INSTALLED_DIR) - SET(GCONF_SCHEMAS_INSTALLED_DIR "${SYSCONF_INSTALL_DIR}/gconf/schemas") -ENDIF(NOT DEFINED GCONF_SCHEMAS_INSTALLED_DIR) - -IF (NOT DEFINED GCONF_CONFIG_SOURCE) - SET(GCONF_CONFIG_SOURCE "") -ENDIF(NOT DEFINED GCONF_CONFIG_SOURCE) -SET(ENV{GCONF_CONFIG_SOURCE} ${GCONF_CONFIG_SOURCE}) - - -ADD_CUSTOM_TARGET(uninstall_schemas - COMMAND GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE} - ${GCONFTOOL} --makefile-uninstall-rule - ${GCONF_SCHEMAS_INSTALLED_DIR}/${_gconf_schemas_basename} - COMMENT "Uninstalling schemas" - ) - -ADD_CUSTOM_TARGET(install_schemas - COMMAND cmake -E copy ${GCONF_SCHEMAS_FILE} ${GCONF_SCHEMAS_INSTALLED_DIR}/${_gconf_schemas_basename} - COMMAND GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE} - ${GCONFTOOL} --makefile-install-rule - ${GCONF_SCHEMAS_INSTALLED_DIR}/${_gconf_schemas_basename} - DEPENDS ${GCONF_SCHEMAS_FILE} - COMMENT "Installing schemas" - ) - -INSTALL(FILES ${GCONF_SCHEMAS_FILE} - DESTINATION "${GCONF_SCHEMAS_INSTALLED_DIR}") - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/Gettext.cmake ibus-chewing-1.3.7.20100910/cmake_modules/Gettext.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/Gettext.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/Gettext.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,167 +0,0 @@ -# Gettext support: Create/Update pot file and -# -# To use: INCLUDE(Gettext) -# -# Most of the gettext support code is from FindGettext.cmake of cmake, -# but it is included here because: -# -# 1. Some system like RHEL5 does not have FindGettext.cmake -# 2. Bug of GETTEXT_CREATE_TRANSLATIONS make it unable to be include in 'All' -# 3. It does not support xgettext -# -#=================================================================== -# Constants: -# XGETTEXT_OPTIONS_DEFAULT: Default xgettext option: -#=================================================================== -# Variables: -# XGETTEXT_OPTIONS: Options pass to xgettext -# Default: XGETTEXT_OPTIONS_DEFAULT -# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool. -# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool. -# GETTEXT_FOUND: True if gettext has been found. -# XGETTEXT_EXECUTABLE: the full path to the xgettext. -# XGETTEXT_FOUND: True if xgettext has been found. -# -#=================================================================== -# Macros: -# GETTEXT_CREATE_POT(potFile -# [OPTION xgettext_options] -# SRC list_of_source_file_that_contains_msgid -# ) -# -# Generate .pot file. -# OPTION xgettext_options: Override XGETTEXT_OPTIONS -# -# * Produced targets: pot_file -# -#------------------------------------------------------------------- -# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] locale1 ... localeN -# [COMMENT comment] ) -# -# This will create a target "translations" which will convert the -# given input po files into the binary output mo file. If the -# ALL option is used, the translations will also be created when -# building the default target. -# -# * Produced targets: translations -#------------------------------------------------------------------- - -FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge) -FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) -FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext) - -SET(XGETTEXT_OPTIONS_DEFAULT - --language=C --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 -s - --package-name=${PROJECT_NAME} --package-version=${PRJ_VER}) - -IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) - SET(GETTEXT_FOUND TRUE) -ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE) - SET(GETTEXT_FOUND FALSE) - IF (GetText_REQUIRED) - MESSAGE(FATAL_ERROR "GetText not found") - ENDIF (GetText_REQUIRED) -ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE ) - -IF(XGETTEXT_EXECUTABLE) - SET(XGETTEXT_FOUND TRUE) -ELSE(XGETTEXT_EXECUTABLE) - MESSAGE(STATUS "xgettext not found.") - SET(XGETTTEXT_FOUND FALSE) -ENDIF(XGETTEXT_EXECUTABLE) - -IF(NOT DEFINED XGETTEXT_OPTIONS) - SET(XGETTEXT_OPTIONS ${XGETTEXT_OPTIONS_DEFAULT}) -ENDIF(NOT DEFINED XGETTEXT_OPTIONS) - -IF(XGETTEXT_FOUND) - MACRO(GETTEXT_CREATE_POT _potFile _pot_options ) - SET(_xgettext_options_list) - SET(_src_list) - SET(_src_list_abs) - SET(_stage "SRC") - FOREACH(_pot_option ${_pot_options} ${ARGN}) - IF(_pot_option STREQUAL "OPTION") - SET(_stage "OPTION") - ELSEIF(_pot_option STREQUAL "SRC") - SET(_stage "SRC") - ELSE(_pot_option STREQUAL "OPTION") - IF(_stage STREQUAL "OPTION") - SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option}) - ELSE(_stage STREQUAL "OPTION") - FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option}) - GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE) - SET(_src_list ${_src_list} ${_relFile}) - SET(_src_list_abs ${_src_list_abs} ${_absFile}) - ENDIF(_stage STREQUAL "OPTION") - ENDIF(_pot_option STREQUAL "OPTION") - ENDFOREACH(_pot_option ${_pot_options} ${ARGN}) - - IF (_xgettext_options_list) - SET(_xgettext_options ${_xgettext_options_list}) - ELSE(_xgettext_options_list) - SET(_xgettext_options ${XGETTEXT_OPTIONS}) - ENDIF(_xgettext_options_list) - - #MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}") - ADD_CUSTOM_COMMAND(OUTPUT ${_potFile} - COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options} -o ${_potFile} ${_src_list} - DEPENDS ${_src_list_abs} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - - ADD_CUSTOM_TARGET(pot_file - COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list} - DEPENDS ${_src_list_abs} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Extract translatable messages to ${_potFile}" - ) - ENDMACRO(GETTEXT_CREATE_POT _potFile _pot_options) - - - MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstLang) - SET(_gmoFiles) - GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE) - GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE) - - SET(_addToAll) - SET(_is_comment FALSE) - - FOREACH (_currentLang ${_firstLang} ${ARGN}) - IF(_currentLang STREQUAL "ALL") - SET(_addToAll "ALL") - ELSEIF(_currentLang STREQUAL "COMMENT") - SET(_is_comment TRUE) - ELSEIF(_is_comment) - SET(_is_comment FALSE) - SET(_comment ${_currentLang}) - ELSE() - SET(_lang ${_currentLang}) - GET_FILENAME_COMPONENT(_absFile ${_currentLang}.po ABSOLUTE) - GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) - SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) - - #MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}") - ADD_CUSTOM_COMMAND( - OUTPUT ${_gmoFile} - COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} - COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} - DEPENDS ${_absPotFile} ${_absFile} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - ) - - INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) - SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) - ENDIF() - ENDFOREACH (_currentLang ) - - IF(DEFINED _comment) - ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles} COMMENT ${_comment}) - ELSE(DEFINED _comment) - ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) - ENDIF(DEFINED _comment) - ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) -ENDIF(XGETTEXT_FOUND) - - - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/ManageVariable.cmake ibus-chewing-1.3.7.20100910/cmake_modules/ManageVariable.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/ManageVariable.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/ManageVariable.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,211 @@ +# - Module that help to get/set variables. +# Defines the following macros: +# COMMAND_OUTPUT_TO_VARIABLE(var cmd) +# - Store command output to a variable, without new line characters (\n and \r). +# This macro is suitable for command that output one line result. +# Note that the var will be set to ${var_name}-NOVALUE if cmd does not have +# any output. +# * Parameters: +# var: A variable that stores the result. +# cmd: A command. +# +# SETTING_FILE_GET_ATTRIBUTE(var attr_name setting_file [UNQUOTED] +# [NOESCAPE_SEMICOLON] [setting_sign]) +# - Get an attribute value from a setting file. +# * Parameters: +# var: Variable to store the attribute value. +# attr_name: Name of the attribute. +# setting_file: Setting filename. +# UNQUOTED: (Optional) remove the double quote mark around the string. +# NOESCAPE_SEMICOLON: Escape semicolons. +# setting_sign: (Optional) The symbol that separate attribute name and its value. +# Default value: "=" +# +# SETTING_FILE_GET_ALL_ATTRIBUTES(setting_file [UNQUOTED] [NOREPLACE] +# [NOESCAPE_SEMICOLON] [setting_sign]) +# - Get all attribute values from a setting file. +# '#' is used to comment out setting. +# * Parameters: +# setting_file: Setting filename. +# UNQUOTED: (Optional) remove the double quote mark around the string. +# NOREPLACE (Optional) Without this parameter, this macro replaces +# previous defined variables, use NOREPLACE to prevent this. +# NOESCAPE_SEMICOLON: Escape semicolons. +# setting_sign: (Optional) The symbol that separate attribute name and its value. +# Default value: "=" +# +# GET_ENV(var default_value [env]) +# - Get the value of a environment variable, or use default +# if the environment variable does not exist or is empty. +# * Parameters: +# var: Variable to be set +# default_value: Default value of the var +# env: (Optional) The name of environment variable. Only need if different from var. +# +# SET_VAR(var untrimmed_value) +# - Trim an set the value to a variable. +# * Parameters: +# var: Variable to be set +# untrimmed_value: Untrimmed values that may have space, \t, \n, \r in the front or back of the string. +# +IF(NOT DEFINED _MANAGE_VARIABLE_CMAKE_) + SET(_MANAGE_VARIABLE_CMAKE_ "DEFINED") + INCLUDE(SupportCmake-2.4) + + MACRO(COMMAND_OUTPUT_TO_VARIABLE var cmd) + EXECUTE_PROCESS( + COMMAND ${cmd} ${ARGN} + OUTPUT_VARIABLE _cmd_output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + IF(_cmd_output) + SET(${var} ${_cmd_output}) + ELSE(_cmd_output) + SET(var "${var}-NOVALUE") + ENDIF(_cmd_output) + #SET(value ${${var}}) + #MESSAGE("var=${var} _cmd_output=${_cmd_output} value=|${value}|" ) + ENDMACRO(COMMAND_OUTPUT_TO_VARIABLE var cmd) + + MACRO(SETTING_FILE_GET_ATTRIBUTE var attr_name setting_file) + SET(setting_sign "=") + SET(_UNQUOTED "") + SET(_NOESCAPE_SEMICOLON "") + FOREACH(_arg ${ARGN}) + IF (${_arg} STREQUAL "UNQUOTED") + SET(_UNQUOTED "UNQUOTED") + ELSE(${_arg} STREQUAL "UNQUOTED") + SET(setting_sign ${_arg}) + ELSEIF (${_arg} STREQUAL "NOESCAPE_SEMICOLON") + SET(_NOESCAPE_SEMICOLON "NOESCAPE_SEMICOLON") + ENDIF(${_arg} STREQUAL "UNQUOTED") + ENDFOREACH(_arg) + SET(_find_pattern "\n[ \\t]*(${attr_name}\)[ \\t]*${setting_sign}\([^\n]*\)") + + # Use "#" to Escape ';', "#@" for original "#" + IF(NOT _NOESCAPE_SEMICOLON STREQUAL "") + FILE(READ "${setting_file}" _txt_content) + ELSE(NOT _NOESCAPE_SEMICOLON STREQUAL "") + EXECUTE_PROCESS(COMMAND sed -e "s/#/#@/g" ${setting_file} + COMMAND sed -e "s/\;/#/g" + OUTPUT_VARIABLE _txt_content + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + ENDIF(NOT _NOESCAPE_SEMICOLON STREQUAL "") + + STRING(REGEX MATCHALL "${_find_pattern}" _matched_lines "${_txt_content}") + #MESSAGE("_matched_lines=|${_matched_lines}|") + SET(_result_line) + + FOREACH(_line ${_matched_lines}) + #MESSAGE("### _line=|${_line}|") + STRING(REGEX REPLACE "${_find_pattern}" "\\2" _result_line "${_line}") + + # Replace semicolon back. + STRING(REGEX REPLACE "#[^@]" "\\\\;" _result_line + "${_result_line}") + STRING(REGEX REPLACE "#@" "#" _result_line + "${_result_line}") + STRING(REGEX REPLACE "\\\\;" ";" _result_line + "${_result_line}") + + SET_VAR(${var} "${_result_line}") + ENDFOREACH() + ENDMACRO(SETTING_FILE_GET_ATTRIBUTE var attr_name setting_file) + + MACRO(SETTING_FILE_GET_ALL_ATTRIBUTES setting_file) + SET(setting_sign "=") + SET(_UNQUOTED "") + SET(_NOREPLACE "") + SET(_NOESCAPE_SEMICOLON "") + SET(SED "sed") + FOREACH(_arg ${ARGN}) + IF (${_arg} STREQUAL "UNQUOTED") + SET(_UNQUOTED "UNQUOTED") + ELSEIF (${_arg} STREQUAL "NOREPLACE") + SET(_NOREPLACE "NOREPLACE") + ELSEIF (${_arg} STREQUAL "NOESCAPE_SEMICOLON") + SET(_NOESCAPE_SEMICOLON "NOESCAPE_SEMICOLON") + ELSE(${_arg} STREQUAL "UNQUOTED") + SET(setting_sign ${_arg}) + ENDIF(${_arg} STREQUAL "UNQUOTED") + ENDFOREACH(_arg) + SET(_find_pattern "\n[ \\t]*([A-Za-z0-9_]*\)[ \\t]*${setting_sign}\([^\n]*\)") + + # Use "#" to Escape ';', "#@" for original "#" + IF(NOT _NOESCAPE_SEMICOLON STREQUAL "") + FILE(READ "${setting_file}" _txt_content) + ELSE(NOT _NOESCAPE_SEMICOLON STREQUAL "") + EXECUTE_PROCESS(COMMAND sed -e "s/#/#@/g" ${setting_file} + COMMAND sed -e "s/\;/#/g" + OUTPUT_VARIABLE _txt_content + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + ENDIF(NOT _NOESCAPE_SEMICOLON STREQUAL "") + + SET(_txt_content "\n${_txt_content}\n") + + STRING(REGEX MATCHALL "${_find_pattern}" _matched_lines "${_txt_content}") + + #MESSAGE("_matched_lines=|${_matched_lines}|") + SET(_result_line) + SET(_var) + + FOREACH(_line ${_matched_lines}) + #MESSAGE("### _line=|${_line}|") + STRING(REGEX REPLACE "${_find_pattern}" "\\1" _var "${_line}") + STRING(REGEX REPLACE "${_find_pattern}" "\\2" _result_line "${_line}") + + # Replace semicolon back. + STRING(REGEX REPLACE "#[^@]" "\\\\;" _result_line + "${_result_line}") + STRING(REGEX REPLACE "#@" "#" _result_line + "${_result_line}") + STRING(REGEX REPLACE "\\\\;" ";" _result_line + "${_result_line}") + + IF (NOT "${_var}" STREQUAL "") + IF ("${_NOREPLACE}" STREQUAL "" OR "${${_var}}" STREQUAL "" ) + #MESSAGE("### _var=${_var} _result_line=|${_result_line}|") + SET_VAR(${_var} "${_result_line}") + ELSE("${_NOREPLACE}" STREQUAL "" OR "${${_var}}" STREQUAL "") + SET(val ${${_var}}) + #MESSAGE("### ${_var} is already defined as ${val}") + ENDIF("${_NOREPLACE}" STREQUAL "" OR "${${_var}}" STREQUAL "") + ENDIF(NOT "${_var}" STREQUAL "") + ENDFOREACH() + ENDMACRO(SETTING_FILE_GET_ALL_ATTRIBUTES setting_file) + + MACRO(GET_ENV var default_value) + IF(${ARGC} GREATER 2) + SET(_env "${ARGV2}") + ELSE(${ARGC} GREATER 2) + SET(_env "${var}") + ENDIF(${ARGC} GREATER 2) + IF ("$ENV{${_env}}" STREQUAL "") + SET(${var} "${default_value}") + ELSE() + SET(${var} "$ENV{${_env}}") + ENDIF() + # MESSAGE("Variable ${var}=${${var}}") + ENDMACRO(GET_ENV var default_value) + + MACRO(SET_VAR var untrimmedValue) + SET(_UNQUOTED "") + FOREACH(_arg ${ARGN}) + IF (${_arg} STREQUAL "UNQUOTED") + SET(_UNQUOTED "UNQUOTED") + ENDIF(${_arg} STREQUAL "UNQUOTED") + ENDFOREACH(_arg) + IF ("${untrimmedValue}" STREQUAL "") + SET(${var} "") + ELSE("${untrimmedValue}" STREQUAL "") + STRING_TRIM(trimmedValue "${untrimmedValue}" ${_UNQUOTED}) + SET(${var} "${trimmedValue}") + ENDIF("${untrimmedValue}" STREQUAL "") + #SET(value "${${var}}") + #MESSAGE("### ${var}=|${value}|") + ENDMACRO(SET_VAR var untrimmedValue) + +ENDIF(NOT DEFINED _MANAGE_VARIABLE_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/ManageVersion.cmake ibus-chewing-1.3.7.20100910/cmake_modules/ManageVersion.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/ManageVersion.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/ManageVersion.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,84 @@ +# - Module that manage version +# Defines following macros: +# LOAD_RELEASE_FILE(releaseFile) +# - Load release file information. +# Arguments: +# + releaseFile: release file to be read. +# This file should contain following definition: +# PRJ_VER: Release version. +# SUMMARY: Summary of the release. Will be output as CHANGE_SUMMARY. +# and a [Changes] section tag, below which listed the change in the +# release. +# This macro also set following variables: +# PRJ_VER: Release version. +# CHANGE_SUMMARY: Summary of changes. +# CHANGELOG_ITEMS: Lines below the [Changes] tag. +# RELEASE_FILE: The loaded release file. +# + +IF(NOT DEFINED _MANAGE_VERSION_CMAKE_) + SET(_MANAGE_VERSION_CMAKE_ "DEFINED") + MESSAGE("CMAKE_HOST_SYSTEM=${CMAKE_HOST_SYSTEM}") + MESSAGE("CMAKE_HOST_SYSTEM_NAME=${CMAKE_HOST_SYSTEM_NAME}") + MESSAGE("CMAKE_HOST_SYSTEM_PROCESSOR=${CMAKE_HOST_SYSTEM_PROCESSOR}") + MESSAGE("CMAKE_HOST_SYSTEM_VERSION=${CMAKE_HOST_SYSTEM_VERSION}") + INCLUDE(ManageVariable) + + MACRO(LOAD_RELEASE_FILE releaseFile) + COMMAND_OUTPUT_TO_VARIABLE(_grep_line grep -F "[Changes]" -n -m 1 ${releaseFile}) + #MESSAGE("_grep_line=|${_grep_line}|") + IF("${_grep_line}" STREQUAL "") + MESSAGE(FATAL_ERROR "${releaseFile} does not have a [Changes] tag!") + ENDIF("${_grep_line}" STREQUAL "") + STRING(REGEX REPLACE ":.*" "" _line_num "${_grep_line}") + + # Read header + MATH(EXPR _setting_line_num ${_line_num}-1) + COMMAND_OUTPUT_TO_VARIABLE(_releaseFile_head head -n ${_setting_line_num} ${releaseFile}) + FILE(WRITE "${releaseFile}_NO_PACK_HEAD" "${_releaseFile_head}") + SETTING_FILE_GET_ALL_ATTRIBUTES("${releaseFile}_NO_PACK_HEAD") + SET(CHANGE_SUMMARY "${SUMMARY}") + + # Read [Changes] Section + MATH(EXPR _line_num ${_line_num}+1) + COMMAND_OUTPUT_TO_VARIABLE(CHANGELOG_ITEMS tail -n +${_line_num} ${releaseFile}) + FILE(WRITE "${releaseFile}_NO_PACK_CHANGELOG_ITEM" "${CHANGELOG_ITEMS}") + + INCLUDE(DateTimeFormat) + FILE(READ "ChangeLog.prev" CHANGELOG_PREV) + #CONFIGURE_FILE(ChangeLog.in ChangeLog) + + SET_SOURCE_FILES_PROPERTIES(ChangeLog PROPERTIES GENERATED TRUE) + + ADD_CUSTOM_TARGET(changelog ALL + DEPENDS ChangeLog + ) + + ADD_CUSTOM_COMMAND(OUTPUT ChangeLog + COMMAND ${CMAKE_COMMAND} -E echo "* ${TODAY_CHANGELOG} - ${MAINTAINER} - ${PRJ_VER}" > ChangeLog + COMMAND cat ${releaseFile}_NO_PACK_CHANGELOG_ITEM >> ChangeLog + COMMAND ${CMAKE_COMMAND} -E echo "" >> ChangeLog + COMMAND cat ChangeLog.prev >> ChangeLog + COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} + DEPENDS ${releaseFile} ChangeLog.prev + COMMENT "ChangeLog is older than ${releaseFile}. Rebuilding" + VERBATIM + ) + + #FILE(WRITE "ChangeLog" "* ${TODAY_CHANGELOG} - ${MAINTAINER} - ${PRJ_VER}\n") + #FILE(APPEND "ChangeLog" "${CHANGELOG_ITEMS}\n") + #FILE(READ "ChangeLog.prev" _changelog_prev) + #FILE(APPEND "ChangeLog" "${_changelog_prev}") + + # PRJ_VER won't be updated until the execution of cmake . + SET(_version_check_cmd grep -e 'PRJ_VER=' ${RELEASE_FILE} | tr -d '\\r\\n' | sed -e s/PRJ_VER=//) + ADD_CUSTOM_TARGET(version_check + COMMAND ${CMAKE_COMMAND} -E echo "PRJ_VER=${PRJ_VER}" + COMMAND ${CMAKE_COMMAND} -E echo "Release file="`eval \"${_version_check_cmd}\"` + COMMAND test \"`${_version_check_cmd}`\" = \"\" -o \"`${_version_check_cmd}`\" = "${PRJ_VER}" + || echo Inconsistent version detected. Fixing.. && ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} + ) + ENDMACRO(LOAD_RELEASE_FILE releaseFile) + +ENDIF(NOT DEFINED _MANAGE_VERSION_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/PackRPM.cmake ibus-chewing-1.3.7.20100910/cmake_modules/PackRPM.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/PackRPM.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/PackRPM.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,280 @@ +# - RPM generation, maintaining (remove old rpm) and verification (rpmlint). +# This module provides macros that provides various rpm building and +# verification targets. +# Reads following variables: +# RPM_DIST_TAG: (optional) Current distribution tag such as el5, fc10. +# Default: Distribution tag from rpm --showrc +# +# RPM_BUILD_TOPDIR: (optional) Directory of the rpm topdir. +# Default: ${CMAKE_BINARY_DIR} +# +# RPM_BUILD_SPECS: (optional) Directory of spec files. +# Default: ${RPM_BUILD_TOPDIR}/SPECS +# +# RPM_BUILD_SOURCES: (optional) Directory of source (tar.gz or zip) files. +# Default: ${RPM_BUILD_TOPDIR}/SOURCES +# +# RPM_BUILD_SRPMS: (optional) Directory of source rpm files. +# Default: ${RPM_BUILD_TOPDIR}/SRPMS +# +# RPM_BUILD_RPMS: (optional) Directory of generated rpm files. +# Default: ${RPM_BUILD_TOPDIR}/RPMS +# +# RPM_BUILD_BUILD: (optional) Directory for RPM build. +# Default: ${RPM_BUILD_TOPDIR}/BUILD +# +# RPM_BUILD_BUILDROOT: (optional) Directory for RPM build. +# Default: ${RPM_BUILD_TOPDIR}/BUILDROOT +# +# Defines following variables after include: +# RPM_IGNORE_FILES: A list of exclude file patterns for PackSource. +# This value is appended to PACK_SOURCE_IGNORE_FILES after including +# this module. +# +# Defines following Macros: +# PACK_RPM(var spec_in source0 ) +# - Generate spec and pack rpm according to the spec_in file. +# It calls PackSource, so no need to call it manually, +# note that environment variables for PackSource should be defined +# before calling this macro. +# Arguments: +# + var: The filename of srpm is outputted to this var. +# Path is excluded. +# + spec_in: RPM spec input template. +# + source0: Source tarball for source0 in spec. +# Note that its better to put the URL prefix in spec_in, instead of here. +# Targets: +# + srpm: Build srpm (rpmbuild -bs). +# + rpm: Build rpm and srpm (rpmbuild -ba) +# + rpmlint: Run rpmlint to generated rpms. +# + clean_rpm": Clean all rpm and build files. +# + clean_pkg": Clean all source packages, rpm and build files. +# + clean_old_rpm: Remove old rpm and build files. +# + clean_old_pkg: Remove old source packages and rpms. +# This macro defines following variables: +# + PRJ_RELEASE: Project release with distribution tags. (e.g. 1.fc13) +# + PRJ_RELEASE_NO: Project release number, without distribution tags. (e.g. 1) +# + RPM_BUILD_ARCH: Arch build +# + PRJ_SRPM_PATH: Filename of generated SRPM file, including relative path. +# +# USE_MOCK(spec_in) +# - Add mock related targets. +# Arguments: +# + spec_in: RPM spec input template. +# Targets: +# + rpm_mock_i386: Make i386 rpm +# + rpm_mock_x86_64: Make x86_64 rpm +# This macor reads following variables?: +# + MOCK_RPM_DIST_TAG: Prefix of mock configure file, such as "fedora-11", "fedora-rawhide", "epel-5". +# Default: Convert from RPM_DIST_TAG +# + +IF(NOT DEFINED _PACK_RPM_CMAKE_) + SET (_PACK_RPM_CMAKE_ "DEFINED") + + INCLUDE(PackSource) + SET (SPEC_FILE_WARNING "This file is generated, please modified the .spec.in file instead!") + + IF(NOT DEFINED RPM_DIST_TAG) + EXECUTE_PROCESS(COMMAND rpm --showrc + COMMAND grep -E "dist[[:space:]]*\\." + COMMAND sed -e "s/^.*dist\\s*\\.//" + COMMAND tr \\n \\t + COMMAND sed -e s/\\t// + OUTPUT_VARIABLE RPM_DIST_TAG) + ENDIF(NOT DEFINED RPM_DIST_TAG) + + IF(NOT DEFINED RPM_BUILD_TOPDIR) + SET(RPM_BUILD_TOPDIR ${CMAKE_BINARY_DIR}) + ENDIF(NOT DEFINED RPM_BUILD_TOPDIR) + + IF(NOT DEFINED RPM_BUILD_SPECS) + SET(RPM_BUILD_SPECS "${RPM_BUILD_TOPDIR}/SPECS") + ENDIF(NOT DEFINED RPM_BUILD_SPECS) + + IF(NOT DEFINED RPM_BUILD_SOURCES) + SET(RPM_BUILD_SOURCES "${RPM_BUILD_TOPDIR}/SOURCES") + ENDIF(NOT DEFINED RPM_BUILD_SOURCES) + + IF(NOT DEFINED RPM_BUILD_SRPMS) + SET(RPM_BUILD_SRPMS "${RPM_BUILD_TOPDIR}/SRPMS") + ENDIF(NOT DEFINED RPM_BUILD_SRPMS) + + IF(NOT DEFINED RPM_BUILD_RPMS) + SET(RPM_BUILD_RPMS "${RPM_BUILD_TOPDIR}/RPMS") + ENDIF(NOT DEFINED RPM_BUILD_RPMS) + + IF(NOT DEFINED RPM_BUILD_BUILD) + SET(RPM_BUILD_BUILD "${RPM_BUILD_TOPDIR}/BUILD") + ENDIF(NOT DEFINED RPM_BUILD_BUILD) + + IF(NOT DEFINED RPM_BUILD_BUILDROOT) + SET(RPM_BUILD_BUILDROOT "${RPM_BUILD_TOPDIR}/BUILDROOT") + ENDIF(NOT DEFINED RPM_BUILD_BUILDROOT) + + # Add RPM build directories in ignore file list. + GET_FILENAME_COMPONENT(_rpm_build_sources_basename ${RPM_BUILD_SOURCES} NAME) + GET_FILENAME_COMPONENT(_rpm_build_srpms_basename ${RPM_BUILD_SRPMS} NAME) + GET_FILENAME_COMPONENT(_rpm_build_rpms_basename ${RPM_BUILD_RPMS} NAME) + GET_FILENAME_COMPONENT(_rpm_build_build_basename ${RPM_BUILD_BUILD} NAME) + GET_FILENAME_COMPONENT(_rpm_build_buildroot_basename ${RPM_BUILD_BUILDROOT} NAME) + SET(RPM_IGNORE_FILES + "/${_rpm_build_sources_basename}/" "/${_rpm_build_srpms_basename}/" "/${_rpm_build_rpms_basename}/" + "/${_rpm_build_build_basename}/" "/${_rpm_build_buildroot_basename}/" "debug.*s.list") + + SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} + ${RPM_IGNORE_FILES}) + + MACRO(PACK_RPM var spec_in source0) + IF(NOT EXISTS ${spec_in}) + MESSAGE(FATAL_ERROR "File ${spec_in} not found!") + ENDIF(NOT EXISTS ${spec_in}) + FIND_PROGRAM(RPMBUILD NAMES "rpmbuild-md5" "rpmbuild") + IF(${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND") + MESSAGE(FATAL_ERROR "rpmbuild-md5 and rpmbuild are not found in PATH!") + ENDIF(${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND") + + # Get release number from spec_in + INCLUDE(ManageVariable) + SETTING_FILE_GET_ATTRIBUTE(_releaseStr Release ${spec_in} ":") + STRING(REPLACE "%{?dist}" ".${RPM_DIST_TAG}" PRJ_RELEASE ${_releaseStr}) + STRING(REPLACE "%{?dist}" "" PRJ_RELEASE_NO ${_releaseStr}) + #MESSAGE("_releaseTag=${_releaseTag} _releaseStr=${_releaseStr}") + + # Update RPM_ChangeLog + FILE(READ "${RPM_BUILD_SPECS}/RPM-ChangeLog.prev" RPM_CHANGELOG_PREV) + CONFIGURE_FILE(${RPM_BUILD_SPECS}/RPM-ChangeLog.in ${RPM_BUILD_SPECS}/RPM-ChangeLog) + + # Generate spec + SET(SOURCE0 ${source0}) + CONFIGURE_FILE(${spec_in} ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec) + SET_SOURCE_FILES_PROPERTIES(${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec + PROPERTIES GENERATED TRUE + ) + + SET(${var} "${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE}.src.rpm") + SET(_prj_srpm_path "${RPM_BUILD_SRPMS}/${${var}}") + + #------------------------------------------------------------------- + # RPM build commands and targets + + ADD_CUSTOM_COMMAND(OUTPUT ${RPM_BUILD_SRPMS} + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_SRPMS} + ) + + ADD_CUSTOM_COMMAND(OUTPUT ${RPM_BUILD_RPMS} + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS} + ) + + ADD_CUSTOM_COMMAND(OUTPUT ${RPM_BUILD_BUILD} + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_BUILD} + ) + + ADD_CUSTOM_COMMAND(OUTPUT ${RPM_BUILD_BUILDROOT} + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_BUILDROOT} + ) + + ADD_CUSTOM_COMMAND(OUTPUT ${_prj_srpm_path} + COMMAND ${RPMBUILD} -bs ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec + --define '_sourcedir ${RPM_BUILD_SOURCES}' + --define '_builddir ${RPM_BUILD_BUILD}' + --define '_srcrpmdir ${RPM_BUILD_SRPMS}' + --define '_rpmdir ${RPM_BUILD_RPMS}' + --define '_specdir ${RPM_BUILD_SPECS}' + DEPENDS ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec ${RPM_BUILD_SOURCES}/${source0} + ${RPM_BUILD_SRPMS} ${RPM_BUILD_BUILD} ChangeLog + COMMENT "Building srpm" + ) + + ADD_CUSTOM_TARGET(srpm + DEPENDS ${_prj_srpm_path} + ) + + ADD_CUSTOM_TARGET(rpm + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_SRPMS} + COMMAND ${RPMBUILD} -ba --buildroot ${RPM_BUILD_BUILDROOT} ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec + --define '_sourcedir ${RPM_BUILD_SOURCES}' + --define '_builddir ${RPM_BUILD_BUILD}' + --define '_srcrpmdir ${RPM_BUILD_SRPMS}' + --define '_rpmdir ${RPM_BUILD_RPMS}' + --define '_specdir ${RPM_BUILD_SPECS}' + DEPENDS ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec ${RPM_BUILD_SOURCES}/${source0} + ${RPM_BUILD_SRPMS} ${RPM_BUILD_RPMS} ${RPM_BUILD_BUILD} ${RPM_BUILD_BUILDROOT} + ChangeLog + ) + + ADD_DEPENDENCIES(rpm version_check) + + ADD_CUSTOM_TARGET(rpmlint find . + -name '${PROJECT_NAME}*-${PRJ_VER}-${PRJ_RELEASE_NO}.*.rpm' + -print -exec rpmlint '{}' '\\;' + DEPENDS ${_prj_srpm_path} + ) + + ADD_CUSTOM_TARGET(clean_old_rpm + COMMAND find . + -name '${PROJECT_NAME}*.rpm' ! -name '${PROJECT_NAME}*-${PRJ_VER}-${PRJ_RELEASE_NO}.*.rpm' + -print -delete + COMMAND find ${RPM_BUILD_BUILD} + -path '${PROJECT_NAME}*' ! -path '${RPM_BUILD_BUILD}/${PROJECT_NAME}-${PRJ_VER}-*' + -print -delete + COMMENT "Cleaning old rpms and build." + ) + + ADD_CUSTOM_TARGET(clean_old_pkg + ) + + ADD_DEPENDENCIES(clean_old_pkg clean_old_rpm clean_old_pack_src) + + ADD_CUSTOM_TARGET(clean_rpm + COMMAND find . -name '${PROJECT_NAME}*.rpm' -print -delete + COMMENT "Cleaning rpms.." + ) + ADD_CUSTOM_TARGET(clean_pkg + ) + + ADD_DEPENDENCIES(clean_rpm clean_old_rpm) + ADD_DEPENDENCIES(clean_pkg clean_rpm clean_pack_src) + + ENDMACRO(PACK_RPM var spec_in source0) + + MACRO(USE_MOCK spec_in) + FIND_PROGRAM(MOCK mock) + IF(MOCK STREQUAL "MOCK-NOTFOUND") + MESSAGE(FATAL_ERROR "mock is not found in PATH!") + ENDIF(MOCK STREQUAL "MOCK-NOTFOUND") + + IF(NOT DEFINED MOCK_RPM_DIST_TAG) + STRING(REGEX MATCH "^fc([1-9][0-9]*)" _fedora_mock_dist "${RPM_DIST_TAG}") + STRING(REGEX MATCH "^el([1-9][0-9]*)" _el_mock_dist "${RPM_DIST_TAG}") + + IF (_fedora_mock_dist) + STRING(REGEX REPLACE "^fc([1-9][0-9]*)" "fedora-\\1" MOCK_RPM_DIST_TAG "${RPM_DIST_TAG}") + ELSEIF (_el_mock_dist) + STRING(REGEX REPLACE "^el([1-9][0-9]*)" "epel-\\1" MOCK_RPM_DIST_TAG "${RPM_DIST_TAG}") + ELSE (_fedora_mock_dist) + SET(MOCK_RPM_DIST_TAG "fedora-devel") + ENDIF(_fedora_mock_dist) + #MESSAGE ("MOCK_RPM_DIST_TAG=${MOCK_RPM_DIST_TAG}") + ENDIF(NOT DEFINED MOCK_RPM_DIST_TAG) + + SETTING_FILE_GET_ATTRIBUTE(_archStr BuildArch ${spec_in} ":") + IF(NOT _archStr STREQUAL "noarch") + SET(_prj_srpm_path "${RPM_BUILD_SRPMS}/${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE}.src.rpm") + ADD_CUSTOM_TARGET(rpm_mock_i386 + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS}/i386 + COMMAND ${MOCK} -r "${MOCK_RPM_DIST_TAG}-i386" --resultdir="${RPM_BUILD_RPMS}/i386" ${_prj_srpm_path} + DEPENDS ${_prj_srpm_path} + ) + + ADD_CUSTOM_TARGET(rpm_mock_x86_64 + COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS}/x86_64 + COMMAND ${MOCK} -r "${MOCK_RPM_DIST_TAG}-x86_64" --resultdir="${RPM_BUILD_RPMS}/x86_64" ${_prj_srpm_path} + DEPENDS ${_prj_srpm_path} + ) + + ENDIF(NOT _archStr STREQUAL "noarch") + ENDMACRO(USE_MOCK) + +ENDIF(NOT DEFINED _PACK_RPM_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/PackSource.cmake ibus-chewing-1.3.7.20100910/cmake_modules/PackSource.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/PackSource.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/PackSource.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,139 @@ +# - Pack source helper module +# By default CPack pack everything under the source directory, this is usually +# undesirable. We avoid this by using the sane default ignore list. +# +# Read and Defines following variable: +# PACK_SOURCE_IGNORE_FILES_DEFAULT: Default list of file patterns +# that are normally exclude from the source package. +# Override it by setting it before INCLUDE(PackSource). +# Defines following target: +# pack_remove_old: Remove old source package files. +# Defines following macro: +# PACK_SOURCE(var outputDir [generator]) +# - Pack source files as --Source., +# Arguments: +# + var: The filename of source package is outputted to this var. +# Path is excluded. +# + outputDir: Directory to write source tarball. +# + generator: (Optional) Method to make tarball. Basically this argument +# is passed as CPACK_GENERATOR. Default to TGZ. +# Variable to be read: +# + PROJECT_NAME: Project name +# + PRJ_VER: Project version +# + PACK_SOURCE_IGNORE_FILES: A list of regex filename pattern to indicate +# the files to be excluded. Note that cmake generated file +# (PACK_SOURCE_IGNORE_FILE_CMAKE) is already in this list. +# Target: +# + pack_src: Pack source files like package_source. +# This target depends on version_check. +# + clean_pack_src: Remove all source packages. +# + clean_old_pack_src: Remove all old source package. +# This target depends on version_check. +# +# +IF(NOT DEFINED _PACK_SOURCE_CMAKE_) + SET (_PACK_SOURCE_CMAKE_ "DEFINED") + SET(PACK_SOURCE_IGNORE_FILES_DEFAULT + "/\\\\.svn/" "/CVS/" "/\\\\.git/" "\\\\.gitignore$" "/\\\\.hg/" + "/\\\\.hgignore$" + "~$" "\\\\.swp$" "\\\\.log$" "\\\\.bak$" "\\\\.old$" + "\\\\.gmo$" "\\\\.cache$" + "\\\\.tar.gz$" "\\\\.tar.bz2$" "/src/config\\\\.h$" "NO_PACK") + + SET(PACK_SOURCE_IGNORE_FILES_CMAKE "/CMakeFiles/" "_CPack_Packages/" "/Testing/" + "\\\\.directory$" "CMakeCache\\\\.txt$" + "/install_manifest.txt$" + "/cmake_install\\\\.cmake$" "/cmake_uninstall\\\\.cmake$""/CPack.*\\\\.cmake$" "/CTestTestfile\\\\.cmake$" + "Makefile$" + ) + + INCLUDE(ManageVersion) + + MACRO(PACK_SOURCE var outputDir) + SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} + ${PACK_SOURCE_IGNORE_FILES_CMAKE} ${PACK_SOURCE_IGNORE_FILES_DEFAULT}) + #MESSAGE("PACK_SOURCE_IGNORE_FILES=${PACK_SOURCE_IGNORE_FILES}") + + IF(PRJ_VER STREQUAL "") + MESSAGE(FATAL_ERROR "PRJ_VER not defined") + ENDIF(PRJ_VER STREQUAL "") + IF(${ARGV3}) + SET(CPACK_GENERATOR "${ARGV3}") + ELSE(${ARGV3}) + SET(CPACK_GENERATOR "TGZ") + ENDIF(${ARGV3}) + SET(CPACK_SOURCE_GENERATOR ${CPACK_GENERATOR}) + IF(${CPACK_GENERATOR} STREQUAL "TGZ") + SET(_pack_source_ext "tar.gz") + ELSEIF(${CPACK_GENERATOR} STREQUAL "TBZ2") + SET(_pack_source_ext "tar.bz2") + ELSEIF(${CPACK_GENERATOR} STREQUAL "ZIP") + SET(_pack_source_ext "zip") + ENDIF(${CPACK_GENERATOR} STREQUAL "TGZ") + + SET(CPACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES}) + SET(CPACK_PACKAGE_VERSION ${PRJ_VER}) + + # Get relative path of outputDir + FILE(RELATIVE_PATH _outputDir_rel ${CMAKE_BINARY_DIR} ${outputDir}) + #MESSAGE("#_outputDir_rel=${_outputDir_rel}") + + IF(EXISTS ${CMAKE_SOURCE_DIR}/COPYING) + SET(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/README) + ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/COPYING) + + IF(EXISTS ${CMAKE_SOURCE_DIR}/README) + SET(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README) + ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/README) + + IF(DEFINED PROJECT_DESCRIPTION) + SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}") + ENDIF(DEFINED PROJECT_DESCRIPTION) + + SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PRJ_VER}-Source") + SET(${var} "${CPACK_SOURCE_PACKAGE_FILE_NAME}.${_pack_source_ext}") + + INCLUDE(CPack) + + ADD_CUSTOM_COMMAND(OUTPUT "${_outputDir_rel}/${${var}}" + COMMAND make pack_src + DEPENDS ChangeLog ${RELEASE_FILE} + COMMENT "Packing the source" + ) + + IF("${_outputDir_rel}" STREQUAL ".") + ADD_CUSTOM_TARGET(pack_src + COMMAND make package_source + DEPENDS ChangeLog + ) + ELSE("${_outputDir_rel}" STREQUAL ".") + ADD_CUSTOM_TARGET(pack_src + COMMAND make package_source + COMMAND cmake -E copy ${${var}} "${_outputDir_rel}/" + COMMAND cmake -E remove ${${var}} + DEPENDS ChangeLog + ) + ENDIF("${_outputDir_rel}" STREQUAL ".") + + ADD_DEPENDENCIES(pack_src version_check) + + ADD_CUSTOM_TARGET(clean_old_pack_src + COMMAND find . + -name '${PROJECT_NAME}*.${_pack_source_ext}' ! -name '${PROJECT_NAME}-${PRJ_VER}-*.${_pack_source_ext}' + -print -delete + COMMENT "Cleaning old source packages" + ) + + ADD_DEPENDENCIES(clean_old_pack_src version_check) + + ADD_CUSTOM_TARGET(clean_pack_src + COMMAND find . + -name '${PROJECT_NAME}*.${_pack_source_ext}' + -print -delete + COMMENT "Cleaning all source packages" + ) + ENDMACRO(PACK_SOURCE var outputDir) + + +ENDIF(NOT DEFINED _PACK_SOURCE_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/pkgUpdaterGoogle.pl ibus-chewing-1.3.7.20100910/cmake_modules/pkgUpdaterGoogle.pl --- ibus-chewing-1.3.6.20100730/cmake_modules/pkgUpdaterGoogle.pl 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/pkgUpdaterGoogle.pl 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,132 @@ +#!/usr/bin/perl + +###### +# Author: Ding-Yi Chen +# License: BSD +# +# Idea from send2goog, but without dumping config at $HOME + +use strict; +use Getopt::Long; +use LWP::UserAgent; +use utf8; +binmode(STDIN, ':encoding(utf8)'); +binmode(STDOUT, ':encoding(utf8)'); +binmode(STDERR, ':encoding(utf8)'); + +my $ua = new LWP::UserAgent; # web browser object +our ($user, $pass, $project, $summary, $filePattern); # we use "our" so we can refer to them as $$_ in a loop + +my (@labels, $batch); + +### +# most of the code revolves around getting/setting config options +# if you want to just look at the upload part, search for "upload part" below +### + +GetOptions("user=s"=>\$user, "pass=s"=>\$pass, "summary=s"=>\$summary, + "label=s"=>\@labels, "filePattern=s"=>\$filePattern) || usage(); + +$project = shift @ARGV if (@ARGV > 1); +my $file = shift @ARGV; +usage("Must specify file") if !$file; +my $fkey = $file; +$fkey =~ s/.*\///; +$fkey =~ s/\b\d+\b/#/g; + +for (qw(project user pass summary filePattern)) { + no strict 'refs'; + no warnings 'uninitialized'; + $$_ = prompt($_ ) if !$$_; # prompt for value +} + +if (!@labels) { # not in args? + print("NO LABEL"); + while (my $lab = prompt("label") ){ + push @labels, $lab; + } +} + + +for (qw(project user pass summary filePattern)) { + no strict 'refs'; + usage("Need $_") if (!$$_); # die unless all vars are defined +} + +### +# Deprecated present package +my $downloadlist = "http://code.google.com/p/ibus/downloads/list"; +my $res=$ua->get($downloadlist); +if ($res->is_success) { + my @matches = ($res->decoded_content =~ m/name="($filePattern)" title="Download"/g); +}else { + die $res->status_line; +} + + +@labels = map {('label', $_)} @labels; # put the word 'label' before each +my @labelsWithDeprecated = (@labels, "label", "Deprecated"); + +my $url = "https://$user:$pass\@$project.googlecode.com/files"; +# yep, that's it, one function does it all +my $res = $ua->post($url, + Content_Type => 'form-data', + Content => [ summary=>$summary, + filename=>[$file], + @labelsWithDeprecated + ] +); +process_web_result/./////; + +### +# finally the "upload part" +### +my $res = $ua->post($url, + Content_Type => 'form-data', + Content => [ summary=>$summary, + filename=>[$file], + @labels + ] +); +process_web_result; + +# show the results and explicitly call exit with success/fail + +sub process_web_result { + if ($res->is_success) { + print $res->content, "\n"; + } else { + print STDERR $res->status_line, "\n"; + exit 1; + } +} + + +sub prompt { + print "Enter ". $_[0] . ":" ; # show the prompt + my $r = ; + chomp($r); + return $r; +} + +sub usage { + my $msg = "$_[0]\n\n" if $_[0]; # put the reason on the first line, if any + + no warnings 'uninitialized'; + + die < + +Sends file specified by to google code. + +Options are: + -f[ilePattern] file pattern for searching old released files. + -l[abel] label (can specify more than 1 time) + -u[ser] username + -p[ass] password + -s[ummary] file summary/description +EOF +} + + + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/RPM.cmake ibus-chewing-1.3.7.20100910/cmake_modules/RPM.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/RPM.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/RPM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ -# RPM generation, maintaining (remove old rpm) and verification (rpmlint). -# -# To use: INCLUDE(RPM) -# Included: SourceTarball -# -#=================================================================== -# Variables: -# DIST_TAG: Current distribution tag such as el5, fc10. -# Default: Distribution tag from rpm --showrc -# -# RPM_BUILD_TOPDIR: Directory of the rpm topdir. -# Default: ${CMAKE_BINARY_DIR} -# RPM_BUILD_SPECS: Directory of spec files. -# Default: ${RPM_BUILD_TOPDIR}/SPECS -# RPM_BUILD_SOURCES: Directory of source (tar.gz or zip) files. -# Default: ${RPM_BUILD_TOPDIR}/SOURCES -# RPM_BUILD_SRPMS: Directory of source rpm files. -# Default: ${RPM_BUILD_TOPDIR}/SRPMS -# RPM_BUILD_RPMS: Directory of generated rpm files. -# Default: ${RPM_BUILD_TOPDIR}/RPMS -# RPM_BUILD_BUILD: Directory for RPM build. -# Default: ${RPM_BUILD_TOPDIR}/BUILD -# RPM_BUILD_BUILDROOT: Directory for RPM build. -# Default: ${RPM_BUILD_TOPDIR}/BUILDROOT -# -# RPM_SOURCE_FILES: Source and patch file for RPM build. -# Default: ${RPM_BUILD_SOURCES}/${PROJECT_NAME}-${PRJ_VER}-Source -# with suffix of either tar.gz, tar.bz2, tgz, tbz, zip -# SRPM_FILE: Generated srpm file. -# Default: ${RPM_BUILD_SRPMS}/${PROJECT_NAME}-${PRJ_VER_FULL}.${DIST_TAG}.src.rpm -# RPM_IS_NO_ARCH: Set it if this rpm is noarch, it also -# hide rpm_mock_i386 and rpm_mock_x86_64 for noarch package -# -# MOCK_DIST_TAG: Prefix of mock configure file, such as "fedora-11", "fedora-rawhide", "epel-5"/ -# Default: Convert from DIST_TAG -# -#=================================================================== -# Macros: -# GENERATE_SPEC(spec_in) -# spec_in: Spec input file -# -# Generate a RPM spec file using an input file, spec_in -#=================================================================== -# Targets: -# srpm: Build srpm (rpmbuild -bs). -# Depends on pack_src. -# -# rpm: Build rpm and srpm (rpmbuild -ba) -# Depends on pack_src. -# -# rpmlint: Run rpmlint to generated rpms. -# -# rpm_mock_i386: Use mock to build i386/i586 rpms. -# Depends on srpm. -# -# rpm_mock_x86_64: Use mock to build x86_64 rpms. -# Depends on srpm. -# -# rpm_remove_old: Remove old rpms. -# -# pkg_remove_old: Remove old source tarballs and rpms. -# Depends on rpm_remove_old -# - -INCLUDE(SourceTarball) -SET (SPEC_FILE_WARNING "This file is generated, please modified the .spec.in file instead!") - -IF(NOT DEFINED DIST_TAG) - EXECUTE_PROCESS(COMMAND rpm --showrc - COMMAND grep -E "dist[[:space:]]*\\." - COMMAND sed -e "s/^.*dist\\s*\\.//" - COMMAND tr \\n \\t - COMMAND sed -e s/\\t// - OUTPUT_VARIABLE DIST_TAG) -ENDIF(NOT DEFINED DIST_TAG) - -IF(NOT DEFINED RPM_BUILD_TOPDIR) - SET(RPM_BUILD_TOPDIR ${CMAKE_BINARY_DIR}) -ENDIF(NOT DEFINED RPM_BUILD_TOPDIR) - -IF(NOT DEFINED RPM_BUILD_SPECS) - SET(RPM_BUILD_SPECS "${RPM_BUILD_TOPDIR}/SPECS") -ENDIF(NOT DEFINED RPM_BUILD_SPECS) - -IF(NOT DEFINED RPM_BUILD_SOURCES) - SET(RPM_BUILD_SOURCES "${RPM_BUILD_TOPDIR}/SOURCES") -ENDIF(NOT DEFINED RPM_BUILD_SOURCES) - -IF(NOT DEFINED RPM_BUILD_SRPMS) - SET(RPM_BUILD_SRPMS "${RPM_BUILD_TOPDIR}/SRPMS") -ENDIF(NOT DEFINED RPM_BUILD_SRPMS) - -IF(NOT DEFINED RPM_BUILD_RPMS) - SET(RPM_BUILD_RPMS "${RPM_BUILD_TOPDIR}/RPMS") -ENDIF(NOT DEFINED RPM_BUILD_RPMS) - -IF(NOT DEFINED RPM_BUILD_BUILD) - SET(RPM_BUILD_BUILD "${RPM_BUILD_TOPDIR}/BUILD") -ENDIF(NOT DEFINED RPM_BUILD_BUILD) - -IF(NOT DEFINED RPM_BUILD_BUILDROOT) - SET(RPM_BUILD_BUILDROOT "${RPM_BUILD_TOPDIR}/BUILDROOT") -ENDIF(NOT DEFINED RPM_BUILD_BUILDROOT) - -MACRO(GENERATE_SPEC spec_in) - CONFIGURE_FILE(${spec_in} ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec) - - SET_SOURCE_FILES_PROPERTIES(${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec - PROPERTIES GENERATED TRUE - ) -ENDMACRO(GENERATE_SPEC spec_in) - -IF(NOT DEFINED RPM_SOURCE_FILES) - SET(RPM_SOURCE_FILES ${SOURCE_TARBALL_OUTPUT}) - #MESSAGE("RPM_SOURCE_FILES=${RPM_SOURCE_FILES}") -ENDIF(NOT DEFINED RPM_SOURCE_FILES) - -IF(NOT DEFINED SRPM_FILE) - SET (SRPM_FILE ${RPM_BUILD_SRPMS}/${PROJECT_NAME}-${PRJ_VER_FULL}.${DIST_TAG}.src.rpm) -ENDIF(NOT DEFINED SRPM_FILE) - -IF(NOT DEFINED MOCK_DIST_TAG) - STRING(REGEX MATCH "^fc([1-9][0-9]*)" _fedora_mock_dist "${DIST_TAG}") - STRING(REGEX MATCH "^el([1-9][0-9]*)" _el_mock_dist "${DIST_TAG}") - - IF (_fedora_mock_dist) - STRING(REGEX REPLACE "^fc([1-9][0-9]*)" "fedora-\\1" MOCK_DIST_TAG "${DIST_TAG}") - ELSEIF (_el_mock_dist) - STRING(REGEX REPLACE "^el([1-9][0-9]*)" "epel-\\1" MOCK_DIST_TAG "${DIST_TAG}") - ELSE (_fedora_mock_dist) - SET(MOCK_DIST_TAG "fedora-devel") - ENDIF(_fedora_mock_dist) - #MESSAGE ("MOCK_DIST_TAG=${MOCK_DIST_TAG}") -ENDIF(NOT DEFINED MOCK_DIST_TAG) - - -GET_FILENAME_COMPONENT(rpm_build_sources_basename ${RPM_BUILD_SOURCES} NAME) -GET_FILENAME_COMPONENT(rpm_build_srpms_basename ${RPM_BUILD_SRPMS} NAME) -GET_FILENAME_COMPONENT(rpm_build_rpms_basename ${RPM_BUILD_RPMS} NAME) -GET_FILENAME_COMPONENT(rpm_build_build_basename ${RPM_BUILD_BUILD} NAME) -SET(RPM_IGNORE_FILES "\\\\.rpm$" - "/${rpm_build_sources_basename}/" "/${rpm_build_srpms_basename}/" "/${rpm_build_rpms_basename}/" "/${rpm_build_build_basename}/" "debug.*s.list") - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME}: ${PROJECT_SUMMARY}") -SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES} - ${RPM_IGNORE_FILES}) -SET(CPACK_PACKAGE_IGNORE_FILES ${CPACK_PACKAGE_IGNORE_FILES} - ${RPM_IGNORE_FILES}) -#MESSAGE("RPM_IGNORE_FILES=${RPM_IGNORE_FILES}") - - -#------------------------------------------------------------------- -# RPM build targets -ADD_CUSTOM_TARGET(srpm - COMMAND ${CMAKE_COMMAND} -E make_directory SRPMS - COMMAND rpmbuild-md5 -bs ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec - --define '_sourcedir ${RPM_BUILD_SOURCES}' - --define '_builddir ${RPM_BUILD_BUILD}' - --define '_srcrpmdir ${RPM_BUILD_SRPMS}' - --define '_rpmdir ${RPM_BUILD_RPMS}' - --define '_specdir ${RPM_BUILD_SPECS}' - DEPENDS ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec ${RPM_SOURCE_FILES} - ) - -ADD_CUSTOM_TARGET(rpm - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_SRPMS} - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS}/i386 - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS}/i586 - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS}/x86_64 - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_RPMS}/noarch - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_BUILD} - COMMAND ${CMAKE_COMMAND} -E make_directory ${RPM_BUILD_BUILDROOT} - COMMAND rpmbuild-md5 -ba --buildroot ${RPM_BUILD_BUILDROOT} ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec - --define '_sourcedir ${RPM_BUILD_SOURCES}' - --define '_builddir ${RPM_BUILD_BUILD}' - --define '_srcrpmdir ${RPM_BUILD_SRPMS}' - --define '_rpmdir ${RPM_BUILD_RPMS}' - --define '_specdir ${RPM_BUILD_SPECS}' - DEPENDS ${RPM_BUILD_SPECS}/${PROJECT_NAME}.spec ${RPM_SOURCE_FILES} - ) - -ADD_DEPENDENCIES(srpm pack_src) -ADD_DEPENDENCIES(rpm pack_src) - -IF(NOT RPM_IS_NOARCH) - ADD_CUSTOM_TARGET(rpm_mock_i386 - COMMAND ${CMAKE_COMMAND} -E make_directory RPMS/i386 - COMMAND mock -r "${MOCK_DIST_TAG}-i386" --resultdir="${RPM_BUILD_RPMS}/i386" ${SRPM_FILE} - ) - - ADD_CUSTOM_TARGET(rpm_mock_x86_64 - COMMAND ${CMAKE_COMMAND} -E make_directory RPMS/x86_64 - COMMAND mock -r "${MOCK_DIST_TAG}-x86_64" --resultdir="${RPM_BUILD_RPMS}/x86_64" ${SRPM_FILE} - ) - - ADD_DEPENDENCIES(rpm_mock_i386 srpm) - ADD_DEPENDENCIES(rpm_mock_x86_64 srpm) -ENDIF(NOT RPM_IS_NOARCH) - -ADD_CUSTOM_TARGET(rpmlint find . - -name '${PROJECT_NAME}*-${PRJ_VER_FULL}.*.rpm' - -print -exec rpmlint '{}' '\\;' - ) - - -ADD_CUSTOM_TARGET(rpm_remove_old - COMMAND find . - -name '${PROJECT_NAME}*.rpm' ! -name '${PROJECT_NAME}*-${PRJ_VER_FULL}.*.rpm' - -print -delete - COMMENT "Removing the old rpms.." - ) - - -ADD_CUSTOM_TARGET(pkg_remove_old - COMMAND find . - -name '${PROJECT_NAME}*.tar.[bg]z*' ! -name '${PROJECT_NAME}-${PRJ_VER}-*.${SOURCE_TARBALL_POSTFIX}' - -print -delete - COMMENT "Removing the old tarballs .." - ) -ADD_DEPENDENCIES(pkg_remove_old rpm_remove_old) - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/SourceTarball.cmake ibus-chewing-1.3.7.20100910/cmake_modules/SourceTarball.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/SourceTarball.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/SourceTarball.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -# -# Source Tarball handling. Required by RPM.cmake -# To use: INCLUDE(SourceTarball) -# -# Includes: Version -# -#=================================================================== -# Variables: -# Predefined: -# CMAKE_GENERATED_FILES: Pattern of CMake generated files. -# They are excluded from packing. -# COMMON_IGNORED_FILES: Pattern of backup files and version control system -# files such as CVS, SVN and git. -# They are excluded from packing. -# Output: -# SOURCE_TARBALL_ORIG_PREFIX: The prefix of CPack packed file. -# SOURCE_TARBALL_ORIG_POSTFIX: The postfix of CPack packed file. -# SOURCE_TARBALL_ORIG: The filename of CPack packed file. -# SOURCE_TARBALL_OUTPUT: output filename of target pack_src, including -# output_dir. -# -# Optional: -# SOURCE_TARBALL_OUTPUT_DIR: Set the output directory for package files. -# SOURCE_TARBALL_OUTPUT_PREFIX: Set the prefix of package files. -# -#=================================================================== -# Targets: -# pack_src: Make source tarball for rpm packaging. -# - -INCLUDE(Version) - -IF(CPACK_SOURCE_GENERATOR STREQUAL "TGZ") - SET(SOURCE_TARBALL_POSTFIX "tar.gz") -ELSEIF(CPACK_SOURCE_GENERATOR STREQUAL "TBZ2") - SET(SOURCE_TARBALL_POSTFIX "tar.bz2") -ELSEIF(CPACK_SOURCE_GENERATOR STREQUAL "TZ") - SET(SOURCE_TARBALL_POSTFIX "tar.Z") -ELSEIF(CPACK_SOURCE_GENERATOR STREQUAL "ZIP") - SET(SOURCE_TARBALL_POSTFIX "zip") -ENDIF(CPACK_SOURCE_GENERATOR STREQUAL "TGZ") -SET(SOURCE_TARBALL_ORIG_PREFIX ${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-Source) -SET(SOURCE_TARBALL_ORIG ${SOURCE_TARBALL_ORIG_PREFIX}.${SOURCE_TARBALL_POSTFIX}) - -SET(SOURCE_TARBALL_OUTPUT) - -IF(DEFINED SOURCE_TARBALL_OUTPUT_DIR) - IF(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) - SET(SOURCE_TARBALL_OUTPUT - ${SOURCE_TARBALL_OUTPUT_DIR}/${SOURCE_TARBALL_OUTPUT_PREFIX}.${SOURCE_TARBALL_POSTFIX}) - ELSE(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) - SET(SOURCE_TARBALL_OUTPUT - ${SOURCE_TARBALL_OUTPUT_DIR}/${SOURCE_TARBALL_ORIG}) - ENDIF(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) -ELSE(DEFINED SOURCE_TARBALL_OUTPUT_DIR) - IF(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) - SET(SOURCE_TARBALL_OUTPUT - ${SOURCE_TARBALL_OUTPUT_PREFIX}.${SOURCE_TARBALL_POSTFIX}) - ELSE(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) - SET(SOURCE_TARBALL_OUTPUT - ${SOURCE_TARBALL_ORIG}) - ENDIF(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) -ENDIF(DEFINED SOURCE_TARBALL_OUTPUT_DIR) - - -IF(DEFINED SOURCE_TARBALL_OUTPUT_DIR) - ADD_CUSTOM_TARGET(pack_src - COMMAND make package_source - COMMENT "Packaging Source files" - COMMAND mkdir -p ${SOURCE_TARBALL_OUTPUT_DIR} - COMMAND mv ${SOURCE_TARBALL_ORIG} ${SOURCE_TARBALL_OUTPUT} - VERBATIM - ) -ELSE(DEFINED SOURCE_TARBALL_OUTPUT_DIR) - IF(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) - ADD_CUSTOM_TARGET(pack_src - COMMAND make package_source - COMMENT "Packaging Source files" - COMMAND mv ${SOURCE_TARBALL_ORIG} ${SOURCE_TARBALL_OUTPUT} - VERBATIM - ) - ELSE(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) - ADD_CUSTOM_TARGET(pack_src - COMMAND make package_source - COMMENT "Packaging Source files" - VERBATIM - ) - ENDIF(DEFINED SOURCE_TARBALL_OUTPUT_PREFIX) -ENDIF(DEFINED SOURCE_TARBALL_OUTPUT_DIR) -#MESSAGE("SOURCE_TARBALL_ORIG=${SOURCE_TARBALL_ORIG}") -#MESSAGE("SOURCE_TARBALL_OUTPUT=${SOURCE_TARBALL_OUTPUT}") - -SET(CMAKE_GENERATED_FILES "/CMakeFiles/" "_CPack_Packages/" "/Testing/" - "\\\\.directory$" "CMakeCache\\\\.txt$" - "/install_manifest.txt$" - "/cmake_.*install\\\\.cmake$" "/CPack.*\\\\.cmake$" "/CTestTestfile\\\\.cmake$" - "Makefile$" - ) - -SET(COMMON_IGNORED_FILES - "/\\\\.svn/" "/CVS/" "/\\\\.git/" "\\\\.gitignore$" - "~$" "\\\\.swp$" "\\\\.log$" "\\\\.bak$" "\\\\.old$" - "\\\\.gmo$" - "\\\\.tar.gz$" "\\\\.tar.bz2$" "/src/config\\\\.h$" "NO_PACK") - -SET(CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES} ${CMAKE_GENERATED_FILES} ${COMMON_IGNORED_FILES}) - -ADD_DEPENDENCIES(pack_src version_check) - diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/SupportCmake-2.4.cmake ibus-chewing-1.3.7.20100910/cmake_modules/SupportCmake-2.4.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/SupportCmake-2.4.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/SupportCmake-2.4.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,47 @@ +# - SupportCmake-2.4: Supporter module for cmake 2.4. +# Defines the following macros: +# STRING_TRIM(var str [UNQUOTED]) +# - Trim a string. This macro is needed as CMake 2.4 does not support +# STRING(STRIP ..) +# * Parameters: +# var: A variable that stores the result. +# str: A string. +# UNQUOTED: (Optional) remove the double quote mark around the string. +# This module is mainly for provide an unified environment for CMake 2.4 +# and up. You can use this module even you are normally with higher version +# such like 2.6. +# +IF(NOT DEFINED _SUPPORT_CMAKE_2.4_CMAKE_) + SET(_SUPPORT_CMAKE_2.4_CMAKE_ "DEFINED") + SET(CMAKE_LOWEST_SUPPORTED_VERSION 2.4) + + IF(CMAKE_VERSION) + IF(CMAKE_VERSION VERSION_LESS 2.6) + MESSAGE("SET CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION}") + SET(CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_VERSION}) + ENDIF(CMAKE_VERSION VERSION_LESS 2.6) + ELSE(CMAKE_VERSION) + # CMAKE_VERSION may not available in 2.4 + # MESSAGE("SET CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_LOWEST_SUPPORTED_VERSION}") + SET(CMAKE_BACKWARDS_COMPATIBILITY ${CMAKE_LOWEST_SUPPORTED_VERSION}) + SET(CMAKE_VERSION ${CMAKE_LOWEST_SUPPORTED_VERSION}) + ENDIF(CMAKE_VERSION) + + MACRO(STRING_TRIM var str) + IF ("${ARGN}" STREQUAL "UNQUOTED") + SET(_unquoted 1) + ELSE("${ARGN}" STREQUAL "UNQUOTED") + SET(_unquoted 0) + ENDIF("${ARGN}" STREQUAL "UNQUOTED") + SET(_var_1 "+${str}+") + STRING(REGEX REPLACE "^[+][ \t\r\n]*" "" _var_2 "${_var_1}" ) + STRING(REGEX REPLACE "[ \t\r\n]*[+]$" "" _var_3 "${_var_2}" ) + IF (${_unquoted}) + STRING(REGEX REPLACE "^\"" "" _var_4 "${_var_3}" ) + STRING(REGEX REPLACE "\"$" "" ${var} "${_var_4}" ) + ELSE(${_unquoted}) + SET(${var} "${_var_3}") + ENDIF(${_unquoted}) + ENDMACRO(STRING_TRIM var str) +ENDIF(NOT DEFINED _SUPPORT_CMAKE_2.4_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/UseDoxygen.cmake ibus-chewing-1.3.7.20100910/cmake_modules/UseDoxygen.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/UseDoxygen.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/UseDoxygen.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,33 @@ +# - Generate Doxyfile +# This module is for doxygen generation. +# Defines following macros: +# USE_DOXYGEN(doxygen_in doc_dir) +# - This macro generate documents according to doxygen template. +# Arguments: +# + doxygen_in: Doxygen template file. +# + doc_dir: Document source directory to be copied from. +# Reads following variable: +# + PROJECT_DOC_DIR: Directory for document +# +# +IF(NOT DEFINED _USE_DOXYGEN_CMAKE_) + SET(_USE_DOXYGEN_CMAKE_ "DEFINED") + SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} "/Doxyfile$") + + MACRO(USE_DOXYGEN doxygen_in doc_dir) + IF(PROJECT_DOC_DIR STREQUAL "") + MESSAGE(FATAL_ERROR "PROJECT_DOC_DIR undefined. Use macro SET_USUAL_COMPILE_ENV() before USE_DOXYGEN") + ENDIF(PROJECT_DOC_DIR STREQUAL "") + FIND_PACKAGE(Doxygen) + CONFIGURE_FILE(${doxygen_in} Doxyfile) + + ADD_CUSTOM_TARGET(doxygen + COMMAND "${DOXYGEN}" "Doxyfile" + ) + + INSTALL(DIRECTORY ${doc_dir} + DESTINATION "${PROJECT_DOC_DIR}" + ) + ENDMACRO(USE_DOXYGEN doxygen_template) +ENDIF(NOT DEFINED _USE_DOXYGEN_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/UseFedpkg.cmake ibus-chewing-1.3.7.20100910/cmake_modules/UseFedpkg.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/UseFedpkg.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/UseFedpkg.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,281 @@ +# - fedpkg targets for Fedora and EPEL developers. +# This module provides convenient targets for scratch build, submit, +# and build on koji, using the GIT infrastructure, +# as well as bodhi update. +# Since this module is mainly for Fedora developers/maintainers, +# This module checks ~/.fedora-upload-ca.cert +# +# Reads and defines following variables: +# FEDORA_CURRENT_RELEASE_TAGS: Current tags of fedora releases. +# Defines following variable: +# FEDORA_RAWHIDE_TAG: Koji tags for rawhide +# Defines following macros: +# USE_FEDPKG(srpm [NORAWHIDE] [tag1 [tag2 ...]) +# - Use fedpkg targets if ~/.fedora-upload-ca.cert exists. +# If ~/.fedora-upload-ca.cert does not exists, this marcos run as an empty +# macro. +# Argument: +# + srpm: srpm file with path. +# + NORAWHIDE: Don't build on rawhide. +# + tag1, tag2...: Dist tags such as f14, f13, el5. +# if no defined, then tags in FEDORA_CURRENT_RELEASE_TAGS are used. +# Reads following variables: +# + FEDPKG_DIR: Directory for fedpkg checkout. +# Default: FedPkg. +# Defines following targets: +# + fedpkg_scratch_build: Sent srpm for scratch build +# + fedpkg_submit: Submit package to koji for each tag. +# + fedpkg_build: Build package with koji for each tag. +# + fedpkg_update: Submit to bodhi +# USE_BODHI([TAGS [tag1 [tag2 ...]] [KARMA karmaValue] ) +# - Use bodhi targets with bodhi command line client. +# Argument: +# + TAGS tag1, ....: Dist Tags for submission. Accepts formats like f14, +# fc14, el6. +# + KARMA karmaValue: Set the karma threshold. Default is 3. +# Reads following variables: +# + BODHI_UPDATE_TYPE: Type of update. Default is "bugfix". +# + BODHI_USER: Login username for bodhi (for -u). +# + FEDORA_CURRENT_RELEASE_TAGS: If TAGS is not defined, then it will be +# use as default tags. +# + SUGGEST_REBOOT: Whether this update require reboot to take effect. +# Default is "False". +# Defines following targets: +# + bodhi_new: Send a new release to bodhi. +# + +IF(NOT DEFINED _USE_FEDPKG_CMAKE_) + SET(_USE_FEDPKG_CMAKE_ "DEFINED") + IF(NOT DEFINED FEDORA_CURRENT_RELEASE_TAGS) + SET(FEDORA_CURRENT_RELEASE_TAGS f14 f13 f12) + ENDIF(NOT DEFINED FEDORA_CURRENT_RELEASE_TAGS) + SET(FEDORA_RAWHIDE_TAG rawhide) + IF(NOT DEFINED FEDPKG_DIR) + SET(FEDPKG_DIR "FedPkg") + ELSEIF (FEDPKG_DIR STREQUAL "") + SET(FEDPKG_DIR "FedPkg") + ENDIF(NOT DEFINED FEDPKG_DIR) + SET(_bodhi_template_file "bodhi.template") + SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} "/${FEDPKG_DIR}/" + "/bodhi\\\\.template$") + + MACRO(_use_fedpkg_make_cmds srpm tags) + #commit + IF (DEFINED CHANGE_SUMMARY) + SET (COMMIT_MSG "-m \"${CHANGE_SUMMARY}\"") + ELSE(DEFINED CHANGE_SUMMARY) + SET (COMMIT_MSG "") + ENDIF(DEFINED CHANGE_SUMMARY) + + FOREACH(_tag ${tags}) + IF(_tag STREQUAL "${FEDORA_RAWHIDE_TAG}") + SET(_branch "master") + ELSE(_tag STREQUAL "${FEDORA_RAWHIDE_TAG}") + SET(_branch "${_tag}") + ENDIF(_tag STREQUAL "${FEDORA_RAWHIDE_TAG}") + + IF(DEFINED _first_branch) + SET(FEDPKG_SCRATCH_BUILD_CMD "${FEDPKG_SCRATCH_BUILD_CMD}" + " ${FEDPKG} switch-branch ${_branch}" + " ${FEDPKG} scratch-build --srpm ${srpm}") + SET(FEDPKG_COMMIT_CMD "${FEDPKG_COMMIT_CMD}" + " ${FEDPKG} switch-branch ${_branch}" + " git merge ${_first_branch}" + " git push") + SET(FEDPKG_BUILD_CMD "${FEDPKG_BUILD_CMD} " + " ${FEDPKG} switch-branch ${_branch}" + " ${FEDPKG} build") + SET(FEDPKG_UPDATE_CMD "${FEDPKG_UPDATE_CMD}" + " ${FEDPKG} switch-branch ${_branch}" + " ${FEDPKG} update") + ELSE(DEFINED _first_branch) + SET(_first_branch ${_branch}) + SET(FEDPKG_SCRATCH_BUILD_CMD + "${FEDPKG} switch-branch ${_branch}" + "${FEDPKG} scratch-build --srpm ${srpm}") + SET(FEDPKG_COMMIT_CMD + "${FEDPKG} switch-branch ${_branch}" + " ${FEDPKG} import ${srpm}" + " ${FEDPKG} commit ${COMMIT_MSG} -p" + ) + SET(FEDPKG_BUILD_CMD + "${FEDPKG} switch-branch ${_branch}" + " ${FEDPKG} build") + SET(FEDPKG_UPDATE_CMD + "${FEDPKG} switch-branch ${_branch}" + " ${FEDPKG} update") + ENDIF(DEFINED _first_branch) + ENDFOREACH(_tag ${tags}) + ENDMACRO(_use_fedpkg_make_cmds tags srpm) + + MACRO(USE_FEDPKG srpm) + IF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert) + FIND_PROGRAM(FEDPKG fedpkg) + IF(FEDPKG STREQUAL "FEDPKG-NOTFOUND") + MESSAGE(FATAL-ERROR "Program fedpkg is not found!") + ENDIF(FEDPKG STREQUAL "FEDPKG-NOTFOUND") + ADD_CUSTOM_COMMAND(OUTPUT ${FEDPKG_DIR} + COMMAND mkdir -p ${FEDPKG_DIR} + ) + + ADD_CUSTOM_COMMAND(OUTPUT ${FEDPKG_DIR}/${PROJECT_NAME} + COMMAND fedpkg clone ${PROJECT_NAME} + DEPENDS ${FEDPKG_DIR} + WORKING_DIRECTORY ${FEDPKG_DIR} + ) + + + SET(_rawhide 1) + FOREACH(_arg ${ARGN}) + IF ("${_arg}" STREQUAL "NORAWHIDE") + SET(_rawhide 0) + ELSE("${_arg}" STREQUAL "NORAWHIDE") + SET(_koji_dist_tags ${_koji_dist_tags} ${_arg}) + ENDIF("${_arg}" STREQUAL "NORAWHIDE") + ENDFOREACH(_arg) + + IF(NOT DEFINED _koji_dist_tags) + SET(_koji_dist_tags ${FEDORA_CURRENT_RELEASE_TAGS}) + ENDIF(NOT DEFINED _koji_dist_tags) + + IF(_rawhide EQUAL 1) + SET(_koji_dist_tags ${FEDORA_RAWHIDE_TAG} ${_koji_dist_tags}) + ENDIF(_rawhide EQUAL 1) + + ## Make target commands for the released dist + _use_fedpkg_make_cmds("${srpm}" "${_koji_dist_tags}") + + #MESSAGE(FEDPKG_SCRATCH_BUILD_CMD=${FEDPKG_SCRATCH_BUILD_CMD}) + ADD_CUSTOM_TARGET(fedpkg_scratch_build + COMMAND eval "${FEDPKG_SCRATCH_BUILD_CMD}" + DEPENDS ${FEDPKG_DIR}/${PROJECT_NAME} ${srpm} ChangeLog + WORKING_DIRECTORY ${FEDPKG_DIR}/${PROJECT_NAME} + COMMENT "Start Koji scratch build" + VERBATIM + ) + + #MESSAGE(FEDPKG_COMMIT_CMD=${FEDPKG_COMMIT_CMD}) + ADD_CUSTOM_TARGET(fedpkg_commit + COMMAND eval "${FEDPKG_COMMIT_CMD}" + DEPENDS ${FEDPKG_DIR}/${PROJECT_NAME} ${srpm} ChangeLog + WORKING_DIRECTORY ${FEDPKG_DIR}/${PROJECT_NAME} + COMMENT "Submitting to Koji" + VERBATIM + ) + + #MESSAGE("FEDPKG_BUILD_CMD=${FEDPKG_BUILD_CMD}") + ADD_CUSTOM_TARGET(fedpkg_build + COMMAND eval "${FEDPKG_BUILD_CMD}" + DEPENDS ${FEDPKG_DIR}/${PROJECT_NAME} ${srpm} ChangeLog + WORKING_DIRECTORY ${FEDPKG_DIR}/${PROJECT_NAME} + COMMENT "Building on Koji" + VERBATIM + ) + + #MESSAGE("FEDPKG_BUILD_CMD=${FEDPKG_BUILD_CMD}") + ADD_CUSTOM_TARGET(fedpkg_update + COMMAND eval "${FEDPKG_UPDATE_CMD}" + DEPENDS ${FEDPKG_DIR}/${PROJECT_NAME} ${srpm} ChangeLog + WORKING_DIRECTORY ${FEDPKG_DIR}/${PROJECT_NAME} + COMMENT "Updating on Bodhi" + VERBATIM + ) + + ENDIF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert) + ENDMACRO(USE_FEDPKG srpm) + + MACRO(_use_bodhi_convert_tag tag_out tag_in) + STRING(REGEX REPLACE "f([0-9]+)" "fc\\1" _tag_replace "${tag_in}") + IF(_tag_replace STREQUAL "") + SET(${tag_out} ${tag_in}) + ELSE(_tag_replace STREQUAL "") + SET(${tag_out} ${_tag_replace}) + ENDIF(_tag_replace STREQUAL "") + ENDMACRO(_use_bodhi_convert_tag tag_out tag_in) + + MACRO(USE_BODHI) + # Bodhi does not really require .fedora-upload-ca.cert + # But since this macro is meant for package maintainers, + # so.. + IF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert) + FIND_PROGRAM(BODHI bodhi) + IF(BODHI STREQUAL "BODHI-NOTFOUND") + MESSAGE(FATAL-ERROR "Program bodhi is not found!") + ENDIF(BODHI STREQUAL "BODHI-NOTFOUND") + + FOREACH(_arg ${ARGN}) + SET(_stage "NONE") + IF(_arg STREQUAL "TAGS") + SET(_stage "TAGS") + ELSEIF(_arg STREQUAL "KARMA") + SET(_stage "KARMA") + ELSE(_arg STREQUAL "TAGS") + # option values + IF(_stage STREQUAL "TAGS") + SET(_tags ${_arg}) + ELSEIF(_stage STREQUAL "KARMA") + IF(_arg STREQUAL "0") + SET(_autokarma "False") + SET(_stable_karma "${_arg}") + ELSE(_arg STREQUAL "0") + SET(_autokarma "True") + SET(_stable_karma "${_arg}") + ENDIF(_arg STREQUAL "0") + SET(_tags ${_arg}) + ENDIF(_stage STREQUAL "TAGS") + ENDIF(_arg STREQUAL "TAGS") + ENDFOREACH(_arg ${ARGN}) + + IF(NOT _tags) + SET(_tags ${FEDORA_CURRENT_RELEASE_TAGS}) + ENDIF(NOT _tags) + + IF(NOT _autokarma) + SET(_autokarma "True") + ENDIF(NOT _autokarma) + + IF(NOT _stable_karma) + SET(_stable_karma "3") + ENDIF(NOT _stable_karma) + + FOREACH(_tag ${_tags}) + _use_bodhi_convert_tag(_bodhi_tag ${_tag}) + + FILE(APPEND ${_bodhi_template_file} "[${PROJECT_NAME}-${PRJ_VER}-${PRJ_RELEASE_NO}.${_bodhi_tag}]\n\n") + + IF(BODHI_UPDATE_TYPE) + FILE(APPEND ${_bodhi_template_file} "type=${BODHI_UPDATE_TYPE}\n\n") + ELSE(BODHI_UPDATE_TYPE) + FILE(APPEND ${_bodhi_template_file} "type=bugfix\n\n") + ENDIF(BODHI_UPDATE_TYPE) + + FILE(APPEND ${_bodhi_template_file} "request=testing\n") + FILE(APPEND ${_bodhi_template_file} "bugs=${REDHAT_BUGZILLA}\n") + FILE(APPEND ${_bodhi_template_file} "notes=${CHANGELOG_ITEMS}\n\n") + + FILE(APPEND ${_bodhi_template_file} "autokarma=${_autokarma}\n") + FILE(APPEND ${_bodhi_template_file} "stable_karma=${_stable_karma}\n") + FILE(APPEND ${_bodhi_template_file} "close_bugs=True\n") + + IF(SUGGEST_REBOOT) + FILE(APPEND ${_bodhi_template_file} "suggest_reboot=True\n") + ELSE(SUGGEST_REBOOT) + FILE(APPEND ${_bodhi_template_file} "suggest_reboot=False\n\n") + ENDIF(SUGGEST_REBOOT) + ENDFOREACH(_tag ${_tags}) + + IF(BODHI_USER) + SET(_bodhi_login -u ${BODHI_USER}) + ENDIF(BODHI_USER) + + ADD_CUSTOM_TARGET(bodhi_new + COMMAND bodhi --new ${_bodhi_login} --file ${_bodhi_template_file} + COMMENT "Send new package to bodhi" + VERBATIM + ) + + ENDIF(EXISTS $ENV{HOME}/.fedora-upload-ca.cert) + ENDMACRO(USE_BODHI) + +ENDIF(NOT DEFINED _USE_FEDPKG_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/UseGConf.cmake ibus-chewing-1.3.7.20100910/cmake_modules/UseGConf.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/UseGConf.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/UseGConf.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,63 @@ +# - GConf relative targets such as install/unstall schemas. +# This module finds gconftool-2 or gconftool for GConf manipulation. +# +# Reads following variables: +# GCONF_SCHEMAS_FILE: Schema file. +# Default: "${PROJECT_NAME}.schemas" +# +# GCONF_SCHEMAS_INSTALLED_DIR: Direct of installed schemas files. +# Default: "${SYSCONF_INSTALL_DIR}/gconf/schemas" +# +# GCONF_CONFIG_SOURCE: configuration source. +# Default: "" (Use the system default) +# +# Defines following targets: +# install_schemas: install schemas +# +# uninstall_schemas: uninstall schemas +# + +IF(NOT DEFINED _USE_GCONF_CMAKE_) + FIND_PROGRAM(GCONFTOOL NAMES gconftool-2 gconftool) + + IF(${GCONFTOOL} STREQUAL "GCONFTOOL-NOTFOUND") + MESSAGE(FATAL_ERROR "gconftool and gconftool-2 are not found, please install GConf or GConf2.") + ENDIF() + + IF (NOT DEFINED GCONF_SCHEMAS_FILE) + SET(GCONF_SCHEMAS_FILE "${PROJECT_NAME}.schemas") + ENDIF(NOT DEFINED GCONF_SCHEMAS_FILE) + + GET_FILENAME_COMPONENT(_gconf_schemas_basename ${GCONF_SCHEMAS_FILE} NAME) + + IF (NOT DEFINED GCONF_SCHEMAS_INSTALLED_DIR) + SET(GCONF_SCHEMAS_INSTALLED_DIR "${SYSCONF_INSTALL_DIR}/gconf/schemas") + ENDIF(NOT DEFINED GCONF_SCHEMAS_INSTALLED_DIR) + + IF (NOT DEFINED GCONF_CONFIG_SOURCE) + SET(GCONF_CONFIG_SOURCE "") + ENDIF(NOT DEFINED GCONF_CONFIG_SOURCE) + SET(ENV{GCONF_CONFIG_SOURCE} ${GCONF_CONFIG_SOURCE}) + + + ADD_CUSTOM_TARGET(uninstall_schemas + COMMAND GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE} + ${GCONFTOOL} --makefile-uninstall-rule + ${GCONF_SCHEMAS_INSTALLED_DIR}/${_gconf_schemas_basename} + COMMENT "Uninstalling schemas" + ) + + ADD_CUSTOM_TARGET(install_schemas + COMMAND cmake -E copy ${GCONF_SCHEMAS_FILE} ${GCONF_SCHEMAS_INSTALLED_DIR}/${_gconf_schemas_basename} + COMMAND GCONF_CONFIG_SOURCE=${GCONF_CONFIG_SOURCE} + ${GCONFTOOL} --makefile-install-rule + ${GCONF_SCHEMAS_INSTALLED_DIR}/${_gconf_schemas_basename} + DEPENDS ${GCONF_SCHEMAS_FILE} + COMMENT "Installing schemas" + ) + + INSTALL(FILES ${GCONF_SCHEMAS_FILE} + DESTINATION "${GCONF_SCHEMAS_INSTALLED_DIR}") +ENDIF(NOT DEFINED _USE_GCONF_CMAKE_) + + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/UseGettext.cmake ibus-chewing-1.3.7.20100910/cmake_modules/UseGettext.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/UseGettext.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/UseGettext.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,154 @@ +# - Gettext support: Create/Update pot file and translation files. +# This module creates gettext related targets. +# Most part of this module is from FindGettext.cmake of cmake, +# but it is included here because: +# 1. Some system like RHEL5 does not have FindGettext.cmake +# 2. Bug of GETTEXT_CREATE_TRANSLATIONS make it unable to be include in 'All' +# 3. It does not support xgettext +# +# Defines following variables: +# GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool. +# GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool. +# XGETTEXT_EXECUTABLE: the full path to the xgettext. +# XGETTEXT_OPTIONS_C: Usual xgettext options for C programs. +# +# Defines following macros: +# GETTEXT_CREATE_POT(potFile +# [OPTIONS xgettext_options] +# SRC list_of_source_files +# ) +# - Generate .pot file. +# Arguments: +# + potFile: pot file to be generated. +# + xgettext_options: (optional) xgettext_options. +# Default: No options. +# + list_of_source_files: List of source files that contains msgid. +# Targets: +# + pot_file: Generate a pot file with the file name specified in potFile. +# +# GETTEXT_CREATE_TRANSLATIONS ( potFile [ALL] locale1 ... localeN +# [COMMENT comment] ) +# - This will create a target "translations" which converts given input po +# files into the binary output mo files. If the ALL option is used, the +# translations will also be created when building with "make all" +# Arguments: +# + potFile: pot file to be referred. +# + ALL: (Optional) target "translations" is included when building with +# "make all" +# + locale1 ... localeN: locale to be built. +# + comment: (Optional) Comment for target "translations". +# Targets: +# + translations: Converts input po files into the binary output mo files. +# + +IF(NOT DEFINED _USE_GETTEXT_CMAKE_) + SET(_USE_GETTEXT_CMAKE_ "DEFINED") + FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext) + IF(XGETTEXT_EXECUTABLE STREQUAL "XGETTEXT_EXECUTABLE-NOTFOUND") + MESSAGE(FATAL_ERROR "xgettext not found!") + ENDIF(XGETTEXT_EXECUTABLE STREQUAL "XGETTEXT_EXECUTABLE-NOTFOUND") + + FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge) + IF(GETTEXT_MSGMERGE_EXECUTABLE STREQUAL "GETTEXT_MSGMERGE_EXECUTABLE-NOTFOUND") + MESSAGE(FATAL_ERROR "msgmerge not found!") + ENDIF(GETTEXT_MSGMERGE_EXECUTABLE STREQUAL "GETTEXT_MSGMERGE_EXECUTABLE-NOTFOUND") + + FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt) + IF(GETTEXT_MSGFMT_EXECUTABLE STREQUAL "GETTEXT_MSGFMT_EXECUTABLE-NOTFOUND") + MESSAGE(FATAL_ERROR "msgfmt not found!") + ENDIF(GETTEXT_MSGFMT_EXECUTABLE STREQUAL "GETTEXT_MSGFMT_EXECUTABLE-NOTFOUND") + + SET(XGETTEXT_OPTIONS_C + --language=C --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 -s + --package-name=${PROJECT_NAME} --package-version=${PRJ_VER}) + + MACRO(GETTEXT_CREATE_POT potFile ) + SET(_xgettext_options_list) + SET(_src_list) + SET(_src_list_abs) + SET(_stage "SRC") + FOREACH(_pot_option ${ARGN}) + IF(_pot_option STREQUAL "OPTIONS") + SET(_stage "OPTIONS") + ELSEIF(_pot_option STREQUAL "SRC") + SET(_stage "SRC") + ELSE(_pot_option STREQUAL "OPTIONS") + IF(_stage STREQUAL "OPTIONS") + SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option}) + ELSE(_stage STREQUAL "OPTIONS") + FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option}) + GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE) + SET(_src_list ${_src_list} ${_relFile}) + SET(_src_list_abs ${_src_list_abs} ${_absFile}) + ENDIF(_stage STREQUAL "OPTIONS") + ENDIF(_pot_option STREQUAL "OPTIONS") + ENDFOREACH(_pot_option ${_pot_options} ${ARGN}) + + IF (_xgettext_options_list) + SET(_xgettext_options ${_xgettext_options_list}) + ELSE(_xgettext_options_list) + SET(_xgettext_options ${XGETTEXT_OPTIONS}) + ENDIF(_xgettext_options_list) + + #MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${potFile} ${_src_list}") + ADD_CUSTOM_COMMAND(OUTPUT ${potFile} + COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${potFile} ${_src_list} + DEPENDS ${_src_list_abs} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + + ADD_CUSTOM_TARGET(pot_file + COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${potFile} ${_src_list} + DEPENDS ${potFile} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Extract translatable messages to ${potFile}" + ) + ENDMACRO(GETTEXT_CREATE_POT potFile _pot_options) + + + MACRO(GETTEXT_CREATE_TRANSLATIONS potFile _firstLang) + SET(_gmoFiles) + GET_FILENAME_COMPONENT(_potBasename ${potFile} NAME_WE) + GET_FILENAME_COMPONENT(_absPotFile ${potFile} ABSOLUTE) + + SET(_addToAll) + SET(_is_comment FALSE) + + FOREACH (_currentLang ${_firstLang} ${ARGN}) + IF(_currentLang STREQUAL "ALL") + SET(_addToAll "ALL") + ELSEIF(_currentLang STREQUAL "COMMENT") + SET(_is_comment TRUE) + ELSEIF(_is_comment) + SET(_is_comment FALSE) + SET(_comment ${_currentLang}) + ELSE(_currentLang STREQUAL "ALL") + SET(_lang ${_currentLang}) + GET_FILENAME_COMPONENT(_absFile ${_currentLang}.po ABSOLUTE) + GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) + SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo) + + #MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}") + ADD_CUSTOM_COMMAND( + OUTPUT ${_gmoFile} + COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} + COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} + DEPENDS ${_absPotFile} ${_absFile} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating ${_currentLang} translation" + ) + + INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) + SET(_gmoFiles ${_gmoFiles} ${_gmoFile}) + ENDIF(_currentLang STREQUAL "ALL") + ENDFOREACH (_currentLang ) + + IF(_comment STREQUAL "") + SET(_comment "Generating translations") + ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles} COMMENT "${_comment}") + ENDIF(_comment STREQUAL "") + ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles} COMMENT "${_comment}") + ENDMACRO(GETTEXT_CREATE_TRANSLATIONS potFile _firstLang) + +ENDIF(NOT DEFINED _USE_GETTEXT_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/UseHostingService.cmake ibus-chewing-1.3.7.20100910/cmake_modules/UseHostingService.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/UseHostingService.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/UseHostingService.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,224 @@ +# - Read setting files and provides developer only targets. +# This module have macros that generate variables such as +# upload to a hosting services, which are valid to only the developers. +# This is normally done by checking the existence of a developer +# setting file. +# +# Defines following Macros: +# USE_HOSTING_SERVICE_READ_SETTING_FILE(filename) +# - It checks the existence of setting file. +# If it does not exist, this macro acts as a no-op; +# if it exists, then it reads variables defined in the setting file, +# and set relevant targets. +# See the "Setting File Format" section for description of file format. +# Arguments: +# + filename: Filename of the setting file. +# Reads and defines following variables: +# + PACK_SOURCE_IGNORE_FILES: It appends list of generated file to +# ignore file list. +# Reads following variables: +# + PRJ_VER: Project version. +# + CHANGE_SUMMARY: Change summary. +# Defines following targets: +# + changelog_update: Update changelog by copying ChangeLog to ChangeLog.prev +# and RPM-ChangeLog to RPM-ChangeLog. This target should be execute before +# starting a new version. +# + tag: tag the latest commit with the ${PRJ_VER} and ${CHANGE_SUMMARY} as comment. +# + upload: upload the source packages to hosting services. +# +# Setting File Format +# +# It is basically the "variable=value" format. +# For variables which accept list, use ';' to separate each element. +# A line start with '#' is deemed as comment. +# +# Recognized Variable: +# Although it does no harm to define other variables in the setting file, +# but this module only recognizes following variables: +# +# HOSTING_SERVICES +# A list of hosting services that packages are hosted. It allows multiple elements. +# +# SOURCE_VERSION_CONTROL +# Version control system for the source code. Accepted values: git, hg, svn, cvs. +# +# The services can be defined by following format: +# __= +# +# ServiceName is the name of the hosting service. +# If using a known service name, you may be able to omit some definition, +# as they have build in value. Do not worry that your hosting service is +# not in the known list, you can still benefit from this module, providing +# your hosting service use supported protocols. +# +# Known service name is: SOURCEFORGE. +# +# Protocol is the protocol used to upload file. +# Supported protocol is: SFTP. +# +# PropertyName is a property that is needed to preform the upload. +# It is usually associate to the Protocol. +# +# For protocol SFTP: +# USER: the user name for sftp. +# SITE: the host name of the sftp site. +# BATCH: File that stores the batch commands. +# BATCH_TEMPATE: File that provides template to for generating +# batch commands. +# If BATCH is also given: Generated batch file is named +# as defined with BATCH; +# if BATCH is not given: Generated batch file is named +# as ${CMAKE_BINARY_DIR}/BatchUpload-${ServiceName} +# OPTIONS: List of options for sftp. +# +# Example +# For a hosting service "Host1" with git, +# while uploading the source package to "Host2" with sftp. +# The setting file might looks as follows: +# +# SOURCE_VERSION_CONTROL=git +# # No, Host1 is not needed here. +# HOSTING_SERVICES=Host2 +# +# Host2_SFTP_USER=host2account +# Host2_SFTP_SITE=host2hostname +# Host2_SFTP_BATCH_TEMPLATE=BatchUpload-Host2.in +# + +IF(NOT DEFINED _USE_HOSTING_SERVICE_CMAKE_) + SET(_USE_HOSTING_SERVICE_CMAKE_ "DEFINED") + MACRO(USE_HOSTING_SERVICE_SFTP alias user site) + SET(_stage "NONE") + FOREACH(_arg ${ARGN}) + IF(_arg STREQUAL "BATCH") + SET(_stage "BATCH") + ELSEIF(_arg STREQUAL "BATCH_TEMPLATE") + SET(_stage "BATCH_TEMPLATE") + ELSEIF(_arg STREQUAL "OPTIONS") + SET(_stage "OPTIONS") + ELSE(_arg STREQUAL "BATCH") + IF(_stage STREQUAL "BATCH") + SET(_batch ${_arg}) + SET(_stage "NONE") + ELSEIF(_stage STREQUAL "BATCH_TEMPLATE") + SET(_batch_template ${_arg}) + SET(_stage "NONE") + ELSEIF(_stage STREQUAL "OPTIONS") + SET(_optionStr "${_optionStr} ${_arg}") + ELSE(_stage STREQUAL "BATCH") + MESSAGE(FATAL_ERROR "Invalid option (${_arg}) for USE_HOSTING_SERVICE_SFTP!") + ENDIF(_stage STREQUAL "SERVER_TYPE") + ENDIF(_arg STREQUAL "SERVER_TYPE") + ENDFOREACH(_arg ${ARGN}) + SET(_developer_upload_cmd "sftp") + IF(_batch_template) + IF(NOT _batch) + SET(_batch ${CMAKE_BINARY_DIR}/BatchUpload-${alias}) + ENDIF(NOT _batch) + CONFIGURE_FILE(${_batch_template} ${_batch}) + SET(PACK_SOURCE_IGNORE_FILES ${PACK_SOURCE_IGNORE_FILES} ${_batch}) + ENDIF(_batch_template) + + IF(_batch STREQUAL "") + SET(_developer_upload_cmd "${_developer_upload_cmd} -b ${_batch}" ) + ENDIF(_batch STREQUAL "") + + IF(_optionStr) + SET(_developer_upload_cmd "${_developer_upload_cmd} -F ${_optionStr}" ) + ENDIF(_optionStr) + SET(_developer_upload_cmd "${_developer_upload_cmd} ${user}@${site}") + + ADD_CUSTOM_TARGET(upload_${alias} + COMMAND ${_developer_upload_cmd} + DEPENDS ${DEVELOPER_DEPENDS} + COMMENT "Uploading the package releases to ${alias}..." + VERBATIM + ) + ENDMACRO(USE_HOSTING_SERVICE_SFTP user site) + + MACRO(USE_HOSTING_SERVICE_GOOGLE_UPLOAD) + FIND_PROGRAM(CURL_CMD curl) + IF(CURL_CMD STREQUAL "CURL_CMD-NOTFOUND") + MESSAGE(FATAL_ERROR "Need curl to perform google upload") + ENDIF(CURL_CMD STREQUAL "CURL_CMD-NOTFOUND") + ENDMACRO(USE_HOSTING_SERVICE_GOOGLE_UPLOAD) + + MACRO(USE_HOSTING_SERVICE_READ_SETTING_FILE filename) + IF(EXISTS "${filename}") + INCLUDE(ManageVariable) + INCLUDE(ManageVersion) + SETTING_FILE_GET_ALL_ATTRIBUTES("${filename}" UNQUOTED) + + #=================================================================== + # Targets: + ADD_CUSTOM_TARGET(upload + COMMENT "Uploading source to hosting services" + ) + + ADD_CUSTOM_TARGET(changelog_update + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/ChangeLog ${CMAKE_SOURCE_DIR}/ChangeLog.prev + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/${RPM_BUILD_SPECS}/RPM-ChangeLog + ${CMAKE_SOURCE_DIR}/${RPM_BUILD_SPECS}/RPM-ChangeLog.prev + COMMENT "Changelogs are updated for next version." + ) + + IF(SOURCE_VERSION_CONTROL STREQUAL "git") + ADD_CUSTOM_TARGET(tag + COMMAND git tag -a -m "${CHANGE_SUMMARY}" "${PRJ_VER}" HEAD + COMMENT "Tagging the source as ver ${PRJ_VER}" + ) + ADD_DEPENDENCIES(tag version_check) + ELSEIF(SOURCE_VERSION_CONTROL STREQUAL "hg") + ADD_CUSTOM_TARGET(tag + COMMAND hg tag -m "${CHANGE_SUMMARY}" "${PRJ_VER}" + COMMENT "Tagging the source as ver ${PRJ_VER}" + ) + ADD_DEPENDENCIES(tag version_check) + ELSEIF(SOURCE_VERSION_CONTROL STREQUAL "svn") + IF(DEFINED SOURCE_BASE_URL) + ADD_CUSTOM_TARGET(tag + COMMAND svn copy "${SOURCE_BASE_URL}/trunk" "${SOURCE_BASE_URL}/tags/${PRJ_VER}" -m "${CHANGE_SUMMARY}" + COMMENT "Tagging the source as ver ${PRJ_VER}" + ) + ENDIF(DEFINED SOURCE_BASE_URL) + ADD_DEPENDENCIES(tag version_check) + ELSEIF(SOURCE_VERSION_CONTROL STREQUAL "cvs") + ADD_CUSTOM_TARGET(tag + COMMAND cvs tag "${PRJ_VER}" + COMMENT "Tagging the source as ver ${PRJ_VER}" + ) + ADD_DEPENDENCIES(tag version_check) + ENDIF(SOURCE_VERSION_CONTROL STREQUAL "git") + + # Setting for each hosting service + FOREACH(_service ${HOSTING_SERVICES}) + IF(_service STREQUAL "SOURCEFORGE") + USE_HOSTING_SERVICE_SFTP("${_service}" ${SOURCEFORGE_SFTP_USER} + frs.sourceforge.net + BATCH ${SOURCEFORGE_SFTP_BATCH} + BATCH_TEMPLATE ${SOURCEFORGE_SFTP_BATCH_TEMPLATE} + OPTIONS ${SOURCEFORGE_SFTP_OPTIONS}) + ELSEIF(_service STREQUAL "GOOGLECODE") + USE_HOSTING_SERVICE_GOOGLE_UPLOAD() + ELSEIF(_service STREQUAL "GITHUB") + ELSE(_service STREQUAL "SOURCEFORGE") + # Generic hosting service + IF(NOT "${${_service}_SFTP_USER}" STREQUAL "") + USE_HOSTING_SERVICE_SFTP("${_service}" ${${_service}_SFTP_USER} + ${${_service}_SFTP_SITE} + BATCH ${${_service}_SFTP_BATCH} + BATCH_TEMPLATE ${${_service}_SFTP_BATCH_TEMPLATE} + OPTIONS ${${_service}_SFTP_OPTIONS}) + # SFTP hosting service + ENDIF(NOT "${${_service}_SFTP_USER}" STREQUAL "") + ENDIF(_service STREQUAL "SOURCEFORGE") + ADD_DEPENDENCIES(upload "upload_${_service}") + + ENDFOREACH(_service ${HOSTING_SERVICES}) + + ENDIF(EXISTS "${filename}") + + ENDMACRO(USE_HOSTING_SERVICE_READ_SETTING_FILE filename) + +ENDIF(NOT DEFINED _USE_HOSTING_SERVICE_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/UseUninstall.cmake ibus-chewing-1.3.7.20100910/cmake_modules/UseUninstall.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/UseUninstall.cmake 1970-01-01 00:00:00.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/UseUninstall.cmake 2010-09-10 14:02:04.000000000 +0000 @@ -0,0 +1,26 @@ +# - Uninstall target. +# Use this module to provide unstall target. +# +# Define following targets +# uninstall: For uninstalling the package. +# + +IF(NOT DEFINED _USE_UNINSTALL_CMAKE_) + SET(_USE_UNINSTALL_CMAKE_ "DEFINED") + FIND_FILE(_cmake_uninstall_in cmake_uninstall.cmake.in + PATHS ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/cmake_modules ${CMAKE_MODULE_PATH} ${CMAKE_INCLUDE_PATH}) + + IF("${_cmake_uninstall_in}" STREQUAL "_cmake_uninstall_in-NOTFOUND") + MESSAGE(FATAL_ERROR "Cannot find cmake_uninstall.cmake.in in ${CMAKE_SOURCE_DIR} " + "${CMAKE_SOURCE_DIR}/cmake_modules ${CMAKE_MODULE_PATH} ${CMAKE_INCLUDE_PATH}") + ENDIF("${_cmake_uninstall_in}" STREQUAL "_cmake_uninstall_in-NOTFOUND") + + CONFIGURE_FILE("${_cmake_uninstall_in}" + "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + IMMEDIATE @ONLY) + + ADD_CUSTOM_TARGET(uninstall + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" + ) +ENDIF(NOT DEFINED _USE_UNINSTALL_CMAKE_) + diff -Nru ibus-chewing-1.3.6.20100730/cmake_modules/Version.cmake ibus-chewing-1.3.7.20100910/cmake_modules/Version.cmake --- ibus-chewing-1.3.6.20100730/cmake_modules/Version.cmake 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_modules/Version.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# Version: Handle version -# -# To use: INCLUDE(Version) -# Includes: BasicMacros -# -#=================================================================== -# Variables: -# RELEASE_FILE: File that contain version information -# PRJ_VER_PATTERN: Version for source tarball, program display, etc. -# Default: ${PRJ_VER_MAJOR}.${PRJ_VER_MINOR}.${PRJ_VER_PATCH}) -# PRJ_VER_FULL: Version for rpms. -# Default: ${PRJ_VER}-${PRJ_VER_RELEASE}) -#=================================================================== -# Targets: -# version_check: -# Check and fix the inconsistent version. -# - -IF(NOT DEFINED _VERSION_CMAKE_) - SET(_VERSION_CMAKE_ "DEFINED") - IF(NOT DEFINED RELEASE_FILE) - SET(RELEASE_FILE RELEASE-NOTES) - ENDIF(NOT DEFINED RELEASE_FILE) - INCLUDE(BasicMacros) - - IF(EXISTS ${RELEASE_FILE}) - SETTING_FILE_GET_ATTRIBUTE(_prj_ver "PRJ_VER" ${RELEASE_FILE}) - IF(_prj_ver) - SET(PRJ_VER_PATTERN ${_prj_ver} CACHE INTERNAL "PRJ_VER") - ENDIF(_prj_ver) - # MESSAGE("### -1 PRJ_VER=${PRJ_VER}") - ENDIF(EXISTS ${RELEASE_FILE}) - - IF(NOT DEFINED PRJ_VER_PATTERN) - SET(PRJ_VER ${PRJ_VER_MAJOR}.${PRJ_VER_MINOR}.${PRJ_VER_PATCH} CACHE - INTERNAL "PRJ_VER") - ELSE(NOT DEFINED PRJ_VER_PATTERN) - SET(PRJ_VER ${PRJ_VER_PATTERN} CACHE INTERNAL "PRJ_VER") - ENDIF(NOT DEFINED PRJ_VER_PATTERN) - - - IF(NOT DEFINED PRJ_VER_FULL) - SET(PRJ_VER_FULL ${PRJ_VER}-${PRJ_VER_RELEASE}) - ENDIF(NOT DEFINED PRJ_VER_FULL) - - SET(_version_check_ver grep -e 'PRJ_VER=' ${RELEASE_FILE} | tr -d '\\r\\n' | sed -e s/PRJ_VER=//) - ADD_CUSTOM_TARGET(version_check - COMMAND ${CMAKE_COMMAND} -E echo "PRJ_VER=${PRJ_VER}" - COMMAND ${CMAKE_COMMAND} -E echo "Release file="`eval \"${_version_check_ver}\"` - COMMAND test \"`${_version_check_ver}`\" = \"\" -o \"`${_version_check_ver}`\" = "${PRJ_VER}" - || echo Inconsistent version detected. Fixing.. && ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR} - ) - -ENDIF(NOT DEFINED _VERSION_CMAKE_) - diff -Nru ibus-chewing-1.3.6.20100730/cmake_uninstall.cmake.in ibus-chewing-1.3.7.20100910/cmake_uninstall.cmake.in --- ibus-chewing-1.3.6.20100730/cmake_uninstall.cmake.in 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/cmake_uninstall.cmake.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") -ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - -FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) -STRING(REGEX REPLACE "\n" ";" files "${files}") -FOREACH(file ${files}) - MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"") - IF(EXISTS "$ENV{DESTDIR}${file}") - EXEC_PROGRAM( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) - IF(NOT "${rm_retval}" STREQUAL 0) - MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"") - ENDIF(NOT "${rm_retval}" STREQUAL 0) - ELSE(EXISTS "$ENV{DESTDIR}${file}") - MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.") - ENDIF(EXISTS "$ENV{DESTDIR}${file}") -ENDFOREACH(file) diff -Nru ibus-chewing-1.3.6.20100730/common.CMakeLists.txt ibus-chewing-1.3.7.20100910/common.CMakeLists.txt --- ibus-chewing-1.3.6.20100730/common.CMakeLists.txt 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/common.CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -#################################################################### -# CMake common setting. -# -# Project independent setting. -# -# Optional Variables: -# -# SET(GENERATE_DOXYFILE TRUE) -# Generate doxyfile from doxyfile.in -# -# SET(ENABLE_GTKDOC TRUE) -# SET(GTKDOC_OUTPUT_DIR ) -# Enable gtk-doc -# -# SET(GENERATE_UPLOADPKG_BATCH TRUE) -# Generate UploadPkg.batch for Uploading to hosting host -# -#################################################################### -INCLUDE(Version) - -ADD_DEFINITIONS(-DPROJECT_NAME='"${PROJECT_NAME}"') - -IF(NOT DEFINED PROJECT_DATADIR) - SET(PROJECT_DATADIR "${datadir}/${PROJECT_NAME}") -ENDIF(NOT DEFINED PROJECT_DATADIR) -ADD_DEFINITIONS(-DPROJECT_DATADIR='"${PROJECT_DATADIR}"') - -IF(NOT DEFINED PROJECT_DOCDIR) - SET(PROJECT_DOCDIR "${docdir}/${PROJECT_NAME}-${PRJ_VER}") -ENDIF(NOT DEFINED PROJECT_DOCDIR) - -ADD_DEFINITIONS(-DPRJ_VERSION='"${PRJ_VER_FULL}"') - -# Load developer targets if DEVELOPER_SETTING_FILE exists -IF(EXISTS ${DEVELOPER_SETTING_FILE}) - INCLUDE(Developer) - SETTING_FILE_GET_ATTRIBUTE(SSH_USER SSH_USER ${DEVELOPER_SETTING_FILE}) - SETTING_FILE_GET_ATTRIBUTE(SSH_ARGS SSH_ARGS ${DEVELOPER_SETTING_FILE}) - SETTING_FILE_GET_ATTRIBUTE(KOJI_CVS_PATH KOJI_CVS_PATH ${DEVELOPER_SETTING_FILE}) - - # Start next version - ADD_CUSTOM_TARGET(next_version - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/ChangeLog ${CMAKE_SOURCE_DIR}/ChangeLog.prev - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/SPECS/RPM-ChangeLog - ${CMAKE_SOURCE_DIR}/SPECS/RPM-ChangeLog.prev - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/SPECS/RPM-RELEASE-NOTES.template - ${CMAKE_SOURCE_DIR}/SPECS/RPM-RELEASE-NOTES.txt - ) -ENDIF(EXISTS ${DEVELOPER_SETTING_FILE}) - -#================================================================== -# Configure files -# - -IF (GENERATE_UPLOADPKG_BATCH) - CONFIGURE_FILE(UploadPkg.batch.in UploadPkg.batch) -ENDIF() - -FILE(READ ${CMAKE_SOURCE_DIR}/ChangeLog.prev CHANGELOG_PREV) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/ChangeLog.in ${CMAKE_SOURCE_DIR}/ChangeLog) -FILE(READ ${CMAKE_SOURCE_DIR}/SPECS/RPM-ChangeLog.prev RPM_CHANGELOG_PREV) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/SPECS/RPM-ChangeLog.in ${CMAKE_SOURCE_DIR}/SPECS/RPM-ChangeLog) - -#================================================================== -# Make uninstall -# -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - ) - -#==================================================================== -# Package handling -# - -SET(CPACK_PACKAGE_VENDOR "Red Hat, APAC, Inc.") -SET(CPACK_PACKAGE_VERSION ${PRJ_VER}) -SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") -SET(SOURCE_TARBALL_OUTPUT_DIR "${CMAKE_BINARY_DIR}/SOURCES") -SET(MY_IGNORE_FILES "/BUILDROOT/") -SET(CPACK_PACKAGE_IGNORE_FILES ${MY_IGNORE_FILES}) -SET(CPACK_SOURCE_IGNORE_FILES ${MY_IGNORE_FILES}) - -IF(EXISTS ${DEVELOPER_SETTING_FILE}) - INCLUDE(FedoraDeveloper) - ELSE(EXISTS ${DEVELOPER_SETTING_FILE}) - INCLUDE(RPM) -ENDIF(EXISTS ${DEVELOPER_SETTING_FILE}) - -#==================================================================== -# Doxygen Document generation -# -IF (GENERATE_DOXYFILE) - CONFIGURE_FILE(Doxyfile.in Doxyfile) -ENDIF() - -IF (EXISTS Doxyfile) - FIND_PACKAGE(Doxygen) - ADD_CUSTOM_TARGET(doxygen - COMMAND "${DOXYGEN}" "Doxyfile" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - ) - INSTALL(DIRECTORY doc/html - DESTINATION "${docdir}/${PROJECT_NAME}-${PRJ_VER}" - ) -ENDIF() - diff -Nru ibus-chewing-1.3.6.20100730/data/chewing.xml.in ibus-chewing-1.3.7.20100910/data/chewing.xml.in --- ibus-chewing-1.3.6.20100730/data/chewing.xml.in 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/data/chewing.xml.in 2010-09-10 14:02:04.000000000 +0000 @@ -3,7 +3,7 @@ org.freedesktop.IBus.Chewing Chewing Component - @PRJ_VER_FULL@ + @PRJ_VER@ GPLv2+ Peng Huang, Ding-Yi Chen http://code.google.com/p/ibus @@ -17,8 +17,9 @@ zh_TW GPLv2+ Peng Huang, Ding-Yi Chen - @PROJECT_DATADIR@/icons/@PROJECT_NAME@.png + @PROJECT_DATA_DIR@/icons/@PROJECT_NAME@.png us + 80 diff -Nru ibus-chewing-1.3.6.20100730/debian/changelog ibus-chewing-1.3.7.20100910/debian/changelog --- ibus-chewing-1.3.6.20100730/debian/changelog 2010-08-14 16:37:27.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/debian/changelog 2010-11-10 14:15:46.000000000 +0000 @@ -1,3 +1,23 @@ +ibus-chewing (1.3.7.20100910-1hychen1) maverick; urgency=low + + [ Hsin-Yi Chen ] + * New upstream release in Natty backport to Maverick + + -- Hsin-Yi Chen (hychen) Wed, 10 Nov 2010 22:14:29 +0800 + +ibus-chewing (1.3.7.20100910-1) unstable; urgency=low + + [ Asias He ] + * New upstream release. + * debian/watch: use googlecode.debian.net + + [ LI Daobing ] + * debian/rules: fix install path of gconf. + * debian/clean: updated. + * debian/control: build depends on rpm. + + -- LI Daobing Mon, 13 Sep 2010 23:05:30 +0800 + ibus-chewing (1.3.6.20100730-1) unstable; urgency=low [ Asias He ] diff -Nru ibus-chewing-1.3.6.20100730/debian/clean ibus-chewing-1.3.7.20100910/debian/clean --- ibus-chewing-1.3.6.20100730/debian/clean 2010-08-09 14:46:09.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/debian/clean 2010-09-13 14:56:51.000000000 +0000 @@ -10,3 +10,6 @@ po/cmake_install.cmake data/chewing.xml data/ibus-chewing.schemas +RELEASE-NOTES.txt_NO_PACK_CHANGELOG_ITEM +RELEASE-NOTES.txt_NO_PACK_HEAD +SPECS/RPM-ChangeLog diff -Nru ibus-chewing-1.3.6.20100730/debian/control ibus-chewing-1.3.7.20100910/debian/control --- ibus-chewing-1.3.6.20100730/debian/control 2010-08-09 14:46:09.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/debian/control 2010-09-13 15:05:26.000000000 +0000 @@ -12,7 +12,8 @@ libibus-dev (>= 1.2.99), libgtk2.0-dev, libx11-dev, - libxtst-dev + libxtst-dev, + rpm Standards-Version: 3.9.1 Homepage: http://code.google.com/p/ibus Vcs-Bzr: lp:~pkg-ime/ibus/debian-ibus-chewing diff -Nru ibus-chewing-1.3.6.20100730/debian/rules ibus-chewing-1.3.7.20100910/debian/rules --- ibus-chewing-1.3.6.20100730/debian/rules 2010-08-09 14:46:09.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/debian/rules 2010-09-13 14:50:02.000000000 +0000 @@ -6,7 +6,9 @@ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \ - -DLIBEXEC_DIR=/usr/lib/ibus-chewing . + -DLIBEXEC_DIR=/usr/lib/ibus-chewing \ + -DSYSCONF_INSTALL_DIR=/usr/share \ + . dh build touch $@ diff -Nru ibus-chewing-1.3.6.20100730/debian/watch ibus-chewing-1.3.7.20100910/debian/watch --- ibus-chewing-1.3.6.20100730/debian/watch 2010-08-09 14:46:09.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/debian/watch 2010-09-13 14:35:17.000000000 +0000 @@ -1,4 +1,3 @@ version=3 -opts=downloadurlmangle=s#.*(ibus-chewing-([\d.]+)-Source\.tar\.gz).*#http://ibus.googlecode.com/files/$1#,filenamemangle=s#.*(ibus-chewing-([\d.]+)-Source\.tar\.gz).*#$1# \ - http://code.google.com/p/ibus/downloads/list ^.*detail\?name=ibus-chewing-([\d.]+)-Source\.tar\.gz.* +http://googlecode.debian.net/p/ibus/ibus-chewing-([\d.]+)-Source\.tar\.gz diff -Nru ibus-chewing-1.3.6.20100730/init.CMakeLists.txt ibus-chewing-1.3.7.20100910/init.CMakeLists.txt --- ibus-chewing-1.3.6.20100730/init.CMakeLists.txt 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/init.CMakeLists.txt 2010-09-10 14:02:04.000000000 +0000 @@ -14,59 +14,4 @@ ENDIF(COMMAND cmake_policy) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake_modules) -SET(ENV{LC_ALL} "C") -INCLUDE(BasicMacros) - -###================================================================== -# Find parameters configuration -# -# Note: CMake 2.4 does not support STRING(STRIP ..) - -DATE_FORMAT(DATE "+%a %b %d %Y") -DATE_FORMAT(DATE_SHORT "+%Y%m%d") -#MESSAGE("DATE=${DATE}|") -#MESSAGE("DATE_SHORT=${DATE_SHORT}|") - -###================================================================== -# Directories -# - -ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX='"${CMAKE_INSTALL_PREFIX}"') - -IF(NOT DEFINED datadir) - SET(datadir "${CMAKE_INSTALL_PREFIX}/share") -ENDIF() -ADD_DEFINITIONS(-DDATADIR='"${datadir}"') - -IF(NOT DEFINED docdir) - SET(docdir "${datadir}/doc") -ENDIF() -ADD_DEFINITIONS(-DDOCDIR='"${docdir}"') - -IF(NOT DEFINED SYSCONF_INSTALL_DIR) - SET(SYSCONF_INSTALL_DIR "/etc") -ENDIF() -ADD_DEFINITIONS(-DSYSCONFDIR='"${SYSCONF_INSTALL_DIR}"') - -IF(NOT DEFINED LIBEXEC_DIR) - SET(LIBEXEC_DIR "${CMAKE_INSTALL_PREFIX}/libexec") -ENDIF() -ADD_DEFINITIONS(-DLIBEXEC_DIR='"${LIBEXEC_DIR}"') - -IF(NOT DEFINED IS_64) - IF( $ENV{MACHTYPE} MATCHES "64") - SET(IS_64 "64") - ELSE() - SET(IS_64 "") - ENDIF() -ENDIF() -ADD_DEFINITIONS(-DIS_64='"${IS64}"') - -###================================================================== -# CPack Generator -# RPM and pack need them, so declare here. -# -SET(CPACK_GENERATOR "TGZ") -SET(CPACK_SOURCE_GENERATOR "TGZ") - diff -Nru ibus-chewing-1.3.6.20100730/po/CMakeLists.txt ibus-chewing-1.3.7.20100910/po/CMakeLists.txt --- ibus-chewing-1.3.6.20100730/po/CMakeLists.txt 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/po/CMakeLists.txt 2010-09-10 14:02:04.000000000 +0000 @@ -1,9 +1,7 @@ # Translated languages. SET(SOURCES_I18N ../src/IBusChewingEngine.gob ../src/IBusChewingEngine-def.c ../src/main.c) -IF (XGETTEXT_FOUND) - GETTEXT_CREATE_POT(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${SOURCES_I18N}) - GETTEXT_CREATE_TRANSLATIONS(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pot ALL ${TRANSLATED} - COMMENT "Creating translations.") -ENDIF() +GETTEXT_CREATE_POT(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pot OPTIONS ${XGETTEXT_OPTIONS_C} SRC ${SOURCES_I18N}) +GETTEXT_CREATE_TRANSLATIONS(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pot ALL ${TRANSLATED} + COMMENT "Creating translations.") diff -Nru ibus-chewing-1.3.6.20100730/po/ibus-chewing.pot ibus-chewing-1.3.7.20100910/po/ibus-chewing.pot --- ibus-chewing-1.3.6.20100730/po/ibus-chewing.pot 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/po/ibus-chewing.pot 2010-09-10 14:02:04.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ibus-chewing 1.3.6.20100729\n" +"Project-Id-Version: ibus-chewing 1.3.7.20100910\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-30 16:44+1000\n" +"POT-Creation-Date: 2010-09-11 00:02+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,15 +24,15 @@ msgid " Use default value:" msgstr "" -#: ../src/IBusChewingEngine-def.c:279 +#: ../src/IBusChewingEngine-def.c:281 msgid "Add phrases in front" msgstr "" -#: ../src/IBusChewingEngine-def.c:283 +#: ../src/IBusChewingEngine-def.c:285 msgid "Add phrases in the front." msgstr "" -#: ../src/IBusChewingEngine-def.c:329 +#: ../src/IBusChewingEngine-def.c:331 msgid "Always input numbers when number keys from key pad is inputted." msgstr "" @@ -40,11 +40,11 @@ msgid "Auto" msgstr "" -#: ../src/IBusChewingEngine-def.c:273 +#: ../src/IBusChewingEngine-def.c:275 msgid "Auto move cursor" msgstr "" -#: ../src/IBusChewingEngine-def.c:277 +#: ../src/IBusChewingEngine-def.c:279 msgid "Automatically move cursor to next character." msgstr "" @@ -52,7 +52,7 @@ msgid "Big5" msgstr "" -#: ../src/IBusChewingEngine-def.c:348 +#: ../src/IBusChewingEngine-def.c:358 msgid "Candidate per page" msgstr "" @@ -68,19 +68,19 @@ msgid "Chi" msgstr "" -#: ../src/IBusChewingEngine-def.c:354 +#: ../src/IBusChewingEngine-def.c:364 msgid "Choose phrases from backward" msgstr "" -#: ../src/IBusChewingEngine-def.c:358 +#: ../src/IBusChewingEngine-def.c:368 msgid "Choose phrases from the back, without moving cursor." msgstr "" -#: ../src/IBusChewingEngine-def.c:285 +#: ../src/IBusChewingEngine-def.c:287 msgid "Easy symbol input" msgstr "" -#: ../src/IBusChewingEngine-def.c:289 +#: ../src/IBusChewingEngine-def.c:291 msgid "Easy symbol input." msgstr "" @@ -92,15 +92,15 @@ msgid "Eng" msgstr "" -#: ../src/IBusChewingEngine-def.c:291 +#: ../src/IBusChewingEngine-def.c:293 msgid "Esc clean all buffer" msgstr "" -#: ../src/IBusChewingEngine-def.c:295 +#: ../src/IBusChewingEngine-def.c:297 msgid "Escape key cleans the text in pre-edit-buffer." msgstr "" -#: ../src/IBusChewingEngine-def.c:303 +#: ../src/IBusChewingEngine-def.c:305 msgid "Force lowercase in En mode" msgstr "" @@ -112,32 +112,32 @@ msgid "Half" msgstr "" -#: ../src/IBusChewingEngine-def.c:270 +#: ../src/IBusChewingEngine-def.c:272 msgid "Hsu's keyboard selection keys, 1 for asdfjkl789, 2 for asdfzxcv89 ." msgstr "" -#: ../src/IBusChewingEngine-def.c:266 +#: ../src/IBusChewingEngine-def.c:268 msgid "Hsu's selection key" msgstr "" -#: ../src/IBusChewingEngine-def.c:307 +#: ../src/IBusChewingEngine-def.c:309 msgid "" "Ignore CapsLock status and input lowercase by default.\n" "It is handy if you wish to enter lowercase by default. Uppercase can still " "be inputted with Shift." msgstr "" -#: ../src/IBusChewingEngine-def.c:346 +#: ../src/IBusChewingEngine-def.c:356 msgid "" "In plain Zhuyin mode, automatic candidate selection and related options are " "disabled or ignored." msgstr "" -#: ../src/IBusChewingEngine-def.c:332 +#: ../src/IBusChewingEngine-def.c:341 msgid "Input Style" msgstr "" -#: ../src/IBusChewingEngine-def.c:337 +#: ../src/IBusChewingEngine-def.c:346 msgid "" "Input style determines where the preedit strings be shown and edited.\n" "\"in application window\": Preedit strings are edited on the target " @@ -150,35 +150,35 @@ msgid "Keyboard" msgstr "" -#: ../src/IBusChewingEngine-def.c:254 +#: ../src/IBusChewingEngine-def.c:256 msgid "Keyboard Type" msgstr "" -#: ../src/IBusChewingEngine-def.c:264 +#: ../src/IBusChewingEngine-def.c:266 msgid "" "Keys used to select candidate. For example \"asdfghjkl;\", press 'a' to " "select the 1st candidate, 's' for 2nd, and so on." msgstr "" -#: ../src/IBusChewingEngine-def.c:297 +#: ../src/IBusChewingEngine-def.c:299 msgid "Maximum Chinese characters" msgstr "" -#: ../src/IBusChewingEngine-def.c:301 +#: ../src/IBusChewingEngine-def.c:303 msgid "" "Maximum Chinese characters in pre-edit buffer, including inputing Zhuyin " "symbols" msgstr "" -#: ../src/IBusChewingEngine-def.c:352 +#: ../src/IBusChewingEngine-def.c:362 msgid "Number of candidate per page." msgstr "" -#: ../src/IBusChewingEngine-def.c:325 +#: ../src/IBusChewingEngine-def.c:327 msgid "Number pad always input number" msgstr "" -#: ../src/IBusChewingEngine-def.c:318 +#: ../src/IBusChewingEngine-def.c:320 msgid "" "Occasionally, the CapsLock status does not match the IM, this option " "determines how these status be synchronized. Valid values:\n" @@ -191,11 +191,11 @@ msgid "Peng Huang, Ding-Yi Chen" msgstr "" -#: ../src/IBusChewingEngine-def.c:342 +#: ../src/IBusChewingEngine-def.c:352 msgid "Plain Zhuyin mode" msgstr "" -#: ../src/IBusChewingEngine-def.c:258 +#: ../src/IBusChewingEngine-def.c:260 msgid "Select Zhuyin keyboard layout." msgstr "" @@ -203,7 +203,7 @@ msgid "Selecting" msgstr "" -#: ../src/IBusChewingEngine-def.c:260 +#: ../src/IBusChewingEngine-def.c:262 msgid "Selection keys" msgstr "" @@ -215,11 +215,11 @@ msgid "Settings" msgstr "" -#: ../src/IBusChewingEngine-def.c:360 +#: ../src/IBusChewingEngine-def.c:370 msgid "Space to select" msgstr "" -#: ../src/IBusChewingEngine-def.c:312 +#: ../src/IBusChewingEngine-def.c:314 msgid "Sync between CapsLock and IM" msgstr "" diff -Nru ibus-chewing-1.3.6.20100730/po/zh_CN.po ibus-chewing-1.3.7.20100910/po/zh_CN.po --- ibus-chewing-1.3.6.20100730/po/zh_CN.po 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/po/zh_CN.po 2010-09-10 14:02:04.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-28 15:35+1000\n" +"POT-Creation-Date: 2010-09-10 23:46+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Peng Huang \n" "Language-Team: LANGUAGE \n" @@ -24,16 +24,16 @@ msgid " Use default value:" msgstr " 使用缺省值：" -#: ../src/IBusChewingEngine-def.c:279 +#: ../src/IBusChewingEngine-def.c:281 msgid "Add phrases in front" msgstr "前方加词" -#: ../src/IBusChewingEngine-def.c:283 +#: ../src/IBusChewingEngine-def.c:285 #, fuzzy msgid "Add phrases in the front." msgstr "前方加词" -#: ../src/IBusChewingEngine-def.c:329 +#: ../src/IBusChewingEngine-def.c:331 msgid "Always input numbers when number keys from key pad is inputted." msgstr "" @@ -41,11 +41,11 @@ msgid "Auto" msgstr "" -#: ../src/IBusChewingEngine-def.c:273 +#: ../src/IBusChewingEngine-def.c:275 msgid "Auto move cursor" msgstr "自动移游标下一个字" -#: ../src/IBusChewingEngine-def.c:277 +#: ../src/IBusChewingEngine-def.c:279 msgid "Automatically move cursor to next character." msgstr "" @@ -53,7 +53,7 @@ msgid "Big5" msgstr "" -#: ../src/IBusChewingEngine-def.c:348 +#: ../src/IBusChewingEngine-def.c:358 msgid "Candidate per page" msgstr "" @@ -70,19 +70,19 @@ msgid "Chi" msgstr "中" -#: ../src/IBusChewingEngine-def.c:354 +#: ../src/IBusChewingEngine-def.c:364 msgid "Choose phrases from backward" msgstr "" -#: ../src/IBusChewingEngine-def.c:358 +#: ../src/IBusChewingEngine-def.c:368 msgid "Choose phrases from the back, without moving cursor." msgstr "" -#: ../src/IBusChewingEngine-def.c:285 +#: ../src/IBusChewingEngine-def.c:287 msgid "Easy symbol input" msgstr "" -#: ../src/IBusChewingEngine-def.c:289 +#: ../src/IBusChewingEngine-def.c:291 msgid "Easy symbol input." msgstr "" @@ -94,15 +94,15 @@ msgid "Eng" msgstr "英" -#: ../src/IBusChewingEngine-def.c:291 +#: ../src/IBusChewingEngine-def.c:293 msgid "Esc clean all buffer" msgstr "" -#: ../src/IBusChewingEngine-def.c:295 +#: ../src/IBusChewingEngine-def.c:297 msgid "Escape key cleans the text in pre-edit-buffer." msgstr "" -#: ../src/IBusChewingEngine-def.c:303 +#: ../src/IBusChewingEngine-def.c:305 msgid "Force lowercase in En mode" msgstr "" @@ -114,32 +114,32 @@ msgid "Half" msgstr "半" -#: ../src/IBusChewingEngine-def.c:270 +#: ../src/IBusChewingEngine-def.c:272 msgid "Hsu's keyboard selection keys, 1 for asdfjkl789, 2 for asdfzxcv89 ." msgstr "" -#: ../src/IBusChewingEngine-def.c:266 +#: ../src/IBusChewingEngine-def.c:268 msgid "Hsu's selection key" msgstr "" -#: ../src/IBusChewingEngine-def.c:307 +#: ../src/IBusChewingEngine-def.c:309 msgid "" "Ignore CapsLock status and input lowercase by default.\n" "It is handy if you wish to enter lowercase by default. Uppercase can still " "be inputted with Shift." msgstr "" -#: ../src/IBusChewingEngine-def.c:346 +#: ../src/IBusChewingEngine-def.c:356 msgid "" "In plain Zhuyin mode, automatic candidate selection and related options are " "disabled or ignored." msgstr "" -#: ../src/IBusChewingEngine-def.c:332 +#: ../src/IBusChewingEngine-def.c:341 msgid "Input Style" msgstr "" -#: ../src/IBusChewingEngine-def.c:337 +#: ../src/IBusChewingEngine-def.c:346 msgid "" "Input style determines where the preedit strings be shown and edited.\n" "\"in application window\": Preedit strings are edited on the target " @@ -152,36 +152,36 @@ msgid "Keyboard" msgstr "" -#: ../src/IBusChewingEngine-def.c:254 +#: ../src/IBusChewingEngine-def.c:256 #, fuzzy msgid "Keyboard Type" msgstr "键盘" -#: ../src/IBusChewingEngine-def.c:264 +#: ../src/IBusChewingEngine-def.c:266 msgid "" "Keys used to select candidate. For example \"asdfghjkl;\", press 'a' to " "select the 1st candidate, 's' for 2nd, and so on." msgstr "" -#: ../src/IBusChewingEngine-def.c:297 +#: ../src/IBusChewingEngine-def.c:299 msgid "Maximum Chinese characters" msgstr "" -#: ../src/IBusChewingEngine-def.c:301 +#: ../src/IBusChewingEngine-def.c:303 msgid "" "Maximum Chinese characters in pre-edit buffer, including inputing Zhuyin " "symbols" msgstr "" -#: ../src/IBusChewingEngine-def.c:352 +#: ../src/IBusChewingEngine-def.c:362 msgid "Number of candidate per page." msgstr "" -#: ../src/IBusChewingEngine-def.c:325 +#: ../src/IBusChewingEngine-def.c:327 msgid "Number pad always input number" msgstr "" -#: ../src/IBusChewingEngine-def.c:318 +#: ../src/IBusChewingEngine-def.c:320 msgid "" "Occasionally, the CapsLock status does not match the IM, this option " "determines how these status be synchronized. Valid values:\n" @@ -194,11 +194,11 @@ msgid "Peng Huang, Ding-Yi Chen" msgstr "" -#: ../src/IBusChewingEngine-def.c:342 +#: ../src/IBusChewingEngine-def.c:352 msgid "Plain Zhuyin mode" msgstr "" -#: ../src/IBusChewingEngine-def.c:258 +#: ../src/IBusChewingEngine-def.c:260 msgid "Select Zhuyin keyboard layout." msgstr "" @@ -206,7 +206,7 @@ msgid "Selecting" msgstr "" -#: ../src/IBusChewingEngine-def.c:260 +#: ../src/IBusChewingEngine-def.c:262 msgid "Selection keys" msgstr "" @@ -218,11 +218,11 @@ msgid "Settings" msgstr "" -#: ../src/IBusChewingEngine-def.c:360 +#: ../src/IBusChewingEngine-def.c:370 msgid "Space to select" msgstr "" -#: ../src/IBusChewingEngine-def.c:312 +#: ../src/IBusChewingEngine-def.c:314 msgid "Sync between CapsLock and IM" msgstr "" diff -Nru ibus-chewing-1.3.6.20100730/po/zh_TW.po ibus-chewing-1.3.7.20100910/po/zh_TW.po --- ibus-chewing-1.3.6.20100730/po/zh_TW.po 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/po/zh_TW.po 2010-09-10 14:02:04.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ibus-chewing 1.2.99.20100317\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-28 14:07+1000\n" +"POT-Creation-Date: 2010-09-10 13:34+1000\n" "PO-Revision-Date: 2010-03-17 10:57+1000\n" "Last-Translator: Ding-Yi Chen \n" "MIME-Version: 1.0\n" @@ -23,16 +23,16 @@ msgid " Use default value:" msgstr " 使用預設值：" -#: ../src/IBusChewingEngine-def.c:279 +#: ../src/IBusChewingEngine-def.c:281 msgid "Add phrases in front" msgstr "前方加詞" -#: ../src/IBusChewingEngine-def.c:283 +#: ../src/IBusChewingEngine-def.c:285 #, fuzzy msgid "Add phrases in the front." msgstr "前方加詞。" -#: ../src/IBusChewingEngine-def.c:329 +#: ../src/IBusChewingEngine-def.c:331 msgid "Always input numbers when number keys from key pad is inputted." msgstr "用數字版輸入時總是輸入數字，並不負責選字。" @@ -40,11 +40,11 @@ msgid "Auto" msgstr "自動" -#: ../src/IBusChewingEngine-def.c:273 +#: ../src/IBusChewingEngine-def.c:275 msgid "Auto move cursor" msgstr "自動移游標" -#: ../src/IBusChewingEngine-def.c:277 +#: ../src/IBusChewingEngine-def.c:279 msgid "Automatically move cursor to next character." msgstr "自動移游標至下一個字。" @@ -52,7 +52,7 @@ msgid "Big5" msgstr "大五碼" -#: ../src/IBusChewingEngine-def.c:348 +#: ../src/IBusChewingEngine-def.c:358 msgid "Candidate per page" msgstr "每頁備選字數" @@ -69,20 +69,20 @@ msgid "Chi" msgstr "中" -#: ../src/IBusChewingEngine-def.c:354 +#: ../src/IBusChewingEngine-def.c:364 msgid "Choose phrases from backward" msgstr "後方選詞" -#: ../src/IBusChewingEngine-def.c:358 +#: ../src/IBusChewingEngine-def.c:368 #, fuzzy msgid "Choose phrases from the back, without moving cursor." msgstr "直接由後方選詞，不必把游標移到候選詞前。" -#: ../src/IBusChewingEngine-def.c:285 +#: ../src/IBusChewingEngine-def.c:287 msgid "Easy symbol input" msgstr "簡易符號輸入" -#: ../src/IBusChewingEngine-def.c:289 +#: ../src/IBusChewingEngine-def.c:291 msgid "Easy symbol input." msgstr "簡易符號輸入。" @@ -94,15 +94,15 @@ msgid "Eng" msgstr "英" -#: ../src/IBusChewingEngine-def.c:291 +#: ../src/IBusChewingEngine-def.c:293 msgid "Esc clean all buffer" msgstr "Esc 鍵清預編區" -#: ../src/IBusChewingEngine-def.c:295 +#: ../src/IBusChewingEngine-def.c:297 msgid "Escape key cleans the text in pre-edit-buffer." msgstr "Esc 鍵清預編區。" -#: ../src/IBusChewingEngine-def.c:303 +#: ../src/IBusChewingEngine-def.c:305 msgid "Force lowercase in En mode" msgstr "CapsLock時英數仍用小寫" @@ -114,15 +114,15 @@ msgid "Half" msgstr "半" -#: ../src/IBusChewingEngine-def.c:270 +#: ../src/IBusChewingEngine-def.c:272 msgid "Hsu's keyboard selection keys, 1 for asdfjkl789, 2 for asdfzxcv89 ." msgstr "許氏鍵盤選擇鍵設定。1 為使用 asdfjkl789，2 為使用asdfzxcv89。" -#: ../src/IBusChewingEngine-def.c:266 +#: ../src/IBusChewingEngine-def.c:268 msgid "Hsu's selection key" msgstr "許式鍵盤選擇鍵" -#: ../src/IBusChewingEngine-def.c:307 +#: ../src/IBusChewingEngine-def.c:309 msgid "" "Ignore CapsLock status and input lowercase by default.\n" "It is handy if you wish to enter lowercase by default. Uppercase can still " @@ -131,17 +131,17 @@ "即使在CapsLcok On 的狀態時，仍然輸出小寫英文字母。 \n" "這對習慣打小寫的用戶來說比較方便。大寫字母仍然可用Shift 鍵輸入。" -#: ../src/IBusChewingEngine-def.c:346 +#: ../src/IBusChewingEngine-def.c:356 msgid "" "In plain Zhuyin mode, automatic candidate selection and related options are " "disabled or ignored." msgstr "在單純注音模式，自動選詞功能及選項將被關閉或忽略。" -#: ../src/IBusChewingEngine-def.c:332 +#: ../src/IBusChewingEngine-def.c:341 msgid "Input Style" msgstr "輸入風格" -#: ../src/IBusChewingEngine-def.c:337 +#: ../src/IBusChewingEngine-def.c:346 msgid "" "Input style determines where the preedit strings be shown and edited.\n" "\"in application window\": Preedit strings are edited on the target " @@ -157,11 +157,11 @@ msgid "Keyboard" msgstr "鍵盤" -#: ../src/IBusChewingEngine-def.c:254 +#: ../src/IBusChewingEngine-def.c:256 msgid "Keyboard Type" msgstr "鍵盤排列" -#: ../src/IBusChewingEngine-def.c:264 +#: ../src/IBusChewingEngine-def.c:266 msgid "" "Keys used to select candidate. For example \"asdfghjkl;\", press 'a' to " "select the 1st candidate, 's' for 2nd, and so on." @@ -169,26 +169,26 @@ "設定選字按鍵。以 \"asdfghjkl;\" 為例，按 'a' 選第一個候選字詞，按 's' 選第二" "個，依此類推。" -#: ../src/IBusChewingEngine-def.c:297 +#: ../src/IBusChewingEngine-def.c:299 msgid "Maximum Chinese characters" msgstr "容納中文字數" -#: ../src/IBusChewingEngine-def.c:301 +#: ../src/IBusChewingEngine-def.c:303 msgid "" "Maximum Chinese characters in pre-edit buffer, including inputing Zhuyin " "symbols" msgstr "預編區可容納中文字數(包含輸入中的注音符號)" -#: ../src/IBusChewingEngine-def.c:352 +#: ../src/IBusChewingEngine-def.c:362 #, fuzzy msgid "Number of candidate per page." msgstr "每頁可顯示候選字詞數。" -#: ../src/IBusChewingEngine-def.c:325 +#: ../src/IBusChewingEngine-def.c:327 msgid "Number pad always input number" msgstr "數字版總是輸入數字" -#: ../src/IBusChewingEngine-def.c:318 +#: ../src/IBusChewingEngine-def.c:320 #, fuzzy msgid "" "Occasionally, the CapsLock status does not match the IM, this option " @@ -206,11 +206,11 @@ msgid "Peng Huang, Ding-Yi Chen" msgstr "黃鵬，陳定彞" -#: ../src/IBusChewingEngine-def.c:342 +#: ../src/IBusChewingEngine-def.c:352 msgid "Plain Zhuyin mode" msgstr "單純注音模式" -#: ../src/IBusChewingEngine-def.c:258 +#: ../src/IBusChewingEngine-def.c:260 #, fuzzy msgid "Select Zhuyin keyboard layout." msgstr "選擇注音符號的鍵盤排列。" @@ -219,7 +219,7 @@ msgid "Selecting" msgstr "選字" -#: ../src/IBusChewingEngine-def.c:260 +#: ../src/IBusChewingEngine-def.c:262 msgid "Selection keys" msgstr "選字按鍵" @@ -231,11 +231,11 @@ msgid "Settings" msgstr "設定" -#: ../src/IBusChewingEngine-def.c:360 +#: ../src/IBusChewingEngine-def.c:370 msgid "Space to select" msgstr "空白鍵選字" -#: ../src/IBusChewingEngine-def.c:312 +#: ../src/IBusChewingEngine-def.c:314 msgid "Sync between CapsLock and IM" msgstr "CapsLock與輸入法狀態同步" diff -Nru ibus-chewing-1.3.6.20100730/README ibus-chewing-1.3.7.20100910/README --- ibus-chewing-1.3.6.20100730/README 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/README 2010-09-10 14:02:04.000000000 +0000 @@ -3,5 +3,5 @@ It is released under GPLv2, see COPYING for detail. -See INSTALL for installation instruction. +See USER-GUIDE for usage documentation; INSTALL for installation. diff -Nru ibus-chewing-1.3.6.20100730/RELEASE-NOTES.txt ibus-chewing-1.3.7.20100910/RELEASE-NOTES.txt --- ibus-chewing-1.3.6.20100730/RELEASE-NOTES.txt 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/RELEASE-NOTES.txt 2010-09-10 14:02:04.000000000 +0000 @@ -1,14 +1,19 @@ -PRJ_VER=1.3.6.20100730 -SUMMARY=Providing USER-GUIDE, which Resolves: #608991 and upstream issue 993; Fix Issue 1016 -# Changes -- Resolves: #608991 -- Sort of fix upstream issue 993. -- Include USER-GUIDE -- Remove NEWS, as this project does not use it. -- Fix upstream Issue 1016: [ibus-chewing] Chewing should commit the complete string before disable chewing. But only for ibus-1.3.0 and later. -- Mouse candidate selection now work in plain Zhuyin mode. -- Default setting changes: (Won't affect current user though). - + Auto move cursor: TRUE - + Add phrases in front: TRUE - + spaceAsSelection: FALSE +PRJ_VER=1.3.7.20100910 +SUMMARY=Resolves: #608991, #632043; Fixed Upstream issue 1022, 1032; Rewrite CMake modules. +BODHI_UPDATE_TYPE=bugfix +REDHAT_BUGZILLA=#632043 +[Changes] +- Input style of ibus-chewing is decommissioned under ibus >=1.3. + Now the input style is determined solely on the setting of + "Embed preedit in application window" in IBus. +- Resolves: #608991, #632043 +- Fixed Issue 1022: chewing commit some text in reset method + (patched by Peng Huang). +- Fixed Issue 1032: [ibus-chewing] Chewing not commit some single Chinese + char into application when press enter. +- Rewrite CMake modules to make them cleaner, and documents in cmake module + help format. +- [For developer and distro maintainer] + Various targets changed. Use 'make help' to obtain a list of available + targets. diff -Nru ibus-chewing-1.3.6.20100730/SPECS/ibus-chewing.spec.in ibus-chewing-1.3.7.20100910/SPECS/ibus-chewing.spec.in --- ibus-chewing-1.3.6.20100730/SPECS/ibus-chewing.spec.in 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/SPECS/ibus-chewing.spec.in 2010-09-10 14:02:04.000000000 +0000 @@ -1,12 +1,12 @@ Name: @PROJECT_NAME@ Version: @PRJ_VER@ -Release: @PRJ_VER_RELEASE@%{?dist} +Release: 1%{?dist} Summary: @PROJECT_DESCRIPTION@ Summary(zh_TW): IBus新酷音輸入法 License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ -Source0: http://ibus.googlecode.com/files/%{name}-%{version}-Source.tar.gz +Source0: http://ibus.googlecode.com/files/@SOURCE0@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -96,5 +96,8 @@ %config(noreplace) %{_sysconfdir}/gconf/schemas/%{name}.schemas %changelog -@RPM_CHANGELOG@ +* @TODAY_CHANGELOG@ @MAINTAINER@ - @PRJ_VER@-@PRJ_RELEASE_NO@ +@CHANGELOG_ITEMS@ + +@RPM_CHANGELOG_PREV@ diff -Nru ibus-chewing-1.3.6.20100730/SPECS/RPM-ChangeLog ibus-chewing-1.3.7.20100910/SPECS/RPM-ChangeLog --- ibus-chewing-1.3.6.20100730/SPECS/RPM-ChangeLog 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/SPECS/RPM-ChangeLog 2010-09-10 14:02:04.000000000 +0000 @@ -1,3 +1,18 @@ +* Sat Sep 11 2010 Ding-Yi Chen - 1.3.7.20100910-1 +- Input style of ibus-chewing is decommissioned under ibus >=1.3. + Now the input style is determined solely on the setting of + "Embed preedit in application window" in IBus. +- Resolves: #608991, #632043 +- Fixed Issue 1022: chewing commit some text in reset method + (patched by Peng Huang). +- Fixed Issue 1032: [ibus-chewing] Chewing not commit some single Chinese + char into application when press enter. +- Rewrite CMake modules to make them cleaner, and documents in cmake module + help format. +- [For developer and distro maintainer] + Various targets changed. Use 'make help' to obtain a list of available + targets. + * Fri Jul 30 2010 Ding-Yi Chen - 1.3.6.20100730-1 - Resolves: #608991 - Sort of fix upstream issue 993. @@ -227,6 +242,3 @@ - The first version. - - - diff -Nru ibus-chewing-1.3.6.20100730/SPECS/RPM-ChangeLog.in ibus-chewing-1.3.7.20100910/SPECS/RPM-ChangeLog.in --- ibus-chewing-1.3.6.20100730/SPECS/RPM-ChangeLog.in 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/SPECS/RPM-ChangeLog.in 2010-09-10 14:02:04.000000000 +0000 @@ -1,4 +1,4 @@ -* @DATE@ @MAINTAINER@ - @PRJ_VER@-@PRJ_VER_RELEASE@ -@RPM_CHANGELOG_ITEMS@ +* @TODAY_CHANGELOG@ @MAINTAINER@ - @PRJ_VER@-@PRJ_RELEASE_NO@ +@CHANGELOG_ITEMS@ @RPM_CHANGELOG_PREV@ diff -Nru ibus-chewing-1.3.6.20100730/SPECS/RPM-ChangeLog.prev ibus-chewing-1.3.7.20100910/SPECS/RPM-ChangeLog.prev --- ibus-chewing-1.3.6.20100730/SPECS/RPM-ChangeLog.prev 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/SPECS/RPM-ChangeLog.prev 2010-09-10 14:02:04.000000000 +0000 @@ -1,3 +1,15 @@ +* Fri Jul 30 2010 Ding-Yi Chen - 1.3.6.20100730-1 +- Resolves: #608991 +- Sort of fix upstream issue 993. +- Include USER-GUIDE +- Remove NEWS, as this project does not use it. +- Fix upstream Issue 1016: [ibus-chewing] Chewing should commit the complete string before disable chewing. But only for ibus-1.3.0 and later. +- Mouse candidate selection now work in plain Zhuyin mode. +- Default setting changes: (Won't affect current user though). + + Auto move cursor: TRUE + + Add phrases in front: TRUE + + spaceAsSelection: FALSE + * Wed Jul 14 2010 Ding-Yi Chen - 1.3.5.20100714-1 - Resolves: #608991 - Removes Ctrl-v/V Hotkey @@ -214,6 +226,3 @@ * Fri Aug 15 2008 Huang Peng - 0.1.1.20081023-1 - The first version. - - - diff -Nru ibus-chewing-1.3.6.20100730/SPECS/RPM-RELEASE-NOTES.template ibus-chewing-1.3.7.20100910/SPECS/RPM-RELEASE-NOTES.template --- ibus-chewing-1.3.6.20100730/SPECS/RPM-RELEASE-NOTES.template 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/SPECS/RPM-RELEASE-NOTES.template 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -RPM_RELEASE=1 -RPM_RELEASE_SUMMARY= -# RPM Release Changes. Note that following lines only go to RPM-ChangeLog when -# RPM_RELEASE >1 diff -Nru ibus-chewing-1.3.6.20100730/SPECS/RPM-RELEASE-NOTES.txt ibus-chewing-1.3.7.20100910/SPECS/RPM-RELEASE-NOTES.txt --- ibus-chewing-1.3.6.20100730/SPECS/RPM-RELEASE-NOTES.txt 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/SPECS/RPM-RELEASE-NOTES.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -RPM_RELEASE=1 -RPM_RELEASE_SUMMARY= -# RPM Release Changes. Note that following lines only go to RPM-ChangeLog when -# RPM_RELEASE >1 diff -Nru ibus-chewing-1.3.6.20100730/src/generate-gconf-schemas.c ibus-chewing-1.3.7.20100910/src/generate-gconf-schemas.c --- ibus-chewing-1.3.6.20100730/src/generate-gconf-schemas.c 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/src/generate-gconf-schemas.c 2010-09-10 14:02:04.000000000 +0000 @@ -40,7 +40,7 @@ /* Init i18n messages */ setlocale (LC_ALL, ""); - bindtextdomain(PROJECT_NAME, DATADIR "/locale"); + bindtextdomain(PROJECT_NAME, DATA_DIR "/locale"); textdomain(PROJECT_NAME); context = g_option_context_new("schemasFile"); diff -Nru ibus-chewing-1.3.6.20100730/src/IBusChewingEngine-def.c ibus-chewing-1.3.7.20100910/src/IBusChewingEngine-def.c --- ibus-chewing-1.3.6.20100730/src/IBusChewingEngine-def.c 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/src/IBusChewingEngine-def.c 2010-09-10 14:02:04.000000000 +0000 @@ -137,9 +137,9 @@ IBusChewingEngine *engine=(IBusChewingEngine *) ctx->userData; chewing_set_easySymbolInput(engine->context,(g_value_get_boolean(value)) ? 1: 0); if (g_value_get_boolean(value)){ - engine->flags |= CHEWING_FLAG_EASY_SYMBOL_INPUT; + engine->chewingFlags |= CHEWING_FLAG_EASY_SYMBOL_INPUT; }else{ - engine->flags &= ~CHEWING_FLAG_EASY_SYMBOL_INPUT; + engine->chewingFlags &= ~CHEWING_FLAG_EASY_SYMBOL_INPUT; } #endif } @@ -163,9 +163,9 @@ #ifdef IBUS_CHEWING_MAIN IBusChewingEngine *engine=(IBusChewingEngine *) ctx->userData; if (g_value_get_boolean(value)){ - engine->flags |= CHEWING_FLAG_FORCE_LOWERCASE_ENGLISH; + engine->chewingFlags |= CHEWING_FLAG_FORCE_LOWERCASE_ENGLISH; }else{ - engine->flags &= ~CHEWING_FLAG_FORCE_LOWERCASE_ENGLISH; + engine->chewingFlags &= ~CHEWING_FLAG_FORCE_LOWERCASE_ENGLISH; } #endif } @@ -188,13 +188,14 @@ #ifdef IBUS_CHEWING_MAIN IBusChewingEngine *engine=(IBusChewingEngine *) ctx->userData; if (g_value_get_boolean(value)){ - engine->flags |= CHEWING_FLAG_NUMPAD_ALWAYS_NUMBER; + engine->chewingFlags |= CHEWING_FLAG_NUMPAD_ALWAYS_NUMBER; }else{ - engine->flags &= ~CHEWING_FLAG_NUMPAD_ALWAYS_NUMBER; + engine->chewingFlags &= ~CHEWING_FLAG_NUMPAD_ALWAYS_NUMBER; } #endif } +#if IBUS_VERSION < 10300 static void inputStyle_set_callback(PropertyContext *ctx, GValue *value){ #ifdef IBUS_CHEWING_MAIN IBusChewingEngine *engine=(IBusChewingEngine *) ctx->userData; @@ -207,8 +208,9 @@ engine->_priv->inputStyle=CHEWING_INPUT_STYLE_IN_APPLICATION; } ibus_chewing_engine_force_commit(engine); -#endif +#endif /* IBUS_CHEWING_MAIN */ } +#endif static void candPerPage_set_callback(PropertyContext *ctx, GValue *value){ #ifdef IBUS_CHEWING_MAIN @@ -241,9 +243,9 @@ #ifdef IBUS_CHEWING_MAIN IBusChewingEngine *engine=(IBusChewingEngine *) ctx->userData; if (g_value_get_boolean(value)){ - engine->flags |= CHEWING_FLAG_PLAIN_ZHUYIN; + engine->chewingFlags |= CHEWING_FLAG_PLAIN_ZHUYIN; }else{ - engine->flags &= ~CHEWING_FLAG_PLAIN_ZHUYIN; + engine->chewingFlags &= ~CHEWING_FLAG_PLAIN_ZHUYIN; } #endif } @@ -329,6 +331,13 @@ N_("Always input numbers when number keys from key pad is inputted."), }, +/* + * Input style is decommissioned for ibus 1.3, + * because ibus 1.3 has built-in support of input style. + * Using built-in input style provides extra benefit, + * like typed text won't be lost when focus-out and disable event. + */ +#if IBUS_VERSION < 10300 {G_TYPE_STRING, "inputStyle", "Editing", N_("Input Style"), "in candidate window", inputStyles, NULL, 0, 1, NULL, inputStyle_set_callback, @@ -338,6 +347,7 @@ "\"in application window\": Preedit strings are edited on the target application window.\n" "\"in candidate window\": Preedit strings are edited on the candidate selection window."), }, +#endif {G_TYPE_BOOLEAN, "plainZhuyin", "Selecting", N_("Plain Zhuyin mode"), "0", NULL, NULL, 0, 1, diff -Nru ibus-chewing-1.3.6.20100730/src/IBusChewingEngine.gob ibus-chewing-1.3.7.20100910/src/IBusChewingEngine.gob --- ibus-chewing-1.3.6.20100730/src/IBusChewingEngine.gob 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/src/IBusChewingEngine.gob 2010-09-10 14:02:04.000000000 +0000 @@ -188,7 +188,7 @@ protected ChewingInputMode inputMode=CHEWING_INPUT_MODE_BYPASS; /* Controlling flags */ - protected ChewingFlag flags=0; + protected ChewingFlag chewingFlags=0; private guint statusFlags=0; @@ -220,7 +220,7 @@ g_object_ref_sink ( ibus_property_new("chewing_settings_prop",PROP_TYPE_TOGGLE, SELF_GET_CLASS(self)->settings_prop_label, - PKGDATADIR "/icons/settings.png", NULL, TRUE, TRUE, + PROJECT_DATA_DIR "/icons/settings.png", NULL, TRUE, TRUE, PROP_STATE_UNCHECKED, NULL)) } destroywith g_object_unref; @@ -254,7 +254,7 @@ gchar buf[100]; g_snprintf(buf,100,"%s/.chewing",getenv("HOME")); - chewing_Init(CHEWING_DATADIR, buf); + chewing_Init(CHEWING_DATA_DIR, buf); self->context=chewing_new(); chewing_set_ChiEngMode(self->context,CHINESE_MODE); @@ -375,7 +375,7 @@ zhuyin_tone=get_tone(chewing_get_KBType(self->context),self->_priv->key_last); add_tone(self->_priv->zhuyin_latest,zhuyin_tone); if (zhuyin_tone>0 ){ - if (self->flags & CHEWING_FLAG_PLAIN_ZHUYIN){ + if (self->chewingFlags & CHEWING_FLAG_PLAIN_ZHUYIN){ /* Open candidate selection window */ if (chewing_get_spaceAsSelection(self->context)){ chewing_handle_Space(self->context); @@ -721,6 +721,10 @@ int zhuyin_tone=-1; gint totalChoice=chewing_cand_TotalChoice(self->context); G_DEBUG_MSG(5, "[I5] determine_input_mode(): TotalChoice=%d", totalChoice); + if (chewing_commit_Check(self->context) + && (self->_priv->key_last==IBUS_Return || self->_priv->key_last==IBUS_KP_Enter)){ + ibus_chewing_engine_set_status_flag(self,ENGINE_STATUS_NEED_COMMIT); + } if (totalChoice >0){ /* Candidate selection mode ensure. */ self->inputMode=CHEWING_INPUT_MODE_SELECTING; @@ -739,20 +743,17 @@ case CHEWING_INPUT_MODE_EDITING: zhuyin_tone=get_tone(chewing_get_KBType(self->context),self->_priv->key_last); if (zhuyin_tone>0 ){ - if (self->flags & CHEWING_FLAG_PLAIN_ZHUYIN){ + if (self->chewingFlags & CHEWING_FLAG_PLAIN_ZHUYIN){ /* For plain zhuyin, Enter SELECTING mode */ self->inputMode=CHEWING_INPUT_MODE_SELECTING; }else{ /* For normal zhuyin, Enter SELECTION_DONE mode */ self->inputMode=CHEWING_INPUT_MODE_SELECTION_DONE; } -// gchar *buff_str=chewing_buffer_String(self->context); -// g_string_assign(self->completedString,buff_str); -// chewing_free(buff_str); } break; case CHEWING_INPUT_MODE_SELECTING: - /* Switch to another t page */ + /* Switch to another page */ if (self_is_selectKey(self, self->_priv->key_last)){ self->inputMode=CHEWING_INPUT_MODE_SELECTION_DONE; }else{ @@ -853,8 +854,18 @@ if (!chewing_commit_Check(self->context)){ chewing_handle_Enter(self->context); } +#else + if (self->_priv->inputStyle==CHEWING_INPUT_STYLE_IN_CANDIDATE){ + /* But if in IN_CANDIDATE mode, still need to simulate enter. + */ + if (!chewing_commit_Check(self->context)){ + chewing_handle_Enter(self->context); + } + } + #endif ibus_chewing_engine_set_status_flag(self, ENGINE_STATUS_FORCE_COMMIT); + self_update(self); } if (chewing_commit_Check(self->context)){ G_DEBUG_MSG(3,"[I3] force_commit() has something to commit. buffer=%d, commit=%d", @@ -871,10 +882,11 @@ reset(IBus:Engine *engine){ G_DEBUG_MSG(1,"[I1] reset"); Self *self=SELF(engine); - if (self->_priv->statusFlags & ENGINE_STATUS_NEED_COMMIT){ - /* Force commit non-empty preedit buffer */ - self_force_commit(self); - } + + /* Always clean buffer */ + self_clean_chewing_buffer(self); + ibus_chewing_engine_clear_status_flag(self, ENGINE_STATUS_FORCE_COMMIT); + ibus_lookup_table_clear(self->table); /* Save KBType type, becaue chewing_Reset() will reset it to default. */ diff -Nru ibus-chewing-1.3.6.20100730/src/IBusChewingEngine-input-events.c ibus-chewing-1.3.7.20100910/src/IBusChewingEngine-input-events.c --- ibus-chewing-1.3.6.20100730/src/IBusChewingEngine-input-events.c 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/src/IBusChewingEngine-input-events.c 2010-09-10 14:02:04.000000000 +0000 @@ -39,7 +39,7 @@ guint keysym_tmp=keysym_KP_to_normal(keysym); if (keysym_tmp){ /* Is keypad key */ - if ((self->flags & CHEWING_FLAG_NUMPAD_ALWAYS_NUMBER) && chewing_get_ChiEngMode(self->context)){ + if ((self->chewingFlags & CHEWING_FLAG_NUMPAD_ALWAYS_NUMBER) && chewing_get_ChiEngMode(self->context)){ chewing_set_ChiEngMode(self->context, 0); self_handle_Default(self,keysym_tmp,FALSE); chewing_set_ChiEngMode(self->context,CHINESE_MODE); @@ -191,6 +191,10 @@ self_refresh_property(self,"chewing_alnumSize_prop"); break; default: + if (keysym>127 || keysym<0){ + /* Special keys, must let it through */ + return FALSE; + } self_handle_Default(self,keysym,TRUE); break; } @@ -214,17 +218,17 @@ void ibus_chewing_engine_handle_Default(IBusChewingEngine *self, guint keyval, gboolean shiftPressed){ G_DEBUG_MSG(2,"[I2] handle_Default(-,%u) plainZhuyin=%s inputMode=%d", - keyval,(self->flags & CHEWING_FLAG_PLAIN_ZHUYIN)? "TRUE": "FALSE",self->inputMode); + keyval,(self->chewingFlags & CHEWING_FLAG_PLAIN_ZHUYIN)? "TRUE": "FALSE",self->inputMode); ibus_chewing_engine_set_status_flag(self, ENGINE_STATUS_NEED_COMMIT); #ifdef EASY_SYMBOL_INPUT_WORK_AROUND - if (self->flags & CHEWING_FLAG_EASY_SYMBOL_INPUT){ + if (self->chewingFlags & CHEWING_FLAG_EASY_SYMBOL_INPUT){ /* If shift is pressed, turn on the easySymbolInput, turn off * otherwise */ chewing_set_easySymbolInput(self->context,(shiftPressed)? 1:0); } #endif - if (self->flags & CHEWING_FLAG_FORCE_LOWERCASE_ENGLISH){ + if (self->chewingFlags & CHEWING_FLAG_FORCE_LOWERCASE_ENGLISH){ if (isupper(keyval) && !shiftPressed){ keyval=tolower(keyval); }else if (islower(keyval) && shiftPressed){ @@ -232,7 +236,7 @@ } } chewing_handle_Default(self->context,keyval); - if (self->flags & CHEWING_FLAG_PLAIN_ZHUYIN){ + if (self->chewingFlags & CHEWING_FLAG_PLAIN_ZHUYIN){ if (self_is_selectKey(self,self->_priv->key_last) && self->inputMode==CHEWING_INPUT_MODE_SELECTING){ chewing_handle_Enter(self->context); diff -Nru ibus-chewing-1.3.6.20100730/src/main.c ibus-chewing-1.3.7.20100910/src/main.c --- ibus-chewing-1.3.6.20100730/src/main.c 2010-07-30 06:44:18.000000000 +0000 +++ ibus-chewing-1.3.7.20100910/src/main.c 2010-09-10 14:02:04.000000000 +0000 @@ -69,9 +69,9 @@ ibus_bus_request_name (bus, "org.freedesktop.IBus.Chewing", 0); }else { IBusComponent *component; -// component = ibus_component_new_from_file ( DATADIR "/ibus/component/chewing.xml"); +// component = ibus_component_new_from_file ( DATA_DIR "/ibus/component/chewing.xml"); component=ibus_component_new("org.freedesktop.IBus.Chewing", - _("Chewing component"), PKGDATADIR, "GPLv2+", + _("Chewing component"), PROJECT_DATA_DIR, "GPLv2+", _("Peng Huang, Ding-Yi Chen"), "http://code.google.com/p/ibus", LIBEXEC_DIR "/ibus-engine-chewing --ibus", @@ -81,7 +81,7 @@ ibus_engine_desc_new("chewing", _("Chewing"), "Chinese chewing input method", "zh_TW", "GPLv2+", _("Peng Huang, Ding-Yi Chen"), - PKGDATADIR "/icons/" PROJECT_NAME ".png", + PROJECT_DATA_DIR "/icons/" PROJECT_NAME ".png", "us") ); @@ -135,7 +135,7 @@ /* Init i18n messages */ setlocale (LC_ALL, "zh_TW.utf8"); - bindtextdomain(PROJECT_NAME, DATADIR "/locale"); + bindtextdomain(PROJECT_NAME, DATA_DIR "/locale"); textdomain(PROJECT_NAME); context = g_option_context_new ("- ibus chewing engine component");