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

[Antonio Rojas]

    Date: Sunday, October 23, 2016 @ 10:40:24
  Author: arojas
Revision: 193033

Update to 3.7.2

Added:
  supercollider/trunk/supercollider-cxxflags.patch
Modified:
  supercollider/trunk/PKGBUILD
Deleted:
  supercollider/trunk/ftbfs-gcc-4.9.patch
  supercollider/trunk/supercollider.install

------------------------------+
 PKGBUILD                     |   25 +++++++++++++------------
 ftbfs-gcc-4.9.patch          |   20 --------------------
 supercollider-cxxflags.patch |   11 +++++++++++
 supercollider.install        |   12 ------------
 4 files changed, 24 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-23 10:10:13 UTC (rev 193032)
+++ PKGBUILD	2016-10-23 10:40:24 UTC (rev 193033)
@@ -4,27 +4,27 @@
 
 _name=SuperCollider
 pkgname=supercollider
-pkgver=3.6.6
-pkgrel=2
+pkgver=3.7.2
+pkgrel=1
 pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition"
 arch=('i686' 'x86_64')
 url="http://supercollider.sourceforge.net/"
 license=('GPL3')
-depends=('jack' 'fftw' 'cwiid' 'qtwebkit')
-makedepends=('cmake' 'ruby' 'vim' 'emacs')
+depends=('jack' 'fftw' 'cwiid' 'qt5-webkit')
+makedepends=('cmake' 'ruby' 'vim' 'emacs' 'qt5-tools' 'boost')
 optdepends=('emacs: emacs interface'
             'gedit: gedit interface'
             'vim: vim interface'
             'ruby: vim support')
-install="$pkgname.install"
-source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2"
-        "ftbfs-gcc-4.9.patch")
-md5sums=('14d6063933230c74e42f5923a811e7c6'
-         '257a9198e650638a9a43bad2812760f7')
+source=("https://github.com/supercollider/supercollider/releases/download/Version-$pkgver/SuperCollider-$pkgver-Source-linux.tar.bz2"
+        supercollider-cxxflags.patch)
+md5sums=('cb89a68bf599205d3c33ee1ee1e13ea0'
+         '4f62489286fe8008d6013fc59047c20b')
 
 prepare() {
-  cd "$srcdir/$_name-Source"
-  patch -Np1 -i ../ftbfs-gcc-4.9.patch
+  cd $_name-Source
+# Fix CXXFLAGS
+  patch -p1 -i ../supercollider-cxxflags.patch
 }
 
 build() {
@@ -32,7 +32,8 @@
   [ -d b ] || mkdir b && cd b
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
            -DCMAKE_BUILD_TYPE=Release \
-           -DLIBSCSYNTH=ON
+           -DLIBSCSYNTH=ON \
+           -DCMAKE_CXX_FLAGS="$CXXFLAGS -DBOOST_MATH_DISABLE_FLOAT128"
   make
 }
 

Deleted: ftbfs-gcc-4.9.patch
===================================================================
--- ftbfs-gcc-4.9.patch	2016-10-23 10:10:13 UTC (rev 193032)
+++ ftbfs-gcc-4.9.patch	2016-10-23 10:40:24 UTC (rev 193033)
@@ -1,20 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Fri, 6 Jun 2014 13:15:18 -0400
-Subject: Fix implementation of aligned_allocator::construct<U>.
-
-Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.
-
-A typo, apparently. This patch can be dropped in the next upstream release.
-Index: supercollider/server/supernova/utilities/malloc_aligned.hpp
-===================================================================
---- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp	2014-09-11 09:15:20.399357542 +0100
-+++ supercollider/server/supernova/utilities/malloc_aligned.hpp	2014-09-11 09:15:20.399357542 +0100
-@@ -243,7 +243,7 @@
-     template< class U, class... Args >
-     void construct(U * p, Args&& ... args)
-     {
--        ::new(p) T(std::forward<Args>(args)...);
-+        ::new(p) U(std::forward<Args>(args)...);
-     }
- #endif
-

Added: supercollider-cxxflags.patch
===================================================================
--- supercollider-cxxflags.patch	                        (rev 0)
+++ supercollider-cxxflags.patch	2016-10-23 10:40:24 UTC (rev 193033)
@@ -0,0 +1,11 @@
+--- SuperCollider-Source/CMakeLists.txt.orig	2016-10-23 10:21:32.322819928 +0000
++++ SuperCollider-Source/CMakeLists.txt	2016-10-23 10:21:52.259731856 +0000
+@@ -240,7 +240,7 @@
+ if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
+ 	if (SSE)
+ 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -msse")
+-		set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -msse")
++		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
+ 		if(NOT APPLE AND NOT CMAKE_COMPILER_IS_CLANG)
+ 			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpmath=sse")
+ 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse")

Deleted: supercollider.install
===================================================================
--- supercollider.install	2016-10-23 10:10:13 UTC (rev 193032)
+++ supercollider.install	2016-10-23 10:40:24 UTC (rev 193033)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
\ No newline at end of file