[frobtads] Fix FTBFS
by jwrdegoede
commit f8d87157074436ab89e91a2172a5960a5121c21c
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Sat Feb 6 13:51:45 2021 +0100
Fix FTBFS
frobtads-1.2.3-gcc11-fix.patch | 12 ++++++++++++
frobtads.spec | 6 +++++-
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/frobtads-1.2.3-gcc11-fix.patch b/frobtads-1.2.3-gcc11-fix.patch
new file mode 100644
index 0000000..6bfa7ba
--- /dev/null
+++ b/frobtads-1.2.3-gcc11-fix.patch
@@ -0,0 +1,12 @@
+diff -up frobtads-1.2.3/tads3/vmtz.cpp~ frobtads-1.2.3/tads3/vmtz.cpp
+--- frobtads-1.2.3/tads3/vmtz.cpp~ 2013-05-17 21:46:51.000000000 +0200
++++ frobtads-1.2.3/tads3/vmtz.cpp 2021-02-06 13:30:16.819008269 +0100
+@@ -1984,7 +1984,7 @@ void CVmTimeZone::query(vmtzquery *resul
+ * the transition in terms of the local time that was in effect
+ * up until that moment
+ */
+- result->set(tcur > 0 ? tcur - 1 : tcur);
++ result->set(cur > 0 ? tcur - 1 : tcur);
+ return;
+ }
+ }
diff --git a/frobtads.spec b/frobtads.spec
index 88afff0..aa11a85 100644
--- a/frobtads.spec
+++ b/frobtads.spec
@@ -1,12 +1,13 @@
Name: frobtads
Version: 1.2.3
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Text interpreter for Tads games
License: non-commercial
URL: http://www.tads.org/frobtads.htm
Source0: http://www.tads.org/%{name}/%{name}-%{version}.tar.gz
Patch1: frobtads-1.2.3-gcc10-fix.patch
+Patch2: frobtads-1.2.3-gcc11-fix.patch
BuildRequires: gcc-c++
BuildRequires: libcurl-devel
@@ -74,6 +75,9 @@ rm -rf %{buildroot}%{_datadir}/frobtads/tads3/doc
%changelog
+* Sat Feb 06 2021 Hans de Goede <j.w.r.degoede(a)gmail.com> - 1.2.3-14
+- Fix FTBFS
+
* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 9 months
[chromium-freeworld/f32: 2/2] Update to 88.0.4324.150
by qvint
commit bd6e3dd044a3122f1a8bf636fc0520a9a6bfeb3c
Author: qvint <dotqvint(a)gmail.com>
Date: Fri Feb 5 23:32:04 2021 +0300
Update to 88.0.4324.150
chromium-freeworld.spec | 6 +++---
sources | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index c7d9a13..4e665b2 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -24,7 +24,7 @@
%global system_re2 1
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 88.0.4324.146
+Version: 88.0.4324.150
Release: 1%{?dist}
Summary: Chromium built with all freeworld codecs and VA-API support
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -662,8 +662,8 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
-* Wed Feb 03 2021 qvint <dotqvint(a)gmail.com> - 88.0.4324.146-1
-- Update to 88.0.4324.146
+* Thu Feb 04 2021 qvint <dotqvint(a)gmail.com> - 88.0.4324.150-1
+- Update to 88.0.4324.150
* Wed Jan 20 2021 qvint <dotqvint(a)gmail.com> - 88.0.4324.96-1
- Update to 88.0.4324.96
diff --git a/sources b/sources
index c7ed750..33e20ba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-88.0.4324.146.tar.xz) = b3f78dde35e83f491a0f81b48e1c3534ee3be295dc4a6958129551983650eccaca3b46f45deec52ec9c8e7565eb6e6192e409acfa5c5110b45327ea915133adb
+SHA512 (chromium-88.0.4324.150.tar.xz) = 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b
SHA512 (chromium-patches-chromium-88-patchset-3.tar.gz) = ba3965e8b3c611490d47d909dd0478b381bec6ce1defe3dce9b09b33856afe321e951df42ab42533a3d6bf11c2213b4741834d617fe3c4827315859c25c0fad3
3 years, 9 months
[crystalhd-kmod] Fix build for 5.10 kernel
by Nicolas Chauvet
commit b673aa12dbdc2df1f3fa6c9faa45eb4f882756d6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 5 20:23:11 2021 +0100
Fix build for 5.10 kernel
crystalhd-kmod.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/crystalhd-kmod.spec b/crystalhd-kmod.spec
index aedc700..10795ce 100644
--- a/crystalhd-kmod.spec
+++ b/crystalhd-kmod.spec
@@ -4,7 +4,7 @@
Name: crystalhd-kmod
Summary: Kernel module (kmod) for crystalhd
Version: 20170515
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2
URL: https://github.com/philipl/crystalhd
Source0: crystalhd-kmod-%{version}.tar.xz
@@ -12,6 +12,7 @@ Source1: crystalhd-Makefile
Source2: crystalhd-Kconfig
Source11: crystalhd-kmodtool-excludekernel-filterfile
Patch0: Linux-4.17-Compatibility.patch
+Patch1: crystalhd-kmod-mmap_sem.patch
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -38,6 +39,7 @@ install -pm 0644 %{SOURCE2} drivers/staging/crystalhd/Kconfig
pushd drivers/staging/crystalhd/
%patch0 -p3
+%patch1 -p4
popd
for kernel_version in %{?kernel_versions} ; do
@@ -59,12 +61,14 @@ done
for kernel_version in %{?kernel_versions}; do
mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
install -D -m 755 -t ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/ -name '*.ko')
- chmod u+x %{buildroot}%{_prefix}/lib/modules/*/extra/*/*
done
%{?akmod_install}
%changelog
+* Fri Feb 05 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 20170515-9
+- Fix build with 5.10 kernel
+
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 20170515-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 9 months
[crystalhd-kmod] Add crystalhd-kmod-mmap_sem patch
by Nicolas Chauvet
commit 9c3879c6568bc7bf5efecc12e5180c2092102123
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 5 20:22:54 2021 +0100
Add crystalhd-kmod-mmap_sem patch
crystalhd-kmod-mmap_sem.patch | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
---
diff --git a/crystalhd-kmod-mmap_sem.patch b/crystalhd-kmod-mmap_sem.patch
new file mode 100644
index 0000000..eb6015f
--- /dev/null
+++ b/crystalhd-kmod-mmap_sem.patch
@@ -0,0 +1,24 @@
+diff -up crystalhd-kmod-20170515/drivers/staging/crystalhd/crystalhd_misc.c.mmap_sem crystalhd-kmod-20170515/drivers/staging/crystalhd/crystalhd_misc.c
+--- crystalhd-kmod-20170515/drivers/staging/crystalhd/crystalhd_misc.c.mmap_sem 2017-05-18 00:37:21.000000000 +0200
++++ crystalhd-kmod-20170515/drivers/staging/crystalhd/crystalhd_misc.c 2021-02-05 19:05:12.932510158 +0100
+@@ -644,12 +644,20 @@ BC_STATUS crystalhd_map_dio(struct cryst
+ }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
++ mmap_read_lock(current_task->mm);
++#else
+ down_read(¤t->mm->mmap_sem);
++#endif
+
+ res = get_user_pages(uaddr, nr_pages, rw == READ ? FOLL_WRITE : 0,
+ dio->pages, NULL);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
++ mmap_read_unlock(current_task->mm);
++#else
+ up_read(¤t->mm->mmap_sem);
++#endif
+
+ /* Save for release..*/
+ dio->sig = crystalhd_dio_locked;
3 years, 9 months
[swftools] Fix build with GCC 11
by Mohamed ElMorabity
commit 2af30f1a4c032c2ec3f5b9dc323c62b5648439f1
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Feb 4 21:34:10 2021 +0100
Fix build with GCC 11
sources | 2 +-
swftools-0.9.2-gcc11.patch | 15 +++++++++++++++
swftools.spec | 7 ++++++-
3 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 0f7817f..d281133 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1055ebbe3b4cadcc71e83775a5a0906d swftools-0.9.2.tar.gz
+SHA512 (swftools-0.9.2.tar.gz) = 91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
diff --git a/swftools-0.9.2-gcc11.patch b/swftools-0.9.2-gcc11.patch
new file mode 100644
index 0000000..347e54c
--- /dev/null
+++ b/swftools-0.9.2-gcc11.patch
@@ -0,0 +1,15 @@
+diff -up ./lib/pdf/xpdf/GlobalParams.cc.orig ./lib/pdf/xpdf/GlobalParams.cc
+--- ./lib/pdf/xpdf/GlobalParams.cc.orig 2021-02-04 16:51:27.238069595 +0000
++++ ./lib/pdf/xpdf/GlobalParams.cc 2021-02-04 17:02:56.875485395 +0000
+@@ -922,9 +922,9 @@ void GlobalParams::parseFile(GString *fi
+ char* p = pos1>pos2?pos1:pos2;
+ int pos = p ? p-cfgFileName : -1;
+ GString*path = new GString(new GString(cfgFileName), 0, (pos < 0 ? strlen(cfgFileName): pos));
+- if(pos1>=0)
++ if(pos1)
+ path->append('/');
+- else if(pos2>=0)
++ else if(pos2)
+ path->append('\\');
+ else
+ #ifdef WIN32
diff --git a/swftools.spec b/swftools.spec
index 6a20040..481e950 100644
--- a/swftools.spec
+++ b/swftools.spec
@@ -1,6 +1,6 @@
Name: swftools
Version: 0.9.2
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: SWF manipulation and generation utilities
# swftools is GPLv2+ licensed, lib/MD5.c is BSD licensed,
@@ -12,6 +12,8 @@ Source0: %{url}/%{name}-%{version}.tar.gz
Patch0: swftools-0.9.2-install.patch
# Fix build with giflib >= 5
Patch1: swftools-0.9.2-giflib5.patch
+# Fix build with GCC 11
+Patch2: swftools-0.9.2-gcc11.patch
BuildRequires: gcc-c++
BuildRequires: fftw-devel
@@ -62,6 +64,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog
+* Thu Feb 04 2021 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 0.9.2-16
+- Fix build with GCC 11
+
* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.9.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
3 years, 9 months