gentoo resync : 01.10.2021

1 files changed, 45 insertions, 60 deletions

diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
index 64b19a54c88a..f5d757b1bb16 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.21.2-unbundle-qtcompress.patch
@@ -1,16 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b72c2c8f6..9436bc66da 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -629,5 +629,6 @@ ELSE()
- ENDIF()
+@@ -594,6 +594,7 @@ ELSE(ENABLE_GPS)
+      MESSAGE(STATUS "GPS: disabled.")
+ ENDIF(ENABLE_GPS)
  
 +find_package(Qt5Compress REQUIRED)
  
- ########### Set some global variables ###########
- IF(UNIX AND NOT WIN32)
-diff --git a/plugins/Satellites/src/CMakeLists.txt b/plugins/Satellites/src/CMakeLists.txt
-index 8e3138adf2..b59049767d 100644
+ IF(USE_QTOPENGL)
+      # QtOpenGL module is deprecated. After merging the QOpenGLWidget branch, we don't use this module directly anymore,
 --- a/plugins/Satellites/src/CMakeLists.txt
 +++ b/plugins/Satellites/src/CMakeLists.txt
 @@ -55,7 +55,7 @@ IF(ENABLE_TESTING)
@@ -22,8 +19,6 @@ index 8e3138adf2..b59049767d 100644
  # The library target "Satellites-static" has a default OUTPUT_NAME of "Satellites-static", so change it.
  SET_TARGET_PROPERTIES(Satellites-static PROPERTIES OUTPUT_NAME "Satellites")
  IF(MSVC)
-diff --git a/plugins/Satellites/src/Satellites.cpp b/plugins/Satellites/src/Satellites.cpp
-index 7432f4316d..f4f4453661 100644
 --- a/plugins/Satellites/src/Satellites.cpp
 +++ b/plugins/Satellites/src/Satellites.cpp
 @@ -43,7 +43,7 @@
@@ -35,7 +30,7 @@ index 7432f4316d..f4f4453661 100644
  
  #include <QNetworkAccessManager>
  #include <QNetworkReply>
-@@ -1533,12 +1533,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
+@@ -1549,12 +1549,12 @@ void Satellites::saveDownloadedUpdate(QNetworkReply* reply)
  					QString archive = zip.fileName();
  					QByteArray data;
  
@@ -48,14 +43,12 @@ index 7432f4316d..f4f4453661 100644
  					{
 -						QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
 +						QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- 						for (const auto& info : infoList)
+ 						for (const auto& info : qAsConst(infoList))
  						{
  							// qWarning() << "[Satellites] Processing:" << info.filePath;
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bdd214729f..81631ce8ec 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -465,7 +465,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
+@@ -464,7 +464,7 @@ IF(ENABLE_SPOUT AND SPOUT_LIBRARY_DLL)
       CONFIGURE_FILE(${SPOUT_LIBRARY_DLL} ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
  ENDIF()
  
@@ -64,11 +57,9 @@ index bdd214729f..81631ce8ec 100644
  IF(ENABLE_LIBGPS)
       SET(STELMAIN_DEPS ${STELMAIN_DEPS} ${GPS_LIBRARY})
  ENDIF()
-diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
-index 8da2070b26..9949252cee 100644
 --- a/src/core/modules/LandscapeMgr.cpp
 +++ b/src/core/modules/LandscapeMgr.cpp
-@@ -1183,8 +1183,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+@@ -1322,8 +1322,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
  	}
  	QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
  
@@ -79,7 +70,7 @@ index 8da2070b26..9949252cee 100644
  	{
  		qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
  		emit errorNotArchive();
-@@ -1193,7 +1193,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
+@@ -1332,7 +1332,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
  
  	//Detect top directory
  	QString topDir, iniPath;
@@ -88,8 +79,6 @@ index 8da2070b26..9949252cee 100644
  	for (const auto& info : infoList)
  	{
  		QFileInfo fileInfo(info.filePath);
-diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
-index 1e0e7e2b32..834aff89cb 100644
 --- a/src/external/CMakeLists.txt
 +++ b/src/external/CMakeLists.txt
 @@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
@@ -106,9 +95,9 @@ index 1e0e7e2b32..834aff89cb 100644
  SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")

 +endif()

  

- set(qcustomplot_SRCS

-     qcustomplot/qcustomplot.cpp

-@@ -176,7 +176,7 @@
+ # QCustomPlot should not be unbundled, because upstream uses GPL 3, and

+ # Stellarium uses GPL 2. Author of QCustomPlot has agreed for GPL 2+ for this.

+@@ -180,7 +182,7 @@ SET(qxlsx_SRCS
      qxlsx/xlsxcelllocation.h

      )

  add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})

@@ -117,11 +106,10 @@ index 1e0e7e2b32..834aff89cb 100644
  set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")

  

  ################################# INDI ################################

-diff -r 11536448457a xlsxzipreader.cpp
---- a/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader.cpp	Thu Oct 08 21:42:03 2020 +0100
-@@ -28,13 +28,13 @@
- namespace QXlsx {
+--- a/src/external/qxlsx/xlsxzipreader.cpp
++++ b/src/external/qxlsx/xlsxzipreader.cpp
+@@ -5,13 +5,13 @@
+ QT_BEGIN_NAMESPACE_XLSX
  
  ZipReader::ZipReader(const QString &filePath) :
 -    m_reader(new Stel::QZipReader(filePath))
@@ -136,30 +124,29 @@ diff -r 11536448457a xlsxzipreader.cpp
  {
      init();
  }
-@@ -45,8 +45,8 @@
+@@ -23,8 +23,8 @@ ZipReader::~ZipReader()
  
  void ZipReader::init()
  {
--	QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
--	foreach (const Stel::QZipReader::FileInfo &fi, allFiles)
-+	QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
-+	foreach (const QZipReader::FileInfo &fi, allFiles)
- 	{
- 		if (fi.isFile)
- 			m_filePaths.append(fi.filePath);
-diff -r 2019bb0d2919 xlsxzipreader_p.h
---- a/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipreader_p.h	Thu Oct 08 21:36:28 2020 +0100
-@@ -38,7 +38,7 @@
- //
+-    QList<Stel::QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
+-    for (const Stel::QZipReader::FileInfo &fi : allFiles) {
++    QList<QZipReader::FileInfo> allFiles = m_reader->fileInfoList();
++    for (const QZipReader::FileInfo &fi : allFiles) {
+         if (fi.isFile || (!fi.isDir && !fi.isFile && !fi.isSymLink))
+             m_filePaths.append(fi.filePath);
+     }
+--- a/src/external/qxlsx/xlsxzipreader_p.h
++++ b/src/external/qxlsx/xlsxzipreader_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
  
  #include "xlsxglobal.h"
 -#include "external/qtcompress/qzipreader.h"
 +#include "qzipreader.h"
- #include <QScopedPointer>
- #include <QStringList>
- #include <QVector>
-@@ -60,7 +60,7 @@
+ 
+ #if QT_VERSION >= 0x050600
+  #include <QVector>
+@@ -31,7 +31,7 @@ public:
  private:
      Q_DISABLE_COPY(ZipReader)
      void init();
@@ -168,10 +155,9 @@ diff -r 2019bb0d2919 xlsxzipreader_p.h
      QStringList m_filePaths;
  };
  
-diff -r 11536448457a xlsxzipwriter.cpp
---- a/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:41:22 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter.cpp	Thu Oct 08 21:42:03 2020 +0100
-@@ -29,14 +29,14 @@
+--- a/src/external/qxlsx/xlsxzipwriter.cpp
++++ b/src/external/qxlsx/xlsxzipwriter.cpp
+@@ -10,14 +10,14 @@ QT_BEGIN_NAMESPACE_XLSX
  
  ZipWriter::ZipWriter(const QString &filePath)
  {
@@ -190,7 +176,7 @@ diff -r 11536448457a xlsxzipwriter.cpp
  }
  
  ZipWriter::~ZipWriter()
-@@ -46,7 +46,7 @@
+@@ -27,7 +27,7 @@ ZipWriter::~ZipWriter()
  
  bool ZipWriter::error() const
  {
@@ -199,19 +185,18 @@ diff -r 11536448457a xlsxzipwriter.cpp
  }
  
  void ZipWriter::addFile(const QString &filePath, QIODevice *device)
-diff -r 2019bb0d2919 xlsxzipwriter_p.h
---- a/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:35:35 2020 +0100
-+++ b/src/external/qxlsx/xlsxzipwriter_p.h	Thu Oct 08 21:36:28 2020 +0100
-@@ -37,7 +37,7 @@
- //
+--- a/src/external/qxlsx/xlsxzipwriter_p.h
++++ b/src/external/qxlsx/xlsxzipwriter_p.h
+@@ -8,7 +8,7 @@
+ #include <QIODevice>
  
- #include <QString>
+ #include "xlsxglobal.h"
 -#include "external/qtcompress/qzipwriter.h"
 +#include "qzipwriter.h"
  
- class QIODevice;
  class QZipWriter;
-@@ -57,7 +57,7 @@
+ 
+@@ -27,7 +27,7 @@ public:
      void close();
  
  private:
@@ -219,4 +204,4 @@ diff -r 2019bb0d2919 xlsxzipwriter_p.h
 +    QZipWriter *m_writer;
  };
  
- } // namespace QXlsx
+ QT_END_NAMESPACE_XLSX