up to 5.1.4

- cpu_has_pge patch no longer needed
- lightdm-greeter-glib-includes does not seem required anymore
- new patch to fix makefile syntax for lightdm-greeter

diff --git a/16-no-update.patch b/16-no-update.patch
index 8d445ebdae40e7b3c40d608fbfdf0a49e3c06d0b..fd06789969d85407e5b1831a9eb039439017b93f 100644 (file)
--- a/16-no-update.patch
+++ b/16-no-update.patch
@@ -62,12 +62,13 @@ diff a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp b/src/VBox/Fron
  #  endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
      addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1255,8 +1253,6 @@
+@@ -1368,9 +1365,6 @@
  # ifdef VBOX_GUI_WITH_NETWORK_MANAGER
      /* 'Network Access Manager' action goes to 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
 -    /* 'Check for Updates' action goes to 'File' menu: */
--    pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
+-    if (gEDataManager->applicationUpdateEnabled())
+-        pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
  # endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
      /* 'Reset Warnings' action goes 'File' menu: */
      pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));

diff --git a/VirtualBox-cpu_has_pge.patch b/VirtualBox-cpu_has_pge.patch
deleted file mode 100644 (file)
index 61ac5d8..0000000
--- a/VirtualBox-cpu_has_pge.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- VirtualBox-5.1.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h.orig      2016-08-02 17:32:06.189576892 +0200
-+++ VirtualBox-5.1.2/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h   2016-08-02 17:33:03.373118295 +0200
-@@ -249,7 +249,7 @@
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 8) && defined(PAGE_KERNEL_EXEC) && defined(CONFIG_X86_PAE)
- # ifdef __PAGE_KERNEL_EXEC
-    /* >= 2.6.27 */
--#  define MY_PAGE_KERNEL_EXEC   __pgprot(cpu_has_pge ? __PAGE_KERNEL_EXEC | _PAGE_GLOBAL : __PAGE_KERNEL_EXEC)
-+#  define MY_PAGE_KERNEL_EXEC   __pgprot(boot_cpu_has(X86_FEATURE_PGE) ? __PAGE_KERNEL_EXEC | _PAGE_GLOBAL : __PAGE_KERNEL_EXEC)
- # else
- #  define MY_PAGE_KERNEL_EXEC   __pgprot(cpu_has_pge ? _PAGE_KERNEL_EXEC | _PAGE_GLOBAL : _PAGE_KERNEL_EXEC)
- # endif

diff --git a/VirtualBox.spec b/VirtualBox.spec
index e89f9c3599c2c8c5f04817e882ade0c8316a5e79..4808f22265ed67b26f75a4e3b6a9ff4dd5de505a 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -42,19 +42,19 @@ exit 1
 
 %define                qtver   5.3.2
 
-%define                rel             2
+%define                rel             1
 %define                pname           VirtualBox
 Summary:       VirtualBox - x86 hardware virtualizer
 Summary(pl.UTF-8):     VirtualBox - wirtualizator sprzętu x86
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       5.1.2
+Version:       5.1.4
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Applications/Emulators
 Source0:       http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: aff1647170dd92914cddfbd0254b9773
+# Source0-md5: e25a6a1f3c113c373dc0433f9c2526f3
 Source1:       http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 0a881c307e66ad963b3a4015b402035b
+# Source1-md5: c24e2057a7dbc7d63e859c32638c321d
 Source2:       vboxservice.init
 Source3:       vboxservice.service
 Source4:       vboxservice.sysconfig
@@ -71,7 +71,7 @@ Patch3:               %{pname}-dri.patch
 Patch4:                wrapper.patch
 Patch5:                xserver-1.12.patch
 Patch6:                hardening-shared.patch
-Patch7:                lightdm-greeter-glib-includes.patch
+Patch7:                lightdm-greeter-makefile.patch
 Patch8:                lightdm-greeter-g++-link.patch
 Patch9:                pld-guest.patch
 Patch10:       16-no-update.patch
@@ -79,7 +79,6 @@ Patch11:      18-system-xorg.patch
 Patch12:       %{pname}-all-translations.patch
 Patch13:       x32.patch
 Patch14:       %{pname}-no-scrextend.patch
-Patch15:       %{pname}-cpu_has_pge.patch
 URL:           http://www.virtualbox.org/
 %if %{with userspace}
 %ifarch %{x8664}
@@ -532,7 +531,6 @@ cd ../..\
 %endif
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in

diff --git a/lightdm-greeter-makefile.patch b/lightdm-greeter-makefile.patch
new file mode 100644 (file)
index 0000000..25c4ab5
--- /dev/null
+++ b/lightdm-greeter-makefile.patch
@@ -0,0 +1,20 @@
+--- VirtualBox-5.1.4/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk.orig        2016-08-21 15:55:34.233163799 +0200
++++ VirtualBox-5.1.4/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk     2016-08-21 15:55:46.509804204 +0200
+@@ -48,7 +48,7 @@
+       GTK_DISABLE_SINGLE_INCLUDES \
+       GDK_DISABLE_DEPRECATED
+ endif
+-vbox-greeter_CFLAGS  := $(if $(VBOX_OSE),%(filter-out -I%,$(shell pkg-config --cflags liblightdm-gobject-1)),)
++vbox-greeter_CFLAGS  := $(if $(VBOX_OSE),$(filter-out -I%,$(shell pkg-config --cflags liblightdm-gobject-1)),)
+ ## @todo r=bird: Why are we cooking our own lightdm-gobject-1 but using system headers?
+ ##               That sounds like a very risky business to me.  I've added  liblightdm-gobject-1.5.0
+ ##               to the INCS, however lightdm.h is missing and will be taken from the system.
+@@ -59,7 +59,7 @@
+       /usr/include/glib-2.0 \
+        $(if $(VBOX_OSE),,liblightdm-gobject-1.5.0) \
+       /usr/include/lightdm-gobject-1 \
+-      $(if $(VBOX_OSE),$(patsubst -I%,%,%(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
++      $(if $(VBOX_OSE),$(patsubst -I%,%,$(filter -I%,$(shell pkg-config --cflags liblightdm-gobject-1))),)
+ ifndef VBOX_WITH_FLTK
+  vbox-greeter_INCS   += \
+       /usr/include/glib-2.0 \