Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10740973
D6179.id14871.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
D6179.id14871.diff
View Options
diff --git a/files/0001-Patch-out-notify-send-call.patch b/files/0001-Patch-out-notify-send-call.patch
--- a/files/0001-Patch-out-notify-send-call.patch
+++ b/files/0001-Patch-out-notify-send-call.patch
@@ -1,25 +1,31 @@
-From 2e0ff0382eacd54d1d1054367ce80a72b4b95613 Mon Sep 17 00:00:00 2001
-From: Joshua Strobl <joshua@stroblindustries.com>
-Date: Sun, 17 Mar 2019 16:23:27 +0200
-Subject: [PATCH 1/1] Patch out notify-send call.
+From d0995d916a93326997f6eab3b86175ac4d7253e7 Mon Sep 17 00:00:00 2001
+From: Pierre-Yves <pyu@riseup.net>
+Date: Tue, 30 Apr 2019 17:51:45 +0200
+Subject: [PATCH] Patch out notify-send call
+Signed-off-by: Pierre-Yves <pyu@riseup.net>
---
- src/VBox/Additions/x11/Installer/98vboxadd-xclient | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/VBox/Additions/x11/Installer/98vboxadd-xclient | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/VBox/Additions/x11/Installer/98vboxadd-xclient b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-index dcad1ce8..fef0a14f 100755
+index dcad1ce8..a4f5df7f 100755
--- a/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+++ b/src/VBox/Additions/x11/Installer/98vboxadd-xclient
-@@ -25,7 +25,7 @@ if ! test -c /dev/vboxguest 2>/dev/null; then
- # Do not start if the kernel module is not present.
- # Execute notify-send in the back-ground to avoid racing with sddm,
- # as notify-send may wait for sddm to start while it waits for us to exit.
+@@ -21,12 +21,7 @@ for i in $HOME/.vboxclient-*.pid; do
+ test -w $i || rm -f $i
+ done
+
+-if ! test -c /dev/vboxguest 2>/dev/null; then
+- # Do not start if the kernel module is not present.
+- # Execute notify-send in the back-ground to avoid racing with sddm,
+- # as notify-send may wait for sddm to start while it waits for us to exit.
- notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." &
-+ # notify-send "VBoxClient: the VirtualBox kernel service is not running. Exiting." &
- elif test -z "${SSH_CONNECTION}"; then
+-elif test -z "${SSH_CONNECTION}"; then
++if test -z "${SSH_CONNECTION}"; then
# This script can also be triggered by a connection over SSH, which is not
# what we had in mind, so we do not start VBoxClient in that case. We do
+ # not use "exit" here as this script is "source"d, not executed.
--
2.21.0
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : virtualbox
version : 6.0.6
-release : 102
+release : 103
source :
- https://download.virtualbox.org/virtualbox/6.0.6/VirtualBox-6.0.6.tar.bz2 : 3419c49a90cef7f0a5781426259d47d7871457ab0fd201ec0fca83321441e552
- git|https://github.com/jwrdegoede/vboxsf.git : 87b9015c57dd7f226c768131bf8b4c0249de9835
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -23,7 +23,7 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="102">virtualbox-common</Dependency>
+ <Dependency releaseFrom="103">virtualbox-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/4.9.168-129.lts/extra/vboxdrv.ko</Path>
@@ -348,7 +348,7 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="102">virtualbox-common</Dependency>
+ <Dependency releaseFrom="103">virtualbox-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/5.0.7-114.current/extra/vboxdrv.ko</Path>
@@ -366,8 +366,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="102">virtualbox</Dependency>
- <Dependency releaseFrom="102">virtualbox-common</Dependency>
+ <Dependency release="103">virtualbox</Dependency>
+ <Dependency releaseFrom="103">virtualbox-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/python3.6/site-packages/vboxapi-1.0-py3.6.egg-info</Path>
@@ -819,7 +819,7 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="102">virtualbox-guest-common</Dependency>
+ <Dependency releaseFrom="103">virtualbox-guest-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/4.9.168-129.lts/misc/vboxguest.ko</Path>
@@ -866,15 +866,15 @@
</Description>
<PartOf>virt</PartOf>
<RuntimeDependencies>
- <Dependency releaseFrom="102">virtualbox-guest-common</Dependency>
+ <Dependency releaseFrom="103">virtualbox-guest-common</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/lib/modules/5.0.7-114.current/misc/vboxsf.ko</Path>
</Files>
</Package>
<History>
- <Update release="102">
- <Date>2019-04-19</Date>
+ <Update release="103">
+ <Date>2019-04-30</Date>
<Version>6.0.6</Version>
<Comment>Packaging update</Comment>
<Name>Pierre-Yves</Name>
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 15 2023, 7:03 AM (12 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5815884
Default Alt Text
D6179.id14871.diff (5 KB)
Attached To
Mode
D6179: Fix shared clipboard not working
Attached
Detach File
Event Timeline
Log In to Comment