[xroar] Updated to new upstream release
by Andrea Musuruane
commit 677845ef173906e99eac7b8dd23843867a27157f
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Mon Jun 15 12:53:35 2020 +0200
Updated to new upstream release
.gitignore | 1 +
sources | 4 ++--
xroar-0.35.4-fcommon-fix.patch | 24 ------------------------
xroar.spec | 24 +++++++++++++-----------
4 files changed, 16 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c259e3..8630602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ dragon.rom
/xroar-0.35.2.tar.gz
/xroar-0.35.3.tar.gz
/xroar-0.35.4.tar.gz
+/xroar-0.36.tar.gz
diff --git a/sources b/sources
index a5f204a..f3cfcb3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
-072fb6c260840ff6e6f12083a4907939 xroar-0.35.4.tar.gz
+SHA512 (xroar-0.36.tar.gz) = e5c13174deaf3637607b8b35759ec559b5e05956edcd6cc61eb1d4b42561e5b2b87b30d461270aa08cda3e4ae37e4eb1174f8e64aede4d6271e1d419e9c09f13
+SHA512 (dragon.rom) = bbe3dc286a828acd745155ad8b2f8f1dc7d674c10deae619758662a4f45feefd1d1aea6b8b09f4c4db8b40cbaf475ab540d88d8286e1e4f8478692ad08979285
diff --git a/xroar.spec b/xroar.spec
index 6ff17de..5501007 100644
--- a/xroar.spec
+++ b/xroar.spec
@@ -1,15 +1,14 @@
Name: xroar
-Version: 0.35.4
-Release: 4%{?dist}
+Version: 0.36
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
-License: GPLv2+
+License: GPLv3+
URL: http://www.6809.org.uk/xroar/
Source0: http://www.6809.org.uk/xroar/download/%{name}-%{version}.tar.gz
Source1: http://www.6809.org.uk/dragon/dragon.rom
Source2: %{name}.desktop
Source3: %{name}-minifirm.desktop
Source4: %{name}.appdata.xml
-Patch1: xroar-0.35.4-fcommon-fix.patch
BuildRequires: gcc
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -35,7 +34,7 @@ minimal firmware is included.
%prep
-%autosetup -p1
+%autosetup
%build
@@ -74,9 +73,9 @@ desktop-file-install \
%{SOURCE3}
# Install AppData file
-install -d -m 755 %{buildroot}%{_datadir}/metainfo
-install -p -m 644 %{SOURCE4} %{buildroot}%{_datadir}/metainfo
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+install -d -m 755 %{buildroot}%{_metainfodir}
+install -p -m 644 %{SOURCE4} %{buildroot}%{_metainfodir}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
rm -f %{buildroot}%{_infodir}/dir
@@ -87,16 +86,19 @@ rm -f %{buildroot}%{_infodir}/dir
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/%{name}-minifirm.desktop
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_metainfodir}/%{name}.appdata.xml
%{_infodir}/%{name}*
%{_mandir}/man1/%{name}.1*
-%license COPYING.GPL COPYING.LGPL-2.1
-%doc ChangeLog README
+%license COPYING.GPL COPYING.LGPL
+%doc ChangeLog README README.SDS
%doc doc/%{name}.html doc/%{name}-screens.png doc/%{name}-timebandit-af.png
%doc doc/%{name}.pdf
%changelog
+* Sat Jun 13 2020 Andrea Musuruane <musuruan(a)gmail.com> - 0.36-1
+- Updated to new upstream release
+
* Tue Mar 17 2020 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.35.4-4
- Fix FTBFS
4 years, 5 months
[HandBrake] Disable metainfo on rhel
by Leigh Scott
commit 7d610367f585ec505167023ac695856bb5106480
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 14 23:52:44 2020 +0100
Disable metainfo on rhel
HandBrake-no-metainfo.patch | 30 ++++++++++++++++++++++++++++++
HandBrake.spec | 14 +++++++++-----
2 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/HandBrake-no-metainfo.patch b/HandBrake-no-metainfo.patch
new file mode 100644
index 0000000..0e7f589
--- /dev/null
+++ b/HandBrake-no-metainfo.patch
@@ -0,0 +1,30 @@
+From e7c9888197491747a98f413b9b3503e9fb42b26d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st>
+Date: Mon, 25 May 2020 13:08:24 +0300
+Subject: [PATCH] gtk: Skip building the metainfo xml when targeting windows
+
+This file is only supposed to be used by desktop managers to get info
+about the app. On windows, the file is unused.
+
+Since 368576dc9aa94c792a309e227c9a893776d8cdd1, the translation step
+for this file requires gettext 0.20 or newer.
+---
+ gtk/src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
+index 147df424e..f9e30458f 100644
+--- a/gtk/src/Makefile.am
++++ b/gtk/src/Makefile.am
+@@ -41,8 +41,10 @@ hb_menu = fr.handbrake.ghb.desktop
+
+ metainfodir = $(datarootdir)/metainfo
+ metainfo_in_files = fr.handbrake.ghb.metainfo.xml.in
++if MINGW
+ metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+ dist_metainfo_DATA = $(metainfo_files)
++endif
+
+ EXTRA_DIST = \
+ $(metainfo_in_files)
+
diff --git a/HandBrake.spec b/HandBrake.spec
index f0d5dfe..05ebe38 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -47,12 +47,15 @@ Patch4: %{name}-no-libva.patch
Patch5: %{name}-qsv.patch
# Fix build on non-x86 (without nasm)
Patch6: %{name}-no-nasm.patch
+# rhel gettext is too old to support metainfo
+# https://github.com/HandBrake/HandBrake/pull/2884
+Patch7: %{name}-no-metainfo.patch
BuildRequires: a52dec-devel >= 0.7.4
BuildRequires: cmake3
BuildRequires: dbus-glib-devel
BuildRequires: desktop-file-utils
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?fedora}
BuildRequires: libappstream-glib
%endif
%{!?_without_ffmpeg:BuildRequires: ffmpeg-devel >= 3.5}
@@ -152,6 +155,9 @@ gpgv2 --keyring %{S:2} %{S:1} %{S:0}
%patch5 -p1
%endif
%patch6 -p1
+%if 0%{?rhel}
+%patch7 -p1
+%endif
mkdir -p download
%{?_without_ffmpeg:cp -p %{SOURCE10} download}
@@ -215,7 +221,7 @@ install -D -p -m 644 gtk/src/%{desktop_id}.svg \
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{desktop_id}.desktop
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?fedora}
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.metainfo.xml
%endif
@@ -241,10 +247,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%license COPYING
%doc AUTHORS.markdown NEWS.markdown README.markdown THANKS.markdown
%{_bindir}/ghb
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?fedora}
%{_metainfodir}/%{desktop_id}.metainfo.xml
-%else
-%exclude %{_metainfodir}/%{desktop_id}.metainfo.xml
%endif
%{_datadir}/applications/%{desktop_id}.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{desktop_id}.svg
4 years, 5 months
[HandBrake/el8] (4 commits) ...Fix and validate appdata
by Leigh Scott
Summary of changes:
e94c3b9... Rebuild for dav1d SONAME bump (*)
09a6374... Rebuild for new x265 version (*)
2087cec... New upstream version (*)
8091601... Fix and validate appdata (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months
[HandBrake/f31] (4 commits) ...Fix and validate appdata
by Leigh Scott
Summary of changes:
e94c3b9... Rebuild for dav1d SONAME bump (*)
09a6374... Rebuild for new x265 version (*)
2087cec... New upstream version (*)
8091601... Fix and validate appdata (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months
