pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 -make sqlite support an extra pkg instead of an op...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9bbae785d9bb
branches: trunk
changeset: 532871:9bbae785d9bb
user: drochner <drochner%pkgsrc.org@localhost>
date: Mon Sep 03 09:35:15 2007 +0000
description:
-make sqlite support an extra pkg instead of an option
-work around iconv(3) incompatibilities: while NetBSD's iconv() is
probed as GNU iconv (due to its signature), it doesn't support empty
strings as encoding (interpreted as "current locale's encoding" by
GNU iconv). Enable some code which uses nl_langinfo(CODESET) to make
it work as expected.
-update to 4.3.1
changes:
-bugfixes
-Updated the German translation to provide complete coverage of Qt
diffstat:
x11/Makefile | 3 +-
x11/qt4-libs/Makefile | 5 ++-
x11/qt4-libs/distinfo | 12 ++++----
x11/qt4-libs/options.mk | 11 +-------
x11/qt4-libs/patches/patch-ab | 53 +++++++++++++++++++++++++-----------------
x11/qt4-libs/patches/patch-am | 16 ------------
x11/qt4-libs/patches/patch-ao | 22 +++++++++++++++++
x11/qt4-sqlite3/DESCR | 1 +
x11/qt4-sqlite3/Makefile | 28 ++++++++++++++++++++++
x11/qt4-sqlite3/PLIST | 3 ++
x11/qt4-tools/PLIST | 6 ++++-
11 files changed, 104 insertions(+), 56 deletions(-)
diffs (300 lines):
diff -r 99d39617e051 -r 9bbae785d9bb x11/Makefile
--- a/x11/Makefile Mon Sep 03 06:58:38 2007 +0000
+++ b/x11/Makefile Mon Sep 03 09:35:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.519 2007/08/23 10:52:18 jnemeth Exp $
+# $NetBSD: Makefile,v 1.520 2007/09/03 09:35:15 drochner Exp $
#
COMMENT= Packages to support the X window system
@@ -273,6 +273,7 @@
SUBDIR+= qt4-docs
SUBDIR+= qt4-libs
SUBDIR+= qt4-pgsql
+SUBDIR+= qt4-sqlite3
SUBDIR+= qt4-tools
SUBDIR+= qtarch
SUBDIR+= qwspritefield
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-libs/Makefile
--- a/x11/qt4-libs/Makefile Mon Sep 03 06:58:38 2007 +0000
+++ b/x11/qt4-libs/Makefile Mon Sep 03 09:35:15 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2007/09/02 14:48:57 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/03 09:35:15 drochner Exp $
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
COMMENT= C++ X GUI toolkit
-PKGREVISION= 1
BUILD_TARGET= sub-src
INSTALL_TARGET= install_flat_headers install_targ_headers
@@ -15,6 +14,8 @@
PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
+CONFIGURE_ARGS+= -no-sql-sqlite
+
do-install:
${INSTALL_DATA_DIR} ${QTPREFIX}
${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Mon Sep 03 06:58:38 2007 +0000
+++ b/x11/qt4-libs/distinfo Mon Sep 03 09:35:15 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2007/08/11 23:22:44 adrianp Exp $
+$NetBSD: distinfo,v 1.13 2007/09/03 09:35:15 drochner Exp $
-SHA1 (qt-x11-opensource-src-4.3.0.tar.gz) = e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4
-RMD160 (qt-x11-opensource-src-4.3.0.tar.gz) = 2106dd8dda7a5b16305ba701e33c17e9349fddc3
-Size (qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 bytes
+SHA1 (qt-x11-opensource-src-4.3.1.tar.gz) = ca59cfdcfc390cf16c6e6b503546e8bb2cc8e1e2
+RMD160 (qt-x11-opensource-src-4.3.1.tar.gz) = 134c1f1a9e685a9519ff88a3afc59e7b8329a270
+Size (qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 bytes
SHA1 (patch-aa) = edfc05780c1be3588fd35a0261b3a1ca45274bc8
-SHA1 (patch-ab) = 1666aa0273b5f4cdecb5a5fd76343d33d1987d9f
+SHA1 (patch-ab) = c2a9c3b51a1afa3080aed5ef8fb91032c4dc53c1
SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
SHA1 (patch-ad) = 3567be61b6df31a65c286a5451753d8cbed9efd3
SHA1 (patch-ae) = 468e3ae41e738d51d253c839e55e329ad7937006
@@ -15,5 +15,5 @@
SHA1 (patch-aj) = 7e8528c6ab1bad239142464b49ee073939a868b0
SHA1 (patch-ak) = 16eef0675a63da937637c8fc654664f1cb155d18
SHA1 (patch-al) = a46ad5c1236d8a63900faaca62b13827b9c1c08e
-SHA1 (patch-am) = a360456b2ce150d00643640db821c31ee77adc3a
SHA1 (patch-an) = 1e0ee434c7db17c2c7d14055ede44d1417318774
+SHA1 (patch-ao) = dd0c6e9fdb0c204f494d5ca4d49be2f0a20a1c81
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-libs/options.mk
--- a/x11/qt4-libs/options.mk Mon Sep 03 06:58:38 2007 +0000
+++ b/x11/qt4-libs/options.mk Mon Sep 03 09:35:15 2007 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2006/05/31 19:18:07 adam Exp $
+# $NetBSD: options.mk,v 1.3 2007/09/03 09:35:16 drochner Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qt4
-PKG_SUPPORTED_OPTIONS= cups debug sqlite
+PKG_SUPPORTED_OPTIONS= cups debug
.include "../../mk/bsd.options.mk"
@@ -18,10 +18,3 @@
CONFIGURE_ARGS+= --debug
INSTALL_UNSTRIPPED= yes
.endif
-
-.if !empty(PKG_OPTIONS:Msqlite)
-. include "../../databases/sqlite3/buildlink3.mk"
-CONFIGURE_ARGS+= -qt-sql-sqlite
-.else
-CONFIGURE_ARGS+= -no-sql-sqlite
-.endif
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-libs/patches/patch-ab
--- a/x11/qt4-libs/patches/patch-ab Mon Sep 03 06:58:38 2007 +0000
+++ b/x11/qt4-libs/patches/patch-ab Mon Sep 03 09:35:15 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2007/07/28 07:37:51 adam Exp $
+$NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
---- src/gui/painting/painting.pri.orig 2007-05-25 15:24:11.000000000 +0200
+--- src/gui/painting/painting.pri.orig 2007-08-07 15:08:41.000000000 +0200
+++ src/gui/painting/painting.pri
-@@ -177,11 +177,11 @@ mac {
+@@ -182,11 +182,11 @@ mac {
win32-g++|!win32:!*-icc* {
mmx {
@@ -16,24 +16,35 @@
mmx_compiler.input = MMX_SOURCES
mmx_compiler.variable_out = OBJECTS
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -194,13 +194,13 @@ mac {
- }
+@@ -194,22 +194,22 @@ mac {
+ QMAKE_EXTRA_COMPILERS += mmx_compiler
}
3dnow {
-- 3dnow_compiler.commands = $$QMAKE_CXX -c
-+ 3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
- 3dnow_compiler.commands += -m3dnow
- mmx: 3dnow_compiler.commands += -mmmx
- sse: 3dnow_compiler.commands += -msse
- 3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
- 3dnow_compiler.dependency_type = TYPE_C
-- 3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+ 3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
- 3dnow_compiler.input = 3DNOW_SOURCES
- 3dnow_compiler.variable_out = OBJECTS
- 3dnow_compiler.name = compiling[3dnow] ${QMAKE_FILE_IN}
-@@ -208,11 +208,11 @@ mac {
- QMAKE_EXTRA_COMPILERS += 3dnow_compiler
+- mmx3dnow_compiler.commands = $$QMAKE_CXX -c
++ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+ mmx3dnow_compiler.commands += -m3dnow -mmmx
+ mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ mmx3dnow_compiler.dependency_type = TYPE_C
+- mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ mmx3dnow_compiler.input = MMX3DNOW_SOURCES
+ mmx3dnow_compiler.variable_out = OBJECTS
+ mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
+ silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
+ QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
+ sse {
+- sse3dnow_compiler.commands = $$QMAKE_CXX -c
++ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+ sse3dnow_compiler.commands += -m3dnow -msse
+ sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ sse3dnow_compiler.dependency_type = TYPE_C
+- sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
++ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
+ sse3dnow_compiler.input = SSE3DNOW_SOURCES
+ sse3dnow_compiler.variable_out = OBJECTS
+ sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
+@@ -218,11 +218,11 @@ mac {
+ }
}
sse {
- sse_compiler.commands = $$QMAKE_CXX -c
@@ -46,7 +57,7 @@
sse_compiler.input = SSE_SOURCES
sse_compiler.variable_out = OBJECTS
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -220,11 +220,11 @@ mac {
+@@ -230,11 +230,11 @@ mac {
QMAKE_EXTRA_COMPILERS += sse_compiler
}
sse2 {
@@ -60,7 +71,7 @@
sse2_compiler.input = SSE2_SOURCES
sse2_compiler.variable_out = OBJECTS
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -232,11 +232,11 @@ mac {
+@@ -242,11 +242,11 @@ mac {
QMAKE_EXTRA_COMPILERS += sse2_compiler
}
iwmmxt {
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-libs/patches/patch-am
--- a/x11/qt4-libs/patches/patch-am Mon Sep 03 06:58:38 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.3 2007/08/04 00:02:35 joerg Exp $
-
---- src/corelib/io/qfsfileengine_iterator_unix.cpp.orig 2007-08-03 22:54:41.000000000 +0000
-+++ src/corelib/io/qfsfileengine_iterator_unix.cpp
-@@ -99,7 +99,11 @@ bool QFSFileEngineIterator::hasNext() co
- // ### Race condition; we should use fpathconf and dirfd().
- long maxPathName = ::pathconf(QFile::encodeName(path()).data(), _PC_NAME_MAX);
- if (maxPathName == -1)
-+#ifdef NAME_MAX
-+ maxPathName = (sizeof(dirent) + NAME_MAX + 1);
-+#else
- maxPathName = (sizeof(dirent) + MAXNAMLEN + 1);
-+#endif
- #if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN)
- if (that->platform->mt_file)
- delete [] that->platform->mt_file;
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-libs/patches/patch-ao
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-ao Mon Sep 03 09:35:15 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1 2007/09/03 09:35:17 drochner Exp $
+
+--- ./src/corelib/codecs/qiconvcodec.cpp.orig 2007-08-07 15:08:39.000000000 +0200
++++ ./src/corelib/codecs/qiconvcodec.cpp
+@@ -44,7 +44,7 @@
+
+ // unistd.h is needed for the _XOPEN_UNIX macro
+ #include <unistd.h>
+-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
++#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD)
+ # include <langinfo.h>
+ #endif
+
+@@ -244,7 +244,7 @@ iconv_t QIconvCodec::createIconv_t(const
+ char *codeset = 0;
+ #endif
+
+-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
++#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD)
+ if (cd == (iconv_t) -1) {
+ codeset = nl_langinfo(CODESET);
+ if (codeset)
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-sqlite3/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-sqlite3/DESCR Mon Sep 03 09:35:15 2007 +0000
@@ -0,0 +1,1 @@
+QT postgresql driver
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-sqlite3/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-sqlite3/Makefile Mon Sep 03 09:35:15 2007 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1 2007/09/03 09:35:18 drochner Exp $
+
+.include "../../x11/qt4-libs/Makefile.common"
+
+PKGNAME= qt4-sqlite3-${QTVERSION}
+COMMENT= QT sqlite3 driver
+
+CONFIGURE_ARGS+= -I${QTDIR}/include
+CONFIGURE_ARGS+= -L${QTDIR}/lib
+CONFIGURE_ARGS+= -system-sqlite
+
+BUILD_QT4= yes
+
+do-build:
+ cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
+ cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE}
+
+SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
+
+do-install:
+ ${INSTALL_DATA_DIR} ${SQLDRVDIR}
+ ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \
+ ${SQLDRVDIR}
+
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-sqlite3/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-sqlite3/PLIST Mon Sep 03 09:35:15 2007 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2007/09/03 09:35:18 drochner Exp $
+qt4/plugins/sqldrivers/libqsqlite.la
+@unexec ${RMDIR} %D/qt4/plugins/sqldrivers 2>/dev/null || ${TRUE}
diff -r 99d39617e051 -r 9bbae785d9bb x11/qt4-tools/PLIST
--- a/x11/qt4-tools/PLIST Mon Sep 03 06:58:38 2007 +0000
+++ b/x11/qt4-tools/PLIST Mon Sep 03 09:35:15 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/07/28 07:37:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/09/03 09:35:19 drochner Exp $
lib/pkgconfig/QtScript.pc
lib/pkgconfig/QtTest.pc
qt4/bin/assistant
@@ -260,6 +260,8 @@
qt4/mkspecs/linux-g++-64/qplatformdefs.h
qt4/mkspecs/linux-g++/qmake.conf
qt4/mkspecs/linux-g++/qplatformdefs.h
+qt4/mkspecs/linux-icc-32/qmake.conf
+qt4/mkspecs/linux-icc-32/qplatformdefs.h
qt4/mkspecs/linux-icc-64/qmake.conf
qt4/mkspecs/linux-icc-64/qplatformdefs.h
qt4/mkspecs/linux-icc/qmake.conf
@@ -351,6 +353,7 @@
qt4/phrasebooks/italian.qph
qt4/phrasebooks/japanese.qph
qt4/phrasebooks/norwegian.qph
+qt4/phrasebooks/polish.qph
qt4/phrasebooks/russian.qph
qt4/phrasebooks/spanish.qph
qt4/phrasebooks/swedish.qph
@@ -395,6 +398,7 @@
@dirrm qt4/mkspecs/linux-lsb-g++
@dirrm qt4/mkspecs/linux-kcc
@dirrm qt4/mkspecs/linux-icc-64
+@dirrm qt4/mkspecs/linux-icc-32
@dirrm qt4/mkspecs/linux-icc
@dirrm qt4/mkspecs/linux-g++-64
@dirrm qt4/mkspecs/linux-g++-32
Home |
Main Index |
Thread Index |
Old Index