From 0a031b2aefe2329b7ebf665432167e0f3ec86575 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 3 Mar 2024 21:39:57 +0100 Subject: [PATCH] remove build requirement for libqt-devel [release 1.2.14-2mamba;Sun Mar 03 2024] --- README.md | 1 + fmit-0.97.7-input_40db.patch | 12 --------- fmit-0.97.7-jack_autoconnect.patch | 24 ------------------ fmit-0.98.1-jackd2.patch | 11 --------- fmit-desktop | 9 ------- fmit-icon.png | Bin 4137 -> 0 bytes fmit.spec | 38 ++++++++--------------------- 7 files changed, 11 insertions(+), 84 deletions(-) delete mode 100644 fmit-0.97.7-input_40db.patch delete mode 100644 fmit-0.97.7-jack_autoconnect.patch delete mode 100644 fmit-0.98.1-jackd2.patch delete mode 100644 fmit-desktop delete mode 100644 fmit-icon.png diff --git a/README.md b/README.md index ad647a9..81c400e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # fmit A Free Music Instrument Tuner. + diff --git a/fmit-0.97.7-input_40db.patch b/fmit-0.97.7-input_40db.patch deleted file mode 100644 index d68754d..0000000 --- a/fmit-0.97.7-input_40db.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru fmit-0.97.7.orig/ui/ConfigForm.ui fmit-0.97.7/ui/ConfigForm.ui ---- fmit-0.97.7.orig/ui/ConfigForm.ui 2008-02-18 14:44:46.000000000 +0100 -+++ fmit-0.97.7/ui/ConfigForm.ui 2008-02-18 14:44:24.000000000 +0100 -@@ -1579,7 +1579,7 @@ - 0 - - -- -28 -+ -40 - - - Horizontal diff --git a/fmit-0.97.7-jack_autoconnect.patch b/fmit-0.97.7-jack_autoconnect.patch deleted file mode 100644 index 022bf2e..0000000 --- a/fmit-0.97.7-jack_autoconnect.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru fmit-0.97.7.orig/ui/ConfigForm.ui fmit-0.97.7/ui/ConfigForm.ui ---- fmit-0.97.7.orig/ui/ConfigForm.ui 2007-11-18 15:30:55.000000000 +0100 -+++ fmit-0.97.7/ui/ConfigForm.ui 2008-02-18 14:39:59.000000000 +0100 -@@ -499,13 +499,19 @@ - - Connect automaticaly FMIT to the following source at startup (eg. alsa_pcm:capture_1) - -+ -+ true -+ - - - - ui_txtJACKSourcePort - -+ -+ alsa_pcm:capture_1 -+ - -- false -+ true - - - diff --git a/fmit-0.98.1-jackd2.patch b/fmit-0.98.1-jackd2.patch deleted file mode 100644 index 2a18218..0000000 --- a/fmit-0.98.1-jackd2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru fmit-0.98.1-Source.orig//src/CaptureThreadImplJACK.cpp fmit-0.98.1-Source/src/CaptureThreadImplJACK.cpp ---- fmit-0.98.1-Source.orig//src/CaptureThreadImplJACK.cpp 2010-05-17 22:57:39.000000000 +0200 -+++ fmit-0.98.1-Source/src/CaptureThreadImplJACK.cpp 2010-12-15 19:47:31.690038946 +0100 -@@ -164,7 +164,6 @@ - - jack_set_process_callback(m_jack_client, JackProcess, (void*)this); - jack_on_shutdown(m_jack_client, JackShutdown, (void*)this); -- jack_set_error_function(jack_error_callback); - jack_set_sample_rate_callback(m_jack_client, JackSampleRate, (void*)this); - - cerr << "CaptureThread: INFO: JACK: sampling rate=" << jack_get_sample_rate(m_jack_client) << endl; diff --git a/fmit-desktop b/fmit-desktop deleted file mode 100644 index 672bd24..0000000 --- a/fmit-desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=fmit -GenericName=A music instrument tuner -GenericName[it]=Accordatore di strumenti musicali -Comment=Music instrument tuner -Exec=fmit -Icon=fmit.png -Categories=Qt;AudioVideo diff --git a/fmit-icon.png b/fmit-icon.png deleted file mode 100644 index 872cb4e99fbd8da8c63f9a441baa21807aa058e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4137 zcmV+^5Z3RBP)KhHVmzUJnIgc#(l6jUhPMx@nt*#!^O zZf)(39jEQs-IT7KMH{M4-7-vT+qpNk{@ALcpp6C3|h5zUH`omvWzjWW1 zys>(|G*%BD4YZ_M)D!6w@%El}zWuvz$HroeizdKLPu>*2f9w6R_v-VI_E0>TP9kJM z#>hm+!j6j~zyp7MKuy|7HQo}B);?dW4%g>5hkp~_*}M}W34|or)wYXAHarp=ZCfsi z0G*l6sE`D@qa%cfA2@kHEo?tHa8T7+H5CtpEV73rczM^$*N(O=7e#=B$%Cp80t7Ul zYUYt0kHibx*B)CN?eFU!LS9IMW4*`J(Y9sW1z3|<6HA+EkjN9;)3JxzKh(wnntPko z-f*v)>B{8Wb3)9WHh0wR8FvBt0)5wdj)xFga)_)D&8M1GfcskRQPXuK!BC9u#y%4y$5=s1x*Pn2u|mQTmqCO_H^zU6ZeO4 z7C`b#NJ`cN(w*rcZA))js#OQ8qq*E5$x=Q9zA*O-V`h^wW=|dlLJ}xJ1tAIaUj6KL z1OUFUFY5uWKq!KWNX3}hG`_3A>8&jST+=R5Qes0i@fbI--*&6^jSKYxB~ z-n@CSB}SLYPiuwu-Tltp zURPNcvR~%p?vrefZO1Vj09Ji()#9Z$E!7^}{a|dn*d7g6h4b$ZnUfhln);}=^5ZKP z|1EYG;(|Tkh8u2(zxd*d(PT1--|xrg^W_h}-%lVAprN6GqeqX%AA9VvAvHfcY1i2q z8_)G9n^ng2PfyRct$RK@%eT+FJ@zT@Q(C4wlifAC5V|D9{)+wTuMhn?&M4u6JmBV= zZ;l^6d|37QeA#l9G*m~|b#Yx6$8oSM3)gj7wrp8lZEbBV*JpXda?h%?ko_|KE&c4c zcL&L1NdT(nR4?ARZleZp%O7uvTOYF2U}X^5CnF@070xWvYO8ANX82}k7swsB01sHR zW=-ti!Go$S%X#ubh+%(Al0>fG#I7Ovw`GNXjczj8TpK+ZMi zXL#+6YZrep{6%fx@BmiY!nIux&>!qq9~gWfesBN1@h$q6*hqP_8m(&G@w(WEJ>bqe z@AT^H>+$(~d2&JweN4^+a=E~^ZCuwS7!20E@x~i@W53(*U9W3G7fMLM(H)weZQ{W1 z4*;;}nnl{P4?UZY_2n-tS3?s+@s3Cbfe8T=zXCGZ>X8rx2=Fog$9U6xv##1#&2(it zrBW%J{;Jq!x6zZMWI29ve7De@p+!LSWy%eQHfjO*{|?pePE8qT~(8!SlR) zB0Mt;X3Utu`t|Gco$uOmm)aTWj2BHRLh?x%eFll&COER`2ms&z*7vnL|KrXf32*re z%VVivDr%OS1SSNK12U2#Wy|ct(DB@?J)Yy?m=5NEN$>t%=DKs4;!dd>kpOGftcgAP z=%Z1;-;bgwL)?DIpalXHdVy`*tX#QraZOE)mh1aO(-ZO6?AO%5gaDF~6=CO3cG9({ z>zpD0tlGFL*6;L3_v`zi4E#lYq+qs)f&{qWIxddxVDuRb9vNh+JC(NPwz^vu+@gK$ z#;<8G!X$XlJ@>?3c;SU;&ixBRU^p-EJP*fla2yBQws9PXMT-_`KmYm9hY+gWRvXVu z%&5K+Usi-(gT^NtX?>;jJw?btOK7pjw8v;kwxEO+7GAnA+J35CYdqSxd9Zzu+y3P? z)cLA5Z|*$p%zH1$10+exhd|*fkQ2f4vVk{T7!(y1@%rnppEd3ecmB{jQgS3)2T&wz z-KOPFEgX3I0FL3Dl@mq_BTj->U3HZw%QA|hy00p}9n%w)J?#frL`nwnVQbN6@d zSD$QqGTvU?j=#j8jcX4&>N{wBvXOz-0jlRz1LT*;(ZGn8!G#MK=1JvZJx4fq&Y@74 z!lm&qfBDNBc$nFI*yUu22c9ONi6u$0VBa6CjaDs5Lb;@mv@vio)#K zv$^`}t1(TJx88b-rluw&Ny6{e#u)S^mOuH8?RC?=0#h zP#VaV)a9%YsS_yZp8CE!r?GQio}OPa9N3;i0qNlO-iQC)M|gZ?tPQm z?JwOP>z2Et$|MC}u@BiNgA9@+q4(;fJJKB8e3W!on!)x#(w%7*%wIq+WkfTp^_Wsw zM#v|V(hU?zP*q+^e=38os3Z!ENPt@w+>-CVe*5~^Q@fs`s(nd6wUiR_oN zp5cLOXA3K4zscnlmoq6aiI?kNu3P$vr7W1gKpU|Ky!qyvst_U$3|aopJpTIPbM)@s zMnzGO%c~~P)jL2i7{GQtQieswvgsL2aoaD}EuMPCN3@aJFzH}QZ24R5z?*tJg^18(Pq^WF$0 z5(!n;^>`t1;4Jcno?-j*PcbQ^@bT%FFtw_Z;-U~A`OsvFf_?%%1>La77$#}mz;WF% ztNEV~&P#wqBB5q7nYeA+`D=xwb7wu1;Saz3DWTLUs;5k3N@Y1SFRkPsW=ulS5 zkmFsw2s~1$G(7`JtnT9+X?jN;eQM{2_YHyE%sY;gzgD>AEhPWDRX?KC=;P`cRk)6W zEN34tBta+`prW`4gkVy686E=LaWO21@PvxCr~deoHp<-23-9RxBO$*!dN(HyHE~&a zgd-i zpZxH99BMkibszmOk}OeKUW)Cy^d?gU{lW1(GNz5~xFih|({VZ3HwfZ_wj-m0bM6Dq zocZD4c^)r5_bjc44l?_aGRh+%JlDapZAy#6$dbTzUD6qYwv#+|G?bNSrwKRo*k`x@UNR9wpBk{~B~`U(4eOe`tlWbXi} zbcUp9F_=t|%ov>L>0|1oO46o{B+J;2iBwd|XTJRJ+St-OH_j4Z$BrFw&-2vxy2ZAPK*X{r4u|mheOcGnO*~0rAZ?)A z4ihI$=F2 zz$XbZhDl{v37tKCctQ{kg-BaA{b`-%UhY|>a?4u{8)6tjYP-hQv zQG|c}x37dBKQ~{ z3j$#C=FRcq;$k(KOw!reNmW%?ab5EWY=rKhrL&li9}RI zQ3!{_`2Bv49zBZVI5ajkQeVGaQeQ(KfA{18B+IhUbsb&TDR|%iK#&KJKFH+Z nv;ZGe@&Ho7EAI!6Jiz|}>tP>xeEy*200000NkvXXu0mjfQkOrP diff --git a/fmit.spec b/fmit.spec index 399a4b2..c8d3e5e 100644 --- a/fmit.spec +++ b/fmit.spec @@ -1,6 +1,6 @@ Name: fmit Version: 1.2.14 -Release: 1mamba +Release: 2mamba Summary: Free Music Instrument Tuner Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -8,43 +8,25 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/gillesdegottex/fmit Source: https://github.com/gillesdegottex/fmit.git/v%{version}/fmit-%{version}.tar.bz2 -Source1: fmit-desktop -Source2: fmit-icon.png -Patch0: %{name}-0.97.7-jack_autoconnect.patch -Patch1: %{name}-0.97.7-input_40db.patch -Patch2: %{name}-0.98.1-jackd2.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libalsa-devel +BuildRequires: libQt5Multimedia-devel +BuildRequires: libQt5Svg-devel BuildRequires: libfftw-devel BuildRequires: libgcc -BuildRequires: libGL-devel -BuildRequires: libGLU-devel -BuildRequires: libGLUT-devel -BuildRequires: libICE-devel -BuildRequires: libjack-devel -BuildRequires: libportaudio-devel -BuildRequires: libqt-devel -BuildRequires: libSM-devel +BuildRequires: libglvnd-devel BuildRequires: libstdc++6-devel -BuildRequires: libX11-devel -BuildRequires: libXext-devel -BuildRequires: libXi-devel -BuildRequires: libXmu-devel -BuildRequires: libXt-devel +BuildRequires: qt5-qtbase-devel ## AUTOBUILDREQ-END %description A Free Music Instrument Tuner. -#% debug_package +%debug_package %prep %setup -q -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 %build %{_qt5_qmake} PREFIX=%{_prefix} @@ -52,7 +34,7 @@ A Free Music Instrument Tuner. %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall INSTALL_ROOT=%{buildroot} +%makeinstall INSTALL_ROOT=%{buildroot} STRIP=/bin/true %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -68,12 +50,12 @@ A Free Music Instrument Tuner. %{_datadir}/icons/hicolor/128x128/apps/fmit.png %{_datadir}/icons/hicolor/symbolic/apps/fmit-symbolic.svg %{_datadir}/icons/hicolor/scalable/apps/fmit.svg -#%lang(de) %{_datadir}/fmit/tr/fmit_de.qm -#%lang(fr) %{_datadir}/fmit/tr/fmit_fr.qm -#%lang(pt) %{_datadir}/fmit/tr/fmit_pt.qm %doc COPYING_GPL.txt COPYING_LGPL.txt %changelog +* Sun Mar 03 2024 Silvan Calarco 1.2.14-2mamba +- remove build requirement for libqt-devel + * Sat Mar 27 2021 Silvan Calarco 1.2.14-1mamba - update to 1.2.14