6 files changed, 0 insertions, 182 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a47139035408..f83fec3c9f30 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 067636f794bc..ebd844266c35 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,7 +1,3 @@
-AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d65797800dc675e40556e4cdf560e257e60e649924316e5a0fdc271507763d90734fc60290e1ddecab417148542e8b318041ca9690c SHA512 852a3c12e1fee4a90e6a31c5c17a371a2b44fe1a399a6e11f8a760d5436ea73fa7aed9ebb906f67f7efbd4315e9c092c7cdf76a464f916df6893cc13bd361f7c
-AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
-AUX flameshot-0.9.0-dont-force-ccache.patch 385 BLAKE2B 2acfd1410e247c6aec3dc2c9ea886b25de25f5432131baf787d4a9dd5f8db114e08cfa7baaff7f83e3228431fc97ad65664c31d4c72b8eca15bd6f5db18f94c9 SHA512 a0c6cefac528e822b2b65fd693830cb96c2ea1df393ebfc2718324411199ed1b82e9121a6018622d5b4ed8bdbf3b14c06c201925a2fd69fa96ac1f9d297c4f04
-AUX flameshot-0.9.0-unbundle-qtsingleapplication.patch 3613 BLAKE2B cc5681081eeb48d3db2e2ab031fbfe4d96d6a52f5078b73b1e6af45b0aa98d078d75e4b4d5f3f50e0d93e7e3be0f8ae515ab096c7513e0f4974f674fc5f16395 SHA512 ce7014b932193650405852957b27c779c567285d46a85e3d3bb89c05449491d15b154efc213bd8f8370660ecadf048adfbf3ce3ade0fcd209fb9e2be9805e8f5
 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
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;