[arch-commits] Commit in rosegarden/trunk (3 files)

[Antonio Rojas]

    Date: Sunday, June 12, 2016 @ 14:54:21
  Author: arojas
Revision: 269391

Hooks

Added:
  rosegarden/trunk/rosegarden-gcc6.patch
Modified:
  rosegarden/trunk/PKGBUILD
Deleted:
  rosegarden/trunk/rosegarden.install

-----------------------+
 PKGBUILD              |   14 ++++++++++----
 rosegarden-gcc6.patch |   13 +++++++++++++
 rosegarden.install    |   15 ---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-12 12:31:37 UTC (rev 269390)
+++ PKGBUILD	2016-06-12 12:54:21 UTC (rev 269391)
@@ -7,7 +7,7 @@
 pkgname=rosegarden
 pkgver=16.02
 _pkgver=16.02
-pkgrel=1
+pkgrel=2
 pkgdesc="MIDI/audio sequencer and notation editor"
 arch=('i686' 'x86_64')
 url="http://www.rosegardenmusic.com/"
@@ -22,10 +22,16 @@
             'flac'
             'wavpack')
 [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
-md5sums=('d179f4d9b5d6b8fd1b71ba61ffc8faaa')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2" rosegarden-gcc6.patch)
+md5sums=('d179f4d9b5d6b8fd1b71ba61ffc8faaa'
+         'c79af470ecb11173a9bdfb26c6269b93')
 
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with GCC 6
+  patch -p1 -i ../rosegarden-gcc6.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: rosegarden-gcc6.patch
===================================================================
--- rosegarden-gcc6.patch	                        (rev 0)
+++ rosegarden-gcc6.patch	2016-06-12 12:54:21 UTC (rev 269391)
@@ -0,0 +1,13 @@
+diff -Nurp rosegarden-16.02.orig/src/gui/dialogs/PitchBendSequenceDialog.cpp rosegarden-16.02.mod/src/gui/dialogs/PitchBendSequenceDialog.cpp
+--- rosegarden-16.02.orig/src/gui/dialogs/PitchBendSequenceDialog.cpp	2016-02-29 13:18:01.000000000 +0100
++++ rosegarden-16.02.mod/src/gui/dialogs/PitchBendSequenceDialog.cpp	2016-04-25 07:30:49.578374291 +0200
+@@ -919,7 +919,7 @@ PitchBendSequenceDialog::addStepwiseEven
+         {
+             const int rawStepSize = spinboxToControlDelta(m_stepSize);
+             if (rawStepSize == 0) { return; }
+-            numSteps = abs(float(valueChange) / float(rawStepSize) + 0.5);
++            numSteps = fabs(float(valueChange) / float(rawStepSize) + 0.5);
+             break;
+         }
+     }
+

Deleted: rosegarden.install
===================================================================
--- rosegarden.install	2016-06-12 12:31:37 UTC (rev 269390)
+++ rosegarden.install	2016-06-12 12:54:21 UTC (rev 269391)
@@ -1,15 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et: