pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qcad: fix build (patchsum went awry)
Module Name: pkgsrc-wip
Committed By: Iain Hibbert <plunky%netbsd.org@localhost>
Pushed By: plunky
Date: Tue Aug 2 16:35:13 2016 +0100
Changeset: 479ff669044fb2e14f242507d076207d6e9e7997
Modified Files:
qcad/distinfo
qcad/patches/patch-src_run_run.pri
Log Message:
qcad: fix build (patchsum went awry)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=479ff669044fb2e14f242507d076207d6e9e7997
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qcad/distinfo | 2 +-
qcad/patches/patch-src_run_run.pri | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
diffs:
diff --git a/qcad/distinfo b/qcad/distinfo
index 2b81ac1..6803faa 100644
--- a/qcad/distinfo
+++ b/qcad/distinfo
@@ -24,7 +24,7 @@ SHA1 (patch-src_grid_grid.pro) = 65f5f47cce612b31181a0ac3e153214d29f08767
SHA1 (patch-src_gui_gui.pro) = 77142df264b5bca8170392f3ff797edc50fe4b95
SHA1 (patch-src_io_dxf_dxf.pro) = 2d9318d88c44ed6024b286c48dc5f15b842cdfa3
SHA1 (patch-src_operations_operations.pro) = b7c549e45dfa84141dbf8bedceac992b4b1ca7ca
-SHA1 (patch-src_run_run.pri) = 8997657526d7f8f8cd860aec0f9138c64414e589
+SHA1 (patch-src_run_run.pri) = 2a06e216d2bf68aeaeca779f99c1dd69263c315a
SHA1 (patch-src_scripting_ecmaapi_ecmaapi.pro) = 028cd35f1676bbee6edde4e4d644d8ae1f6a7d88
SHA1 (patch-src_snap_snap.pro) = fc538a3fcd7f4782016d8221d8758cb8de1594dd
SHA1 (patch-src_spatialindex_spatialindex.pro) = f7c528feef7f5e1c6171c6b538fa5cf0b8db6dec
diff --git a/qcad/patches/patch-src_run_run.pri b/qcad/patches/patch-src_run_run.pri
index 1aa5378..dfb834a 100644
--- a/qcad/patches/patch-src_run_run.pri
+++ b/qcad/patches/patch-src_run_run.pri
@@ -5,18 +5,17 @@ and create an install target
--- src/run/run.pri.orig 2016-07-01 07:13:14.000000000 +0000
+++ src/run/run.pri
-@@ -26,22 +26,12 @@ win32 {
- SOURCES += $$PWD/main.cpp
+@@ -27,21 +27,12 @@ SOURCES += $$PWD/main.cpp
TEMPLATE = app
OTHER_FILES += $$PWD/run.dox
--
+
-win32 {
- TARGET = $${RLIBNAME}
-}
-
-macx {
- TARGET = QCAD
--}
+-}
-else {
- unix {
- TARGET = $${RLIBNAME}-bin
@@ -25,7 +24,7 @@ and create an install target
+TARGET = $${RLIBNAME}
+INSTALLS += target
+target.path = $${PREFIX}/bin
-
+
# copy Qt plugins to QCAD plugin folder:
-!build_pass {
+DISABLE_THIS {
Home |
Main Index |
Thread Index |
Old Index