[arch-commits] Commit in supercollider/repos/community-x86_64 (8 files)
Date: Sunday, February 10, 2019 @ 12:34:31 Author: dvzrv Revision: 431417 archrelease: copy trunk to community-x86_64 Added: supercollider/repos/community-x86_64/PKGBUILD (from rev 431416, supercollider/trunk/PKGBUILD) supercollider/repos/community-x86_64/boost-1.67.patch (from rev 431416, supercollider/trunk/boost-1.67.patch) supercollider/repos/community-x86_64/supercollider-use_system_boost.patch (from rev 431416, supercollider/trunk/supercollider-use_system_boost.patch) supercollider/repos/community-x86_64/supercollider.install (from rev 431416, supercollider/trunk/supercollider.install) Deleted: supercollider/repos/community-x86_64/PKGBUILD supercollider/repos/community-x86_64/boost-1.67.patch supercollider/repos/community-x86_64/supercollider-use_system_boost.patch supercollider/repos/community-x86_64/supercollider.install --+ PKGBUILD | 126 ++--- boost-1.67.patch | 24 - supercollider-use_system_boost.patch | 718 - supercollider.install| 16 4 files changed, 442 insertions(+), 442 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2019-02-10 12:34:22 UTC (rev 431416) +++ PKGBUILD2019-02-10 12:34:31 UTC (rev 431417) @@ -1,63 +0,0 @@ -# Maintainer: David Runge -# Contributor: speps -# Contributor: osc - -_name=SuperCollider -pkgname=supercollider -pkgver=3.10.1 -pkgrel=2 -pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" -arch=('x86_64') -url="https://supercollider.github.io; -license=('GPL3') -groups=('pro-audio') -depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webengine' 'qt5-websockets' 'yaml-cpp') -makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') -checkdepends=('xorg-server-xvfb') -optdepends=('emacs: emacs interface' -'gedit: gedit interface' -'sc3-plugins: additional extension plugins for scsynth') -source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2; -'boost-1.67.patch' -"${pkgname}-use_system_boost.patch" -) -install="${pkgname}.install" -sha512sums=('283fb44f3c5d690f0c646782f3ac4d3cab6c9d787982006c85c743246f32bbe0de2b79dd1f6b183fd9a5085424b956c8e7c25878ef2418e50d41e1f8d85ed0b9' - '9980d77802f18fd56d2a13f24f070e81768d9111b2cc63e479a0e9b405a04aec28bc523e5d36aab0462af6a3831d64598470cdc6c3266431e2ca64aa427a6bf2' - 'd9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae') - -prepare() { - mv -v "${_name}-Source" "${pkgname}-${pkgver}" - cd "${pkgname}-${pkgver}" - # supernova build: - # https://github.com/supercollider/supercollider/issues/3981 - patch -Np1 -i ../boost-1.67.patch - # make sure system boost is used - # https://github.com/supercollider/supercollider/issues/4096 - patch -Np1 -i ../"${pkgname}-use_system_boost.patch" - mkdir -v build -} - -build() { - cd "${pkgname}-${pkgver}/build" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIBSCSYNTH=ON \ - -DFORTIFY=ON \ - -DSYSTEM_YAMLCPP=ON \ - -DSYSTEM_BOOST=ON \ - -DSC_VIM=OFF - make VERBOSE=1 -} - -check() { - cd "${pkgname}-${pkgver}/build" - xvfb-run make test ARGS="-V" || warning "Known failing tests: https://github.com/supercollider/supercollider/issues/3555; -} - -package() { - cd "${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - install -t "${pkgdir}/usr/share/doc/${pkgname}/" \ --vDm 644 ../{AUTHORS,{CHANGELOG,README,README_LINUX}.md} -} Copied: supercollider/repos/community-x86_64/PKGBUILD (from rev 431416, supercollider/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-02-10 12:34:31 UTC (rev 431417) @@ -0,0 +1,63 @@ +# Maintainer: David Runge +# Contributor: speps +# Contributor: osc + +_name=SuperCollider +pkgname=supercollider +pkgver=3.10.2 +pkgrel=1 +pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" +arch=('x86_64') +url="https://supercollider.github.io; +license=('GPL3') +groups=('pro-audio') +depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webengine' 'qt5-websockets' 'yaml-cpp') +makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') +checkdepends=('xorg-server-xvfb') +optdepends=('emacs: emacs interface' +'gedit: gedit interface' +'sc3-plugins: additional extension plugins for scsynth') +source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2; +'boost-1.67.patch' +
[arch-commits] Commit in supercollider/repos/community-x86_64 (8 files)
Date: Wednesday, February 6, 2019 @ 11:09:43 Author: dvzrv Revision: 429729 archrelease: copy trunk to community-x86_64 Added: supercollider/repos/community-x86_64/PKGBUILD (from rev 429728, supercollider/trunk/PKGBUILD) supercollider/repos/community-x86_64/boost-1.67.patch (from rev 429728, supercollider/trunk/boost-1.67.patch) supercollider/repos/community-x86_64/supercollider-use_system_boost.patch (from rev 429728, supercollider/trunk/supercollider-use_system_boost.patch) supercollider/repos/community-x86_64/supercollider.install (from rev 429728, supercollider/trunk/supercollider.install) Deleted: supercollider/repos/community-x86_64/PKGBUILD supercollider/repos/community-x86_64/boost-1.67.patch supercollider/repos/community-x86_64/supercollider-use_system_boost.patch supercollider/repos/community-x86_64/supercollider.install --+ PKGBUILD | 126 ++--- boost-1.67.patch | 24 - supercollider-use_system_boost.patch | 718 - supercollider.install| 16 4 files changed, 442 insertions(+), 442 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2019-02-06 11:09:27 UTC (rev 429728) +++ PKGBUILD2019-02-06 11:09:43 UTC (rev 429729) @@ -1,63 +0,0 @@ -# Maintainer: David Runge -# Contributor: speps -# Contributor: osc - -_name=SuperCollider -pkgname=supercollider -pkgver=3.10.1 -pkgrel=1 -pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" -arch=('x86_64') -url="https://supercollider.github.io; -license=('GPL3') -groups=('pro-audio') -depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'yaml-cpp') -makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') -checkdepends=('xorg-server-xvfb') -optdepends=('emacs: emacs interface' -'gedit: gedit interface' -'sc3-plugins: additional extension plugins for scsynth') -source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2; -'boost-1.67.patch' -"${pkgname}-use_system_boost.patch" -) -install="${pkgname}.install" -sha512sums=('283fb44f3c5d690f0c646782f3ac4d3cab6c9d787982006c85c743246f32bbe0de2b79dd1f6b183fd9a5085424b956c8e7c25878ef2418e50d41e1f8d85ed0b9' - '9980d77802f18fd56d2a13f24f070e81768d9111b2cc63e479a0e9b405a04aec28bc523e5d36aab0462af6a3831d64598470cdc6c3266431e2ca64aa427a6bf2' - 'd9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae') - -prepare() { - mv -v "${_name}-Source" "${pkgname}-${pkgver}" - cd "${pkgname}-${pkgver}" - # supernova build: - # https://github.com/supercollider/supercollider/issues/3981 - patch -Np1 -i ../boost-1.67.patch - # make sure system boost is used - # https://github.com/supercollider/supercollider/issues/4096 - patch -Np1 -i ../"${pkgname}-use_system_boost.patch" - mkdir -v build -} - -build() { - cd "${pkgname}-${pkgver}/build" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIBSCSYNTH=ON \ - -DFORTIFY=ON \ - -DSYSTEM_YAMLCPP=ON \ - -DSYSTEM_BOOST=ON \ - -DSC_VIM=OFF - make VERBOSE=1 -} - -check() { - cd "${pkgname}-${pkgver}/build" - xvfb-run make test ARGS="-V" || warning "Known failing tests: https://github.com/supercollider/supercollider/issues/3555; -} - -package() { - cd "${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - install -t "${pkgdir}/usr/share/doc/${pkgname}/" \ --vDm 644 ../{AUTHORS,{CHANGELOG,README,README_LINUX}.md} -} Copied: supercollider/repos/community-x86_64/PKGBUILD (from rev 429728, supercollider/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-02-06 11:09:43 UTC (rev 429729) @@ -0,0 +1,63 @@ +# Maintainer: David Runge +# Contributor: speps +# Contributor: osc + +_name=SuperCollider +pkgname=supercollider +pkgver=3.10.1 +pkgrel=2 +pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" +arch=('x86_64') +url="https://supercollider.github.io; +license=('GPL3') +groups=('pro-audio') +depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webengine' 'qt5-websockets' 'yaml-cpp') +makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') +checkdepends=('xorg-server-xvfb') +optdepends=('emacs: emacs interface' +'gedit: gedit interface' +'sc3-plugins: additional extension plugins for scsynth') +source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2; +'boost-1.67.patch'
[arch-commits] Commit in supercollider/repos/community-x86_64 (8 files)
Date: Saturday, February 2, 2019 @ 18:28:26 Author: dvzrv Revision: 429210 archrelease: copy trunk to community-x86_64 Added: supercollider/repos/community-x86_64/PKGBUILD (from rev 429209, supercollider/trunk/PKGBUILD) supercollider/repos/community-x86_64/boost-1.67.patch (from rev 429209, supercollider/trunk/boost-1.67.patch) supercollider/repos/community-x86_64/supercollider-use_system_boost.patch (from rev 429209, supercollider/trunk/supercollider-use_system_boost.patch) supercollider/repos/community-x86_64/supercollider.install (from rev 429209, supercollider/trunk/supercollider.install) Deleted: supercollider/repos/community-x86_64/PKGBUILD supercollider/repos/community-x86_64/boost-1.67.patch supercollider/repos/community-x86_64/supercollider.install supercollider/repos/community-x86_64/use-system-boost.patch --+ PKGBUILD | 126 +-- boost-1.67.patch | 24 +- supercollider-use_system_boost.patch | 359 + supercollider.install| 16 - use-system-boost.patch | 75 -- 5 files changed, 442 insertions(+), 158 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2019-02-02 18:27:57 UTC (rev 429209) +++ PKGBUILD2019-02-02 18:28:26 UTC (rev 429210) @@ -1,63 +0,0 @@ -# Maintainer: David Runge -# Contributor: speps -# Contributor: osc - -_name=SuperCollider -pkgname=supercollider -pkgver=3.10.0 -pkgrel=3 -pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" -arch=('x86_64') -url="https://supercollider.github.io; -license=('GPL3') -groups=('pro-audio') -depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'yaml-cpp') -makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') -checkdepends=('xorg-server-xvfb') -optdepends=('emacs: emacs interface' -'gedit: gedit interface' -'sc3-plugins: additional extension plugins for scsynth') -source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2; -'boost-1.67.patch' -'use-system-boost.patch' -) -install="${pkgname}.install" -sha512sums=('5670f0264329f0e90ed9c1b5bf63853fd67cd83ad48e2d96979ca548ed42265105d766e7fbb51839cb7b917a687929080e7c42f1c0baf3eb36a5365dee4b12bb' - '9980d77802f18fd56d2a13f24f070e81768d9111b2cc63e479a0e9b405a04aec28bc523e5d36aab0462af6a3831d64598470cdc6c3266431e2ca64aa427a6bf2' - '5e42f64e5e08ca9e03870e662b6694a0c41f4ab2e6522c8d2aade617a68b4455dc1932a18de18176a9ed9fc89e36f1f1ec76d3e3ff8322d0d1e8ae6fb85cbce9') - -prepare() { - mv -v "${_name}-Source" "${pkgname}-${pkgver}" - cd "${pkgname}-${pkgver}" - # supernova build: - # https://github.com/supercollider/supercollider/issues/3981 - patch -Np1 -i ../boost-1.67.patch - # make sure system boost is used - # https://github.com/supercollider/supercollider/issues/4096 - patch -Np1 -i ../use-system-boost.patch - mkdir -v build -} - -build() { - cd "${pkgname}-${pkgver}/build" - cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DLIBSCSYNTH=ON \ - -DFORTIFY=ON \ - -DSYSTEM_YAMLCPP=ON \ - -DSYSTEM_BOOST=ON \ - -DSC_VIM=OFF - make VERBOSE=1 -} - -check() { - cd "${pkgname}-${pkgver}/build" - xvfb-run make test ARGS="-V" || warning "Known failing tests: https://github.com/supercollider/supercollider/issues/3555; -} - -package() { - cd "${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - install -t "${pkgdir}/usr/share/doc/${pkgname}/" \ --vDm 644 ../{AUTHORS,{CHANGELOG,README,README_LINUX}.md} -} Copied: supercollider/repos/community-x86_64/PKGBUILD (from rev 429209, supercollider/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-02-02 18:28:26 UTC (rev 429210) @@ -0,0 +1,63 @@ +# Maintainer: David Runge +# Contributor: speps +# Contributor: osc + +_name=SuperCollider +pkgname=supercollider +pkgver=3.10.1 +pkgrel=1 +pkgdesc="Environment and programming language for real time audio synthesis and algorithmic composition" +arch=('x86_64') +url="https://supercollider.github.io; +license=('GPL3') +groups=('pro-audio') +depends=('boost-libs' 'desktop-file-utils' 'fftw' 'jack' 'qt5-svg' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'yaml-cpp') +makedepends=('boost' 'cmake' 'emacs' 'qt5-tools') +checkdepends=('xorg-server-xvfb') +optdepends=('emacs: emacs interface' +'gedit: gedit interface' +'sc3-plugins: additional extension plugins for scsynth')
[arch-commits] Commit in supercollider/repos/community-x86_64 (8 files)
Date: Sunday, March 25, 2018 @ 14:26:55 Author: dvzrv Revision: 312577 archrelease: copy trunk to community-x86_64 Added: supercollider/repos/community-x86_64/0001-cmake-correctly-include-yaml-cpp.patch (from rev 312576, supercollider/trunk/0001-cmake-correctly-include-yaml-cpp.patch) supercollider/repos/community-x86_64/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch (from rev 312576, supercollider/trunk/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch) supercollider/repos/community-x86_64/PKGBUILD (from rev 312576, supercollider/trunk/PKGBUILD) supercollider/repos/community-x86_64/supercollider.install (from rev 312576, supercollider/trunk/supercollider.install) Deleted: supercollider/repos/community-x86_64/0001-cmake-correctly-include-yaml-cpp.patch supercollider/repos/community-x86_64/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch supercollider/repos/community-x86_64/PKGBUILD supercollider/repos/community-x86_64/supercollider.install -+ 0001-cmake-correctly-include-yaml-cpp.patch | 114 +- 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch | 52 ++-- PKGBUILD| 113 - supercollider.install | 16 - 4 files changed, 147 insertions(+), 148 deletions(-) Deleted: 0001-cmake-correctly-include-yaml-cpp.patch === --- 0001-cmake-correctly-include-yaml-cpp.patch 2018-03-25 14:26:46 UTC (rev 312576) +++ 0001-cmake-correctly-include-yaml-cpp.patch 2018-03-25 14:26:55 UTC (rev 312577) @@ -1,57 +0,0 @@ -From f82cec5ae917e4d43a2a003b2eb0ddae3c0d31c7 Mon Sep 17 00:00:00 2001 -From: Brian Heim-Date: Sun, 4 Mar 2018 18:29:54 -0500 -Subject: [PATCH 1/2] cmake: correctly include yaml-cpp - -Include its dirs last for libsclang, and use the YAMLCPP_LIBRARY variable for linking - editors/sc-ide/CMakeLists.txt | 3 ++- - lang/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt -index ffe70f98e..2f6c9c2cc 100644 a/editors/sc-ide/CMakeLists.txt -+++ b/editors/sc-ide/CMakeLists.txt -@@ -199,6 +199,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common) - include_directories(${CMAKE_SOURCE_DIR}/common) - include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface) - include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost) -+include_directories(${YAMLCPP_INCLUDE_DIR}) - # For QtCollider headers: - include_directories(${CMAKE_SOURCE_DIR}) - # Needed for auto-generated forms headers: -@@ -273,7 +274,7 @@ endif() - - target_link_libraries( SuperCollider - ${QT_IDE_LIBRARIES} --yaml -+${YAMLCPP_LIBRARY} - oscpack - ) - -diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt -index 9270b6320..5de19e46e 100644 a/lang/CMakeLists.txt -+++ b/lang/CMakeLists.txt -@@ -10,8 +10,6 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common - ${CMAKE_SOURCE_DIR}/include/server - ${CMAKE_SOURCE_DIR}/common - --${YAMLCPP_INCLUDE_DIR} -- - ${CMAKE_SOURCE_DIR}/external_libraries/boost_sync/include - - LangSource -@@ -19,6 +17,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common - - ${CMAKE_SOURCE_DIR}/external_libraries/nova-tt - LangSource/Bison -+ -+${YAMLCPP_INCLUDE_DIR} - ) - - --- -2.16.2 - Copied: supercollider/repos/community-x86_64/0001-cmake-correctly-include-yaml-cpp.patch (from rev 312576, supercollider/trunk/0001-cmake-correctly-include-yaml-cpp.patch) === --- 0001-cmake-correctly-include-yaml-cpp.patch (rev 0) +++ 0001-cmake-correctly-include-yaml-cpp.patch 2018-03-25 14:26:55 UTC (rev 312577) @@ -0,0 +1,57 @@ +From f82cec5ae917e4d43a2a003b2eb0ddae3c0d31c7 Mon Sep 17 00:00:00 2001 +From: Brian Heim +Date: Sun, 4 Mar 2018 18:29:54 -0500 +Subject: [PATCH 1/2] cmake: correctly include yaml-cpp + +Include its dirs last for libsclang, and use the YAMLCPP_LIBRARY variable for linking +--- + editors/sc-ide/CMakeLists.txt | 3 ++- + lang/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +index ffe70f98e..2f6c9c2cc 100644 +--- a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +@@ -199,6 +199,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common) + include_directories(${CMAKE_SOURCE_DIR}/common) + include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface) +
[arch-commits] Commit in supercollider/repos/community-x86_64 (8 files)
Date: Wednesday, March 21, 2018 @ 19:52:25 Author: dvzrv Revision: 310249 archrelease: copy trunk to community-x86_64 Added: supercollider/repos/community-x86_64/0001-cmake-correctly-include-yaml-cpp.patch (from rev 310248, supercollider/trunk/0001-cmake-correctly-include-yaml-cpp.patch) supercollider/repos/community-x86_64/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch (from rev 310248, supercollider/trunk/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch) supercollider/repos/community-x86_64/PKGBUILD (from rev 310248, supercollider/trunk/PKGBUILD) supercollider/repos/community-x86_64/supercollider.install (from rev 310248, supercollider/trunk/supercollider.install) Deleted: supercollider/repos/community-x86_64/0001-cmake-correctly-include-yaml-cpp.patch supercollider/repos/community-x86_64/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch supercollider/repos/community-x86_64/PKGBUILD supercollider/repos/community-x86_64/supercollider.install -+ 0001-cmake-correctly-include-yaml-cpp.patch | 114 +- 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch | 52 ++-- PKGBUILD| 113 + supercollider.install | 16 - 4 files changed, 148 insertions(+), 147 deletions(-) Deleted: 0001-cmake-correctly-include-yaml-cpp.patch === --- 0001-cmake-correctly-include-yaml-cpp.patch 2018-03-21 19:52:14 UTC (rev 310248) +++ 0001-cmake-correctly-include-yaml-cpp.patch 2018-03-21 19:52:25 UTC (rev 310249) @@ -1,57 +0,0 @@ -From f82cec5ae917e4d43a2a003b2eb0ddae3c0d31c7 Mon Sep 17 00:00:00 2001 -From: Brian Heim-Date: Sun, 4 Mar 2018 18:29:54 -0500 -Subject: [PATCH 1/2] cmake: correctly include yaml-cpp - -Include its dirs last for libsclang, and use the YAMLCPP_LIBRARY variable for linking - editors/sc-ide/CMakeLists.txt | 3 ++- - lang/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt -index ffe70f98e..2f6c9c2cc 100644 a/editors/sc-ide/CMakeLists.txt -+++ b/editors/sc-ide/CMakeLists.txt -@@ -199,6 +199,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common) - include_directories(${CMAKE_SOURCE_DIR}/common) - include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface) - include_directories(${CMAKE_SOURCE_DIR}/external_libraries/boost) -+include_directories(${YAMLCPP_INCLUDE_DIR}) - # For QtCollider headers: - include_directories(${CMAKE_SOURCE_DIR}) - # Needed for auto-generated forms headers: -@@ -273,7 +274,7 @@ endif() - - target_link_libraries( SuperCollider - ${QT_IDE_LIBRARIES} --yaml -+${YAMLCPP_LIBRARY} - oscpack - ) - -diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt -index 9270b6320..5de19e46e 100644 a/lang/CMakeLists.txt -+++ b/lang/CMakeLists.txt -@@ -10,8 +10,6 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common - ${CMAKE_SOURCE_DIR}/include/server - ${CMAKE_SOURCE_DIR}/common - --${YAMLCPP_INCLUDE_DIR} -- - ${CMAKE_SOURCE_DIR}/external_libraries/boost_sync/include - - LangSource -@@ -19,6 +17,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common - - ${CMAKE_SOURCE_DIR}/external_libraries/nova-tt - LangSource/Bison -+ -+${YAMLCPP_INCLUDE_DIR} - ) - - --- -2.16.2 - Copied: supercollider/repos/community-x86_64/0001-cmake-correctly-include-yaml-cpp.patch (from rev 310248, supercollider/trunk/0001-cmake-correctly-include-yaml-cpp.patch) === --- 0001-cmake-correctly-include-yaml-cpp.patch (rev 0) +++ 0001-cmake-correctly-include-yaml-cpp.patch 2018-03-21 19:52:25 UTC (rev 310249) @@ -0,0 +1,57 @@ +From f82cec5ae917e4d43a2a003b2eb0ddae3c0d31c7 Mon Sep 17 00:00:00 2001 +From: Brian Heim +Date: Sun, 4 Mar 2018 18:29:54 -0500 +Subject: [PATCH 1/2] cmake: correctly include yaml-cpp + +Include its dirs last for libsclang, and use the YAMLCPP_LIBRARY variable for linking +--- + editors/sc-ide/CMakeLists.txt | 3 ++- + lang/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +index ffe70f98e..2f6c9c2cc 100644 +--- a/editors/sc-ide/CMakeLists.txt b/editors/sc-ide/CMakeLists.txt +@@ -199,6 +199,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/common) + include_directories(${CMAKE_SOURCE_DIR}/common) + include_directories(${CMAKE_SOURCE_DIR}/include/plugin_interface) +