[arch-commits] Commit in rosegarden/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sun Jun 12 12:54:58 UTC 2016
Date: Sunday, June 12, 2016 @ 14:54:58
Author: arojas
Revision: 269392
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
rosegarden/repos/extra-i686/PKGBUILD
(from rev 269391, rosegarden/trunk/PKGBUILD)
rosegarden/repos/extra-i686/rosegarden-gcc6.patch
(from rev 269391, rosegarden/trunk/rosegarden-gcc6.patch)
rosegarden/repos/extra-x86_64/PKGBUILD
(from rev 269391, rosegarden/trunk/PKGBUILD)
rosegarden/repos/extra-x86_64/rosegarden-gcc6.patch
(from rev 269391, rosegarden/trunk/rosegarden-gcc6.patch)
Deleted:
rosegarden/repos/extra-i686/PKGBUILD
rosegarden/repos/extra-i686/rosegarden.install
rosegarden/repos/extra-x86_64/PKGBUILD
rosegarden/repos/extra-x86_64/rosegarden.install
------------------------------------+
/PKGBUILD | 108 +++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 48 ---------------
extra-i686/rosegarden-gcc6.patch | 13 ++++
extra-i686/rosegarden.install | 15 ----
extra-x86_64/PKGBUILD | 48 ---------------
extra-x86_64/rosegarden-gcc6.patch | 13 ++++
extra-x86_64/rosegarden.install | 15 ----
7 files changed, 134 insertions(+), 126 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-06-12 12:54:21 UTC (rev 269391)
+++ extra-i686/PKGBUILD 2016-06-12 12:54:58 UTC (rev 269392)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Robert Emil Berge <robert at rebi.no>
-
-pkgname=rosegarden
-pkgver=16.02
-_pkgver=16.02
-pkgrel=1
-pkgdesc="MIDI/audio sequencer and notation editor"
-arch=('i686' 'x86_64')
-url="http://www.rosegardenmusic.com/"
-license=('GPL')
-depends=('liblrdf' 'dssi' 'fftw' 'lirc'
- 'perl' 'qt5-tools' 'shared-mime-info' 'liblo>=0.28')
-makedepends=('imake' 'cmake')
-optdepends=('lilypond: notation display'
- 'cups: printing support'
- 'kdegraphics-okular: print preview, or any other PDF viewer'
- 'timidity++: MIDI playback, or any other softsynth'
- '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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # qt4 compatibility (qt->qt5)
- #LRELEASE=/usr/lib/qt4/bin/lrelease
- #LUPDATE=/usr/lib/qt4/bin/lupdate
-
- #export lrdf_CFLAGS LRELEASE LUPDATE
-
- cmake -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: rosegarden/repos/extra-i686/PKGBUILD (from rev 269391, rosegarden/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-06-12 12:54:58 UTC (rev 269392)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Robert Emil Berge <robert at rebi.no>
+
+pkgname=rosegarden
+pkgver=16.02
+_pkgver=16.02
+pkgrel=2
+pkgdesc="MIDI/audio sequencer and notation editor"
+arch=('i686' 'x86_64')
+url="http://www.rosegardenmusic.com/"
+license=('GPL')
+depends=('liblrdf' 'dssi' 'fftw' 'lirc'
+ 'perl' 'qt5-tools' 'shared-mime-info' 'liblo>=0.28')
+makedepends=('imake' 'cmake')
+optdepends=('lilypond: notation display'
+ 'cups: printing support'
+ 'kdegraphics-okular: print preview, or any other PDF viewer'
+ 'timidity++: MIDI playback, or any other softsynth'
+ 'flac'
+ 'wavpack')
+[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
+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"
+
+ # qt4 compatibility (qt->qt5)
+ #LRELEASE=/usr/lib/qt4/bin/lrelease
+ #LUPDATE=/usr/lib/qt4/bin/lupdate
+
+ #export lrdf_CFLAGS LRELEASE LUPDATE
+
+ cmake -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: rosegarden/repos/extra-i686/rosegarden-gcc6.patch (from rev 269391, rosegarden/trunk/rosegarden-gcc6.patch)
===================================================================
--- extra-i686/rosegarden-gcc6.patch (rev 0)
+++ extra-i686/rosegarden-gcc6.patch 2016-06-12 12:54:58 UTC (rev 269392)
@@ -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: extra-i686/rosegarden.install
===================================================================
--- extra-i686/rosegarden.install 2016-06-12 12:54:21 UTC (rev 269391)
+++ extra-i686/rosegarden.install 2016-06-12 12:54:58 UTC (rev 269392)
@@ -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:
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-06-12 12:54:21 UTC (rev 269391)
+++ extra-x86_64/PKGBUILD 2016-06-12 12:54:58 UTC (rev 269392)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Ray Rashif <schiv at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Robert Emil Berge <robert at rebi.no>
-
-pkgname=rosegarden
-pkgver=16.02
-_pkgver=16.02
-pkgrel=1
-pkgdesc="MIDI/audio sequencer and notation editor"
-arch=('i686' 'x86_64')
-url="http://www.rosegardenmusic.com/"
-license=('GPL')
-depends=('liblrdf' 'dssi' 'fftw' 'lirc'
- 'perl' 'qt5-tools' 'shared-mime-info' 'liblo>=0.28')
-makedepends=('imake' 'cmake')
-optdepends=('lilypond: notation display'
- 'cups: printing support'
- 'kdegraphics-okular: print preview, or any other PDF viewer'
- 'timidity++: MIDI playback, or any other softsynth'
- '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')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # qt4 compatibility (qt->qt5)
- #LRELEASE=/usr/lib/qt4/bin/lrelease
- #LUPDATE=/usr/lib/qt4/bin/lupdate
-
- #export lrdf_CFLAGS LRELEASE LUPDATE
-
- cmake -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: rosegarden/repos/extra-x86_64/PKGBUILD (from rev 269391, rosegarden/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-06-12 12:54:58 UTC (rev 269392)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Robert Emil Berge <robert at rebi.no>
+
+pkgname=rosegarden
+pkgver=16.02
+_pkgver=16.02
+pkgrel=2
+pkgdesc="MIDI/audio sequencer and notation editor"
+arch=('i686' 'x86_64')
+url="http://www.rosegardenmusic.com/"
+license=('GPL')
+depends=('liblrdf' 'dssi' 'fftw' 'lirc'
+ 'perl' 'qt5-tools' 'shared-mime-info' 'liblo>=0.28')
+makedepends=('imake' 'cmake')
+optdepends=('lilypond: notation display'
+ 'cups: printing support'
+ 'kdegraphics-okular: print preview, or any other PDF viewer'
+ 'timidity++: MIDI playback, or any other softsynth'
+ 'flac'
+ 'wavpack')
+[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
+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"
+
+ # qt4 compatibility (qt->qt5)
+ #LRELEASE=/usr/lib/qt4/bin/lrelease
+ #LUPDATE=/usr/lib/qt4/bin/lupdate
+
+ #export lrdf_CFLAGS LRELEASE LUPDATE
+
+ cmake -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: rosegarden/repos/extra-x86_64/rosegarden-gcc6.patch (from rev 269391, rosegarden/trunk/rosegarden-gcc6.patch)
===================================================================
--- extra-x86_64/rosegarden-gcc6.patch (rev 0)
+++ extra-x86_64/rosegarden-gcc6.patch 2016-06-12 12:54:58 UTC (rev 269392)
@@ -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: extra-x86_64/rosegarden.install
===================================================================
--- extra-x86_64/rosegarden.install 2016-06-12 12:54:21 UTC (rev 269391)
+++ extra-x86_64/rosegarden.install 2016-06-12 12:54:58 UTC (rev 269392)
@@ -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:
More information about the arch-commits
mailing list