pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11 Create a shared library for libQtUiTools, in the h...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5eb2122ac938
branches: trunk
changeset: 537293:5eb2122ac938
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Jan 05 22:15:24 2008 +0000
description:
Create a shared library for libQtUiTools, in the hope that this fixes
the build for kdelibs4 on amd64.
Bump PKGREVISION for qt4-tools.
diffstat:
x11/qt4-libs/distinfo | 3 ++-
x11/qt4-libs/patches/patch-am | 13 +++++++++++++
x11/qt4-tools/Makefile | 5 +++--
x11/qt4-tools/PLIST | 4 ++--
4 files changed, 20 insertions(+), 5 deletions(-)
diffs (75 lines):
diff -r 6d14d5c87e08 -r 5eb2122ac938 x11/qt4-libs/distinfo
--- a/x11/qt4-libs/distinfo Sat Jan 05 22:15:10 2008 +0000
+++ b/x11/qt4-libs/distinfo Sat Jan 05 22:15:24 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2007/12/17 22:19:43 adam Exp $
+$NetBSD: distinfo,v 1.18 2008/01/05 22:15:24 wiz Exp $
SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228
RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292
@@ -15,6 +15,7 @@
SHA1 (patch-aj) = e9ca9544f929bb4adf3ccb0ca2cad9352124289d
SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1
SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605
+SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
SHA1 (patch-an) = 338d0cf6cdf38689c9f3770222802206dd8035a3
SHA1 (patch-ao) = 04361d820325b1b8a0bc66ecaf47bab5f92e7825
SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
diff -r 6d14d5c87e08 -r 5eb2122ac938 x11/qt4-libs/patches/patch-am
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt4-libs/patches/patch-am Sat Jan 05 22:15:24 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.5 2008/01/05 22:15:24 wiz Exp $
+
+--- tools/designer/src/uitools/uitools.pro.orig 2007-12-04 16:43:42.000000000 +0000
++++ tools/designer/src/uitools/uitools.pro
+@@ -1,7 +1,7 @@
+ TEMPLATE = lib
+ TARGET = $$qtLibraryTarget(QtUiTools)
+ QT += xml
+-CONFIG += qt staticlib
++CONFIG += qt dll
+ DESTDIR = ../../../../lib
+ DLLDESTDIR = ../../../../bin
+
diff -r 6d14d5c87e08 -r 5eb2122ac938 x11/qt4-tools/Makefile
--- a/x11/qt4-tools/Makefile Sat Jan 05 22:15:10 2008 +0000
+++ b/x11/qt4-tools/Makefile Sat Jan 05 22:15:24 2008 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2007/12/17 22:19:44 adam Exp $
+# $NetBSD: Makefile,v 1.16 2008/01/05 22:15:24 wiz Exp $
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-tools-${QTVERSION}
+PKGREVISION= 1
COMMENT= QT GUI (WYSIWYG) builder and other tools
DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
@@ -39,7 +40,7 @@
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
${QTPREFIX}/lib/
.endfor
- ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtUiTools.a \
+ ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtUiTools.la \
${QTPREFIX}/lib/
.for lib in QtUiTools QtTest
sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
diff -r 6d14d5c87e08 -r 5eb2122ac938 x11/qt4-tools/PLIST
--- a/x11/qt4-tools/PLIST Sat Jan 05 22:15:10 2008 +0000
+++ b/x11/qt4-tools/PLIST Sat Jan 05 22:15:24 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2007/12/06 11:17:11 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/01/05 22:15:24 wiz Exp $
lib/pkgconfig/QtTest.pc
lib/pkgconfig/QtUiTools.pc
qt4/bin/assistant
@@ -128,7 +128,7 @@
qt4/lib/libQtDesigner.la
qt4/lib/libQtDesignerComponents.la
qt4/lib/libQtTest.la
-qt4/lib/libQtUiTools.a
+qt4/lib/libQtUiTools.la
qt4/mkspecs/aix-g++-64/qmake.conf
qt4/mkspecs/aix-g++-64/qplatformdefs.h
qt4/mkspecs/aix-g++/qmake.conf
Home |
Main Index |
Thread Index |
Old Index