pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Changes 4.8.2:
details: https://anonhg.NetBSD.org/pkgsrc/rev/20315a8f6cbd
branches: trunk
changeset: 604154:20315a8f6cbd
user: adam <adam%pkgsrc.org@localhost>
date: Thu May 24 08:07:33 2012 +0000
description:
Changes 4.8.2:
* Over 100 functional improvements
* WebKit updated to version 2.2.2
* libpng updated to version 1.5.10
* Thirty improvements to documentation and tools
diffstat:
x11/qt4-libs/Makefile | 3 +--
x11/qt4-libs/Makefile.common | 4 ++--
x11/qt4-libs/distinfo | 10 +++++-----
x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp | 8 ++++----
x11/qt4-sqlite3/Makefile | 3 +--
x11/qt4-tools/PLIST | 14 +++++++++-----
x11/qt4/Makefile.common | 4 ++--
7 files changed, 24 insertions(+), 22 deletions(-)
diffs (145 lines):
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4-libs/Makefile Thu May 24 08:07:33 2012 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.74 2012/04/10 18:45:28 abs Exp $
+# $NetBSD: Makefile,v 1.75 2012/05/24 08:07:33 adam Exp $
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 1
COMMENT= C++ X GUI toolkit
.include "../../x11/qt4-libs/Makefile.common"
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4-libs/Makefile.common
--- a/x11/qt4-libs/Makefile.common Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4-libs/Makefile.common Thu May 24 08:07:33 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2012/02/17 14:11:23 hans Exp $
+# $NetBSD: Makefile.common,v 1.32 2012/05/24 08:07:33 adam Exp $
# used by x11/qt4-docs/Makefile
# used by x11/qt4-libs/Makefile
# used by x11/qt4-mng/Makefile
@@ -10,7 +10,7 @@
DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
CATEGORIES= x11
-MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/
+MASTER_SITES= http://releases.qt-project.org/qt4/source/
PKG_DESTDIR_SUPPORT= user-destdir
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4-libs/distinfo Thu May 24 08:07:33 2012 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.74 2012/04/10 18:45:29 abs Exp $
+$NetBSD: distinfo,v 1.75 2012/05/24 08:07:33 adam Exp $
-SHA1 (qt-everywhere-opensource-src-4.8.1.tar.gz) = a074d0f605f009e23c63e0a4cb9b71c978146ffc
-RMD160 (qt-everywhere-opensource-src-4.8.1.tar.gz) = 538e626fae80ca8ca5aac575919f469a9827ad4f
-Size (qt-everywhere-opensource-src-4.8.1.tar.gz) = 239606696 bytes
+SHA1 (qt-everywhere-opensource-src-4.8.2.tar.gz) = e1e2edef1d63ed677d6534d32800c2e1f7ad0e73
+RMD160 (qt-everywhere-opensource-src-4.8.2.tar.gz) = 6a15077aee1e84076380787127b80c7bb97ebe86
+Size (qt-everywhere-opensource-src-4.8.2.tar.gz) = 239108331 bytes
SHA1 (patch-aa) = 9b5f8bd980d8c3f38fd3c541380fd42d2a93a609
SHA1 (patch-ab) = 447a888cbc784a54935f23d1005d6977374a484d
SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
@@ -38,7 +38,7 @@
SHA1 (patch-cg) = 2519fe525237167f10dffb9294c861f4d7063f31
SHA1 (patch-ci) = bc85adf9ea17be24f92897b960517941f5b28ab7
SHA1 (patch-cj) = 4f6d3546e3bc04ca2034af21645fc6f27bc82eef
-SHA1 (patch-qmake_generators_makefile.cpp) = b985fa61c5fe8cc9edbf2502109e3883a81faa85
+SHA1 (patch-qmake_generators_makefile.cpp) = d163cfbf8e598123dd1ed2f9bb5e6935b4e5bf64
SHA1 (patch-src-tools-mocmain.cpp-QTBUG-22829) = 79ffa61f856d657be054d1ea2fcab3a90740621e
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = cbce2e10307d26163a76266c0ceee315a609d63d
SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_jit_JITStubs.cpp) = bfe38ea1e26fef02dd78e40c95c000cb0cc32a04
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp
--- a/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4-libs/patches/patch-qmake_generators_makefile.cpp Thu May 24 08:07:33 2012 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2012/04/09 09:12:49 adam Exp $
+$NetBSD: patch-qmake_generators_makefile.cpp,v 1.3 2012/05/24 08:07:33 adam Exp $
---- qmake/generators/makefile.cpp.orig 2012-03-14 14:01:12.000000000 +0000
+--- qmake/generators/makefile.cpp.orig 2012-05-24 05:03:21.000000000 +0000
+++ qmake/generators/makefile.cpp
@@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile()
bundle = bundle.left(suffix);
@@ -9,5 +9,5 @@
- pkgConfiglibDir = "-L${libdir}";
+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
- pkgConfiglibName += project->first("TARGET_VERSION_EXT");
- }
+ if (project->isActiveConfig("shared"))
+ pkgConfiglibName += project->first("TARGET_VERSION_EXT");
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4-sqlite3/Makefile
--- a/x11/qt4-sqlite3/Makefile Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4-sqlite3/Makefile Thu May 24 08:07:33 2012 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2012/04/27 12:32:08 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/05/24 08:07:33 adam Exp $
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-sqlite3-${QTVERSION}
-PKGREVISION= 1
COMMENT= QT sqlite3 driver
CONFIGURE_ARGS+= -I${QTDIR}/include
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4-tools/PLIST
--- a/x11/qt4-tools/PLIST Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4-tools/PLIST Thu May 24 08:07:33 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2012/04/09 09:12:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2012/05/24 08:07:33 adam Exp $
lib/pkgconfig/QtCLucene.pc
lib/pkgconfig/QtDesigner.pc
lib/pkgconfig/QtDesignerComponents.pc
@@ -330,10 +330,8 @@
qt4/mkspecs/features/yacc.prf
qt4/mkspecs/freebsd-g++/qmake.conf
qt4/mkspecs/freebsd-g++/qplatformdefs.h
-qt4/mkspecs/freebsd-g++34/qmake.conf
-qt4/mkspecs/freebsd-g++34/qplatformdefs.h
-qt4/mkspecs/freebsd-g++40/qmake.conf
-qt4/mkspecs/freebsd-g++40/qplatformdefs.h
+qt4/mkspecs/freebsd-g++46/qmake.conf
+qt4/mkspecs/freebsd-g++46/qplatformdefs.h
qt4/mkspecs/freebsd-icc/qmake.conf
qt4/mkspecs/freebsd-icc/qplatformdefs.h
qt4/mkspecs/hpux-acc-64/qmake.conf
@@ -364,6 +362,8 @@
qt4/mkspecs/irix-g++-64/qplatformdefs.h
qt4/mkspecs/irix-g++/qmake.conf
qt4/mkspecs/irix-g++/qplatformdefs.h
+qt4/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+qt4/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h
qt4/mkspecs/linux-cxx/qmake.conf
qt4/mkspecs/linux-cxx/qplatformdefs.h
qt4/mkspecs/linux-ecc-64/qmake.conf
@@ -543,6 +543,10 @@
qt4/mkspecs/unixware-cc/qplatformdefs.h
qt4/mkspecs/unixware-g++/qmake.conf
qt4/mkspecs/unixware-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+qt4/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+qt4/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
qt4/mkspecs/unsupported/linux-armcc/qmake.conf
qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h
qt4/mkspecs/unsupported/linux-clang/qmake.conf
diff -r fefcd70c2543 -r 20315a8f6cbd x11/qt4/Makefile.common
--- a/x11/qt4/Makefile.common Thu May 24 07:27:27 2012 +0000
+++ b/x11/qt4/Makefile.common Thu May 24 08:07:33 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.28 2012/04/09 09:12:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.29 2012/05/24 08:07:33 adam Exp $
# used by x11/qt4-libs/Makefile.common
# used by x11/qt4-tools/Makefile
-QTVERSION= 4.8.1
+QTVERSION= 4.8.2
MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://qt.nokia.com/
Home |
Main Index |
Thread Index |
Old Index