commit:     ab03eff9efbb6f1899898954ac8c892745fb2fe0
Author:     David Flogeras <dflogeras2 <AT> gmail <DOT> com>
AuthorDate: Fri Mar  8 15:50:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 16:50:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab03eff9

media-libs/kimageannotator: add 0.7.1

Closes: https://bugs.gentoo.org/921699
Closes: https://bugs.gentoo.org/925642
Closes: https://github.com/gentoo/gentoo/pull/35670
Signed-off-by: David Flogeras <dflogeras2 <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/kimageannotator/Manifest                |  1 +
 ...ageannotator-0.7.1-fix_KeyInputHelperTest.patch | 32 ++++++++++++++
 .../kimageannotator/kimageannotator-0.7.1.ebuild   | 51 ++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/media-libs/kimageannotator/Manifest 
b/media-libs/kimageannotator/Manifest
index 0c3c5d3f502e..502b2949bb70 100644
--- a/media-libs/kimageannotator/Manifest
+++ b/media-libs/kimageannotator/Manifest
@@ -1,2 +1,3 @@
 DIST kImageAnnotator-0.6.1.tar.gz 264176 BLAKE2B 
dfbfb50d2187572b0e68f1a699e91391fbb1fbc36f9b44f3ad97cab9e4ab3329e20ae4abe7fc68f1cf8dfd1960f2b03b3d6a6c949b4a7102b0c22d35690b8e05
 SHA512 
92ec8ff06011856e98e5624f9c3d98227e10991385fa41e110187db9b5d7b8de075199844e886618668040b69f8910be51b8cf55a009fac8887954c5b7695b25
 DIST kImageAnnotator-0.7.0.tar.gz 266849 BLAKE2B 
eda6428caf37dedc24f613e513c970a94a0b25f37ea62953a9cf4b7afe3abd01b487f5a19f1c7baa34d9f31dfa0aaefed192f23ca2e3e1f06964cc6e4a951888
 SHA512 
e2a6d3014476fcb6e8838c0d0aa72e4bf5ccf6fbe1314ee6c1f44bb4299c6bd1b04be305e1039628f55e5e5e1626899329d9b93314c1f1fd2870bafaf0a8e2ff
+DIST kImageAnnotator-0.7.1.tar.gz 266861 BLAKE2B 
861aedec7481e022db4c75bcd5d10e202da2073d7ffde7c60ab6ebe16b25d301045c6ef7ade0c69b594719e5094031842b96f62981565f7fe7252474486e41b1
 SHA512 
cb5e7e87f1b7c72108a8ace7fb60ef644e2de19e78b3e61e50e6d534b235710e5e62464f8d136ee46b7f96cb3235601eb80b09b41d972d8df9ef6fe09cb34c95

diff --git 
a/media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch
 
b/media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch
new file mode 100644
index 000000000000..ea8d4b4181d2
--- /dev/null
+++ 
b/media-libs/kimageannotator/files/kimageannotator-0.7.1-fix_KeyInputHelperTest.patch
@@ -0,0 +1,32 @@
+From 81a5af864e39e8f553e79ba83871390f42c65186 Mon Sep 17 00:00:00 2001
+From: dflogeras <[email protected]>
+Date: Fri, 8 Mar 2024 11:12:00 -0400
+Subject: [PATCH] Don't call XCloseDisplay on null object.  Hopefully fixes
+ Issue #335. (#337)
+
+Co-authored-by: Dave Flogeras <[email protected]>
+---
+ src/annotations/items/text/CapsLockStatusChecker.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/annotations/items/text/CapsLockStatusChecker.cpp 
b/src/annotations/items/text/CapsLockStatusChecker.cpp
+index 8bf98438..809e448a 100644
+--- a/src/annotations/items/text/CapsLockStatusChecker.cpp
++++ b/src/annotations/items/text/CapsLockStatusChecker.cpp
+@@ -46,8 +46,8 @@ bool CapsLockStatusChecker::isCapsLockEnabled()
+                       unsigned n;
+                       XkbGetIndicatorState(display, XkbUseCoreKbd, &n);
+                       capsState = (n & 0x01) == 1;
++                      XCloseDisplay(display);
+               }
+-              XCloseDisplay(display);
+               return capsState;
+       }
+ #else
+@@ -55,4 +55,4 @@ bool CapsLockStatusChecker::isCapsLockEnabled()
+ #endif
+ }
+ 
+-} // namespace kImageAnnotator
+\ No newline at end of file
++} // namespace kImageAnnotator

diff --git a/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild 
b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
new file mode 100644
index 000000000000..fd572618ff8e
--- /dev/null
+++ b/media-libs/kimageannotator/kimageannotator-0.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_PN=kImageAnnotator
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for annotating images"
+HOMEPAGE="https://github.com/ksnip/kImageAnnotator";
+SRC_URI="https://github.com/ksnip/${MY_PN}/archive/v${PV}.tar.gz -> 
${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       dev-qt/qtbase:6[gui,widgets]
+       dev-qt/qtsvg:6
+       >=media-libs/kcolorpicker-0.3.1
+       x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto
+       test? (
+               dev-cpp/gtest
+               dev-qt/qtbase:6
+       )
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+PATCHES=( "${FILESDIR}/${P}-fix_KeyInputHelperTest.patch" )
+
+src_configure() {
+       local mycmakeargs=(
+               -DBUILD_TESTS=$(usex test)
+               -DBUILD_WITH_QT6=ON
+       )
+       cmake_src_configure
+}
+
+src_test() {
+       local -x QT_QPA_PLATFORM=offscreen
+       BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
+}

Reply via email to