[arch-commits] Commit in hydrogen/trunk (12 files)
David Runge
dvzrv at archlinux.org
Tue Mar 6 22:10:06 UTC 2018
Date: Tuesday, March 6, 2018 @ 22:10:05
Author: dvzrv
Revision: 303333
upgpkg: hydrogen 0.9.7-1
Upgrading to 0.9.7. Adding portaudio/portmidi to depends. Making source unique.
Adding all necessary patches to be able to build. Building html manual and tutorial and updating translations.
Adding various docs and cleaning up build.
Added:
hydrogen/trunk/1000_portaudio_v2.patch
hydrogen/trunk/1010-spelling.patch
hydrogen/trunk/fix_cmake_cache.patch
hydrogen/trunk/fix_cxx_flags.patch
hydrogen/trunk/fix_desktop_file.patch
hydrogen/trunk/fix_dtd_version.patch
hydrogen/trunk/fix_man_path.patch
hydrogen/trunk/fix_missing_locale.patch
hydrogen/trunk/fix_python2.patch
hydrogen/trunk/fix_rubberband_path.patch
Modified:
hydrogen/trunk/PKGBUILD
Deleted:
hydrogen/trunk/.contrib
---------------------------+
.contrib | 2
1000_portaudio_v2.patch | 43 ++++++++++++
1010-spelling.patch | 153 ++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 110 ++++++++++++++++++++++++++-----
fix_cmake_cache.patch | 12 +++
fix_cxx_flags.patch | 11 +++
fix_desktop_file.patch | 25 +++++++
fix_dtd_version.patch | 22 ++++++
fix_man_path.patch | 11 +++
fix_missing_locale.patch | 10 ++
fix_python2.patch | 8 ++
fix_rubberband_path.patch | 11 +++
12 files changed, 398 insertions(+), 20 deletions(-)
Deleted: .contrib
===================================================================
--- .contrib 2018-03-06 22:08:43 UTC (rev 303332)
+++ .contrib 2018-03-06 22:10:05 UTC (rev 303333)
@@ -1,2 +0,0 @@
-# Contributor: K. Piche <kpiche at rogers.com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
Added: 1000_portaudio_v2.patch
===================================================================
--- 1000_portaudio_v2.patch (rev 0)
+++ 1000_portaudio_v2.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,43 @@
+Description: ???
+Author: ???
+Forwarded: mauser at smoors.de
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/core/include/hydrogen/IO/PortAudioDriver.h
++++ b/src/core/include/hydrogen/IO/PortAudioDriver.h
+@@ -30,6 +30,9 @@
+
+ #ifdef H2CORE_HAVE_PORTAUDIO
+
++#define PortAudioStream PaStream
++#define PaTimestamp PaTime
++
+ #include <inttypes.h>
+ #include <portaudio.h>
+
+--- a/src/core/src/IO/portaudio_driver.cpp
++++ b/src/core/src/IO/portaudio_driver.cpp
+@@ -68,7 +68,13 @@
+ m_pOut_L = new float[ m_nBufferSize ];
+ m_pOut_R = new float[ m_nBufferSize ];
+
+- int err = Pa_Initialize();
++ PaError err = Pa_Initialize();
++
++ typedef struct
++ {
++ float left_phase;
++ float right_phase;
++ } paTestData;
+
+
+ if ( err != paNoError ) {
+@@ -84,7 +90,7 @@
+ m_nSampleRate, // sample rate
+ m_nBufferSize, // frames per buffer
+ portAudioCallback, /* specify our custom callback */
+- this ); /* pass our data through to callback */
++ (void*)this ); /* pass our data through to callback */
+
+
+ if ( err != paNoError ) {
Added: 1010-spelling.patch
===================================================================
--- 1010-spelling.patch (rev 0)
+++ 1010-spelling.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,153 @@
+Description: Fix some spelling.
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: mauser at smoors.de
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/core/src/IO/jack_output.cpp
++++ b/src/core/src/IO/jack_output.cpp
+@@ -152,13 +152,13 @@
+ INFOLOG( "Could not connect so saved out-ports. Connecting to first pair of in-ports" );
+ const char ** portnames = jack_get_ports ( client, NULL, NULL, JackPortIsInput );
+ if ( !portnames || !portnames[0] || !portnames[1] ) {
+- ERRORLOG( "Could't locate two Jack input port" );
++ ERRORLOG( "Couldn't locate two Jack input ports" );
+ Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
+ return 2;
+ }
+ if ( jack_connect( client, jack_port_name( output_port_1 ), portnames[0] ) != 0 ||
+ jack_connect( client, jack_port_name( output_port_2 ), portnames[1] ) != 0 ) {
+- ERRORLOG( "Could't connect to first pair of Jack input ports" );
++ ERRORLOG( "Couldn't connect to first pair of Jack input ports" );
+ Hydrogen::get_instance()->raiseError( Hydrogen::JACK_CANNOT_CONNECT_OUTPUT_PORT );
+ return 2;
+ }
+--- a/src/core/src/IO/midi_input.cpp
++++ b/src/core/src/IO/midi_input.cpp
+@@ -254,7 +254,7 @@
+ else if(Preferences::get_instance()->m_bMidiFixedMapping ){
+ pInstr = instrList->findMidiNote( nNote );
+ if(pInstr == NULL) {
+- ERRORLOG( QString( "Can't find correponding Intrument for note %1" ).arg( nNote ));
++ ERRORLOG( QString( "Can't find corresponding Instrument for note %1" ).arg( nNote ));
+ return;
+ }
+ nInstrument = instrList->index(pInstr);
+--- a/src/core/src/helpers/legacy.cpp
++++ b/src/core/src/helpers/legacy.cpp
+@@ -106,7 +106,7 @@
+ DEBUGLOG( "Using back compatibility code. filename node found" );
+ QString sFilename = instrument_node.read_string( "filename", "" );
+ if( sFilename.isEmpty() ) {
+- ERRORLOG( "filename back compability node is empty" );
++ ERRORLOG( "filename back compatibility node is empty" );
+ } else {
+
+ Sample* sample = new Sample( dk_path+"/"+sFilename );
+--- a/src/core/src/helpers/xml.cpp
++++ b/src/core/src/helpers/xml.cpp
+@@ -159,7 +159,7 @@
+ {
+ QFile file( filepath );
+ if ( !file.open( QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate ) ) {
+- ERRORLOG( QString( "Unable to open %1 for writting" ).arg( filepath ) );
++ ERRORLOG( QString( "Unable to open %1 for writing" ).arg( filepath ) );
+ return false;
+ }
+ QTextStream out( &file );
+--- a/src/core/src/lilypond/lilypond.cpp
++++ b/src/core/src/lilypond/lilypond.cpp
+@@ -30,7 +30,7 @@
+ * It contains the notation style (states the position of notes), and for this
+ * it follows the "Guide to Standardized Drumset Notation" by Norman Weinberg.
+ *
+- * Note that the GM-kit uses two unconventionnal intruments: "Stick" and
++ * Note that the GM-kit uses two unconventionnal instruments: "Stick" and
+ * "Hand Clap", so for those I did what I could and used the recommended
+ * triangle notehead to distinguish them for drum and cymbal notation.
+ */
+--- a/src/core/src/midi_action.cpp
++++ b/src/core/src/midi_action.cpp
+@@ -87,7 +87,7 @@
+ * in midi_input.cpp .
+ *
+ * Each action has two independ parameters. The two parameters are optional and
+-* can be used to carry additional informations, which mean
++* can be used to carry additional information, which mean
+ * only something to this very Action. They can have totally different meanings for other Actions.
+ * Example: parameter1 is the Mixer strip and parameter 2 a multiplier for the volume change on this strip
+ *
+--- a/src/core/src/preferences.cpp
++++ b/src/core/src/preferences.cpp
+@@ -102,7 +102,7 @@
+
+ char * ladpath = getenv( "LADSPA_PATH" ); // read the Environment variable LADSPA_PATH
+ if ( ladpath ) {
+- INFOLOG( "Found LADSPA_PATH enviroment variable" );
++ INFOLOG( "Found LADSPA_PATH environment variable" );
+ QString sLadspaPath = QString::fromLocal8Bit(ladpath);
+ int pos;
+ while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
+--- a/src/gui/src/ExportSongDialog.cpp
++++ b/src/gui/src/ExportSongDialog.cpp
+@@ -66,7 +66,7 @@
+ setWindowTitle( trUtf8( "Export song" ) );
+
+ exportTypeCombo->addItem(trUtf8("Export to a single track"));
+- exportTypeCombo->addItem(trUtf8("Export to seperate tracks"));
++ exportTypeCombo->addItem(trUtf8("Export to separate tracks"));
+ exportTypeCombo->addItem(trUtf8("Both"));
+
+ HydrogenApp::get_instance()->addEventListener( this );
+--- a/src/gui/src/PatternEditor/DrumPatternEditor.cpp
++++ b/src/gui/src/PatternEditor/DrumPatternEditor.cpp
+@@ -92,7 +92,7 @@
+ // check engine state
+ int state = engine->getState();
+ if ( (state != STATE_READY) && (state != STATE_PLAYING) ) {
+- ERRORLOG( "FIXME: skipping pattern editor update (state shoud be READY or PLAYING)" );
++ ERRORLOG( "FIXME: skipping pattern editor update (state should be READY or PLAYING)" );
+ return;
+ }
+
+--- a/src/gui/src/SampleEditor/SampleEditor_UI.ui
++++ b/src/gui/src/SampleEditor/SampleEditor_UI.ui
+@@ -641,7 +641,7 @@
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 4 default processing options</p>
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 5 equivalent to --no-lamination --window-short (may be good for drums)</p>
+ <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>
+-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">more informations about you can find here:</p>
++<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">you can find more information here:</p>
+ <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.breakfastquay.com/rubberband/ "><span style=" text-decoration: underline; color:#0000ff;">http://www.breakfastquay.com/rubberband/ </span></a></p></body></html></string>
+ </property>
+ <item>
+--- a/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
++++ b/src/gui/src/SoundLibrary/SoundLibraryPanel.cpp
+@@ -493,7 +493,7 @@
+ bool conditionalLoad = false;
+ bool hasNotes = false;
+
+- INFOLOG("Old kit has " + QString::number( oldCount ) + " intruments, new one has " + QString::number( newCount ) );
++ INFOLOG("Old kit has " + QString::number( oldCount ) + " instruments, new one has " + QString::number( newCount ) );
+
+ if ( newCount < oldCount )
+ {
+@@ -520,7 +520,7 @@
+ QMessageBox msgBox;
+ msgBox.setWindowTitle("Hydrogen");
+ msgBox.setIcon( QMessageBox::Warning );
+- msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new intruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
++ msgBox.setText( tr( "The existing kit has %1 instruments but the new one only has %2.\nThe first %2 instruments will be replaced with the new instruments and will keep their notes, but some of the remaining instruments have notes.\nWould you like to keep or discard the remaining instruments and notes?\n").arg( QString::number( oldCount ),QString::number( newCount ) ) );
+
+ msgBox.setStandardButtons(QMessageBox::Save);
+ msgBox.setButtonText(QMessageBox::Save, trUtf8("Keep"));
+--- a/src/core/src/local_file_mgr.cpp
++++ b/src/core/src/local_file_mgr.cpp
+@@ -1078,7 +1078,7 @@
+ return false;
+ } else {
+ _WARNINGLOG( QString("File '%1' is being read in "
+- "TinyXML compatability mode")
++ "TinyXML compatibility mode")
+ .arg(filename) );
+ return true;
+ }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-06 22:08:43 UTC (rev 303332)
+++ PKGBUILD 2018-03-06 22:10:05 UTC (rev 303333)
@@ -1,39 +1,113 @@
# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Rob Til Freedmen <rob.til.freedman at gmail.com>
+# Contributor: Ray Rashif <schiv at archlinux.org>
# Contributor: tobias <tobias at archlinux.org>
-# Contributor: see .contrib
pkgname=hydrogen
-pkgver=0.9.6.1
-pkgrel=4
+pkgver=0.9.7
+pkgrel=1
pkgdesc="An advanced drum machine"
arch=('x86_64')
license=('GPL')
url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt4' 'jack' 'libpulse')
-optdepends=('rubberband')
-makedepends=('cmake')
-source=("https://github.com/hydrogen-music/hydrogen/archive/$pkgver.tar.gz")
-md5sums=('527a44eec22fd31f55e6b3cf1089613d')
+depends=('jack' 'ladspa' 'lash' 'libarchive' 'liblrdf' 'liblo' 'portaudio'
+'portmidi' 'libpulse' 'qt4')
+makedepends=('cmake' 'cppunit' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
+'docbook-xsl' 'poxml' 'xmlto')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}-music/${pkgname}/archive/${pkgver}.tar.gz"
+ '1000_portaudio_v2.patch'
+ '1010-spelling.patch'
+ 'fix_cmake_cache.patch'
+ 'fix_cxx_flags.patch'
+ 'fix_desktop_file.patch'
+ 'fix_dtd_version.patch'
+ 'fix_man_path.patch'
+ 'fix_missing_locale.patch'
+ 'fix_python2.patch'
+ 'fix_rubberband_path.patch')
+sha512sums=('1480a18d1181d12e92a53e89a4d1c8f4ae9a8a9a02271e6af4089afaaca9d658abb3876dc7db08a453bbe3ab7f66f31567d992f30102818782b62ebba5141f58'
+ '1fa94eeeec1b1d5e685d5fd5dc0a5cce0ed59f38107589ca226bea79c45db9e7377b5a3e13c0f568b6b2611250b70d44d37bc1e29609d959c4eaccbfb2fd47a5'
+ '843ab2a1c74f26fe124c7324f52fb22c3d85274de0ccf4552df0a90a83669571db320287f00fc737d1731da7e21b42d883d64c889ac9193cae8ce745eb44d8bb'
+ '1bc99593ba75af5ffac932bd48d294fdf7c0005530e76145908485d8f79e7ef35cac50fca9df3fbbe672ab8250f76613c3d73ca89253198bfd5d8d6d298a452e'
+ '3bea26ce1fc4fd9518e2a43d3b6474867cf2cb2abbb207a29fd001d95224b6d481aecd32ff6f7231a62ad4b612e107204f4e043c1b8adad09a580b87bb9bed74'
+ '520c11da80610e4ccc5c03066de8ab1e9b0027b24d76c25146a622fffa2e94da9b89961e8f80b50f5e6ea5ea84efb5e314ea2bd7b221a02a0061e781b6f54c00'
+ 'f1024ed99711c18f6e80ccacee119c91ee14cfdc5493ac07c6c152a9ca9875de349f6fcd818dc9a036e79577101ae7afc2ce5b324660a4ebb89a9e0a72129510'
+ '1f640706182cffbf1c11fe639bc749ec1bdfa9e0def77fd2673f64fa314586a8067bbea224d7f9be6c534ac9854ae44c6c9de3ba4b6229d3691a95aeb9036420'
+ '833c57f342b2a7088df28762a9a0ada4ff5351013f63cc9c499db9da9713ac5612cc06ac359816f2d0ad7e6b7291dcc2e81094e4aed348c38583b31d6115b6b3'
+ '38c473173ceda0a3880eadce7e706f0f22fd8ff79bbbcb023b7948ffdd499f47c148d627766c78530663c396547654e04b4fe1a9f383cdd8b77a83071c28a173'
+ '514d77d2207322ca57d0e9f872b8d3d5f1a6e41c9765f54d6a5bb88cb68d2c308234a77235e5012c4a12d01137f1772eb1b4ea9454a31c9d1199cb6772b78322')
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ # fix libpulse requirement
+ sed -i 's|pulseaudio pulse/|libpulse pulse/|' CMakeLists.txt
+ # fix raptor2 include path
+ sed -i 's|${RAPTOR_INCLUDE_DIR}|/usr/include/raptor2|' src/core/CMakeLists.txt
+ # patches from debian
+ msg "1000_portaudio_v2.patch"
+ patch -Np1 -i "${srcdir}/1000_portaudio_v2.patch"
+ msg "1010-spelling.patch"
+ patch -Np1 -i "${srcdir}/1010-spelling.patch"
+ # various fixes
+ msg "fix_dtd_version.patch"
+ patch -Np1 -i "${srcdir}/fix_dtd_version.patch"
+ msg "fix_rubberband_path.patch"
+ patch -Np1 -i "${srcdir}/fix_rubberband_path.patch"
+ msg "fix_missing_locale.patch"
+ msg "fix_missing_locale.patch"
+ patch -Np1 -i "${srcdir}/fix_missing_locale.patch"
+ msg "fix_desktop_file.patch"
+ patch -Np1 -i "${srcdir}/fix_desktop_file.patch"
+ msg "fix_cmake_cache.patch"
+ patch -Np1 -i "${srcdir}/fix_cmake_cache.patch"
+ msg "fix_cxx_flags.patch"
+ patch -Np1 -i "${srcdir}/fix_cxx_flags.patch"
+ msg "fix_man_path.patch"
+ patch -Np1 -i "${srcdir}/fix_man_path.patch"
+ msg "fix_python2.patch"
+ patch -Np1 -i "${srcdir}/fix_python2.patch"
+ # out-of-tree build
+ mkdir -v build
+}
+
build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # lash will have to wait until I bring it into [extra] --schiv
- cmake . -DCMAKE_INSTALL_PREFIX=/usr \
- -DWANT_CPPUNIT=OFF \
- -DWANT_LRDF=ON
+ cd "${pkgname}-${pkgver}/build"
+ # rubberband is disabled (not properly discovered and apparently broken)
+ cmake .. -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWANT_DEBUG=OFF \
+ -DWANT_CPPUNIT=ON \
+ -DWANT_LASH=ON \
+ -DWANT_LRDF=ON \
+ -DWANT_PORTAUDIO=ON \
+ -DWANT_PORTMIDI=ON \
+ -DWANT_PULSEAUDIO=ON \
+ -DWANT_RUBBERBAND=OFF
make
+ # build html manual & tutorial
+ cd ../data/doc
+ make
+ # update translations
+ cd ../i18n
+ ./updateTranslations.sh
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
+ cd "${pkgname}-${pkgver}/build"
make DESTDIR="$pkgdir" install
# TODO: tell upstream to comply with freedesktop.org icon conventions
sed -i 's:Icon=h2-icon:Icon=/usr/share/hydrogen/data/img/gray/h2-icon.svg:' \
- "$pkgdir/usr/share/applications/$pkgname.desktop"
+ "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+ # docs
+ install -t "${pkgdir}/usr/share/doc/${pkgname}" \
+ -vDm644 ../{ChangeLog,DEVELOPERS,INSTALL.txt,README.txt}
+
+ # clean up data dir
+ rm "$pkgdir/usr/share/${pkgname}/data/i18n/"{*.ts,stats.py,updateTranslations.sh} \
+ "$pkgdir/usr/share/${pkgname}/data/doc/"{*.docbook,*.po,*.pot,Makefile,TODO,README.DOCUMENTATION.txt}
}
# vim:set ts=2 sw=2 et:
Added: fix_cmake_cache.patch
===================================================================
--- fix_cmake_cache.patch (rev 0)
+++ fix_cmake_cache.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,12 @@
+# Hydrogen can only be built with empty cmake cache
+# https://github.com/hydrogen-music/hydrogen/issues/539
+--- a/cmake/FindHelper.cmake 2016-11-05 09:22:50.000000000 +0100
++++ b/cmake/FindHelper.cmake 2017-11-20 11:35:19.412334235 +0200
+@@ -18,6 +18,7 @@
+
+ if(${prefix}_INCLUDE_DIR AND ${prefix}_LIBRARIES)
+ set(${prefix}_FIND_QUIETLY TRUE)
++ set(${prefix}_FOUND TRUE)
+ else()
+ if(NOT WIN32)
+ FIND_PACKAGE(PkgConfig)
Added: fix_cxx_flags.patch
===================================================================
--- fix_cxx_flags.patch (rev 0)
+++ fix_cxx_flags.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2016-11-05 09:22:50.000000000 +0100
++++ b/CMakeLists.txt 2017-07-28 11:35:19.412334235 +0200
+@@ -106,7 +106,7 @@
+ 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")
++SET(CMAKE_CXX_FLAGS "${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()
Added: fix_desktop_file.patch
===================================================================
--- fix_desktop_file.patch (rev 0)
+++ fix_desktop_file.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,25 @@
+--- a/linux/hydrogen.desktop 2016-11-05 09:22:50.000000000 +0100
++++ b/linux/hydrogen.desktop 2017-07-28 15:25:19.412346723 +0200
+@@ -19,19 +13,17 @@
+ GenericName[tr]=Davul Makinası
+ GenericName[fr]=Boîte à rythme
+
+-Encoding=UTF-8
+ Version=1.0
+
+ Type=Application
+-Categories=Application;AudioVideo;Sound;Audio;Qt;
++Categories=AudioVideo;Audio;Qt;
+ Keywords=audio;sound;jackd;sampler;drum;
+
+-MimeType=text/xml
++MimeType=text/xml;
+
+-FilePattern=hydrogen
+ Exec=hydrogen %F
+ TryExec=hydrogen
+ Terminal=false
+ StartupNotify=true
+
+-Icon=h2-icon
++Icon=h2-icon.svg
Added: fix_dtd_version.patch
===================================================================
--- fix_dtd_version.patch (rev 0)
+++ fix_dtd_version.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,22 @@
+--- a/data/doc/manual.docbook 2016-11-05 09:22:50.000000000 +0100
++++ b/data/doc/manual.docbook 2017-07-28 18:03:51.938394459 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?> <!-- -*- mode:nxml; indent-tabs-mode:nil; fill-column:80; -*- -->
+- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
+- "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
++ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
++ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ <book id="Hydrogen-manual" lang="en">
+
+ <bookinfo>
+--- a/data/doc/tutorial.docbook 2016-11-05 09:22:50.000000000 +0100
++++ b/data/doc/tutorial.docbook 2017-07-28 18:03:51.938394459 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
+- "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
++ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+ <book id="Hydrogen-tutorial" lang="en">
+
+ <bookinfo>
Added: fix_man_path.patch
===================================================================
--- fix_man_path.patch (rev 0)
+++ fix_man_path.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2016-11-05 09:22:50.000000000 +0100
++++ b/CMakeLists.txt 2017-07-28 14:35:19.488234235 +0200
+@@ -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()
+
+ #
Added: fix_missing_locale.patch
===================================================================
--- fix_missing_locale.patch (rev 0)
+++ fix_missing_locale.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,10 @@
+--- a/data/i18n/updateTranslations.sh 2016-11-05 09:22:50.000000000 +0100
++++ b/data/i18n/updateTranslations.sh 2017-07-28 12:25:19.230534851 +0200
+@@ -35,6 +35,7 @@
+ $CMD ../../data/i18n/hydrogen.de.ts
+ $CMD ../../data/i18n/hydrogen.sv.ts
+ $CMD ../../data/i18n/hydrogen.hr.ts
++$CMD ../../data/i18n/hydrogen.ca.ts
+ $CMD ../../data/i18n/hydrogen.cs.ts
+ $CMD ../../data/i18n/hydrogen.el.ts
+ $CMD ../../data/i18n/hydrogen.gl.ts
Added: fix_python2.patch
===================================================================
--- fix_python2.patch (rev 0)
+++ fix_python2.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,8 @@
+--- a/data/i18n/stats.py 2016-11-05 09:22:50.000000000 +0100
++++ b/data/i18n/stats.py 2017-07-28 18:03:51.908394459 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+
+ from xml.dom import minidom, Node
+
Added: fix_rubberband_path.patch
===================================================================
--- fix_rubberband_path.patch (rev 0)
+++ fix_rubberband_path.patch 2018-03-06 22:10:05 UTC (rev 303333)
@@ -0,0 +1,11 @@
+--- a/data/hydrogen.default.conf 2016-11-05 09:22:50.000000000 +0100
++++ b/data/hydrogen.default.conf 2017-07-28 11:05:14.481532464 +0200
+@@ -19,7 +19,7 @@
+ <hearNewNotes>true</hearNewNotes>
+ <recordEvents>false</recordEvents>
+ <quantizeEvents>true</quantizeEvents>
+- <path_to_rubberband>Path to Rubberband-CLI</path_to_rubberband>
++ <path_to_rubberband>/usr/bin/rubberband</path_to_rubberband>
+ <recentUsedSongs />
+ <recentlyUsedEffects />
+ <serverList>
More information about the arch-commits
mailing list