[Midnightbsd-cvs] mports [23396] trunk/devel/qt5-core: drop patches
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 6 12:51:23 EDT 2018
Revision: 23396
http://svnweb.midnightbsd.org/mports/?rev=23396
Author: laffer1
Date: 2018-05-06 12:51:22 -0400 (Sun, 06 May 2018)
Log Message:
-----------
drop patches
Modified Paths:
--------------
trunk/devel/qt5-core/pkg-plist
Removed Paths:
-------------
trunk/devel/qt5-core/files/patch-git_08be8691
trunk/devel/qt5-core/files/patch-git_090bf50
trunk/devel/qt5-core/files/patch-git_6552469
trunk/devel/qt5-core/files/patch-git_c8c4ad0
Deleted: trunk/devel/qt5-core/files/patch-git_08be8691
===================================================================
--- trunk/devel/qt5-core/files/patch-git_08be8691 2018-05-06 16:19:23 UTC (rev 23395)
+++ trunk/devel/qt5-core/files/patch-git_08be8691 2018-05-06 16:51:22 UTC (rev 23396)
@@ -1,45 +0,0 @@
-commit 08be8691f7ba5e522cbc000b1880941128ad5f8c
-Author: Dmitry Shachnev <mitya57 at gmail.com>
-Date: Fri Oct 23 21:21:38 2015 +0300
-
- Fix QStorageInfo on BSD4 systems
-
- - On NetBSD, the defines were not properly defined;
- - On all other BSD systems, we use statfs which does not have f_frsize
- member, revert to using f_bsize there.
-
- Task-number: QTBUG-48267
- Change-Id: Ia1ed484ac61a615fcbb5b45affb516b5e86a64b0
- Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen at theqtcompany.com>
- Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
- Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
-
---- src/corelib/io/qstorageinfo_unix.cpp
-+++ src/corelib/io/qstorageinfo_unix.cpp
-@@ -68,8 +68,8 @@
-
- #if defined(Q_OS_BSD4)
- # if defined(Q_OS_NETBSD)
-- define QT_STATFSBUF struct statvfs
-- define QT_STATFS ::statvfs
-+# define QT_STATFSBUF struct statvfs
-+# define QT_STATFS ::statvfs
- # else
- # define QT_STATFSBUF struct statfs
- # define QT_STATFS ::statfs
-@@ -506,9 +506,15 @@ void QStorageInfoPrivate::retrieveVolumeInfo()
- valid = true;
- ready = true;
-
-+#if defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)
-+ bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize;
-+ bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize;
-+ bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize;
-+#else
- bytesTotal = statfs_buf.f_blocks * statfs_buf.f_frsize;
- bytesFree = statfs_buf.f_bfree * statfs_buf.f_frsize;
- bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize;
-+#endif
- #if defined(Q_OS_ANDROID) || defined (Q_OS_BSD4)
- #if defined(_STATFS_F_FLAGS)
- readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0;
Deleted: trunk/devel/qt5-core/files/patch-git_090bf50
===================================================================
--- trunk/devel/qt5-core/files/patch-git_090bf50 2018-05-06 16:19:23 UTC (rev 23395)
+++ trunk/devel/qt5-core/files/patch-git_090bf50 2018-05-06 16:51:22 UTC (rev 23396)
@@ -1,25 +0,0 @@
-commit 090bf50771ec1e5d089b0ae0488059a5643883b2
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Sun Dec 27 01:24:34 2015 +0100
-
- forkfd: Only enable pipe2 on FreeBSD >= 10.0.
-
- The system call is not present on earlier releases, and since the 9.x
- series will be supported until the end of 2016, add a check for the
- __FreeBSD_version macro and only enable pipe2 support if the value is
- high enough.
-
- Change-Id: I5633531cec7e95d42ff5f4b14afe772ae8d7d66d
- Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
-
---- src/3rdparty/forkfd/forkfd.c
-+++ src/3rdparty/forkfd/forkfd.c
-@@ -62,7 +62,7 @@
- # undef HAVE_WAITID
- #endif
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__FreeBSD_version) && __FreeBSD_version >= 1000032
- # define HAVE_PIPE2 1
- #endif
-
Deleted: trunk/devel/qt5-core/files/patch-git_6552469
===================================================================
--- trunk/devel/qt5-core/files/patch-git_6552469 2018-05-06 16:19:23 UTC (rev 23395)
+++ trunk/devel/qt5-core/files/patch-git_6552469 2018-05-06 16:51:22 UTC (rev 23396)
@@ -1,43 +0,0 @@
-commit 655246969eaa916fbc098a7315dc24830f5b8b5d
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Mon Dec 28 11:43:36 2015 +0100
-
- forkfd: Also define BSD visibility macros in forkfd_qt.cpp.
-
- This is a follow-up to c8c4ad0 ("forkfd: Define __BSD_VISIBLE and
- _NETBSD_SOURCE").
-
- Defining those macros in forkfd.c is not enough: forkfd_qt.cpp also sets
- _POSIX_C_SOURCE, and sys/cdefs.h can be included implicitly via Qt's
- headers (<algorithm> ends up pulling unistd.h that leads to sys/cdefs.h
- and sys/types.h with both libstdc++ and older libc++ versions). In this
- case, __BSD_VISIBLE/_NETBSD_SOURCE are not defined, _POSIX_C_SOURCE is,
- several type definitions are omitted and by the time we include
- sys/time.h in forkfd.c the build fails. On FreeBSD < 11, the error looks
- like this:
-
- In file included from io/../../3rdparty/forkfd/forkfd.c:36,
- from io/forkfd_qt.cpp:80:
- /usr/include/sys/time.h:94: error: 'u_int' has not been declared
-
- Change-Id: I01fa2f5861027d99936d3026faeee9f0db3ecabd
- Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
-
---- src/corelib/io/forkfd_qt.cpp
-+++ src/corelib/io/forkfd_qt.cpp
-@@ -39,6 +39,15 @@
- # define _XOPEN_SOURCE 700
- #endif
-
-+// Define BSD visibility macros. These are also defined in forkfd.c, but the
-+// headers using them may be included before forkfd.c itself.
-+#ifndef _NETBSD_SOURCE
-+# define _NETBSD_SOURCE 1
-+#endif
-+#ifndef __BSD_VISIBLE
-+# define __BSD_VISIBLE 1
-+#endif
-+
- #include <QtCore/qatomic.h>
- #include "qprocess_p.h"
-
Deleted: trunk/devel/qt5-core/files/patch-git_c8c4ad0
===================================================================
--- trunk/devel/qt5-core/files/patch-git_c8c4ad0 2018-05-06 16:19:23 UTC (rev 23395)
+++ trunk/devel/qt5-core/files/patch-git_c8c4ad0 2018-05-06 16:51:22 UTC (rev 23396)
@@ -1,31 +0,0 @@
-commit c8c4ad0c62cacec749b6c42e0a58339446093bba
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date: Sat Dec 26 02:30:58 2015 +0100
-
- forkfd: Define __BSD_VISIBLE and _NETBSD_SOURCE.
-
- pipe2's availability on BSD operating systems depends on the
- __BSD_VISIBLE macro on FreeBSD and OpenBSD and _NETBSD_SOURCE on
- NetBSD (DragonFly BSD appears to define it unconditionally).
-
- Those two macros are generally set by default, except when
- _POSIX_C_SOURCE is set. Since we consciously set _POSIX_C_SOURCE but
- need pipe2, explicitly define the visibility macros.
-
- This fixes the -no-pch build on FreeBSD at least.
-
- Change-Id: Icc77f6b5d1f9a5bf7bd8048cabbb01f8f89397cc
- Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
---- src/3rdparty/forkfd/forkfd.c
-+++ src/3rdparty/forkfd/forkfd.c
-@@ -25,8 +25,10 @@
-
- #ifndef _GNU_SOURCE
- # define _GNU_SOURCE
-+# define _NETBSD_SOURCE 1
- # define _POSIX_C_SOURCE 200809L
- # define _XOPEN_SOURCE 700
-+# define __BSD_VISIBLE 1
- #endif
- #include "forkfd.h"
-
Modified: trunk/devel/qt5-core/pkg-plist
===================================================================
--- trunk/devel/qt5-core/pkg-plist 2018-05-06 16:19:23 UTC (rev 23395)
+++ trunk/devel/qt5-core/pkg-plist 2018-05-06 16:51:22 UTC (rev 23396)
@@ -8,7 +8,9 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_mac_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcore_unix_p.h
@@ -26,6 +28,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeuckrcodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_blackberry_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_cf_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_glib_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_unix_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeventdispatcher_win_p.h
@@ -47,9 +50,11 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_polling_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfilesystemwatcher_win_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfinalstate_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfreelist_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_iterator_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfsfileengine_p.h
+%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_fake_env_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfunctions_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfutureinterface_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qfuturewatcher_p.h
@@ -146,7 +151,6 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
-%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qversionnumber_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
@@ -241,6 +245,7 @@
%%QT_INCDIR%%/QtCore/QHash
%%QT_INCDIR%%/QtCore/QHashData
%%QT_INCDIR%%/QtCore/QHashDummyValue
+%%QT_INCDIR%%/QtCore/QHashFunctions
%%QT_INCDIR%%/QtCore/QHashIterator
%%QT_INCDIR%%/QtCore/QHashNode
%%QT_INCDIR%%/QtCore/QHistoryState
@@ -295,9 +300,6 @@
%%QT_INCDIR%%/QtCore/QMetaObject
%%QT_INCDIR%%/QtCore/QMetaProperty
%%QT_INCDIR%%/QtCore/QMetaType
-%%QT_INCDIR%%/QtCore/QMetaTypeId
-%%QT_INCDIR%%/QtCore/QMetaTypeId2
-%%QT_INCDIR%%/QtCore/QMetaTypeIdQObject
%%QT_INCDIR%%/QtCore/QMimeData
%%QT_INCDIR%%/QtCore/QMimeDatabase
%%QT_INCDIR%%/QtCore/QMimeType
@@ -413,6 +415,7 @@
%%QT_INCDIR%%/QtCore/QTranslator
%%QT_INCDIR%%/QtCore/QTypeInfo
%%QT_INCDIR%%/QtCore/QTypeInfoMerger
+%%QT_INCDIR%%/QtCore/QTypeInfoQuery
%%QT_INCDIR%%/QtCore/QUnhandledException
%%QT_INCDIR%%/QtCore/QUrl
%%QT_INCDIR%%/QtCore/QUrlQuery
@@ -427,6 +430,7 @@
%%QT_INCDIR%%/QtCore/QVariantMap
%%QT_INCDIR%%/QtCore/QVector
%%QT_INCDIR%%/QtCore/QVectorIterator
+%%QT_INCDIR%%/QtCore/QVersionNumber
%%QT_INCDIR%%/QtCore/QWaitCondition
%%QT_INCDIR%%/QtCore/QWeakPointer
%%QT_INCDIR%%/QtCore/QWinEventNotifier
@@ -482,7 +486,6 @@
%%QT_INCDIR%%/QtCore/qatomic_cxx11.h
%%QT_INCDIR%%/QtCore/qatomic_gcc.h
%%QT_INCDIR%%/QtCore/qatomic_ia64.h
-%%QT_INCDIR%%/QtCore/qatomic_mips.h
%%QT_INCDIR%%/QtCore/qatomic_msvc.h
%%QT_INCDIR%%/QtCore/qatomic_unix.h
%%QT_INCDIR%%/QtCore/qatomic_x86.h
@@ -543,6 +546,7 @@
%%QT_INCDIR%%/QtCore/qglobal.h
%%QT_INCDIR%%/QtCore/qglobalstatic.h
%%QT_INCDIR%%/QtCore/qhash.h
+%%QT_INCDIR%%/QtCore/qhashfunctions.h
%%QT_INCDIR%%/QtCore/qhistorystate.h
%%QT_INCDIR%%/QtCore/qidentityproxymodel.h
%%QT_INCDIR%%/QtCore/qiodevice.h
@@ -651,6 +655,8 @@
%%QT_INCDIR%%/QtCore/qvariantanimation.h
%%QT_INCDIR%%/QtCore/qvarlengtharray.h
%%QT_INCDIR%%/QtCore/qvector.h
+%%QT_INCDIR%%/QtCore/qversionnumber.h
+%%QT_INCDIR%%/QtCore/qversiontagging.h
%%QT_INCDIR%%/QtCore/qwaitcondition.h
%%QT_INCDIR%%/QtCore/qwineventnotifier.h
%%QT_INCDIR%%/QtCore/qxmlstream.h
More information about the Midnightbsd-cvs
mailing list