Skip to content
Permalink
Browse files

qbs: update to 1.13.0

Adjust patch-environment.diff to source changes.

Setting DYLD_LIBRARY_PATH is not needed anymore.
The option qbs_disable_rpath already takes care of that.
  • Loading branch information
jobor authored and cjones051073 committed Apr 26, 2019
1 parent f335572 commit f88ca7223aa438c34e1925b65b850556418fbc1d
Showing with 14 additions and 15 deletions.
  1. +4 −4 devel/qbs/Portfile
  2. +10 −11 devel/qbs/files/patch-environment.diff
@@ -6,7 +6,7 @@ PortGroup cxx11 1.1

name qbs

version 1.12.2
version 1.13.0
categories devel
platforms darwin
license LGPL-2.1
@@ -18,9 +18,9 @@ homepage https://wiki.qt.io/Qbs
distname qbs-src-${version}
master_sites https://download.qt.io/official_releases/qbs/${version}/

checksums rmd160 c4b3d6c0c466e339f971b8a75ac6d3d3d3e42282 \
sha256 97819b8b404a6ee5715d38ceda5ac1d992500a38f8956abe4a58a1d66e64d6f1 \
size 4374830
checksums rmd160 e7777815d8e82a8b637c0bc24d46992285c3eae5 \
sha256 4daa764a944bdb33a4a0dd792864dd9acc24036ad84ef34cfb3215538c6cef89 \
size 4323291

qt5.depends_component qtscript
qt5.min_version 5.9.0
@@ -1,12 +1,11 @@
--- static-res.pro.orig 2018-04-15 08:33:48.000000000 -0700
+++ static-res.pro 2018-04-15 08:33:18.000000000 -0700
@@ -15,6 +15,9 @@
--- static-res.pro.orig
+++ static-res.pro
@@ -15,6 +15,8 @@ unix:qbs_disable_rpath {
envSpec = $$envVar=$$newVal
}

qbsres.target = $$builddirname/default/default.bg
qbsres.commands = \
+ $$shell_quote(/usr/bin/env) \
+ DYLD_LIBRARY_PATH=$$shell_path(lib) \
+ TMPDIR=$$shell_path(/tmp) \
$$shell_quote($$shell_path($$qbsbindir/qbs)) \
build \
--settings-dir $$shell_quote($$builddirname/settings) \
+envSpec += TMPDIR=$$shell_path(/tmp)
+
builddirname = qbsres
typedescdir = share/qbs/qml-type-descriptions
typedescdir_src = $$builddirname/default/install-root/$$typedescdir

0 comments on commit f88ca72

Please sign in to comment.
You can’t perform that action at this time.