[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-6-3-g7bfb50c
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Feb 24 12:28:55 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=7bfb50c
The following commit has been merged in the experimental branch:
commit 7bfb50c9da38a2ca5f16758f356073b5c96cfad4
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Feb 24 15:28:47 2015 +0300
Update patches for the new release.
---
debian/changelog | 3 ++
debian/patches/gnukfreebsd.diff | 2 +-
debian/patches/series | 2 -
...ersions.cpp-Fix-build-on-big-endian-syste.patch | 37 --------------
...o_unix.cpp-Fix-build-on-BSD-and-other-uni.patch | 57 ----------------------
5 files changed, 4 insertions(+), 97 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5a81812..a627e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.4.1+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Update debian/watch to use https://download.qt.io/.
+ * Drop patches that have been applied upstream:
+ - upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch.
+ - upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 24 Feb 2015 15:18:59 +0300
diff --git a/debian/patches/gnukfreebsd.diff b/debian/patches/gnukfreebsd.diff
index 63d5951..94beb88 100644
--- a/debian/patches/gnukfreebsd.diff
+++ b/debian/patches/gnukfreebsd.diff
@@ -157,7 +157,7 @@ Forwarded: no
+#endif // QPLATFORMDEFS_H
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
-@@ -265,6 +265,8 @@ defineTest(qtAddTargetEnv) {
+@@ -266,6 +266,8 @@
deppath.name = PATH
} else:contains(QMAKE_HOST.os, Linux|FreeBSD|OpenBSD|NetBSD|DragonFly|SunOS|HP-UX|QNX|GNU) {
deppath.name = LD_LIBRARY_PATH
diff --git a/debian/patches/series b/debian/patches/series
index 9591ea2..2c1bf49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
upstream_small-improvements-to-the-hurd-g-mkspec.patch
upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
-upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
-upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
gnukfreebsd.diff
# Debian specific.
diff --git a/debian/patches/upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch b/debian/patches/upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
deleted file mode 100644
index 0e0c4f4..0000000
--- a/debian/patches/upstream_qimage_conversions.cpp-Fix-build-on-big-endian-syste.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 404f4281fda764cafdaa5635db995dabc4f1de8c Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Tue, 9 Dec 2014 09:27:53 +0300
-Subject: [PATCH] qimage_conversions.cpp: Fix build on big endian systems
-
-Change-Id: I8149eb2deaa101daf85a957ff48c3a7140c43bbc
-Reviewed-by: Timo Jyrinki <timo.jyrinki at canonical.com>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
----
- src/gui/image/qimage_conversions.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
-index 17563b1..858a0d9 100644
---- a/src/gui/image/qimage_conversions.cpp
-+++ b/src/gui/image/qimage_conversions.cpp
-@@ -2252,7 +2252,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
- convert_ARGB_to_ARGB_PM,
- #else
- 0,
-- 0
-+ 0,
- #endif
- 0, 0, 0, 0
- }, // Format_RGBA8888
-@@ -2281,7 +2281,7 @@ Image_Converter qimage_converter_map[QImage::NImageFormats][QImage::NImageFormat
- #else
- 0,
- 0,
-- 0
-+ 0,
- #endif
- 0, 0, 0, 0
- }, // Format_RGBA8888_Premultiplied
---
-2.1.4
-
diff --git a/debian/patches/upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch b/debian/patches/upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
deleted file mode 100644
index cce71b3..0000000
--- a/debian/patches/upstream_qstorageinfo_unix.cpp-Fix-build-on-BSD-and-other-uni.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 13972476ad2c3178fe89f2d96f398de10394c6f6 Mon Sep 17 00:00:00 2001
-From: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Mon, 22 Dec 2014 13:44:45 +0300
-Subject: [PATCH] qstorageinfo_unix.cpp: Fix build on BSD and other unices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* Include statvfs.h on all non-Linux and non-Solaris systems.
-* Fix type of stat_buf structure on BSD.
-
-Change-Id: I6336503082fafd7f6108cf95c079bdd329d2ea0f
-Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich at theqtcompany.com>
-Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen at theqtcompany.com>
-Reviewed-by: Shawn Rutledge <shawn.rutledge at digia.com>
----
- src/corelib/io/qstorageinfo_unix.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
-index e82737c..857464f 100644
---- a/src/corelib/io/qstorageinfo_unix.cpp
-+++ b/src/corelib/io/qstorageinfo_unix.cpp
-@@ -52,17 +52,18 @@
-
- #if defined(Q_OS_BSD4)
- # include <sys/mount.h>
-+# include <sys/statvfs.h>
- #elif defined(Q_OS_ANDROID)
- # include <sys/mount.h>
- # include <sys/vfs.h>
- # include <mntent.h>
--#elif defined(Q_OS_QNX)
--# include <sys/statvfs.h>
- #elif defined(Q_OS_LINUX)
- # include <mntent.h>
- # include <sys/statvfs.h>
- #elif defined(Q_OS_SOLARIS)
- # include <sys/mnttab.h>
-+#else
-+# include <sys/statvfs.h>
- #endif
-
- #if defined(Q_OS_BSD4)
-@@ -118,7 +119,7 @@ public:
- inline QByteArray device() const;
- private:
- #if defined(Q_OS_BSD4)
-- statfs *stat_buf;
-+ struct statfs *stat_buf;
- int entryCount;
- int currentIndex;
- #elif defined(Q_OS_SOLARIS)
---
-2.1.4
-
--
qtbase packaging
More information about the pkg-kde-commits
mailing list