Sun Dec 4 21:46:54 2016 UTC ()
x11/qt5-qtbase: Fix build on FreeBSD and DragonFly

1. DragonFly needs -lexecinfo LDFLAG
2. Qlockfile is unsupported on DF, allow to fall through
3. QStorageInfo only worked for NetBSD.  Take patch from historical
   ports to fix FreeBSD, DragonFly, and OpenBSD.  (It's been fixed
   upstread for QT5 5.6)


(marino)
diff -r1.38 -r1.39 pkgsrc/x11/qt5-qtbase/Makefile
diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_io_qlockfile__unix.cpp
diff -r1.5 -r1.6 pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
cvs diff -r1.38 -r1.39 pkgsrc/x11/qt5-qtbase/Makefile (switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2016/12/04 05:17:15 1.38
+++ pkgsrc/x11/qt5-qtbase/Makefile 2016/12/04 21:46:54 1.39
@@ -1,223 +1,224 @@ @@ -1,223 +1,224 @@
1# $NetBSD: Makefile,v 1.38 2016/12/04 05:17:15 ryoon Exp $ 1# $NetBSD: Makefile,v 1.39 2016/12/04 21:46:54 marino Exp $
2 2
3DISTNAME= qtbase-opensource-src-${QTVERSION} 3DISTNAME= qtbase-opensource-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5PKGREVISION= 9 5PKGREVISION= 9
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7 7
8.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
9 9
10.if defined(MAKE_JOBS) 10.if defined(MAKE_JOBS)
11. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) 11. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
12CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q} 12CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
13. endif 13. endif
14.endif 14.endif
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16CONFIGURE_ARGS+= -optimized-qmake 16CONFIGURE_ARGS+= -optimized-qmake
17CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 17CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
18CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*} 18CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
19CONFIGURE_ARGS+= -opensource -confirm-license 19CONFIGURE_ARGS+= -opensource -confirm-license
20CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg" 20CONFIGURE_ARGS+= -sysconfdir "${PKG_SYSCONFDIR}/xdg"
21CONFIGURE_ARGS+= -accessibility 21CONFIGURE_ARGS+= -accessibility
22CONFIGURE_ARGS+= -dbus-linked 22CONFIGURE_ARGS+= -dbus-linked
23CONFIGURE_ARGS+= -fontconfig 23CONFIGURE_ARGS+= -fontconfig
24CONFIGURE_ARGS+= -force-pkg-config 24CONFIGURE_ARGS+= -force-pkg-config
25CONFIGURE_ARGS+= -icu 25CONFIGURE_ARGS+= -icu
26CONFIGURE_ARGS+= -openssl-linked 26CONFIGURE_ARGS+= -openssl-linked
27CONFIGURE_ARGS+= -nomake examples 27CONFIGURE_ARGS+= -nomake examples
28CONFIGURE_ARGS+= -nomake tests 28CONFIGURE_ARGS+= -nomake tests
29CONFIGURE_ARGS+= -no-pch 29CONFIGURE_ARGS+= -no-pch
30CONFIGURE_ARGS+= -no-sql-db2 30CONFIGURE_ARGS+= -no-sql-db2
31CONFIGURE_ARGS+= -no-sql-ibase 31CONFIGURE_ARGS+= -no-sql-ibase
32CONFIGURE_ARGS+= -no-sql-mysql 32CONFIGURE_ARGS+= -no-sql-mysql
33CONFIGURE_ARGS+= -no-sql-oci 33CONFIGURE_ARGS+= -no-sql-oci
34CONFIGURE_ARGS+= -no-sql-odbc 34CONFIGURE_ARGS+= -no-sql-odbc
35CONFIGURE_ARGS+= -no-sql-psql 35CONFIGURE_ARGS+= -no-sql-psql
36CONFIGURE_ARGS+= -no-sql-sqlite 36CONFIGURE_ARGS+= -no-sql-sqlite
37CONFIGURE_ARGS+= -no-sql-sqlite2 37CONFIGURE_ARGS+= -no-sql-sqlite2
38CONFIGURE_ARGS+= -no-sql-tds 38CONFIGURE_ARGS+= -no-sql-tds
39CONFIGURE_ARGS+= -no-strip 39CONFIGURE_ARGS+= -no-strip
40CONFIGURE_ARGS+= -system-harfbuzz 40CONFIGURE_ARGS+= -system-harfbuzz
41CONFIGURE_ARGS+= -system-libjpeg 41CONFIGURE_ARGS+= -system-libjpeg
42CONFIGURE_ARGS+= -system-libpng 42CONFIGURE_ARGS+= -system-libpng
43CONFIGURE_ARGS+= -system-pcre 43CONFIGURE_ARGS+= -system-pcre
44CONFIGURE_ARGS+= -system-sqlite 44CONFIGURE_ARGS+= -system-sqlite
45CONFIGURE_ARGS+= -system-zlib 45CONFIGURE_ARGS+= -system-zlib
46 46
47.include "../../mk/bsd.prefs.mk" 47.include "../../mk/bsd.prefs.mk"
48 48
49.if ${OPSYS} != "Darwin" 49.if ${OPSYS} != "Darwin"
50CONFIGURE_ARGS+= -iconv 50CONFIGURE_ARGS+= -iconv
51QMAKE_CONF= qmake.conf 51QMAKE_CONF= qmake.conf
52. if ${OPSYS} != "SunOS" && \ 52. if ${OPSYS} != "SunOS" && \
53 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64)) 53 (!empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Mx86_64))
54CONFIGURE_ARGS+= -reduce-relocations 54CONFIGURE_ARGS+= -reduce-relocations
55. endif 55. endif
56.else 56.else
57QMAKE_CONF= qmake.conf.mac 57QMAKE_CONF= qmake.conf.mac
58.endif 58.endif
59 59
60PLIST_VARS+= egl 60PLIST_VARS+= egl
61 61
62.include "../../mk/compiler.mk" 62.include "../../mk/compiler.mk"
63 63
64.if ${OPSYS} == "SunOS" 64.if ${OPSYS} == "SunOS"
65. if !empty(CC_VERSION:Mgcc*) 65. if !empty(CC_VERSION:Mgcc*)
66. if ${ABI:U} == "64" 66. if ${ABI:U} == "64"
67CONFIGURE_ARGS+= -platform solaris-g++-64 67CONFIGURE_ARGS+= -platform solaris-g++-64
68. else 68. else
69CONFIGURE_ARGS+= -platform solaris-g++ 69CONFIGURE_ARGS+= -platform solaris-g++
70. endif 70. endif
71. else 71. else
72. if ${ABI:U} == "64" 72. if ${ABI:U} == "64"
73CONFIGURE_ARGS+= -platform solaris-cc-64 73CONFIGURE_ARGS+= -platform solaris-cc-64
74. else 74. else
75CONFIGURE_ARGS+= -platform solaris-cc 75CONFIGURE_ARGS+= -platform solaris-cc
76. endif 76. endif
77. endif 77. endif
78SYS_LIBS= -lresolv -lsocket -lnsl -lrt 78SYS_LIBS= -lresolv -lsocket -lnsl -lrt
79.elif ${OPSYS} == "Interix" 79.elif ${OPSYS} == "Interix"
80CONFIGURE_ARGS+= -platform interix-g++ 80CONFIGURE_ARGS+= -platform interix-g++
81CFLAGS+= -I/usr/local/include/bind 81CFLAGS+= -I/usr/local/include/bind
82LDFLAGS+= -L/usr/local/lib/bind -lbind 82LDFLAGS+= -L/usr/local/lib/bind -lbind
83BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 83BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
84SYS_LIBS= -lbind -ldb -ldl 84SYS_LIBS= -lbind -ldb -ldl
85.elif ${OPSYS} == "DragonFly" 85.elif ${OPSYS} == "DragonFly"
86CONFIGURE_ARGS+= -platform freebsd-g++ 86CONFIGURE_ARGS+= -platform freebsd-g++
 87LDFLAGS+= -lexecinfo
87.elif ${OPSYS} == "Darwin" 88.elif ${OPSYS} == "Darwin"
88CONFIGURE_ARGS+= -platform macx-clang 89CONFIGURE_ARGS+= -platform macx-clang
89CONFIGURE_ARGS+= -no-framework 90CONFIGURE_ARGS+= -no-framework
90. if exists(/usr/lib/libresolv.dylib) 91. if exists(/usr/lib/libresolv.dylib)
91LDFLAGS+= -lresolv 92LDFLAGS+= -lresolv
92. endif 93. endif
93.elif ${OPSYS} == "Linux" 94.elif ${OPSYS} == "Linux"
94LDFLAGS+= -ldl 95LDFLAGS+= -ldl
95.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" 96.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
96. if exists(/usr/lib/libexecinfo.so) 97. if exists(/usr/lib/libexecinfo.so)
97LDFLAGS+= -lexecinfo 98LDFLAGS+= -lexecinfo
98. endif 99. endif
99.endif 100.endif
100.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" 101.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
101LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp 102LDFLAGS+= -lkvm # see patch-src_corelib_io_qlockfile__unix.cpp
102.endif 103.endif
103 104
104REPLACE_PERL+= bin/syncqt.pl 105REPLACE_PERL+= bin/syncqt.pl
105 106
106PTHREAD_OPTS+= require 107PTHREAD_OPTS+= require
107UNLIMIT_RESOURCES= datasize 108UNLIMIT_RESOURCES= datasize
108 109
109BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} 110BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
110 111
111BUILD_TARGET= sub-src 112BUILD_TARGET= sub-src
112INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig 113INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig
113INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 114INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
114 115
115CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro 116CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro
116CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro 117CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
117CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro 118CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
118CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro 119CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
119CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro 120CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
120CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro 121CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
121CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh 122CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
122 123
123SUBST_CLASSES+= opt path 124SUBST_CLASSES+= opt path
124SUBST_STAGE.opt= pre-configure 125SUBST_STAGE.opt= pre-configure
125SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags. 126SUBST_MESSAGE.opt= Removing some Qt5 default compiler flags.
126SUBST_FILES.opt= mkspecs/common/gcc-base.conf 127SUBST_FILES.opt= mkspecs/common/gcc-base.conf
127SUBST_SED.opt= -e 's,-O[23],,' 128SUBST_SED.opt= -e 's,-O[23],,'
128SUBST_SED.opt+= -e 's,-fvisibility=hidden,,' 129SUBST_SED.opt+= -e 's,-fvisibility=hidden,,'
129 130
130SUBST_STAGE.path= pre-configure 131SUBST_STAGE.path= pre-configure
131SUBST_MESSAGE.path= Add to default XDG path. 132SUBST_MESSAGE.path= Add to default XDG path.
132SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp 133SUBST_FILES.path= src/corelib/io/qstandardpaths_unix.cpp
133SUBST_VARS.path= LOCALBASE 134SUBST_VARS.path= LOCALBASE
134 135
135BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri 136BROKEN_FILES= qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
136 137
137PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \ 138PC_FILES= Qt5Bootstrap.pc Qt5Concurrent.pc Qt5Core.pc \
138 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \ 139 Qt5Gui.pc Qt5Network.pc Qt5OpenGL.pc \
139 Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \ 140 Qt5OpenGLExtensions.pc Qt5PlatformSupport.pc \
140 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \ 141 Qt5PrintSupport.pc Qt5Sql.pc Qt5Test.pc \
141 Qt5Widgets.pc Qt5Xml.pc 142 Qt5Widgets.pc Qt5Xml.pc
142 143
143pre-configure: 144pre-configure:
144 ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 145 ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \
145 -e 's:@X11BASE@:${X11BASE}:g' \ 146 -e 's:@X11BASE@:${X11BASE}:g' \
146 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 147 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
147 -e 's:@CC@:${CC:Q}:g' \ 148 -e 's:@CC@:${CC:Q}:g' \
148 -e 's:@CXX@:${CXX:Q}:g' \ 149 -e 's:@CXX@:${CXX:Q}:g' \
149 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 150 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
150 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 151 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
151 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 152 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
152 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 153 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
153 -e 's:@LEX@:${LEX}:g' \ 154 -e 's:@LEX@:${LEX}:g' \
154 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 155 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
155 -e 's:@AR@:${AR:Q}:g' \ 156 -e 's:@AR@:${AR:Q}:g' \
156 -e 's:@MKDIR@:${MKDIR}:g' \ 157 -e 's:@MKDIR@:${MKDIR}:g' \
157 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 158 -e 's:@LIBQT@:${LIBQT:Q}:g' \
158 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 159 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
159 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 160 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
160 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ 161 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
161 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 162 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
162 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf 163 ${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
163 for dir in ${WRKSRC}/mkspecs/*; do \ 164 for dir in ${WRKSRC}/mkspecs/*; do \
164 cp ${WRKSRC}/qmake.conf $${dir}; \ 165 cp ${WRKSRC}/qmake.conf $${dir}; \
165 rm -f $${dir}/*.orig; \ 166 rm -f $${dir}/*.orig; \
166 done 167 done
167 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf 168 ${RM} -f ${WRKSRC}/mkspecs/features/mac/default_pre.prf
168 ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig 169 ${RM} -f ${WRKSRC}/mkspecs/features/mac/objective_c.prf.orig
169 170
170post-configure: 171post-configure:
171 cd ${WRKSRC} && ./bin/qmake -o Makefile 172 cd ${WRKSRC} && ./bin/qmake -o Makefile
172 173
173post-install: 174post-install:
174.for i in ${PC_FILES} 175.for i in ${PC_FILES}
175 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 176 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
176 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i} 177 ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
177.endfor 178.endfor
178 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \ 179 cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} \
179 ${MAKE_PROGRAM} install_mkspecs 180 ${MAKE_PROGRAM} install_mkspecs
180# The pri file has WRKSRC in it. 181# The pri file has WRKSRC in it.
181 ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \ 182 ${SED} -e 's,${WRKSRC}/bin/qmake,${QTDIR}/bin/qmake,g' \
182 ${DESTDIR}${PREFIX}/${BROKEN_FILES} \ 183 ${DESTDIR}${PREFIX}/${BROKEN_FILES} \
183 > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 184 > ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1
184 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \ 185 ${MV} -f ${DESTDIR}${PREFIX}/${BROKEN_FILES}.1 \
185 ${DESTDIR}${PREFIX}/${BROKEN_FILES} 186 ${DESTDIR}${PREFIX}/${BROKEN_FILES}
186 187
187.include "../../converters/libiconv/buildlink3.mk" 188.include "../../converters/libiconv/buildlink3.mk"
188.include "../../devel/gettext-lib/buildlink3.mk" 189.include "../../devel/gettext-lib/buildlink3.mk"
189.include "../../devel/glib2/buildlink3.mk" 190.include "../../devel/glib2/buildlink3.mk"
190.include "../../devel/pcre/buildlink3.mk" 191.include "../../devel/pcre/buildlink3.mk"
191.include "../../devel/zlib/buildlink3.mk" 192.include "../../devel/zlib/buildlink3.mk"
192.include "../../fonts/fontconfig/buildlink3.mk" 193.include "../../fonts/fontconfig/buildlink3.mk"
193.include "../../fonts/harfbuzz/buildlink3.mk" 194.include "../../fonts/harfbuzz/buildlink3.mk"
194.include "../../graphics/freetype2/buildlink3.mk" 195.include "../../graphics/freetype2/buildlink3.mk"
195.include "../../graphics/png/buildlink3.mk" 196.include "../../graphics/png/buildlink3.mk"
196.include "../../security/openssl/buildlink3.mk" 197.include "../../security/openssl/buildlink3.mk"
197# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus 198# Use lib/dbus-1.0/include/dbus/dbus-arch-deps.h from sysutils/dbus
198USE_DBUS-ARCH-DEPS_H= yes 199USE_DBUS-ARCH-DEPS_H= yes
199.include "../../sysutils/dbus/buildlink3.mk" 200.include "../../sysutils/dbus/buildlink3.mk"
200.include "../../textproc/icu/buildlink3.mk" 201.include "../../textproc/icu/buildlink3.mk"
201.if ${OPSYS} != "Darwin" 202.if ${OPSYS} != "Darwin"
202.include "../../graphics/glu/buildlink3.mk" 203.include "../../graphics/glu/buildlink3.mk"
203. if !empty(MESALIB_SUPPORTS_EGL:Myes) 204. if !empty(MESALIB_SUPPORTS_EGL:Myes)
204PLIST.egl= yes 205PLIST.egl= yes
205. endif 206. endif
206.include "../../x11/libxcb/buildlink3.mk" 207.include "../../x11/libxcb/buildlink3.mk"
207.include "../../x11/xcb-util/buildlink3.mk" 208.include "../../x11/xcb-util/buildlink3.mk"
208.include "../../x11/xcb-util-image/buildlink3.mk" 209.include "../../x11/xcb-util-image/buildlink3.mk"
209.include "../../x11/xcb-util-keysyms/buildlink3.mk" 210.include "../../x11/xcb-util-keysyms/buildlink3.mk"
210.include "../../x11/xcb-util-wm/buildlink3.mk" 211.include "../../x11/xcb-util-wm/buildlink3.mk"
211.include "../../x11/libSM/buildlink3.mk" 212.include "../../x11/libSM/buildlink3.mk"
212.include "../../x11/libX11/buildlink3.mk" 213.include "../../x11/libX11/buildlink3.mk"
213.include "../../x11/libXext/buildlink3.mk" 214.include "../../x11/libXext/buildlink3.mk"
214.include "../../x11/libXcursor/buildlink3.mk" 215.include "../../x11/libXcursor/buildlink3.mk"
215.include "../../x11/libXft/buildlink3.mk" 216.include "../../x11/libXft/buildlink3.mk"
216.include "../../x11/libXmu/buildlink3.mk" 217.include "../../x11/libXmu/buildlink3.mk"
217.include "../../x11/libXrandr/buildlink3.mk" 218.include "../../x11/libXrandr/buildlink3.mk"
218.include "../../x11/libXrender/buildlink3.mk" 219.include "../../x11/libXrender/buildlink3.mk"
219.include "../../x11/libxkbcommon/buildlink3.mk" 220.include "../../x11/libxkbcommon/buildlink3.mk"
220.endif 221.endif
221.include "../../mk/jpeg.buildlink3.mk" 222.include "../../mk/jpeg.buildlink3.mk"
222.include "../../mk/pthread.buildlink3.mk" 223.include "../../mk/pthread.buildlink3.mk"
223.include "../../mk/bsd.pkg.mk" 224.include "../../mk/bsd.pkg.mk"
cvs diff -r1.30 -r1.31 pkgsrc/x11/qt5-qtbase/distinfo (switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/distinfo 2016/03/14 06:12:17 1.30
+++ pkgsrc/x11/qt5-qtbase/distinfo 2016/12/04 21:46:54 1.31
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: distinfo,v 1.30 2016/03/14 06:12:17 dbj Exp $ 1$NetBSD: distinfo,v 1.31 2016/12/04 21:46:54 marino Exp $
2 2
3SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f 3SHA1 (qtbase-opensource-src-5.5.1.tar.xz) = 0b651543fa013ae151b7a11f0d0dee092050aa3f
4RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44 4RMD160 (qtbase-opensource-src-5.5.1.tar.xz) = ce4bccd0703aaf8d904fbecd1f334ef13d698a44
5SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 5SHA512 (qtbase-opensource-src-5.5.1.tar.xz) = 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575
6Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes 6Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes
7SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764 7SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
8SHA1 (patch-configure) = 482815b5f3ec25fabe0995cfc70acf164928d192 8SHA1 (patch-configure) = 482815b5f3ec25fabe0995cfc70acf164928d192
9SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4 9SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4
10SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177 10SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177
11SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39 11SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39
12SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b 12SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b
13SHA1 (patch-qmake_Makefile.unix) = 0b33fc32f493e23da25bfb38ad59a6ae550581e5 13SHA1 (patch-qmake_Makefile.unix) = 0b33fc32f493e23da25bfb38ad59a6ae550581e5
14SHA1 (patch-qmake_generators_makefile.cpp) = 08bdf7b58fb7e5bd2a1c31f0a0344c733b65acb3 14SHA1 (patch-qmake_generators_makefile.cpp) = 08bdf7b58fb7e5bd2a1c31f0a0344c733b65acb3
15SHA1 (patch-qmake_generators_unix_unixmake.cpp) = f8d2b60473b19cfab76cca1b886f71030674099d 15SHA1 (patch-qmake_generators_unix_unixmake.cpp) = f8d2b60473b19cfab76cca1b886f71030674099d
16SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 528d7ea009dd9dd698009d7797d0b23dd469d995 16SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 528d7ea009dd9dd698009d7797d0b23dd469d995
17SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7 17SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7
18SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c 18SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c
19SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1 19SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1
20SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101 20SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66fd1b85d101
21SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180 21SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180
22SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328 22SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328
23SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = 62274f5a0c114ef86460218b4de303901ab7d0e6 23SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = f07812f0867bd04dfdea736847a668843a5fe646
24SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938 24SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
25SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 41852cf146138df3fd0f26d124a6f9a338d472a0 25SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 688de65bf3364cb8c982a7f82c9b67f5ecbebd10
26SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d 26SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
27SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580 27SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580
28SHA1 (patch-src_platformsupport_devicediscovery_devicediscovery.pri) = 2cd24768b41c813d0aee0943f97f913308794611 28SHA1 (patch-src_platformsupport_devicediscovery_devicediscovery.pri) = 2cd24768b41c813d0aee0943f97f913308794611
29SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081 29SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
30SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64 30SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
31SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d 31SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d
32SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02 32SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = 0eb333ed8193ef056dc2c4ed99fb9d207c31fa02
33SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb 33SHA1 (patch-src_tools_moc_main.cpp) = ebdddd657ba1c24657a9ca5624907e31a5d0c8bb
34SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1 34SHA1 (patch-src_widgets_graphicsview_qgraphicsitem__p.h) = fd55d5ef6fde506849aab07f7ba23e856373b3a1
35SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac 35SHA1 (patch-tests_auto_corelib_io_qprocess_qprocess.pro) = 7d5ccb008a30238fcf35e763832a494af51ed0ac
36SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1 36SHA1 (patch-tests_auto_widgets_itemviews_qtreewidgetitemiterator_qtreewidgetitemiterator.pro) = a0534c3fe05ea1d7a23170811d1da7fa740e31d1
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt5-qtbase/patches/Attic/patch-src_corelib_io_qlockfile__unix.cpp (switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/patches/Attic/patch-src_corelib_io_qlockfile__unix.cpp 2015/10/26 19:03:59 1.1
+++ pkgsrc/x11/qt5-qtbase/patches/Attic/patch-src_corelib_io_qlockfile__unix.cpp 2016/12/04 21:46:54 1.2
@@ -1,37 +1,40 @@ @@ -1,37 +1,40 @@
1$NetBSD: patch-src_corelib_io_qlockfile__unix.cpp,v 1.1 2015/10/26 19:03:59 adam Exp $ 1$NetBSD: patch-src_corelib_io_qlockfile__unix.cpp,v 1.2 2016/12/04 21:46:54 marino Exp $
2 2
3Add support for NetBSD and OpenBSD. 3Add support for NetBSD and OpenBSD.
 4Enable fallback to unsupported for DragonFly
4 5
5--- src/corelib/io/qlockfile_unix.cpp.orig 2015-10-25 12:40:42.000000000 +0000 6--- src/corelib/io/qlockfile_unix.cpp.orig 2015-10-13 04:35:31 UTC
6+++ src/corelib/io/qlockfile_unix.cpp 7+++ src/corelib/io/qlockfile_unix.cpp
7@@ -54,6 +54,10 @@ 8@@ -54,6 +54,10 @@
8 #elif defined(Q_OS_LINUX) 9 #elif defined(Q_OS_LINUX)
9 # include <unistd.h> 10 # include <unistd.h>
10 # include <cstdio> 11 # include <cstdio>
11+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) 12+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
12+# include <kvm.h> 13+# include <kvm.h>
13+# include <sys/param.h> 14+# include <sys/param.h>
14+# include <sys/sysctl.h> 15+# include <sys/sysctl.h>
15 #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS) 16 #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
16 # include <sys/user.h> 17 # include <sys/user.h>
17 # if defined(__GLIBC__) && defined(__FreeBSD_kernel__) 18 # if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
18@@ -239,6 +243,19 @@ QString QLockFilePrivate::processNameByP 19@@ -239,7 +243,20 @@ QString QLockFilePrivate::processNameByP
19 } 20 }
20 buf[len] = 0; 21 buf[len] = 0;
21 return QFileInfo(QFile::decodeName(buf)).fileName(); 22 return QFileInfo(QFile::decodeName(buf)).fileName();
 23-#elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
22+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) 24+#elif defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
23+ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL); 25+ kvm_t *kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
24+ int cnt; 26+ int cnt;
25+ QString name; 27+ QString name;
26+ struct kinfo_proc2 *proc = kvm_getproc2(kd, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), &cnt); 28+ struct kinfo_proc2 *proc = kvm_getproc2(kd, KERN_PROC_PID, (int)pid, sizeof(struct kinfo_proc2), &cnt);
27+ if (!proc) { 29+ if (!proc) {
28+ name = QString(); 30+ name = QString();
29+ } 31+ }
30+ else { 32+ else {
31+ name = QFile::decodeName(proc->p_comm); 33+ name = QFile::decodeName(proc->p_comm);
32+ } 34+ }
33+ kvm_close(kd); 35+ kvm_close(kd);
34+ return name; 36+ return name;
35 #elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS) 37+#elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS) && !defined(__DragonFly__)
36 # if defined(__GLIBC__) && defined(__FreeBSD_kernel__) 38 # if defined(__GLIBC__) && defined(__FreeBSD_kernel__)
37 int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid }; 39 int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid };
 40 size_t len = 0;
cvs diff -r1.5 -r1.6 pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp (switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp 2015/10/26 19:03:59 1.5
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp 2016/12/04 21:46:54 1.6
@@ -1,36 +1,53 @@ @@ -1,36 +1,53 @@
1$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.5 2015/10/26 19:03:59 adam Exp $ 1$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.6 2016/12/04 21:46:54 marino Exp $
2 2
3* make statvfs available on non-NetBSD BSD platforms 3* make statvfs available on non-NetBSD BSD platforms
 4* Use f_bsize instead of f_frsize on non-NetBSD BSD platforms
4* fix build on SunOS 5* fix build on SunOS
5 6
6--- src/corelib/io/qstorageinfo_unix.cpp.orig 2015-10-13 04:35:31.000000000 +0000 7--- src/corelib/io/qstorageinfo_unix.cpp.orig 2015-10-13 04:35:31 UTC
7+++ src/corelib/io/qstorageinfo_unix.cpp 8+++ src/corelib/io/qstorageinfo_unix.cpp
8@@ -68,8 +68,8 @@ 9@@ -68,8 +68,8 @@
9  10
10 #if defined(Q_OS_BSD4) 11 #if defined(Q_OS_BSD4)
11 # if defined(Q_OS_NETBSD) 12 # if defined(Q_OS_NETBSD)
12- define QT_STATFSBUF struct statvfs 13- define QT_STATFSBUF struct statvfs
13- define QT_STATFS ::statvfs 14- define QT_STATFS ::statvfs
14+# define QT_STATFSBUF struct statvfs 15+# define QT_STATFSBUF struct statvfs
15+# define QT_STATFS ::statvfs 16+# define QT_STATFS ::statvfs
16 # else 17 # else
17 # define QT_STATFSBUF struct statfs 18 # define QT_STATFSBUF struct statfs
18 # define QT_STATFS ::statfs 19 # define QT_STATFS ::statfs
19@@ -78,7 +78,7 @@ 20@@ -78,7 +78,7 @@
20 # if !defined(ST_RDONLY) 21 # if !defined(ST_RDONLY)
21 # define ST_RDONLY MNT_RDONLY 22 # define ST_RDONLY MNT_RDONLY
22 # endif 23 # endif
23-# if !defined(_STATFS_F_FLAGS) 24-# if !defined(_STATFS_F_FLAGS)
24+# if !defined(_STATFS_F_FLAGS) && !defined(Q_OS_NETBSD) 25+# if !defined(_STATFS_F_FLAGS) && !defined(Q_OS_NETBSD)
25 # define _STATFS_F_FLAGS 1 26 # define _STATFS_F_FLAGS 1
26 # endif 27 # endif
27 #elif defined(Q_OS_ANDROID) 28 #elif defined(Q_OS_ANDROID)
28@@ -87,7 +87,7 @@ 29@@ -87,7 +87,7 @@
29 # if !defined(ST_RDONLY) 30 # if !defined(ST_RDONLY)
30 # define ST_RDONLY 1 // hack for missing define on Android 31 # define ST_RDONLY 1 // hack for missing define on Android
31 # endif 32 # endif
32-#elif defined(Q_OS_HAIKU) 33-#elif defined(Q_OS_HAIKU)
33+#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS) 34+#elif defined(Q_OS_HAIKU) || defined(Q_OS_SOLARIS)
34 # define QT_STATFSBUF struct statvfs 35 # define QT_STATFSBUF struct statvfs
35 # define QT_STATFS ::statvfs 36 # define QT_STATFS ::statvfs
36 #else 37 #else
 38@@ -506,9 +506,15 @@ void QStorageInfoPrivate::retrieveVolume
 39 valid = true;
 40 ready = true;
 41
 42+#if defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
 43+ bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
 44+ bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
 45+ bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
 46+#else
 47 bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize;
 48 bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
 49 bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
 50+#endif
 51 #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4)
 52 #if defined(_STATFS_F_FLAGS)
 53 readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;