pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Qt 4.8.5 provides overall close to 400 improvement...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2a71e0c08c3a
branches: trunk
changeset: 621380:2a71e0c08c3a
user: adam <adam%pkgsrc.org@localhost>
date: Sun Jul 07 18:13:56 2013 +0000
description:
Qt 4.8.5 provides overall close to 400 improvements, for example:
35 fixes to Qt Core module
65 fixes to Qt Gui module
21 Mac OS X specific fixes
15 Windows specific fixes
8 Linux/X11 specific fixes
Webkit upgrade to 2.2.4 (minor improvements)
Change all shmget calls to user-only memory (security)
Several important fixes for the VxWorks port in the Qt Enterprise version
diffstat:
x11/qt4-docs/Makefile | 3 +-
x11/qt4-libs/Makefile | 53 ++++++---
x11/qt4-libs/Makefile.common | 4 +-
x11/qt4-libs/PLIST | 4 +-
x11/qt4-libs/distinfo | 25 +--
x11/qt4-libs/patches/patch-aq | 22 ++--
x11/qt4-libs/patches/patch-av | 10 +-
x11/qt4-libs/patches/patch-src-tools-mocmain.cpp-QTBUG-22829 | 13 --
x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp | 15 --
x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h | 4 +-
x11/qt4-libs/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h | 13 ++
x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h | 39 +++---
x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h | 13 +-
x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp | 19 ---
x11/qt4-libs/patches/patch-src_corelib_tools_qiterator.h | 16 ---
x11/qt4-libs/patches/patch-src_declarative_util_qdeclarativefontloader.cpp | 22 ----
x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h | 15 --
x11/qt4-mng/Makefile | 3 +-
x11/qt4-mysql/Makefile | 3 +-
x11/qt4-pgsql/Makefile | 3 +-
x11/qt4-qdbus/Makefile | 7 +-
x11/qt4-sqlite3/Makefile | 3 +-
x11/qt4-tiff/Makefile | 9 +-
x11/qt4-tools/Makefile | 28 ++--
x11/qt4-tools/PLIST | 6 +-
x11/qt4/Makefile.common | 6 +-
26 files changed, 139 insertions(+), 219 deletions(-)
diffs (truncated from 795 to 300 lines):
diff -r 5fcab1c56596 -r 2a71e0c08c3a x11/qt4-docs/Makefile
--- a/x11/qt4-docs/Makefile Sun Jul 07 18:11:11 2013 +0000
+++ b/x11/qt4-docs/Makefile Sun Jul 07 18:13:56 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2013/06/06 12:55:21 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/07/07 18:13:56 adam Exp $
PKGNAME= qt4-docs-${QTVERSION}
-PKGREVISION= 5
COMMENT= Documentation for the QT C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
diff -r 5fcab1c56596 -r 2a71e0c08c3a x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Sun Jul 07 18:11:11 2013 +0000
+++ b/x11/qt4-libs/Makefile Sun Jul 07 18:13:56 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2013/06/06 12:53:41 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2013/07/07 18:13:56 adam Exp $
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 7
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
@@ -29,6 +28,7 @@
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
CXXFLAGS+= -std=c++11 -Wno-c++11-narrowing
+CXXFLAGS+= -D_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC=1
.endif
INSTALLATION_DIRS= lib/pkgconfig
@@ -36,6 +36,7 @@
INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel
INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures
INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles
+INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/shaders
INSTALLATION_DIRS+= ${QTPREFIX}/imports/QtWebKit
INSTALLATION_DIRS+= ${QTPREFIX}/include
INSTALLATION_DIRS+= ${QTPREFIX}/lib
@@ -60,8 +61,8 @@
SUBST_SED.no-libtool= -e '/@: IGNORE THIS LINE/s,=.*$$,= @:,'
do-install:
-.for prog in moc rcc uic
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
+.for f in moc rcc uic
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${DESTDIR}${QTPREFIX}/bin/
.endfor
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
${DESTDIR}${QTPREFIX}/bin/
@@ -74,47 +75,59 @@
${LIBTOOL} --mode=install ${INSTALL_LIB} \
${WRKSRC}/imports/Qt/labs/particles/libqmlparticlesplugin.la \
${DESTDIR}${QTPREFIX}/imports/Qt/labs/particles/
- ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+ ${WRKSRC}/imports/Qt/labs/shaders/libqmlshadersplugin.la \
+ ${DESTDIR}${QTPREFIX}/imports/Qt/labs/shaders/
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} \
${WRKSRC}/imports/QtWebKit/libqmlwebkitplugin.la \
${DESTDIR}${QTPREFIX}/imports/QtWebKit/
-.for incl in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/Source/WebKit/qt
- cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
+.for f in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/Source/WebKit/qt
+ cd ${WRKSRC}/src/${f} && env ${MAKE_ENV} ${INSTALL_ENV} \
${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
.endfor
cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
-.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore webcore
- ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
+.for f in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore webcore
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${f}.la \
${DESTDIR}${QTPREFIX}/lib/
sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
-e "s:${QTPREFIX}/lib/lib\\([A-Za-z3]*\\)\\.la:-l\\1:g" \
- ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
- ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
+ ${WRKSRC}/lib/pkgconfig/${f}.pc > ${WRKDIR}/${f}.pc
+ ${INSTALL_DATA} ${WRKDIR}/${f}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
.endfor
${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX}
-.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets
+.for f in qtaccessiblecompatwidgets qtaccessiblewidgets
${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/plugins/accessible/lib${plug}.la \
+ ${WRKSRC}/plugins/accessible/lib${f}.la \
${DESTDIR}${QTPREFIX}/plugins/accessible/
.endfor
+#.for f in qcorewlanbearer qgenericbearer
+.if ${OPSYS} == "Darwin"
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} \
+ ${WRKSRC}/plugins/bearer/libqcorewlanbearer.la \
+ ${DESTDIR}${QTPREFIX}/plugins/bearer/
+.endif
${LIBTOOL} --mode=install ${INSTALL_LIB} \
${WRKSRC}/plugins/bearer/libqgenericbearer.la \
${DESTDIR}${QTPREFIX}/plugins/bearer/
-.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs
+#.endfor
+.for f in qcncodecs qjpcodecs qkrcodecs qtwcodecs
${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/plugins/codecs/lib${codec}.la \
+ ${WRKSRC}/plugins/codecs/lib${f}.la \
${DESTDIR}${QTPREFIX}/plugins/codecs/
.endfor
-.for plug in qglgraphicssystem qtracegraphicssystem
+.for f in qglgraphicssystem qtracegraphicssystem
${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/plugins/graphicssystems/lib${plug}.la \
+ ${WRKSRC}/plugins/graphicssystems/lib${f}.la \
${DESTDIR}${QTPREFIX}/plugins/graphicssystems/
.endfor
+.for f in qsvgicon
${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/plugins/iconengines/libqsvgicon.la \
+ ${WRKSRC}/plugins/iconengines/lib${f}.la \
${DESTDIR}/${QTPREFIX}/plugins/iconengines/
-.for plug in qgif qico qjpeg qsvg qtga
+.endfor
+.for f in qgif qico qjpeg qsvg qtga
${LIBTOOL} --mode=install ${INSTALL_LIB} \
- ${WRKSRC}/plugins/imageformats/lib${plug}.la \
+ ${WRKSRC}/plugins/imageformats/lib${f}.la \
${DESTDIR}${QTPREFIX}/plugins/imageformats/
.endfor
.if ${OPSYS} == "Darwin"
diff -r 5fcab1c56596 -r 2a71e0c08c3a x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common Sun Jul 07 18:11:11 2013 +0000
+++ b/x11/qt4-libs/Makefile.common Sun Jul 07 18:13:56 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.35 2013/01/11 00:15:40 joerg Exp $
+# $NetBSD: Makefile.common,v 1.36 2013/07/07 18:13:56 adam Exp $
# used by x11/qt4-docs/Makefile
# used by x11/qt4-libs/Makefile
# used by x11/qt4-mng/Makefile
@@ -10,7 +10,7 @@
DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
CATEGORIES= x11
-MASTER_SITES= http://releases.qt-project.org/qt4/source/
+MASTER_SITES= http://download.qt-project.org/official_releases/qt/${QTVERSION:R}/${QTVERSION}/
EXTRACT_USING= bsdtar
.include "../../x11/qt4/Makefile.common"
diff -r 5fcab1c56596 -r 2a71e0c08c3a x11/qt4-libs/PLIST
--- a/x11/qt4-libs/PLIST Sun Jul 07 18:11:11 2013 +0000
+++ b/x11/qt4-libs/PLIST Sun Jul 07 18:13:56 2013 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2012/01/12 22:59:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2013/07/07 18:13:56 adam Exp $
lib/pkgconfig/Qt3Support.pc
lib/pkgconfig/QtCore.pc
lib/pkgconfig/QtDeclarative.pc
@@ -23,6 +23,7 @@
qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la
qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.la
qt4/imports/Qt/labs/particles/libqmlparticlesplugin.la
+qt4/imports/Qt/labs/shaders/libqmlshadersplugin.la
qt4/imports/QtWebKit/libqmlwebkitplugin.la
qt4/lib/libQt3Support.la
qt4/lib/libQtCore.la
@@ -43,6 +44,7 @@
qt4/lib/libwebcore.la
qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
qt4/plugins/accessible/libqtaccessiblewidgets.la
+${PLIST.mac}qt4/plugins/bearer/libqcorewlanbearer.la
qt4/plugins/bearer/libqgenericbearer.la
qt4/plugins/codecs/libqcncodecs.la
qt4/plugins/codecs/libqjpcodecs.la
diff -r 5fcab1c56596 -r 2a71e0c08c3a x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sun Jul 07 18:11:11 2013 +0000
+++ b/x11/qt4-libs/distinfo Sun Jul 07 18:13:56 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.86 2013/05/19 09:10:10 adam Exp $
+$NetBSD: distinfo,v 1.87 2013/07/07 18:13:56 adam Exp $
-SHA1 (qt-everywhere-opensource-src-4.8.4.tar.gz) = f5880f11c139d7d8d01ecb8d874535f7d9553198
-RMD160 (qt-everywhere-opensource-src-4.8.4.tar.gz) = 3c09a3b1411385d0917225f01ac2ff3a2ce83fda
-Size (qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028 bytes
+SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
+RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
+Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes
SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -19,11 +19,11 @@
SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
-SHA1 (patch-aq) = 5821207c6c2340dd048cb29be23b56af27d5ef79
+SHA1 (patch-aq) = d2818f69e89a2d0531df57daabd255ddeef0acb9
SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
-SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
+SHA1 (patch-av) = a79dbf65e6b88ac22d48514cca01c0baa6dec880
SHA1 (patch-aw) = 7e6735bf637bf3e72afe488f37b399d170185f8f
SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
@@ -37,26 +37,25 @@
SHA1 (patch-cb) = 13e1b0ffb171637e1ff84a548ef83cf4e006c207
SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
-SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
SHA1 (patch-src_3rdparty_clucene_src_CLucene_config_repl__tchar.h) = 3f19ae44da341afc4ebfe32a2eb80e38c3307648
SHA1 (patch-src_3rdparty_clucene_src_CLucene_index_SegmentMerger.cpp) = 8f43ece880786f7dc9352322d922c7fff652a36f
SHA1 (patch-src_3rdparty_clucene_src_CLucene_search_FieldCacheImpl.cpp) = 4f03369a9e5681f5babe8f6d5f8aaf560f45a855
SHA1 (patch-src_3rdparty_clucene_src_CLucene_util_Arrays.h) = 41c2cf95b81157f3809acb7bd82fe7e098e2abb8
-SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_Interpreter.cpp) = a9e94ed9becb0d5a88b30f721048509cd0d6b5a5
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.cpp) = 156e99fa8594470be4e89e212408258824044e41
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_Structure.h) = b822a84aae7e125cb56b01bffdcfec07060d88f6
-SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = a63219598a2bd6b6e660fb15ccebec3b327a60d1
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_HashTable.h) = 66b510e7f8a3a33f9934ad77bbe00a6c24b60d74
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_RefCountedLeakCounter.h) = 3b70ecb3a95944a3dd4a26c7b5c53e44aa89de1a
SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading.h) = d1ff007f2070a57aba65e9eac49c9b3df7f3a583
+SHA1 (patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_TypeTraits.h) = f23437f6e4b47f999d4fc2c576c5e7a63446b9da
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = c7c9c39b11007e7ec3884874a38d000e3238bf64
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = bf748efe8d150fe636cbc5b20dcd9a7d4945c8c9
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 95eb0e9aa01aedf148bd0ad53a59a1418081e623
-SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = 38d34aa7df1214cadd8e82c857d7056e2deda429
+SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = c79d9ed7f60a63090aadabbe2fa399a911449cd8
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 25654a9f2cedb17b5f536b324e47d56eb4010029
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_MathExtras.h) = 68152f0077ec5bcce1b3774aaac64af5fd9e491e
-SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = 0c2c47ed2f522d17ce44f3f3c17ca0655a4c5b0b
+SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h) = c22f73ad58f2ae2f80e3dfce3df6fe75b20ede39
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_RefCountedLeakCounter.h) = fc4686c018471fcae375d9382737e0844a0f45a8
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_StringImpl.h) = d5460bede6b3662df4d9dbec5826db98c6ef4f61
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7
@@ -70,11 +69,7 @@
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
SHA1 (patch-src_3rdparty_webkit_Source_WebKit_qt_Api_qgraphicswebview.cpp) = 87518d8aa1363d9d56358d69f896593369cf0ba9
SHA1 (patch-src_3rdparty_webkit_Source_WebKit_qt_WebCoreSupport_NotificationPresenterClientQt.cpp) = 1a3417f521d238a845a0afc750fcf3e2a71c2fc8
-SHA1 (patch-src_corelib_animation_qpropertyanimation.cpp) = c6fb5cdfed1013f904b4a194d3c9fcab86a2327c
SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
-SHA1 (patch-src_corelib_tools_qiterator.h) = 40c4807719e6555a40f6a738330ad5037d6c80ad
-SHA1 (patch-src_declarative_util_qdeclarativefontloader.cpp) = 0bb76eac102a4325cadb5bcb4e7a1ac85a3d099f
-SHA1 (patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h) = 84d356628d764797524fe72139ea6829a33524ea
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
diff -r 5fcab1c56596 -r 2a71e0c08c3a x11/qt4-libs/patches/patch-aq
--- a/x11/qt4-libs/patches/patch-aq Sun Jul 07 18:11:11 2013 +0000
+++ b/x11/qt4-libs/patches/patch-aq Sun Jul 07 18:13:56 2013 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.13 2012/12/07 10:06:13 adam Exp $
+$NetBSD: patch-aq,v 1.14 2013/07/07 18:13:56 adam Exp $
---- configure.orig 2012-11-23 10:11:23.000000000 +0000
+--- configure.orig 2013-06-07 05:16:41.000000000 +0000
+++ configure
-@@ -3224,13 +3224,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3223,13 +3223,13 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
CFG_HOST_ARCH=x86_64
fi
;;
@@ -18,7 +18,7 @@
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit PowerPC (powerpc)"
fi
-@@ -3254,6 +3254,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3253,6 +3253,19 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
fi
CFG_HOST_ARCH=sparc
;;
@@ -38,16 +38,16 @@
QNX:*:*)
case "$UNAME_MACHINE" in
x86pc)
-@@ -3562,7 +3575,7 @@ fi
+@@ -3561,7 +3574,7 @@ fi
if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
# get the darwin version. 10.0.0 and up means snow leopard.
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
-- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
-+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then
+- if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` == "MacOSX10.4u.sdk" ] && [ "$PLATFORM" == "macx-g++" ]; then
++ if [ "$VERSION" -gt 9 ] && [ `basename "$CFG_SDK"` = "MacOSX10.4u.sdk" ] && [ "$PLATFORM" = "macx-g++" ]; then
echo
echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
echo
-@@ -5049,7 +5062,7 @@ if true; then ###[ '!' -f "$outpath/bin/
+@@ -5058,7 +5071,7 @@ if true; then ###[ '!' -f "$outpath/bin/
done
QMAKE_BUILD_ERROR=no
@@ -56,7 +56,7 @@
[ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
[ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
[ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
-@@ -7140,7 +7153,7 @@ fi
+@@ -7158,7 +7171,7 @@ fi
# select Carbon on 10.4 Tiger.
if [ "$PLATFORM_MAC" = "yes" ]; then
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
@@ -65,7 +65,7 @@
CFG_MAC_COCOA="no";
CFG_MAC_CARBON="yes";
Home |
Main Index |
Thread Index |
Old Index