From 12f5f45fcc001a4c57932245bfdb74ada76e7c86 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Apr 04 2019 12:51:15 +0000 Subject: remove obsolete patches --- diff --git a/hydrogen-devel-warning.patch b/hydrogen-devel-warning.patch deleted file mode 100644 index 647d6d7..0000000 --- a/hydrogen-devel-warning.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN hydrogen-0.9.5.old/data/hydrogen.default.conf hydrogen-0.9.5/data/hydrogen.default.conf ---- hydrogen-0.9.5.old/data/hydrogen.default.conf 2010-01-13 17:20:49.000000000 -0500 -+++ hydrogen-0.9.5/data/hydrogen.default.conf 2011-03-26 08:36:07.000000000 -0400 -@@ -14,7 +14,7 @@ - false - false - 400 -- true -+ false - true - false - true diff --git a/hydrogen-format-security.patch b/hydrogen-format-security.patch deleted file mode 100644 index e5f17bf..0000000 --- a/hydrogen-format-security.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nurp hydrogen-0.9.5.1/libs/hydrogen/src/object.cpp hydrogen-0.9.5.1.mod/libs/hydrogen/src/object.cpp ---- hydrogen-0.9.5.1/libs/hydrogen/src/object.cpp 2009-09-20 04:04:23.000000000 +0200 -+++ hydrogen-0.9.5.1.mod/libs/hydrogen/src/object.cpp 2013-12-10 07:18:00.506872464 +0100 -@@ -239,9 +239,9 @@ void* loggerThread_func( void* param ) - QString tmpString; - for( it = last = queue.begin() ; it != queue.end() ; ++it ) { - last = it; -- printf( it->toLocal8Bit() ); -+ printf("%s", qPrintable(it->toLocal8Bit())); - if( pLogFile ) { -- fprintf( pLogFile, it->toLocal8Bit() ); -+ fprintf( pLogFile, "%s", qPrintable(it->toLocal8Bit())); - fflush( pLogFile ); - } - } diff --git a/hydrogen-lrdf-pkg.patch b/hydrogen-lrdf-pkg.patch deleted file mode 100644 index 4a11faf..0000000 --- a/hydrogen-lrdf-pkg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN hydrogen-0.9.5.1.old/Sconstruct hydrogen-0.9.5.1/Sconstruct ---- hydrogen-0.9.5.1.old/Sconstruct 2012-02-19 16:54:05.000000000 -0500 -+++ hydrogen-0.9.5.1/Sconstruct 2012-07-22 21:10:17.044739638 -0400 -@@ -193,6 +193,8 @@ def get_hydrogen_lib( opts ): - env.ParseConfig('pkg-config --modversion jack', get_jack_api_flags) - if str(env['lash']) == "1": - env.ParseConfig('pkg-config --cflags --libs lash-1.0') -+ if str(env['lrdf']) == "1": -+ env.ParseConfig('pkg-config --cflags --libs lrdf') - - - #env.Decider is not known in older scons version -@@ -450,7 +452,7 @@ elif not str(env['libarchive']) == "1" a - Exit(1) - - #lrdf: categorizing of ladspa effects --if str(env['lrdf']) == "1" and not conf.CheckCHeader('lrdf.h'): -+if str(env['lrdf']) == "1" and not conf.CheckPKG('lrdf'): - print 'lrdf must be installed!' - Exit(1) - diff --git a/hydrogen.spec b/hydrogen.spec index 9ac1bfa..bd89c1d 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -4,15 +4,7 @@ Version: 0.9.7 Release: 8%{?dist} URL: http://www.hydrogen-music.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -# Remove the "you are using the development version" warning -# http://sourceforge.net/mailarchive/forum.php?forum_name=hydrogen-devel -# See the "0.9.5 si out" thread -#Patch1: hydrogen-devel-warning.patch -# We need to use pkgconfig to detect lrdf to get the right cflags -# Temporary patch since upstream already switched from scons to cmake in trunk -#Patch2: hydrogen-lrdf-pkg.patch -#Patch3: hydrogen-format-security.patch -Patch4: hydrogen-desktop.patch +Patch0: hydrogen-desktop.patch License: GPLv2+ @@ -65,15 +57,7 @@ Header files for the hydrogen drum machine. %prep %setup -q -#patch -p0 < patches/portaudio.patch -#%if 0%{fedora} > 12 -# portmidi build fix. Looks like other distros did not obey upstream decisions -#sed -i '/porttime/d' Sconstruct -#%endif -#%patch1 -p1 -b .nodevver -#%patch2 -p1 -b .cflags -#%patch3 -p1 -b .fmt-security -%patch4 -p0 -b .dekstop +%patch0 -p0 -b .desktop %build export QTDIR=%{_qt4_prefix} @@ -144,6 +128,7 @@ mv $RPM_BUILD_ROOT/usr/man/man1/hydrogen.1 $RPM_BUILD_ROOT%{_mandir}/man1/hydrog - rebuild to fix GUI glitch - use spaces for formatting - rename 'devel' subpackage to 'hydrogen-devel' (d'oh) +- remove obsolete patches * Fri Feb 01 2019 Fedora Release Engineering - 0.9.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild