From 744d2a31b2ca9d7e04ecb240855056d3f2dca9e73421990813237ac1304e924d Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Wed, 16 Jan 2019 17:24:37 +0000 Subject: [PATCH 1/2] Accepting request 665376 from home:lwfinger:branches:Virtualization - Fix for latest gcc8 was incomplete. - Fix builds for the latest version of gcc8 and above. File "fixes_for_gcc9" is added. OBS-URL: https://build.opensuse.org/request/show/665376 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=462 --- fixes_for_gcc9 | 26 ++++++++++++++++++++++++++ virtualbox.changes | 10 ++++++++++ virtualbox.spec | 7 +++++-- 3 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 fixes_for_gcc9 diff --git a/fixes_for_gcc9 b/fixes_for_gcc9 new file mode 100644 index 0000000..157f96d --- /dev/null +++ b/fixes_for_gcc9 @@ -0,0 +1,26 @@ +Index: VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semevent-linux.cpp +=================================================================== +--- VirtualBox-5.2.22.orig/src/VBox/Runtime/r3/linux/semevent-linux.cpp ++++ VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semevent-linux.cpp +@@ -37,7 +37,7 @@ + * against glibc < 2.6. + */ + #include "../posix/semevent-posix.cpp" +-asm volatile (".global epoll_pwait"); ++asm (".global epoll_pwait"); + + #else /* glibc < 2.6 */ + +Index: VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +=================================================================== +--- VirtualBox-5.2.22.orig/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp ++++ VirtualBox-5.2.22/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +@@ -39,7 +39,7 @@ + * against glibc < 2.6. + */ + #include "../posix/semeventmulti-posix.cpp" +-asm volatile (".global epoll_pwait"); ++asm (".global epoll_pwait"); + + #else /* glibc < 2.6 */ + diff --git a/virtualbox.changes b/virtualbox.changes index 9515246..7e4f738 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Jan 13 18:31:20 UTC 2019 - Larry Finger + +- Fix for latest gcc8 was incomplete. + +------------------------------------------------------------------- +Sat Jan 12 18:01:29 UTC 2019 - Larry Finger + +- Fix builds for the latest version of gcc8 and above. File "fixes_for_gcc9" is added. + ------------------------------------------------------------------- Sat Dec 8 18:10:09 UTC 2018 - Hans-Peter Jansen diff --git a/virtualbox.spec b/virtualbox.spec index d5b0604..34c4ff4 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -129,8 +129,10 @@ Patch123: switch_to_python3.4+.patch Patch124: fix_32_bit_builds.patch # Fix API changes for kernel 4.20+ Patch125: fixes_for_4.20.patch -# Change default network adapter -Patch126: change_default_net_adapter.patch +# Fix changes for gcc9 +Patch126: fixes_for_gcc9 +# Fix API changes for kernel 5.0+ +#Patch127: fixes_for_5.0.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -437,6 +439,7 @@ as an "extpack" for VirtualBox. The implementation is licensed under GPL. %patch124 -p1 %patch125 -p1 %patch126 -p1 +#%patch127 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf From 1fecde2dfbf4bdaebea87271d9fd2b441ba3d1f6d83fac7ea607d8036968b2b0 Mon Sep 17 00:00:00 2001 From: Factory Maintainer Date: Fri, 18 Jan 2019 15:10:00 +0000 Subject: [PATCH 2/2] Accepting request 666534 from home:lwfinger:branches:Virtualization - Remove test patch "change_default_net_adapter.patch". It was made obsolete by upstream changes. OBS-URL: https://build.opensuse.org/request/show/666534 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=463 --- change_default_net_adapter.patch | 51 -------------------------------- virtualbox.changes | 5 ++++ 2 files changed, 5 insertions(+), 51 deletions(-) delete mode 100644 change_default_net_adapter.patch diff --git a/change_default_net_adapter.patch b/change_default_net_adapter.patch deleted file mode 100644 index 027a8b9..0000000 --- a/change_default_net_adapter.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: VirtualBox-5.2.22/src/VBox/Main/src-all/Global.cpp -=================================================================== ---- VirtualBox-5.2.22.orig/src/VBox/Main/src-all/Global.cpp -+++ VirtualBox-5.2.22/src/VBox/Main/src-all/Global.cpp -@@ -181,18 +181,18 @@ const Global::OSType Global::sOSTypes[] - - { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64-bit)", - VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, -- 128, 16, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ 128, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, - - { "Linux", "Linux", "Linux26", "Linux 2.6 / 3.x / 4.x (32-bit)", - VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, -- 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ 512, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, - - { "Linux", "Linux", "Linux26_64", "Linux 2.6 / 3.x / 4.x (64-bit)", - VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC - | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, -- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ 1024, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, - - { "Linux", "Linux", "ArchLinux", "Arch Linux (32-bit)", -@@ -219,13 +219,13 @@ const Global::OSType Global::sOSTypes[] - - { "Linux", "Linux", "OpenSUSE", "openSUSE (32-bit)", - VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, -- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ 1024, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, - - { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64-bit)", - VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC - | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, -- 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ 1024, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, - - { "Linux", "Linux", "Fedora", "Fedora (32-bit)", -@@ -323,7 +323,7 @@ const Global::OSType Global::sOSTypes[] - { "Linux", "Linux", "Linux_64", "Other Linux (64-bit)", - VBOXOSTYPE_Linux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC - | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, -- 512, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ 512, 16, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, - - { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)", diff --git a/virtualbox.changes b/virtualbox.changes index 7e4f738..2e66b13 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 16 18:32:24 UTC 2019 - Larry Finger + +- Remove test patch "change_default_net_adapter.patch". It was made obsolete by upstream changes. + ------------------------------------------------------------------- Sun Jan 13 18:31:20 UTC 2019 - Larry Finger