Hello community, here is the log from the commit of package hydrogen for openSUSE:Factory checked in at 2012-03-20 11:27:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hydrogen (Old) and /work/SRC/openSUSE:Factory/.hydrogen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hydrogen", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/hydrogen/hydrogen.changes 2011-10-26 20:21:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hydrogen.new/hydrogen.changes 2012-03-20 11:27:50.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 17 20:38:28 UTC 2012 - [email protected] + +- Add hydrogen-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- New: ---- hydrogen-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hydrogen.spec ++++++ --- /var/tmp/diff_new_pack.8tr0KC/_old 2012-03-20 11:27:52.000000000 +0100 +++ /var/tmp/diff_new_pack.8tr0KC/_new 2012-03-20 11:27:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package hydrogen # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,9 +25,30 @@ %define librubberband 0 Name: hydrogen -BuildRequires: alsa-devel doxygen flac-devel libjack-devel liblrdf-devel libqt4-devel libsndfile-devel util-linux -BuildRequires: ladspa ladspa-devel lash-devel libarchive-devel libraptor-devel portaudio-devel zlib-devel -BuildRequires: cmake fdupes gcc-c++ help2man hicolor-icon-theme pkg-config rsync subversion update-desktop-files +BuildRequires: alsa-devel +BuildRequires: cmake +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: flac-devel +BuildRequires: gcc-c++ +BuildRequires: help2man +BuildRequires: hicolor-icon-theme +BuildRequires: ladspa +BuildRequires: ladspa-devel +BuildRequires: lash-devel +BuildRequires: libarchive-devel +BuildRequires: libjack-devel +BuildRequires: liblrdf-devel +BuildRequires: libqt4-devel +BuildRequires: libraptor-devel +BuildRequires: libsndfile-devel +BuildRequires: pkg-config +BuildRequires: portaudio-devel +BuildRequires: rsync +BuildRequires: subversion +BuildRequires: update-desktop-files +BuildRequires: util-linux +BuildRequires: zlib-devel BuildRequires: pkgconfig(Qt3Support) BuildRequires: pkgconfig(QtCLucene) BuildRequires: pkgconfig(QtCore) @@ -60,11 +81,11 @@ BuildRequires: rubberband-cli %endif Summary: A Real-Time Drum Machine and Sequencer +License: GPL-2.0+ +Group: Productivity/Multimedia/Sound/Midi # NOTE: Don't forget to update the libsuffix macro. Version: 0.9.6 Release: 0 -License: GPL-2.0+ -Group: Productivity/Multimedia/Sound/Midi BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.hydrogen-music.org/ Source0: %{name}-%{version}.tar.bz2 @@ -77,6 +98,8 @@ Patch1: hydrogen-no-current-time.patch # libhydrogencore has no soname and installs in _libexecdir Patch2: hydrogen-0.9.6-lib64.patch +# PATCH-FIX-UPSTREAM hydrogen-gcc47.patch [email protected] -- Fix build with gcc 4.7. +Patch3: hydrogen-gcc47.patch %description Hydrogen is an advanced drum machine for GNU/Linux. @@ -103,15 +126,15 @@ Export song to midi file. %package -n libhydrogen-core%{soversion} -Group: System/Libraries Summary: Library essential for hydrogen +Group: System/Libraries %description -n libhydrogen-core%{soversion} This is the core of hydrogen's operation. %package -n libhydrogen-core-devel -Group: Development/Libraries/C and C++ Summary: Development files and headers for libhydrogen-core +Group: Development/Libraries/C and C++ Requires: libhydrogen-core%{soversion} = %{version}-%{release} %description -n libhydrogen-core-devel @@ -123,6 +146,8 @@ %patch0 %patch1 %patch2 +%patch3 + # copy licence with correct fsf address install -m 0644 %{S:3} ./ ++++++ hydrogen-gcc47.patch ++++++ Index: src/gui/src/SongEditor/SongEditor.cpp =================================================================== --- src/gui/src/SongEditor/SongEditor.cpp.orig 2011-07-13 07:20:49.000000000 +0200 +++ src/gui/src/SongEditor/SongEditor.cpp 2012-03-17 21:26:39.717208076 +0100 @@ -21,6 +21,7 @@ */ #include <assert.h> +#include <unistd.h> #include <algorithm> #include <memory> Index: src/tests/xml.cpp =================================================================== --- src/tests/xml.cpp.orig 2011-07-22 09:34:28.000000000 +0200 +++ src/tests/xml.cpp 2012-03-17 21:25:11.436012069 +0100 @@ -1,4 +1,4 @@ - +#include <unistd.h> #include <hydrogen/helpers/filesystem.h> #include <hydrogen/basics/drumkit.h> Index: src/gui/src/MainForm.cpp =================================================================== --- src/gui/src/MainForm.cpp.orig 2011-07-04 23:27:45.000000000 +0200 +++ src/gui/src/MainForm.cpp 2012-03-17 21:33:34.983627498 +0100 @@ -20,6 +20,7 @@ * */ +#include <unistd.h> #include <hydrogen/version.h> #include <hydrogen/hydrogen.h> #include <hydrogen/playlist.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
