From d6599854a591e35b51b818fb8f926a482c9f6a37 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 10 Sep 2004 15:43:51 +0000 Subject: update to 2.2 changes: added dialog for tab-focus order, file generation separate for sources and .dlg file avoid the X11R6/libXft trap update some C++ for gcc-3.3 This should fix the build errors seen in bulk builds --- x11/qtarch/Makefile | 10 +++++----- x11/qtarch/distinfo | 12 +++++++----- x11/qtarch/patches/patch-aa | 33 ++++++++++++++++++--------------- x11/qtarch/patches/patch-ab | 4 ++-- x11/qtarch/patches/patch-ac | 12 ++++++++++++ x11/qtarch/patches/patch-ad | 31 +++++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 x11/qtarch/patches/patch-ac create mode 100644 x11/qtarch/patches/patch-ad (limited to 'x11/qtarch') diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile index 9c142ec9a1c..ea07eb391f9 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.22 2004/04/28 00:05:24 snj Exp $ +# $NetBSD: Makefile,v 1.23 2004/09/10 15:43:51 drochner Exp $ # -DISTNAME= qtarch-2.1-1 -PKGNAME= qtarch-2.1 -PKGREVISION= 1 +DISTNAME= qtarch-2.2-1 +PKGNAME= qtarch-2.2 CATEGORIES= x11 devel -MASTER_SITES= ftp://qtarch.sourceforge.net/pub/qtarch/ +#MASTER_SITES= ftp://qtarch.sourceforge.net/pub/qtarch/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qtarch/} MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://qtarch.sourceforge.net/ diff --git a/x11/qtarch/distinfo b/x11/qtarch/distinfo index 642865a01c1..d5a2c978c7b 100644 --- a/x11/qtarch/distinfo +++ b/x11/qtarch/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/12/24 17:06:55 jmc Exp $ +$NetBSD: distinfo,v 1.4 2004/09/10 15:43:51 drochner Exp $ -SHA1 (qtarch-2.1-1.tar.gz) = 44e38d1a671711802710a5213f781778123181d6 -Size (qtarch-2.1-1.tar.gz) = 826401 bytes -SHA1 (patch-aa) = 7f1624966cc8101599cb7cd6f0fee6cbd74ffdf7 -SHA1 (patch-ab) = 7a08349ef0d0e5fa1cba2ffb0c957002f3de677d +SHA1 (qtarch-2.2-1.tar.gz) = a8edd71e94a952d0136af286589069f0f39ea883 +Size (qtarch-2.2-1.tar.gz) = 811809 bytes +SHA1 (patch-aa) = 2a4ec961e4d525292d808e7d5190357295ed782b +SHA1 (patch-ab) = b451cc0ef2e081d7ec076b3aa537c9fe2f55f55c +SHA1 (patch-ac) = e12ba04ff38e58e024669bbf42a24f516679c357 +SHA1 (patch-ad) = 40b414f729477ff193bfc188842becaf58666e9d diff --git a/x11/qtarch/patches/patch-aa b/x11/qtarch/patches/patch-aa index e21a9c19ee5..c39a8954c9b 100644 --- a/x11/qtarch/patches/patch-aa +++ b/x11/qtarch/patches/patch-aa @@ -1,37 +1,40 @@ -$NetBSD: patch-aa,v 1.3 2001/12/24 17:06:56 jmc Exp $ +$NetBSD: patch-aa,v 1.4 2004/09/10 15:43:51 drochner Exp $ ---- Makefile.common.orig Tue May 16 03:13:20 2000 -+++ Makefile.common Mon Dec 24 16:42:11 2001 -@@ -15,22 +15,24 @@ - # -Wconversion -Wno-overloaded-virtual +--- Makefile.common.orig 2001-03-20 20:58:29.000000000 +0100 ++++ Makefile.common +@@ -19,10 +19,10 @@ INCDIR = -I$(QTDIR)/include -I$(TOPDIR) ifdef BUILD_RELEASE --CFLAGS = -O2 -fno-strength-reduce -W -Wall -pipe -+CFLAGS = -O2 -fno-strength-reduce -W -Wall -pipe -D__unix__ + CFLAGS = -DQTARCH_VERSION=\"$(VERSION)-$(RELEASE)\" \ +- -O2 -fno-strength-reduce -W -Wall -pipe -rdynamic ++ -O2 -fno-strength-reduce -W -Wall -pipe -rdynamic -D__unix__ else --CFLAGS = -g -Wall -W -pipe #-DQT_NO_COMPAT -+CFLAGS = -g -Wall -W -pipe -D__unix__ #-DQT_NO_COMPAT + CFLAGS = -DQTARCH_VERSION=\"$(VERSION)-$(RELEASE)\" \ +- -g -Wall -W -pipe -rdynamic #-DQT_NO_COMPAT ++ -g -Wall -W -pipe -rdynamic -D__unix__ #-DQT_NO_COMPAT endif # Flags used by the C Compiler (not the c++ compiler) - C_FLAGS = -O2 -Ixmltok -Ixmlparse -DXML_NS +@@ -32,14 +32,16 @@ else + C_FLAGS = -g -Wall -W -pipe -Ixmltok -Ixmlparse -DXML_NS + endif -LFLAGS = -g -L$(QTDIR)/lib \ -+LFLAGS = -g -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib \ ++LFLAGS = ${LDFLAGS} -g -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib \ widget/libwidget.a \ prop/libprop.a \ bmp/libbmp.a \ layout/liblayout.a \ pixmap/libpixmap.a \ xml/libqtarchxml.a \ -- -lfl -lqt -ldl -+ -lfl -lqt \ +- -lfl -lqt -rdynamic -ldl ++ -lfl -lqt -rdynamic \ + -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \ -+ -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz -lstdc++ ++ -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz -lstdc++ # -lfl -lqt -rdynamic $(HOME)/tmp/ccmalloc-0.2.3/src/libccmalloc.a -ldl ARFLAGS = -crs -@@ -39,7 +41,7 @@ +@@ -48,7 +50,7 @@ CC = g++ AR = ar FLEX = flex MAKE = gmake diff --git a/x11/qtarch/patches/patch-ab b/x11/qtarch/patches/patch-ab index 9bf2d60d337..a37036779cc 100644 --- a/x11/qtarch/patches/patch-ab +++ b/x11/qtarch/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2000/10/19 08:04:58 skrll Exp $ +$NetBSD: patch-ab,v 1.3 2004/09/10 15:43:51 drochner Exp $ --- bmp/Makefile.orig Fri Apr 28 02:41:56 2000 +++ bmp/Makefile @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.2 2000/10/19 08:04:58 skrll Exp $ qembed: qembed.o - $(CC) qembed.o -o qembed -Wall -L$(QTDIR)/lib -lqt -+ $(CC) qembed.o -o qembed -Wall -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt \ ++ $(CC) ${LDFLAGS} qembed.o -o qembed -Wall -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt \ + -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \ + -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz diff --git a/x11/qtarch/patches/patch-ac b/x11/qtarch/patches/patch-ac new file mode 100644 index 00000000000..85f3788d156 --- /dev/null +++ b/x11/qtarch/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2004/09/10 15:43:51 drochner Exp $ + +--- TabOrderDialog.h.orig 2004-09-10 15:28:26.000000000 +0200 ++++ TabOrderDialog.h +@@ -78,6 +78,6 @@ private: // Attributes + WidgetFrame *widgetFrame; + QWidget *frameOverlay; + +- friend Overlay; ++ friend class Overlay; + }; + #endif // TabOrderDialog_included diff --git a/x11/qtarch/patches/patch-ad b/x11/qtarch/patches/patch-ad new file mode 100644 index 00000000000..887ddcadc36 --- /dev/null +++ b/x11/qtarch/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.1 2004/09/10 15:43:51 drochner Exp $ + +--- appconf.cpp.orig 2004-09-10 15:30:46.000000000 +0200 ++++ appconf.cpp +@@ -1246,7 +1246,7 @@ FileConfig::FileConfig(const char *szFil + ifstream inpStream; + if ( !bLocalOnly ) { + m_szFullFileName = GlobalConfigFile(); +- inpStream.open(m_szFullFileName, ios::in | ios::nocreate); ++ inpStream.open(m_szFullFileName, ios::in); + if ( inpStream ) { + m_bParsingLocal = FALSE; + m_bOk = readStream(&inpStream); +@@ -1260,7 +1260,7 @@ FileConfig::FileConfig(const char *szFil + // ------------------------ + m_szFullFileName = LocalConfigFile(); + if ( m_szFullFileName != NULL ) { +- inpStream.open(m_szFullFileName, ios::in | ios::nocreate); ++ inpStream.open(m_szFullFileName, ios::in); + if ( inpStream ) { + m_bParsingLocal = TRUE; + if ( readStream(&inpStream) ) { +@@ -1308,7 +1308,7 @@ FileConfig::readFile(const char *szFileN + strcpy(m_szFileName, szFileName); + + m_szFullFileName = m_szFileName; +- inpStream.open(m_szFullFileName, ios::in | ios::nocreate); ++ inpStream.open(m_szFullFileName, ios::in); + if ( inpStream ) { + m_bParsingLocal = TRUE; + if ( readStream(&inpStream) ) { -- cgit v1.2.3