summaryrefslogtreecommitdiff
path: root/media-gfx/flameshot/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-07-16 13:45:36 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-07-16 13:45:36 +0100
commit29607d91fb1bf1c4456a0b90601ee172ea769283 (patch)
tree71a1c87ff8b0a522d0f8243a4f064f8f9b5d94e4 /media-gfx/flameshot/files
parent22b96ae0ceb12f57b30fc2577770f565506bbac8 (diff)
gentoo auto-resync : 16:07:2022 - 13:45:35
Diffstat (limited to 'media-gfx/flameshot/files')
-rw-r--r--media-gfx/flameshot/files/flameshot-0.6.0-missing-include-fix.patch22
-rw-r--r--media-gfx/flameshot/files/flameshot-0.6.0-unbundle-qtsingleapplication.patch47
-rw-r--r--media-gfx/flameshot/files/flameshot-0.9.0-dont-force-ccache.patch13
-rw-r--r--media-gfx/flameshot/files/flameshot-0.9.0-unbundle-qtsingleapplication.patch96
4 files changed, 0 insertions, 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..000000000000
--- 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.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/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..000000000000
--- 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.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/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..000000000000
--- 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..000000000000
--- 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
-+++ 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;