From 0d70d73100834c22df9a8d2f71c137635270e383 Mon Sep 17 00:00:00 2001 From: nick black Date: Sat, 8 May 2021 13:48:14 -0400 Subject: [PATCH] Write Requires.private in pc files based off discovered TERMINFO_LIBRARIES #1635 --- CMakeLists.txt | 1 + src/lib/kitty.c | 2 +- tools/notcurses-core.pc.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24bffc8c0..df0629586 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,7 @@ set_package_properties(Threads PROPERTIES TYPE REQUIRED) pkg_search_module(TERMINFO REQUIRED tinfo>=6.1 ncursesw>=6.1) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND terminfo) set_package_properties(terminfo PROPERTIES TYPE REQUIRED) +set(PKGCONF_REQ_PRIV "${TERMINFO_LIBRARIES}") pkg_search_module(READLINE REQUIRED readline>=8.0) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND readline) set_package_properties(readline PROPERTIES TYPE REQUIRED) diff --git a/src/lib/kitty.c b/src/lib/kitty.c index 8eb18afdb..57a9175bb 100644 --- a/src/lib/kitty.c +++ b/src/lib/kitty.c @@ -447,7 +447,7 @@ write_kitty_data(FILE* fp, int linesize, int leny, int lenx, *parse_start = fprintf(fp, "\e_Gf=32,s=%d,v=%d,i=%d,a=T,%c=1;", lenx, leny, sprixelid, chunks ? 'm' : 'q'); }else{ - fprintf(fp, "\e_G%sm=%d;", chunks ? "" : "q=1,", chunks ? 1 : 0); + fprintf(fp, "\e_G%sm=%d;", chunks ? "" : "q=2,", chunks ? 1 : 0); } if((targetout += RGBA_MAXLEN) > total){ targetout = total; diff --git a/tools/notcurses-core.pc.in b/tools/notcurses-core.pc.in index 27bccc7e2..0663bfcc9 100644 --- a/tools/notcurses-core.pc.in +++ b/tools/notcurses-core.pc.in @@ -8,7 +8,7 @@ Description: TUI library for modern terminal emulators (core library) Version: @PROJECT_VERSION@ Requires: -Requires.private: tinfo +Requires.private: @PKGCONF_REQ_PRIV@ Libs: -L${libdir} -lnotcurses-core Libs.private: -lunistring -lm Cflags: -I${includedir}