qcad: fix runtime to use shared libraries

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: qcad: fix runtime to use shared libraries
From: Iain Hibbert <plunky%netbsd.org@localhost>
Date: Sun, 31 Jul 2016 10:18:48 +0000
Module Name:	pkgsrc-wip
Committed By:	Iain Hibbert <plunky%netbsd.org@localhost>
Pushed By:	plunky
Date:		Sun Jul 31 11:18:48 2016 +0100
Changeset:	9588a3d85fa8a650c75bee483bff29408bd4cce6

Modified Files:
	qcad/Makefile
	qcad/PLIST
	qcad/TODO
	qcad/distinfo
Added Files:
	qcad/patches/patch-shared.pri
	qcad/patches/patch-shared__app.pri
	qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro
	qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
	qcad/patches/patch-src_3rdparty_opennurbs_zlib_zlib.pro
	qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro
	qcad/patches/patch-src_core_core.pro
	qcad/patches/patch-src_customwidgets_customwidgets.pro
	qcad/patches/patch-src_entity_entity.pro
	qcad/patches/patch-src_grid_grid.pro
	qcad/patches/patch-src_gui_gui.pro
	qcad/patches/patch-src_io_dxf_dxf.pro
	qcad/patches/patch-src_operations_operations.pro
	qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro
	qcad/patches/patch-src_snap_snap.pro
	qcad/patches/patch-src_spatialindex_spatialindex.pro
	qcad/patches/patch-src_stemmer_stemmer.pro
	qcad/patches/patch-src_zip_zip.pro
	qcad/patches/patch-support_examples_exampleplugin_exampleplugin.pro
	qcad/patches/patch-support_examples_transactionlistener_transactionlistener.pro
Removed Files:
	qcad/patches/patch-src_3rdparty_quazip_quazip.pro
	qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro

Log Message:
qcad: fix runtime to use shared libraries

make all plugins and libraries into shared libraries

when linking, use the filename directly instead of -lfoo

update TODO with current status

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9588a3d85fa8a650c75bee483bff29408bd4cce6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qcad/Makefile                                      | 12 +++---
 qcad/PLIST                                         | 12 +++---
 qcad/TODO                                          | 22 +++--------
 qcad/distinfo                                      | 22 ++++++++++-
 qcad/patches/patch-shared.pri                      | 13 +++++++
 qcad/patches/patch-shared__app.pri                 | 44 ++++++++++++++++++++++
 qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro  | 11 ++++++
 ...-src_3rdparty_opennurbs_opennurbs_opennurbs.pro | 21 +++++++++++
 .../patch-src_3rdparty_opennurbs_zlib_zlib.pro     | 13 +++++++
 qcad/patches/patch-src_3rdparty_quazip_quazip.pro  | 20 ----------
 ...rdparty_spatialindexnavel_spatialindexnavel.pro | 20 ----------
 .../patches/patch-src_3rdparty_stemmer_stemmer.pro | 12 ++++++
 qcad/patches/patch-src_core_core.pro               | 14 +++++++
 .../patch-src_customwidgets_customwidgets.pro      | 13 +++++++
 qcad/patches/patch-src_entity_entity.pro           | 14 +++++++
 qcad/patches/patch-src_grid_grid.pro               | 10 +++++
 qcad/patches/patch-src_gui_gui.pro                 | 14 +++++++
 qcad/patches/patch-src_io_dxf_dxf.pro              | 23 +++++++++++
 qcad/patches/patch-src_operations_operations.pro   | 13 +++++++
 .../patch-src_scripting_ecmaapi_ecmaapi.pro        | 28 ++++++++++++++
 qcad/patches/patch-src_snap_snap.pro               | 14 +++++++
 .../patch-src_spatialindex_spatialindex.pro        | 13 +++++++
 qcad/patches/patch-src_stemmer_stemmer.pro         | 14 +++++++
 qcad/patches/patch-src_zip_zip.pro                 | 13 +++++++
 ...upport_examples_exampleplugin_exampleplugin.pro | 12 ++++++
 ...les_transactionlistener_transactionlistener.pro | 11 ++++++
 26 files changed, 357 insertions(+), 71 deletions(-)

diffs:
diff --git a/qcad/Makefile b/qcad/Makefile
index b9a8960..2f9f5ee 100644
--- a/qcad/Makefile
+++ b/qcad/Makefile
@@ -49,12 +49,12 @@ QCADLIBS=	libqcadcore.la \
 		libqcadspatialindex.la \
 		libqcadstemmer.la \
 		libqcadzip.la \
-		libdxflib.a \
-		libopennurbs.a \
-		libquazip.a \
-		libspatialindexnavel.a \
-		libstemmer.a \
-		libzlib.a
+		libdxflib.la \
+		libopennurbs.la \
+		libquazip.la \
+		libspatialindexnavel.la \
+		libstemmer.la \
+		libzlib.la
 
 QCADPLUGINS=	plugins/libqcaddxf.la \
 		plugins/libqcadexample.la \
diff --git a/qcad/PLIST b/qcad/PLIST
index c599a43..6dfbb31 100644
--- a/qcad/PLIST
+++ b/qcad/PLIST
@@ -1,7 +1,7 @@
 @comment $NetBSD$
 bin/qcad
-lib/libdxflib.a
-lib/libopennurbs.a
+lib/libdxflib.la
+lib/libopennurbs.la
 lib/libqcadcore.la
 lib/libqcadecmaapi.la
 lib/libqcadentity.la
@@ -12,10 +12,10 @@ lib/libqcadsnap.la
 lib/libqcadspatialindex.la
 lib/libqcadstemmer.la
 lib/libqcadzip.la
-lib/libquazip.a
-lib/libspatialindexnavel.a
-lib/libstemmer.a
-lib/libzlib.a
+lib/libquazip.la
+lib/libspatialindexnavel.la
+lib/libstemmer.la
+lib/libzlib.la
 lib/qcad/fonts/CourierCad.cxf
 lib/qcad/fonts/Cursive.cxf
 lib/qcad/fonts/Cyrillic_II.cxf
diff --git a/qcad/TODO b/qcad/TODO
index e9674a8..7adbd38 100644
--- a/qcad/TODO
+++ b/qcad/TODO
@@ -1,22 +1,10 @@
 
-The application starts ok and asks for initial setup (language, page size, units etc)
-but then at 70% initializing add-ons, showing AutoZoomView it fails:
+The application starts and seems to find the libraries/plugins ok now
 
-QCAD version  3.15.4.1
-Debug:    TIMER:  377000000 ns ( 377 ms )  -  "loading add-ons"
-Warning:  "QFormBuilder was unable to create a custom widget of the class 'RTextEdit'; defaulting to base class 'QTextBrowser'."
-Warning:  "QFormBuilder was unable to create a custom widget of the class 'RCommandLine'; defaulting to base class 'QLineEdit'."
-Warning:  RScriptHandlerEcma::eval: script engine exception:  "TypeError: Result of expression 'leCommand.commandConfirmed' [undefined] is not an object."
-Warning:  "<anonymous>()@/usr/pkg/lib/qcad/scripts/Widgets/CommandLine/CommandLine.js:181"
-Warning:  At least one uncaught exception:
-Warning:  "<anonymous>()@/usr/pkg/lib/qcad/scripts/Widgets/CommandLine/CommandLine.js:181"
-Debug:    "<global>() at -1"
+  -- some button images are missing, eg the back button
 
+  -- parts library not working
 
-I started it with the qcad -enable-script-debugger and it shows the same. It seems that
-leCommand is a QLineEdit object (should have been RCommandLine), and commandConfirmed is
-a signal provided by the RCommandLine class.
+  -- eventually crashed with an undefined symbol?
 
-I think this means that the library/plugins just haven't been libtooled and/or loaded correctly
-
-for some reason they are all .a files except for some of the plugins. I think they should be .so
+/usr/pkg/lib/qcad/plugins/libqcaddxf.so: Undefined PLT symbol "_ZN6DL_DxfC1Ev" (symnum = 1293)
diff --git a/qcad/distinfo b/qcad/distinfo
index 67445e7..0a20c20 100644
--- a/qcad/distinfo
+++ b/qcad/distinfo
@@ -5,9 +5,27 @@ RMD160 (qcad-3.15.4.1.zip) = 7deec07e81d17c3a80ef67314a53b650c7509ebb
 SHA512 (qcad-3.15.4.1.zip) = d3d9ae386920ec5102ab8c49c0a3967994dbae0b9b04b256d64ccd6fcf865ae3c26770204fec3c2feecddf91b4cfe12997fe9a975f5ccc78bb5c88c2012d0696
 Size (qcad-3.15.4.1.zip) = 37420623 bytes
 SHA1 (patch-qcad.1) = 74501775e11319b8385867c944f17c9dd67e3377
+SHA1 (patch-shared.pri) = d0d5c25bdf7edc9b50ba7613cf99ac8d6fba07e5
+SHA1 (patch-shared__app.pri) = aeb06a234698158be41be723939f8f740c6e4e24
+SHA1 (patch-src_3rdparty_dxflib_dxflib.pro) = aab80446ab63ef92d8ad8a759ace6c77bcf8da25
 SHA1 (patch-src_3rdparty_dxflib_src_dl__writer.h) = 21e99b53bcb964c9dc010a6013a5ed9f028738d2
-SHA1 (patch-src_3rdparty_quazip_quazip.pro) = 76f0f38b8e8ac8fc441685ae13a12f68385b5298
-SHA1 (patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro) = b641f00398fb4d7bc5c80c6597d23252b0667dec
+SHA1 (patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro) = bab84639eff58c1ea8de047b8654930e9f464ee5
+SHA1 (patch-src_3rdparty_opennurbs_zlib_zlib.pro) = 7675339a7e6c70e467292d706dac7b339c5e0753
+SHA1 (patch-src_3rdparty_stemmer_stemmer.pro) = 7a59a6ef56eb0e0866085ec0b01658bd54ce694b
 SHA1 (patch-src_core_RS.cpp) = 04677e154aff2906b20911b1e8c7a6e15546748a
 SHA1 (patch-src_core_RSettings.cpp) = a8f1d9c16c30c605f73239da1121c4d997625032
+SHA1 (patch-src_core_core.pro) = c2515355a7ad7092dfaa7efc42cf0661e77cd4db
+SHA1 (patch-src_customwidgets_customwidgets.pro) = c27f13b9a2f8a34524d00c1aabc4e15a9238956d
+SHA1 (patch-src_entity_entity.pro) = 6ca9d8a80622b3546cc1daff2247b414b4742644
+SHA1 (patch-src_grid_grid.pro) = 7c93037629969c51359fbca01237fa738394fb88
+SHA1 (patch-src_gui_gui.pro) = 80a5682c2ae81bbb263f9c427df28d2158a19506
+SHA1 (patch-src_io_dxf_dxf.pro) = f29d25ca0c2bf9acd199404665dc3c7c8c3b70e2
+SHA1 (patch-src_operations_operations.pro) = 6e7abb80a316dca48ae10ed301fd6553e187ef80
 SHA1 (patch-src_run_run.pri) = 10f94e46c743e92dd8518bd5bd1ddadb4104a212
+SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 44430db964f3bad655aa4821743431a03a76eec4
+SHA1 (patch-src_snap_snap.pro) = bb89c208dec5f536ade905f4c659c029df8d656d
+SHA1 (patch-src_spatialindex_spatialindex.pro) = 7c6d3173e5a54391cd3076ab4c5aee4b3fbef85a
+SHA1 (patch-src_stemmer_stemmer.pro) = 1c0c47f80db2201ccadae1a232d860f7809b9a84
+SHA1 (patch-src_zip_zip.pro) = 5db611164407b69e08278d4ee510c117b4b1d72f
+SHA1 (patch-support_examples_exampleplugin_exampleplugin.pro) = 03c92a88d6391dcc933eb860fbd2c5cafaf8a4a0
+SHA1 (patch-support_examples_transactionlistener_transactionlistener.pro) = 48d611fb49d55087be8f8a3d603d44156f7f6fb7
diff --git a/qcad/patches/patch-shared.pri b/qcad/patches/patch-shared.pri
new file mode 100644
index 0000000..ace6824
--- /dev/null
+++ b/qcad/patches/patch-shared.pri
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- shared.pri.orig	2016-07-01 07:13:14.000000000 +0000
++++ shared.pri
+@@ -158,8 +158,6 @@ QMAKE_TARGET_PRODUCT = QCAD Application
+ DESTDIR = $$PWD/$$ROUTDIR
+ UI_DIR = .ui
+
+-LIBS += -L$$PWD/$$ROUTDIR
+-
+ CONFIG(debug, debug|release) {
+     !win32 {
+         QMAKE_LFLAGS += -rdynamic
diff --git a/qcad/patches/patch-shared__app.pri b/qcad/patches/patch-shared__app.pri
new file mode 100644
index 0000000..f05f99b
--- /dev/null
+++ b/qcad/patches/patch-shared__app.pri
@@ -0,0 +1,44 @@
+$NetBSD$
+
+--- shared_app.pri.orig	2016-07-01 07:13:14.000000000 +0000
++++ shared_app.pri
+@@ -1,24 +1,24 @@
+ include($$PWD/shared.pri)
+
+ LIBS += \
+-    -l$${RLIBNAME}ecmaapi \
+-    -l$${RLIBNAME}gui \
+-    -l$${RLIBNAME}entity \
+-    -l$${RLIBNAME}operations \
+-    -l$${RLIBNAME}spatialindex \
+-    -lspatialindexnavel \
+-    -l$${RLIBNAME}grid \
+-    -l$${RLIBNAME}snap \
+-    -l$${RLIBNAME}core \
+-    -l$${RLIBNAME}stemmer \
+-    -lstemmer \
+-    -l$${RLIBNAME}zip \
+-    -lquazip
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}ecmaapi$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}gui$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}entity$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}operations$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}spatialindex$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}spatialindexnavel$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}grid$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}snap$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}stemmer$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}stemmer$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}$${RLIBNAME}zip$${RLIBPOSTDLL} \
++    $${DESTDIR}/$${RLIBPRE}quazip$${RLIBPOSTDLL}
+
+ !r_no_opennurbs {
+     LIBS += \
+-        -lopennurbs \
+-        -lzlib
++        $${DESTDIR}/$${RLIBPRE}opennurbs$${RLIBPOSTDLL} \
++        $${DESTDIR}/$${RLIBPRE}zlib$${RLIBPOSTDLL}
+ }
+
+ win32 {
diff --git a/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro b/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro
new file mode 100644
index 0000000..10c460b
--- /dev/null
+++ b/qcad/patches/patch-src_3rdparty_dxflib_dxflib.pro
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- src/3rdparty/dxflib/dxflib.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/3rdparty/dxflib/dxflib.pro
+@@ -25,5 +25,5 @@ SOURCES = \
+
+ TARGET = dxflib
+ TEMPLATE = lib
+-CONFIG += staticlib
++CONFIG += plugin
+ DEFINES += DXFLIB_LIBRARY
diff --git a/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro b/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
new file mode 100644
index 0000000..568e6d7
--- /dev/null
+++ b/qcad/patches/patch-src_3rdparty_opennurbs_opennurbs_opennurbs.pro
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/3rdparty/opennurbs/opennurbs/opennurbs.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/3rdparty/opennurbs/opennurbs/opennurbs.pro
+@@ -218,14 +218,8 @@ HEADERS += \
+
+ TARGET = opennurbs
+ TEMPLATE = lib
+-CONFIG += staticlib
+-CONFIG(release, debug|release) {
+-    LIBS += -L../zlib/release
+-}
+-else {
+-    LIBS += -L../zlib/debug
+-}
+-LIBS += -lzlib
++CONFIG += plugin
++LIBS += ../../../../$${ROUTDIR}/$${RLIBPRE}zlib$${RLIBPOSTDLL}
+ win32 {
+     #DEFINES += ON_DLL_EXPORTS ON_COMPILING_OPENNURBS NDEBUG
+     DEFINES += ON_COMPILING_OPENNURBS NDEBUG
diff --git a/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zlib.pro b/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zlib.pro
new file mode 100644
index 0000000..ed93526
--- /dev/null
+++ b/qcad/patches/patch-src_3rdparty_opennurbs_zlib_zlib.pro
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/3rdparty/opennurbs/zlib/zlib.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/3rdparty/opennurbs/zlib/zlib.pro
+@@ -27,7 +27,7 @@ HEADERS += \
+
+ TARGET = zlib
+ TEMPLATE = lib
+-CONFIG += staticlib
++CONFIG += plugin
+ #win32 {
+ #    LIBS += -lRpcrt4 -lAdvapi32
+ #}
diff --git a/qcad/patches/patch-src_3rdparty_quazip_quazip.pro b/qcad/patches/patch-src_3rdparty_quazip_quazip.pro
deleted file mode 100644
index 25fa9b8..0000000
--- a/qcad/patches/patch-src_3rdparty_quazip_quazip.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-libtool won't install libraries depending on this when it is a plugin
-
---- src/3rdparty/quazip/quazip.pro.orig	2016-06-30 12:42:57.000000000 +0000
-+++ src/3rdparty/quazip/quazip.pro
-@@ -2,12 +2,7 @@ include( ../../../shared.pri )
-
- TARGET = quazip
- TEMPLATE = lib
--r_static_libs {
--    CONFIG += staticlib
--}
--else {
--    CONFIG += plugin
--}
-+CONFIG += staticlib
-
- CONFIG -= warn_on
- CONFIG += warn_off
diff --git a/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro b/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro
deleted file mode 100644
index 50c4a11..0000000
--- a/qcad/patches/patch-src_3rdparty_spatialindexnavel_spatialindexnavel.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-libtool won't install libraries depending on this when it is a plugin
-
---- src/3rdparty/spatialindexnavel/spatialindexnavel.pro.orig	2016-06-30 12:42:57.000000000 +0000
-+++ src/3rdparty/spatialindexnavel/spatialindexnavel.pro
-@@ -2,12 +2,7 @@ include( ../../../shared.pri )
-
- TARGET = spatialindexnavel
- TEMPLATE = lib
--r_static_libs {
--    CONFIG += staticlib
--}
--else {
--    CONFIG += plugin
--}
-+CONFIG += staticlib
-
- # this is required to compile the spatial index library from navel ltd:
- #DEFINES += PACKAGE_BUGREPORT=\\\"mhadji%gmail.com@localhost\\\"
diff --git a/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro b/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro
new file mode 100644
index 0000000..bc7b0d5
--- /dev/null
+++ b/qcad/patches/patch-src_3rdparty_stemmer_stemmer.pro
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/3rdparty/stemmer/stemmer.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/3rdparty/stemmer/stemmer.pro
+@@ -44,5 +44,5 @@ HEADERS += \
+
+ TARGET = stemmer
+ TEMPLATE = lib
+-CONFIG += staticlib
+-#CONFIG += plugin
++#CONFIG += staticlib
++CONFIG += plugin
diff --git a/qcad/patches/patch-src_core_core.pro b/qcad/patches/patch-src_core_core.pro
new file mode 100644
index 0000000..5d3b41c
--- /dev/null
+++ b/qcad/patches/patch-src_core_core.pro
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/core/core.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/core/core.pro
+@@ -282,7 +282,8 @@ RESOURCES = resources/core.qrc
+ OTHER_FILES += core.dox math/math.dox
+ DEFINES += QCADCORE_LIBRARY
+
+-LIBS += -lopennurbs -lzlib
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}opennurbs$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}zlib$${RLIBPOSTDLL}
+
+ win32 {
+     LIBS += -lRpcrt4 -lAdvapi32
diff --git a/qcad/patches/patch-src_customwidgets_customwidgets.pro b/qcad/patches/patch-src_customwidgets_customwidgets.pro
new file mode 100644
index 0000000..01d051a
--- /dev/null
+++ b/qcad/patches/patch-src_customwidgets_customwidgets.pro
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/customwidgets/customwidgets.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/customwidgets/customwidgets.pro
+@@ -36,6 +36,7 @@ HEADERS = RShortcutLineEditPlugin.h \
+ #    HEADERS += RWebViewPlugin.h
+ #}
+ TEMPLATE = lib
+-LIBS += -l$${RLIBNAME}gui -l$${RLIBNAME}core
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}gui$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL}
+ DESTDIR = ../../plugins/designer
+ OTHER_FILES += customwidgets.dox
diff --git a/qcad/patches/patch-src_entity_entity.pro b/qcad/patches/patch-src_entity_entity.pro
new file mode 100644
index 0000000..57ebbcc
--- /dev/null
+++ b/qcad/patches/patch-src_entity_entity.pro
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/entity/entity.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/entity/entity.pro
+@@ -119,7 +119,8 @@ NAME = $${RLIBNAME}entity
+ TARGET = $${NAME}
+ OTHER_FILES += entity.dox
+ DEFINES += QCADENTITY_LIBRARY
+-LIBS += -l$${RLIBNAME}core -lopennurbs
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}opennurbs$${RLIBPOSTDLL}
+ !win32 {
+     include( ../../shared_ts.pri )
+ }
diff --git a/qcad/patches/patch-src_grid_grid.pro b/qcad/patches/patch-src_grid_grid.pro
new file mode 100644
index 0000000..bae3214
--- /dev/null
+++ b/qcad/patches/patch-src_grid_grid.pro
@@ -0,0 +1,10 @@
+$NetBSD$
+
+--- src/grid/grid.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/grid/grid.pro
+@@ -13,4 +13,4 @@ else {
+     CONFIG += plugin
+ }
+ TARGET = $${RLIBNAME}grid
+-LIBS += -l$${RLIBNAME}core
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL}
diff --git a/qcad/patches/patch-src_gui_gui.pro b/qcad/patches/patch-src_gui_gui.pro
new file mode 100644
index 0000000..395df5c
--- /dev/null
+++ b/qcad/patches/patch-src_gui_gui.pro
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/gui/gui.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/gui/gui.pro
+@@ -80,7 +80,8 @@ else {
+     CONFIG += plugin
+ }
+
+-LIBS += -l$${RLIBNAME}core -l$${RLIBNAME}entity
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}entity$${RLIBPOSTDLL}
+ NAME = $${RLIBNAME}gui
+ TARGET = $${NAME}
+ OTHER_FILES += gui.dox
diff --git a/qcad/patches/patch-src_io_dxf_dxf.pro b/qcad/patches/patch-src_io_dxf_dxf.pro
new file mode 100644
index 0000000..1fab7d5
--- /dev/null
+++ b/qcad/patches/patch-src_io_dxf_dxf.pro
@@ -0,0 +1,23 @@
+$NetBSD$
+
+--- src/io/dxf/dxf.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/io/dxf/dxf.pro
+@@ -16,7 +16,11 @@ SOURCES = \
+     RDxfPlugin.cpp
+ TEMPLATE = lib
+ DEFINES += QCADDXF_LIBRARY
+-LIBS += -l$${RLIBNAME}core -l$${RLIBNAME}entity -ldxflib -l$${RLIBNAME}operations
++LIBS += ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}entity$${RLIBPOSTDLL} \
++	../../../$${ROUTDIR}/$${RLIBPRE}dxflib$${RLIBPOSTDLL} \
++	../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}operations$${RLIBPOSTDLL}
++
+ r_static_libs {
+     CONFIG -= plugin
+     CONFIG += staticlib
+@@ -25,4 +29,4 @@ else {
+     DESTDIR = ../../../plugins
+ }
+
+-POST_TARGETDEPS += ../../../$$ROUTDIR/$${RLIBPRE}dxflib$${RLIBPOST}
++#POST_TARGETDEPS += ../../../$${ROUTDIR}/$${RLIBPRE}dxflib$${RLIBPOSTDLL}
diff --git a/qcad/patches/patch-src_operations_operations.pro b/qcad/patches/patch-src_operations_operations.pro
new file mode 100644
index 0000000..d723a41
--- /dev/null
+++ b/qcad/patches/patch-src_operations_operations.pro
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/operations/operations.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/operations/operations.pro
+@@ -41,6 +41,7 @@ else {
+     CONFIG += plugin
+ }
+ TARGET = $${RLIBNAME}operations
+-LIBS += -l$${RLIBNAME}core -l$${RLIBNAME}entity
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}entity$${RLIBPOSTDLL}
+ OTHER_FILES += operations.dox
+ DEFINES += QCADOPERATIONS_LIBRARY
diff --git a/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro b/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro
new file mode 100644
index 0000000..1368e54
--- /dev/null
+++ b/qcad/patches/patch-src_scripting_ecmaapi_ecmaapi.pro
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- src/scripting/ecmaapi/ecmaapi.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/scripting/ecmaapi/ecmaapi.pro
+@@ -19,13 +19,13 @@ SOURCES += \
+ include(adapters/adapters.pri)
+ include(generated/generated.pri)
+ LIBS += \
+-    -l$${RLIBNAME}core \
+-    -l$${RLIBNAME}entity \
+-    -l$${RLIBNAME}grid \
+-    -l$${RLIBNAME}gui \
+-    -l$${RLIBNAME}operations \
+-    -l$${RLIBNAME}snap \
+-    -l$${RLIBNAME}spatialindex \
+-    -l$${RLIBNAME}stemmer \
+-    -l$${RLIBNAME}zip \
+-    -lquazip
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}entity$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}grid$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}gui$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}operations$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}snap$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}spatialindex$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}stemmer$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}zip$${RLIBPOSTDLL} \
++    ../../../$${ROUTDIR}/$${RLIBPRE}quazip$${RLIBPOSTDLL}
diff --git a/qcad/patches/patch-src_snap_snap.pro b/qcad/patches/patch-src_snap_snap.pro
new file mode 100644
index 0000000..7f8f477
--- /dev/null
+++ b/qcad/patches/patch-src_snap_snap.pro
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/snap/snap.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/snap/snap.pro
+@@ -45,6 +45,8 @@ else {
+     CONFIG += plugin
+ }
+ TARGET = $${RLIBNAME}snap
+-LIBS += -l$${RLIBNAME}core -l$${RLIBNAME}grid -l$${RLIBNAME}entity
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}grid$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}entity$${RLIBPOSTDLL}
+ OTHER_FILES += snap.dox
+ DEFINES += QCADSNAP_LIBRARY
diff --git a/qcad/patches/patch-src_spatialindex_spatialindex.pro b/qcad/patches/patch-src_spatialindex_spatialindex.pro
new file mode 100644
index 0000000..0631ec9
--- /dev/null
+++ b/qcad/patches/patch-src_spatialindex_spatialindex.pro
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/spatialindex/spatialindex.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/spatialindex/spatialindex.pro
+@@ -14,7 +14,8 @@ else {
+     CONFIG += plugin
+ }
+ TARGET = $${RLIBNAME}spatialindex
+-LIBS += -l$${RLIBNAME}core -lspatialindexnavel
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}spatialindexnavel$${RLIBPOSTDLL}
+ OTHER_FILES += spatialindex.dox
+ DEFINES += QCADSPATIALINDEX_LIBRARY
diff --git a/qcad/patches/patch-src_stemmer_stemmer.pro b/qcad/patches/patch-src_stemmer_stemmer.pro
new file mode 100644
index 0000000..3d2257b
--- /dev/null
+++ b/qcad/patches/patch-src_stemmer_stemmer.pro
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- src/stemmer/stemmer.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/stemmer/stemmer.pro
+@@ -7,8 +7,6 @@ HEADERS = \
+ TEMPLATE = lib
+ CONFIG += plugin
+ TARGET = $${RLIBNAME}stemmer
+-LIBS += -lstemmer
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}stemmer$${RLIBPOSTDLL}
+ OTHER_FILES += stemmer.dox
+ DEFINES += QCADSTEMMER_LIBRARY
+-
+-POST_TARGETDEPS += ../../$$ROUTDIR/$${RLIBPRE}stemmer$${RLIBPOST}
diff --git a/qcad/patches/patch-src_zip_zip.pro b/qcad/patches/patch-src_zip_zip.pro
new file mode 100644
index 0000000..69691c5
--- /dev/null
+++ b/qcad/patches/patch-src_zip_zip.pro
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/zip/zip.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ src/zip/zip.pro
+@@ -23,7 +23,8 @@ else {
+     CONFIG += plugin
+ }
+ TARGET = $${RLIBNAME}zip
+-LIBS += -l$${RLIBNAME}core -lquazip
++LIBS += ../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../$${ROUTDIR}/$${RLIBPRE}quazip$${RLIBPOSTDLL}
+ OTHER_FILES += zip.dox
+ DEFINES += QCADZIP_LIBRARY
diff --git a/qcad/patches/patch-support_examples_exampleplugin_exampleplugin.pro b/qcad/patches/patch-support_examples_exampleplugin_exampleplugin.pro
new file mode 100644
index 0000000..5f7edda
--- /dev/null
+++ b/qcad/patches/patch-support_examples_exampleplugin_exampleplugin.pro
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- support/examples/exampleplugin/exampleplugin.pro.orig	2016-07-01 07:13:14.000000000 +0000
++++ support/examples/exampleplugin/exampleplugin.pro
+@@ -6,4 +6,6 @@ TEMPLATE    = lib
+ HEADERS     = RExamplePlugin.h
+ SOURCES     = RExamplePlugin.cpp
+ DESTDIR     = ../../../plugins
+-LIBS += -l$${RLIBNAME}core -l$${RLIBNAME}gui -l$${RLIBNAME}ecmaapi
++LIBS += ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}gui$${RLIBPOSTDLL} \
++	../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}ecmaapi$${RLIBPOSTDLL}
diff --git a/qcad/patches/patch-support_examples_transactionlistener_transactionlistener.pro b/qcad/patches/patch-support_examples_transactionlistener_transactionlistener.pro
new file mode 100644
index 0000000..558ba3a
--- /dev/null
+++ b/qcad/patches/patch-support_examples_transactionlistener_transactionlistener.pro
@@ -0,0 +1,11 @@
+$NetBSD$
+
+--- support/examples/transactionlistener/transactionlistener.pro.orig	2016-07-31 09:44:06.521154782 +0000
++++ support/examples/transactionlistener/transactionlistener.pro
+@@ -6,4 +6,5 @@ TEMPLATE    = lib
+ HEADERS     = TransactionListenerPlugin.h
+ SOURCES     = TransactionListenerPlugin.cpp
+ DESTDIR     = ../../../plugins
+-LIBS += -l$${RLIBNAME}core -l$${RLIBNAME}gui
++LIBS += ../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}core$${RLIBPOSTDLL} \
++	../../../$${ROUTDIR}/$${RLIBPRE}$${RLIBNAME}gui$${RLIBPOSTDLL}
Prev by Date: update openNURBS to version 2013-07-11
Next by Date: qcad: update distinfo
Previous by Thread: update openNURBS to version 2013-07-11
Next by Thread: qcad: update distinfo
Indexes:
Home | Main Index | Thread Index | Old Index