gentoo resync : 03.03.2021

3 files changed, 49 insertions, 8 deletions

diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
new file mode 100644
index 000000000000..127fc7ad926c
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
@@ -0,0 +1,17 @@
+Description: install appdata to package directory
+ The CMAKE_INSTALL_PREFIX was not set to install path and set its correct
+ location.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2018-08-21
+
+--- a/converseen.pro
++++ b/converseen.pro
+@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm
+  desktopFile.files = res/converseen.desktop
+  kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus
+  kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+  appdata.files = converseen.appdata.xml
+ 
+  isEmpty(QMAKE_LRELEASE) {
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
index 3b53d056948c..50ad7a01e8db 100644
--- a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
@@ -1,15 +1,15 @@
-From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
+From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Tue, 9 Jan 2018 02:06:09 +0100
 Subject: [PATCH] Use GNUInstalldirs
 
 No need to reinvent the wheel, make use of standards provided by cmake.
 ---
- CMakeLists.txt | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
+ CMakeLists.txt | 40 +++++++++++++++++++++-------------------
+ 1 file changed, 21 insertions(+), 19 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a944102..de5e556 100755
+index f135b66..4bd8764 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
@@ -21,7 +21,7 @@ index a944102..de5e556 100755
  ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )

    

  SET(converseen_UIS  

-@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
+@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI}
    

  TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})

  

@@ -29,7 +29,7 @@ index a944102..de5e556 100755
 -install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)

 -install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)

 -install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)

--install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)

+-install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

@@ -42,11 +42,13 @@ index a944102..de5e556 100755
 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})

 +install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

 +install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)

 +install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)

-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)

++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

@@ -59,6 +61,8 @@ index a944102..de5e556 100755
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 -- 
-2.15.1
+2.30.1
 
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
new file mode 100644
index 000000000000..f4dad00586ab
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
@@ -0,0 +1,20 @@
+Description: Don't check upstream versions
+ Don't check new versions page due to privacy concerns.
+Forwarded: no
+Last-Update: 2018-08-21
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Bug-Debian: https://bugs.debian.org/761944
+
+---
+
+--- a/src/mainwindowimpl.cpp
++++ b/src/mainwindowimpl.cpp
+@@ -1012,7 +1012,7 @@ void MainWindowImpl::openFlattrLink()
+ void MainWindowImpl::checkForUpdates()
+ {
+     UpdateChecker *up = new UpdateChecker();
+-    up->checkForUpdates();
++//    up->checkForUpdates();
+ }
+ 
+ void MainWindowImpl::bugReport()