Sun Feb 9 17:19:14 2014 UTC ()
Fix qt5-qtserialport on SunOS by patching cfmakeraw usage


(wiedi)
diff -r1.7 -r1.8 pkgsrc/x11/qt5-qtbase/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qtbase/patches/patch-qtserialport_src_serialport_qserialport__unix.cpp
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt5-qtbase/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2014/01/28 08:46:14 1.7
+++ pkgsrc/x11/qt5-qtbase/distinfo 2014/02/09 17:19:14 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.7 2014/01/28 08:46:14 ryoon Exp $ 1$NetBSD: distinfo,v 1.8 2014/02/09 17:19:14 wiedi Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-5.2.0.tar.xz) = 7d9d8cad4434bc200d9ed87b3c7cb39654a2f1b4 3SHA1 (qt-everywhere-opensource-src-5.2.0.tar.xz) = 7d9d8cad4434bc200d9ed87b3c7cb39654a2f1b4
4RMD160 (qt-everywhere-opensource-src-5.2.0.tar.xz) = b2dd68f622fa7ff271ef621a7c7f17f2ecf7be9d 4RMD160 (qt-everywhere-opensource-src-5.2.0.tar.xz) = b2dd68f622fa7ff271ef621a7c7f17f2ecf7be9d
5Size (qt-everywhere-opensource-src-5.2.0.tar.xz) = 173962448 bytes 5Size (qt-everywhere-opensource-src-5.2.0.tar.xz) = 173962448 bytes
6SHA1 (patch-qtbase_config.tests_unix_iconv_iconv.cpp) = bd7d0440b9c7022a71ccc6fe71415e1846c50e57 6SHA1 (patch-qtbase_config.tests_unix_iconv_iconv.cpp) = bd7d0440b9c7022a71ccc6fe71415e1846c50e57
7SHA1 (patch-qtbase_configure) = 06cbb2dc9433bbb890fa5a49e161798b6847af41 7SHA1 (patch-qtbase_configure) = 06cbb2dc9433bbb890fa5a49e161798b6847af41
8SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b 8SHA1 (patch-qtbase_mkspecs_features_qt__module__pris.prf) = b58b4a9e1a0a76cfa99c8b2c540514159707043b
9SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883 9SHA1 (patch-qtbase_qmake_Makefile.unix) = cdde195c16f55bc5f22ff095c20a59b7c2cdc883
10SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4 10SHA1 (patch-qtbase_qmake_generators_makefile.cpp) = 18831f38df9d4abf61dbd0a1f780bffc0b1cabf4
11SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = df77053e3f98e5be682bb7b4440c13d542556798 11SHA1 (patch-qtbase_qmake_generators_unix_unixmake.cpp) = df77053e3f98e5be682bb7b4440c13d542556798
12SHA1 (patch-qtbase_qmake_generators_unix_unixmake2.cpp) = 77f9e4114c48398676dbda1a564ba004a33c2a0b 12SHA1 (patch-qtbase_qmake_generators_unix_unixmake2.cpp) = 77f9e4114c48398676dbda1a564ba004a33c2a0b
13SHA1 (patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp) = 9a00bc1538136c29992e15b60bc23f9b40db900a 13SHA1 (patch-qtbase_src_concurrent_qtconcurrentiteratekernel.cpp) = 9a00bc1538136c29992e15b60bc23f9b40db900a
14SHA1 (patch-qtbase_src_corelib_arch_sparc_arch.pri) = 0af37348671d681cbfc5033dfe5347df33d59f27 14SHA1 (patch-qtbase_src_corelib_arch_sparc_arch.pri) = 0af37348671d681cbfc5033dfe5347df33d59f27
@@ -33,26 +33,27 @@ SHA1 (patch-qtdeclarative_src_qml_jsrunt @@ -33,26 +33,27 @@ SHA1 (patch-qtdeclarative_src_qml_jsrunt
33SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b 33SHA1 (patch-qtdeclarative_src_qmldevtools_qmldevtools.pro) = 6f0e65eb6c4a5bfd05a603d9cbfc6fdc22e46d3b
34SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998 34SHA1 (patch-qtdeclarative_tests_auto_qml_qjsengine_tst__qjsengine.cpp) = b1cc5a386dd0f1b3651adb9babee87be84221998
35SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 9281d212f28dab5fece2f7a0cc9bddf0e58922dc 35SHA1 (patch-qtmultimedia_src_gsttools_qgstreamervideoinputdevicecontrol.cpp) = 9281d212f28dab5fece2f7a0cc9bddf0e58922dc
36SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851 36SHA1 (patch-qtmultimedia_src_plugins_gstreamer_audiodecoder_qgstreameraudiodecoderserviceplugin.cpp) = ac97ed7ec63e3cfc060ce7e90dfe7f053f9dd851
37SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8 37SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabincontrol.cpp) = e2b0022da1f523324159efdcd29237f82380aed8
38SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 4c5f0d3d5a0c6b3075232272abe00b467575194f 38SHA1 (patch-qtmultimedia_src_plugins_gstreamer_camerabin_camerabinserviceplugin.cpp) = 4c5f0d3d5a0c6b3075232272abe00b467575194f
39SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374 39SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamercaptureserviceplugin.cpp) = 224a3097498d12284f10a9adb5a774356092f374
40SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 55aee0426b057461861605dadd4687932988bd78 40SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediacapture_qgstreamerv4l2input.cpp) = 55aee0426b057461861605dadd4687932988bd78
41SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp) = 729d69245a1ab6fe9b01a63673102685b39d7add 41SHA1 (patch-qtmultimedia_src_plugins_gstreamer_mediaplayer_qgstreamerplayerserviceplugin.cpp) = 729d69245a1ab6fe9b01a63673102685b39d7add
42SHA1 (patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = b1efdea5596a76eeae37a70bd49bb7741a8b7c5f 42SHA1 (patch-qtquick1_tests_auto_declarative_qdeclarativeimage_tst__qdeclarativeimage.cpp) = b1efdea5596a76eeae37a70bd49bb7741a8b7c5f
43SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h) = 66dc22ee78727c84f1e82dc10bb342d514f8f9a0 43SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_config.h) = 66dc22ee78727c84f1e82dc10bb342d514f8f9a0
44SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = ee35790f58ec9cf4d1a370f5549d92b5a680f557 44SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue.h) = ee35790f58ec9cf4d1a370f5549d92b5a680f557
45SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = ea5d9249aaa6e00b2111e0ba5bd8337f2e0f345a 45SHA1 (patch-qtscript_src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h) = ea5d9249aaa6e00b2111e0ba5bd8337f2e0f345a
 46SHA1 (patch-qtserialport_src_serialport_qserialport__unix.cpp) = 27ff0bdedda6099f11ebb3eb4c377052bb605ddd
46SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 67c3422f65338ea29d03e45f51bb0f40274760d1 47SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 67c3422f65338ea29d03e45f51bb0f40274760d1
47SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 5dc1139b4dbfd464bfecd9eac86090064e5ae816 48SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 5dc1139b4dbfd464bfecd9eac86090064e5ae816
48SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = 30562da15ccfd3034b6db5430e7abdab2fd5cb94 49SHA1 (patch-qttools_src_assistant_3rdparty_clucene_src_CLucene_util_Arrays.h) = 30562da15ccfd3034b6db5430e7abdab2fd5cb94
49SHA1 (patch-qttools_src_assistant_clucene_qclucene-config__p.h) = 000e1c5e6bba4e59738ec539d4f22530dc84cd98 50SHA1 (patch-qttools_src_assistant_clucene_qclucene-config__p.h) = 000e1c5e6bba4e59738ec539d4f22530dc84cd98
50SHA1 (patch-qttools_src_designer_src_uitools_uitools.pro) = 61e72ba527d1209daa3672c749e25413d0ac595e 51SHA1 (patch-qttools_src_designer_src_uitools_uitools.pro) = 61e72ba527d1209daa3672c749e25413d0ac595e
51SHA1 (patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri) = 196feeeaf0ce0e3a4f8c9541bb3ea67b0892f79c 52SHA1 (patch-qtwebkit_Source_JavaScriptCore_DerivedSources.pri) = 196feeeaf0ce0e3a4f8c9541bb3ea67b0892f79c
52SHA1 (patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri) = 0ce44b200616417357efc6495274c3a682bcd44b 53SHA1 (patch-qtwebkit_Source_JavaScriptCore_JavaScriptCore.pri) = 0ce44b200616417357efc6495274c3a682bcd44b
53SHA1 (patch-qtwebkit_Source_JavaScriptCore_Target.pri) = 5c86d2733e8288e6ec9bea61907f917953adfc5c 54SHA1 (patch-qtwebkit_Source_JavaScriptCore_Target.pri) = 5c86d2733e8288e6ec9bea61907f917953adfc5c
54SHA1 (patch-qtwebkit_Source_JavaScriptCore_assembler_ARMAssembler.h) = e1d300fa9e307dc2e905d7a81ba755cd13e5de7e 55SHA1 (patch-qtwebkit_Source_JavaScriptCore_assembler_ARMAssembler.h) = e1d300fa9e307dc2e905d7a81ba755cd13e5de7e
55SHA1 (patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 5c0b8cdba7590a4dc79715b874868c0d334b5f35 56SHA1 (patch-qtwebkit_Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 5c0b8cdba7590a4dc79715b874868c0d334b5f35
56SHA1 (patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp) = c720b46af1f38c8feac7c0ec478e54c68c817a82 57SHA1 (patch-qtwebkit_Source_JavaScriptCore_bytecode_CodeBlock.cpp) = c720b46af1f38c8feac7c0ec478e54c68c817a82
57SHA1 (patch-qtwebkit_Source_JavaScriptCore_dfg_DFGNode.h) = f52396dd1202bb0716e13cbeff173c5cc3ca8ae1 58SHA1 (patch-qtwebkit_Source_JavaScriptCore_dfg_DFGNode.h) = f52396dd1202bb0716e13cbeff173c5cc3ca8ae1
58SHA1 (patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2cbc9cdf08dfbb2d1814fd7a9fe18195700be15f 59SHA1 (patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2cbc9cdf08dfbb2d1814fd7a9fe18195700be15f
File Added: pkgsrc/x11/qt5-qtbase/patches/Attic/patch-qtserialport_src_serialport_qserialport__unix.cpp
$NetBSD: patch-qtserialport_src_serialport_qserialport__unix.cpp,v 1.1 2014/02/09 17:19:14 wiedi Exp $

SunOS doesn't have cfmakeraw
--- qtserialport/src/serialport/qserialport_unix.cpp.orig	2013-12-08 17:09:55.000000000 +0000
+++ qtserialport/src/serialport/qserialport_unix.cpp
@@ -236,7 +236,15 @@ bool QSerialPortPrivate::open(QIODevice:
     }
 
     currentTermios = restoredTermios;
+#if defined(__sun)
+    currentTermios.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
+    currentTermios.c_oflag &= ~OPOST;
+    currentTermios.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+    currentTermios.c_cflag &= ~(CSIZE|PARENB);
+    currentTermios.c_cflag |= CS8;
+#else
     ::cfmakeraw(&currentTermios);
+#endif
     currentTermios.c_cflag |= CLOCAL;
     currentTermios.c_cc[VTIME] = 0;
     currentTermios.c_cc[VMIN] = 0;