diff options
| author | Joakim L. Gilje <jgilje@jgilje.net> | 2020-10-30 21:36:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-30 13:36:13 -0700 |
| commit | f543049ddd00a1fe1b3d04dcdea26fb57321411f (patch) | |
| tree | cb41c73074e0264e2100b07fe9ff8f3eac3e9b61 | |
| parent | fe78675f817144710dd3f602f90f8f93b9dc2754 (diff) | |
| download | vcpkg-f543049ddd00a1fe1b3d04dcdea26fb57321411f.tar.gz vcpkg-f543049ddd00a1fe1b3d04dcdea26fb57321411f.zip | |
skip ibus on linux (#14275)
| -rw-r--r-- | ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch | 16 | ||||
| -rw-r--r-- | ports/sdl2/portfile.cmake | 1 | ||||
| -rw-r--r-- | ports/sdl2/vcpkg.json | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch b/ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch new file mode 100644 index 000000000..8baa73c0f --- /dev/null +++ b/ports/sdl2/0007-sdl2-skip-ibus-on-linux.patch @@ -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) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 57ef470df..fce7912da 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -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) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 27b693359..ed7c6293a 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -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": { |