[mixxx/f32] Disable flaky EngineBufferE2ETest
by Uwe Klotz
commit b5d4b730d145bcabd3cf72cff20bf0357ef54eda
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Dec 6 12:17:18 2020 +0100
Disable flaky EngineBufferE2ETest
mixxx.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 7614425..1816595 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -167,7 +167,9 @@ rm -rf \
%check
# Run tests
-%ctest3 --timeout 120
+# The EngineBufferE2ETest test is disabled due to spurious failures
+# for x86_64 when run on AMD EPYC. Varying tests are failing sometimes.
+%ctest3 --timeout 120 --exclude-regex EngineBufferE2ETest
# Validate AppStream data
appstream-util \
3 years, 11 months
[mixxx/f33] Disable flaky EngineBufferE2ETest
by Uwe Klotz
commit 1bd82fcd869cd4c5a4e4b749b350c55571b38a9f
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sun Dec 6 12:17:18 2020 +0100
Disable flaky EngineBufferE2ETest
mixxx.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index f4828d0..e559efc 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -167,7 +167,9 @@ rm -rf \
%check
# Run tests
-%ctest3 --timeout 120
+# The EngineBufferE2ETest test is disabled due to spurious failures
+# for x86_64 when run on AMD EPYC. Varying tests are failing sometimes.
+%ctest3 --timeout 120 --exclude-regex EngineBufferE2ETest
# Validate AppStream data
appstream-util \
3 years, 11 months
[qtox/f33] Update to 1.17.3
by Robert-André Mauchin
Summary of changes:
1cae333... Update to 1.17.3 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 11 months
[qtox] Update to 1.17.3
by Robert-André Mauchin
commit 1cae333c68ac1ef433202e1296bbf657cc484eb5
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sat Dec 5 22:43:09 2020 +0100
Update to 1.17.3
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
.gitignore | 1 +
qTox-af02542-disable_Werror.patch | 11 -----------
qTox-af02542-remove_project_group.patch | 11 -----------
qTox-c0e9a3b-remove_project_group.patch | 11 +++++++++++
qtox.spec | 22 ++++++++++++----------
sources | 2 +-
6 files changed, 25 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f0f568..27f7caa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/qtox-1.16.2.tar.gz
/qtox-af02542.tar.gz
/qtox-a44cce6.tar.gz
+/qtox-c0e9a3b.tar.gz
diff --git a/qTox-c0e9a3b-remove_project_group.patch b/qTox-c0e9a3b-remove_project_group.patch
new file mode 100644
index 0000000..29e6689
--- /dev/null
+++ b/qTox-c0e9a3b-remove_project_group.patch
@@ -0,0 +1,11 @@
+diff -up qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml.orig qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml
+--- qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml.orig 2020-12-05 22:34:17.689682779 +0100
++++ qTox-c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f/res/io.github.qtox.qTox.appdata.xml 2020-12-05 22:35:02.244903395 +0100
+@@ -62,7 +62,6 @@
+ </screenshots>
+ <url type="homepage">https://qtox.github.io</url>
+ <update_contact>barrdetwix(a)gmail.com</update_contact>
+- <project_group>qTox</project_group>
+ <content_rating type="oars-1.0">
+ <content_attribute id="social-chat">intense</content_attribute>
+ <content_attribute id="social-audio">intense</content_attribute>
diff --git a/qtox.spec b/qtox.spec
index 31ca2d2..a754643 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -1,14 +1,15 @@
-%global commit a44cce65beb60c5f280b651e0c084fa9c2bdb0dc
+%global commit c0e9a3b79609681e5b9f6bbf8f9a36cb1993dc5f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate 20191018
+%global snapshotdate 20191205
+# %%global prerelease 1
# git describe
-%global qtox_version v1.16.3-704-gedb6af6f
+%global qtox_version v1.17.3-316-g12fc33ee
%undefine __cmake_in_source_build
Name: qtox
-Version: 1.16.3
-Release: 5.%{snapshotdate}git%{shortcommit}%{?dist}
+Version: 1.17.3
+Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist}
Summary: Feature-rich Tox client
# Main program: GPLv3+
@@ -20,9 +21,7 @@ URL: https://github.com/qTox/qTox/
Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
# Remove project_group tag from appdata.xml
-Patch0: qTox-af02542-remove_project_group.patch
-# Remove -Werror from compile flags
-Patch1: qTox-af02542-disable_Werror.patch
+Patch0: qTox-c0e9a3b-remove_project_group.patch
BuildRequires: gcc-c++
BuildRequires: cmake3
@@ -59,8 +58,8 @@ guidelines while running on all major platforms.
%build
%cmake3 -DSVGZ_ICON=OFF \
- -DGIT_DESCRIBE=%{qtox_version} \
- -DGIT_VERSION=%{commit}
+ -DGIT_DESCRIBE=%{qtox_version} \
+ -DGIT_VERSION=%{commit}
%cmake3_build
%install
@@ -81,6 +80,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github
%{_datadir}/icons/hicolor/*/apps/qtox.*
%changelog
+* Sat Dec 05 22:19:55 CET 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.17.3-1
+- Update to 1.17.3
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.16.3-5.20191018gita44cce6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index a7b52bd..21e46d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtox-a44cce6.tar.gz) = 200b30bc035a4e203dc1d1599266fb2de0cb87d4716a8fff87e41cd7cfc5a19b23692425bde03ca368b17879865446256b1da6cb60011fa538864b84fdaca0f6
+SHA512 (qtox-c0e9a3b.tar.gz) = a591558220cf45ac480d946380e4e68cebbb4271947846161889d31ddd2acdea0282e77270b92cb28883d812934fd427ced2dca4cdb76afc05e1a352fc7b9dc6
3 years, 11 months
[mixxx/f32] New upstream snapshot 2.3.0-beta.20201205gitbf343d2
by Uwe Klotz
commit 85267af45c97e9a8cf7cd37b8a51b203efa54dda
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sat Dec 5 15:03:41 2020 +0100
New upstream snapshot 2.3.0-beta.20201205gitbf343d2
mixxx.spec | 10 +++++++---
sources | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 3ffaf29..7614425 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -9,9 +9,9 @@
%global extraver beta
# Optional: Only used for untagged snapshot versions
-%global gitcommit 7e18fc418ed1dea2cb3ccd42ecbc094146470cf4
+%global gitcommit bf343d2677f19d1886682c4bd15e26f70884ce27
# Format: <yyyymmdd>
-%global gitcommitdate 20201126
+%global gitcommitdate 20201205
# Additional sources
%global libkeyfinder_archive v2.2.3.zip
@@ -27,7 +27,7 @@
Name: mixxx
Version: 2.3.0
-Release: 0.13%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 0.14%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -139,6 +139,7 @@ cp %{SOURCE1} %{__cmake_builddir}/download/libKeyFinder/%{libkeyfinder_archive}
%install
+
# Install build artifacts
%cmake3_install
@@ -187,6 +188,9 @@ appstream-util \
%changelog
+* Sat Dec 5 15:01:55 CET 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.0-0.14.beta.20201205gitbf343d2
+- New upstream snapshot 2.3.0-beta
+
* Thu Nov 26 08:56:41 CET 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.0-0.13.beta.20201126git7e18fc4
- New upstream snapshot 2.3.0-beta
diff --git a/sources b/sources
index 2c7b5fd..d2cc3d1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (libKeyFinder_v2.2.3.zip) = d5eb1c1f00af07689279dd337ec8f2f738eff8658dd7883395275558493784d70ec25924dee35ceae660d9651878fd3e703b02e879f818e6427ecf0f303e15ee
-SHA512 (mixxx-7e18fc418ed1dea2cb3ccd42ecbc094146470cf4.tar.gz) = 21253942ade206fb56ca8cfe1ac31028da0c254d1d2cb9938060630a69c76f8d58c0bf86b74474d651c2c9483a0b1e50eb3205801fc83aa395a19d54fdd5ed6c
+SHA512 (mixxx-bf343d2677f19d1886682c4bd15e26f70884ce27.tar.gz) = df8f3e339bca14fed99650029159ecc2948bc1d7c6ba3ab05d31f035da78ed3b61654eddfd1a051d77c511c545bda058178e815ade28282e64bf2c4a296073c4
3 years, 11 months
[mixxx/f32] Enable ctest after upstream build fix
by Uwe Klotz
commit 3b60fff8ba1041d60d67fa0122acb3e562f4e98b
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Dec 4 22:05:11 2020 +0100
Enable ctest after upstream build fix
mixxx.spec | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 7b8f010..3ffaf29 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -139,9 +139,16 @@ cp %{SOURCE1} %{__cmake_builddir}/download/libKeyFinder/%{libkeyfinder_archive}
%install
+# Install build artifacts
%cmake3_install
-# USB HID permissions
+# Install desktop launcher
+desktop-file-install \
+ --vendor "" \
+ --dir %{buildroot}%{_datadir}/applications \
+ res/linux/%{name}.desktop
+
+# Install custom USB HID permissions
# - Relocate .rules file
# - Order custom rules before 70-uaccess.rules
install -d \
@@ -157,22 +164,11 @@ rm -rf \
%check
-# Tests can only be executed locally. Running them on
-# http://koji.rpmfusion.org always ends with the error
-# message "# Child aborted***Exception:"
-# Note: Add the macro prefix '%' in front of 'ctest3' manually after uncommenting.
-# Otherwise the tests would get executed by macro expansion even though hidden
-# within a comment!
-#QT_QPA_PLATFORM=offscreen \
-#ctest3
-
-# Desktop launcher
-desktop-file-install \
- --vendor "" \
- --dir %{buildroot}%{_datadir}/applications \
- res/linux/%{name}.desktop
-# AppStream data
+# Run tests
+%ctest3 --timeout 120
+
+# Validate AppStream data
appstream-util \
validate-relax \
--nonet \
3 years, 11 months
