commit ad948d140465fd553f941ef845be60bc703edcae Author: Jacek Konieczny <j.koniec...@eggsoft.pl> Date: Thu Apr 18 09:59:47 2019 +0200
Version: 1.0.0-beta1 (with Qt5 support) hydrogen.desktop.patch | 26 --------------------- hydrogen.spec | 61 +++++++++++++++++++++++++++++++++----------------- mandir.patch | 10 ++++----- 3 files changed, 46 insertions(+), 51 deletions(-) --- diff --git a/hydrogen.spec b/hydrogen.spec index 5b7493d..1809e12 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -1,35 +1,47 @@ # # TODO: # - fix localized manuals build +# +# Conditional build: +%bcond_without tests # build with tests + +%define beta beta1 +%define rel 1 Summary: Pattern based drum machine Summary(pl.UTF-8): Automat perkusyjny Name: hydrogen -Version: 0.9.7 -Release: 1 +Version: 1.0.0 +Release: 0.%{beta}.%{rel} License: GPL v2, zlib (TinyXML Library) Group: X11/Applications/Sound -Source0: http://downloads.sourceforge.net/hydrogen/%{name}-%{version}.tar.gz -# Source0-md5: fcc5639144f74efdb70c76c8edfc4f64 -Patch0: %{name}.desktop.patch -Patch1: mandir.patch +Source0: http://downloads.sourceforge.net/hydrogen/%{name}-%{version}-%{beta}.tar.gz +# Source0-md5: 788540070d1874473fd1019e9de73f4b +Patch0: mandir.patch URL: http://www.hydrogen-music.org/ # BuildRequires: portaudio-devel < 19 -BuildRequires: QtGui-devel >= 4.4.0 -BuildRequires: QtNetwork-devel >= 4.4.0 -BuildRequires: QtXml-devel >= 4.4.0 -BuildRequires: QtXmlPatterns-devel >= 4.4.0 +BuildRequires: Qt5Network-devel +BuildRequires: Qt5Gui-devel +BuildRequires: Qt5Core-devel +BuildRequires: Qt5Widgets-devel +BuildRequires: Qt5Xml-devel +BuildRequires: Qt5XmlPatterns-devel BuildRequires: alsa-lib-devel >= 1.0.0 -BuildRequires: cmake >= 2.6 +BuildRequires: cmake >= 2.8.11 +%{?with_tests:BuildRequires: cppunit-devel} BuildRequires: jack-audio-connection-kit-devel >= 0.103.0 +BuildRequires: ladspa-devel BuildRequires: lash-devel >= 0.5.0 BuildRequires: libarchive-devel +BuildRequires: liblo-devel BuildRequires: liblrdf-devel BuildRequires: libsndfile-devel >= 1.0.18 BuildRequires: pkgconfig BuildRequires: portmidi-devel -BuildRequires: qt4-build -BuildRequires: qt4-linguist +BuildRequires: pulseaudio-devel +BuildRequires: rubberband-devel +BuildRequires: qt5-build +BuildRequires: qt5-linguist # for translated manuals #BuildRequires: gnome-doc-utils #BuildRequires: kde4-poxml @@ -63,9 +75,8 @@ GNU/Linuksa. Celem programu jest umożliwienie w prosty i szybki sposób tworzenia paternów rytmicznych. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{beta} %patch0 -p1 -%patch1 -p1 %build mkdir build @@ -76,15 +87,24 @@ cd build -DWANT_ALSA=1 \ -DWANT_LIBARCHIVE=1 \ -DWANT_RUBBERBAND=1 \ - -DWANT_OSS=1 \ + -DWANT_OSS=0 \ -DWANT_PORTAUDIO=0 \ -DWANT_PORTMIDI=1 \ -DWANT_LASH=1 \ -DWANT_LRDF=1 \ - -DWANT_COREAUDIO=1 \ - -DWANT_COREMIDI=1 + -DWANT_COREAUDIO=0 \ + -DWANT_COREMIDI=0 \ + -DWANT_LADSPA=1 \ + -DLADSPA_INCLUDE_DIR=/usr/include \ + -DLADSPA_LIBRARIES=%{_libdir}/ladspa %{__make} +cd .. + +%if %{with tests} +%{__make} -C build tests +./build/src/tests/tests +%endif %install rm -rf $RPM_BUILD_ROOT @@ -99,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT%{_includedir}/hydrogen rm -rf $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/{stats.py,updateTranslations.sh} # clean up documentation -rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README.DOCUMENTATION.txt,TODO} +rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README.md,TODO} rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot} rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/img/*.h2song rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/*.ts @@ -112,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README.txt -%doc data/doc/README.DOCUMENTATION.txt %attr(755,root,root) %{_bindir}/* +%doc data/doc/README.md %attr(755,root,root) %{_libdir}/libhydrogen-core-%{version}.so %dir %{_datadir}/hydrogen @@ -151,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT %lang(ru) %{_datadir}/hydrogen/data/i18n/%{name}.ru.qm %lang(sr) %{_datadir}/hydrogen/data/i18n/%{name}.sr.qm %lang(sv) %{_datadir}/hydrogen/data/i18n/%{name}.sv.qm +%lang(uk) %{_datadir}/hydrogen/data/i18n/%{name}.uk.qm %{_mandir}/man1/hydrogen.1* %{_datadir}/appdata/*.xml diff --git a/hydrogen.desktop.patch b/hydrogen.desktop.patch deleted file mode 100644 index b2954dc..0000000 --- a/hydrogen.desktop.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -dur hydrogen-0.9.7.orig/linux/hydrogen.desktop hydrogen-0.9.7/linux/hydrogen.desktop ---- hydrogen-0.9.7.orig/linux/hydrogen.desktop 2016-11-05 09:22:50.000000000 +0100 -+++ hydrogen-0.9.7/linux/hydrogen.desktop 2017-09-03 16:05:55.647832517 +0200 -@@ -1,5 +1,6 @@ - [Desktop Entry] - Name=Hydrogen Drum Machine -+Name[pl]=Automat Perkusyjny Hydrogen - Name[de]=Hydrogen Drumsequencer - Name[ru]=Драм-машина Hydrogen - Name[hu]=Hydrogen Dobgép -@@ -7,6 +8,7 @@ - Name[fr]=Boîte à rythme Hydrogen - - Comment=Create drum sequences -+Comment[pl]=Tworzenie sekwencji perkusyjnych - Comment[de]=Schlagzeugsequenzen erstellen - Comment[ru]=Создание партий ударных инструментов - Comment[hu]=Dobszekvenciákat lehet vele készíteni -@@ -14,6 +16,7 @@ - Comment[fr]=Créer des séquences rythmiques - - GenericName=Drum Machine -+GenericName[pl]=Automat Perkusyjny - GenericName[de]=Drumsequencer - GenericName[ru]=Драм-машина - GenericName[tr]=Davul Makinası diff --git a/mandir.patch b/mandir.patch index 270d0f3..2e07ffe 100644 --- a/mandir.patch +++ b/mandir.patch @@ -1,10 +1,10 @@ -diff -dur hydrogen-0.9.7.orig/CMakeLists.txt hydrogen-0.9.7/CMakeLists.txt ---- hydrogen-0.9.7.orig/CMakeLists.txt 2016-11-05 09:22:50.000000000 +0100 -+++ hydrogen-0.9.7/CMakeLists.txt 2017-09-03 17:42:03.711259090 +0200 -@@ -358,7 +358,7 @@ - IF(NOT MINGW AND NOT APPLE) +diff -dur hydrogen-1.0.0-beta1.orig/CMakeLists.txt hydrogen-1.0.0-beta1/CMakeLists.txt +--- hydrogen-1.0.0-beta1.orig/CMakeLists.txt 2018-03-18 12:50:43.000000000 +0100 ++++ hydrogen-1.0.0-beta1/CMakeLists.txt 2019-04-18 09:12:23.000000000 +0200 +@@ -361,7 +361,7 @@ 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}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps") - 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() ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/hydrogen.git/commitdiff/ad948d140465fd553f941ef845be60bc703edcae _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit