From baf93d562f41e0478cbf7c860623daa0a7e2d69a5b078b2a22abb57dd994a85a Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 6 Aug 2012 15:49:17 +0000 Subject: [PATCH] Accepting request 130122 from home:MargueriteSu:branches:M17N add Dependency: libpresage-devel, which is already in Factory OBS-URL: https://build.opensuse.org/request/show/130122 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=39 --- fcitx-4.2.4.1.tar.bz2 | 3 --- fcitx.spec | 1 + fix-fcitx-4.2.4.1-memory-overflow.patch | 25 ------------------------- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 fcitx-4.2.4.1.tar.bz2 delete mode 100644 fix-fcitx-4.2.4.1-memory-overflow.patch diff --git a/fcitx-4.2.4.1.tar.bz2 b/fcitx-4.2.4.1.tar.bz2 deleted file mode 100644 index 97300b7..0000000 --- a/fcitx-4.2.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27d21fc2a37255219b0ff643be72614f3a3314b46c9d7a263e965b096efded52 -size 904487 diff --git a/fcitx.spec b/fcitx.spec index 9eac68b..5686ac5 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -50,6 +50,7 @@ BuildRequires: desktop-file-utils BuildRequires: libxkbfile-devel %endif BuildRequires: enchant-devel +BuildRequires: libpresage-devel BuildRequires: iso-codes-devel BuildRequires: pango-devel %if 0%{?suse_version} >= 1110 || 0%{?fedora_version} diff --git a/fix-fcitx-4.2.4.1-memory-overflow.patch b/fix-fcitx-4.2.4.1-memory-overflow.patch deleted file mode 100644 index 7f2a092..0000000 --- a/fix-fcitx-4.2.4.1-memory-overflow.patch +++ /dev/null @@ -1,25 +0,0 @@ -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) {