diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-20 01:03:05 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-20 01:03:05 -0300 |
| commit | f8039fc964a84d9a1dd8d59aaf598fd01985c6c4 (patch) | |
| tree | 0bdd100b1bdc96653b6a0a9ad649bbcfaad3c970 /debian | |
| parent | 7b71aaa1bbc511f9c668417545b954fa75f468ff (diff) | |
| download | qtbase-f8039fc964a84d9a1dd8d59aaf598fd01985c6c4.tar.gz | |
Refresh support_mips_atomic_on_pre-mips32_archs.patch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/support_mips_atomic_on_pre-mips32_archs.patch | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index e7208b9..48c69e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,9 @@ qtbase-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium it's just a false positive coming from the fact that the documentation is listing the license, but it's really not licensed under the RFC license. * Update symbols files with buildds' logs. - * Refresh hurd_opengl_incldir.diff. + * Refresh patches: + - hurd_opengl_incldir.diff + - support_mips_atomic_on_pre-mips32_archs.patch * Remove fix_power_atomic_code.patch, the code it patches has been removed. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 29 Mar 2014 10:10:09 -0300 diff --git a/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch b/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch index d42760e..0a890c4 100644 --- a/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch +++ b/debian/patches/support_mips_atomic_on_pre-mips32_archs.patch @@ -20,14 +20,12 @@ doesn't choke on it. Change-Id: I9cc984bd55b5f172736ce9e638a6f4e271b79fe7 --- - src/corelib/arch/qatomic_mips.h | 10 ++++++++-- + src/corelib/arch/qatomic_mips.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h -index 6eb9613..dab72a2 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h -@@ -119,13 +119,19 @@ template <typename T> struct QAtomicOps : QBasicAtomicOps<sizeof(T)> +@@ -110,13 +110,19 @@ template <typename T> struct QAtomicOps template <int size> template <typename T> inline void QBasicAtomicOps<size>::acquireMemoryFence(const T &) Q_DECL_NOTHROW { @@ -49,6 +47,3 @@ index 6eb9613..dab72a2 100644 } template <int size> template <typename T> inline --- -1.8.4.2 - |