SHA256
1
0
forked from pool/fcitx

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
This commit is contained in:
Marguerite Su 2012-08-06 15:49:17 +00:00 committed by Git OBS Bridge
parent 76201068d6
commit baf93d562f
3 changed files with 1 additions and 28 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27d21fc2a37255219b0ff643be72614f3a3314b46c9d7a263e965b096efded52
size 904487

View File

@ -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}

View File

@ -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) {