diff options
| author | gdt <gdt@pkgsrc.org> | 2021-09-19 15:35:40 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2021-09-19 15:35:40 +0000 |
| commit | bf797475a6babb3e957386e369f6acb2088f2ced (patch) | |
| tree | 9dffe2fbcdf468cb72e44d473fae0ebc562b1e8e /cad | |
| parent | c8c68e6871adce58d97130180859d4500f9dca67 (diff) | |
| download | pkgsrc-bf797475a6babb3e957386e369f6acb2088f2ced.tar.gz | |
cad/qcad: Build and install libqcadscripts
Despite not causing a failure to build and package, qcad's build was
failing to find libqcadcore while building libqcadscripts. This
commits adds a patch, similar to many others already present, that
adds -L ../core and then installs the library (and then the expected
PLIST change).
It remains a mystery why the build ever worked; the makefile I get
seems to ignore the failed build, which seems wrong. The bulk builds
have worked. But Mustafa reports a build failure, and I find that
failure in my log, even if it is non-fatal.
Reported by Mustafa Dogan.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/qcad/Makefile | 4 | ||||
| -rw-r--r-- | cad/qcad/PLIST | 3 | ||||
| -rw-r--r-- | cad/qcad/distinfo | 3 | ||||
| -rw-r--r-- | cad/qcad/patches/patch-src_scripts_scripts.pro | 16 |
4 files changed, 22 insertions, 4 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 7263f8c0117..7465cf4bd58 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.99 2021/07/30 12:26:42 ryoon Exp $ +# $NetBSD: Makefile,v 1.100 2021/09/19 15:35:40 gdt Exp $ # DISTNAME= qcad-3.26.1.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_GITHUB:=qcad/} EXTRACT_USING= bsdtar diff --git a/cad/qcad/PLIST b/cad/qcad/PLIST index 0009975a018..c8180e4eeac 100644 --- a/cad/qcad/PLIST +++ b/cad/qcad/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2021/04/02 20:27:12 plunky Exp $ +@comment $NetBSD: PLIST,v 1.21 2021/09/19 15:35:40 gdt Exp $ bin/qcad lib/libdxflib.so lib/libopennurbs.so @@ -8,6 +8,7 @@ lib/libqcadentity.so lib/libqcadgrid.so lib/libqcadgui.so lib/libqcadoperations.so +lib/libqcadscripts.so lib/libqcadsnap.so lib/libqcadspatialindex.so lib/libqcadstemmer.so diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo index 70d7f87fb9d..fa85faaa8a3 100644 --- a/cad/qcad/distinfo +++ b/cad/qcad/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.38 2021/04/02 20:27:12 plunky Exp $ +$NetBSD: distinfo,v 1.39 2021/09/19 15:35:40 gdt Exp $ SHA1 (qcad-3.26.1.0.tar.gz) = 7bfc33e7a26a2f0f99f64ac120b110d3bd67aa3d RMD160 (qcad-3.26.1.0.tar.gz) = 2c764bd8dd126e3084fc4291cea0fcd3df3d7e7a @@ -29,6 +29,7 @@ SHA1 (patch-src_operations_operations.pro) = d10b38594f29ae07febdb52339049646926 SHA1 (patch-src_run_main.cpp) = ef4498e2b1028dd675663793a885b4a65030027f SHA1 (patch-src_run_run.pri) = fca4570872f9fc7b25beac8dfd0c4802b81d3972 SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 8105fd89a8b52962f9e0c1ff80cf154ceb09145e +SHA1 (patch-src_scripts_scripts.pro) = 7019dd69451b2594890c14f9ebf688a15cf81ee4 SHA1 (patch-src_snap_snap.pro) = 9464576805a1d2baa81c91f759e59a8cc3989b6a SHA1 (patch-src_spatialindex_spatialindex.pro) = 3afcdcd036b0ee183220cc5406accbf0756841e7 SHA1 (patch-src_stemmer_stemmer.pro) = d76d1d92378f516a278432fb0d6a23f8fdd355eb diff --git a/cad/qcad/patches/patch-src_scripts_scripts.pro b/cad/qcad/patches/patch-src_scripts_scripts.pro new file mode 100644 index 00000000000..c8da6351fec --- /dev/null +++ b/cad/qcad/patches/patch-src_scripts_scripts.pro @@ -0,0 +1,16 @@ +$NetBSD: patch-src_scripts_scripts.pro,v 1.1 2021/09/19 15:35:40 gdt Exp $ + +Fix upstream makefiles, just like many other patches. + +--- src/scripts/scripts.pro.orig 2021-03-08 13:09:33.000000000 +0000 ++++ src/scripts/scripts.pro +@@ -7,7 +7,8 @@ HEADERS = RScriptsPlugin.h + SOURCES = RScriptsPlugin.cpp + DESTDIR = ../../plugins + RC_FILE = scripts.rc +-LIBS += -l$${RLIBNAME}core ++LIBS += -L ../core -l$${RLIBNAME}core ++INSTALLS += target + + CONFIG += resources_big + |