diff --git a/0001-fix-ButtonHandler-fix-issue-that-program-will-stick-.patch b/0001-fix-ButtonHandler-fix-issue-that-program-will-stick-.patch deleted file mode 100644 index 03f8108..0000000 --- a/0001-fix-ButtonHandler-fix-issue-that-program-will-stick-.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a6530e31cbf761bb6930f43c838decea6cc017aa Mon Sep 17 00:00:00 2001 -From: wangyucheng -Date: Tue, 10 Oct 2023 14:43:33 +0800 -Subject: [PATCH] fix(ButtonHandler): fix issue that program will stick when - multi screen -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复当多屏模式下，不同分辨率时，截图截在大分辨率相比小分辨率多出来的那一部分时应用卡住的问题(#17107, #17108) ---- - src/widgets/capture/buttonhandler.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/widgets/capture/buttonhandler.cpp b/src/widgets/capture/buttonhandler.cpp -index 867a2f2..7f12709 100644 ---- a/src/widgets/capture/buttonhandler.cpp -+++ b/src/widgets/capture/buttonhandler.cpp -@@ -126,10 +126,10 @@ void ButtonHandler::updatePosition(const QRect &selection) { - } - // ElemIndicator, elemsAtCorners - QVector positions = horizontalPoints(center, addCounter, true); -- //moveButtonsToPoints(positions, elemIndicator); -+ moveButtonsToPoints(positions, elemIndicator); - } - // Add buttons at the right side of the seletion -- /*if (!m_blockedRight && elemIndicator < vecLength) { -+ if (!m_blockedRight && elemIndicator < vecLength) { - int addCounter = buttonsPerCol; - addCounter = qBound(0, addCounter, vecLength - elemIndicator); - -@@ -137,9 +137,9 @@ void ButtonHandler::updatePosition(const QRect &selection) { - m_selection.center().y()); - QVector positions = verticalPoints(center, addCounter, false); - moveButtonsToPoints(positions, elemIndicator); -- }*/ -+ } - // Add buttons at the top of the seletion -- /* if (!m_blockedTop && elemIndicator < vecLength) { -+ if (!m_blockedTop && elemIndicator < vecLength) { - int addCounter = buttonsPerRow + elemCornersTop; - addCounter = qBound(0, addCounter, vecLength - elemIndicator); - QPoint center = QPoint(m_selection.center().x(), -@@ -149,9 +149,9 @@ void ButtonHandler::updatePosition(const QRect &selection) { - } - QVector positions = horizontalPoints(center, addCounter, false); - moveButtonsToPoints(positions, elemIndicator); -- }*/ -+ } - // Add buttons at the left side of the seletion -- /*if (!m_blockedLeft && elemIndicator < vecLength) { -+ if (!m_blockedLeft && elemIndicator < vecLength) { - int addCounter = buttonsPerCol; - addCounter = qBound(0, addCounter, vecLength - elemIndicator); - -@@ -159,7 +159,7 @@ void ButtonHandler::updatePosition(const QRect &selection) { - m_selection.center().y()); - QVector positions = verticalPoints(center, addCounter, true); - moveButtonsToPoints(positions, elemIndicator); -- }*/ -+ } - // If there are elements for the next cycle, increase the size of the - // base area - if (elemIndicator < vecLength && !(m_allSidesBlocked)) { --- -2.33.0 - diff --git a/0002-fix-geneneralconf-Fix-the-autostart-failure.patch b/0002-fix-geneneralconf-Fix-the-autostart-failure.patch deleted file mode 100644 index ad0cf75..0000000 --- a/0002-fix-geneneralconf-Fix-the-autostart-failure.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bbc211cb6e341b96966059e5bfcc6a59244b281c Mon Sep 17 00:00:00 2001 -From: luoqing -Date: Wed, 22 Nov 2023 16:04:02 +0800 -Subject: [PATCH] fix(geneneralconf):Fix the autostart failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 修复自启动设置失效 - -Closes #20621,#21058 ---- - src/utils/confighandler.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/utils/confighandler.cpp b/src/utils/confighandler.cpp -index 0c57ad2..b9127d2 100644 ---- a/src/utils/confighandler.cpp -+++ b/src/utils/confighandler.cpp -@@ -285,9 +285,9 @@ void ConfigHandler::setStartupLaunch(const bool start) { - QFile file(path + "Flameshot.desktop"); - if (start) { - if (file.open(QIODevice::WriteOnly)) { -- QByteArray data("[Desktop Entry]\nName=flameshot\nIcon=flameshot" -- "\nExec=flameshot\nTerminal=false\nType=Application" -- "\nX-GNOME-Autostart-enabled=true\n"); -+ QByteArray data("[Desktop Entry]\nName=kiran-flameshot\nIcon=flameshot" -+ "\nExec=kiran-flameshot\nTerminal=false\nType=Application" -+ "\nX-KIRAN-Autostart-enabled=true\n"); - file.write(data); - } - } else { --- -2.33.0 - diff --git a/kiran-flameshot-2.2.3.tar.gz b/kiran-flameshot-2.2.3.tar.gz deleted file mode 100644 index 46a057c..0000000 Binary files a/kiran-flameshot-2.2.3.tar.gz and /dev/null differ diff --git a/kiran-flameshot-2.2.4.tar.gz b/kiran-flameshot-2.2.4.tar.gz new file mode 100644 index 0000000..96c22f3 Binary files /dev/null and b/kiran-flameshot-2.2.4.tar.gz differ diff --git a/kiran-flameshot.spec b/kiran-flameshot.spec index 2429cfd..a231069 100644 --- a/kiran-flameshot.spec +++ b/kiran-flameshot.spec @@ -1,6 +1,6 @@ Name: kiran-flameshot -Version: 2.2.3 -Release: 3 +Version: 2.2.4 +Release: 1 # Main code: GPLv3 # Logo: Free Art License v1.3 @@ -14,8 +14,6 @@ Summary: Powerful and simple to use screenshot software URL: https://github.com/lupoDharkael/flameshot Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch1: 0001-fix-ButtonHandler-fix-issue-that-program-will-stick-.patch -Patch2: 0002-fix-geneneralconf-Fix-the-autostart-failure.patch BuildRequires: pkgconfig(Qt5Widgets) @@ -79,6 +77,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/*.* %changelog +* Fri Nov 24 2023 luoqing - 2.2.4-1 +- rebuild + * Thu Nov 23 2023 luoqing - 2.2.3-3 - KYOS-F: Fix the autostart failure (#20621,#21058)