* [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/
@ 2020-05-30 22:24 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-05-30 22:24 UTC (permalink / raw
To: gentoo-commits
commit: e21afcf5a4083064234f4d4d1906164986a85bdc
Author: Pavel Kalugin <paul.kalug <AT> gmail <DOT> com>
AuthorDate: Fri May 29 08:41:32 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 30 22:22:48 2020 +0000
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 <paul.kalug <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16001
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 00000000000..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.183333313 +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 <cmath>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLineF>
+ #include <QDragEnterEvent>
+ #include <QMimeData>
+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.184333329 +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 <QPainter>
++#include <QPainterPath>
+
+ 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/
@ 2021-04-30 7:19 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-04-30 7:19 UTC (permalink / raw
To: gentoo-commits
commit: 23db2bfabfb85b73d30cbced60000ef62cd61f3c
Author: Pavel Kalugin <pavel <AT> pavelthebest <DOT> me>
AuthorDate: Wed Apr 28 19:04:47 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 07:19:18 2021 +0000
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 <shiz01 <AT> tutanota.com>
Signed-off-by: Pavel Kalugin <pavel <AT> pavelthebest.me>
Closes: https://github.com/gentoo/gentoo/pull/20584
Signed-off-by: Joonas Niilola <juippis <AT> 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 bf5fbbbba36..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 00000000000..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 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
+- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../external/singleapplication/>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../external/Qt-Color-Widgets/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dbus/>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/cli>
+@@ -153,6 +152,15 @@
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/widgets/capture>
+ $<INSTALL_INTERFACE:include/mylib>)
+
++if (USE_EXTERNAL_SINGLEAPPLICATION)
++ add_compile_definitions(USE_EXTERNAL_SINGLEAPPLICATION=1)
++else ()
++ target_include_directories(
++ flameshot
++ PUBLIC
++ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../external/singleapplication>)
++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 +70,11 @@
+
+ // no arguments, just launch Flameshot
+ if (argc == 1) {
++#ifndef USE_EXTERNAL_SINGLEAPPLICATION
+ SingleApplication app(argc, argv);
++#else
++ QtSingleApplication app(argc, argv);
++#endif
+ QApplication::setStyle(new StyleOverride);
+
+ QTranslator translator, qtTranslator;
diff --git a/media-gfx/flameshot/flameshot-0.9.0.ebuild b/media-gfx/flameshot/flameshot-0.9.0.ebuild
new file mode 100644
index 00000000000..2f6c1bbbe3f
--- /dev/null
+++ b/media-gfx/flameshot/flameshot-0.9.0.ebuild
@@ -0,0 +1,50 @@
+# 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/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 FreeArt GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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}"
+PATCHES=(
+ "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+)
+
+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
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/
@ 2020-05-28 18:37 Maxim Koltsov
0 siblings, 0 replies; 3+ messages in thread
From: Maxim Koltsov @ 2020-05-28 18:37 UTC (permalink / raw
To: gentoo-commits
commit: c8519f723d963b46b3ff2137d9ac7d498af94a57
Author: Pavel Kalugin <38429428+pavel-the-best <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Mon May 25 18:48:18 2020 +0000
Commit: Maxim Koltsov <maksbotan <AT> gentoo <DOT> org>
CommitDate: Thu May 28 18:36:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8519f72
media-gfx/flameshot: new package
Signed-off-by: Pavel Kalugin <paul.kalug <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15968
Signed-off-by: Maxim Koltsov <maksbotan <AT> 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 00000000000..bf5fbbbba36
--- /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 00000000000..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.pro 2020-05-25 21:16:54.044214597 +0300
++++ b/flameshot.pro 2020-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 <http://www.gnu.org/licenses/>.
+
+ #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 <QtSingleApplication>
+ #include <QApplication>
+ #include <QTranslator>
+ #include <QTextStream>
+@@ -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 00000000000..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 00000000000..49f9e82790b
--- /dev/null
+++ b/media-gfx/flameshot/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>paul.kalug@gmail.com</email>
+ <name>Pavel Kalugin</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-04-30 7:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-30 22:24 [gentoo-commits] repo/gentoo:master commit in: media-gfx/flameshot/files/, media-gfx/flameshot/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-04-30 7:19 Joonas Niilola
2020-05-28 18:37 Maxim Koltsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox