When I fixed a runtime error in Qt4 (after p2k19), I missed a major bump
for QtNetwork:
Dynamic export changes:
added:
_Z20q_X509_getm_notAfterPK7x509_st
_Z21q_X509_getm_notBeforePK7x509_st
removed:
X509_getm_notAfter
X509_getm_notBefore
The diff below bumps all libraries from x11/qt4 that link against
libQtNetwork.
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.162
diff -u -p -r1.162 Makefile
--- Makefile 6 Dec 2019 09:44:05 -0000 1.162
+++ Makefile 17 Mar 2020 17:13:25 -0000
@@ -26,7 +26,7 @@ PKGNAME-main = qt4-${PKGVERSION}
PKGNAME-debug = qt4-debug-${PKGVERSION}
FULLPKGNAME-html = qt4-html-${PKGVERSION}
FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main = 21
+REVISION-main = 22
REVISION-mysql = 7
REVISION-postgresql = 6
REVISION-sqlite2 = 6
@@ -38,27 +38,27 @@ REVISION-html = 3
# XXX qmake include parser is bogus
DPB_PROPERTIES = parallel nojunk
-SHARED_LIBS = Qt3Support 9.0 \
+SHARED_LIBS = Qt3Support 10.0 \
QtCore 10.0 \
QtDesigner 8.0 \
QtDesignerComponents 8.0 \
QtGui 11.0 \
- QtNetwork 11.0 \
+ QtNetwork 12.0 \
QtOpenGL 8.0 \
QtSql 9.0 \
QtXml 9.0 \
QtSvg 8.0 \
- QtTest 8.0 \
- QtDBus 3.0 \
+ QtTest 9.0 \
+ QtDBus 4.0 \
QtMultimedia 1.0 \
QtScript 3.0 \
- QtCLucene 1.0 \
- QtHelp 2.0 \
- QtXmlPatterns 1.0 \
+ QtCLucene 2.0 \
+ QtHelp 3.0 \
+ QtXmlPatterns 2.0 \
QtScriptTools 1.0 \
- QtWebKit 5.0 \
+ QtWebKit 6.0 \
phonon 5.0 \
- QtDeclarative 1.0
+ QtDeclarative 2.0
VERSION = 4.8.7
Index: pkg/PLIST-examples
===================================================================
RCS file: /var/cvs/ports/x11/qt4/pkg/PLIST-examples,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST-examples
--- pkg/PLIST-examples 12 Jul 2014 11:10:14 -0000 1.30
+++ pkg/PLIST-examples 17 Mar 2020 19:19:33 -0000
@@ -652,7 +652,7 @@ lib/qt4/demos/shared/images/slider_thumb
lib/qt4/demos/shared/images/title_cap_left.png
lib/qt4/demos/shared/images/title_cap_right.png
lib/qt4/demos/shared/images/title_stretch.png
-lib/qt4/demos/shared/libdemo_shared.a
+@static-lib lib/qt4/demos/shared/libdemo_shared.a
lib/qt4/demos/shared/libdemo_shared.prl
lib/qt4/demos/shared/shared.pri
lib/qt4/demos/shared/shared.pro
@@ -1105,7 +1105,7 @@ lib/qt4/examples/declarative/cppextensio
lib/qt4/examples/declarative/cppextensions/cppextensions.qmlproject
lib/qt4/examples/declarative/cppextensions/imageprovider/
lib/qt4/examples/declarative/cppextensions/imageprovider/ImageProviderCore/
-lib/qt4/examples/declarative/cppextensions/imageprovider/ImageProviderCore/libqmlimageproviderplugin.so
+@so
lib/qt4/examples/declarative/cppextensions/imageprovider/ImageProviderCore/libqmlimageproviderplugin.so
lib/qt4/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
lib/qt4/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
lib/qt4/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
@@ -1122,7 +1122,7 @@ lib/qt4/examples/declarative/cppextensio
lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml
lib/qt4/examples/declarative/cppextensions/plugins/
lib/qt4/examples/declarative/cppextensions/plugins/README
-lib/qt4/examples/declarative/cppextensions/plugins/libqmlqwidgetsplugin.so
+@so lib/qt4/examples/declarative/cppextensions/plugins/libqmlqwidgetsplugin.so
lib/qt4/examples/declarative/cppextensions/plugins/org/
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/
@@ -1130,7 +1130,7 @@ lib/qt4/examples/declarative/cppextensio
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/center.png
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/clock.png
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/hour.png
-lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/libqmlqtimeexampleplugin.so
+@so
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/libqmlqtimeexampleplugin.so
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/minute.png
lib/qt4/examples/declarative/cppextensions/plugins/org/qtproject/TimeExample/qmldir
lib/qt4/examples/declarative/cppextensions/plugins/plugin.cpp
@@ -3816,7 +3816,7 @@ lib/qt4/examples/tools/echoplugin/echowi
lib/qt4/examples/tools/echoplugin/plugin/
lib/qt4/examples/tools/echoplugin/plugin/echoplugin.cpp
lib/qt4/examples/tools/echoplugin/plugin/echoplugin.h
-lib/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
+@so lib/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
lib/qt4/examples/tools/echoplugin/plugin/plugin.pro
lib/qt4/examples/tools/i18n/
@bin lib/qt4/examples/tools/i18n/i18n
@@ -3878,9 +3878,9 @@ lib/qt4/examples/tools/plugandpaint/plug
lib/qt4/examples/tools/plugandpaint/plugindialog.cpp
lib/qt4/examples/tools/plugandpaint/plugindialog.h
lib/qt4/examples/tools/plugandpaint/plugins/
-lib/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a
+@static-lib lib/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a
lib/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.prl
-lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
+@so lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
lib/qt4/examples/tools/plugandpaintplugins/
lib/qt4/examples/tools/plugandpaintplugins/basictools/
lib/qt4/examples/tools/plugandpaintplugins/basictools/basictools.pro
@@ -3922,7 +3922,7 @@ lib/qt4/examples/tools/styleplugin/plugi
@bin lib/qt4/examples/tools/styleplugin/styleplugin
lib/qt4/examples/tools/styleplugin/styleplugin.pro
lib/qt4/examples/tools/styleplugin/styles/
-lib/qt4/examples/tools/styleplugin/styles/libsimplestyleplugin.so
+@so lib/qt4/examples/tools/styleplugin/styles/libsimplestyleplugin.so
lib/qt4/examples/tools/styleplugin/stylewindow/
lib/qt4/examples/tools/styleplugin/stylewindow/main.cpp
lib/qt4/examples/tools/styleplugin/stylewindow/stylewindow.cpp
@@ -4605,8 +4605,8 @@ lib/qt4/examples/xmlpatterns/xquery/glob
lib/qt4/examples/xmlpatterns/xquery/globalVariables/globals.html
lib/qt4/examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
lib/qt4/examples/xmlpatterns/xquery/xquery.pro
-lib/qt4/plugins/designer/libarthurplugin.so
-lib/qt4/plugins/designer/libcontainerextension.so
-lib/qt4/plugins/designer/libcustomwidgetplugin.so
-lib/qt4/plugins/designer/libtaskmenuextension.so
-lib/qt4/plugins/designer/libworldtimeclockplugin.so
+@so lib/qt4/plugins/designer/libarthurplugin.so
+@so lib/qt4/plugins/designer/libcontainerextension.so
+@so lib/qt4/plugins/designer/libcustomwidgetplugin.so
+@so lib/qt4/plugins/designer/libtaskmenuextension.so
+@so lib/qt4/plugins/designer/libworldtimeclockplugin.so
Index: pkg/PLIST-main
===================================================================
RCS file: /var/cvs/ports/x11/qt4/pkg/PLIST-main,v
retrieving revision 1.37
diff -u -p -r1.37 PLIST-main
--- pkg/PLIST-main 25 May 2018 13:09:02 -0000 1.37
+++ pkg/PLIST-main 17 Mar 2020 19:19:31 -0000
@@ -3175,19 +3175,19 @@ lib/qt4/imports/
lib/qt4/imports/Qt/
lib/qt4/imports/Qt/labs/
lib/qt4/imports/Qt/labs/folderlistmodel/
-lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
+@so lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
lib/qt4/imports/Qt/labs/folderlistmodel/qmldir
lib/qt4/imports/Qt/labs/gestures/
-lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
+@so lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
lib/qt4/imports/Qt/labs/gestures/qmldir
lib/qt4/imports/Qt/labs/particles/
-lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so
+@so lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so
lib/qt4/imports/Qt/labs/particles/qmldir
lib/qt4/imports/Qt/labs/shaders/
-lib/qt4/imports/Qt/labs/shaders/libqmlshadersplugin.so
+@so lib/qt4/imports/Qt/labs/shaders/libqmlshadersplugin.so
lib/qt4/imports/Qt/labs/shaders/qmldir
lib/qt4/imports/QtWebKit/
-lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
+@so lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
lib/qt4/imports/QtWebKit/qmldir
lib/qt4/include
lib/qt4/libQt3Support.la
@@ -3239,7 +3239,7 @@ lib/qt4/libQtSvg.prl
lib/qt4/libQtTest.la
lib/qt4/libQtTest.prl
@lib lib/qt4/libQtTest.so.${LIBQtTest_VERSION}
-lib/qt4/libQtUiTools.a
+@static-lib lib/qt4/libQtUiTools.a
lib/qt4/libQtUiTools.prl
lib/qt4/libQtWebKit.la
lib/qt4/libQtWebKit.prl
@@ -4051,44 +4051,44 @@ lib/qt4/pkgconfig/QtXmlPatterns.pc
lib/qt4/pkgconfig/phonon.pc
lib/qt4/plugins/
lib/qt4/plugins/accessible/
-lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
-lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
+@so lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+@so lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
lib/qt4/plugins/bearer/
-lib/qt4/plugins/bearer/libqgenericbearer.so
+@so lib/qt4/plugins/bearer/libqgenericbearer.so
lib/qt4/plugins/codecs/
-lib/qt4/plugins/codecs/libqcncodecs.so
-lib/qt4/plugins/codecs/libqjpcodecs.so
-lib/qt4/plugins/codecs/libqkrcodecs.so
-lib/qt4/plugins/codecs/libqtwcodecs.so
+@so lib/qt4/plugins/codecs/libqcncodecs.so
+@so lib/qt4/plugins/codecs/libqjpcodecs.so
+@so lib/qt4/plugins/codecs/libqkrcodecs.so
+@so lib/qt4/plugins/codecs/libqtwcodecs.so
lib/qt4/plugins/designer/
-lib/qt4/plugins/designer/libphononwidgets.so
-lib/qt4/plugins/designer/libqdeclarativeview.so
-lib/qt4/plugins/designer/libqt3supportwidgets.so
-lib/qt4/plugins/designer/libqwebview.so
+@so lib/qt4/plugins/designer/libphononwidgets.so
+@so lib/qt4/plugins/designer/libqdeclarativeview.so
+@so lib/qt4/plugins/designer/libqt3supportwidgets.so
+@so lib/qt4/plugins/designer/libqwebview.so
lib/qt4/plugins/graphicssystems/
-lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
-lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
+@so lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
+@so lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
lib/qt4/plugins/iconengines/
-lib/qt4/plugins/iconengines/libqsvgicon.so
+@so lib/qt4/plugins/iconengines/libqsvgicon.so
lib/qt4/plugins/imageformats/
-lib/qt4/plugins/imageformats/libqgif.so
-lib/qt4/plugins/imageformats/libqico.so
-lib/qt4/plugins/imageformats/libqjpeg.so
-lib/qt4/plugins/imageformats/libqmng.so
-lib/qt4/plugins/imageformats/libqsvg.so
-lib/qt4/plugins/imageformats/libqtga.so
-lib/qt4/plugins/imageformats/libqtiff.so
+@so lib/qt4/plugins/imageformats/libqgif.so
+@so lib/qt4/plugins/imageformats/libqico.so
+@so lib/qt4/plugins/imageformats/libqjpeg.so
+@so lib/qt4/plugins/imageformats/libqmng.so
+@so lib/qt4/plugins/imageformats/libqsvg.so
+@so lib/qt4/plugins/imageformats/libqtga.so
+@so lib/qt4/plugins/imageformats/libqtiff.so
lib/qt4/plugins/inputmethods/
-lib/qt4/plugins/inputmethods/libqimsw-multi.so
+@so lib/qt4/plugins/inputmethods/libqimsw-multi.so
lib/qt4/plugins/phonon_backend/
-lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
+@so lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
lib/qt4/plugins/qmltooling/
-lib/qt4/plugins/qmltooling/libqmldbg_inspector.so
-lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
+@so lib/qt4/plugins/qmltooling/libqmldbg_inspector.so
+@so lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
lib/qt4/plugins/script/
-lib/qt4/plugins/script/libqtscriptdbus.so
+@so lib/qt4/plugins/script/libqtscriptdbus.so
lib/qt4/plugins/sqldrivers/
-lib/qt4/plugins/sqldrivers/libqsqlite.so
+@so lib/qt4/plugins/sqldrivers/libqsqlite.so
lib/qt4/q3porting.xml
lib/qt4/tests/
lib/qt4/tests/qt4/
Index: pkg/PLIST-mysql
===================================================================
RCS file: /var/cvs/ports/x11/qt4/pkg/PLIST-mysql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-mysql
--- pkg/PLIST-mysql 14 Jun 2012 09:38:36 -0000 1.2
+++ pkg/PLIST-mysql 17 Mar 2020 19:19:38 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-mysql,v 1.2 2012/06/14 09:38:36 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlmysql.so
+@so lib/qt4/plugins/sqldrivers/libqsqlmysql.so
Index: pkg/PLIST-postgresql
===================================================================
RCS file: /var/cvs/ports/x11/qt4/pkg/PLIST-postgresql,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-postgresql
--- pkg/PLIST-postgresql 14 Jun 2012 09:38:36 -0000 1.2
+++ pkg/PLIST-postgresql 17 Mar 2020 19:19:38 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-postgresql,v 1.2 2012/06/14 09:38:36 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlpsql.so
+@so lib/qt4/plugins/sqldrivers/libqsqlpsql.so
Index: pkg/PLIST-sqlite2
===================================================================
RCS file: /var/cvs/ports/x11/qt4/pkg/PLIST-sqlite2,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-sqlite2
--- pkg/PLIST-sqlite2 14 Jun 2012 09:38:36 -0000 1.2
+++ pkg/PLIST-sqlite2 17 Mar 2020 19:19:38 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-sqlite2,v 1.2 2012/06/14 09:38:36 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlite2.so
+@so lib/qt4/plugins/sqldrivers/libqsqlite2.so
Index: pkg/PLIST-tds
===================================================================
RCS file: /var/cvs/ports/x11/qt4/pkg/PLIST-tds,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-tds
--- pkg/PLIST-tds 14 Jun 2012 09:38:36 -0000 1.2
+++ pkg/PLIST-tds 17 Mar 2020 19:19:38 -0000
@@ -1,2 +1,2 @@
@comment $OpenBSD: PLIST-tds,v 1.2 2012/06/14 09:38:36 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqltds.so
+@so lib/qt4/plugins/sqldrivers/libqsqltds.so
