cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In mt mode, rename libqui -> libqui-mt

Browse Source 
qt-mt is now tested, one could say...
This commit is contained in:
espie 2003-02-09 19:17:32 +00:00
parent 09aa6e92e7
commit 0530a5ef91
9 changed files with 83 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/qt3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2003/01/09 23:06:30 espie Exp $
# $OpenBSD: Makefile,v 1.26 2003/02/09 19:17:32 espie Exp $
# $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
COMMENT= C++ X11 GUI toolkit
@ -57,7 +57,7 @@ CONFIGURE_ARGS= -qt-gif -system-libmng -system-libpng -system-libjpeg \
MULTI_PACKAGES+=-base -html
.if ${FLAVOR:L:Mmt}
FULLPKGNAME= qt3-mt-${VERSION}
FULLPKGNAME= qt3-mt-${VERSION}p0
CONFIGURE_ARGS+=-thread
ALL_TARGET=sub-src sub-tools
.else
@ -156,7 +156,7 @@ PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig
.if ${FLAVOR:L:Mmt}
MT_SUFX=-mt
LIBRARIES=qt${MT_SUFX}.so.3.11
LIBRARIES=qt${MT_SUFX}.so.3.11 qui${MT_SUFX}.so.1.0
post-patch:
-rm -rf ${WRKSRC}/examples

15
x11/qt3/patches/patch-tools_designer_app_app_pro Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-tools_designer_app_app_pro,v 1.1 2003/02/09 19:17:32 espie Exp $
--- tools/designer/app/app.pro.orig Sun Feb 9 15:37:11 2003
+++ tools/designer/app/app.pro Sun Feb 9 15:38:33 2003
@@ -5,7 +5,10 @@ CONFIG -= moc
SOURCES += main.cpp
INCLUDEPATH += ../designer
-unix:LIBS += -ldesigner -lqui -lqassistantclient -L$$QT_BUILD_TREE/lib
+
+unix:thread:LIBS += -ldesigner -lqui-mt -lqassistantclient -L$$QT_BUILD_TREE/lib
+unix:!thread:LIBS += -ldesigner -lqui -lqassistantclient -L$$QT_BUILD_TREE/lib
+
win32 {
RC_FILE = designer.rc
LIBS += $$QT_BUILD_TREE/lib/designerlib.lib

14
x11/qt3/patches/patch-tools_designer_designer_designer_pro
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-tools_designer_designer_designer_pro,v 1.1 2003/01/19 17:36:51 espie Exp $
$OpenBSD: patch-tools_designer_designer_designer_pro,v 1.2 2003/02/09 19:17:32 espie Exp $
--- tools/designer/designer/designer.pro.orig Tue Nov 26 15:39:41 2002
+++ tools/designer/designer/designer.pro Sun Jan 19 16:00:29 2003
+++ tools/designer/designer/designer.pro Sun Feb 9 18:49:53 2003
@@ -16,6 +16,11 @@ DEFINES += QT_INTERNAL_ICONVIEW
DEFINES += QT_INTERNAL_TABLE
table:win32-msvc:DEFINES+=QM_TEMPLATE_EXTERN_TABLE=extern
@ -13,3 +13,13 @@ $OpenBSD: patch-tools_designer_designer_designer_pro,v 1.1 2003/01/19 17:36:51 e
include( ../../../src/qt_professional.pri )
SOURCES += command.cpp \
@@ -411,7 +416,8 @@ table {
INCLUDEPATH += ../shared ../uilib
win32:LIBS += $$QT_BUILD_TREE/lib/qui.lib $$QT_BUILD_TREE/lib/qassistantclient.lib
-unix:LIBS += -L$$QT_BUILD_TREE/lib -lqui -lqassistantclient
+unix:thread:LIBS += -L$$QT_BUILD_TREE/lib -lqui-mt -lqassistantclient
+unix:!thread:LIBS += -L$$QT_BUILD_TREE/lib -lqui -lqassistantclient
TRANSLATIONS = designer_de.ts designer_fr.ts

12
x11/qt3/patches/patch-tools_designer_examples_receiver1_receiver_pro Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tools_designer_examples_receiver1_receiver_pro,v 1.1 2003/02/09 19:17:32 espie Exp $
--- tools/designer/examples/receiver1/receiver.pro.orig Sun Feb 9 18:50:40 2003
+++ tools/designer/examples/receiver1/receiver.pro Sun Feb 9 18:50:51 2003
@@ -6,6 +6,7 @@ TEMPLATE =app
CONFIG += qt warn_on release
INCLUDEPATH += $$QT_SOURCE_TREE/tools/designer/uilib
win32:LIBS += $$QT_BUILD_TREE/lib/qui.lib
-unix:LIBS += -lqui
+unix:thread:LIBS += -lqui-mt
+unix:!thread:LIBS += -lqui
DBFILE = receiver.db
LANGUAGE = C++

13
x11/qt3/patches/patch-tools_designer_examples_receiver2_receiver_pro Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-tools_designer_examples_receiver2_receiver_pro,v 1.1 2003/02/09 19:17:32 espie Exp $
--- tools/designer/examples/receiver2/receiver.pro.orig Sun Feb 9 18:50:59 2003
+++ tools/designer/examples/receiver2/receiver.pro Sun Feb 9 18:51:12 2003
@@ -6,7 +6,8 @@ TEMPLATE =app
CONFIG += qt warn_on release
INCLUDEPATH += $$QT_SOURCE_TREE/tools/designer/uilib
win32:LIBS += $$QT_BUILD_TREE/lib/qui.lib
-unix:LIBS += -lqui
+unix:thread:LIBS += -lqui-mt
+unix:!thread:LIBS += -lqui
DBFILE = receiver.db
IMAGEFILE = images.cpp
LANGUAGE = C++

11
x11/qt3/patches/patch-tools_designer_uilib_test_test_pro Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-tools_designer_uilib_test_test_pro,v 1.1 2003/02/09 19:17:32 espie Exp $
--- tools/designer/uilib/test/test.pro.orig Sun Feb 9 18:50:16 2003
+++ tools/designer/uilib/test/test.pro Sun Feb 9 18:50:26 2003
@@ -3,5 +3,6 @@ CONFIG += qt warn_on release
HEADERS =
SOURCES = main.cpp
TARGET = test
-unix:LIBS += -lqui -L$$QT_BUILD_TREE/lib
+unix:thread:LIBS += -lqui-mt -L$$QT_BUILD_TREE/lib
+unix:!thread:LIBS += -lqui -L$$QT_BUILD_TREE/lib
win32:LIBS += $$QT_BUILD_TREE/lib/qui.lib

14
x11/qt3/patches/patch-tools_designer_uilib_uilib_pro Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tools_designer_uilib_uilib_pro,v 1.1 2003/02/09 19:17:32 espie Exp $
--- tools/designer/uilib/uilib.pro.orig Mon Dec 2 10:49:45 2002
+++ tools/designer/uilib/uilib.pro Sun Feb 9 18:22:54 2003
@@ -15,7 +15,9 @@ sql:HEADERS += ../designer/database2.
DEFINES += QT_INTERNAL_XML
!win32-borland:DEFINES += Q_TEMPLATE_EXTERN=extern
include( ../../../src/qt_professional.pri )
-TARGET = qui
+!thread:TARGET = qui
+thread:TARGET = qui-mt
+
INCLUDEPATH += ../shared
DESTDIR = ../../../lib
VERSION = 1.0.0

2
x11/qt3/pkg/DESCR
View File

@ -32,5 +32,3 @@ Warning: the qt3 library also appears under ${PREFIX}/lib, but you
${PREFIX}/lib may also contain a later incarnation of qt, in which case
the linker will pick up the most recent library.
The qt packages currently do not include mt versions of qt, because of
insufficient testing.

4
x11/qt3/pkg/PLIST-mt
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-mt,v 1.5 2003/01/06 06:22:53 espie Exp $
@comment $OpenBSD: PLIST-mt,v 1.6 2003/02/09 19:17:33 espie Exp $
bin/assistant-mt
bin/designer3-mt
bin/findtr3-mt
@ -26,7 +26,9 @@ lib/qt3/bin-mt/qtconfig
lib/qt3/bin-mt/qtrename140
lib/qt3/bin-mt/uic
lib/libqt-mt.so.3.11
lib/libqui-mt.so.1.0
lib/qt3/libqt-mt.so.3.11
lib/qt3/libqui-mt.so.1.0
lib/qt3/plugins-mt/designer/libcppeditor.so
lib/qt3/plugins-mt/designer/libdlgplugin.so
lib/qt3/plugins-mt/designer/librcplugin.so