[buildsys-build-rpmfusion/el9] Restore dist-tag
by Nicolas Chauvet
commit ce66b09741cf5b67e460451c90dfb812a58502f3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 14 13:34:50 2022 +0200
Restore dist-tag
buildsys-build-rpmfusion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 711d277..d0cdebe 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
Version: 35
-Release: 0.3
+Release: 0.4%{?dist}
Summary: Tools and files used by the %{repo} buildsys
License: MIT
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Thu Apr 14 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.4
+- Restore dist tag
+
* Wed Apr 06 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.3
- Bump for el9
2 years, 7 months
[buildsys-build-rpmfusion] Restore dist-tag
by Nicolas Chauvet
commit 833a9af720f6f20a72a18a61a94d7903870775b8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 14 13:34:50 2022 +0200
Restore dist-tag
buildsys-build-rpmfusion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 711d277..d0cdebe 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
Version: 35
-Release: 0.3
+Release: 0.4%{?dist}
Summary: Tools and files used by the %{repo} buildsys
License: MIT
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Thu Apr 14 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.4
+- Restore dist tag
+
* Wed Apr 06 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.3
- Bump for el9
2 years, 7 months
[buildsys-build-rpmfusion] Bump for el9
by Nicolas Chauvet
commit 49ab8d42358bc7a3d7d92b537cb28cd9ea4cc5c4
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 6 16:58:36 2022 +0200
Bump for el9
buildsys-build-rpmfusion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index c8ccc5a..711d277 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
Version: 35
-Release: 0.2
+Release: 0.3
Summary: Tools and files used by the %{repo} buildsys
License: MIT
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Wed Apr 06 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.3
+- Bump for el9
+
* Sun Mar 14 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.2
- rebuild for kernel default
2 years, 7 months
[dfhack] Backport upstream fix to compile with -fpermissive for uicommon.h
by Mamoru Tasaka
commit d2f21a230151bc791622f1a83028b560dc2de8a9
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Thu Apr 14 19:13:14 2022 +0900
Backport upstream fix to compile with -fpermissive for uicommon.h
dfhack-0.47.05-fpermissive-uicommon.patch | 35 +++++++++++++++++++++++++++++++
dfhack.spec | 8 ++++++-
2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/dfhack-0.47.05-fpermissive-uicommon.patch b/dfhack-0.47.05-fpermissive-uicommon.patch
new file mode 100644
index 0000000..aefc9f6
--- /dev/null
+++ b/dfhack-0.47.05-fpermissive-uicommon.patch
@@ -0,0 +1,35 @@
+From 39c650de131f85ea74d1f7638c3ea630faed5c15 Mon Sep 17 00:00:00 2001
+From: lethosor <lethosor(a)gmail.com>
+Date: Sat, 21 Aug 2021 12:58:17 -0400
+Subject: [PATCH] Fix compilation error on macOS with GCC 11
+
+This should make `-fpermissive` (from #1924) unnecessary, so I also removed
+those instructions.
+---
+ docs/Compile.rst | 14 ++++----------
+ plugins/uicommon.h | 5 +++--
+ 2 files changed, 7 insertions(+), 12 deletions(-)
+
+diff --git a/plugins/uicommon.h b/plugins/uicommon.h
+index 78256ac690..54a948eb28 100644
+--- a/plugins/uicommon.h
++++ b/plugins/uicommon.h
+@@ -31,7 +31,6 @@ using namespace std;
+ using std::string;
+ using std::vector;
+ using std::map;
+-using std::ostringstream;
+ using std::set;
+
+ using namespace DFHack;
+@@ -160,7 +159,9 @@ static inline void OutputToggleString(int &x, int &y, const char *text, df::inte
+
+ inline string int_to_string(const int n)
+ {
+- return static_cast<ostringstream*>( &(ostringstream() << n) )->str();
++ std::ostringstream ss;
++ ss << n;
++ return ss.str();
+ }
+
+ static inline void set_to_limit(int &value, const int maximum, const int min = 0)
diff --git a/dfhack.spec b/dfhack.spec
index 610493c..e20377a 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -47,7 +47,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 7.%{hackrelease}%{?dist}
+Release: 8.%{hackrelease}%{?dist}
Summary: Memory hacking library for Dwarf Fortress and a set of tools that use it
# It'd be nice if we could unbundle some of these things, but I suspect it won't happen.
@@ -92,6 +92,8 @@ Source15: https://github.com/DFHack/scripts/archive/%{commit15}/dfhack-scr
# Patch to make protobuf build on F33/F32 with gcc 10.
# https://github.com/DFHack/dfhack/issues/1506
Patch3: protobuf-gcc-10-fix.patch
+# https://github.com/DFHack/dfhack/commit/39c650de131f85ea74d1f7638c3ea630f...
+Patch4: %{name}-0.47.05-fpermissive-uicommon.patch
# dfhack only supports DF architectures, of which there are two.
ExclusiveArch: %{ix86} x86_64
@@ -227,6 +229,7 @@ cp -a %SOURCE3 library/include/
# You know what, don't apply patches. We don't build isoworld, anyway.
#patch0 -p1
#patch1 -p1
+%patch4 -p1
# Fix protobuf problem; there's probably a way to do this with the patch macro.
patch depends/protobuf/google/protobuf/message.cc %PATCH3
@@ -344,6 +347,9 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
+* Thu Apr 14 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 0.47.04-8.r1
+- Backport upstream fix to compile with -fpermissive for uicommon.h
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.47.04-7.r1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years, 7 months
[dosemu] Update BR for xorg-x11-font-utils split
by Mamoru Tasaka
commit 3a7716b50ae2342d6b9efe258ea655d65a59b293
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Thu Apr 14 12:41:55 2022 +0900
Update BR for xorg-x11-font-utils split
Undefined _hardened_build for now for binutils 2.36
dosemu.spec | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/dosemu.spec b/dosemu.spec
index e47065e..2c41e11 100644
--- a/dosemu.spec
+++ b/dosemu.spec
@@ -1,6 +1,6 @@
Name: dosemu
Version: 1.4.0.8
-Release: 31.20131022git%{?dist}
+Release: 32.20131022git%{?dist}
Summary: DOS Emulator for Linux
URL: http://dosemu.sf.net
License: GPLv2+
@@ -44,7 +44,8 @@ BuildRequires: SDL-devel
BuildRequires: alsa-lib-devel
BuildRequires: libsndfile
BuildRequires: desktop-file-utils
-BuildRequires: xorg-x11-font-utils
+BuildRequires: %{_bindir}/bdftopcf
+BuildRequires: %{_bindir}/mkfontdir
BuildRequires: git
# At this time, Dosemu only works with Linux on x86, other ports are welcome.
@@ -54,7 +55,6 @@ BuildRequires: git
ExclusiveOS: linux
ExclusiveArch: i686 x86_64
-
%description
DOSEMU is a PC Emulator that allows Linux to run a DOS operating system
in a virtual x86 machine. This allows you to run all kinds of different
@@ -69,6 +69,13 @@ programs forever!
# DEBUG: /usr/bin/ld: /tmp/dosemu.bin.1hmolM.ltrans0.ltrans.o: in function `stub_rep__':
# DEBUG: <artificial>:(.text+0xe): undefined reference to `rep_movs_stos'
%define _lto_cflags %{nil}
+#gcc -Wl,-warn-common -Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -Wl,--build-id=sha1 -Wl,-dT,/builddir/build/BUILD/dosemu-1.4.0.8/.package_note-dosemu-1.4.0.8-32.20131022git.fc37.x86_64.ld -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o ../../1.4.0.8/commands/emufs.sys emufs.o
+#/usr/bin/ld: section .note.gnu.property LMA [0000000000000000,000000000000002f] overlaps section .text LMA [0000000000000000,0000000000000293]
+#collect2: error: ld returned 1 exit status
+#make[2]: *** [Makefile:57: ../../1.4.0.8/commands/emufs.sys] Error 1
+# https://www.mail-archive.com/grub-devel@gnu.org/msg32447.html
+# With binutils 2.36
+%undefine _hardened_build
%build
%configure --with-fdtarball=%{SOURCE1}
@@ -119,6 +126,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%changelog
+* Thu Apr 14 2022 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.4.0.8-32.20131022git
+- Update BR for xorg-x11-font-utils split
+- Undefined _hardened_build for now for binutils 2.36
+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.4.0.8-31.20131022git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
2 years, 7 months
[vdr-softhddevice-openglosd] Rebuilt for VDR 2.6.1
by Sérgio M. Basto
commit de22774343ed5db0b09f28ca131c09818255f01f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Apr 13 16:29:47 2022 +0100
Rebuilt for VDR 2.6.1
vdr-softhddevice-openglosd.spec | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/vdr-softhddevice-openglosd.spec b/vdr-softhddevice-openglosd.spec
index 14d1c0e..5fbf095 100644
--- a/vdr-softhddevice-openglosd.spec
+++ b/vdr-softhddevice-openglosd.spec
@@ -3,6 +3,10 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global gitdate 20160717
+# version we want build against
+%global vdr_version 2.6.1
+
+
%if 0%{?fedora} > 27
%bcond_without compat_ffmpeg
%else
@@ -11,7 +15,7 @@
Name: vdr-softhddevice-openglosd
Version: 0.6.1
-Release: 33.%{gitdate}git%{shortcommit}%{?dist}
+Release: 34.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -27,7 +31,7 @@ Patch1: chartype.patch
Patch2: ffmpeg_2.9.patch
BuildRequires: gcc-c++
-BuildRequires: vdr-devel >= 1.7.22
+BuildRequires: vdr-devel >= %{vdr_version}
BuildRequires: gettext
BuildRequires: libva-devel
BuildRequires: libvdpau-devel
@@ -109,6 +113,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Wed Apr 13 2022 Sérgio Basto <sergio(a)serjux.com> - 0.6.1-34.20160717git569fde5
+- Rebuilt for VDR 2.6.1
+
* Sat Feb 05 2022 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-33.20160717git569fde5
- Rebuilt for new VDR API version
2 years, 7 months
