pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11 Changes 4.2.3:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5920f7ed8e18
branches:  trunk
changeset: 526766:5920f7ed8e18
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun Mar 18 17:34:41 2007 +0000

description:
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:

 x11/qt4-docs/Makefile         |   7 ++---
 x11/qt4-libs/Makefile         |   7 ++---
 x11/qt4-libs/Makefile.common  |  44 ++++++++++++++++++++--------------------
 x11/qt4-libs/distinfo         |  22 ++++++++++---------
 x11/qt4-libs/patches/patch-aa |  44 +++++++++++++++++++++------------------
 x11/qt4-libs/patches/patch-ab |   6 ++--
 x11/qt4-libs/patches/patch-ad |  14 ++++++------
 x11/qt4-libs/patches/patch-ae |  10 ++++----
 x11/qt4-libs/patches/patch-af |  42 +++++++++++++++++++++++--------------
 x11/qt4-libs/patches/patch-ag |   6 ++--
 x11/qt4-libs/patches/patch-aj |  47 +++++++++++++++++++++++++++++++++++++++++++
 x11/qt4-libs/patches/patch-ak |  13 +++++++++++
 x11/qt4-pgsql/Makefile        |   8 ++----
 x11/qt4-tools/Makefile        |  24 ++++++++++-----------
 x11/qt4-tools/PLIST           |  38 ++++++++++++++++++++++-----------
 x11/qt4/Makefile.common       |   4 +-
 16 files changed, 209 insertions(+), 127 deletions(-)

diffs (truncated from 704 to 300 lines):

diff -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-docs/Makefile
--- a/x11/qt4-docs/Makefile     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-docs/Makefile     Sun Mar 18 17:34:41 2007 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/04/17 13:47:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/03/18 17:34:41 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-docs-${QTVERSION}
-PKGREVISION=   1
 COMMENT=       Documentation for the QT C++ X GUI toolkit
 
 NO_CONFIGURE=          yes
@@ -11,8 +10,8 @@
 PLIST_SRC=             ${WRKDIR}/PLIST ${PKGDIR}/PLIST
 
 do-install:
-       ${CP} -R ${WRKSRC}/doc ${QTPREFIX}
-       cd ${PREFIX}; ${FIND} qt4/doc -type f -print > ${WRKDIR}/PLIST
+       cp -R ${WRKSRC}/doc ${QTPREFIX}
+       cd ${PREFIX}; find qt4/doc -type f -print > ${WRKDIR}/PLIST
 
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/Makefile     Sun Mar 18 17:34:41 2007 +0000
@@ -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 @@
        ${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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common      Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/Makefile.common      Sun Mar 18 17:34:41 2007 +0000
@@ -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 @@
 .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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/distinfo     Sun Mar 18 17:34:41 2007 +0000
@@ -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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/patches/patch-aa
--- a/x11/qt4-libs/patches/patch-aa     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/patches/patch-aa     Sun Mar 18 17:34:41 2007 +0000
@@ -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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ab     Sun Mar 18 17:34:41 2007 +0000
@@ -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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/patches/patch-ad
--- a/x11/qt4-libs/patches/patch-ad     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ad     Sun Mar 18 17:34:41 2007 +0000
@@ -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 @@
       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 @@
  #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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/patches/patch-ae
--- a/x11/qt4-libs/patches/patch-ae     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ae     Sun Mar 18 17:34:41 2007 +0000
@@ -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 @@
                  } 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 @@
      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 -r a3da1460a535 -r 5920f7ed8e18 x11/qt4-libs/patches/patch-af
--- a/x11/qt4-libs/patches/patch-af     Sun Mar 18 16:09:22 2007 +0000
+++ b/x11/qt4-libs/patches/patch-af     Sun Mar 18 17:34:41 2007 +0000
@@ -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



Home | Main Index | Thread Index | Old Index