diff --git a/srcpkgs/libfcitx-qt5/patches/cmake-config-for-cross.patch b/srcpkgs/libfcitx-qt5/patches/cmake-config-for-cross.patch index 44a1d4e3135..159365f122d 100644 --- a/srcpkgs/libfcitx-qt5/patches/cmake-config-for-cross.patch +++ b/srcpkgs/libfcitx-qt5/patches/cmake-config-for-cross.patch @@ -1,28 +1,23 @@ -diff --git a/dbusaddons/CMakeLists.txt b/dbusaddons/CMakeLists.txt -index 75f4ab8..2299330 100644 ---- a/dbusaddons/CMakeLists.txt -+++ b/dbusaddons/CMakeLists.txt -@@ -51,7 +51,8 @@ generate_export_header(FcitxQt5DBusAddons BASE_NAME FcitxQtDBusAddons) - add_library(FcitxQt5::DBusAddons ALIAS FcitxQt5DBusAddons) +From 2e8be9e242ef146a7baa1f092e56c0ff719bdff1 Mon Sep 17 00:00:00 2001 +From: Weng Xuetian +Date: Fri, 15 May 2020 21:40:08 -0700 +Subject: [PATCH] Use relative path for header + +Close #39 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d10bb7f..7263bd2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,7 +37,7 @@ find_package(Fcitx 4.2.8 REQUIRED) + find_package(LibIntl REQUIRED) + endif () - target_include_directories(FcitxQt5DBusAddons PUBLIC "$") --target_include_directories(FcitxQt5DBusAddons INTERFACE "$") -+target_include_directories(FcitxQt5DBusAddons -+ INTERFACE $) +-set(FcitxQt5_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/FcitxQt5) ++set(FcitxQt5_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/FcitxQt5) - set_target_properties(FcitxQt5DBusAddons - PROPERTIES VERSION 1.0 -diff --git a/widgetsaddons/CMakeLists.txt b/widgetsaddons/CMakeLists.txt -index 4d2b29e..bad852e 100644 ---- a/widgetsaddons/CMakeLists.txt -+++ b/widgetsaddons/CMakeLists.txt -@@ -52,7 +52,8 @@ generate_export_header(FcitxQt5WidgetsAddons BASE_NAME FcitxQtWidgetsAddons) - add_library(FcitxQt5::WidgetsAddons ALIAS FcitxQt5WidgetsAddons) - - target_include_directories(FcitxQt5WidgetsAddons PUBLIC "$") --target_include_directories(FcitxQt5WidgetsAddons INTERFACE "$") -+target_include_directories(FcitxQt5WidgetsAddons -+ INTERFACE $) - - set_target_properties(FcitxQt5WidgetsAddons - PROPERTIES VERSION 1.0 + if (ENABLE_LIBRARY) + add_subdirectory(dbusaddons) diff --git a/srcpkgs/libfcitx-qt5/template b/srcpkgs/libfcitx-qt5/template index d5fb0e7aff9..60bc380b9a6 100644 --- a/srcpkgs/libfcitx-qt5/template +++ b/srcpkgs/libfcitx-qt5/template @@ -1,18 +1,18 @@ # Template file for 'libfcitx-qt5' pkgname=libfcitx-qt5 -version=1.2.3 -revision=2 +version=1.2.4 +revision=1 wrksrc="fcitx-qt5-${version}" build_style=cmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools libfcitx" makedepends="fcitx-devel libxkbcommon-devel qt5-devel" short_desc="Flexible Context-aware Input Tool with eXtension - Qt5 IM module" -maintainer="Robert La Spina " +maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/" distfiles="http://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-${version}.tar.xz" -checksum=fef09d3f5a7e6b4860169290c0cfe731a9039793ebbf43f6d823fcb920c3dfa5 +checksum=b7030474b72c8fc3d77f329815e5a577d17929b8365dd82fca23200aab12b454 patch_args=-Np1 post_install() {