From a7c0337fb26defab46926de71bb764d03b083a82 Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Wed, 18 May 2022 23:40:02 +0000 Subject: [PATCH] Accepting request 978018 from home:sbradnick - Removing patch files which aren't needed since items were fixed upstream: * qimgv-mpv_v2_fix.patch * qimgv-no_return_in_nonvoid.patch OBS-URL: https://build.opensuse.org/request/show/978018 OBS-URL: https://build.opensuse.org/package/show/graphics/qimgv?expand=0&rev=45 --- qimgv-mpv_v2_fix.patch | 22 ---------------------- qimgv-no_return_in_nonvoid.patch | 12 ------------ qimgv.changes | 7 +++++++ 3 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 qimgv-mpv_v2_fix.patch delete mode 100644 qimgv-no_return_in_nonvoid.patch diff --git a/qimgv-mpv_v2_fix.patch b/qimgv-mpv_v2_fix.patch deleted file mode 100644 index 3c703e5..0000000 --- a/qimgv-mpv_v2_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8b01170753fcadc86770dd650c3d38a76e88963d Mon Sep 17 00:00:00 2001 -From: easymodo -Date: Sat, 18 Dec 2021 10:32:05 +0200 -Subject: [PATCH] fix mpv_opengl_init_params - ---- - plugins/player_mpv/src/mpvwidget.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/player_mpv/src/mpvwidget.cpp b/plugins/player_mpv/src/mpvwidget.cpp -index 16c4b168..2f8a39a5 100644 ---- a/plugins/player_mpv/src/mpvwidget.cpp -+++ b/plugins/player_mpv/src/mpvwidget.cpp -@@ -69,7 +69,7 @@ void MpvWidget::setOption(const QString& name, const QVariant& value) { - } - - void MpvWidget::initializeGL() { -- mpv_opengl_init_params gl_init_params{get_proc_address, nullptr, nullptr}; -+ mpv_opengl_init_params gl_init_params{get_proc_address, nullptr}; - mpv_render_param params[]{ - {MPV_RENDER_PARAM_API_TYPE, const_cast(MPV_RENDER_API_TYPE_OPENGL)}, - {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params}, diff --git a/qimgv-no_return_in_nonvoid.patch b/qimgv-no_return_in_nonvoid.patch deleted file mode 100644 index ae4ac92..0000000 --- a/qimgv-no_return_in_nonvoid.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qimgv-1.0.0/qimgv/utils/fileoperations.cpp -=================================================================== ---- qimgv-1.0.0.orig/qimgv/utils/fileoperations.cpp -+++ qimgv-1.0.0/qimgv/utils/fileoperations.cpp -@@ -60,6 +60,7 @@ QString FileOperations::decodeResult(con - case FileOpResult::OTHER_ERROR: - return "Other error."; - } -+ return NULL; - } - - void FileOperations::copyFileTo(const QString &srcFilePath, const QString &destDirPath, bool force, FileOpResult &result) { diff --git a/qimgv.changes b/qimgv.changes index 7a1fb79..bf4d462 100644 --- a/qimgv.changes +++ b/qimgv.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 18 23:25:22 UTC 2022 - Scott Bradnick + +- Removing patch files which aren't needed since items were fixed upstream: + * qimgv-mpv_v2_fix.patch + * qimgv-no_return_in_nonvoid.patch + ------------------------------------------------------------------- Wed May 11 18:15:36 UTC 2022 - scott.bradnick@suse.com