mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-i18n/fcitx: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
committed by
Conrad Kostecki
parent
bbfe0c7dad
commit
f768f63d70
@@ -1,32 +0,0 @@
|
||||
https://github.com/fcitx/fcitx/issues/475
|
||||
|
||||
--- a/cmake/FindEnchant.cmake
|
||||
+++ b/cmake/FindEnchant.cmake
|
||||
@@ -16,15 +16,15 @@
|
||||
endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
|
||||
|
||||
find_package(PkgConfig)
|
||||
-pkg_check_modules(PC_ENCHANT enchant)
|
||||
+pkg_check_modules(PC_ENCHANT enchant-2 enchant)
|
||||
|
||||
find_path(ENCHANT_INCLUDE_DIR
|
||||
NAMES enchant.h
|
||||
HINTS ${PC_ENCHANT_INCLUDE_DIRS}
|
||||
- PATH_SUFFIXES "enchant")
|
||||
+ PATH_SUFFIXES enchant-2 enchant)
|
||||
|
||||
find_library(ENCHANT_LIBRARIES
|
||||
- NAMES enchant
|
||||
+ NAMES enchant-2 enchant
|
||||
HINTS ${PC_ENCHANT_LIBRARY_DIRS})
|
||||
|
||||
if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
- #include <enchant/enchant.h>
|
||||
+ #include <enchant.h>
|
||||
|
||||
EnchantBroker *enchant_broker_init();
|
||||
char **enchant_dict_suggest(EnchantDict *dict, const char *str,
|
||||
@@ -1,32 +0,0 @@
|
||||
https://github.com/fcitx/fcitx/issues/250
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -96,12 +96,15 @@
|
||||
endif()
|
||||
endif()
|
||||
if (ENABLE_XKB)
|
||||
- # Parse xkb xml file
|
||||
- find_package(LibXml2 REQUIRED)
|
||||
find_package(IsoCodes REQUIRED)
|
||||
- find_package(XkbFile REQUIRED)
|
||||
# Parse isocodes json
|
||||
pkg_check_modules(JsonC "json-c" IMPORTED_TARGET REQUIRED)
|
||||
+ if(ENABLE_X11)
|
||||
+ # Parse xkb xml file
|
||||
+ find_package(LibXml2 REQUIRED)
|
||||
+ find_package(XkbFile REQUIRED)
|
||||
+ find_package(XKeyboardConfig REQUIRED)
|
||||
+ endif(ENABLE_X11)
|
||||
endif (ENABLE_XKB)
|
||||
if(ENABLE_PRESAGE)
|
||||
find_package(Presage)
|
||||
@@ -121,8 +124,6 @@
|
||||
message(FATAL_ERROR "Xkb is needed")
|
||||
endif (NOT X11_Xkb_FOUND)
|
||||
|
||||
-find_package(XKeyboardConfig REQUIRED)
|
||||
-
|
||||
endif()
|
||||
|
||||
if (ENABLE_TEST)
|
||||
@@ -1,12 +0,0 @@
|
||||
https://github.com/fcitx/fcitx5/pull/1119
|
||||
|
||||
--- a/src/lib/fcitx-utils/inputbuffer.h
|
||||
+++ b/src/lib/fcitx-utils/inputbuffer.h
|
||||
@@ -7,6 +7,7 @@
|
||||
#ifndef _FCITX_UTILS_INPUTBUFFER_H_
|
||||
#define _FCITX_UTILS_INPUTBUFFER_H_
|
||||
|
||||
+#include <cstdint>
|
||||
#include <cstring>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
Reference in New Issue
Block a user