Tue Sep 8 18:55:51 2015 UTC ()
Rename internal structure to not conflict with the new non-null warning
attribute.


(joerg)
diff -r1.23 -r1.24 pkgsrc/x11/qt5-qtbase/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qtbase/patches/patch-src_tools_qlalr_lalr.cpp
cvs diff -r1.23 -r1.24 pkgsrc/x11/qt5-qtbase/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2015/08/30 04:13:46 1.23
+++ pkgsrc/x11/qt5-qtbase/distinfo 2015/09/08 18:55:51 1.24
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.23 2015/08/30 04:13:46 markd Exp $ 1$NetBSD: distinfo,v 1.24 2015/09/08 18:55:51 joerg Exp $
2 2
3SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd 3SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
4RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909 4RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
5Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes 5Size (qtbase-opensource-src-5.4.0.tar.xz) = 46109688 bytes
6SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 6SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
7SHA1 (patch-configure) = f8b7c04737473af372165d1b8b48891b8e2b446c 7SHA1 (patch-configure) = f8b7c04737473af372165d1b8b48891b8e2b446c
8SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 8SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177
9SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 9SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39
10SHA1 (patch-mkspecs_features_simd.prf) = 3dea0d38e2791bdcae589bef38f2cce29a4c5b6c 10SHA1 (patch-mkspecs_features_simd.prf) = 3dea0d38e2791bdcae589bef38f2cce29a4c5b6c
11SHA1 (patch-qmake_Makefile.unix) = d07bfa160af94d06546865662bc2049a789fffec 11SHA1 (patch-qmake_Makefile.unix) = d07bfa160af94d06546865662bc2049a789fffec
12SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59d296a 12SHA1 (patch-qmake_generators_makefile.cpp) = 9db55a0a64183b9bff830af185ea1eb7c59d296a
13SHA1 (patch-qmake_generators_unix_unixmake.cpp) = b278ab55b2a8083d5bd343d9e748790cf99dc4e6 13SHA1 (patch-qmake_generators_unix_unixmake.cpp) = b278ab55b2a8083d5bd343d9e748790cf99dc4e6
14SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 7c2966006f20390c5b40698f1a110debd0b88c3a 14SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 7c2966006f20390c5b40698f1a110debd0b88c3a
@@ -18,16 +18,17 @@ SHA1 (patch-src_corelib_arch_sparc_arch. @@ -18,16 +18,17 @@ SHA1 (patch-src_corelib_arch_sparc_arch.
18SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101 18SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101
19SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180 19SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180
20SHA1 (patch-src_corelib_io_io.pri) = ce7630cc611410dec49a43519e9a162caba2ad05 20SHA1 (patch-src_corelib_io_io.pri) = ce7630cc611410dec49a43519e9a162caba2ad05
21SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 963030058b0b67df599c8eaf05a2cc8d6bc57706 21SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 963030058b0b67df599c8eaf05a2cc8d6bc57706
22SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = d6a8e931c25ce2f7065047a8861728b836bdddf8 22SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = d6a8e931c25ce2f7065047a8861728b836bdddf8
23SHA1 (patch-src_gui_image_qbmphandler.cpp) = 1e540711365f056657100ec84b22789e60443c98 23SHA1 (patch-src_gui_image_qbmphandler.cpp) = 1e540711365f056657100ec84b22789e60443c98
24SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d 24SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
25SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081 25SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
26SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64 26SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
27SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d 27SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d
28SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp) = cee1a36f16cabaaba45815c54ee262db90df0c98 28SHA1 (patch-src_plugins_platforms_xcb_qxcbconnection_xi2.cpp) = cee1a36f16cabaaba45815c54ee262db90df0c98
29SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 46c40c3d205fc5bffd26dac1b231d7c5a33c2dba 29SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 46c40c3d205fc5bffd26dac1b231d7c5a33c2dba
30SHA1 (patch-src_tools_moc_main.cpp) = d5888014ad648cb06fa8c348e52102133e6a5f4b 30SHA1 (patch-src_tools_moc_main.cpp) = d5888014ad648cb06fa8c348e52102133e6a5f4b
 31SHA1 (patch-src_tools_qlalr_lalr.cpp) = 33b1e65dc702fd96b60c0190d5ab86a11efbb735
31SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1 32SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
32SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac 33SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac
33SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1 34SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
File Added: pkgsrc/x11/qt5-qtbase/patches/Attic/patch-src_tools_qlalr_lalr.cpp
$NetBSD: patch-src_tools_qlalr_lalr.cpp,v 1.1 2015/09/08 18:55:51 joerg Exp $

--- src/tools/qlalr/lalr.cpp.orig	2015-08-30 17:58:52.000000000 +0000
+++ src/tools/qlalr/lalr.cpp
@@ -238,11 +238,11 @@ void Grammar::buildExtendedGrammar ()
   non_terminals.insert (accept_symbol);
 }
 
-struct _Nullable: public std::unary_function<Name, bool>
+struct qt_Nullable: public std::unary_function<Name, bool>
 {
   Automaton *_M_automaton;
 
-  _Nullable (Automaton *aut):
+  qt_Nullable (Automaton *aut):
     _M_automaton (aut) {}
 
   bool operator () (Name name) const
@@ -300,7 +300,7 @@ void Automaton::buildNullables ()
 
       for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
         {
-          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
+          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (qt_Nullable (this)));
 
           if (nn == rule->rhs.end ())
             changed |= nullables.insert (rule->lhs).second;
@@ -635,7 +635,7 @@ void Automaton::buildIncludesDigraph ()
                   if (! _M_grammar->isNonTerminal (*A))
                     continue;
 
-                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
+                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (qt_Nullable (this)));
                   if (first_not_nullable != rule->rhs.end ())
                     continue;