Hello community, here is the log from the commit of package fcitx for openSUSE:Factory checked in at 2012-06-26 15:19:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx (Old) and /work/SRC/openSUSE:Factory/.fcitx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx/fcitx.changes 2012-06-15 16:31:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.changes 2012-06-26 15:19:33.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Jun 16 14:32:39 UTC 2012 - i...@marguerite.su + +- fix memory overflow, thanks to reporter dieter. + * http://lists.opensuse.org/opensuse-factory/2012-06/msg00359.html +- support fedora builds. +- further split packages by input engines and tables, no longer a big mess. + +------------------------------------------------------------------- New: ---- fix-fcitx-4.2.4.1-memory-overflow.patch xinput-fcitx ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx.spec ++++++ ++++ 677 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fcitx/fcitx.spec ++++ and /work/SRC/openSUSE:Factory/.fcitx.new/fcitx.spec ++++++ _service ++++++ --- /var/tmp/diff_new_pack.IM6bsT/_old 2012-06-26 15:19:35.000000000 +0200 +++ /var/tmp/diff_new_pack.IM6bsT/_new 2012-06-26 15:19:35.000000000 +0200 @@ -4,7 +4,7 @@ - <param name="history-depth">all</param><param name="url">http://code.google.com/p/fcitx/</param><param name="versionprefix">4.2git</param><param name="filename">fcitx</param><param name="scm">git</param></service> + <param name="history-depth">all</param><param name="url">https://github.com/fcitx/fcitx.git</param><param name="versionprefix">4.2git</param><param name="filename">fcitx</param><param name="scm">git</param></service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">bz2</param> ++++++ fix-fcitx-4.2.4.1-memory-overflow.patch ++++++ diff -urN fcitx-4.2.4.1.orig/src/module/xkb/xkb.c fcitx-4.2.4.1/src/module/xkb/xkb.c --- fcitx-4.2.4.1.orig/src/module/xkb/xkb.c 2012-06-16 22:27:00.087029656 +0800 +++ fcitx-4.2.4.1/src/module/xkb/xkb.c 2012-06-16 22:29:18.941293740 +0800 @@ -197,8 +197,7 @@ xkbParentDir = strdup("/usr/share/X11"); } - rulesFile = fcitx_utils_malloc0(sizeof(char) * (1 + strlen(xkbParentDir) + strlen(rulesName) + strlen("/xkb/rules/"))); - sprintf(rulesFile, "%s/xkb/rules/%s.xml", xkbParentDir, rulesName); + asprintf(&rulesFile, "%s/xkb/rules/%s.xml", xkbParentDir, rulesName); fcitx_utils_free(xkbParentDir); } diff -urN fcitx-4.2.4.1.orig/src/ui/classic/skin.c fcitx-4.2.4.1/src/ui/classic/skin.c --- fcitx-4.2.4.1.orig/src/ui/classic/skin.c 2012-06-16 22:27:00.090029620 +0800 +++ fcitx-4.2.4.1/src/ui/classic/skin.c 2012-06-16 22:30:39.775283176 +0800 @@ -216,7 +216,7 @@ const char* fallbackChainNoFallback[] = { buf }; const char* fallbackChainPanel[] = { buf, "skin/default" }; const char* fallbackChainTray[] = { "imicon" }; - const char* fallbackChainPanelIMIcon[] = { buf, "imicon" }; + const char* fallbackChainPanelIMIcon[] = { buf, "imicon", "skin/default" }; HASH_FIND_STR(*imageTable, name, image); if (image != NULL) { ++++++ xinput-fcitx ++++++ XIM=fcitx XIM_PROGRAM=/usr/bin/fcitx ICON="/usr/share/pixmaps/fcitx.png" XIM_ARGS="-D" PREFERENCE_PROGRAM=/usr/bin/fcitx-configtool SHORT_DESC="FCITX" GTK_IM_MODULE=fcitx if test -f /usr/lib/qt4/plugins/inputmethods/qtim-fcitx.so || \ test -f /usr/lib64/qt4/plugins/inputmethods/qtim-fcitx.so; then QT_IM_MODULE=fcitx else QT_IM_MODULE=xim fi -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
