[audacity-freeworld] Add fedora fixes

commit ee0e59fa61998827361bb08bbb019dc01ea44eb3 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Sep 2 19:23:51 2020 +0100 Add fedora fixes audacity-2.3.3-appdata.patch | 12 ++++++++++++ ...ktop.in.patch => audacity-2.3.3-desktop.in.patch | 11 ++++++----- audacity-freeworld.spec | 21 +++++++++++++++------ 3 files changed, 33 insertions(+), 11 deletions(-) --- diff --git a/audacity-2.3.3-appdata.patch b/audacity-2.3.3-appdata.patch new file mode 100644 index 0000000..fc6ac70 --- /dev/null +++ b/audacity-2.3.3-appdata.patch @@ -0,0 +1,12 @@ +--- help/audacity.appdata.xml.orig 2018-11-02 16:56:11.000000000 +0000 ++++ help/audacity.appdata.xml 2020-06-15 10:47:33.359600935 +0100 +@@ -1,7 +1,8 @@ + <?xml version="1.0" encoding="UTF-8"?> + <component type="desktop"> + <id>org.audacityteam.Audacity</id> +- <launchable type="desktop">audacity.desktop</launchable> ++ <launchable type="desktop-id">audacity.desktop</launchable> ++ <content_rating type="oars-1.1" /> + <project_license>GPL-2.0 and CC-BY-3.0</project_license> + <metadata_license>CC0-1.0</metadata_license> + <name>Audacity</name> diff --git a/audacity-2.0.2-desktop.in.patch b/audacity-2.3.3-desktop.in.patch similarity index 70% rename from audacity-2.0.2-desktop.in.patch rename to audacity-2.3.3-desktop.in.patch index 4604012..7a31ee8 100644 --- a/audacity-2.0.2-desktop.in.patch +++ b/audacity-2.3.3-desktop.in.patch @@ -1,6 +1,6 @@ ---- ./src/audacity.desktop.in.orig 2018-02-11 03:16:28.828537405 +0000 -+++ ./src/audacity.desktop.in 2018-02-11 03:18:24.112709701 +0000 -@@ -16,7 +16,7 @@ GenericName[ru]=Редактор зву� +--- src/audacity.desktop.in.original 2020-05-03 12:35:11.935438397 +0100 ++++ src/audacity.desktop.in 2020-05-03 12:49:40.221602525 +0100 +@@ -20,7 +20,7 @@ GenericName[uk]=Редактор звукових файлів GenericName[zh_CN]=音频编辑器 GenericName[zh_TW]=音訊編輯器 @@ -9,14 +9,15 @@ Comment[ar]=سجل و حرر ملفات صوت Comment[ca]=Enregistreu i editeu els fitxers d'àudio Comment[da]=Optag og rediger lydfiler -@@ -36,9 +36,9 @@ Comment[zh_TW]=錄音和編輯音訊檔� +@@ -44,9 +44,9 @@ Icon=@AUDACITY_NAME@ Type=Application -Categories=AudioVideo;Audio;AudioVideoEditing; +Categories=AudioVideo;Audio;GTK;GNOME;Sequencer;X-Jack;AudioVideoEditing; - Exec=env UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F +-Exec=env UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F ++Exec=env GDK_BACKEND=x11 UBUNTU_MENUPROXY=0 @AUDACITY_NAME@ %F StartupNotify=false Terminal=false -MimeType=application/x-audacity-project;@MIMETYPES@ diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec index bd1b852..ec0e01f 100644 --- a/audacity-freeworld.spec +++ b/audacity-freeworld.spec @@ -9,7 +9,7 @@ Name: audacity-freeworld Version: 2.3.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multitrack audio editor License: GPLv2 URL: https://www.audacityteam.org @@ -29,14 +29,18 @@ Source0: http://www.fosshub.com/Audacity.html/%{realname}-minsrc-%{version}.tar. Patch1: audacity-2.2.1-libmp3lame-default.patch Patch2: audacity-2.3.3-libdir.patch -# add audio/x-flac +# add audio/x-flac (bug #557335) # remove audio/mpeg, audio/x-mp3 -# enable startup notification # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature -Patch3: audacity-2.0.2-desktop.in.patch +# Add GDK_BACKEND=x11 to exec line (bug #1798987) +Patch3: audacity-2.3.3-desktop.in.patch Patch4: audacity-2.0.6-non-dl-ffmpeg.patch # Based on https://github.com/audacity/audacity/commit/bd6ec9c0ed9fe94ae2f6e171969ae... Patch5: Fix-gcc-10-compile-issue.patch +# Fix launchable type in the appdata file (BZ #1810509) +# This has been fixed by upstream in version 2.4.2 +Patch6: audacity-2.3.3-appdata.patch + Provides: audacity-nonfree = %{version}-%{release} Obsoletes: audacity-nonfree < %{version}-%{release} @@ -124,9 +128,10 @@ do done grep -q -s libmp3lame.so\| * -R && exit 1 -%patch3 -p1 -b .desktop +%patch3 -b .desktop %patch4 -p1 -b .non-dl-ffmpeg %patch5 -p1 -b .gcc10 +%patch6 -b .appdata %build @@ -216,7 +221,7 @@ if appstream-util --help | grep -q replace-screenshots ; then # See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details. # appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/audacity.appdata.xml \ - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screens... + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screens... fi %endif @@ -250,6 +255,10 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt %changelog +* Wed Sep 02 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.3.3-5 +- Add GDK_BACKEND=x11 to audacity.desktop exec line (rfbz#5551) +- Fix incorrect appdata.xml type tag (rfbz#5679) + * Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 2.3.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild