Skip to content

[sdl2] skip ibus on linux #14275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 1 commit into from
Oct 30, 2020
Merged

[sdl2] skip ibus on linux #14275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- CMakeLists.orig.txt 2020-10-28 09:08:51.925900284 +0100
+++ CMakeLists.txt 2020-10-28 09:09:10.034165780 +0100
@@ -1197,13 +1197,6 @@
list(APPEND EXTRA_LIBS ${DBUS_LIBRARIES})
endif()

- pkg_search_module(IBUS ibus-1.0 ibus)
- if(IBUS_FOUND)
- set(HAVE_IBUS_IBUS_H TRUE)
- include_directories(${IBUS_INCLUDE_DIRS})
- list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES})
- add_definitions(-DSDL_USE_IME)
- endif()
if(HAVE_LIBUNWIND_H)
# We've already found the header, so REQUIRE the lib to be present
pkg_search_module(UNWIND REQUIRED libunwind)
1 change: 1 addition & 0 deletions ports/sdl2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ vcpkg_extract_source_archive_ex(
disable-wcslcpy-and-wcslcat-for-windows.patch
fix-EventToken-header-reference.patch
0006-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch
0007-sdl2-skip-ibus-on-linux.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC)
Expand Down
2 changes: 1 addition & 1 deletion ports/sdl2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sdl2",
"version-string": "2.0.12",
"port-version": 5,
"port-version": 6,
"description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
"homepage": "https://www.libsdl.org/download-2.0.php",
"features": {
Expand Down