libfcitx-qt5: update to 1.2.4.

This commit is contained in:
Đoàn Trần Công Danh 2020-05-17 13:25:31 +07:00
parent 937a755478
commit 7c0fdf8560
2 changed files with 25 additions and 30 deletions

View file

@ -1,28 +1,23 @@
diff --git a/dbusaddons/CMakeLists.txt b/dbusaddons/CMakeLists.txt From 2e8be9e242ef146a7baa1f092e56c0ff719bdff1 Mon Sep 17 00:00:00 2001
index 75f4ab8..2299330 100644 From: Weng Xuetian <wengxt@gmail.com>
--- a/dbusaddons/CMakeLists.txt Date: Fri, 15 May 2020 21:40:08 -0700
+++ b/dbusaddons/CMakeLists.txt Subject: [PATCH] Use relative path for header
@@ -51,7 +51,8 @@ generate_export_header(FcitxQt5DBusAddons BASE_NAME FcitxQtDBusAddons)
add_library(FcitxQt5::DBusAddons ALIAS FcitxQt5DBusAddons)
target_include_directories(FcitxQt5DBusAddons PUBLIC "$<BUILD_INTERFACE:${fcitxqtdbusaddons_INCLUDE_DIRS}>") Close #39
-target_include_directories(FcitxQt5DBusAddons INTERFACE "$<INSTALL_INTERFACE:${FcitxQt5_INCLUDE_INSTALL_DIR}/FcitxQtDBusAddons>") ---
+target_include_directories(FcitxQt5DBusAddons CMakeLists.txt | 2 +-
+ INTERFACE $<INSTALL_INTERFACE:include/FcitxQt5/FcitxQtDBusAddons>) 1 file changed, 1 insertion(+), 1 deletion(-)
set_target_properties(FcitxQt5DBusAddons diff --git a/CMakeLists.txt b/CMakeLists.txt
PROPERTIES VERSION 1.0 index d10bb7f..7263bd2 100644
diff --git a/widgetsaddons/CMakeLists.txt b/widgetsaddons/CMakeLists.txt --- a/CMakeLists.txt
index 4d2b29e..bad852e 100644 +++ b/CMakeLists.txt
--- a/widgetsaddons/CMakeLists.txt @@ -37,7 +37,7 @@ find_package(Fcitx 4.2.8 REQUIRED)
+++ b/widgetsaddons/CMakeLists.txt find_package(LibIntl REQUIRED)
@@ -52,7 +52,8 @@ generate_export_header(FcitxQt5WidgetsAddons BASE_NAME FcitxQtWidgetsAddons) endif ()
add_library(FcitxQt5::WidgetsAddons ALIAS FcitxQt5WidgetsAddons)
target_include_directories(FcitxQt5WidgetsAddons PUBLIC "$<BUILD_INTERFACE:${fcitxqtwidgetsaddons_INCLUDE_DIRS}>") -set(FcitxQt5_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}/FcitxQt5)
-target_include_directories(FcitxQt5WidgetsAddons INTERFACE "$<INSTALL_INTERFACE:${FcitxQt5_INCLUDE_INSTALL_DIR}/FcitxQtWidgetsAddons>") +set(FcitxQt5_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/FcitxQt5)
+target_include_directories(FcitxQt5WidgetsAddons
+ INTERFACE $<INSTALL_INTERFACE:include/FcitxQt5/FcitxQtWidgetsAddons>)
set_target_properties(FcitxQt5WidgetsAddons if (ENABLE_LIBRARY)
PROPERTIES VERSION 1.0 add_subdirectory(dbusaddons)

View file

@ -1,18 +1,18 @@
# Template file for 'libfcitx-qt5' # Template file for 'libfcitx-qt5'
pkgname=libfcitx-qt5 pkgname=libfcitx-qt5
version=1.2.3 version=1.2.4
revision=2 revision=1
wrksrc="fcitx-qt5-${version}" wrksrc="fcitx-qt5-${version}"
build_style=cmake build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake hostmakedepends="extra-cmake-modules pkg-config qt5-qmake
qt5-host-tools libfcitx" qt5-host-tools libfcitx"
makedepends="fcitx-devel libxkbcommon-devel qt5-devel" makedepends="fcitx-devel libxkbcommon-devel qt5-devel"
short_desc="Flexible Context-aware Input Tool with eXtension - Qt5 IM module" short_desc="Flexible Context-aware Input Tool with eXtension - Qt5 IM module"
maintainer="Robert La Spina <rkidlaspina@gmail.com>" maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause"
homepage="https://fcitx-im.org/" homepage="https://fcitx-im.org/"
distfiles="http://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-${version}.tar.xz" distfiles="http://download.fcitx-im.org/fcitx-qt5/fcitx-qt5-${version}.tar.xz"
checksum=fef09d3f5a7e6b4860169290c0cfe731a9039793ebbf43f6d823fcb920c3dfa5 checksum=b7030474b72c8fc3d77f329815e5a577d17929b8365dd82fca23200aab12b454
patch_args=-Np1 patch_args=-Np1
post_install() { post_install() {