pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qtbase Update patches with comments about that...
details: https://anonhg.NetBSD.org/pkgsrc/rev/b1ae73a8134a
branches: trunk
changeset: 651952:b1ae73a8134a
user: nros <nros%pkgsrc.org@localhost>
date: Mon May 18 13:52:24 2015 +0000
description:
Update patches with comments about that they have been sent upstream.
diffstat:
x11/qt5-qtbase/distinfo | 6 +++---
x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri | 5 +++--
x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp | 4 +++-
3 files changed, 9 insertions(+), 6 deletions(-)
diffs (48 lines):
diff -r 14a9a8625129 -r b1ae73a8134a x11/qt5-qtbase/distinfo
--- a/x11/qt5-qtbase/distinfo Mon May 18 13:36:38 2015 +0000
+++ b/x11/qt5-qtbase/distinfo Mon May 18 13:52:24 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/04/15 14:10:15 nros Exp $
+$NetBSD: distinfo,v 1.21 2015/05/18 13:52:24 nros Exp $
SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
@@ -16,8 +16,8 @@
SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1
SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101
SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180
-SHA1 (patch-src_corelib_io_io.pri) = c4bb37370849bfbc994809825ff94090d71a7116
-SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 7732cae95975af17e0618667b979c3b84d51adae
+SHA1 (patch-src_corelib_io_io.pri) = 2ef6ddb57bf18c22c508283e79d6032bc9d01a6f
+SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 963030058b0b67df599c8eaf05a2cc8d6bc57706
SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = d6a8e931c25ce2f7065047a8861728b836bdddf8
SHA1 (patch-src_gui_image_qbmphandler.cpp) = 1e540711365f056657100ec84b22789e60443c98
SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
diff -r 14a9a8625129 -r b1ae73a8134a x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri Mon May 18 13:36:38 2015 +0000
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_io.pri Mon May 18 13:52:24 2015 +0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-src_corelib_io_io.pri,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_corelib_io_io.pri,v 1.2 2015/05/18 13:52:24 nros Exp $
* Add NetBSD support
* Add DragonFly support
-
+* Patch sent and merged upstream:
+ http://codereview.qt-project.org/#/c/111741/
--- src/corelib/io/io.pri.orig 2013-11-27 01:01:16.000000000 +0000
+++ src/corelib/io/io.pri
@@ -152,7 +152,7 @@ win32 {
diff -r 14a9a8625129 -r b1ae73a8134a x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp Mon May 18 13:36:38 2015 +0000
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qfilesystemwatcher.cpp Mon May 18 13:52:24 2015 +0000
@@ -1,6 +1,8 @@
-$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.2 2015/05/18 13:52:24 nros Exp $
* Add NetBSD support
+* patch filed and merged upstream:
+ http://codereview.qt-project.org/#/c/111741/
--- src/corelib/io/qfilesystemwatcher.cpp.orig 2014-09-11 10:48:06.000000000 +0000
+++ src/corelib/io/qfilesystemwatcher.cpp
Home |
Main Index |
Thread Index |
Old Index