summaryrefslogtreecommitdiff
path: root/x11/qtarch/patches/patch-ab
diff options
context:
space:
mode:
authorskrll <skrll>2000-10-19 08:04:57 +0000
committerskrll <skrll>2000-10-19 08:04:57 +0000
commit801173a5754b638ee130fb3bb542bcebf10433a3 (patch)
treef0ae5d211bc3b9c660bc172576d63e5111ae7a25 /x11/qtarch/patches/patch-ab
parentf401f6488626e8e2409dee7f641b5162fee35f79 (diff)
downloadpkgsrc-801173a5754b638ee130fb3bb542bcebf10433a3.tar.gz
Use the new qt-2.2.1 libraries.
Update to version 2.1. Changes are XML File Formats XML is used for all files formats. The previous file format is still loaded. However, only XML is saved. The previous format may be dropped in a latter release. Code Generation The following code generation changes were made: * Special character values, like new lines and tabs, are escaped in the generated code. Widgets The following widgets were added: * QHGroupBox * QIconView * QVGroupBox As usual the properties for all the widgets were updated. Properties which were marked as obsolete were removed. In a future release, qtarch will support compiling with the QT_NO_COMPAT flag.
Diffstat (limited to 'x11/qtarch/patches/patch-ab')
-rw-r--r--x11/qtarch/patches/patch-ab35
1 files changed, 13 insertions, 22 deletions
diff --git a/x11/qtarch/patches/patch-ab b/x11/qtarch/patches/patch-ab
index 830df3e0ffc..9bf2d60d337 100644
--- a/x11/qtarch/patches/patch-ab
+++ b/x11/qtarch/patches/patch-ab
@@ -1,24 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/28 20:31:44 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2000/10/19 08:04:58 skrll Exp $
---- Makefile.common.orig Mon Oct 4 03:24:17 1999
-+++ Makefile.common Fri Apr 28 21:41:31 2000
-@@ -19,14 +19,17 @@
- else
- CFLAGS = -g -Wall -W -pipe
- endif
-+CFLAGS+= -D__unix__
+--- bmp/Makefile.orig Fri Apr 28 02:41:56 2000
++++ bmp/Makefile
+@@ -95,7 +95,9 @@
+ include ../Makefile.common
--LFLAGS = -rdynamic -g -L$(QTDIR)/lib \
-+LFLAGS = -g -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib \
- widget/libwidget.a \
- prop/libprop.a \
- bmp/libbmp.a \
- layout/liblayout.a \
- pixmap/libpixmap.a \
-- -lfl -lqt -lstdc++ -ldl -rdynamic
-+ -lfl -lqt \
-+ -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
-+ -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz -lstdc++
- ARFLAGS = -crs
- CC = g++
- AR = ar
+ 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 \
++ -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
++ -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz
+
+ $(BMPSOURCE): $(BMPS) qembed
+ ./qembed $(BMPHEADER) $(BMPSOURCE) $(BMPS)