summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/qt2-docs/pkg/PLIST7
-rw-r--r--x11/qt2-examples/pkg/PLIST6
-rw-r--r--x11/qt2-libs/distinfo18
-rw-r--r--x11/qt2-libs/patches/patch-aa8
-rw-r--r--x11/qt2-libs/patches/patch-ae8
-rw-r--r--x11/qt2-libs/patches/patch-ag10
-rw-r--r--x11/qt2-libs/patches/patch-ah10
-rw-r--r--x11/qt2-libs/patches/patch-aj10
-rw-r--r--x11/qt2-libs/patches/patch-ak10
-rw-r--r--x11/qt2/Makefile.common4
10 files changed, 50 insertions, 41 deletions
diff --git a/x11/qt2-docs/pkg/PLIST b/x11/qt2-docs/pkg/PLIST
index 40b9900257d..d3ce06049af 100644
--- a/x11/qt2-docs/pkg/PLIST
+++ b/x11/qt2-docs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/03/23 18:09:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/06/17 19:10:38 drochner Exp $
qt2/doc/README
qt2/doc/README.QT
qt2/doc/html/HOWTO-framebuffer.html
@@ -288,6 +288,7 @@ qt2/doc/html/objecttrees.html
qt2/doc/html/opengl.html
qt2/doc/html/organizers.html
qt2/doc/html/palette.png
+qt2/doc/html/performance-qws.html
qt2/doc/html/picture-picture-cpp.html
qt2/doc/html/pictures.html
qt2/doc/html/pnglogo.png
@@ -1258,6 +1259,8 @@ qt2/doc/html/qwsmousehandler-members.html
qt2/doc/html/qwsmousehandler.html
qt2/doc/html/qwsserver-members.html
qt2/doc/html/qwsserver.html
+qt2/doc/html/qwswindow-members.html
+qt2/doc/html/qwswindow.html
qt2/doc/html/qxml-h.html
qt2/doc/html/qxmlattributes-members.html
qt2/doc/html/qxmlattributes.html
@@ -1738,6 +1741,7 @@ qt2/man/man3/QWSDecoration.3
qt2/man/man3/QWSKeyboardHandler.3
qt2/man/man3/QWSMouseHandler.3
qt2/man/man3/QWSServer.3
+qt2/man/man3/QWSWindow.3
qt2/man/man3/QWaitCondition.3
qt2/man/man3/QWhatsThis.3
qt2/man/man3/QWheelEvent.3
@@ -2083,6 +2087,7 @@ qt2/man/man3/qwsdecoration.3
qt2/man/man3/qwskeyboardhandler.3
qt2/man/man3/qwsmousehandler.3
qt2/man/man3/qwsserver.3
+qt2/man/man3/qwswindow.3
qt2/man/man3/qxmlattributes.3
qt2/man/man3/qxmlcontenthandler.3
qt2/man/man3/qxmldeclhandler.3
diff --git a/x11/qt2-examples/pkg/PLIST b/x11/qt2-examples/pkg/PLIST
index 6f2f4de5918..f8d8dbbdef8 100644
--- a/x11/qt2-examples/pkg/PLIST
+++ b/x11/qt2-examples/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/03/23 18:09:34 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/06/17 19:10:38 drochner Exp $
qt2/examples/Makefile
qt2/examples/README
qt2/examples/aclock/Makefile
@@ -174,6 +174,8 @@ qt2/examples/i18n/main.cpp
qt2/examples/i18n/mywidget.cpp
qt2/examples/i18n/mywidget.h
qt2/examples/i18n/mywidget.po
+qt2/examples/i18n/mywidget_cs.po
+qt2/examples/i18n/mywidget_cs.qm
qt2/examples/i18n/mywidget_de.po
qt2/examples/i18n/mywidget_de.qm
qt2/examples/i18n/mywidget_el.po
@@ -193,6 +195,8 @@ qt2/examples/i18n/mywidget_no.po
qt2/examples/i18n/mywidget_no.qm
qt2/examples/i18n/mywidget_ru.po
qt2/examples/i18n/mywidget_ru.qm
+qt2/examples/i18n/mywidget_zh.po
+qt2/examples/i18n/mywidget_zh.qm
qt2/examples/iconview/Makefile
qt2/examples/iconview/iconview.pro
qt2/examples/iconview/main.cpp
diff --git a/x11/qt2-libs/distinfo b/x11/qt2-libs/distinfo
index 6a0afc10ae0..bac9db102e3 100644
--- a/x11/qt2-libs/distinfo
+++ b/x11/qt2-libs/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.2 2001/04/17 16:51:47 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/06/17 19:10:39 drochner Exp $
-SHA1 (qt-x11-2.3.0.tar.gz) = 6ab5ff4f648bbe20c957f9124fc4e025385112ce
-Size (qt-x11-2.3.0.tar.gz) = 8664303 bytes
-SHA1 (patch-aa) = dc1e3bfee83a8f6b19a4ce78eaec709ac562ad51
+SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
+Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
+SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
SHA1 (patch-ab) = 0b8657fc5b28e4ffb58584988758fdc4a9900a34
SHA1 (patch-ac) = a85cb26d5cdcaa9ef61021d105d56a3a78cf5389
SHA1 (patch-ad) = 26482d22e1d016ef514a43a69a5d58b19f03193c
-SHA1 (patch-ae) = 47c46c62ef8114aa707430145ee42c6658e557a9
+SHA1 (patch-ae) = 3ca7c34f608458950e5036f4a0b9ca0c53f83343
SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
-SHA1 (patch-ag) = 410c4c67a0a0651c2dbe15372a2112da471a0d62
-SHA1 (patch-ah) = ae572066db03cfdf5a3f33c702405d3a55dd3bfd
+SHA1 (patch-ag) = 85a6376bc780c7aad88879c70fb86542f7e738ae
+SHA1 (patch-ah) = aed767e01998aa5093e3932f6ab1032d0a35b9bb
SHA1 (patch-ai) = 20a61cefe445fdc8cac90da9800d0836ac57caf8
-SHA1 (patch-aj) = ad8dd5a1ca058ef2d3ee0950b5f1b6f1bed023c5
-SHA1 (patch-ak) = a926a35bd0458f7baecb26ec9ecf03acb36488fb
+SHA1 (patch-aj) = ed0cd262eca3ff190c221421a62ce2970121a4d4
+SHA1 (patch-ak) = 3eac0d921f3535231aab9ff1f6738f9541b8b564
diff --git a/x11/qt2-libs/patches/patch-aa b/x11/qt2-libs/patches/patch-aa
index e23af98666d..bd8413a661c 100644
--- a/x11/qt2-libs/patches/patch-aa
+++ b/x11/qt2-libs/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2001/02/06 09:26:17 skrll Exp $
+$NetBSD: patch-aa,v 1.4 2001/06/17 19:10:39 drochner Exp $
---- Makefile.orig Thu Feb 1 02:29:35 2001
-+++ Makefile
+--- Makefile.orig Wed Jun 13 10:56:52 2001
++++ Makefile Fri Jun 15 20:23:04 2001
@@ -25,8 +25,14 @@
-rm -f bin/moc
cp src/moc/moc bin/moc
@@ -17,4 +17,4 @@ $NetBSD: patch-aa,v 1.3 2001/02/06 09:26:17 skrll Exp $
+ cd tools; $(MAKE) designer-utils
symlinks: .buildopts
- @cd include; rm -f q*.h; ln -s $(QTDIR)/src/*/q*.h .; ln -s $(QTDIR)/extensions/*/src/q*.h .; rm -f q*_p.h
+ @cd include; rm -f q*.h; for i in $(QTDIR)/src/*/q*.h $(QTDIR)/extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index 31aa69a683f..b73fa9212f3 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.7 2001/03/23 18:09:34 drochner Exp $
+$NetBSD: patch-ae,v 1.8 2001/06/17 19:10:39 drochner Exp $
---- src/Makefile.in.orig Mon Mar 5 19:12:49 2001
-+++ src/Makefile.in
+--- src/Makefile.in.orig Wed Jun 13 10:57:02 2001
++++ src/Makefile.in Fri Jun 15 20:28:15 2001
@@ -2,7 +2,7 @@
####### Compiler, tools and options
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.7 2001/03/23 18:09:34 drochner Exp $
+DESTDIR =
VER_MAJ = 2
VER_MIN = 3
- VER_PATCH = 0
+ VER_PATCH = 1
@@ -378,19 +378,7 @@
.SUFFIXES: .cpp .cxx .cc .C .c
diff --git a/x11/qt2-libs/patches/patch-ag b/x11/qt2-libs/patches/patch-ag
index 5e0ef82c8f1..2f5cce64dfb 100644
--- a/x11/qt2-libs/patches/patch-ag
+++ b/x11/qt2-libs/patches/patch-ag
@@ -1,14 +1,14 @@
-$NetBSD: patch-ag,v 1.2 2001/02/06 09:26:17 skrll Exp $
+$NetBSD: patch-ag,v 1.3 2001/06/17 19:10:39 drochner Exp $
---- tools/designer/designer/Makefile.in.orig Thu Feb 1 02:29:50 2001
-+++ tools/designer/designer/Makefile.in
+--- tools/designer/designer/Makefile.in.orig Wed Jun 13 10:57:07 2001
++++ tools/designer/designer/Makefile.in Fri Jun 15 20:34:17 2001
@@ -6,15 +6,15 @@
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER
-INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
--LIBS = $(SUBLIBS) -lqutil -L$(QTDIR)/lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+INCPATH = -I../shared -I../util
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+LIBS = $(SUBLIBS) ../util/libqutil.la $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.2 2001/02/06 09:26:17 skrll Exp $
####### Target
-DESTDIR = $(QTDIR)/bin/
-+DESTDIR =
++DESTDIR =
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
diff --git a/x11/qt2-libs/patches/patch-ah b/x11/qt2-libs/patches/patch-ah
index 1caa55b834d..5040ad36ea8 100644
--- a/x11/qt2-libs/patches/patch-ah
+++ b/x11/qt2-libs/patches/patch-ah
@@ -1,14 +1,14 @@
-$NetBSD: patch-ah,v 1.2 2001/02/06 09:26:17 skrll Exp $
+$NetBSD: patch-ah,v 1.3 2001/06/17 19:10:39 drochner Exp $
---- tools/designer/uic/Makefile.in.orig Thu Feb 1 02:29:51 2001
-+++ tools/designer/uic/Makefile.in
+--- tools/designer/uic/Makefile.in.orig Wed Jun 13 10:57:08 2001
++++ tools/designer/uic/Makefile.in Fri Jun 15 20:38:51 2001
@@ -6,15 +6,15 @@
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) -DUIC
-INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
--LIBS = $(SUBLIBS) -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil -L../lib $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+INCPATH = -I../shared -I../util
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+LIBS = $(SUBLIBS) ../util/libqutil.la $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -18,7 +18,7 @@ $NetBSD: patch-ah,v 1.2 2001/02/06 09:26:17 skrll Exp $
####### Target
-DESTDIR = $(QTDIR)/bin/
-+DESTDIR =
++DESTDIR =
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
diff --git a/x11/qt2-libs/patches/patch-aj b/x11/qt2-libs/patches/patch-aj
index 4b255c398b2..3cf53398ec2 100644
--- a/x11/qt2-libs/patches/patch-aj
+++ b/x11/qt2-libs/patches/patch-aj
@@ -1,14 +1,14 @@
-$NetBSD: patch-aj,v 1.1 2001/03/28 09:27:51 skrll Exp $
+$NetBSD: patch-aj,v 1.2 2001/06/17 19:10:39 drochner Exp $
---- tools/designer/uic/Makefile-kde.in.orig Mon Mar 5 18:12:53 2001
-+++ tools/designer/uic/Makefile-kde.in
+--- tools/designer/uic/Makefile-kde.in.orig Wed Jun 13 10:57:07 2001
++++ tools/designer/uic/Makefile-kde.in Fri Jun 15 20:43:34 2001
@@ -6,15 +6,15 @@
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DUIC -DHAVE_KDE
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) -DUIC -DHAVE_KDE
-INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib -I$(KDEDIR)/include
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
--LIBS = $(SUBLIBS) -lqutil -L../lib -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil -L../lib -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+INCPATH = -I../shared -I../util -I$(KDEDIR)/include
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+LIBS = $(SUBLIBS) ../util/libqutil.la -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -18,7 +18,7 @@ $NetBSD: patch-aj,v 1.1 2001/03/28 09:27:51 skrll Exp $
####### Target
-DESTDIR = $(QTDIR)/bin/
-+DESTDIR =
++DESTDIR =
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
diff --git a/x11/qt2-libs/patches/patch-ak b/x11/qt2-libs/patches/patch-ak
index 3270f9b8e3c..11f9671b1ba 100644
--- a/x11/qt2-libs/patches/patch-ak
+++ b/x11/qt2-libs/patches/patch-ak
@@ -1,14 +1,14 @@
-$NetBSD: patch-ak,v 1.1 2001/03/28 09:27:51 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2001/06/17 19:10:39 drochner Exp $
---- tools/designer/designer/Makefile-kde.in.orig Mon Mar 5 18:12:52 2001
-+++ tools/designer/designer/Makefile-kde.in
+--- tools/designer/designer/Makefile-kde.in.orig Wed Jun 13 10:57:06 2001
++++ tools/designer/designer/Makefile-kde.in Fri Jun 15 20:48:20 2001
@@ -6,15 +6,15 @@
CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DDESIGNER -DHAVE_KDE
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) -DDESIGNER -DHAVE_KDE
-INCPATH = -I../shared -I../util -I../../../src/3rdparty/zlib -I$(KDEDIR)/include
-LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
--LIBS = $(SUBLIBS) -lqutil -L$(QTDIR)/lib -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+-LIBS = $(SUBLIBS) -L$(QTDIR)/lib -lqutil -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
+INCPATH = -I../shared -I../util -I$(KDEDIR)/include
+LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
+LIBS = $(SUBLIBS) ../util/libqutil.la -L$(KDEDIR)/lib -lkdecore -lkdeui -lDCOP $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -19,7 +19,7 @@ $NetBSD: patch-ak,v 1.1 2001/03/28 09:27:51 skrll Exp $
####### Target
-DESTDIR = $(QTDIR)/bin/
-+DESTDIR =
++DESTDIR =
VER_MAJ = 1
VER_MIN = 0
VER_PATCH = 0
diff --git a/x11/qt2/Makefile.common b/x11/qt2/Makefile.common
index 4fe14a31a4b..60b2d6dc69f 100644
--- a/x11/qt2/Makefile.common
+++ b/x11/qt2/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.4 2001/03/23 18:09:33 drochner Exp $
+# $NetBSD: Makefile.common,v 1.5 2001/06/17 19:10:37 drochner Exp $
#
-QTVERSION= 2.3.0
+QTVERSION= 2.3.1
MAINTAINER= skrll@netbsd.org
HOMEPAGE= http://www.trolltech.com/products/qt.html
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 20:49:22 +0000