diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-03-18 18:42:32 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-03-18 21:37:24 +0100 |
commit | ced006913d987c7748685f55c460d23e50091a8a (patch) | |
tree | aab12822fe62b43127067c3f5dc46d128c4df121 /source/x | |
parent | 0a9c4a21e16a4b14718a29c1cd1e58a2800926c1 (diff) | |
download | current-ced006913d987c7748685f55c460d23e50091a8a.tar.gz current-ced006913d987c7748685f55c460d23e50091a8a.tar.xz |
Sat Mar 18 18:42:32 UTC 202320230318184232
l/glibmm-2.66.6-x86_64-1.txz: Upgraded.
n/postfix-3.7.4-x86_64-4.txz: Rebuilt.
Fixes warning about being compiled with a different version of OpenSSL.
Thanks to gildbg.
x/fcitx5-5.0.23-x86_64-1.txz: Upgraded.
x/fcitx5-kkc-5.0.12-x86_64-2.txz: Rebuilt.
Patched to fix FTBFS. Thanks to nobodino and marav.
Diffstat (limited to 'source/x')
-rw-r--r-- | source/x/fcitx5-kkc/0001-remove-std-c-11-from-gui-CMakeLists.txt.patch | 24 | ||||
-rwxr-xr-x | source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/source/x/fcitx5-kkc/0001-remove-std-c-11-from-gui-CMakeLists.txt.patch b/source/x/fcitx5-kkc/0001-remove-std-c-11-from-gui-CMakeLists.txt.patch new file mode 100644 index 000000000..260113583 --- /dev/null +++ b/source/x/fcitx5-kkc/0001-remove-std-c-11-from-gui-CMakeLists.txt.patch @@ -0,0 +1,24 @@ +From 418c44e61fcda33e809076d1817acc2f2362d409 Mon Sep 17 00:00:00 2001 +From: Qiyu Yan <yanqiyu@fedoraproject.org> +Date: Sun, 12 Mar 2023 12:48:39 +0800 +Subject: [PATCH] remove -std=c++11 from gui/CMakeLists.txt + +--- + gui/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt +index 38b50d4..2327132 100644 +--- a/gui/CMakeLists.txt ++++ b/gui/CMakeLists.txt +@@ -17,7 +17,7 @@ qt5_wrap_ui(KKC_CONFIG_SRCS dictwidget.ui adddictdialog.ui shortcutwidget.ui add + add_library(fcitx5-kkc-config + MODULE ${KKC_CONFIG_SRCS}) + +-add_definitions(-DQT_NO_KEYWORDS -std=c++11) ++add_definitions(-DQT_NO_KEYWORDS) + + target_include_directories(fcitx5-kkc-config PRIVATE ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + +-- +2.39.2 diff --git a/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild b/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild index 072f46920..fd366ded0 100755 --- a/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild +++ b/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fcitx5-kkc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,6 +76,8 @@ rm -rf fcitx5-kkc-$VERSION tar xvf $CWD/fcitx5-kkc-$VERSION.tar.?z || exit 1 cd fcitx5-kkc-$VERSION || exit 1 +zcat $CWD/0001-remove-std-c-11-from-gui-CMakeLists.txt.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |