diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | use-clang.patch | 32 |
3 files changed, 7 insertions, 46 deletions
@@ -1,6 +1,6 @@ pkgbase = radium pkgdesc = A graphical music editor. A next generation tracker. - pkgver = 5.9.67 + pkgver = 5.9.69 pkgrel = 1 url = https://users.notam02.no/~kjetism/radium arch = i686 @@ -31,13 +31,11 @@ pkgbase = radium optdepends = calf-ladspa: Default chorus plugin optdepends = ladspa-plugins: Package group for default radium plugins incl in binary releases options = !strip - source = https://github.com/kmatheussen/radium/archive/5.9.67.tar.gz - source = use-clang.patch + source = https://github.com/kmatheussen/radium/archive/5.9.69.tar.gz source = use-libtirpc-headers.patch source = use-system-libxcb.patch source = use-system-vstsdk.patch - sha256sums = e1f19c2b447703efb1eb1bf40908526c588da32619614649c5b608ee1cf29e0a - sha256sums = 1e6e4d9110ca1e939d62eb68e89deb03facc41a5d7d0bde3aa6e4e5fff768346 + sha256sums = 6eefd28f898920a8dd264c9ac2dbf011f102a7c59aafe8d38d89acd4ee0133cc sha256sums = 0dfa3014bc6a66989564c7da2d963681f5d129eb0be28153744693dd533e4909 sha256sums = 6c29e825e06d1c3aec4afd915718b8c46da705d1411a94f7c0f777b888a9b50d sha256sums = 045e4b4c444d1a37dffdcecb87e5245188fadf68444f9a4b14207a5b98671344 @@ -3,7 +3,7 @@ # Maintainer: Teteros <teteros at teknik dot io> pkgname=radium -pkgver=5.9.67 +pkgver=5.9.69 pkgrel=1 pkgdesc="A graphical music editor. A next generation tracker." arch=('i686' 'x86_64') @@ -41,12 +41,10 @@ optdepends=( ) options=(!strip) source=("https://github.com/kmatheussen/${pkgname}/archive/${pkgver}.tar.gz" - "use-clang.patch" "use-libtirpc-headers.patch" "use-system-libxcb.patch" "use-system-vstsdk.patch") -sha256sums=('e1f19c2b447703efb1eb1bf40908526c588da32619614649c5b608ee1cf29e0a' - '1e6e4d9110ca1e939d62eb68e89deb03facc41a5d7d0bde3aa6e4e5fff768346' +sha256sums=('6eefd28f898920a8dd264c9ac2dbf011f102a7c59aafe8d38d89acd4ee0133cc' '0dfa3014bc6a66989564c7da2d963681f5d129eb0be28153744693dd533e4909' '6c29e825e06d1c3aec4afd915718b8c46da705d1411a94f7c0f777b888a9b50d' '045e4b4c444d1a37dffdcecb87e5245188fadf68444f9a4b14207a5b98671344') @@ -54,9 +52,6 @@ sha256sums=('e1f19c2b447703efb1eb1bf40908526c588da32619614649c5b608ee1cf29e0a' prepare() { cd "${pkgname}-${pkgver}" - # https://github.com/kmatheussen/radium/issues/1222 - patch -p1 < "${srcdir}/use-clang.patch" - # glibc-2.27 deprecated legacy rpc, header files for libpd are in libtirpc patch -p1 < "${srcdir}/use-libtirpc-headers.patch" @@ -74,8 +69,8 @@ prepare() { build() { cd "${pkgname}-${pkgver}" - RADIUM_QT_VERSION=5 make packages - RADIUM_QT_VERSION=5 BUILDTYPE=RELEASE ./build_linux.sh + RADIUM_USE_CLANG=1 RADIUM_QT_VERSION=5 make packages + RADIUM_USE_CLANG=1 RADIUM_QT_VERSION=5 BUILDTYPE=RELEASE ./build_linux.sh } package() { diff --git a/use-clang.patch b/use-clang.patch deleted file mode 100644 index 8d8fdfc265f6..000000000000 --- a/use-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -aur --no-dereference radium-5.9.67.pristine/bin/packages/build.sh radium-5.9.67.new/bin/packages/build.sh ---- radium-5.9.67.pristine/bin/packages/build.sh 2019-06-19 13:56:47.000000000 +0100 -+++ radium-5.9.67.new/bin/packages/build.sh 2019-06-19 17:55:42.121298953 +0100 -@@ -13,12 +13,12 @@ - export CPPFLAGS="-mtune=generic -msse2 -mfpmath=sse -fPIC -fno-strict-aliasing" - export CXXFLAGS="-mtune=generic -msse2 -mfpmath=sse -fPIC -fno-strict-aliasing" - --DASCC=gcc --DASCXX=g++ -+#DASCC=gcc -+#DASCXX=g++ - - # These two lines should be uncommented if setting CLANG=1 in build_linux_common.sh --#DASCC=clang --#DASCXX=clang++ -+DASCC=clang -+DASCXX=clang++ - - if ! env |grep RADIUM_QT_VERSION ; then - echo "Must define RADIUM_QT_VERSION to either 4 or 5. For instance: \"RADIUM_QT_VERSION=5 make packages\"" -diff -aur --no-dereference radium-5.9.67.pristine/build_linux_common.sh radium-5.9.67.new/build_linux_common.sh ---- radium-5.9.67.pristine/build_linux_common.sh 2019-06-19 13:56:47.000000000 +0100 -+++ radium-5.9.67.new/build_linux_common.sh 2019-06-19 17:55:11.894631896 +0100 -@@ -57,7 +57,7 @@ - # REQUIRES_RTTI=1 cmake -DLLVM_ENABLE_PROJECTS="clang;compiler-rt" -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$GCC_PREFIX/bin/gcc -DCMAKE_CXX_COMPILER=$GCC_PREFIX/bin/g++ -DGCC_INSTALL_PREFIX=$GCC_PREFIX -DCMAKE_INSTALL_PREFIX=/home/kjetil/site -DLLVM_ENABLE_RTTI=ON ../llvm - # REQUIRES_RTTI=1 make REQUIRES_RTTI=1 -j2 - --USE_CLANG=0 -+USE_CLANG=1 - - if [[ $USE_CLANG == 1 ]] ; then - export CLANG_PREFIX=$(dirname `which clang`)/../ |