[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2024-03-11 Thread Sam James 
commit: 2f8c57b46ad5450a60adadafdf189f0631500857
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Mar 12 04:54:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 12 05:15:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f8c57b4

media-gfx/flameshot: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/859613
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/flameshot/flameshot-12.1.0-r2.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
index c24b2ab6ac05..b01a0e3e9fc2 100644
--- a/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2023 Gentoo Authors
+# Copyright 2021-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
@@ -37,6 +37,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # https://bugs.gentoo.org/859613
+   # https://github.com/flameshot-org/flameshot/issues/3531
+   #
+   # Do not trust with LTO either
+   append-flags -fno-strict-aliasing
+   filter-lto
+
local mycmakeargs=(
-DUSE_EXTERNAL_SINGLEAPPLICATION=1
-DENABLE_CACHE=0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2023-04-25 Thread Sam James 
commit: 1bca85e2acf03e9d8870a86feafdeeb5245eb658
Author: Huang Rui  gmail  com>
AuthorDate: Wed Apr 19 02:26:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 26 04:02:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bca85e2

media-gfx/flameshot: depend on kde-frameworks/kguiaddons:5

Depend on kde-frameworks/kguiaddons:5 or otherwise this will fail
right again once kguiaddons:6 comes around.

Bug: https://bugs.gentoo.org/904266
Signed-off-by: Huang Rui  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30646
Signed-off-by: Sam James  gentoo.org>

 .../{flameshot-12.0.0-r1.ebuild => flameshot-12.0.0-r2.ebuild}  | 2 +-
 .../{flameshot-12.1.0-r1.ebuild => flameshot-12.1.0-r2.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-12.0.0-r1.ebuild 
b/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild
similarity index 95%
rename from media-gfx/flameshot/flameshot-12.0.0-r1.ebuild
rename to media-gfx/flameshot/flameshot-12.0.0-r2.ebuild
index 35e2aa26f399..708edafe52aa 100644
--- a/media-gfx/flameshot/flameshot-12.0.0-r1.ebuild
+++ b/media-gfx/flameshot/flameshot-12.0.0-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
sys-apps/dbus
-   wayland? ( kde-frameworks/kguiaddons )
+   wayland? ( kde-frameworks/kguiaddons:5 )
 "
 BDEPEND="
dev-qt/linguist-tools:5

diff --git a/media-gfx/flameshot/flameshot-12.1.0-r1.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
similarity index 95%
rename from media-gfx/flameshot/flameshot-12.1.0-r1.ebuild
rename to media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
index f88dd873b6b5..c24b2ab6ac05 100644
--- a/media-gfx/flameshot/flameshot-12.1.0-r1.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
sys-apps/dbus
-   wayland? ( kde-frameworks/kguiaddons )
+   wayland? ( kde-frameworks/kguiaddons:5 )
 "
 BDEPEND="
dev-qt/linguist-tools:5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2023-04-13 Thread Sam James 
commit: 5575fcf2bf5b7a54187c7d6aef60ad631bf1db6d
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 13 10:04:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 01:05:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5575fcf2

media-gfx/flameshot: add github upstream metadata

Signed-off-by: Huang Rui  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30580
Signed-off-by: Sam James  gentoo.org>

 media-gfx/flameshot/metadata.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/media-gfx/flameshot/metadata.xml b/media-gfx/flameshot/metadata.xml
index bdd7288cc17a..d52ef8aac3ff 100644
--- a/media-gfx/flameshot/metadata.xml
+++ b/media-gfx/flameshot/metadata.xml
@@ -9,4 +9,14 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   flameshot-org/flameshot
+   
+   
+   Flameshot is a screenshot tool that aims to be powerful yet
+   simple-to-use. Its notable features include customizable 
appearance,
+   in-app screenshot editing, D-Bus interface, tray icon support,
+   experimental GNOME/KDE Wayland support, integration with Imgur 
and
+   support for both GUI and CLI interface.
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2023-04-13 Thread Sam James 
commit: 34aaa2a10885275756493b0e234bc1c1060c8ba8
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 13 10:03:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 01:05:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34aaa2a1

media-gfx/flameshot: backport wayland fix to 12.0.0

Issue: https://bugs.gentoo.org/904266
Signed-off-by: Huang Rui  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../{flameshot-12.0.0.ebuild => flameshot-12.0.0-r1.ebuild} | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-12.0.0.ebuild 
b/media-gfx/flameshot/flameshot-12.0.0-r1.ebuild
similarity index 86%
rename from media-gfx/flameshot/flameshot-12.0.0.ebuild
rename to media-gfx/flameshot/flameshot-12.0.0-r1.ebuild
index cccbfdf33cd5..35e2aa26f399 100644
--- a/media-gfx/flameshot/flameshot-12.0.0.ebuild
+++ b/media-gfx/flameshot/flameshot-12.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,16 +12,18 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="wayland"
 
 DEPEND="
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
dev-qt/qtcore:5
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
-   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
-   dev-qt/qtwidgets:5
-   dev-qt/qtsvg:5
dev-qt/qtnetwork:5
-   dev-qt/qtdbus:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
sys-apps/dbus
+   wayland? ( kde-frameworks/kguiaddons )
 "
 BDEPEND="
dev-qt/linguist-tools:5
@@ -38,6 +40,7 @@ src_configure() {
local mycmakeargs=(
-DUSE_EXTERNAL_SINGLEAPPLICATION=1
-DENABLE_CACHE=0
+   -DUSE_WAYLAND_CLIPBOARD=$(usex wayland)
)
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2023-04-13 Thread Sam James 
commit: 9474805514651c85628be780897a6317804d9716
Author: Huang Rui  gmail  com>
AuthorDate: Thu Apr 13 10:00:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 01:05:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94748055

media-gfx/flameshot: fix wayland clipboard behavior

Closes: https://bugs.gentoo.org/904266
Signed-off-by: Huang Rui  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../{flameshot-12.1.0.ebuild => flameshot-12.1.0-r1.ebuild}   | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0-r1.ebuild
similarity index 90%
rename from media-gfx/flameshot/flameshot-12.1.0.ebuild
rename to media-gfx/flameshot/flameshot-12.1.0-r1.ebuild
index fa3545cbb409..f88dd873b6b5 100644
--- a/media-gfx/flameshot/flameshot-12.1.0.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0-r1.ebuild
@@ -12,16 +12,18 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
+IUSE="wayland"
 
 DEPEND="
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
dev-qt/qtcore:5
+   dev-qt/qtdbus:5
dev-qt/qtgui:5
-   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
-   dev-qt/qtwidgets:5
-   dev-qt/qtsvg:5
dev-qt/qtnetwork:5
-   dev-qt/qtdbus:5
+   dev-qt/qtsvg:5
+   dev-qt/qtwidgets:5
sys-apps/dbus
+   wayland? ( kde-frameworks/kguiaddons )
 "
 BDEPEND="
dev-qt/linguist-tools:5
@@ -38,6 +40,7 @@ src_configure() {
local mycmakeargs=(
-DUSE_EXTERNAL_SINGLEAPPLICATION=1
-DENABLE_CACHE=0
+   -DUSE_WAYLAND_CLIPBOARD=$(usex wayland)
)
 
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2023-02-28 Thread Arthur Zamarin 
commit: 0cab05589d51056b76d9beaf3de4287d3bbf1990
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Feb 28 18:20:48 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Feb 28 18:20:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cab0558

media-gfx/flameshot: Keyword 12.1.0 arm64, #898462

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/flameshot/flameshot-12.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0.ebuild
index eaeba5e61c70..fa3545cbb409 100644
--- a/media-gfx/flameshot/flameshot-12.1.0.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
dev-qt/qtcore:5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-10-27 Thread Joonas Niilola 
commit: d83fae87a7946a238f7aed0adbb2444729f5d67a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 27 07:51:05 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 27 07:51:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d83fae87

media-gfx/flameshot: Stabilize 12.1.0 amd64, #875875

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-12.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0.ebuild
index cccbfdf33cd5..a482a98d2081 100644
--- a/media-gfx/flameshot/flameshot-12.1.0.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
dev-qt/qtcore:5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-10-27 Thread Joonas Niilola 
commit: 26f72a8c95e1e7db1f3d32c33fade51ecde7405a
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 27 07:51:37 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 27 07:51:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f72a8c

media-gfx/flameshot: Stabilize 12.1.0 x86, #875875

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-12.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0.ebuild
index a482a98d2081..eaeba5e61c70 100644
--- a/media-gfx/flameshot/flameshot-12.1.0.ebuild
+++ b/media-gfx/flameshot/flameshot-12.1.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
dev-qt/qtcore:5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-07-25 Thread Joonas Niilola 
commit: 1cd858abe9b419e1560d6128db75c01bf8a403fe
Author: Douglas Agbeve  agbeve  com>
AuthorDate: Fri Jul 15 10:20:47 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 25 06:04:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd858ab

media-gfx/flameshot: bump to v12.1.0

Signed-off-by: Douglas Agbeve  agbeve.com>
Closes: https://github.com/gentoo/gentoo/pull/26418
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/Manifest|  1 +
 media-gfx/flameshot/flameshot-12.1.0.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index a4d8ebbe281f..e735adbfa0b3 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,3 +1,4 @@
 DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B 
c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692
 SHA512 
b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
 DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 
1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018
 SHA512 
de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f
 DIST flameshot-12.0.0.tar.gz 15617684 BLAKE2B 
0c878c1efae7b1dd7fccc50471bb810bbf6067bcb1fe26b73965d4f5a78e514e33d74f4a0c28e68ff4e15875ec5d6f9eccfc91ee1635b6e0d31bb50133182277
 SHA512 
8a7d0878ff57f9c3fcb12791c33f2c11de08b057a68bb50684dd9195fbba8557e71236bc4f8a5f50062af021ed970d5b4362fc2bfdc90415143d7597c3df50f0
+DIST flameshot-12.1.0.tar.gz 15618560 BLAKE2B 
975019d71a31f32785f081a05d224f72927628a1142697ba7ef9646f65d2cf1dcb5457633522143201716fe20a320224c95047904408dc411975c3e711e48002
 SHA512 
159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c

diff --git a/media-gfx/flameshot/flameshot-12.1.0.ebuild 
b/media-gfx/flameshot/flameshot-12.1.0.ebuild
new file mode 100644
index ..cccbfdf33cd5
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-12.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
+SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
+   dev-qt/qtwidgets:5
+   dev-qt/qtsvg:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtdbus:5
+   sys-apps/dbus
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   rm -r external/singleapplication || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_EXTERNAL_SINGLEAPPLICATION=1
+   -DENABLE_CACHE=0
+   )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/

2022-07-16 Thread Joonas Niilola 
commit: bad297f8438fabd719c108050ccc316fa22e6058
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Jul 15 18:30:42 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 16 07:16:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad297f8

media-gfx/flameshot: remove unused patch(es)

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26425
Signed-off-by: Joonas Niilola  gentoo.org>

 .../flameshot-0.6.0-missing-include-fix.patch  | 22 -
 ...meshot-0.6.0-unbundle-qtsingleapplication.patch | 47 ---
 .../files/flameshot-0.9.0-dont-force-ccache.patch  | 13 ---
 ...meshot-0.9.0-unbundle-qtsingleapplication.patch | 96 --
 4 files changed, 178 deletions(-)

diff --git 
a/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch 
b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
deleted file mode 100644
index f6b2ea457cbf..
--- a/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 
b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
 a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 
22:47:56.18313 +0300
-+++ b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 
22:52:19.147998709 +0300
-@@ -24,6 +24,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-diff -ru a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h
 a/src/tools/arrow/arrowtool.h  2020-05-29 22:47:56.18429 +0300
-+++ b/src/tools/arrow/arrowtool.h  2020-05-29 22:48:25.688787364 +0300
-@@ -19,6 +19,7 @@
- 
- #include "src/tools/abstracttwopointtool.h"
- #include 
-+#include 
- 
- class ArrowTool : public AbstractTwoPointTool {
- Q_OBJECT

diff --git 
a/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch 
b/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 7973aa1d06c8..
--- 
a/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ruN a/flameshot.pro b/flameshot.pro
 a/flameshot.pro2020-05-25 21:16:54.044214597 +0300
-+++ b/flameshot.pro2020-05-25 21:25:03.808676488 +0300
-@@ -18,7 +18,7 @@
- QT  += dbus
- }
- 
--CONFIG += c++11 link_pkgconfig
-+CONFIG += c++11 link_pkgconfig qtsingleapplication
- 
- #CONFIG += packaging   # Enables "make install" for packaging paths
- 
-@@ -63,7 +63,6 @@
- 
- DEFINES += QT_DEPRECATED_WARNINGS
- 
--include(src/third-party/singleapplication/singleapplication.pri)
- include(src/third-party/Qt-Color-Widgets//color_widgets.pri)
- 
- DEFINES += QAPPLICATION_CLASS=QApplication
-diff -ruN a/src/main.cpp b/src/main.cpp
 a/src/main.cpp 2020-05-25 21:16:54.055215952 +0300
-+++ b/src/main.cpp 2020-05-25 21:25:35.095744395 +0300
-@@ -16,13 +16,13 @@
- // along with Flameshot.  If not, see .
- 
- #include "src/core/controller.h"
--#include "singleapplication.h"
- #include "src/utils/filenamehandler.h"
- #include "src/utils/confighandler.h"
- #include "src/cli/commandlineparser.h"
- #include "src/utils/systemnotification.h"
- #include "src/utils/pathinfo.h"
- #include "src/core/capturerequest.h"
-+#include 
- #include 
- #include 
- #include 
-@@ -44,7 +44,7 @@
- 
- // no arguments, just launch Flameshot
- if (argc == 1) {
--SingleApplication app(argc, argv);
-+QtSingleApplication app(argc, argv);
- 
- QTranslator translator;
- QStringList trPaths = PathInfo::translationsPaths();

diff --git a/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch 
b/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch
deleted file mode 100644
index 85f43fc6c98e..
--- a/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2021-05-03 12:55:07.561259897 +0300
-+++ b/CMakeLists.txt   2021-05-03 12:55:36.772461830 +0300
-@@ -70,9 +70,6 @@
- 
- add_library(project_warnings INTERFACE)
- 
--# enable cache system
--include(cmake/Cache.cmake)
--
- # standard compiler warnings
- include(cmake/CompilerWarnings.cmake)
- # set_project_warnings(project_warnings)

diff --git 
a/media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch 
b/media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch
deleted file mode 100644
index 20e8f6bb5f31..
--- 
a/media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ruN a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2021-04-28 20:19:06.995353847 +0300

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-07-05 Thread Joonas Niilola 
commit: cd9dd5cdb38ec11745ccad8cd80ece1d3742315a
Author: Douglas Agbeve  agbeve  com>
AuthorDate: Thu Jun 23 08:42:39 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jul  5 07:40:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9dd5cd

media-gfx/flameshot: bump to v12.0.0

Signed-off-by: Douglas Agbeve  agbeve.com>
Closes: https://github.com/gentoo/gentoo/pull/26055
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/Manifest|  1 +
 media-gfx/flameshot/flameshot-12.0.0.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index dc32d88dbd68..6456a03354b2 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -3,3 +3,4 @@ DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B 
c7c7402d0cb6234473018571e67c39aebec
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 
38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46
 SHA512 
888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11
 DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 
1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018
 SHA512 
de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f
+DIST flameshot-12.0.0.tar.gz 15617684 BLAKE2B 
0c878c1efae7b1dd7fccc50471bb810bbf6067bcb1fe26b73965d4f5a78e514e33d74f4a0c28e68ff4e15875ec5d6f9eccfc91ee1635b6e0d31bb50133182277
 SHA512 
8a7d0878ff57f9c3fcb12791c33f2c11de08b057a68bb50684dd9195fbba8557e71236bc4f8a5f50062af021ed970d5b4362fc2bfdc90415143d7597c3df50f0

diff --git a/media-gfx/flameshot/flameshot-12.0.0.ebuild 
b/media-gfx/flameshot/flameshot-12.0.0.ebuild
new file mode 100644
index ..cccbfdf33cd5
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-12.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
+SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
+   dev-qt/qtwidgets:5
+   dev-qt/qtsvg:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtdbus:5
+   sys-apps/dbus
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   rm -r external/singleapplication || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_EXTERNAL_SINGLEAPPLICATION=1
+   -DENABLE_CACHE=0
+   )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-07-05 Thread Joonas Niilola 
commit: 6d61c899e6875a22c461cdeb039495575cc0dcec
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jul  5 07:40:01 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jul  5 07:40:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d61c899

media-gfx/flameshot: drop 0.6.0-r1, 0.9.0-r1, 0.10.1

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/Manifest  |  3 --
 media-gfx/flameshot/flameshot-0.10.1.ebuild   | 47 -
 media-gfx/flameshot/flameshot-0.6.0-r1.ebuild | 59 ---
 media-gfx/flameshot/flameshot-0.9.0-r1.ebuild | 51 ---
 4 files changed, 160 deletions(-)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 6456a03354b2..a4d8ebbe281f 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,6 +1,3 @@
-DIST flameshot-0.10.1.tar.gz 7726725 BLAKE2B 
7045e7f86fc835a49a814b6fb86c2d413422a323925d358cc37d6263b8a1ca9415f134caf72700ebe138621a5687d9245dc96edf8f0597eb1e974edf5bf699f1
 SHA512 
dca9c48b284d23b67cb71ff78d79b87887506bf5b30600c5d9ee78f5fadebab6d507674abeeae0c5cdf4a149e71df60666299c7db10168613c03467c7aafa7cf
 DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B 
c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692
 SHA512 
b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
-DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
-DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 
38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46
 SHA512 
888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11
 DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 
1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018
 SHA512 
de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f
 DIST flameshot-12.0.0.tar.gz 15617684 BLAKE2B 
0c878c1efae7b1dd7fccc50471bb810bbf6067bcb1fe26b73965d4f5a78e514e33d74f4a0c28e68ff4e15875ec5d6f9eccfc91ee1635b6e0d31bb50133182277
 SHA512 
8a7d0878ff57f9c3fcb12791c33f2c11de08b057a68bb50684dd9195fbba8557e71236bc4f8a5f50062af021ed970d5b4362fc2bfdc90415143d7597c3df50f0

diff --git a/media-gfx/flameshot/flameshot-0.10.1.ebuild 
b/media-gfx/flameshot/flameshot-0.10.1.ebuild
deleted file mode 100644
index fc16ba761736..
--- a/media-gfx/flameshot/flameshot-0.10.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
-SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
-   dev-qt/qtwidgets:5
-   dev-qt/qtsvg:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtdbus:5
-   sys-apps/dbus
-   dev-libs/spdlog:=
-"
-BDEPEND="
-   dev-qt/linguist-tools:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-   rm -r external/spdlog || die
-   rm -r external/singleapplication || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DUSE_EXTERNAL_SPDLOG=1
-   -DUSE_EXTERNAL_SINGLEAPPLICATION=1
-   -DENABLE_CACHE=0
-   )
-
-   cmake_src_configure
-}

diff --git a/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
deleted file mode 100644
index a83757d63d11..
--- a/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg-utils
-
-DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
-SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Free-Art-1.3 GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtsingleapplication[qt5(+),X]
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-03-17 Thread Joonas Niilola 
commit: 04628d662b75cb81fcb5e349a668e3fead348b40
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 17 08:54:05 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 17 08:56:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04628d66

media-gfx/flameshot: stabilize 0.10.2 for amd64

Bug: https://bugs.gentoo.org/828361
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.10.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild 
b/media-gfx/flameshot/flameshot-0.10.2.ebuild
index f7e216a175dc..53cdaae3c9dc 100644
--- a/media-gfx/flameshot/flameshot-0.10.2.ebuild
+++ b/media-gfx/flameshot/flameshot-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
dev-qt/qtcore:5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-03-17 Thread Joonas Niilola 
commit: a773ad363c246ef5d67581f7006b15a353459f99
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Mar 17 08:56:34 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 17 08:56:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a773ad36

media-gfx/flameshot: stabilize 0.10.2 for x86

Closes: https://bugs.gentoo.org/828361
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.10.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild 
b/media-gfx/flameshot/flameshot-0.10.2.ebuild
index 53cdaae3c9dc..9edb962ea42d 100644
--- a/media-gfx/flameshot/flameshot-0.10.2.ebuild
+++ b/media-gfx/flameshot/flameshot-0.10.2.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
dev-qt/qtcore:5

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2022-02-27 Thread Joonas Niilola 
commit: 6b890227f1982290c1c61aef3beac10e829bcd24
Author: Pavel Kalugin  pavelthebest  me>
AuthorDate: Mon Feb  7 12:50:58 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Feb 27 13:29:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b890227

media-gfx/flameshot: version bump to v11.0.0

- Remove spdlog dependency

Note a change in versioning scheme: leading zero has been dropped

Closes: https://bugs.gentoo.org/831475
Signed-off-by: Pavel Kalugin  pavelthebest.me>
Closes: https://github.com/gentoo/gentoo/pull/24112
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/Manifest|  1 +
 media-gfx/flameshot/flameshot-11.0.0.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index dd2fa89381d1..dc32d88dbd68 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -2,3 +2,4 @@ DIST flameshot-0.10.1.tar.gz 7726725 BLAKE2B 
7045e7f86fc835a49a814b6fb86c2d41342
 DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B 
c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692
 SHA512 
b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 
38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46
 SHA512 
888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11
+DIST flameshot-11.0.0.tar.gz 12662479 BLAKE2B 
1adef0196a449c33ea57ecd214ad890f44a8530c9c1116d5bdc29074835c040c8fbbec207501e597fb09887ab1e80e937e8412acdc7eb38c8619aa993f986018
 SHA512 
de13f3c5bc18f164c6e37c0b3f42c8693d3ebfaba5f3d54360899df6479390e2a0c38970fa2595c9293304b4e52ca2198477f4f317abcb11df4c30a24ab1909f

diff --git a/media-gfx/flameshot/flameshot-11.0.0.ebuild 
b/media-gfx/flameshot/flameshot-11.0.0.ebuild
new file mode 100644
index ..cccbfdf33cd5
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-11.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
+SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
+   dev-qt/qtwidgets:5
+   dev-qt/qtsvg:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtdbus:5
+   sys-apps/dbus
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   rm -r external/singleapplication || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_EXTERNAL_SINGLEAPPLICATION=1
+   -DENABLE_CACHE=0
+   )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2021-11-29 Thread Joonas Niilola 
commit: 8a13eae3dceaaafbe7365ba0c1fe2ec491a673bb
Author: Douglas Agbeve  agbeve  com>
AuthorDate: Fri Nov 26 13:35:43 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov 30 07:27:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a13eae3

media-gfx/flameshot: bump to v0.10.2

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Douglas Agbeve  agbeve.com>
Closes: https://github.com/gentoo/gentoo/pull/23090
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/Manifest|  1 +
 media-gfx/flameshot/flameshot-0.10.2.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 1d536a4b067f..dd2fa89381d1 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,3 +1,4 @@
 DIST flameshot-0.10.1.tar.gz 7726725 BLAKE2B 
7045e7f86fc835a49a814b6fb86c2d413422a323925d358cc37d6263b8a1ca9415f134caf72700ebe138621a5687d9245dc96edf8f0597eb1e974edf5bf699f1
 SHA512 
dca9c48b284d23b67cb71ff78d79b87887506bf5b30600c5d9ee78f5fadebab6d507674abeeae0c5cdf4a149e71df60666299c7db10168613c03467c7aafa7cf
+DIST flameshot-0.10.2.tar.gz 7726687 BLAKE2B 
c7c7402d0cb6234473018571e67c39aebec3b4afa398fc2ef590f64527980ca218b1ebd8228ea47a3f9fd76e0edc2f8e1662965f79817bf6461bf0fc64d8b692
 SHA512 
b0eb1decd87dab1d4a375708448dd4c6f85c101d33814b76edbb328150d0e9ee7a588be698fddcb24e70e39cd4331f9aa2ff082525ff6975d52303a6d9c1ab12
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 
38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46
 SHA512 
888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11

diff --git a/media-gfx/flameshot/flameshot-0.10.2.ebuild 
b/media-gfx/flameshot/flameshot-0.10.2.ebuild
new file mode 100644
index ..f7e216a175dc
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-0.10.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
+SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
+   dev-qt/qtwidgets:5
+   dev-qt/qtsvg:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtdbus:5
+   sys-apps/dbus
+   dev-libs/spdlog:=
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   rm -r external/spdlog || die
+   rm -r external/singleapplication || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_EXTERNAL_SPDLOG=1
+   -DUSE_EXTERNAL_SINGLEAPPLICATION=1
+   -DENABLE_CACHE=0
+   )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2021-07-27 Thread Ionen Wolkens 
commit: 1636216136596f19164d4fc775bffc50a5602fd1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jul 27 17:51:56 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul 27 18:18:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16362161

media-gfx/flameshot: remove unused desktop inherit

Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/flameshot/flameshot-0.10.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/flameshot/flameshot-0.10.1.ebuild 
b/media-gfx/flameshot/flameshot-0.10.1.ebuild
index ae9c8e477d2..fc16ba76173 100644
--- a/media-gfx/flameshot/flameshot-0.10.1.ebuild
+++ b/media-gfx/flameshot/flameshot-0.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake desktop xdg
+inherit cmake xdg
 
 DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2021-07-27 Thread Ionen Wolkens 
commit: 80cad85eafac14c1f0a2215fbef101c4d5ef6513
Author: Douglas Agbeve  agbeve  com>
AuthorDate: Mon Jul 26 16:06:31 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul 27 18:18:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cad85e

media-gfx/flameshot: bump to v0.10.1

Closes: https://bugs.gentoo.org/804576
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Douglas Agbeve  agbeve.com>
Closes: https://github.com/gentoo/gentoo/pull/21794
Acked-by: Pavel Kalugin  pavelthebest.me>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/flameshot/Manifest|  1 +
 media-gfx/flameshot/flameshot-0.10.1.ebuild | 47 +
 2 files changed, 48 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 33e42fb44c6..1d536a4b067 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,2 +1,3 @@
+DIST flameshot-0.10.1.tar.gz 7726725 BLAKE2B 
7045e7f86fc835a49a814b6fb86c2d413422a323925d358cc37d6263b8a1ca9415f134caf72700ebe138621a5687d9245dc96edf8f0597eb1e974edf5bf699f1
 SHA512 
dca9c48b284d23b67cb71ff78d79b87887506bf5b30600c5d9ee78f5fadebab6d507674abeeae0c5cdf4a149e71df60666299c7db10168613c03467c7aafa7cf
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 
38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46
 SHA512 
888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11

diff --git a/media-gfx/flameshot/flameshot-0.10.1.ebuild 
b/media-gfx/flameshot/flameshot-0.10.1.ebuild
new file mode 100644
index 000..ae9c8e477d2
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-0.10.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
+SRC_URI="https://github.com/flameshot-org/flameshot/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   =dev-qt/qtsingleapplication-2.6*[qt5(+),X]
+   dev-qt/qtwidgets:5
+   dev-qt/qtsvg:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtdbus:5
+   sys-apps/dbus
+   dev-libs/spdlog:=
+"
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   rm -r external/spdlog || die
+   rm -r external/singleapplication || die
+
+   cmake_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DUSE_EXTERNAL_SPDLOG=1
+   -DUSE_EXTERNAL_SINGLEAPPLICATION=1
+   -DENABLE_CACHE=0
+   )
+
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2021-05-19 Thread Ulrich Müller 
commit: 8665e6933fb45ff448c5b4dd05d48f224cf991be
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri May 14 11:17:33 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Wed May 19 21:07:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8665e693

media-gfx/flameshot: Update LICENSE to Free-Art-1.3

Also GPL-3+ instead of GPL-3.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 .../flameshot/{flameshot-0.6.0.ebuild => flameshot-0.6.0-r1.ebuild} | 2 +-
 .../flameshot/{flameshot-0.9.0.ebuild => flameshot-0.9.0-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
similarity index 96%
rename from media-gfx/flameshot/flameshot-0.6.0.ebuild
rename to media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
index 1944a2858d7..a83757d63d1 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
 SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
-LICENSE="FreeArt GPL-3 Apache-2.0"
+LICENSE="Free-Art-1.3 GPL-3+ Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

diff --git a/media-gfx/flameshot/flameshot-0.9.0.ebuild 
b/media-gfx/flameshot/flameshot-0.9.0-r1.ebuild
similarity index 96%
rename from media-gfx/flameshot/flameshot-0.9.0.ebuild
rename to media-gfx/flameshot/flameshot-0.9.0-r1.ebuild
index 0b3b2178cb1..040dac744ba 100644
--- a/media-gfx/flameshot/flameshot-0.9.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.9.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
 SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
-LICENSE="Apache-2.0 FreeArt GPL-3"
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/, media-gfx/flameshot/files/

2021-05-04 Thread Joonas Niilola 
commit: 38ac024d53d4f795ad65182e24cdfbf6cf89a064
Author: Pavel Kalugin  pavelthebest  me>
AuthorDate: Mon May  3 10:02:12 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue May  4 12:59:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ac024d

media-gfx/flameshot: don't force using ccache

- don't include cmake/Cache.cmake

Reported-by: josef.95  posteo.org>
Closes: https://bugs.gentoo.org/787095
Signed-off-by: Pavel Kalugin  pavelthebest.me>
Closes: https://github.com/gentoo/gentoo/pull/20665
Signed-off-by: Joonas Niilola  gentoo.org>

 .../flameshot/files/flameshot-0.9.0-dont-force-ccache.patch | 13 +
 media-gfx/flameshot/flameshot-0.9.0.ebuild  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch 
b/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch
new file mode 100644
index 000..85f43fc6c98
--- /dev/null
+++ b/media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch
@@ -0,0 +1,13 @@
+diff -ruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2021-05-03 12:55:07.561259897 +0300
 b/CMakeLists.txt   2021-05-03 12:55:36.772461830 +0300
+@@ -70,9 +70,6 @@
+ 
+ add_library(project_warnings INTERFACE)
+ 
+-# enable cache system
+-include(cmake/Cache.cmake)
+-
+ # standard compiler warnings
+ include(cmake/CompilerWarnings.cmake)
+ # set_project_warnings(project_warnings)

diff --git a/media-gfx/flameshot/flameshot-0.9.0.ebuild 
b/media-gfx/flameshot/flameshot-0.9.0.ebuild
index 2f6c1bbbe3f..0b3b2178cb1 100644
--- a/media-gfx/flameshot/flameshot-0.9.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.9.0.ebuild
@@ -31,6 +31,7 @@ BDEPEND="
 RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+   "${FILESDIR}/${P}-dont-force-ccache.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/

2021-04-30 Thread Joonas Niilola 
commit: 23db2bfabfb85b73d30cbced6ef62cd61f3c
Author: Pavel Kalugin  pavelthebest  me>
AuthorDate: Wed Apr 28 19:04:47 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 30 07:19:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23db2bfa

media-gfx/flameshot: version bump to 0.9.0

- unbundle qtsingleapplication
- add spdlog to dependencies
- use xdg instead of xdg-utils to avoid boilerplate
- sort license names alphabetically

Closes: https://bugs.gentoo.org/777414
Suggested-by: shiz01  tutanota.com>
Signed-off-by: Pavel Kalugin  pavelthebest.me>
Closes: https://github.com/gentoo/gentoo/pull/20584
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/Manifest   |  1 +
 ...meshot-0.9.0-unbundle-qtsingleapplication.patch | 96 ++
 media-gfx/flameshot/flameshot-0.9.0.ebuild | 50 +++
 3 files changed, 147 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index bf5fa36..33e42fb44c6 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1 +1,2 @@
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
+DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 
38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46
 SHA512 
888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11

diff --git 
a/media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch 
b/media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch
new file mode 100644
index 000..20e8f6bb5f3
--- /dev/null
+++ 
b/media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch
@@ -0,0 +1,96 @@
+diff -ruN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2021-04-28 20:19:06.995353847 +0300
 b/CMakeLists.txt   2021-04-28 21:06:25.811315173 +0300
+@@ -86,7 +86,17 @@
+ set(QAPPLICATION_CLASS
+ QApplication
+ CACHE STRING "Inheritance class for SingleApplication")
+-add_subdirectory(external/singleapplication)
++
++if(USE_EXTERNAL_SINGLEAPPLICATION)
++  # look for external QtSingleApplication
++  # package dev-qt/qtsingleapplication provides no symlink to current version
++  set(qtsingleapplication_libs libQt5Solutions_SingleApplication-2.6 
Qt5Solutions_SingleApplication-2.6)
++  find_library(QTSINGLEAPPLICATION_LIBRARY NAMES ${qtsingleapplication_libs})
++  message(STATUS "Using external SingleApplication library")
++else()
++  add_subdirectory(external/singleapplication)
++  set(QTSINGLEAPPLICATION_LIBRARY SingleApplication::SingleApplication)
++endif()
+ 
+ if(USE_EXTERNAL_SPDLOG)
+   find_package(spdlog REQUIRED)
+diff -ruN a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt   2021-04-28 20:19:07.048354525 +0300
 b/src/CMakeLists.txt   2021-04-28 21:07:44.651559479 +0300
+@@ -107,7 +107,7 @@
+ 
+ target_sources(
+ flameshot
+-PRIVATE # 
${CMAKE_CURRENT_SOURCE_DIR}/../external/singleapplication/singleapplication.cpp
++PRIVATE
+ 
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_utils.cpp
+ 
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/src/color_wheel.cpp
+ 
${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include/color_wheel.hpp
+@@ -120,7 +120,6 @@
+ flameshot
+ PUBLIC $
+ $
+-
$
+ 
$
+ $
+ $
+@@ -153,6 +152,15 @@
+ $
+ $)
+ 
++if (USE_EXTERNAL_SINGLEAPPLICATION)
++add_compile_definitions(USE_EXTERNAL_SINGLEAPPLICATION=1)
++else ()
++target_include_directories(
++flameshot
++PUBLIC
++
$)
++endif()
++
+ target_link_libraries(
+ flameshot
+ project_warnings
+@@ -161,7 +169,7 @@
+ Qt5::DBus
+ Qt5::Network
+ Qt5::Widgets
+-SingleApplication::SingleApplication
++${QTSINGLEAPPLICATION_LIBRARY}
+ spdlog::spdlog
+ )
+ 
+diff -ruN a/src/main.cpp b/src/main.cpp
+--- a/src/main.cpp 2021-04-28 20:19:07.051354563 +0300
 b/src/main.cpp 2021-04-28 20:59:32.921808263 +0300
+@@ -1,7 +1,12 @@
+ // SPDX-License-Identifier: GPL-3.0-or-later
+ // SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors
+ 
+-#include "singleapplication.h"
++#ifndef USE_EXTERNAL_SINGLEAPPLICATION
++#include "singleapplication.h"
++#else
++#include "QtSolutions/qtsingleapplication.h"
++#endif
++
+ #include "src/cli/commandlineparser.h"
+ #include "src/config/styleoverride.h"
+ #include "src/core/capturerequest.h"
+@@ -65,7

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2021-04-14 Thread Joonas Niilola 
commit: 957e1578ddd7586ed99354b1fa33042eba7e5a22
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Apr 14 06:05:23 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 14 06:05:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957e1578

media-gfx/flameshot: add Github as 2ndary HOMEPAGE

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 0db51f4f66c..1944a2858d7 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.org;
+HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot;
 SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="FreeArt GPL-3 Apache-2.0"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2021-04-14 Thread Joonas Niilola 
commit: 4f1222c946019deab4d7e8b2c3f22dba29011a13
Author: Pavel Kalugin  pavelthebest  me>
AuthorDate: Sun Apr 11 16:18:14 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 14 06:04:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1222c9

media-gfx/flameshot: update homepage and SRC_URI

Signed-off-by: Pavel Kalugin  pavelthebest.me>
Closes: https://github.com/gentoo/gentoo/pull/20337
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.6.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index bf095c3de1b..0db51f4f66c 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="Powerful yet simple to use screenshot software"
-HOMEPAGE="https://flameshot.js.org;
-SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+HOMEPAGE="https://flameshot.org;
+SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2020-12-08 Thread Joonas Niilola 
commit: 4c448ac5ac524b7e2392480efe08602428c4ec20
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Dec  8 15:30:01 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  8 15:30:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c448ac5

media-gfx/flameshot: stabilize 0.6.0 on x86

Bug: https://bugs.gentoo.org/758905
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 7c9bcc840ba..ea6411ad547 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2020-12-08 Thread Joonas Niilola 
commit: 7ef91315c2cf7d10f05054ef3d7ecb93a6159233
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Dec  8 15:31:04 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  8 15:31:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef91315

media-gfx/flameshot: stabilize 0.6.0 on amd64

Closes: https://bugs.gentoo.org/758905
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index ea6411ad547..bf095c3de1b 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="FreeArt GPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/

2020-07-16 Thread Joonas Niilola 
commit: 1af50583c7f8870d02c8e8c0c62549f98059c489
Author: Pavel Kalugin  gmail  com>
AuthorDate: Fri Jul  3 13:02:47 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 16 12:59:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af50583

media-gfx/flameshot: add linguist-tools to BDEPEND on 0.6.0

Closes: https://bugs.gentoo.org/730428
Signed-off-by: Pavel Kalugin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16569
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/flameshot/flameshot-0.6.0.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 08fa91211c6..7c9bcc840ba 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -24,6 +24,9 @@ DEPEND="
dev-qt/qtdbus:5
sys-apps/dbus
 "
+BDEPEND="
+   dev-qt/linguist-tools:5
+"
 RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/

2020-05-30 Thread Andreas Sturmlechner 
commit: e21afcf5a4083064234f4d4d1906164986a85bdc
Author: Pavel Kalugin  gmail  com>
AuthorDate: Fri May 29 08:41:32 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 30 22:22:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21afcf5

media-gfx/flameshot: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/725930
Signed-off-by: Pavel Kalugin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16001
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../flameshot-0.6.0-missing-include-fix.patch  | 22 ++
 media-gfx/flameshot/flameshot-0.6.0.ebuild |  5 -
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch 
b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
new file mode 100644
index 000..f6b2ea457cb
--- /dev/null
+++ b/media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch
@@ -0,0 +1,22 @@
+diff -ru a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 
b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp
+--- a/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 
22:47:56.18313 +0300
 b/src/third-party/Qt-Color-Widgets/src/color_wheel.cpp 2020-05-29 
22:52:19.147998709 +0300
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff -ru a/src/tools/arrow/arrowtool.h b/src/tools/arrow/arrowtool.h
+--- a/src/tools/arrow/arrowtool.h  2020-05-29 22:47:56.18429 +0300
 b/src/tools/arrow/arrowtool.h  2020-05-29 22:48:25.688787364 +0300
+@@ -19,6 +19,7 @@
+ 
+ #include "src/tools/abstracttwopointtool.h"
+ #include 
++#include 
+ 
+ class ArrowTool : public AbstractTwoPointTool {
+ Q_OBJECT

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index e3d9daac1c7..08fa91211c6 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -25,7 +25,10 @@ DEPEND="
sys-apps/dbus
 "
 RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+   "${FILESDIR}/${P}-missing-include-fix.patch"
+)
 
 src_prepare() {
rm -r src/third-party/singleapplication || die

[gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/

2020-05-28 Thread Maxim Koltsov 
commit: c8519f723d963b46b3ff2137d9ac7d498af94a57
Author: Pavel Kalugin <38429428+pavel-the-best  users  noreply 
 github  com>
AuthorDate: Mon May 25 18:48:18 2020 +
Commit: Maxim Koltsov  gentoo  org>
CommitDate: Thu May 28 18:36:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8519f72

media-gfx/flameshot: new package

Signed-off-by: Pavel Kalugin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15968
Signed-off-by: Maxim Koltsov  gentoo.org>

 media-gfx/flameshot/Manifest   |  1 +
 ...meshot-0.6.0-unbundle-qtsingleapplication.patch | 47 +++
 media-gfx/flameshot/flameshot-0.6.0.ebuild | 53 ++
 media-gfx/flameshot/metadata.xml   | 12 +
 4 files changed, 113 insertions(+)

diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
new file mode 100644
index 000..bf5fa36
--- /dev/null
+++ b/media-gfx/flameshot/Manifest
@@ -0,0 +1 @@
+DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B 
f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad
 SHA512 
194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975

diff --git 
a/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch 
b/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch
new file mode 100644
index 000..7973aa1d06c
--- /dev/null
+++ 
b/media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch
@@ -0,0 +1,47 @@
+diff -ruN a/flameshot.pro b/flameshot.pro
+--- a/flameshot.pro2020-05-25 21:16:54.044214597 +0300
 b/flameshot.pro2020-05-25 21:25:03.808676488 +0300
+@@ -18,7 +18,7 @@
+ QT  += dbus
+ }
+ 
+-CONFIG += c++11 link_pkgconfig
++CONFIG += c++11 link_pkgconfig qtsingleapplication
+ 
+ #CONFIG += packaging   # Enables "make install" for packaging paths
+ 
+@@ -63,7 +63,6 @@
+ 
+ DEFINES += QT_DEPRECATED_WARNINGS
+ 
+-include(src/third-party/singleapplication/singleapplication.pri)
+ include(src/third-party/Qt-Color-Widgets//color_widgets.pri)
+ 
+ DEFINES += QAPPLICATION_CLASS=QApplication
+diff -ruN a/src/main.cpp b/src/main.cpp
+--- a/src/main.cpp 2020-05-25 21:16:54.055215952 +0300
 b/src/main.cpp 2020-05-25 21:25:35.095744395 +0300
+@@ -16,13 +16,13 @@
+ // along with Flameshot.  If not, see .
+ 
+ #include "src/core/controller.h"
+-#include "singleapplication.h"
+ #include "src/utils/filenamehandler.h"
+ #include "src/utils/confighandler.h"
+ #include "src/cli/commandlineparser.h"
+ #include "src/utils/systemnotification.h"
+ #include "src/utils/pathinfo.h"
+ #include "src/core/capturerequest.h"
++#include 
+ #include 
+ #include 
+ #include 
+@@ -44,7 +44,7 @@
+ 
+ // no arguments, just launch Flameshot
+ if (argc == 1) {
+-SingleApplication app(argc, argv);
++QtSingleApplication app(argc, argv);
+ 
+ QTranslator translator;
+ QStringList trPaths = PathInfo::translationsPaths();

diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild 
b/media-gfx/flameshot/flameshot-0.6.0.ebuild
new file mode 100644
index 000..e3d9daac1c7
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="Powerful yet simple to use screenshot software"
+HOMEPAGE="https://flameshot.js.org;
+SRC_URI="https://github.com/lupoDharkael/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="FreeArt GPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtsingleapplication[qt5(+),X]
+   dev-qt/qtwidgets:5
+   dev-qt/qtsvg:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtdbus:5
+   sys-apps/dbus
+"
+RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch" )
+
+src_prepare() {
+   rm -r src/third-party/singleapplication || die
+   default
+}
+
+src_configure() {
+   eqmake5 "CONFIG+=packaging"
+}
+
+src_install() {
+   emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+   xdg_desktop_database_update
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+   xdg_desktop_database_update
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+}

diff --git a/media-gfx/flameshot/metadata.xml b/media-gfx/flameshot/metadata.xml
new file mode 100644
index 000..49f9e82790b
--- /dev/null
+++ b/media-gfx/flameshot/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   paul.ka...@gmail.com
+   Pavel Kalugin
+   
+   
+   proxy-ma...@gentoo.org
+