Changes 4.7.1:
Qt 4.7.1 is a bug-fix release. It maintains both forward and backward compatibility (source and binary) with Qt 4.7.0. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt.nokia.com/doc/4.7 The Qt version 4.7 series is binary compatible with the 4.6.x series. Applications compiled for 4.6 will continue to run with 4.7. Changes 4.7.0: Qt 4.7 introduces many new features and improvements as well as bugfixes over the 4.6.x series. For more details, refer to the online documentation included in this distribution. The documentation is also available online: http://qt.nokia.com/doc/4.7 The Qt version 4.7 series is binary compatible with the 4.6.x series. Applications compiled for 4.6 will continue to run with 4.7.
This commit is contained in:
adam
parent
8be6c735fb
commit
a96a7a4a0a
35 changed files with 406 additions and 226 deletions
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.10 2010/09/14 11:03:04 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.11 2010/11/15 13:05:44 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-docs-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= Documentation for the QT C++ X GUI toolkit
|
||||
|
||||
NO_CONFIGURE= yes
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.50 2010/09/14 11:13:16 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.51 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-libs-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= C++ X GUI toolkit
|
||||
|
||||
# XXX this is to test what really gets installed when 'do-install' is disabled
|
||||
|
|
@ -27,9 +26,14 @@ CONFIGURE_ARGS+= -no-sql-sqlite
|
|||
|
||||
INSTALLATION_DIRS= lib/pkgconfig
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/bin
|
||||
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/QtWebKit
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/include
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/lib
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/plugins/bearer
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems
|
||||
INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines
|
||||
|
|
@ -43,13 +47,25 @@ do-install:
|
|||
${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
|
||||
.endfor
|
||||
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
|
||||
${DESTDIR}${QTPREFIX}/bin
|
||||
.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/WebCore
|
||||
${DESTDIR}${QTPREFIX}/bin/
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la \
|
||||
${DESTDIR}${QTPREFIX}/imports/Qt/labs/folderlistmodel/
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/imports/Qt/labs/gestures/libqmlgesturesplugin.la \
|
||||
${DESTDIR}${QTPREFIX}/imports/Qt/labs/gestures/
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/imports/Qt/labs/particles/libqmlparticlesplugin.la \
|
||||
${DESTDIR}${QTPREFIX}/imports/Qt/labs/particles/
|
||||
${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/WebCore
|
||||
cd ${WRKSRC}/src/${incl} && 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 QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtXmlPatterns QtScript QtScriptTools QtTest QtWebKit
|
||||
.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
|
||||
${DESTDIR}${QTPREFIX}/lib/
|
||||
sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
|
||||
|
|
@ -63,14 +79,17 @@ do-install:
|
|||
${WRKSRC}/plugins/accessible/lib${plug}.la \
|
||||
${DESTDIR}${QTPREFIX}/plugins/accessible/
|
||||
.endfor
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/plugins/bearer/libqgenericbearer.la \
|
||||
${DESTDIR}${QTPREFIX}/plugins/bearer/
|
||||
.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/plugins/codecs/lib${codec}.la \
|
||||
${DESTDIR}${QTPREFIX}/plugins/codecs/
|
||||
.endfor
|
||||
.for gfxs in qglgraphicssystem qtracegraphicssystem
|
||||
.for plug in qglgraphicssystem qtracegraphicssystem
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \
|
||||
${WRKSRC}/plugins/graphicssystems/lib${plug}.la \
|
||||
${DESTDIR}${QTPREFIX}/plugins/graphicssystems/
|
||||
.endfor
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
|
|
@ -93,6 +112,7 @@ SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h
|
|||
SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
|
||||
.endif
|
||||
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../fonts/fontconfig/buildlink3.mk"
|
||||
.include "../../graphics/freetype2/buildlink3.mk"
|
||||
.include "../../graphics/jpeg/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.21 2010/07/04 06:00:14 adam Exp $
|
||||
# $NetBSD: Makefile.common,v 1.22 2010/11/15 13:05:45 adam Exp $
|
||||
# used by x11/qt4-docs/Makefile
|
||||
# used by x11/qt4-libs/Makefile
|
||||
# used by x11/qt4-mng/Makefile
|
||||
|
|
@ -35,6 +35,12 @@ CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
|
|||
OPSYSVARS+= CONFIGURE_ARGS
|
||||
CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
.if !empty(MAKE_JOBS)
|
||||
CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
|
||||
.endif
|
||||
|
||||
LIBQT?= -lQtCore -lQtGui
|
||||
|
||||
MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
|
||||
|
|
@ -98,9 +104,9 @@ CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
|
|||
.endif
|
||||
|
||||
pre-configure:
|
||||
sed -e 's:@LOCALBASE@:${LOCALBASE:Q}:g' \
|
||||
-e 's:@X11BASE@:${X11BASE:Q}:g' \
|
||||
-e 's:@X11PREFIX@:${X11PREFIX:Q}:g' \
|
||||
sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \
|
||||
-e 's:@X11BASE@:${X11BASE}:g' \
|
||||
-e 's:@X11PREFIX@:${X11PREFIX}:g' \
|
||||
-e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
|
||||
-e 's:@CC@:${CC:Q}:g' \
|
||||
-e 's:@CXX@:${CXX:Q}:g' \
|
||||
|
|
@ -108,14 +114,14 @@ pre-configure:
|
|||
-e 's:@CFLAGS@:${CFLAGS:Q}:g' \
|
||||
-e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
|
||||
-e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
|
||||
-e 's:@LEX@:${LEX:Q}:g' \
|
||||
-e 's:@LEX@:${LEX}:g' \
|
||||
-e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
|
||||
-e 's:@AR@:${AR:Q}:g' \
|
||||
-e 's:@MKDIR@:${MKDIR:Q}:g' \
|
||||
-e 's:@MKDIR@:${MKDIR}:g' \
|
||||
-e 's:@LIBQT@:${LIBQT:Q}:g' \
|
||||
-e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
|
||||
-e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
|
||||
-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG:Q}:g' \
|
||||
-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
|
||||
-e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
|
||||
${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
|
||||
for dir in ${WRKSRC}/mkspecs/*; do \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
@comment $NetBSD: PLIST,v 1.14 2010/02/02 14:05:59 adam Exp $
|
||||
@comment $NetBSD: PLIST,v 1.15 2010/11/15 13:05:45 adam Exp $
|
||||
lib/pkgconfig/Qt3Support.pc
|
||||
lib/pkgconfig/QtCore.pc
|
||||
lib/pkgconfig/QtDeclarative.pc
|
||||
lib/pkgconfig/QtGui.pc
|
||||
lib/pkgconfig/QtMultimedia.pc
|
||||
lib/pkgconfig/QtNetwork.pc
|
||||
|
|
@ -13,12 +14,18 @@ lib/pkgconfig/QtTest.pc
|
|||
lib/pkgconfig/QtWebKit.pc
|
||||
lib/pkgconfig/QtXml.pc
|
||||
lib/pkgconfig/QtXmlPatterns.pc
|
||||
lib/pkgconfig/jscore.pc
|
||||
qt4/bin/moc
|
||||
qt4/bin/rcc
|
||||
qt4/bin/uic
|
||||
qt4/bin/uic3
|
||||
qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la
|
||||
qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.la
|
||||
qt4/imports/Qt/labs/particles/libqmlparticlesplugin.la
|
||||
qt4/imports/QtWebKit/libqmlwebkitplugin.la
|
||||
qt4/lib/libQt3Support.la
|
||||
qt4/lib/libQtCore.la
|
||||
qt4/lib/libQtDeclarative.la
|
||||
qt4/lib/libQtGui.la
|
||||
qt4/lib/libQtMultimedia.la
|
||||
qt4/lib/libQtNetwork.la
|
||||
|
|
@ -31,8 +38,10 @@ qt4/lib/libQtTest.la
|
|||
qt4/lib/libQtWebKit.la
|
||||
qt4/lib/libQtXml.la
|
||||
qt4/lib/libQtXmlPatterns.la
|
||||
qt4/lib/libjscore.la
|
||||
qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
|
||||
qt4/plugins/accessible/libqtaccessiblewidgets.la
|
||||
qt4/plugins/bearer/libqgenericbearer.la
|
||||
qt4/plugins/codecs/libqcncodecs.la
|
||||
qt4/plugins/codecs/libqjpcodecs.la
|
||||
qt4/plugins/codecs/libqkrcodecs.la
|
||||
|
|
|
|||
|
|
@ -1,34 +1,38 @@
|
|||
$NetBSD: distinfo,v 1.46 2010/09/03 13:47:12 drochner Exp $
|
||||
$NetBSD: distinfo,v 1.47 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 1c18a564df9296c7cb0e0dedde40b9843e1b30e8
|
||||
RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = ceb3ca78263d0d9cdf92fef903e30c0026db6bff
|
||||
Size (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 bytes
|
||||
SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262
|
||||
SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8
|
||||
SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84
|
||||
SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9
|
||||
SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe
|
||||
SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341
|
||||
RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899
|
||||
Size (qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 bytes
|
||||
SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
|
||||
SHA1 (patch-ab) = a2de275815bc71f294c787c124f5596440d3ce03
|
||||
SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
|
||||
SHA1 (patch-ad) = df3a50533fdb6d71ecb83cb3d6fef9a9195ef3e6
|
||||
SHA1 (patch-ae) = c3956f4453a0c365b683692ef86f25be6af9f744
|
||||
SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
|
||||
SHA1 (patch-ag) = c7573bf93741d91b4f81ca5f0e7d851c1a40239a
|
||||
SHA1 (patch-ag) = ae652f320072670ef4125b11e002c4aa2d87ce89
|
||||
SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
|
||||
SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
|
||||
SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df
|
||||
SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d
|
||||
SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
|
||||
SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9
|
||||
SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981
|
||||
SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
|
||||
SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
|
||||
SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
|
||||
SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
|
||||
SHA1 (patch-aq) = 1a7f8ba45c9a232c35c4db0094ae1ac2c795b6ab
|
||||
SHA1 (patch-aq) = ec88f8b47d77297cc9a06e97a0cfce5297074c68
|
||||
SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a
|
||||
SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed
|
||||
SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
|
||||
SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
|
||||
SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12
|
||||
SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
|
||||
SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
|
||||
SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
|
||||
SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
|
||||
SHA1 (patch-ay) = ee700d2a4bf02be6a908c0aebe8e8bfd3b1f6c38
|
||||
SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1
|
||||
SHA1 (patch-ba) = 3fbe444ec924b9185f845cbcc90f4a799aaf59ae
|
||||
SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42
|
||||
SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635
|
||||
SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
|
||||
SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d
|
||||
SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
|
||||
SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
|
||||
SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f
|
||||
SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d
|
||||
SHA1 (patch-be) = fa9cd7a9ab77dbad48ef441832f744a574fe3d0f
|
||||
SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04
|
||||
SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
# $NetBSD: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $
|
||||
# $Id: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $
|
||||
# $NetBSD: qmake.conf,v 1.4 2010/11/15 13:05:45 adam Exp $
|
||||
# $Id: qmake.conf,v 1.4 2010/11/15 13:05:45 adam Exp $
|
||||
#
|
||||
# qmake configuration for pkgsrc
|
||||
#
|
||||
|
||||
MAKEFILE_GENERATOR = UNIX
|
||||
TARGET_PLATFORM = unix
|
||||
TEMPLATE = app
|
||||
CONFIG += qt warn_on release link_prl
|
||||
QT += core gui
|
||||
|
|
@ -21,6 +22,7 @@ QMAKE_CFLAGS_WARN_OFF =
|
|||
QMAKE_CFLAGS_RELEASE =
|
||||
QMAKE_CFLAGS_DEBUG = -g
|
||||
QMAKE_CFLAGS_SHLIB = -fPIC
|
||||
QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
|
||||
QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
|
||||
QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
||||
|
||||
|
|
@ -32,6 +34,7 @@ QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
|
|||
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
|
||||
QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
|
||||
QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
|
||||
QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
|
||||
QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
|
||||
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
||||
|
||||
|
|
@ -46,6 +49,8 @@ QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib
|
|||
|
||||
QMAKE_LINK = @CXX@
|
||||
QMAKE_LINK_SHLIB = @CXX@
|
||||
QMAKE_LINK_C = @CC@
|
||||
QMAKE_LINK_C_SHLIB = @CC@
|
||||
QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
|
||||
QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib
|
||||
QMAKE_LFLAGS_RELEASE =
|
||||
|
|
@ -53,8 +58,9 @@ QMAKE_LFLAGS_DEBUG =
|
|||
QMAKE_LFLAGS_SHLIB = -shared
|
||||
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
||||
QMAKE_LFLAGS_SONAME =
|
||||
QMAKE_LFLAGS_THREAD =
|
||||
QMAKE_RPATH = @COMPILER_RPATH_FLAG@
|
||||
QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@
|
||||
QMAKE_LFLAGS_NOUNDEF =
|
||||
QMAKE_LFLAGS_RPATH = @COMPILER_RPATH_FLAG@
|
||||
|
||||
QMAKE_LIBS =
|
||||
QMAKE_LIBS_DYNLOAD =
|
||||
|
|
@ -62,7 +68,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@
|
|||
QMAKE_LIBS_X11SM = -lSM -lICE
|
||||
QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
|
||||
QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
|
||||
QMAKE_LIBS_THREAD = @PTHREAD_LDFLAGS@ @PTHREAD_LIBS@
|
||||
QMAKE_LIBS_THREAD = @PTHREAD_LIBS@
|
||||
|
||||
QMAKE_MOC = $(QTDIR)/bin/moc
|
||||
QMAKE_UIC = $(QTDIR)/bin/uic
|
||||
|
|
@ -70,15 +76,19 @@ QMAKE_UIC3 = $(QTDIR)/bin/uic3
|
|||
QMAKE_RCC = $(QTDIR)/bin/rcc
|
||||
|
||||
QMAKE_AR = @AR@ ru
|
||||
#QMAKE_OBJCOPY = objcopy
|
||||
QMAKE_RANLIB = @QMAKE_RANLIB@
|
||||
|
||||
QMAKE_TAR = tar -cf
|
||||
QMAKE_GZIP = gzip -9f
|
||||
|
||||
QMAKE_COPY = cp -f
|
||||
QMAKE_MOVE = mv
|
||||
QMAKE_COPY_FILE = $$QMAKE_COPY
|
||||
QMAKE_COPY_DIR = $$QMAKE_COPY -R
|
||||
QMAKE_MOVE = mv -f
|
||||
QMAKE_DEL_FILE = rm -f
|
||||
QMAKE_DEL_DIR = rmdir
|
||||
QMAKE_CHK_DIR_EXISTS = test -d
|
||||
QMAKE_MKDIR = @MKDIR@
|
||||
include(../common/unix.conf)
|
||||
load(qt_config)
|
||||
|
|
|
|||
|
|
@ -1,31 +1,31 @@
|
|||
$NetBSD: patch-aa,v 1.11 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-aa,v 1.12 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- qmake/generators/unix/unixmake2.cpp.orig 2010-01-15 17:01:30.000000000 +0000
|
||||
--- qmake/generators/unix/unixmake2.cpp.orig 2010-09-10 09:04:41.000000000 +0000
|
||||
+++ qmake/generators/unix/unixmake2.cpp
|
||||
@@ -233,6 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
@@ -239,6 +239,8 @@ UnixMakefileGenerator::writeMakeParts(QT
|
||||
if(!project->isEmpty("QMAKE_BUNDLE")) {
|
||||
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
|
||||
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
|
||||
+ } else if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "TARGETD = " << var("TARGET_la") << endl;
|
||||
+ } else if(project->isActiveConfig("compile_libtool")) {
|
||||
+ t << "TARGETD = " << var("TARGET_la") << endl;
|
||||
} else if(!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
|
||||
t << "TARGETD = " << escapeFilePath(var("TARGET")) << endl;
|
||||
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
|
||||
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
|
||||
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
|
||||
@@ -994,8 +996,12 @@ void UnixMakefileGenerator::init2()
|
||||
@@ -1016,8 +1018,12 @@ void UnixMakefileGenerator::init2()
|
||||
} else if (project->isActiveConfig("staticlib")) {
|
||||
project->values("TARGET").first().prepend("lib");
|
||||
project->values("TARGET").first() += ".a";
|
||||
project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
|
||||
project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
|
||||
- if(project->values("QMAKE_AR_CMD").isEmpty())
|
||||
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
|
||||
+ else
|
||||
+ if(project->isActiveConfig("compile_libtool"))
|
||||
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
|
||||
+ else
|
||||
project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
|
||||
+ }
|
||||
+ }
|
||||
} else {
|
||||
project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
|
||||
if(project->isActiveConfig("compile_libtool"))
|
||||
@@ -1439,7 +1445,7 @@ UnixMakefileGenerator::writePkgConfigFil
|
||||
project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
|
||||
+ project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
|
||||
@@ -1467,7 +1473,7 @@ UnixMakefileGenerator::writePkgConfigFil
|
||||
bundle = bundle.left(suffix);
|
||||
pkgConfiglibName = "-framework " + bundle + " ";
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
$NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-ab,v 1.11 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/gui/painting/painting.pri.orig 2010-01-15 17:01:35.000000000 +0000
|
||||
+++ src/gui/painting/painting.pri
|
||||
@@ -232,7 +232,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
|
||||
win32-g++|!win32:!*-icc* {
|
||||
--- src/gui/gui.pro.orig 2010-11-06 01:55:14.000000000 +0000
|
||||
+++ src/gui/gui.pro
|
||||
@@ -101,7 +101,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
} else {
|
||||
win32-g++*|!win32:!win32-icc*:!macx-icc* {
|
||||
mmx {
|
||||
- mmx_compiler.commands = $$QMAKE_CXX -c -Winline
|
||||
+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
|
||||
|
||||
mac {
|
||||
mmx_compiler.commands += -Xarch_i386 -mmmx
|
||||
@@ -243,7 +243,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -112,7 +112,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
|
||||
mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
mmx_compiler.dependency_type = TYPE_C
|
||||
|
|
@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
mmx_compiler.input = MMX_SOURCES
|
||||
mmx_compiler.variable_out = OBJECTS
|
||||
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
|
||||
@@ -251,7 +251,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -120,7 +120,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
QMAKE_EXTRA_COMPILERS += mmx_compiler
|
||||
}
|
||||
3dnow {
|
||||
|
|
@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
|
||||
mac {
|
||||
mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
|
||||
@@ -262,14 +262,14 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -131,14 +131,14 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
|
||||
mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
mmx3dnow_compiler.dependency_type = TYPE_C
|
||||
|
|
@ -46,7 +46,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
|
||||
mac {
|
||||
sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
|
||||
@@ -280,7 +280,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -149,7 +149,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
|
||||
sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
sse3dnow_compiler.dependency_type = TYPE_C
|
||||
|
|
@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
sse3dnow_compiler.input = SSE3DNOW_SOURCES
|
||||
sse3dnow_compiler.variable_out = OBJECTS
|
||||
sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
|
||||
@@ -289,7 +289,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -158,7 +158,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
}
|
||||
}
|
||||
sse {
|
||||
|
|
@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
|
||||
mac {
|
||||
sse_compiler.commands += -Xarch_i386 -msse
|
||||
@@ -300,7 +300,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -169,7 +169,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
|
||||
sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
sse_compiler.dependency_type = TYPE_C
|
||||
|
|
@ -73,7 +73,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
sse_compiler.input = SSE_SOURCES
|
||||
sse_compiler.variable_out = OBJECTS
|
||||
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
|
||||
@@ -308,7 +308,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -177,7 +177,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
QMAKE_EXTRA_COMPILERS += sse_compiler
|
||||
}
|
||||
sse2 {
|
||||
|
|
@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
|
||||
mac {
|
||||
sse2_compiler.commands += -Xarch_i386 -msse2
|
||||
@@ -319,7 +319,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
@@ -188,7 +188,7 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
|
||||
sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
|
||||
sse2_compiler.dependency_type = TYPE_C
|
||||
|
|
@ -91,8 +91,8 @@ $NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
sse2_compiler.input = SSE2_SOURCES
|
||||
sse2_compiler.variable_out = OBJECTS
|
||||
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
|
||||
@@ -327,11 +327,11 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
QMAKE_EXTRA_COMPILERS += sse2_compiler
|
||||
@@ -215,11 +215,11 @@ contains(QMAKE_MAC_XARCH, no) {
|
||||
QMAKE_EXTRA_COMPILERS += ssse3_compiler
|
||||
}
|
||||
iwmmxt {
|
||||
- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-ac,v 1.3 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-ac,v 1.4 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- tools/designer/src/designer/designer.pro.orig 2010-01-15 17:01:29.000000000 +0000
|
||||
--- tools/designer/src/designer/designer.pro.orig 2010-09-10 09:04:49.000000000 +0000
|
||||
+++ tools/designer/src/designer/designer.pro
|
||||
@@ -14,7 +14,7 @@ INCLUDEPATH += \
|
||||
../lib/uilib \
|
||||
extra
|
||||
|
||||
-LIBS += -L../../lib \
|
||||
+LIBS += \
|
||||
-L../../../../lib \
|
||||
-lQtDesignerComponents \
|
||||
-lQtDesigner
|
||||
-QMAKE_LIBDIR += ../../lib ../../../../lib
|
||||
+QMAKE_LIBDIR += ../../../../lib
|
||||
LIBS += -lQtDesignerComponents -lQtDesigner
|
||||
|
||||
RESOURCES += designer.qrc
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-ad,v 1.10 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-ad,v 1.11 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/corelib/global/qglobal.h.orig 2010-01-15 17:01:36.000000000 +0000
|
||||
--- src/corelib/global/qglobal.h.orig 2010-09-10 09:05:25.000000000 +0000
|
||||
+++ src/corelib/global/qglobal.h
|
||||
@@ -159,6 +159,7 @@ namespace QT_NAMESPACE {}
|
||||
NETBSD - NetBSD
|
||||
|
|
@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.10 2010/01/29 18:19:09 adam Exp $
|
|||
# if defined(Q_OS_DARWIN64)
|
||||
# define Q_OS_MAC64
|
||||
# elif defined(Q_OS_DARWIN32)
|
||||
@@ -805,8 +807,6 @@ namespace QT_NAMESPACE {}
|
||||
@@ -804,8 +806,6 @@ namespace QT_NAMESPACE {}
|
||||
# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
|
||||
#elif defined(Q_OS_UNIX)
|
||||
# if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-ae,v 1.9 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- qmake/generators/unix/unixmake.cpp.orig 2010-01-15 17:01:30.000000000 +0000
|
||||
--- qmake/generators/unix/unixmake.cpp.orig 2010-09-10 09:04:41.000000000 +0000
|
||||
+++ qmake/generators/unix/unixmake.cpp
|
||||
@@ -325,27 +325,29 @@ UnixMakefileGenerator::init()
|
||||
@@ -327,27 +327,29 @@ UnixMakefileGenerator::init()
|
||||
if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
|
||||
libtool_flags += " --mode=link";
|
||||
if(project->isActiveConfig("staticlib")) {
|
||||
|
|
@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $
|
|||
} else {
|
||||
libtool_flags += " --mode=compile";
|
||||
}
|
||||
@@ -677,7 +679,6 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
@@ -683,7 +685,6 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false);
|
||||
if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
|
||||
destdir += Option::dir_sep;
|
||||
|
|
@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $
|
|||
if(targetdir.right(1) != Option::dir_sep)
|
||||
targetdir += Option::dir_sep;
|
||||
|
||||
@@ -715,10 +716,14 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
@@ -721,10 +722,14 @@ UnixMakefileGenerator::defaultInstall(co
|
||||
QString src_targ = target;
|
||||
if(src_targ == "$(TARGET)")
|
||||
src_targ = "$(TARGETL)";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
$NetBSD: patch-ag,v 1.11 2010/07/04 06:00:14 adam Exp $
|
||||
$NetBSD: patch-ag,v 1.12 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- qmake/project.cpp.orig 2010-06-02 02:03:09.000000000 +0000
|
||||
--- qmake/project.cpp.orig 2010-09-10 09:04:41.000000000 +0000
|
||||
+++ qmake/project.cpp
|
||||
@@ -1614,6 +1614,9 @@ QMakeProject::isActiveConfig(const QStri
|
||||
if(isForSymbian() && (x == "symbian" || x == "unix"))
|
||||
return true;
|
||||
@@ -1534,6 +1534,9 @@ QMakeProject::isActiveConfig(const QStri
|
||||
return Option::target_mode == Option::TARG_WIN_MODE;
|
||||
}
|
||||
|
||||
+ if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib"))
|
||||
+ return true;
|
||||
+
|
||||
//mkspecs
|
||||
if((Option::target_mode == Option::TARG_MACX_MODE ||
|
||||
Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
|
||||
static QString spec;
|
||||
if(spec.isEmpty())
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-aj,v 1.9 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-01-15 17:01:28.000000000 +0000
|
||||
--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-09-10 09:04:49.000000000 +0000
|
||||
+++ mkspecs/netbsd-g++/qplatformdefs.h
|
||||
@@ -65,6 +65,7 @@
|
||||
#include <sys/types.h>
|
||||
|
|
@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $
|
|||
#include <sys/time.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -127,10 +128,14 @@
|
||||
@@ -87,6 +88,11 @@
|
||||
#define QT_SNPRINTF ::snprintf
|
||||
#define QT_VSNPRINTF ::vsnprintf
|
||||
|
||||
|
|
@ -22,7 +22,3 @@ $NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $
|
|||
// Older NetBSD versions may still use the a.out format instead of ELF.
|
||||
#ifndef __ELF__
|
||||
#define QT_AOUT_UNDERSCORE
|
||||
#endif
|
||||
|
||||
-
|
||||
#endif // QPLATFORMDEFS_H
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ak,v 1.6 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-ak,v 1.7 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/gui/kernel/qcursor_x11.cpp.orig 2010-01-15 17:01:35.000000000 +0000
|
||||
--- src/gui/kernel/qcursor_x11.cpp.orig 2010-09-10 09:05:24.000000000 +0000
|
||||
+++ src/gui/kernel/qcursor_x11.cpp
|
||||
@@ -243,7 +243,7 @@ void QCursorData::update()
|
||||
@@ -246,7 +246,7 @@ void QCursorData::update()
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aq,v 1.7 2010/07/04 06:00:14 adam Exp $
|
||||
$NetBSD: patch-aq,v 1.8 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- configure.orig 2010-06-02 02:03:10.000000000 +0000
|
||||
--- configure.orig 2010-11-06 01:55:00.000000000 +0000
|
||||
+++ configure
|
||||
@@ -3071,7 +3071,7 @@ fi
|
||||
@@ -3272,7 +3272,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}'`
|
||||
|
|
@ -11,7 +11,25 @@ $NetBSD: patch-aq,v 1.7 2010/07/04 06:00:14 adam Exp $
|
|||
echo
|
||||
echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
|
||||
echo
|
||||
@@ -7002,7 +7002,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
|
||||
@@ -4733,7 +4733,7 @@ if true; then ###[ '!' -f "$outpath/bin/
|
||||
done
|
||||
|
||||
QMAKE_BUILD_ERROR=no
|
||||
- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
|
||||
+ (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes
|
||||
[ '!' -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
|
||||
@@ -6556,7 +6556,7 @@ fi
|
||||
# select Carbon on 10.4 Tiger.
|
||||
if [ "$PLATFORM_MAC" = "yes" ]; then
|
||||
VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
|
||||
- if [ "$VERSION" == 8 ]; then
|
||||
+ if [ "$VERSION" = 8 ]; then
|
||||
CFG_MAC_COCOA="no";
|
||||
CFG_MAC_CARBON="yes";
|
||||
fi
|
||||
@@ -7754,7 +7754,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
|
||||
[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
|
||||
[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
|
||||
[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: patch-as,v 1.4 2009/10/11 09:14:52 adam Exp $
|
||||
$NetBSD: patch-as,v 1.5 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2009-09-29 13:01:39.000000000 +0200
|
||||
--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2010-09-10 09:04:47.000000000 +0000
|
||||
+++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h
|
||||
@@ -94,7 +94,7 @@ configure.
|
||||
#define _CL_HAVE_FCNTL_H 1
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-as,v 1.4 2009/10/11 09:14:52 adam Exp $
|
|||
!defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \
|
||||
defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64))
|
||||
/* Define to 1 if the system has the type `float_t'. */
|
||||
@@ -432,7 +432,7 @@ configure.
|
||||
@@ -430,7 +430,7 @@ configure.
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
$NetBSD: patch-au,v 1.4 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-au,v 1.5 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2010-01-28 07:10:17.000000000 +0000
|
||||
--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2010-09-10 09:05:24.000000000 +0000
|
||||
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
|
||||
@@ -468,7 +468,7 @@ namespace JSC {
|
||||
@@ -491,7 +491,7 @@ namespace JSC {
|
||||
u.asBits.tag = CellTag;
|
||||
else
|
||||
u.asBits.tag = EmptyValueTag;
|
||||
- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
|
||||
+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
|
||||
}
|
||||
|
||||
inline JSValue::JSValue(const JSCell* ptr)
|
||||
@@ -477,7 +477,7 @@ namespace JSC {
|
||||
#if ENABLE(JSC_ZOMBIES)
|
||||
ASSERT(!isZombie());
|
||||
#endif
|
||||
@@ -503,7 +503,7 @@ namespace JSC {
|
||||
u.asBits.tag = CellTag;
|
||||
else
|
||||
u.asBits.tag = EmptyValueTag;
|
||||
- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
|
||||
+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
|
||||
}
|
||||
|
||||
inline JSValue::operator bool() const
|
||||
#if ENABLE(JSC_ZOMBIES)
|
||||
ASSERT(!isZombie());
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ax,v 1.2 2010/01/29 18:19:09 adam Exp $
|
||||
$NetBSD: patch-ax,v 1.3 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-01-28 06:27:43.000000000 +0000
|
||||
--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-09-10 09:05:20.000000000 +0000
|
||||
+++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp
|
||||
@@ -252,7 +252,11 @@ int WebSocketHandshake::readServerHandsh
|
||||
@@ -286,7 +286,11 @@ int WebSocketHandshake::readServerHandsh
|
||||
p += sizeof(webSocketConnectionHeader) - 1;
|
||||
}
|
||||
|
||||
|
|
@ -12,5 +12,5 @@ $NetBSD: patch-ax,v 1.2 2010/01/29 18:19:09 adam Exp $
|
|||
if (!strnstr(p, "\r\n\r\n", end - p)) {
|
||||
+#endif
|
||||
// Just hasn't been received fully yet.
|
||||
m_mode = Incomplete;
|
||||
return -1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,33 @@
|
|||
$NetBSD: patch-ay,v 1.7 2010/07/04 06:00:14 adam Exp $
|
||||
$NetBSD: patch-ay,v 1.8 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-06-02 02:03:12.000000000 +0000
|
||||
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-09-10 09:05:23.000000000 +0000
|
||||
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
|
||||
@@ -86,6 +86,13 @@
|
||||
#define WTF_PLATFORM_OPENBSD 1
|
||||
@@ -399,7 +399,7 @@
|
||||
|
||||
/* OS(NETBSD) - NetBSD */
|
||||
#if defined(__NetBSD__)
|
||||
-#define WTF_PLATFORM_NETBSD 1
|
||||
+#define WTF_OS_NETBSD 1
|
||||
#endif
|
||||
|
||||
+/* PLATFORM(DRAGONFLY) */
|
||||
+/* Operating system level dependencies for OpenBSD systems that */
|
||||
+/* should be used regardless of operating environment */
|
||||
/* OS(OPENBSD) - OpenBSD */
|
||||
@@ -407,6 +407,11 @@
|
||||
#define WTF_OS_OPENBSD 1
|
||||
#endif
|
||||
|
||||
+/* OS(DRAGONFLY) - DragonFly */
|
||||
+#ifdef __DragonFly__
|
||||
+#define WTF_PLATFORM_DRAGONFLY 1
|
||||
+#define WTF_OS_DRAGONFLY 1
|
||||
+#endif
|
||||
+
|
||||
/* PLATFORM(SOLARIS) */
|
||||
/* Operating system level dependencies for Solaris that should be used */
|
||||
/* regardless of operating environment */
|
||||
@@ -141,6 +148,7 @@
|
||||
/* should be used regardless of operating environment */
|
||||
#if PLATFORM(DARWIN) \
|
||||
|| PLATFORM(FREEBSD) \
|
||||
+ || PLATFORM(DRAGONFLY) \
|
||||
|| PLATFORM(SYMBIAN) \
|
||||
|| PLATFORM(NETBSD) \
|
||||
|| PLATFORM(SOLARIS) \
|
||||
@@ -723,7 +731,7 @@
|
||||
#endif
|
||||
|
||||
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
|
||||
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX))
|
||||
+#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA)
|
||||
#define WTF_USE_JSVALUE64 1
|
||||
#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA)
|
||||
#define WTF_USE_JSVALUE64 1
|
||||
/* OS(QNX) - QNX */
|
||||
#if defined(__QNXNTO__)
|
||||
#define WTF_OS_QNX 1
|
||||
@@ -440,6 +445,7 @@
|
||||
|| OS(ANDROID) \
|
||||
|| OS(DARWIN) \
|
||||
|| OS(FREEBSD) \
|
||||
+ || OS(DRAGONFLY) \
|
||||
|| OS(HAIKU) \
|
||||
|| OS(HPUX) \
|
||||
|| OS(LINUX) \
|
||||
|
|
|
|||
|
|
@ -1,22 +1,22 @@
|
|||
$NetBSD: patch-az,v 1.3 2010/03/12 08:19:38 mrg Exp $
|
||||
$NetBSD: patch-az,v 1.4 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- ./src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig 2010-03-11 18:45:16.000000000 -0800
|
||||
+++ ./src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h 2010-03-11 18:45:31.000000000 -0800
|
||||
@@ -476,7 +476,7 @@
|
||||
--- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig 2010-09-10 09:05:24.000000000 +0000
|
||||
+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h
|
||||
@@ -491,7 +491,7 @@ namespace JSC {
|
||||
u.asBits.tag = CellTag;
|
||||
else
|
||||
u.asBits.tag = EmptyValueTag;
|
||||
- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
|
||||
+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
|
||||
}
|
||||
|
||||
inline JSValue::JSValue(const JSCell* ptr)
|
||||
@@ -485,7 +485,7 @@
|
||||
#if ENABLE(JSC_ZOMBIES)
|
||||
ASSERT(!isZombie());
|
||||
#endif
|
||||
@@ -503,7 +503,7 @@ namespace JSC {
|
||||
u.asBits.tag = CellTag;
|
||||
else
|
||||
u.asBits.tag = EmptyValueTag;
|
||||
- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
|
||||
+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
|
||||
}
|
||||
|
||||
inline JSValue::operator bool() const
|
||||
#if ENABLE(JSC_ZOMBIES)
|
||||
ASSERT(!isZombie());
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
$NetBSD: patch-ba,v 1.5 2010/07/04 06:00:14 adam Exp $
|
||||
$NetBSD: patch-ba,v 1.6 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
http://bugreports.qt.nokia.com/browse/QTBUG-6932
|
||||
|
||||
--- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-06-02 02:03:15.000000000 +0000
|
||||
--- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-09-10 09:05:24.000000000 +0000
|
||||
+++ src/gui/graphicsview/qgraphicsitem_p.h
|
||||
@@ -679,7 +679,7 @@ inline bool qt_closestItemFirst(const QG
|
||||
@@ -762,7 +762,7 @@ inline bool qt_closestItemFirst(const QG
|
||||
// item1Ancestor is now at the same level as item2Ancestor, but not the same.
|
||||
const QGraphicsItem *p1 = t1;
|
||||
const QGraphicsItem *p2 = t2;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
$NetBSD: patch-bb,v 1.3 2010/05/29 17:10:31 adam Exp $
|
||||
$NetBSD: patch-bb,v 1.4 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2010-05-29 13:27:36.000000000 +0000
|
||||
--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2010-09-10 09:05:24.000000000 +0000
|
||||
+++ src/3rdparty/javascriptcore/JavaScriptCore/config.h
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
#endif
|
||||
|
||||
-#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD)
|
||||
+#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) || PLATFORM(DRAGONFLY)
|
||||
-#if OS(FREEBSD) || OS(OPENBSD)
|
||||
+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY)
|
||||
#define HAVE_PTHREAD_NP_H 1
|
||||
#endif
|
||||
|
||||
|
|
|
|||
33
x11/qt4-libs/patches/patch-bc
Normal file
33
x11/qt4-libs/patches/patch-bc
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
$NetBSD: patch-bc,v 1.3 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.orig 2010-11-06 01:55:19.000000000 +0000
|
||||
+++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
|
||||
@@ -376,7 +376,7 @@
|
||||
|
||||
/* OS(NETBSD) - NetBSD */
|
||||
#if defined(__NetBSD__)
|
||||
-#define WTF_PLATFORM_NETBSD 1
|
||||
+#define WTF_OS_NETBSD 1
|
||||
#endif
|
||||
|
||||
/* OS(OPENBSD) - OpenBSD */
|
||||
@@ -384,6 +384,11 @@
|
||||
#define WTF_OS_OPENBSD 1
|
||||
#endif
|
||||
|
||||
+/* OS(DRAGONFLY) - DragonFly */
|
||||
+#ifdef __DragonFly__
|
||||
+#define WTF_OS_DRAGONFLY 1
|
||||
+#endif
|
||||
+
|
||||
/* OS(QNX) - QNX */
|
||||
#if defined(__QNXNTO__)
|
||||
#define WTF_OS_QNX 1
|
||||
@@ -414,6 +419,7 @@
|
||||
|| OS(ANDROID) \
|
||||
|| OS(DARWIN) \
|
||||
|| OS(FREEBSD) \
|
||||
+ || OS(DRAGONFLY) \
|
||||
|| OS(HAIKU) \
|
||||
|| OS(LINUX) \
|
||||
|| OS(NETBSD) \
|
||||
13
x11/qt4-libs/patches/patch-bd
Normal file
13
x11/qt4-libs/patches/patch-bd
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-bd,v 1.1 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/webkit/JavaScriptCore/config.h.orig 2010-10-26 09:26:05.000000000 +0000
|
||||
+++ src/3rdparty/webkit/JavaScriptCore/config.h
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
#endif
|
||||
|
||||
-#if OS(FREEBSD) || OS(OPENBSD)
|
||||
+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY)
|
||||
#define HAVE_PTHREAD_NP_H 1
|
||||
#endif
|
||||
|
||||
13
x11/qt4-libs/patches/patch-be
Normal file
13
x11/qt4-libs/patches/patch-be
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-be,v 1.1 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.orig 2010-11-06 01:55:19.000000000 +0000
|
||||
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
|
||||
@@ -90,7 +90,7 @@ defineTest(addJavaScriptCoreLib) {
|
||||
# that can't resolve symbols from QtCore if libjscore comes after.
|
||||
QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
|
||||
LIBS += -l$$JAVASCRIPTCORE_TARGET
|
||||
- POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
|
||||
+ POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.la
|
||||
}
|
||||
|
||||
win32-* {
|
||||
27
x11/qt4-libs/patches/patch-bf
Normal file
27
x11/qt4-libs/patches/patch-bf
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
$NetBSD: patch-bf,v 1.1 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro.orig 2010-11-06 01:55:20.000000000 +0000
|
||||
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
|
||||
@@ -4,7 +4,7 @@ include($$PWD/../WebKit.pri)
|
||||
include(JavaScriptCore.pri)
|
||||
|
||||
TEMPLATE = lib
|
||||
-CONFIG += staticlib
|
||||
+CONFIG += buildling-libs
|
||||
# Don't use JavaScriptCore as the target name. qmake would create a JavaScriptCore.vcproj for msvc
|
||||
# which already exists as a directory
|
||||
TARGET = $$JAVASCRIPTCORE_TARGET
|
||||
@@ -33,10 +33,11 @@ CONFIG(QTDIR_build) {
|
||||
# WebCore adds these config only when in a standalone build.
|
||||
# qbase.pri takes care of that when in a QTDIR_build
|
||||
# Here we add the config for both cases since we don't include qbase.pri
|
||||
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
-unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
|
||||
+#contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
+#unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
|
||||
|
||||
CONFIG(QTDIR_build) {
|
||||
+ include($$QT_SOURCE_TREE/src/qbase.pri)
|
||||
# Remove the following 2 lines if you want debug information in JavaScriptCore
|
||||
CONFIG -= separate_debug_info
|
||||
CONFIG += no_debug_info
|
||||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.4 2010/09/14 11:03:04 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.5 2010/11/15 13:05:45 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-mng-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= QT MNG image format plugin
|
||||
|
||||
CONFIGURE_ARGS+= -I${QTDIR}/include
|
||||
|
|
@ -23,7 +22,7 @@ IMGFMTDIR= ${QTPREFIX}/plugins/imageformats
|
|||
INSTALLATION_DIRS= ${IMGFMTDIR}
|
||||
|
||||
do-install:
|
||||
${LIBTOOL} --mode=install ${INSTALL_DATA} \
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/plugins/imageformats/libqmng.la ${DESTDIR}${IMGFMTDIR}
|
||||
|
||||
.include "../../x11/qt4-libs/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.12 2010/09/30 10:49:13 obache Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2010/11/15 13:05:46 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-mysql-${QTVERSION}
|
||||
PKGREVISION= 2
|
||||
COMMENT= QT mysql driver
|
||||
|
||||
CONFIGURE_ARGS+= -I${QTDIR}/include
|
||||
|
|
@ -22,7 +21,7 @@ SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
|
|||
INSTALLATION_DIRS= ${SQLDRVDIR}
|
||||
|
||||
do-install:
|
||||
${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
|
||||
${DESTDIR}${SQLDRVDIR}
|
||||
|
||||
.include "../../x11/qt4-libs/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.18 2010/09/14 11:03:05 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.19 2010/11/15 13:05:46 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-pgsql-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= QT postgresql driver
|
||||
|
||||
CONFIGURE_ARGS+= -I${QTDIR}/include
|
||||
|
|
@ -23,7 +22,7 @@ SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
|
|||
INSTALLATION_DIRS= ${SQLDRVDIR}
|
||||
|
||||
do-install:
|
||||
${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
|
||||
${DESTDIR}${SQLDRVDIR}
|
||||
|
||||
.include "../../x11/qt4-libs/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.14 2010/09/14 11:01:15 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.15 2010/11/15 13:05:46 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-qdbus-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= QT DBus support
|
||||
|
||||
CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
|
||||
|
|
@ -39,6 +38,6 @@ do-install:
|
|||
${DESTDIR}${QTPREFIX}/bin
|
||||
.endfor
|
||||
|
||||
.include "../../x11/qt4-libs/buildlink3.mk"
|
||||
.include "../../sysutils/dbus/buildlink3.mk"
|
||||
.include "../../x11/qt4-libs/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.12 2010/09/14 11:03:05 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2010/11/15 13:05:46 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-sqlite3-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= QT sqlite3 driver
|
||||
|
||||
CONFIGURE_ARGS+= -I${QTDIR}/include
|
||||
|
|
@ -24,7 +23,7 @@ SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
|
|||
INSTALLATION_DIRS= ${SQLDRVDIR}
|
||||
|
||||
do-install:
|
||||
${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \
|
||||
${DESTDIR}${SQLDRVDIR}
|
||||
|
||||
.include "../../x11/qt4-libs/buildlink3.mk"
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.11 2010/09/14 11:03:05 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2010/11/15 13:05:46 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGNAME= qt4-tiff-${QTVERSION}
|
||||
PKGREVISION= 1
|
||||
COMMENT= QT TIFF image format plugin
|
||||
|
||||
CONFIGURE_ARGS+= -I${QTDIR}/include
|
||||
|
|
@ -23,7 +22,7 @@ IMGFMTDIR= ${QTPREFIX}/plugins/imageformats
|
|||
INSTALLATION_DIRS= ${IMGFMTDIR}
|
||||
|
||||
do-install:
|
||||
${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqtiff.la \
|
||||
${DESTDIR}${IMGFMTDIR}
|
||||
|
||||
# up to 4.3.2 a builtin libtiff is used
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.35 2010/09/14 11:01:16 wiz Exp $
|
||||
# $NetBSD: Makefile,v 1.36 2010/11/15 13:05:47 adam Exp $
|
||||
|
||||
PKG_DESTDIR_SUPPORT= user-destdir
|
||||
|
||||
.include "../../x11/qt4-libs/Makefile.common"
|
||||
|
||||
PKGREVISION= 2
|
||||
|
||||
PKGNAME= qt4-tools-${QTVERSION}
|
||||
COMMENT= QT GUI (WYSIWYG) builder and other tools
|
||||
|
||||
|
|
@ -37,35 +35,31 @@ post-configure:
|
|||
ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
|
||||
|
||||
do-install:
|
||||
.for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4
|
||||
.for prog in lconvert lrelease lupdate pixeltool qdoc3 qmake qmlviewer qt3to4 qtconfig qttracereplay xmlpatterns xmlpatternsvalidator
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
|
||||
.endfor
|
||||
.for prog in assistant designer linguist qdoc3 qtconfig qhelpconverter \
|
||||
qhelpgenerator qcollectiongenerator
|
||||
.for prog in assistant designer linguist qcollectiongenerator qhelpconverter qhelpgenerator
|
||||
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
|
||||
${DESTDIR}${QTPREFIX}/bin
|
||||
.endfor
|
||||
cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
|
||||
${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
|
||||
cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
|
||||
${MAKE_PROGRAM} install_assistant_headers
|
||||
cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
|
||||
${MAKE_PROGRAM} install_designer_headers
|
||||
cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \
|
||||
${MAKE_PROGRAM} install_quitools_headers
|
||||
.for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools
|
||||
.for lib in QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
|
||||
${DESTDIR}${QTPREFIX}/lib/
|
||||
sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
|
||||
${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
|
||||
${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
|
||||
.endfor
|
||||
.for lib in qdeclarativeview qt3supportwidgets qwebview
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/plugins/designer/libqt3supportwidgets.la \
|
||||
${DESTDIR}${QTPREFIX}/plugins/designer/
|
||||
${LIBTOOL} --mode=install ${INSTALL_LIB} \
|
||||
${WRKSRC}/plugins/designer/libqwebview.la \
|
||||
${WRKSRC}/plugins/designer/lib${lib}.la \
|
||||
${DESTDIR}${QTPREFIX}/plugins/designer/
|
||||
.endfor
|
||||
${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \
|
||||
${DESTDIR}${QTPREFIX}/phrasebooks/
|
||||
cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
@comment $NetBSD: PLIST,v 1.22 2010/07/04 06:00:15 adam Exp $
|
||||
lib/pkgconfig/QtAssistantClient.pc
|
||||
@comment $NetBSD: PLIST,v 1.23 2010/11/15 13:05:47 adam Exp $
|
||||
lib/pkgconfig/QtCLucene.pc
|
||||
lib/pkgconfig/QtDesigner.pc
|
||||
lib/pkgconfig/QtDesignerComponents.pc
|
||||
lib/pkgconfig/QtHelp.pc
|
||||
lib/pkgconfig/QtUiTools.pc
|
||||
qt4/bin/assistant
|
||||
qt4/bin/assistant_adp
|
||||
qt4/bin/designer
|
||||
qt4/bin/lconvert
|
||||
qt4/bin/linguist
|
||||
qt4/bin/lrelease
|
||||
qt4/bin/lupdate
|
||||
|
|
@ -17,8 +16,12 @@ qt4/bin/qdoc3
|
|||
qt4/bin/qhelpconverter
|
||||
qt4/bin/qhelpgenerator
|
||||
qt4/bin/qmake
|
||||
qt4/bin/qmlviewer
|
||||
qt4/bin/qt3to4
|
||||
qt4/bin/qtconfig
|
||||
qt4/bin/qttracereplay
|
||||
qt4/bin/xmlpatterns
|
||||
qt4/bin/xmlpatternsvalidator
|
||||
qt4/include/Qt/QtHelp
|
||||
qt4/include/Qt/qhelp_global.h
|
||||
qt4/include/Qt/qhelpcontentwidget.h
|
||||
|
|
@ -28,10 +31,6 @@ qt4/include/Qt/qhelpindexwidget.h
|
|||
qt4/include/Qt/qhelpsearchengine.h
|
||||
qt4/include/Qt/qhelpsearchquerywidget.h
|
||||
qt4/include/Qt/qhelpsearchresultwidget.h
|
||||
qt4/include/QtAssistant/QAssistantClient
|
||||
qt4/include/QtAssistant/QtAssistant
|
||||
qt4/include/QtAssistant/qassistantclient.h
|
||||
qt4/include/QtAssistant/qassistantclient_global.h
|
||||
qt4/include/QtDesigner/QAbstractExtensionFactory
|
||||
qt4/include/QtDesigner/QAbstractExtensionManager
|
||||
qt4/include/QtDesigner/QAbstractFormBuilder
|
||||
|
|
@ -135,7 +134,6 @@ qt4/include/QtHelp/qhelpsearchresultwidget.h
|
|||
qt4/include/QtUiTools/QUiLoader
|
||||
qt4/include/QtUiTools/QtUiTools
|
||||
qt4/include/QtUiTools/quiloader.h
|
||||
qt4/lib/libQtAssistantClient.la
|
||||
qt4/lib/libQtCLucene.la
|
||||
qt4/lib/libQtDesigner.la
|
||||
qt4/lib/libQtDesignerComponents.la
|
||||
|
|
@ -149,16 +147,41 @@ qt4/mkspecs/aix-xlc-64/qmake.conf
|
|||
qt4/mkspecs/aix-xlc-64/qplatformdefs.h
|
||||
qt4/mkspecs/aix-xlc/qmake.conf
|
||||
qt4/mkspecs/aix-xlc/qplatformdefs.h
|
||||
qt4/mkspecs/common/aix/qplatformdefs.h
|
||||
qt4/mkspecs/common/armcc.conf
|
||||
qt4/mkspecs/common/c89/qplatformdefs.h
|
||||
qt4/mkspecs/common/g++.conf
|
||||
qt4/mkspecs/common/linux.conf
|
||||
qt4/mkspecs/common/llvm.conf
|
||||
qt4/mkspecs/common/mac-g++.conf
|
||||
qt4/mkspecs/common/mac-llvm.conf
|
||||
qt4/mkspecs/common/mac.conf
|
||||
qt4/mkspecs/common/posix/qplatformdefs.h
|
||||
qt4/mkspecs/common/qmake.conf
|
||||
qt4/mkspecs/common/qws.conf
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknPopupFader.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknServerApp.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknUtils.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknsConstants.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknsItemID.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/AknsUtils.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/ApDataHandler.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h
|
||||
qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h
|
||||
qt4/mkspecs/common/symbian/qplatformdefs.h
|
||||
qt4/mkspecs/common/symbian/stl-off/new
|
||||
qt4/mkspecs/common/symbian/symbian-makefile.conf
|
||||
qt4/mkspecs/common/symbian/symbian-mmp.conf
|
||||
qt4/mkspecs/common/symbian/symbian.conf
|
||||
qt4/mkspecs/common/unix.conf
|
||||
qt4/mkspecs/common/wince/qmake.conf
|
||||
|
|
@ -168,7 +191,6 @@ qt4/mkspecs/cygwin-g++/qplatformdefs.h
|
|||
qt4/mkspecs/darwin-g++/qmake.conf
|
||||
qt4/mkspecs/darwin-g++/qplatformdefs.h
|
||||
qt4/mkspecs/default
|
||||
qt4/mkspecs/features/assistant.prf
|
||||
qt4/mkspecs/features/build_pass.prf
|
||||
qt4/mkspecs/features/dbusadaptors.prf
|
||||
qt4/mkspecs/features/dbusinterfaces.prf
|
||||
|
|
@ -217,16 +239,27 @@ qt4/mkspecs/features/symbian/add_mmp_rules.prf
|
|||
qt4/mkspecs/features/symbian/application_icon.prf
|
||||
qt4/mkspecs/features/symbian/armcc_warnings.prf
|
||||
qt4/mkspecs/features/symbian/data_caging_paths.prf
|
||||
qt4/mkspecs/features/symbian/debug.prf
|
||||
qt4/mkspecs/features/symbian/def_files.prf
|
||||
qt4/mkspecs/features/symbian/def_files_disabled.prf
|
||||
qt4/mkspecs/features/symbian/default_post.prf
|
||||
qt4/mkspecs/features/symbian/default_pre.prf
|
||||
qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf
|
||||
qt4/mkspecs/features/symbian/epocallowdlldata.prf
|
||||
qt4/mkspecs/features/symbian/moc.prf
|
||||
qt4/mkspecs/features/symbian/nested_exceptions.prf
|
||||
qt4/mkspecs/features/symbian/opengl.prf
|
||||
qt4/mkspecs/features/symbian/platform_paths.prf
|
||||
qt4/mkspecs/features/symbian/qt.prf
|
||||
qt4/mkspecs/features/symbian/qt_config.prf
|
||||
qt4/mkspecs/features/symbian/release.prf
|
||||
qt4/mkspecs/features/symbian/run_on_phone.prf
|
||||
qt4/mkspecs/features/symbian/sis_targets.prf
|
||||
qt4/mkspecs/features/symbian/stl.prf
|
||||
qt4/mkspecs/features/symbian/stl_off.prf
|
||||
qt4/mkspecs/features/symbian/symbian_building.prf
|
||||
qt4/mkspecs/features/symbian/thread.prf
|
||||
qt4/mkspecs/features/testcase.prf
|
||||
qt4/mkspecs/features/uic.prf
|
||||
qt4/mkspecs/features/uitools.prf
|
||||
qt4/mkspecs/features/unix/bsymbolic_functions.prf
|
||||
|
|
@ -254,6 +287,7 @@ qt4/mkspecs/features/win32/embed_manifest_exe.prf
|
|||
qt4/mkspecs/features/win32/exceptions.prf
|
||||
qt4/mkspecs/features/win32/exceptions_off.prf
|
||||
qt4/mkspecs/features/win32/ltcg.prf
|
||||
qt4/mkspecs/features/win32/msvc_mp.prf
|
||||
qt4/mkspecs/features/win32/opengl.prf
|
||||
qt4/mkspecs/features/win32/openvg.prf
|
||||
qt4/mkspecs/features/win32/qaxcontainer.prf
|
||||
|
|
@ -358,6 +392,9 @@ qt4/mkspecs/macx-xcode/qmake.conf
|
|||
qt4/mkspecs/macx-xcode/qplatformdefs.h
|
||||
qt4/mkspecs/macx-xlc/qmake.conf
|
||||
qt4/mkspecs/macx-xlc/qplatformdefs.h
|
||||
qt4/mkspecs/modules/README
|
||||
qt4/mkspecs/modules/qmake.conf
|
||||
qt4/mkspecs/modules/qt_webkit_version.pri
|
||||
qt4/mkspecs/netbsd-g++/qmake.conf
|
||||
qt4/mkspecs/netbsd-g++/qplatformdefs.h
|
||||
qt4/mkspecs/openbsd-g++/qmake.conf
|
||||
|
|
@ -367,6 +404,8 @@ qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
|
|||
qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
|
||||
qt4/mkspecs/qws/linux-arm-g++/qmake.conf
|
||||
qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
|
||||
qt4/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf
|
||||
qt4/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
|
||||
qt4/mkspecs/qws/linux-armv6-g++/qmake.conf
|
||||
qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
|
||||
qt4/mkspecs/qws/linux-avr32-g++/qmake.conf
|
||||
|
|
@ -431,6 +470,13 @@ qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
|
|||
qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
|
||||
qt4/mkspecs/symbian-sbsv2/qmake.conf
|
||||
qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
|
||||
qt4/mkspecs/symbian/linux-armcc/features/default_post.prf
|
||||
qt4/mkspecs/symbian/linux-armcc/qmake.conf
|
||||
qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h
|
||||
qt4/mkspecs/symbian/linux-gcce/features/default_post.prf
|
||||
qt4/mkspecs/symbian/linux-gcce/qmake.conf
|
||||
qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h
|
||||
qt4/mkspecs/symbian/qmake.conf
|
||||
qt4/mkspecs/tru64-cxx/qmake.conf
|
||||
qt4/mkspecs/tru64-cxx/qplatformdefs.h
|
||||
qt4/mkspecs/tru64-g++/qmake.conf
|
||||
|
|
@ -446,6 +492,8 @@ qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
|
|||
qt4/mkspecs/unsupported/qmake.conf
|
||||
qt4/mkspecs/unsupported/qnx-g++/qmake.conf
|
||||
qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h
|
||||
qt4/mkspecs/unsupported/qws/qnx-641/qmake.conf
|
||||
qt4/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
|
||||
qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
|
||||
qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
|
||||
qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
|
||||
|
|
@ -460,26 +508,22 @@ qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
|
|||
qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
|
||||
qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
|
||||
qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
|
||||
qt4/mkspecs/unsupported/win32-g++-cross/qmake.conf
|
||||
qt4/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
|
||||
qt4/mkspecs/win32-borland/qmake.conf
|
||||
qt4/mkspecs/win32-borland/qplatformdefs.h
|
||||
qt4/mkspecs/win32-g++/qmake.conf
|
||||
qt4/mkspecs/win32-g++/qplatformdefs.h
|
||||
qt4/mkspecs/win32-icc/qmake.conf
|
||||
qt4/mkspecs/win32-icc/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc.net/qmake.conf
|
||||
qt4/mkspecs/win32-msvc.net/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc/features/incremental.prf
|
||||
qt4/mkspecs/win32-msvc/features/incremental_off.prf
|
||||
qt4/mkspecs/win32-msvc/qmake.conf
|
||||
qt4/mkspecs/win32-msvc/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc2002/qmake.conf
|
||||
qt4/mkspecs/win32-msvc2002/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc2003/qmake.conf
|
||||
qt4/mkspecs/win32-msvc2003/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc2005/qmake.conf
|
||||
qt4/mkspecs/win32-msvc2005/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc2008/qmake.conf
|
||||
qt4/mkspecs/win32-msvc2008/qplatformdefs.h
|
||||
qt4/mkspecs/win32-msvc2010/qmake.conf
|
||||
qt4/mkspecs/win32-msvc2010/qplatformdefs.h
|
||||
qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
|
||||
qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
|
||||
qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
|
||||
|
|
@ -545,6 +589,7 @@ qt4/phrasebooks/dutch.qph
|
|||
qt4/phrasebooks/finnish.qph
|
||||
qt4/phrasebooks/french.qph
|
||||
qt4/phrasebooks/german.qph
|
||||
qt4/phrasebooks/hungarian.qph
|
||||
qt4/phrasebooks/italian.qph
|
||||
qt4/phrasebooks/japanese.qph
|
||||
qt4/phrasebooks/norwegian.qph
|
||||
|
|
@ -552,5 +597,6 @@ qt4/phrasebooks/polish.qph
|
|||
qt4/phrasebooks/russian.qph
|
||||
qt4/phrasebooks/spanish.qph
|
||||
qt4/phrasebooks/swedish.qph
|
||||
qt4/plugins/designer/libqdeclarativeview.la
|
||||
qt4/plugins/designer/libqt3supportwidgets.la
|
||||
qt4/plugins/designer/libqwebview.la
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# $NetBSD: Makefile.common,v 1.22 2010/07/04 06:00:13 adam Exp $
|
||||
# $NetBSD: Makefile.common,v 1.23 2010/11/15 13:05:44 adam Exp $
|
||||
# used by x11/qt4-libs/Makefile.common
|
||||
# used by x11/qt4-tools/Makefile
|
||||
|
||||
QTVERSION= 4.6.3
|
||||
QTVERSION= 4.7.1
|
||||
|
||||
MAINTAINER?= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://qt.nokia.com/
|
||||
|
||||
LICENSE= gnu-gpl-v3
|
||||
LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3
|
||||
|
|
|
|||
Loading…
Reference in a new issue