[Midnightbsd-cvs] mports [17799] trunk/devel/qt4-corelib: remove old patches

[laffer1 at midnightbsd.org]

Revision: 17799
          http://svnweb.midnightbsd.org/mports/?rev=17799
Author:   laffer1
Date:     2014-11-01 13:50:44 -0400 (Sat, 01 Nov 2014)
Log Message:
-----------
remove old patches

Modified Paths:
--------------
    trunk/devel/qt4-corelib/Makefile

Removed Paths:
-------------
    trunk/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff
    trunk/devel/qt4-corelib/files/patch-git_ccd1b2ee

Modified: trunk/devel/qt4-corelib/Makefile
===================================================================
--- trunk/devel/qt4-corelib/Makefile	2014-11-01 17:48:43 UTC (rev 17798)
+++ trunk/devel/qt4-corelib/Makefile	2014-11-01 17:50:44 UTC (rev 17799)
@@ -42,8 +42,6 @@
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 .include "${.CURDIR}/../../devel/qt4/files/Makefile.options"
 
 .if empty(QT4_OPTIONS:MCUPS)

Deleted: trunk/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff
===================================================================
--- trunk/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff	2014-11-01 17:48:43 UTC (rev 17798)
+++ trunk/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff	2014-11-01 17:50:44 UTC (rev 17799)
@@ -1,42 +0,0 @@
---- src/corelib/global/qglobal.h.orig	2009-09-07 13:00:30.000000000 +0200
-+++ src/corelib/global/qglobal.h	2009-09-14 12:46:30.965296640 +0200
-@@ -1594,8 +1594,16 @@
- #ifdef QT3_SUPPORT
- Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
- #endif /* QT3_SUPPORT */
--Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
--Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
-+Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+    __attribute__ ((format (printf, 2, 3)))
-+#endif
-+    ;
-+Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+    __attribute__ ((format (printf, 1, 2)))
-+#endif
-+    ;
- 
- #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
- #define QT_NO_DEBUG_STREAM
---- src/corelib/tools/qbytearray.h.orig	2009-09-07 13:00:30.000000000 +0200
-+++ src/corelib/tools/qbytearray.h	2009-09-14 12:44:29.801547129 +0200
-@@ -95,8 +95,16 @@
- Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
- 
- // implemented in qvsnprintf.cpp
--Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
--Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
-+Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 0)))
-+#endif
-+    ;
-+Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 4)))
-+#endif
-+    ;
- 
- #ifdef QT3_SUPPORT
- inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)

Deleted: trunk/devel/qt4-corelib/files/patch-git_ccd1b2ee
===================================================================
--- trunk/devel/qt4-corelib/files/patch-git_ccd1b2ee	2014-11-01 17:48:43 UTC (rev 17798)
+++ trunk/devel/qt4-corelib/files/patch-git_ccd1b2ee	2014-11-01 17:50:44 UTC (rev 17799)
@@ -1,35 +0,0 @@
-commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date:   Fri May 10 01:40:23 2013 +0300
-
-    Check that 3DNow! instructions are supported before including mm3dnow.h.
-    
-    Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX
-    instruction headers: by checking that the compiler is set to support those
-    instructions besides verifying that QT_HAVE_3DNOW evalues to true (which
-    only means the compiler supported them when the build was being configured).
-    
-    This has not caused a problem in most cases so far because GCC protects its
-    mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say,
-    pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check
-    and can fail if -march is set to, for example, i386 or i486.
-    
-    Not backported from qt5 because qtbase because qsimd_p.h does not include
-    the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee.
-    
-    Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd
-    Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
-
-diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
-index 87e26e1..6a32e8f 100644
---- ./src/corelib/tools/qsimd_p.h
-+++ ./src/corelib/tools/qsimd_p.h
-@@ -199,7 +199,7 @@ QT_BEGIN_HEADER
- #endif
- 
- // 3D now intrinsics
--#if defined(QT_HAVE_3DNOW)
-+#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC))
- #include <mm3dnow.h>
- #endif
-