commit 1792543c5f47851f6ae18a32b7328ddbd6dadf37
Author: Jan Palus <[email protected]>
Date: Mon Oct 24 23:44:36 2016 +0200
up to 5.1.8
- new patch to fix build with newer versions of lightdm
VirtualBox-lightdm-1.19.2.patch | 63 +++++++++++++++++++++++++++++++++++++++++
VirtualBox.spec | 10 ++++---
2 files changed, 69 insertions(+), 4 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index b5c69e7..b13de5f 100644
--- 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.6
+Version: 5.1.8
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: 8c2331a718cfc038963c1214c2ba9811
+# Source0-md5: 6a294ccb318cd605ca99df5dc2c20477
Source1:
http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 712a7264ccdc0af459faa2c396f31d98
+# Source1-md5: c05f0eb1d92b979ae29330558dfc7095
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -80,6 +80,7 @@ Patch12: %{pname}-all-translations.patch
Patch13: x32.patch
Patch14: %{pname}-no-scrextend.patch
Patch15: %{pname}-multipython.patch
+Patch16: %{pname}-lightdm-1.19.2.patch
URL: http://www.virtualbox.org/
%if %{with userspace}
%ifarch %{x8664}
@@ -533,6 +534,7 @@ cd ../..\
%patch13 -p1
%patch14 -p1
%patch15 -p0
+%patch16 -p0
%{__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/VirtualBox-lightdm-1.19.2.patch b/VirtualBox-lightdm-1.19.2.patch
new file mode 100644
index 0000000..5f1c9bc
--- /dev/null
+++ b/VirtualBox-lightdm-1.19.2.patch
@@ -0,0 +1,63 @@
+--- src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp.orig
2016-10-24 22:48:30.177292847 +0200
++++ src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp 2016-10-24
22:53:43.351327894 +0200
+@@ -394,7 +394,11 @@
+ #endif
+ pszDomain);
+ /* Trigger LightDM authentication with the user name just
retrieved. */
++#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2
++ lightdm_greeter_authenticate(pCtx->pGreeter, pszUsername, NULL);
/* Must be the real user name from host! */
++#else
+ lightdm_greeter_authenticate(pCtx->pGreeter, pszUsername); /*
Must be the real user name from host! */
++#endif
+
+ /* Securely wipe the user name + domain again. */
+ VbglR3CredentialsDestroy(pszUsername, NULL /* pszPassword */,
pszDomain,
+@@ -448,7 +452,11 @@
+ {
+ if (pCtx->pszPassword)
+ {
++#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2
++ lightdm_greeter_respond(pGreeter, pCtx->pszPassword, NULL);
++#else
+ lightdm_greeter_respond(pGreeter, pCtx->pszPassword);
++#endif
+ }
+ else
+ {
+@@ -460,7 +468,11 @@
+ AssertPtr(pEdtPwd);
+ const gchar *pszPwd = gtk_entry_get_text(pEdtPwd);
+ #endif
++#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2
++ lightdm_greeter_respond(pGreeter, pszPwd, NULL);
++#else
+ lightdm_greeter_respond(pGreeter, pszPwd);
++#endif
+ }
+ break;
+ }
+@@ -587,8 +599,13 @@
+ #endif
+ if (strlen(pszUser)) /* Only authenticate if username is given. */
+ {
++#ifdef HAVE_LIBLIGHTDMGOBJECT_1_19_2
++ lightdm_greeter_respond(pCtx->pGreeter, pszPwd, NULL);
++ lightdm_greeter_authenticate(pCtx->pGreeter, pszUser, NULL);
++#else
+ lightdm_greeter_respond(pCtx->pGreeter, pszPwd);
+ lightdm_greeter_authenticate(pCtx->pGreeter, pszUser);
++#endif
+ }
+ }
+
+--- src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk.orig 2016-10-24
23:14:30.007548938 +0200
++++ src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk 2016-10-24
23:16:23.902737037 +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_CXXFLAGS := $(if $(VBOX_OSE),$(filter-out -I%,$(shell
pkg-config --cflags liblightdm-gobject-1)),) $(if $(shell pkg-config --exists
'liblightdm-gobject-1 >= 1.19.2' && echo 1),-DHAVE_LIBLIGHTDMGOBJECT_1_19_2,)
+ ## @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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/1792543c5f47851f6ae18a32b7328ddbd6dadf37
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
