[vdr-markad/f39] Update to 3.3.4
by Martin Gansser
Summary of changes:
20b70fb... Update to 3.3.4 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 3 months
[vdr-markad/f37] Update to 3.3.4
by Martin Gansser
Summary of changes:
20b70fb... Update to 3.3.4 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 3 months
[vdr-markad/f38] Update to 3.3.4
by Martin Gansser
Summary of changes:
20b70fb... Update to 3.3.4 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 3 months
[vdr-markad] Update to 3.3.4
by Martin Gansser
commit 20b70fb22bf2da45e17efc2d16eae1f4d756dc35
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Aug 13 11:13:06 2023 +0200
Update to 3.3.4
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9770495..6cad0c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.3.1.tar.gz
/vdr-markad-3.3.2.tar.gz
/vdr-markad-3.3.3.tar.gz
+/vdr-markad-3.3.4.tar.gz
diff --git a/sources b/sources
index 92053a7..16fefcb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.3.3.tar.gz) = cea471cc38dae3fab68f94491e2ae79649615a71afae4cfce5e79ceb0dfe986b2c6735ff94ab23dbb56cd3184a8d8fc7c3b7411f9c990501249725a2fa524a4e
+SHA512 (vdr-markad-3.3.4.tar.gz) = 7579d38f6061d235280d4d4a397ac884cb7b4022592df61da9409db785cb6d3d132dc9b085508a35e0daaa7603199c2f5e4fada884e6450d19811109d8e45189
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 0cac2c9..8505ec3 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 3.3.3
+Version: 3.3.4
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -71,6 +71,9 @@ fi
%doc html
%changelog
+* Sun Aug 13 2023 Martin Gansser <martinkg(a)fedoraproject.org> - 3.3.4-1
+- Update to 3.3.4
+
* Sun Jul 23 2023 Martin Gansser <martinkg(a)fedoraproject.org> - 3.3.3-1
- Update to 3.3.3
1 year, 3 months
[pcsx2/f39] Fix FTBFS
by Sérgio M. Basto
Summary of changes:
26b108b... Fix FTBFS (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 3 months
[pcsx2] Fix FTBFS
by Sérgio M. Basto
commit 26b108b2ed5559f401d0cf78385faf2973b4873b
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Aug 10 17:14:31 2023 +0100
Fix FTBFS
gcc12.patch | 20 ++++++++++++++++++++
pcsx2.spec | 2 ++
wx-config-3.2.patch | 11 +++++++++++
3 files changed, 33 insertions(+)
---
diff --git a/gcc12.patch b/gcc12.patch
new file mode 100644
index 0000000..b565c2a
--- /dev/null
+++ b/gcc12.patch
@@ -0,0 +1,20 @@
+--- ./plugins/cdvdGigaherz/src/CDVD.h.orig 2023-08-10 16:16:20.716321111 +0100
++++ ./plugins/cdvdGigaherz/src/CDVD.h 2023-08-10 16:16:25.011311080 +0100
+@@ -29,6 +29,7 @@
+ #include <mutex>
+ #include <string>
+ #include <vector>
++#include <system_error>
+
+ #define CDVDdefs
+ #include <PS2Edefs.h>
+--- pcsx2-1.6.0/pcsx2/gui/i18n.cpp.orig 2023-08-10 16:37:17.172389358 +0100
++++ pcsx2-1.6.0/pcsx2/gui/i18n.cpp 2023-08-10 16:37:30.484358330 +0100
+@@ -37,7 +37,6 @@ static wxString i18n_GetBetterLanguageNa
+ {
+ case wxLANGUAGE_CHINESE: return L"Chinese (Traditional)";
+ case wxLANGUAGE_CHINESE_TRADITIONAL: return L"Chinese (Traditional)";
+- case wxLANGUAGE_CHINESE_TAIWAN: return L"Chinese (Traditional)";
+ case wxLANGUAGE_CHINESE_HONGKONG: return L"Chinese (Traditional, Hong Kong)";
+ case wxLANGUAGE_CHINESE_MACAU: return L"Chinese (Traditional, Macau)";
+ }
diff --git a/pcsx2.spec b/pcsx2.spec
index 4351cbf..649cf31 100644
--- a/pcsx2.spec
+++ b/pcsx2.spec
@@ -10,6 +10,8 @@ Summary: Playstation 2 Emulator
License: GPLv2 and GPLv3+ and LGPLv2+ and LGPLv3
URL: https://pcsx2.net
Source0: https://github.com/%{appname}/%{name}/archive/v%{version}/%{name}-%{versi...
+Patch1: wx-config-3.2.patch
+Patch2: gcc12.patch
ExclusiveArch: i686
BuildRequires: cmake3
diff --git a/wx-config-3.2.patch b/wx-config-3.2.patch
new file mode 100644
index 0000000..151b86c
--- /dev/null
+++ b/wx-config-3.2.patch
@@ -0,0 +1,11 @@
+--- ./cmake/SearchForStuff.cmake.orig 2023-08-10 14:28:49.578246639 +0100
++++ ./cmake/SearchForStuff.cmake 2023-08-10 14:29:27.977160495 +0100
+@@ -35,7 +35,7 @@ else()
+ set(wxWidgets_CONFIG_OPTIONS --unicode=yes)
+ endif()
+
+-list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
++list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.2)
+
+ if(GTK3_API AND NOT APPLE)
+ list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
1 year, 3 months
[rpmfusion-nonfree-release/f39] Switch to branch layout
by Leigh Scott
commit 11db06480c23992a5cba9397d14c5e95b3705800
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 10 14:57:26 2023 +0100
Switch to branch layout
rpmfusion-nonfree-rawhide.repo | 2 +-
rpmfusion-nonfree-release.spec | 9 ++++++---
rpmfusion-nonfree-updates-testing.repo | 2 +-
rpmfusion-nonfree.repo | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/rpmfusion-nonfree-rawhide.repo b/rpmfusion-nonfree-rawhide.repo
index 391cb3e..adb2f06 100644
--- a/rpmfusion-nonfree-rawhide.repo
+++ b/rpmfusion-nonfree-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-rawhi...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index b8912a7..e6c2863 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -1,10 +1,10 @@
#global _repo free
%global _repo nonfree
-%global israwhide 1
+%global israwhide 0
Name: rpmfusion-%{_repo}-release
Version: 39
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -65,9 +65,9 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-38
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-39
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-40
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-41
# Links for the keys
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Thu Aug 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 39-0.2
+- Switch to branch layout
+
* Fri Feb 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 39-0.1
- Bump for 39
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 90ba1c0..36e4d55 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 5f73f00..239b8fb 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
1 year, 3 months
[rpmfusion-free-release/f39] Switch to branch layout
by Leigh Scott
commit 8875e53b42bc0419f8c7cf498ab4bbb4f9654b93
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 10 14:52:42 2023 +0100
Switch to branch layout
rpmfusion-free-rawhide.repo | 2 +-
rpmfusion-free-release.spec | 9 ++++++---
rpmfusion-free-updates-testing.repo | 2 +-
rpmfusion-free.repo | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/rpmfusion-free-rawhide.repo b/rpmfusion-free-rawhide.repo
index 5946aab..5a02334 100644
--- a/rpmfusion-free-rawhide.repo
+++ b/rpmfusion-free-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-rawhide&...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index ce12290..4d58e77 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,10 +1,10 @@
%global _repo free
#global _repo nonfree
-%global israwhide 1
+%global israwhide 0
Name: rpmfusion-%{_repo}-release
Version: 39
-Release: 0.1
+Release: 0.2
Summary: RPM Fusion (%{_repo}) Repository Configuration
License: BSD
@@ -65,9 +65,9 @@ install -d -m755 \
%{buildroot}%{_sysconfdir}/pki/rpm-gpg
# Avoid using basearch in name for the key. Introduced in F18
-ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-38
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-39
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-40
+ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-41
# Links for the keys
ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{_repo}-fedora-latest
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Thu Aug 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 39-0.2
+- Switch to branch layout
+
* Fri Feb 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 39-0.1
- Bump for 39
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 9c39b34..54112fd 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo
index 21ed42a..4f1611f 100644
--- a/rpmfusion-free.repo
+++ b/rpmfusion-free.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$release...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
1 year, 3 months
[rpmfusion-nonfree-release] Bump for 40
by Leigh Scott
commit 803129131eb716150644d6c5fc11e3127139b9e5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 10 14:39:05 2023 +0100
Bump for 40
rpmfusion-nonfree-release.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index b8912a7..d08227e 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -3,7 +3,7 @@
%global israwhide 1
Name: rpmfusion-%{_repo}-release
-Version: 39
+Version: 40
Release: 0.1
Summary: RPM Fusion (%{_repo}) Repository Configuration
@@ -98,6 +98,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{_repo}-tainted.repo
%changelog
+* Thu Aug 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 40-0.1
+- Bump for 40
+
* Fri Feb 10 2023 Leigh Scott <leigh123linux(a)gmail.com> - 39-0.1
- Bump for 39
1 year, 3 months