diff options
author | adam <adam@pkgsrc.org> | 2007-03-18 17:34:41 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2007-03-18 17:34:41 +0000 |
commit | 87b6788564d3ba610f36c33e1dc8f8ef8485afd8 (patch) | |
tree | e2ab3e1512f96126499bcc7a30c24de203a7b0a0 /x11/qt4-libs | |
parent | 58c522844e1fabfbc8760790ae309d184db5f3ea (diff) | |
download | pkgsrc-87b6788564d3ba610f36c33e1dc8f8ef8485afd8.tar.gz |
Changes 4.2.3:
This is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.2.0.
- Configuration/Compilation
* Fixed architecture detection on UltraSPARC-T1 systems.
* Fixed compilation on embedded architectures when qreal is not double.
- Documentation
* Completed documentation for "Implementing Atomic Operations",
which is useful for people porting Qt to a new hardware architecture.
- Translations
* Added a new unofficial Portuguese translation courtesy of Helder
Correia.
- Qt Linguist
* Made the columns in the phrasebook resizeable.
- lupdate
* Fixed bug in the .pro parser of lupdate. It should accept backslashes.
* Fixed a severe slowdown in lupdate. (~400x speedup.)
* Fixed traversal of subdirectories.
- moc
* Don't create trigraphs in the generated code for C++ casts.
- uic
* Fixed a bug that generated excessive margins for Q3GroupBox.
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r-- | x11/qt4-libs/Makefile | 7 | ||||
-rw-r--r-- | x11/qt4-libs/Makefile.common | 44 | ||||
-rw-r--r-- | x11/qt4-libs/distinfo | 22 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-aa | 44 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ab | 6 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ad | 14 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ae | 10 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-af | 42 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ag | 6 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-aj | 47 | ||||
-rw-r--r-- | x11/qt4-libs/patches/patch-ak | 13 |
11 files changed, 165 insertions, 90 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 1904cea0c60..0f9f480a908 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2007/01/15 19:16:36 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2007/03/18 17:34:41 adam Exp $ .include "../../x11/qt4-libs/Makefile.common" PKGNAME= qt4-libs-${QTVERSION} -PKGREVISION= 1 COMMENT= C++ X GUI toolkit BUILD_TARGET= sub-src @@ -25,9 +24,9 @@ do-install: ${INSTALL_DATA_DIR} ${QTPREFIX}/include .for incl in corelib gui network opengl qt3support sql svg xml cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} \ - ${MAKE_PROGRAM} -f Makefile.Release ${INSTALL_TARGET} + ${MAKE_PROGRAM} ${INSTALL_TARGET} .endfor - cd ${PREFIX} && ${FIND} qt4/include -type f -print > ${WRKDIR}/PLIST + cd ${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST ${INSTALL_LIB_DIR} ${QTPREFIX}/lib .for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common index 031dc88c535..5df4e62740d 100644 --- a/x11/qt4-libs/Makefile.common +++ b/x11/qt4-libs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2007/01/15 19:16:36 joerg Exp $ +# $NetBSD: Makefile.common,v 1.5 2007/03/18 17:34:41 adam Exp $ DISTNAME= qt-x11-opensource-src-${QTVERSION} CATEGORIES= x11 @@ -87,27 +87,27 @@ CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline .endif pre-configure: - ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ - -e 's:@X11BASE@:${X11BASE}:g' \ - -e 's:@X11PREFIX@:${X11PREFIX}:g' \ - -e 's:@LIBTOOL@:${LIBTOOL}:g' \ - -e 's:@CC@:${CC}:g' \ - -e 's:@CXX@:${CXX}:g' \ - -e 's:@LDFLAGS@:${LDFLAGS}:g' \ - -e 's:@CFLAGS@:${CFLAGS}:g' \ - -e 's:@CXXFLAGS@:${CXXFLAGS}:g' \ - -e 's:@SYS_LIBS@:${SYS_LIBS}:g' \ - -e 's:@LEX@:${LEX}:g' \ - -e 's:@YACC@:${TOOLS_CMDLINE_YACC}:g' \ - -e 's:@AR@:${AR}:g' \ - -e 's:@MKDIR@:${MKDIR}:g' \ - -e 's:@LIBQT@:${LIBQT}:g' \ - -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS}:g' \ - -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS}:g' \ - -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \ - -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB}:g' \ + sed -e 's:@LOCALBASE@:${LOCALBASE:Q}:g' \ + -e 's:@X11BASE@:${X11BASE:Q}:g' \ + -e 's:@X11PREFIX@:${X11PREFIX:Q}:g' \ + -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ + -e 's:@CC@:${CC:Q}:g' \ + -e 's:@CXX@:${CXX:Q}:g' \ + -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ + -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:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ + -e 's:@AR@:${AR:Q}:g' \ + -e 's:@MKDIR@:${MKDIR:Q}: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:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf for dir in ${WRKSRC}/mkspecs/*; do \ - ${CP} ${WRKSRC}/qmake.conf $${dir}; \ - ${RM} -f $${dir}/*.orig; \ + cp ${WRKSRC}/qmake.conf $${dir}; \ + rm -f $${dir}/*.orig; \ done diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index ea3ab7626af..e95a7cb10aa 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,14 +1,16 @@ -$NetBSD: distinfo,v 1.7 2006/07/17 15:30:16 minskim Exp $ +$NetBSD: distinfo,v 1.8 2007/03/18 17:34:41 adam Exp $ -SHA1 (qt-x11-opensource-src-4.1.4.tar.gz) = 7924011d7fcc0c873b952670e0dac2c56fc6f0f5 -RMD160 (qt-x11-opensource-src-4.1.4.tar.gz) = a7e8558f275751b1a6217827784c3b81f84d6d5f -Size (qt-x11-opensource-src-4.1.4.tar.gz) = 32174985 bytes -SHA1 (patch-aa) = 87a1b7e57853d70bbe6e7cb79f4a1c6e1c89d36b -SHA1 (patch-ab) = 3305517f366628fdedcb820fb83026018067471e +SHA1 (qt-x11-opensource-src-4.2.3.tar.gz) = b988aab4fa1dcce8532c36bb63947a556076e8c8 +RMD160 (qt-x11-opensource-src-4.2.3.tar.gz) = 06c9c3bd53dd6b96fc68a1dfe96882ac6927df25 +Size (qt-x11-opensource-src-4.2.3.tar.gz) = 37635710 bytes +SHA1 (patch-aa) = 2ac5ba5b0a419f1a6fe63989b9734d042ccf1562 +SHA1 (patch-ab) = 726bc5f30d5eb54ec19f76be35422e3697fb1b8c SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821 -SHA1 (patch-ad) = 1db8ce11816ae2fe8423906c51290c82ddb169ea -SHA1 (patch-ae) = f007463664a56e4dc53adf1e33c80790b07591c3 -SHA1 (patch-af) = a8576bc098c14cb5a13d45d4231b7ee21441eb89 -SHA1 (patch-ag) = 9c73840a8fd2edf518a26532ab1f04752cca3fc9 +SHA1 (patch-ad) = 6b835687f74358999ddc89feb46c98cc36fef47b +SHA1 (patch-ae) = 5b0d7ede053f1a792418406547280cd3352d7c47 +SHA1 (patch-af) = d3a6680553d7cd41cb9436776ee81737e3f2eb07 +SHA1 (patch-ag) = cfdc8678689089a7894d4acfee9e6a868d384b6f SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 +SHA1 (patch-aj) = cb57c340a125587f5e26f63274c090512079a41c +SHA1 (patch-ak) = 16eef0675a63da937637c8fc654664f1cb155d18 diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa index 44cf5b10a00..d6127f9f42a 100644 --- a/x11/qt4-libs/patches/patch-aa +++ b/x11/qt4-libs/patches/patch-aa @@ -1,32 +1,36 @@ -$NetBSD: patch-aa,v 1.3 2006/07/17 15:30:16 minskim Exp $ +$NetBSD: patch-aa,v 1.4 2007/03/18 17:34:41 adam Exp $ ---- qmake/generators/unix/unixmake2.cpp.orig 2006-07-17 03:35:32.000000000 +0000 +--- qmake/generators/unix/unixmake2.cpp.orig 2006-11-27 17:26:28.000000000 +0000 +++ qmake/generators/unix/unixmake2.cpp -@@ -199,6 +199,8 @@ UnixMakefileGenerator::writeMakeParts(QT +@@ -205,6 +205,8 @@ UnixMakefileGenerator::writeMakeParts(QT if(!project->isEmpty("QMAKE_BUNDLE_NAME")) { - t << "TARGETD = " << var("TARGET_x.y") << endl; - t << "TARGET0 = " << var("TARGET_") << endl; -+ } else if(project->isActiveConfig("compile_libtool")) { -+ t << "TARGETD = " << var("TARGET_la") << endl; + 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->isEmpty("QMAKE_HPUX_SHLIB")) { - t << "TARGETD = " << var("TARGET_x.y.z") << endl; - t << "TARGET0 = " << var("TARGET_") << endl; -@@ -885,6 +887,9 @@ void UnixMakefileGenerator::init2() - project->variables()["TARGET"].first().prepend("lib"); - project->variables()["TARGET"].first() += ".a"; - if(project->variables()["QMAKE_AR_CMD"].isEmpty()) -+ if(project->isActiveConfig("compile_libtool")) -+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)"); -+ else - project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGET) $(OBJECTS)"); + t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; + t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; +@@ -946,8 +948,12 @@ void UnixMakefileGenerator::init2() + } else if (project->isActiveConfig("staticlib")) { + project->values("TARGET").first().prepend("lib"); + project->values("TARGET").first() += ".a"; +- 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 + project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)"); ++ } } else { - project->variables()["TARGETA"].append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); -@@ -1282,7 +1287,7 @@ UnixMakefileGenerator::writePkgConfigFil + project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); + if(project->isActiveConfig("compile_libtool")) +@@ -1372,7 +1378,7 @@ UnixMakefileGenerator::writePkgConfigFil else libs << "QMAKE_LIBS"; //obvious one libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread? - t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " "; + t << "Libs: -Wl,-R${libdir} -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " "; for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) - t << project->variables()[(*it)].join(" ") << " "; + t << project->values((*it)).join(" ") << " "; t << endl; diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab index 96d4ed2191b..bac054270a9 100644 --- a/x11/qt4-libs/patches/patch-ab +++ b/x11/qt4-libs/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2006/07/17 15:30:16 minskim Exp $ +$NetBSD: patch-ab,v 1.3 2007/03/18 17:34:41 adam Exp $ ---- src/gui/painting/painting.pri.orig 2006-06-19 10:49:23.000000000 +0000 +--- src/gui/painting/painting.pri.orig 2007-02-21 10:58:43.000000000 +0100 +++ src/gui/painting/painting.pri -@@ -119,9 +119,9 @@ embedded { +@@ -137,9 +137,9 @@ x11|embedded { mac { } else:sse|win32-g++ { diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad index d36dec6c3e2..be5ee601732 100644 --- a/x11/qt4-libs/patches/patch-ad +++ b/x11/qt4-libs/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.3 2006/05/31 19:18:07 adam Exp $ +$NetBSD: patch-ad,v 1.4 2007/03/18 17:34:41 adam Exp $ ---- src/corelib/global/qglobal.h.orig 2006-05-14 12:46:59.000000000 +0200 +--- src/corelib/global/qglobal.h.orig 2006-11-27 17:26:05.000000000 +0000 +++ src/corelib/global/qglobal.h @@ -55,6 +55,7 @@ NETBSD - NetBSD @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.3 2006/05/31 19:18:07 adam Exp $ IRIX - SGI Irix OSF - HP Tru64 UNIX SCO - SCO OpenServer 5 -@@ -106,6 +107,9 @@ +@@ -107,6 +108,9 @@ #elif defined(__NetBSD__) # define Q_OS_NETBSD # define Q_OS_BSD4 @@ -20,19 +20,19 @@ $NetBSD: patch-ad,v 1.3 2006/05/31 19:18:07 adam Exp $ #elif defined(__OpenBSD__) # define Q_OS_OPENBSD # define Q_OS_BSD4 -@@ -145,11 +149,6 @@ +@@ -146,11 +150,6 @@ # define Q_OS_WIN #endif -#if defined(Q_OS_DARWIN) --# define Q_OS_MAC /* Q_OS_MAC is mostly for compatiblity, but also more clear */ --# define Q_OS_MACX /* Q_OS_MACX is only for compatiblity.*/ +-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */ +-# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/ -#endif - #if defined(Q_OS_MSDOS) || defined(Q_OS_OS2) || defined(Q_OS_WIN) # undef Q_OS_UNIX #elif !defined(Q_OS_UNIX) -@@ -530,10 +529,7 @@ +@@ -542,10 +541,7 @@ # define Q_WS_PM # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" #elif defined(Q_OS_UNIX) diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae index 559b6bd78e6..da602e18f2d 100644 --- a/x11/qt4-libs/patches/patch-ae +++ b/x11/qt4-libs/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2006/07/17 15:30:16 minskim Exp $ +$NetBSD: patch-ae,v 1.2 2007/03/18 17:34:41 adam Exp $ ---- qmake/generators/unix/unixmake.cpp.orig 2006-06-19 03:49:29.000000000 -0700 +--- qmake/generators/unix/unixmake.cpp.orig 2007-02-21 10:59:01.000000000 +0100 +++ qmake/generators/unix/unixmake.cpp -@@ -250,27 +250,29 @@ UnixMakefileGenerator::init() +@@ -280,27 +280,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.1 2006/07/17 15:30:16 minskim Exp $ } else { libtool_flags += " --mode=compile"; } -@@ -555,7 +557,6 @@ UnixMakefileGenerator::defaultInstall(co +@@ -611,7 +613,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.1 2006/07/17 15:30:16 minskim Exp $ if(targetdir.right(1) != Option::dir_sep) targetdir += Option::dir_sep; -@@ -611,10 +612,14 @@ UnixMakefileGenerator::defaultInstall(co +@@ -656,10 +657,14 @@ UnixMakefileGenerator::defaultInstall(co QString src_targ = target; if(src_targ == "$(TARGET)") src_targ = "$(TARGETL)"; diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af index a3f0df745e2..0348c3bb949 100644 --- a/x11/qt4-libs/patches/patch-af +++ b/x11/qt4-libs/patches/patch-af @@ -1,21 +1,31 @@ -$NetBSD: patch-af,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $ +$NetBSD: patch-af,v 1.2 2007/03/18 17:34:41 adam Exp $ ---- qmake/Makefile.unix.orig 2005-12-16 12:51:54.000000000 +0100 +--- qmake/Makefile.unix.orig 2006-11-27 17:26:04.000000000 +0000 +++ qmake/Makefile.unix -@@ -37,14 +37,14 @@ DEPEND_SRC=project.cpp property.cpp meta - @SOURCE_PATH@/src/corelib/io/qsettings.cpp @SOURCE_PATH@/src/corelib/kernel/qvariant.cpp \ - @QMAKE_QTSRCS@ $(COMMERCIAL_DEPEND_SRC) +@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ + QTOBJS = @QMAKE_QTOBJS@ + QTSRCS = @QMAKE_QTSRCS@ + QMAKESPEC = @QMAKESPEC@ +-LFLAGS = @QMAKE_LFLAGS@ ++LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS} --CXXFLAGS = @QMAKE_CXXFLAGS@ \ -+CXXFLAGS += @QMAKE_CXXFLAGS@ \ - -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ - -I@SOURCE_PATH@/src/corelib/arch/generic -I@BUILD_PATH@/include -I@BUILD_PATH@/include/QtCore \ - -I@SOURCE_PATH@/include -I@SOURCE_PATH@/include/QtCore -I@BUILD_PATH@/src/corelib/global \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL -DQT_BUILD_QMAKE \ - -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ + #qmake code + OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ +@@ -45,7 +45,7 @@ DEPEND_SRC=project.cpp property.cpp meta + $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/3rdparty/md5/md5.cpp \ + $(QTSRCS) $(COMMERCIAL_DEPEND_SRC) + +-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ ++CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ + -I$(SOURCE_PATH)/src/corelib/arch/generic -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ + -I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \ + -I$(SOURCE_PATH)/src/3rdparty/md5 \ +@@ -53,7 +53,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators + -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) --LFLAGS=@QMAKE_LFLAGS@ -+LFLAGS=@QMAKE_LFLAGS@ ${LDFLAGS} - first all: @BUILD_PATH@/bin/qmake - qmake: @BUILD_PATH@/bin/qmake +-CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) ++CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS) + + first all: $(BUILD_PATH)/bin/qmake + qmake: $(BUILD_PATH)/bin/qmake diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag index fd81accac1c..e645861d1a3 100644 --- a/x11/qt4-libs/patches/patch-ag +++ b/x11/qt4-libs/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2006/07/17 15:30:16 minskim Exp $ +$NetBSD: patch-ag,v 1.4 2007/03/18 17:34:41 adam Exp $ ---- qmake/project.cpp.orig 2006-06-19 03:49:22.000000000 -0700 +--- qmake/project.cpp.orig 2007-02-21 10:58:40.000000000 +0100 +++ qmake/project.cpp -@@ -1383,6 +1383,9 @@ QMakeProject::isActiveConfig(const QStri +@@ -1355,6 +1355,9 @@ QMakeProject::isActiveConfig(const QStri else if(x == "false") return false; diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj new file mode 100644 index 00000000000..89ef8518db3 --- /dev/null +++ b/x11/qt4-libs/patches/patch-aj @@ -0,0 +1,47 @@ +$NetBSD: patch-aj,v 1.1 2007/03/18 17:34:41 adam Exp $ + +--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2006-11-27 17:26:42.000000000 +0000 ++++ mkspecs/netbsd-g++/qplatformdefs.h +@@ -47,6 +47,7 @@ + #include <sys/types.h> + #include <sys/ioctl.h> + #include <sys/ipc.h> ++#include <sys/param.h> + #include <sys/time.h> + #include <sys/shm.h> + #include <sys/socket.h> +@@ -107,10 +108,14 @@ + #define QT_SNPRINTF ::snprintf + #define QT_VSNPRINTF ::vsnprintf + ++#if (__NetBSD_Version__ >= 200040000) ++#include <sys/statvfs.h> ++#define QT_STATVFS 1 ++#endif ++ + // Older NetBSD versions may still use the a.out format instead of ELF. + #ifndef __ELF__ + #define QT_AOUT_UNDERSCORE + #endif + +- + #endif // QPLATFORMDEFS_H +--- src/corelib/io/qsettings.cpp.orig 2006-11-27 17:26:06.000000000 +0000 ++++ src/corelib/io/qsettings.cpp +@@ -105,9 +105,16 @@ inline bool qt_isEvilFsTypeName(const ch + + static bool isLikelyToBeNfs(int handle) + { ++#ifdef QT_STATVFS ++ struct statvfs buf; ++ if (fstatvfs(handle, &buf) != 0) ++ return false; ++#else + struct statfs buf; + if (fstatfs(handle, &buf) != 0) + return false; ++#endif ++ + return qt_isEvilFsTypeName(buf.f_fstypename); + } + diff --git a/x11/qt4-libs/patches/patch-ak b/x11/qt4-libs/patches/patch-ak new file mode 100644 index 00000000000..2b1db0d469c --- /dev/null +++ b/x11/qt4-libs/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2007/03/18 17:34:41 adam Exp $ + +--- ./src/gui/kernel/qcursor_x11.cpp.orig 2006-11-27 17:26:13.000000000 +0000 ++++ ./src/gui/kernel/qcursor_x11.cpp +@@ -239,7 +239,7 @@ void QCursorData::update() + return; + } + +- static const char *cursorNames[] = { ++ static char *cursorNames[] = { + "left_ptr", + "up_arrow", + "cross", |