diff --git a/srcpkgs/hydrogen/patches/cxxflags-from-env.patch b/srcpkgs/hydrogen/patches/cxxflags-from-env.patch deleted file mode 100644 index f78fc8f9889..00000000000 --- a/srcpkgs/hydrogen/patches/cxxflags-from-env.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- CMakeLists.txt.orig 2016-11-06 06:11:37.041598678 +0100 -+++ CMakeLists.txt 2016-11-06 06:19:21.978622663 +0100 -@@ -106,10 +106,10 @@ - ENDIF() - - #SET(CMAKE_CXX_FLAGS "-fno-implement-inlines -finline-small-functions -findirect-inlining -fpartial-inlining") --SET(CMAKE_CXX_FLAGS "-O2 -std=gnu++11 -Wno-deprecated-register") --IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines") --ENDIF() -+#SET(CMAKE_CXX_FLAGS "-O2 -std=gnu++11 -Wno-deprecated-register") -+#IF (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") -+# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-implement-inlines") -+#ENDIF() - - SET(CMAKE_CXX_FLAGS_RELEASE "") - diff --git a/srcpkgs/hydrogen/patches/fix-man-path.patch b/srcpkgs/hydrogen/patches/fix-man-path.patch deleted file mode 100644 index ee926681d20..00000000000 --- a/srcpkgs/hydrogen/patches/fix-man-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2016-11-06 06:21:09.000000000 +0100 -+++ CMakeLists.txt 2016-11-06 06:24:00.389637026 +0100 -@@ -358,7 +358,7 @@ - IF(NOT MINGW AND NOT APPLE) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") -- INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1") - ENDIF() - - # diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template index fed24a7e531..1b46559cdc6 100644 --- a/srcpkgs/hydrogen/template +++ b/srcpkgs/hydrogen/template @@ -1,22 +1,31 @@ # Template file for 'hydrogen' pkgname=hydrogen -version=0.9.7 -revision=2 +version=1.0.0 +revision=1 build_style=cmake -configure_args="-DWANT_LRDF=ON -DWANT_CPPUNIT=OFF" -hostmakedepends="pkg-config" +# Our flags has -g already, DEBUG=ON will add -O0 +configure_args="-DWANT_DEBUG=OFF" +hostmakedepends="pkg-config qt5-host-tools qt5-devel qt5-tools" makedepends="libsndfile-devel libarchive-devel liblrdf-devel - pulseaudio-devel jack-devel qt-devel" + pulseaudio-devel jack-devel qt5-devel qt5-xmlpatterns-devel + qt5-tools-devel ladspa-sdk liblo-devel libcppunit-devel" depends="desktop-file-utils" short_desc="Advanced drum machine" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.hydrogen-music.org/" distfiles="https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz" -checksum=1e0f3d9eae901ef5f11a61e2a446b1d819f3b38e2476a2b382cc02dea693c2b7 -python_version=2 #unverified +checksum=c4eac296a0d20578c274faf7816cf35c16ed43b634d91d2d19686bf9bbfeb970 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" qt-host-tools qt-devel" -fi -CXXFLAGS="-std=gnu++11 -Wno-deprecated-register -fno-implement-inlines" +post_patch() { + vsed -i '/INSTALL/s,"data,"/usr/share/hydrogen/data,' \ + data/i18n/CMakeLists.txt +} + +do_check() { + H2_HOME=$wrksrc ./build/src/tests/tests +} + +post_install() { + rm -rf $DESTDIR/usr/include +}