diff options
Diffstat (limited to 'source/x')
5 files changed, 4 insertions, 58 deletions
diff --git a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild index 0998ce454..1580fca71 100755 --- a/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild +++ b/source/x/fcitx5-chinese-addons/fcitx5-chinese-addons.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fcitx5-chinese-addons VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | cut -f 2- -d _ | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} 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 deleted file mode 100644 index 260113583..000000000 --- a/source/x/fcitx5-kkc/0001-remove-std-c-11-from-gui-CMakeLists.txt.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 fd366ded0..8168ed344 100755 --- a/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild +++ b/source/x/fcitx5-kkc/fcitx5-kkc.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2015-2016 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2016, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -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:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,8 +76,6 @@ 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 \) \ diff --git a/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch b/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch deleted file mode 100644 index 0e8a33913..000000000 --- a/source/x/fcitx5/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7fb3a5500270877d93b61b11b2a17b9b8f6a506b Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wengxt@gmail.com> -Date: Sat, 20 May 2023 20:02:24 -0700 -Subject: [PATCH] Fix compatiblity with fmt 10.0 - -Fix #797 ---- - src/modules/dbus/dbusmodule.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp -index a7196676..6bebee30 100644 ---- a/src/modules/dbus/dbusmodule.cpp -+++ b/src/modules/dbus/dbusmodule.cpp -@@ -570,8 +570,9 @@ class Controller1 : public ObjectVTable<Controller1> { - ss << fmt::format("{:02x}", static_cast<int>(v)); - } - ss << "] program:" << ic->program() -- << " frontend:" << ic->frontend() -- << " cap:" << fmt::format("{:x}", ic->capabilityFlags()) -+ << " frontend:" << ic->frontend() << " cap:" -+ << fmt::format("{:x}", -+ static_cast<uint64_t>(ic->capabilityFlags())) - << " focus:" << ic->hasFocus() << std::endl; - return true; - }); diff --git a/source/x/fcitx5/fcitx5.SlackBuild b/source/x/fcitx5/fcitx5.SlackBuild index ce3d80a10..cda538784 100755 --- a/source/x/fcitx5/fcitx5.SlackBuild +++ b/source/x/fcitx5/fcitx5.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2012 vvoody <vvoodywang@gmail.com> -# Copyright 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2018, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # # All rights reserved. # @@ -87,8 +87,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/7fb3a5500270877d93b61b11b2a17b9b8f6a506b.patch.gz | patch -p1 --verbose || exit 1 - mkdir build cd build cmake \ |