[VirtualBox-kmod] Update to 7.0.8
by Sérgio M. Basto
commit fb2fb4894ba53e679fc72c3e134f312781de2849
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 18 23:37:07 2023 +0100
Update to 7.0.8
...inux-vboxvideo-Additional-build-fixes-for.patch | 75 -----
VirtualBox-kmod.spec | 13 +-
fixes_for_cs8.8.patch | 36 +++
fixes_for_kernel_6.3.patch | 330 ---------------------
update_vbox.sh | 19 +-
5 files changed, 55 insertions(+), 418 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index bc26629..5d32633 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,8 +39,8 @@
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6519
Name: VirtualBox-kmod
-Version: 7.0.6
-Release: 4%{?dist}
+Version: 7.0.8
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -48,9 +48,8 @@ License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
-Patch1: fixes_for_kernel_6.3.patch
-Patch2: fix_7.0.6_locking_problems.patch
-Patch3: 0001-Additions-Linux-vboxvideo-Additional-build-fixes-for.patch
+Patch1: fix_7.0.6_locking_problems.patch
+Patch2: fixes_for_cs8.8.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc = %{version} xz time elfutils-libelf-devel gcc
@@ -74,7 +73,6 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
pushd %{name}-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
popd
# error out if there was something wrong with kmodtool
@@ -137,6 +135,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
[ $MODS = $DIRS ] || [ $MODS = 0 ]
%changelog
+* Tue Apr 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-1
+- Update to 7.0.8
+
* Thu Apr 13 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.6-4
- add opensuse patches fix_7.0.6_locking_problems.patch and
fixes_for_kernel_6.3.patch
diff --git a/fixes_for_cs8.8.patch b/fixes_for_cs8.8.patch
new file mode 100644
index 0000000..7b1adf9
--- /dev/null
+++ b/fixes_for_cs8.8.patch
@@ -0,0 +1,36 @@
+--- ./vboxvideo/vbox_ttm.c.orig 2023-04-18 23:57:46.583842252 +0100
++++ ./vboxvideo/vbox_ttm.c 2023-04-19 00:00:57.537182564 +0100
+@@ -316,9 +316,9 @@ static struct ttm_tt *vbox_ttm_tt_create
+ #if RTLNX_VER_MAX(5,10,0) && !RTLNX_RHEL_RANGE(8,5, 8,99)
+ tt->func = &vbox_tt_backend_func;
+ #endif
+-#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
++#if RTLNX_VER_MIN(5,19,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+ if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined, 0)) {
+-#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,99)
++#elif RTLNX_VER_MIN(5,11,0) || RTLNX_RHEL_RANGE(8,5, 8,8)
+ if (ttm_tt_init(tt, bo, page_flags, ttm_write_combined)) {
+ #elif RTLNX_VER_MIN(4,17,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
+ if (ttm_tt_init(tt, bo, page_flags)) {
+--- ./vboxvideo/vbox_mode.c.orig 2023-04-18 23:56:36.335084935 +0100
++++ ./vboxvideo/vbox_mode.c 2023-04-19 00:02:53.664781629 +0100
+@@ -45,7 +45,7 @@
+ # include <drm/drm_probe_helper.h>
+ #endif
+
+-#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
++#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+ # include <drm/drm_edid.h>
+ #endif
+
+--- ./vboxvideo/vbox_drv.h.orig 2023-04-18 23:56:20.637139167 +0100
++++ ./vboxvideo/vbox_drv.h 2023-04-19 00:03:40.757619051 +0100
+@@ -184,7 +184,7 @@
+ # include <drm/ttm/ttm_resource.h>
+ #endif
+
+-#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_MAJ_PREREQ(9,2)
++#if RTLNX_VER_MIN(6,0,0) || RTLNX_RHEL_RANGE(8,8, 8,99) || RTLNX_RHEL_MAJ_PREREQ(9,2)
+ # include <drm/drm_framebuffer.h>
+ #endif
+
diff --git a/update_vbox.sh b/update_vbox.sh
index 07fc2e0..4c584b2 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=7.0.6
+VERSION=7.0.8
REL=1
-RAWHIDE=38
-REPOS="f37 f36 el9 el8"
+RAWHIDE=39
+REPOS="f38 f37 f36 el9 el8"
if [ -z "$1" ]
then
@@ -31,19 +31,23 @@ fi
if test $stage -le 1; then
echo STAGE 1
rfpkg ci -c && git show
+fi
+if test $stage -le 2; then
+echo STAGE 2
BRANCH1=f$RAWHIDE
BRANCH2=fc$RAWHIDE
echo Press enter tag-build rawhide to continue or n to skip; read dummy;
if [[ "$dummy" != "n" ]]; then
echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout rawhide && rfpkg push
koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
-git checkout $BRANCH1 && rfpkg push && rfpkg build --nowait ) &
+git checkout rawhide && rfpkg build --nowait ) &
fi
fi
-if test $stage -le 2; then
-echo STAGE 2
+if test $stage -le 3; then
+echo STAGE 3
for repo in $REPOS ; do
BRANCH1=$repo
BRANCH2=$repo
@@ -53,9 +57,10 @@ fi
echo Press enter tag-build $BRANCH1 to continue or n to skip; read dummy;
if [[ "$dummy" != "n" ]]; then
echo koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
+git checkout $BRANCH1 && git merge master
koji-rpmfusion tag-build $BRANCH1-free-override VirtualBox-$VERSION-$REL.$BRANCH2
(koji-rpmfusion wait-repo $BRANCH1-free-build --build=VirtualBox-$VERSION-$REL.$BRANCH2 && \
-git checkout $BRANCH1 && git merge master && git push && rfpkg build --nowait; git checkout master) &
+git checkout $BRANCH1 && rfpkg build --nowait; git checkout master) &
fi
done
fi
1 year, 7 months
[VirtualBox] Update VirtualBox to 7.0.8
by Sérgio M. Basto
commit e9162c45628dc54880a55e34635444cbff4755b5
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Apr 18 22:13:01 2023 +0100
Update VirtualBox to 7.0.8
VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch | 11 --
VirtualBox-lzf.patch | 12 ---
VirtualBox-python3.11.patch | 117 ++++++++++-----------
VirtualBox.spec | 16 ++-
sources | 4 +-
update_vbox.sh | 2 +-
6 files changed, 67 insertions(+), 95 deletions(-)
---
diff --git a/VirtualBox-python3.11.patch b/VirtualBox-python3.11.patch
index ac0077f..5a75f5a 100644
--- a/VirtualBox-python3.11.patch
+++ b/VirtualBox-python3.11.patch
@@ -9,10 +9,9 @@
for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
-diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk
---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-19 22:01:39.000000000 +0100
-+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-25 14:00:03.971778289 +0100
-@@ -26,7 +26,7 @@ endif
+--- ./src/libs/xpcom18a4/python/Makefile.kmk.python3.11 2023-04-17 16:58:21.000000000 +0100
++++ ./src/libs/xpcom18a4/python/Makefile.kmk 2023-04-18 20:34:47.463630061 +0100
+@@ -30,7 +30,7 @@ include $(KBUILD_PATH)/subheader.kmk
#
# List of supported Python versions, defining a number of
@@ -21,68 +20,68 @@ diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6.
# which get picked up below.
#
ifeq ($(KBUILD_TARGET),darwin) # Relatively predictable, don't script.
-@@ -624,6 +624,52 @@ VBoxPython3_10m_x86_LIBS = $(VBOX_
+@@ -665,6 +665,52 @@ ifndef VBOX_ONLY_SDK
+ endif
endif
- endif
- endif
-+
-+ifdef VBOX_PYTHON311_INC
-+#
-+# Python 3.11 version
-+#
-+DLLS += VBoxPython3_11
-+VBoxPython3_11_EXTENDS = VBoxPythonBase
-+VBoxPython3_11_EXTENDS_BY = appending
-+VBoxPython3_11_TEMPLATE = XPCOM
-+VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC)
-+VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB)
+
++ ifdef VBOX_PYTHON311_INC
++ #
++ # Python 3.11 version
++ #
++ DLLS += VBoxPython3_11
++ VBoxPython3_11_EXTENDS = VBoxPythonBase
++ VBoxPython3_11_EXTENDS_BY = appending
++ VBoxPython3_11_TEMPLATE = XPCOM
++ VBoxPython3_11_INCS = $(VBOX_PYTHON311_INC)
++ VBoxPython3_11_LIBS = $(VBOX_PYTHON311_LIB)
+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+ ifdef VBOX_PYTHON311_LIB_X86
-+DLLS += VBoxPython3_11_x86
-+VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86
-+VBoxPython3_11_x86_EXTENDS_BY = appending
-+VBoxPython3_11_x86_TEMPLATE = XPCOM
-+VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC)
-+VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86)
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++ ifdef VBOX_PYTHON311_LIB_X86
++ DLLS += VBoxPython3_11_x86
++ VBoxPython3_11_x86_EXTENDS = VBoxPythonBase_x86
++ VBoxPython3_11_x86_EXTENDS_BY = appending
++ VBoxPython3_11_x86_TEMPLATE = XPCOM
++ VBoxPython3_11_x86_INCS = $(VBOX_PYTHON311_INC)
++ VBoxPython3_11_x86_LIBS = $(VBOX_PYTHON311_LIB_X86)
++ endif
++ endif
+ endif
-+ endif
-+endif
+
-+ifdef VBOX_PYTHON311M_INC
-+#
-+# Python 3.11 version with pymalloc
-+#
-+DLLS += VBoxPython3_11m
-+VBoxPython3_11m_EXTENDS = VBoxPythonBase_m
-+VBoxPython3_11m_EXTENDS_BY = appending
-+VBoxPython3_11m_TEMPLATE = XPCOM
-+VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC)
-+VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB)
++ ifdef VBOX_PYTHON311M_INC
++ #
++ # Python 3.11 version with pymalloc
++ #
++ DLLS += VBoxPython3_11m
++ VBoxPython3_11m_EXTENDS = VBoxPythonBase_m
++ VBoxPython3_11m_EXTENDS_BY = appending
++ VBoxPython3_11m_TEMPLATE = XPCOM
++ VBoxPython3_11m_INCS = $(VBOX_PYTHON311M_INC)
++ VBoxPython3_11m_LIBS = $(VBOX_PYTHON311M_LIB)
+
-+ ifdef VBOX_WITH_32_ON_64_MAIN_API
-+ ifdef VBOX_PYTHON311M_LIB_X86
-+DLLS += VBoxPython3_11m_x86
-+VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m
-+VBoxPython3_11m_x86_EXTENDS_BY = appending
-+VBoxPython3_11m_x86_TEMPLATE_ = XPCOM
-+VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC)
-+VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86)
++ ifdef VBOX_WITH_32_ON_64_MAIN_API
++ ifdef VBOX_PYTHON311M_LIB_X86
++ DLLS += VBoxPython3_11m_x86
++ VBoxPython3_11m_x86_EXTENDS = VBoxPythonBase_x86_m
++ VBoxPython3_11m_x86_EXTENDS_BY = appending
++ VBoxPython3_11m_x86_TEMPLATE_ = XPCOM
++ VBoxPython3_11m_x86_INCS = $(VBOX_PYTHON311M_INC)
++ VBoxPython3_11m_x86_LIBS = $(VBOX_PYTHON311M_LIB_X86)
++ endif
++ endif
+ endif
-+ endif
-+endif
-
- ifdef VBOX_PYTHONDEF_INC
- #
-@@ -744,7 +790,7 @@ endif
- # TODO: ASSUMING that we don't need a different headers for pymalloc
- # ('m' builds < 3.8) and CRT malloc.
- #
--VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \
-+VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \
- ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
++
+ ifdef VBOX_PYTHONDEF_INC
+ #
+ # Python without versioning
+@@ -707,7 +753,7 @@ ifndef VBOX_ONLY_SDK
+ # TODO: ASSUMING that we don't need a different headers for pymalloc
+ # ('m' builds < 3.8) and CRT malloc.
+ #
+- VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \
++ VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \
+ ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
- DLLS += VBoxPython3
+ DLLS += VBoxPython3
--- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2022-10-30 04:19:33.834495672 +0000
+++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-10-30 04:24:11.895463023 +0000
@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c1a0c6d..6e083c9 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,7 +45,7 @@
%bcond_without python3
Name: VirtualBox
-Version: 7.0.6
+Version: 7.0.8
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -99,10 +99,7 @@ Patch60: VirtualBox-7.0.2-xclient-cleanups.patch
#Patch70: vbox-python-selection.patch
Patch80: VirtualBox-6.1.4-gcc10.patch
-Patch88: VirtualBox-lzf.patch
Patch90: VirtualBox-python3.11.patch
-# Force the build of xpcom with -std=gnu++17, mandated by Python 3.11
-Patch92: VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch
BuildRequires: gcc-c++
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -326,11 +323,11 @@ rm -r src/libs/libpng-1.6.*/
rm -r src/libs/libxml2-2.9.*/
rm -r src/libs/openssl-3.*/
rm -r src/libs/zlib-1.2.*/
-rm -r src/libs/curl-7.*/
+rm -r src/libs/curl-8.*/
rm -r src/libs/libvorbis-1.3.*/
rm -r src/libs/libogg-1.3.*/
%if %{with system_libtpms}
-rm -r src/libs/libtpms-0.9.0/
+rm -r src/libs/libtpms-0.9.*/
%endif
%if %{with dxvk_native}
#rm -r src/libs/dxvk-native-1.9.*/
@@ -356,11 +353,7 @@ rm -r src/libs/libtpms-0.9.0/
%patch60 -p1 -b .xclient
#patch70 -p1 -b .python-detection
%patch80 -p1 -b .gcc10
-%patch88 -p1 -b .lzf
%patch90 -p1 -b .python3.11
-%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
-%patch92 -p1 -b .c++17
-%endif
%build
@@ -906,6 +899,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue Apr 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-1
+- Update VirtualBox to 7.0.8
+
* Wed Jan 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.6-1
- Update VirtualBox to 7.0.6
- Add fix to gcc13
diff --git a/sources b/sources
index bc23083..41255b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-7.0.6.tar.bz2) = f9db7a154e392f550f50abe774fc6263eb0b6f86dccc069f2c5012fedbe2debbf5b8ba62cca44ea0d5d5475652188176bfb888266f69197677b22854f02b64a0
-SHA512 (UserManual.pdf) = dddaa004188ed950684c919f30f874afac70a05aa6884073899a4a67a1c79f4f298ee79c441a7448422453d89f9114f39d16cb040c5bffc7b34d00a713003e29
+SHA512 (VirtualBox-7.0.8.tar.bz2) = 4c25f8275269d085cf347596a242b8921f140e0e40d8c44fd6b171742b8cbd0c9a45f4702dbc0c1272e10091be68c3668711c9e4d1a8b3ce57d25f871e0eb9fe
+SHA512 (UserManual.pdf) = 310f83fe2b832b496b8419bfee85e30ff1a1b668d68bb32b3c34ba2be25cbfc89d199f3ef09e4d1b787bc691e2173bb03997b25ce5cfd6525920363d19a7c44c
diff --git a/update_vbox.sh b/update_vbox.sh
index 2e7cd2b..c9c5df6 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=7.0.6
+VERSION=7.0.8
REL=1
RAWHIDE=39
REPOS="f38 f37 f36 el9 el8"
1 year, 7 months
[VirtualBox] Minor fixes
by Sérgio M. Basto
commit 5e3e1580d8b1e6ecfbea8ffc1fae8a42d9866231
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 13 00:28:38 2023 +0100
Minor fixes
VirtualBox.spec | 2 --
update_vbox.sh | 4 ++--
vbox-python-selection.patch | 36 ++++++++++++++++---------------
virtualbox-snpritnf-buffer-overflow.patch | 12 -----------
4 files changed, 21 insertions(+), 33 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index c248038..c1a0c6d 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -97,7 +97,6 @@ Patch54: VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch
Patch60: VirtualBox-7.0.2-xclient-cleanups.patch
# from OpenSuse
#Patch70: vbox-python-selection.patch
-Patch72: virtualbox-snpritnf-buffer-overflow.patch
Patch80: VirtualBox-6.1.4-gcc10.patch
Patch88: VirtualBox-lzf.patch
@@ -356,7 +355,6 @@ rm -r src/libs/libtpms-0.9.0/
%patch54 -p1 -b .dtrace
%patch60 -p1 -b .xclient
#patch70 -p1 -b .python-detection
-%patch72 -p1 -b .snpritnf-buffer-overflow
%patch80 -p1 -b .gcc10
%patch88 -p1 -b .lzf
%patch90 -p1 -b .python3.11
diff --git a/update_vbox.sh b/update_vbox.sh
index 6bb1f43..2e7cd2b 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
VERSION=7.0.6
REL=1
-#RAWHIDE=38
-REPOS="f37 f36 f35 el9 el8"
+RAWHIDE=39
+REPOS="f38 f37 f36 el9 el8"
if [ -z "$1" ]
then
stage=0
diff --git a/vbox-python-selection.patch b/vbox-python-selection.patch
index fa187d0..5b238b6 100644
--- a/vbox-python-selection.patch
+++ b/vbox-python-selection.patch
@@ -1,6 +1,6 @@
---- VirtualBox-6.1.34.orig/src/bldprogs/scm.cpp
-+++ VirtualBox-6.1.34/src/bldprogs/scm.cpp
-@@ -2206,7 +2206,7 @@ static int scmProcessFileInner(PSCMRWSTA
+--- VirtualBox-7.0.6.orig/src/bldprogs/scm.cpp
++++ VirtualBox-7.0.6/src/bldprogs/scm.cpp
+@@ -2335,7 +2335,7 @@ static int scmProcessFileInner(PSCMRWSTA
pszTreatAs = "shell";
else if ( (cchFirst >= 15 && strncmp(pchFirst, "/usr/bin/python", 15) == 0)
|| (cchFirst >= 19 && strncmp(pchFirst, "/usr/bin/env python", 19) == 0) )
@@ -9,9 +9,9 @@
else if ( (cchFirst >= 13 && strncmp(pchFirst, "/usr/bin/perl", 13) == 0)
|| (cchFirst >= 17 && strncmp(pchFirst, "/usr/bin/env perl", 17) == 0) )
pszTreatAs = "perl";
---- VirtualBox-6.1.34.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-+++ VirtualBox-6.1.34/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
-@@ -22,6 +22,9 @@
+--- VirtualBox-7.0.6.orig/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
++++ VirtualBox-7.0.6/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
+@@ -32,6 +32,9 @@
%define VBOXDOCDIR %{_defaultdocdir}/%NAME%
%global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -21,19 +21,21 @@
Summary: Oracle VM VirtualBox
Name: %NAME%
---- VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-+++ VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
-@@ -439,6 +439,8 @@ char *PyTraceback_AsString(PyObject *exc
+--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
++++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/ErrorUtils.cpp
+@@ -438,7 +438,9 @@ char *PyTraceback_AsString(PyObject *exc
+
{ // a temp scope so I can use temp locals.
#if PY_MAJOR_VERSION <= 2
- char *tempResult = PyString_AsString(obResult);
+- char *tempResult = PyString_AsString(obResult);
++ char *tempResult = (char *)PyString_AsString(obResult);
+#elif PY_MINOR_VERSION <= 6
-+ char *tempResult = PyUnicode_AsUTF8(obResult);
++ char *tempResult = (char *)PyUnicode_AsUTF8(obResult);
#else
/* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */
const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult);
---- VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
-+++ VirtualBox-6.1.34/src/libs/xpcom18a4/python/src/PyGBase.cpp
+--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/src/PyGBase.cpp
++++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/src/PyGBase.cpp
@@ -183,7 +183,11 @@ PyG_Base::~PyG_Base()
// Get the correct interface pointer for this object given the IID.
void *PyG_Base::ThisAsIID( const nsIID &iid )
@@ -47,9 +49,9 @@
if (iid.Equals(NS_GET_IID(nsISupports)))
return (nsISupports *)(nsIInternalPython *)this;
if (iid.Equals(NS_GET_IID(nsISupportsWeakReference)))
---- VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py
-+++ VirtualBox-6.1.34/src/libs/xpcom18a4/python/gen_python_deps.py
-@@ -86,7 +86,7 @@ def main(argv):
+--- VirtualBox-7.0.6.orig/src/libs/xpcom18a4/python/gen_python_deps.py
++++ VirtualBox-7.0.6/src/libs/xpcom18a4/python/gen_python_deps.py
+@@ -96,7 +96,7 @@ def main(argv):
else:
multi = 1
@@ -58,7 +60,7 @@
prefixes = ["/usr"]
versions = [str(sys.version_info[0])+'.'+str(sys.version_info[1]),
str(sys.version_info[0])+'.'+str(sys.version_info[1])+'m']
-@@ -114,24 +114,25 @@ def main(argv):
+@@ -124,24 +124,25 @@ def main(argv):
continue
for p in prefixes:
c = checkPair(p, v, dllpre, dllsuff, bitness_magic)
1 year, 7 months
[obs-studio/f37] Rebuilt
by Nicolas Chauvet
commit dda10b3d2f3b6b5bc245af91a5ef048fcf7f9445
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Apr 18 19:14:41 2023 +0200
Rebuilt
obs-studio.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/obs-studio.spec b/obs-studio.spec
index b0eff93..fca8c10 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -11,7 +11,7 @@
Name: obs-studio
Version: 28.1.2
-Release: 3%{?dist}
+Release: 3%{?dist}.1
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -157,6 +157,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%{_includedir}/obs/
%changelog
+* Tue Apr 18 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 28.1.2-3.1
+- Rebuilt for qt5-5.15-9
+
* Thu Jan 12 2023 Vitaly Zaitsev <vitaly(a)easycoding.org> - 28.1.2-3
- Rebuilt due to Qt 5.15.8 update.
1 year, 7 months
