[arch-commits] Commit in supercollider/trunk (3 files)

2020-09-03 Thread David Runge via arch-commits 
Date: Thursday, September 3, 2020 @ 18:28:40
  Author: dvzrv
Revision: 697523

upgpkg: supercollider 3.11.1-1: Upgrade to 3.11.1.

Using upstreamed patch for devendoring abletonlink.
Removing local copy of upstreamed patch for devendoring abletonlink.
Adding backported patch for fixing linker issues in regards to libscsynth.so.
Applying latest cmake packaging guidelines.
Running all tests - they all seem to work now \o/.
Adding 0B7D1EA4E32B5C3C4275D3C70796CC538BEFF177 to validpgpkeys as upstream 
started providing detached signatures for their tarballs.

Added:
  supercollider/trunk/supercollider-3.11.1-fix_linker_errors.patch
Modified:
  supercollider/trunk/PKGBUILD
Deleted:
  supercollider/trunk/supercollider-3.11.0-use_system_link.patch

--+
 PKGBUILD |   40 +--
 supercollider-3.11.0-use_system_link.patch   |   30 --
 supercollider-3.11.1-fix_linker_errors.patch |  322 +
 3 files changed, 347 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-03 18:21:34 UTC (rev 697522)
+++ PKGBUILD2020-09-03 18:28:40 UTC (rev 697523)
@@ -4,8 +4,8 @@
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.11.0
-pkgrel=4
+pkgver=3.11.1
+pkgrel=1
 pkgdesc="Environment and programming language for real time audio synthesis 
and algorithmic composition"
 arch=('x86_64')
 url="https://supercollider.github.io;
@@ -19,12 +19,21 @@
 optdepends=('emacs: emacs interface'
 'gedit: gedit interface'
 'sc3-plugins: additional extension plugins for scsynth')
-provides=("libscsynth.so" "sclang=${pkgver}" "scsynth=${pkgver}")
-source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source.tar.bz2;
-"${pkgname}-3.11.0-use_system_link.patch")
+provides=('libscsynth.so' "sclang=${pkgver}" "scsynth=${pkgver}")
+source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source.tar.bz2"{,.asc}
+
"${pkgname}-3.11.1-devendor_abletonlink.patch::https://github.com/supercollider/supercollider/pull/4836/commits/95bd9721226f3cb1bba903bea8154cee5859cfb8.patch;
+"${pkgname}-3.11.1-fix_linker_errors.patch"
+)
 install="${pkgname}.install"
-sha512sums=('64fef4d751436337baf40ced068a496d3e9221f751dcde7bfc2857a79c094764dff814d1c0cf519380053ddcfdb2c3f2b8eb787d3cff03e522c19fd95951b1da'
-
'1a9977f7b1a1a90ea3b4163ef6f6f963325e8d87b6ca16fecaa5a1816323d6cb4ab7eb750957d58be34a99fd3ed08ed7b7a92ac5352f31c894a8eb002f0aa71c')
+sha512sums=('5c4c5ba75f32ee7dda9a9e30c346ff028aedce81374474b4ee93fb8dc631f7b6ea54e91706b3502be6ed84baa69f6d659fcddaf5140ca292827d62734efbd6b2'
+'SKIP'
+
'6a31c8c2edd102b806cfe110c2f27516e9fe05a7b074d50e14d5aad69cb80a2badfcb3a20f942d6dee90dfaf4bf5ae7eb8b8ef8c517ea8e0110bee7f0c2c4f40'
+
'900f6559986ba80fe5aa8a05881f1ccfc2ae01d5b18dc0cf963bf86bfb7cbc0b77dfb9a4f059e588c9563c2ef9f8632731f3d046b79d8bfdffa88111cae7c52a')
+b2sums=('0fed25646c7163e8e13ae27024a25206f1ea141c5c23b93d7a1f4c00a30f0ce15a084b73eccb424f724f2000db138e3539b568045afddcfd612cf5dab99cb94d'
+'SKIP'
+
'c589ea2451b4c232fa34de1b442e6822fb5867475b0e0bb7b94563cbfac54f09f47a7be8cf1e9f4a2896ffa678db40d718ec9ee301ad037eaebeb71772e773e4'
+
'b8d0b153d08dcf98b5b2c385c52a1c446086f4c795f34840bf1a55f8eccdf53e262fcfb8b7245332919d1b932e5887dc20236ad35df29c4712853d2676e89a20')
+validpgpkeys=('0B7D1EA4E32B5C3C4275D3C70796CC538BEFF177') # Brian Heim 

 
 
 prepare() {
@@ -33,16 +42,16 @@
   # devendoring Ableton Link:
   # https://github.com/supercollider/supercollider/issues/4818
   # https://github.com/supercollider/supercollider/pull/4836
-  patch -Np1 -i "../${pkgname}-3.11.0-use_system_link.patch"
-  # removing macOS hidden files (due to release tarball issues):
-  # https://github.com/supercollider/supercollider/issues/4545
-  find . -type f -iname "*\._*" -delete
+  patch -Np1 -i "../${pkgname}-3.11.1-devendor_abletonlink.patch"
+  # fix linker issues with libscsynth.so (backported patch)
+  # https://github.com/supercollider/supercollider/issues/4992
+  patch -Np1 -i "../${pkgname}-3.11.1-fix_linker_errors.patch"
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_BUILD_TYPE='None' \
 -DBoost_NO_BOOST_CMAKE=ON \
 -DLIBSCSYNTH=ON \
 -DFORTIFY=ON \
@@ -50,14 +59,15 @@
 -DSYSTEM_BOOST=ON \
 -DSYSTEM_YAMLCPP=ON \
 -DSC_VIM=OFF \
+-Wno-dev \
 -B build \
-.
+-S .
   make VERBOSE=1 -C build
 }
 
 check() {
-  cd "${pkgname}-${pkgver}/build"
-  xvfb-run make test ARGS="-V" -C build || echo "Known failing tests: 
https://github.com/supercollider/supercollider/issues/3555;
+  cd "${pkgname}-${pkgver}"
+  xvfb-run make test

[arch-commits] Commit in supercollider/trunk (3 files)

2020-03-21 Thread David Runge via arch-commits 
Date: Saturday, March 21, 2020 @ 20:51:39
  Author: dvzrv
Revision: 603104

upgpkg: supercollider 3.11.0-2: Simplifying the patch for devendoring link.
The link package now ships the AbletonLinkConfig.cmake, which allows for a 
simple find_package() call.
This change is currently being reviewed upstream for inclusion.

Added:
  supercollider/trunk/supercollider-3.11.0-use_system_link.patch
Modified:
  supercollider/trunk/PKGBUILD
Deleted:
  supercollider/trunk/supercollider-3.11.0-devendor_ableton_link.patch

--+
 PKGBUILD |   10 ++--
 supercollider-3.11.0-devendor_ableton_link.patch |   43 -
 supercollider-3.11.0-use_system_link.patch   |   30 ++
 3 files changed, 35 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-21 20:29:28 UTC (rev 603103)
+++ PKGBUILD2020-03-21 20:51:39 UTC (rev 603104)
@@ -5,7 +5,7 @@
 _name=SuperCollider
 pkgname=supercollider
 pkgver=3.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Environment and programming language for real time audio synthesis 
and algorithmic composition"
 arch=('x86_64')
 url="https://supercollider.github.io;
@@ -21,10 +21,10 @@
 'sc3-plugins: additional extension plugins for scsynth')
 provides=("libscsynth.so" "sclang=${pkgver}" "scsynth=${pkgver}")
 
source=("https://github.com/${pkgname}/${pkgname}/releases/download/Version-${pkgver}/${_name}-${pkgver}-Source-linux.tar.bz2;
-"${pkgname}-3.11.0-devendor_ableton_link.patch")
+"${pkgname}-3.11.0-use_system_link.patch")
 install="${pkgname}.install"
 
sha512sums=('8c93395231caf3617c3dae07e7c94e2253e24ab1a822b64904d5bc67f62fb12e9837ed0cd7210fbbe10cb5a7ff277e80e5f2ec85d6b51026c920851d4fda59a4'
-
'f42f2eb9c61b20b6313f9351e0528c397718bccafd094095d7d1d810eee55efd7b47126be8ef3ba56d6e752dbd270d1f188c4a88282405af489993b3051d')
+
'2b0ed3a7a0022d9a23beb42a39e6327f28b8c59b6fe976771442df572477f509c1ca3882cdb41c2b277fb4d4b0f07e8bd88a6c4017c522c5e4ff89ce32c9b4cd')
 
 
 prepare() {
@@ -32,8 +32,8 @@
   cd "${pkgname}-${pkgver}"
   # devendoring Ableton Link:
   # https://github.com/supercollider/supercollider/issues/4818
-  # https://github.com/supercollider/supercollider/issues/4818
-  patch -Np1 -i "../${pkgname}-3.11.0-devendor_ableton_link.patch"
+  # https://github.com/supercollider/supercollider/pull/4836
+  patch -Np1 -i "../${pkgname}-3.11.0-use_system_link.patch"
   # removing macOS hidden files (due to release tarball issues):
   # https://github.com/supercollider/supercollider/issues/4545
   find . -type f -iname "*\._*" -delete

Deleted: supercollider-3.11.0-devendor_ableton_link.patch
===
--- supercollider-3.11.0-devendor_ableton_link.patch2020-03-21 20:29:28 UTC 
(rev 603103)
+++ supercollider-3.11.0-devendor_ableton_link.patch2020-03-21 20:51:39 UTC 
(rev 603104)
@@ -1,43 +0,0 @@
-diff --git c/CMakeLists.txt w/CMakeLists.txt
-index 30d9c8d1a..5e1e9cb89 100644
 c/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -228,6 +228,7 @@ endif()
- 
- option(SC_SYMLINK_CLASSLIB "Place a symlink of SCCLassLibrary instead of 
copying" OFF)
- 
-+option(SYSTEM_ABLETON_LINK "Use link from system" OFF)
- option(SYSTEM_BOOST   "Use boost libraries from system" OFF)
- option(SYSTEM_YAMLCPP "Use yaml-cpp library from system" OFF)
- 
-diff --git c/lang/CMakeLists.txt w/lang/CMakeLists.txt
-index 9b5095d11..5374fb29f 100644
 c/lang/CMakeLists.txt
-+++ w/lang/CMakeLists.txt
-@@ -252,7 +252,25 @@ endif()
- 
- if (SC_ABLETON_LINK)
-   message(STATUS "Compiling with Ableton Link support")
--  include(../external_libraries/link/AbletonLinkConfig.cmake)
-+  if(SYSTEM_ABLETON_LINK)
-+  find_path(ABLETON_LINK_INCLUDE ableton Link.hpp)
-+  add_library(Ableton::Link IMPORTED INTERFACE)
-+  set_property(TARGET Ableton::Link APPEND PROPERTY
-+  INTERFACE_INCLUDE_DIRECTORIES
-+  ${ABLETON_LINK_INCLUDE}/ableton
-+  )
-+  set_property(TARGET Ableton::Link APPEND PROPERTY
-+  INTERFACE_COMPILE_DEFINITIONS
-+  LINK_PLATFORM_LINUX=1
-+  )
-+  set_property(TARGET Ableton::Link APPEND PROPERTY
-+  INTERFACE_SOURCES
-+  ${ABLETON_LINK_INCLUDE}/ableton/Link.hpp
-+  )
-+  else()
-+  include(../external_libraries/link/AbletonLinkConfig.cmake)
-+  endif()
-+
-   target_link_libraries(libsclang Ableton::Link)
- 
-   add_definitions(-DSC_ABLETON_LINK)

Added: supercollider-3.11.0-use_system_link.patch
===
--- supercollider-3.11.0-use_system_link.patch  (rev 0)
+++

[arch-commits] Commit in supercollider/trunk (3 files)

2019-02-02 Thread David Runge via arch-commits 
Date: Saturday, February 2, 2019 @ 18:27:57
  Author: dvzrv
Revision: 429209

Upgrading to 3.10.1. Backporting proposed upstream fix for external libraries 
vs. system libraries.

Added:
  supercollider/trunk/supercollider-use_system_boost.patch
Modified:
  supercollider/trunk/PKGBUILD
Deleted:
  supercollider/trunk/use-system-boost.patch

--+
 PKGBUILD |   12 -
 supercollider-use_system_boost.patch |  359 +
 use-system-boost.patch   |   75 --
 3 files changed, 365 insertions(+), 81 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-02-02 18:24:45 UTC (rev 429208)
+++ PKGBUILD2019-02-02 18:27:57 UTC (rev 429209)
@@ -4,8 +4,8 @@
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.10.0
-pkgrel=3
+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;
@@ -19,12 +19,12 @@
 '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'
+"${pkgname}-use_system_boost.patch"
 )
 install="${pkgname}.install"
-sha512sums=('5670f0264329f0e90ed9c1b5bf63853fd67cd83ad48e2d96979ca548ed42265105d766e7fbb51839cb7b917a687929080e7c42f1c0baf3eb36a5365dee4b12bb'
+sha512sums=('283fb44f3c5d690f0c646782f3ac4d3cab6c9d787982006c85c743246f32bbe0de2b79dd1f6b183fd9a5085424b956c8e7c25878ef2418e50d41e1f8d85ed0b9'
 
'9980d77802f18fd56d2a13f24f070e81768d9111b2cc63e479a0e9b405a04aec28bc523e5d36aab0462af6a3831d64598470cdc6c3266431e2ca64aa427a6bf2'
-
'5e42f64e5e08ca9e03870e662b6694a0c41f4ab2e6522c8d2aade617a68b4455dc1932a18de18176a9ed9fc89e36f1f1ec76d3e3ff8322d0d1e8ae6fb85cbce9')
+
'd9b2ef108673b11a27c63654ceacf3b7e51df11ce05fc6d9045abd219ea718c2552f5ea026a5182c272639e695a1073192013b14cae257e7e4b00dd3c303ecae')
 
 prepare() {
   mv -v "${_name}-Source" "${pkgname}-${pkgver}"
@@ -34,7 +34,7 @@
   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
+  patch -Np1 -i ../"${pkgname}-use_system_boost.patch"
   mkdir -v build
 }
 

Added: supercollider-use_system_boost.patch
===
--- supercollider-use_system_boost.patch(rev 0)
+++ supercollider-use_system_boost.patch2019-02-02 18:27:57 UTC (rev 
429209)
@@ -0,0 +1,359 @@
+diff --git c/CMakeLists.txt w/CMakeLists.txt
+index 063028774..a6b76f49b 100644
+--- c/CMakeLists.txt
 w/CMakeLists.txt
+@@ -253,20 +253,43 @@ if (NOT WIN32)
+ endif()
+ 
+ if(SYSTEM_BOOST)
+-  set(Boost_USE_MULTITHREADED  ON)
+-  find_package( Boost 1.50.0 COMPONENTS  thread system filesystem 
program_options regex test_exec_monitor )
+-endif()
+-
+-if (Boost_FOUND)
+-  link_directories(${Boost_LIBRARY_DIRS})
++set(Boost_USE_MULTITHREADED ON)
++find_package( Boost 1.50.0 COMPONENTS  thread system filesystem 
program_options regex test_exec_monitor )
++if (Boost_FOUND)
++# we're specifically setting up the boost libraries here, so we can
++# name them
++add_library(boost_thread_lib SHARED IMPORTED)
++set_property(TARGET boost_thread_lib PROPERTY IMPORTED_LOCATION
++  ${Boost_THREAD_LIBRARY})
++add_library(boost_system_lib SHARED IMPORTED)
++set_property(TARGET boost_system_lib PROPERTY IMPORTED_LOCATION
++  ${Boost_SYSTEM_LIBRARY})
++add_library(boost_filesystem_lib SHARED IMPORTED)
++set_property(TARGET boost_filesystem_lib PROPERTY IMPORTED_LOCATION
++  ${Boost_FILESYSTEM_LIBRARY})
++add_library(boost_program_options_lib SHARED IMPORTED)
++set_property(TARGET boost_program_options_lib PROPERTY
++  IMPORTED_LOCATION ${Boost_PROGRAM_OPTIONS_LIBRARY})
++add_library(boost_regex_lib SHARED IMPORTED)
++set_property(TARGET boost_regex_lib PROPERTY IMPORTED_LOCATION
++  ${Boost_REGEX_LIBRARY})
++add_library(boost_test_exec_monitor_lib SHARED IMPORTED)
++set_property(TARGET boost_test_exec_monitor_lib PROPERTY
++  IMPORTED_LOCATION ${Boost_TEST_EXEC_MONITOR_LIBRARY})
++set(boost_include_dirs ${Boost_INCLUDE_DIRS})
++else()
++set(SYSTEM_BOOST OFF)
++set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
++message(WARNING "Not using system boost because none was found.")
++endif()
+ else()
+-  message(STATUS "building boost libraries manually")
++set(boost_include_dirs ${CMAKE_SOURCE_DIR}/external_libraries/boost)
+

[arch-commits] Commit in supercollider/trunk (3 files)

2018-04-09 Thread David Runge via arch-commits 
Date: Monday, April 9, 2018 @ 22:14:56
  Author: dvzrv
Revision: 315497

upgpkg: supercollider 3.9.3-1

Upgrading to 3.9.3, removing now unneeded yaml-cpp patch.

Modified:
  supercollider/trunk/PKGBUILD
Deleted:
  supercollider/trunk/0001-cmake-correctly-include-yaml-cpp.patch
  
supercollider/trunk/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch

-+
 0001-cmake-correctly-include-yaml-cpp.patch |   57 
--
 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch |   26 
 PKGBUILD|   15 --
 3 files changed, 3 insertions(+), 95 deletions(-)

Deleted: 0001-cmake-correctly-include-yaml-cpp.patch
===
--- 0001-cmake-correctly-include-yaml-cpp.patch 2018-04-09 21:36:27 UTC (rev 
315496)
+++ 0001-cmake-correctly-include-yaml-cpp.patch 2018-04-09 22:14:56 UTC (rev 
315497)
@@ -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
-

Deleted: 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch
===
--- 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch 
2018-04-09 21:36:27 UTC (rev 315496)
+++ 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch 
2018-04-09 22:14:56 UTC (rev 315497)
@@ -1,26 +0,0 @@
-From 031922987a1fea903ecc908d1b40d696823f1f28 Mon Sep 17 00:00:00 2001
-From: Brian Heim 
-Date: Sun, 4 Mar 2018 18:48:42 -0500
-Subject: [PATCH 2/2] set YAMLCPP_LIBRARY and YAMLCPP_INCLUDE_DIR if not using
- system
-

- external_libraries/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/external_libraries/CMakeLists.txt 
b/external_libraries/CMakeLists.txt
-index 10c466fd4..df33dc6f1 100644
 a/external_libraries/CMakeLists.txt
-+++ b/external_libraries/CMakeLists.txt
-@@ -106,6 +106,8 @@ if(NOT YAMLCPP_FOUND)
-   add_library(yaml STATIC EXCLUDE_FROM_ALL 
${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp)
-   target_include_directories(yaml PUBLIC 
${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
-   set_property( TARGET yaml PROPERTY FOLDER 3rdparty )
-+  set(YAMLCPP_LIBRARY yaml)
-+  set(YAMLCPP_INCLUDE_DIR 
${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include)
- 
-   if(CMAKE_COMPILER_IS_GNUCXX)
- target_compile_options(yaml PRIVATE -Wno-deprecated-declarations)
--- 
-2.16.2
-

Modified: PKGBUILD
===
--- PKGBUILD2018-04-09 21:36:27 UTC (rev 315496)
+++ PKGBUILD2018-04-09 22:14:56 UTC (rev 315497)
@@ -5,7 +5,7 @@
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.9.2
+pkgver=3.9.3
 pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis 
and algorithmic composition"
 arch=('x86_64')
@@ -16,22 +16,13 @@
 optdepends=('emacs: emacs interface'
 'gedit: gedit interface'
 'sc3-plugins: additional extension

[arch-commits] Commit in supercollider/trunk (3 files)

2018-03-09 Thread David Runge via arch-commits 
Date: Friday, March 9, 2018 @ 18:10:42
  Author: dvzrv
Revision: 305559

upgpkg: supercollider 3.9.1-3

Fixing FS#57767, meanwhile also fixing integration of system boost and yaml-cpp 
(with upstream patches from main developer) libraries.

Added:
  supercollider/trunk/0001-cmake-correctly-include-yaml-cpp.patch
  
supercollider/trunk/0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch
Modified:
  supercollider/trunk/PKGBUILD

-+
 0001-cmake-correctly-include-yaml-cpp.patch |   57 
++
 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch |   26 
 PKGBUILD|   24 ++--
 3 files changed, 99 insertions(+), 8 deletions(-)

Added: 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-09 18:10:42 UTC (rev 
305559)
@@ -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)
+ 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
+

Added: 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch
===
--- 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch 
(rev 0)
+++ 0002-set-YAMLCPP_LIBRARY-and-YAMLCPP_INCLUDE_DIR-if-not-u.patch 
2018-03-09 18:10:42 UTC (rev 305559)
@@ -0,0 +1,26 @@
+From 031922987a1fea903ecc908d1b40d696823f1f28 Mon Sep 17 00:00:00 2001
+From: Brian Heim 
+Date: Sun, 4 Mar 2018 18:48:42 -0500
+Subject: [PATCH 2/2] set YAMLCPP_LIBRARY and YAMLCPP_INCLUDE_DIR if not using
+ system
+
+---
+ external_libraries/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/external_libraries/CMakeLists.txt 
b/external_libraries/CMakeLists.txt
+index 10c466fd4..df33dc6f1 100644
+--- a/external_libraries/CMakeLists.txt
 b/external_libraries/CMakeLists.txt
+@@ -106,6 +106,8 @@ if(NOT YAMLCPP_FOUND)
+   add_library(yaml STATIC EXCLUDE_FROM_ALL 
${CMAKE_CURRENT_BINARY_DIR}/libyamlcpp.cpp)
+   target_include_directories(yaml PUBLIC 
${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include boost)
+   set_property( TARGET yaml PROPERTY FOLDER 3rdparty )
++  set(YAMLCPP_LIBRARY yaml)
++  set(YAMLCPP_INCLUDE_DIR 
${CMAKE_SOURCE_DIR}/external_libraries/yaml-cpp/include)
+ 
+   if(CMAKE_COMPILER_IS_GNUCXX)
+ target_compile_options(yaml PRIVATE -Wno-deprecated-declarations)
+-- 
+2.16.2
+

Modified: PKGBUILD
===
--- PKGBUILD2018-03-09 18:08:20 UTC (rev 305558)
+++ PKGBUILD2018-03-09 18:10:42 UTC (rev 305559)
@@ -6,22 +6,32 @@
 _name=SuperCollider
 pkgname=supercollider
 pkgver=3.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An environment and programming language for real time audio synthesis 
and algorithmic composition"
 arch=('x86_64')
 url="https://supercollider.github.io;
 license=('GPL3')
-depends=('boost-libs' 'fftw'