Commit e7c14371 authored by Tomasz Buchert's avatar Tomasz Buchert

new release 0.14.0

parent 197ca34b
stellarium (0.13.3-3) UNRELEASED; urgency=medium
stellarium (0.14.0-1) unstable; urgency=medium
* d/patches: Improve patches
* Imported Upstream version 0.14.0
* d/patches: drop patches
-- Tomasz Buchert <tomasz@debian.org> Sat, 13 Jun 2015 14:17:01 +0200
-- Tomasz Buchert <tomasz@debian.org> Sat, 24 Oct 2015 21:22:04 +0200
stellarium (0.13.3-2) unstable; urgency=medium
......
From: Tomasz Buchert <tomasz@debian.org>
Date: Mon, 25 May 2015 14:38:09 +0200
Subject: Put QZip* into a separated namespace
This patch is in response to https://bugs.debian.org/786715.
---
src/CMakeLists.txt | 2 +-
src/core/external/qtcompress/qzip.cpp | 18 +++++++++---------
src/core/external/qtcompress/qzipreader.h | 18 ++++++++++--------
src/core/external/qtcompress/qzipwriter.h | 14 ++++++++------
src/core/modules/LandscapeMgr.cpp | 10 +++++-----
5 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba76c02..257668e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -243,7 +243,7 @@ SET(stellarium_lib_SRCS
)
# On windows, QZipReader is already included in the lib
-IF(!WIN32)
+IF(NOT WIN32)
SET(stellarium_lib_SRCS ${stellarium_lib_SRCS}
core/external/qtcompress/qzip.cpp
core/external/qtcompress/qzipreader.h
diff --git a/src/core/external/qtcompress/qzip.cpp b/src/core/external/qtcompress/qzip.cpp
index 2675875..95a15c5 100644
--- a/src/core/external/qtcompress/qzip.cpp
+++ b/src/core/external/qtcompress/qzip.cpp
@@ -39,17 +39,15 @@
**
****************************************************************************/
-#include <qglobal.h>
-
#ifndef QT_NO_TEXTODFWRITER
#include "qzipreader.h"
#include "qzipwriter.h"
-#include <qdatetime.h>
-#include <qplatformdefs.h>
-#include <qendian.h>
-#include <qdebug.h>
-#include <qdir.h>
+
+#include <sys/stat.h>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
#include <zlib.h>
@@ -101,7 +99,8 @@
#define ZDEBUG if (0) qDebug
#endif
-QT_BEGIN_NAMESPACE
+// QT_BEGIN_NAMESPACE
+namespace Stel {
static inline uint readUInt(const uchar *data)
{
@@ -1390,6 +1389,7 @@ void QZipWriter::close()
d->device->close();
}
-QT_END_NAMESPACE
+// QT_END_NAMESPACE
+}
#endif // QT_NO_TEXTODFWRITER
diff --git a/src/core/external/qtcompress/qzipreader.h b/src/core/external/qtcompress/qzipreader.h
index d263191..584de5c 100644
--- a/src/core/external/qtcompress/qzipreader.h
+++ b/src/core/external/qtcompress/qzipreader.h
@@ -42,17 +42,18 @@
#ifndef QZIPREADER_H
#define QZIPREADER_H
-#include <QtCore/qglobal.h>
+#include <QtGlobal>
-#include <QtCore/qdatetime.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qstring.h>
+#include <QDateTime>
+#include <QFile>
+#include <QString>
-QT_BEGIN_NAMESPACE
+// QT_BEGIN_NAMESPACE
+namespace Stel {
class QZipReaderPrivate;
-class Q_GUI_EXPORT QZipReader
+class QZipReader
{
public:
explicit QZipReader(const QString &fileName, QIODevice::OpenMode mode = QIODevice::ReadOnly );
@@ -65,7 +66,7 @@ public:
bool isReadable() const;
bool exists() const;
- struct Q_GUI_EXPORT FileInfo
+ struct FileInfo
{
FileInfo();
FileInfo(const FileInfo &other);
@@ -107,6 +108,7 @@ private:
Q_DISABLE_COPY(QZipReader)
};
-QT_END_NAMESPACE
+// QT_END_NAMESPACE
+}
#endif // QZIPREADER_H
diff --git a/src/core/external/qtcompress/qzipwriter.h b/src/core/external/qtcompress/qzipwriter.h
index b54a8d3..1d304b0 100644
--- a/src/core/external/qtcompress/qzipwriter.h
+++ b/src/core/external/qtcompress/qzipwriter.h
@@ -41,15 +41,16 @@
#ifndef QZIPWRITER_H
#define QZIPWRITER_H
-#include <QtCore/qglobal.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qfile.h>
+#include <QtGlobal>
+#include <QString>
+#include <QFile>
-QT_BEGIN_NAMESPACE
+// QT_BEGIN_NAMESPACE
+namespace Stel {
class QZipWriterPrivate;
-class Q_GUI_EXPORT QZipWriter
+class QZipWriter
{
public:
explicit QZipWriter(const QString &fileName, QIODevice::OpenMode mode = (QIODevice::WriteOnly | QIODevice::Truncate) );
@@ -98,6 +99,7 @@ private:
Q_DISABLE_COPY(QZipWriter)
};
-QT_END_NAMESPACE
+// QT_END_NAMESPACE
+}
#endif // QZIPWRITER_H
diff --git a/src/core/modules/LandscapeMgr.cpp b/src/core/modules/LandscapeMgr.cpp
index 2e3ecfd..c17b26c 100644
--- a/src/core/modules/LandscapeMgr.cpp
+++ b/src/core/modules/LandscapeMgr.cpp
@@ -815,8 +815,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
}
QDir destinationDir (parentDestinationDir.absoluteFilePath("landscapes"));
- QZipReader reader(sourceFilePath);
- if (reader.status() != QZipReader::NoError)
+ Stel::QZipReader reader(sourceFilePath);
+ if (reader.status() != Stel::QZipReader::NoError)
{
qWarning() << "LandscapeMgr: Unable to open as a ZIP archive:" << QDir::toNativeSeparators(sourceFilePath);
emit errorNotArchive();
@@ -825,8 +825,8 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
//Detect top directory
QString topDir, iniPath;
- QList<QZipReader::FileInfo> infoList = reader.fileInfoList();
- foreach(QZipReader::FileInfo info, infoList)
+ QList<Stel::QZipReader::FileInfo> infoList = reader.fileInfoList();
+ foreach(Stel::QZipReader::FileInfo info, infoList)
{
QFileInfo fileInfo(info.filePath);
if (fileInfo.fileName() == "landscape.ini")
@@ -890,7 +890,7 @@ QString LandscapeMgr::installLandscapeFromArchive(QString sourceFilePath, const
return QString();
}
destinationDir.cd(landscapeID);
- foreach(QZipReader::FileInfo info, infoList)
+ foreach(Stel::QZipReader::FileInfo info, infoList)
{
QFileInfo fileInfo(info.filePath);
if (info.isFile && fileInfo.dir().path() == topDir)
0001-Put-QZip-into-a-separated-namespace.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment