diff options
| author | Florian Franzmann | 2018-12-31 14:05:06 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2019-01-01 18:18:23 +0100 |
| commit | 96916e747a1bc56dcc50309da238a6ccac2421ce (patch) | |
| tree | 2486278c454b47aa3383f04de75675d4e935f300 /qt5-cmake | |
| parent | aeecb0afae4f6e96f7a2cbf2bd86796326f1464d (diff) | |
qt5-cmake/drumstick: version 1.1.0
Diffstat (limited to 'qt5-cmake')
| -rwxr-xr-x | qt5-cmake/drumstick/DETAILS | 4 | ||||
| -rw-r--r-- | qt5-cmake/drumstick/HISTORY | 4 | ||||
| -rwxr-xr-x | qt5-cmake/drumstick/PRE_BUILD | 1 | ||||
| -rw-r--r-- | qt5-cmake/drumstick/gcc6.patch | 38 |
4 files changed, 6 insertions, 41 deletions
diff --git a/qt5-cmake/drumstick/DETAILS b/qt5-cmake/drumstick/DETAILS index d638ecbec2..a8476d2c3e 100755 --- a/qt5-cmake/drumstick/DETAILS +++ b/qt5-cmake/drumstick/DETAILS @@ -1,6 +1,6 @@ SPELL=drumstick - VERSION=1.0.2 - SOURCE_HASH=sha512:df8d36b58e83b1e06cd1e4788e63c504bf2282c26f505509b2125e6c7be8ce8bc013774755b68e36f372a8682328459a5efb67ff09be1e0190805528458b3e45 + VERSION=1.1.0 + SOURCE_HASH=sha512:1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da SOURCE=$SPELL-$VERSION.tar.bz2 SOURCE_URL[0]=http://sourceforge.net/projects/drumstick/files/$SOURCE SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION diff --git a/qt5-cmake/drumstick/HISTORY b/qt5-cmake/drumstick/HISTORY index 111a5e0db4..7c978e5240 100644 --- a/qt5-cmake/drumstick/HISTORY +++ b/qt5-cmake/drumstick/HISTORY @@ -1,3 +1,7 @@ +2018-12-31 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 1.1.0 + * PRE_BUILD, gcc6.patch: remove obsolete patch + 2016-05-23 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.0.2 * gcc6.patch: added diff --git a/qt5-cmake/drumstick/PRE_BUILD b/qt5-cmake/drumstick/PRE_BUILD index a27a7bbcdb..36070cceba 100755 --- a/qt5-cmake/drumstick/PRE_BUILD +++ b/qt5-cmake/drumstick/PRE_BUILD @@ -1,4 +1,3 @@ default_pre_build && cd $SOURCE_DIRECTORY && -patch -p1 <$SPELL_DIRECTORY/gcc6.patch && sed -i '/update_xdg_mimetypes/D;/LIB_SUFFIX/s/64//' CMakeLists.txt diff --git a/qt5-cmake/drumstick/gcc6.patch b/qt5-cmake/drumstick/gcc6.patch deleted file mode 100644 index ca465239a1..0000000000 --- a/qt5-cmake/drumstick/gcc6.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: library/file/qove.cpp -=================================================================== ---- a/library/file/qove.cpp (revision 316) -+++ b/library/file/qove.cpp (working copy) -@@ -11356,7 +11356,7 @@ - OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k); - QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo); - -- if (k == 0 || (k > 0 && abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) { -+ if (k == 0 || (k > 0 && std::abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) { - int tick = d->mtt.getTick(k, 0); - int tempo = (int) measure->getTypeTempo(); - tempos[tick] = tempo; -@@ -11739,7 +11739,7 @@ - } - case OVE::Articulation_Arpeggio: { - //if( art->getChangeSoundEffect() ) { -- unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second); -+ unsigned int soundEffect = std::abs(art->getSoundEffect().first) + std::abs(art->getSoundEffect().second); - int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1); - startTick -= tickAmount; - //} -Index: utils/testevents/testevents.cpp -=================================================================== ---- a/utils/testevents/testevents.cpp (revision 316) -+++ b/utils/testevents/testevents.cpp (working copy) -@@ -262,7 +262,7 @@ - dumpEvent(new KeyPressEvent(5, 60, 124)); - dumpEvent(new ChanPressEvent(6, 111)); - dumpEvent(new PitchBendEvent(7, 1234)); -- char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7}; -+ char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0', '\x7f', '\0', '\x41', '\xf7'}; - dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex)))); - QString text = "This can be a copyright, song name, instrument, lyric..."; - TextEvent te(text, 3); --- -cgit v0.12 - |