[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-25-g199b71b
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Wed Feb 18 17:51:41 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=e1b204f
The following commit has been merged in the kubuntu_unstable branch:
commit e1b204f1e322c4bfaead9e52d918c2bc65f6db2f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sat Feb 7 18:10:53 2015 -0300
Remove patches applied upstream.
---
debian/changelog | 2 +
debian/patches/series | 4 --
...PS-atomic-support-on-pre-MIPS32-architect.patch | 33 ------------
...ersions.cpp-Fix-build-on-big-endian-syste.patch | 37 -------------
...o_unix.cpp-Fix-build-on-BSD-and-other-uni.patch | 57 --------------------
...m_small-improvements-to-the-hurd-g-mkspec.patch | 61 ----------------------
6 files changed, 2 insertions(+), 192 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a41cf07..a71acd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
* Remove libopenvg1-mesa-dev as a build dependency because mesa does not
builds it anymore (Closes: #777341).
Thanks Andreas Beckmann for the report.
+ * Remove the patches Pino replaced above as they are already present
+ in this version of the code.
[ Dmitry Shachnev ]
* Drop private marks from QCollator and QOpenGLWidget symbols.
diff --git a/debian/patches/series b/debian/patches/series
index fe4f9d2..e651402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-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_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch b/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
deleted file mode 100644
index 02dc565..0000000
--- a/debian/patches/upstream_Complete-MIPS-atomic-support-on-pre-MIPS32-architect.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7ec14ae0b267780d6bfa5c7453c906caeee3bc00 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 27 Dec 2014 17:54:47 +0100
-Subject: [PATCH] Complete MIPS atomic support on pre-MIPS32 architectures
-
-Extend the support for pre-MIPS32 architectures (done mostly in
-60b6b28c213a420ee40e254ff1823876098e0a04) also to orderedMemoryFence.
-
-Change-Id: I50b9091c16166b8434a07988053c1f901d528237
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- src/corelib/arch/qatomic_mips.h | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h
-index b8a9665..b99c70f 100644
---- a/src/corelib/arch/qatomic_mips.h
-+++ b/src/corelib/arch/qatomic_mips.h
-@@ -120,7 +120,10 @@ void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
- template <int size> template <typename T> inline
- void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
- {
-- asm volatile ("sync 0" ::: "memory");
-+ asm volatile (".set push
"
-+ ".set mips32
"
-+ "sync 0
"
-+ ".set pop
" ::: "memory");
- }
-
- template<> template<typename T> inline
---
-2.1.4
-
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
-
diff --git a/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch b/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch
deleted file mode 100644
index f52f467..0000000
--- a/debian/patches/upstream_small-improvements-to-the-hurd-g-mkspec.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 8f0e84bec513ad28c3ec479053fbc59add3959e1 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino at tiscali.it>
-Date: Sat, 27 Dec 2014 17:32:51 +0100
-Subject: [PATCH] small improvements to the hurd-g++ mkspec
-
-- remove the X11R6 paths, since they were gone for years, and their
- lack may cause build issues with CMake config files
-- add empty QMAKE_*_XCB variables, as done in the common linux.conf
-- add to QMAKE_PLATFORM, not just reset it (just done in other mkspecs)
-- borrow QMAKE_LFLAGS_GCSECTIONS from the common linux.conf
-
-Change-Id: I94e05032f8195bbda73dffe1da02eec7ac679045
-Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
----
- mkspecs/hurd-g++/qmake.conf | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
-index 54a152d..d53b49c 100644
---- a/mkspecs/hurd-g++/qmake.conf
-+++ b/mkspecs/hurd-g++/qmake.conf
-@@ -3,19 +3,20 @@
- #
-
- MAKEFILE_GENERATOR = UNIX
--QMAKE_PLATFORM = hurd
-+QMAKE_PLATFORM += hurd
- CONFIG += incremental
- QMAKE_INCREMENTAL_STYLE = sublib
-
- QMAKE_CFLAGS_THREAD += -D_REENTRANT
- QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
-+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-
- QMAKE_INCDIR =
- QMAKE_LIBDIR =
--QMAKE_INCDIR_X11 = /usr/X11R6/include
--QMAKE_LIBDIR_X11 = /usr/X11R6/lib
--QMAKE_INCDIR_OPENGL = /usr/X11R6/include
--QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
-+QMAKE_INCDIR_X11 =
-+QMAKE_LIBDIR_X11 =
-+QMAKE_INCDIR_OPENGL =
-+QMAKE_LIBDIR_OPENGL =
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL =
-@@ -33,6 +34,10 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
- QMAKE_LIBS_OPENVG = -lOpenVG
- QMAKE_LIBS_THREAD = -lpthread
-
-+QMAKE_CFLAGS_XCB =
-+QMAKE_LIBS_XCB =
-+QMAKE_DEFINES_XCB =
-+
- QMAKE_AR = ar cqs
- QMAKE_OBJCOPY = objcopy
- QMAKE_NM = nm -P
---
-2.1.4
-
--
qtbase packaging
More information about the pkg-kde-commits
mailing list