summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-10 14:19:54 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-05-10 14:19:54 -0300
commit65e7fbfdd5114e303e711061676b7b68017b3211 (patch)
tree771da34ffab941236b56765c0c4f736882523b9e /libre/virtualbox-libre
parent104ba4d89f45f4263d1a36efe6968290cd9277f6 (diff)
virtualbox-libre: fixing issue on patch
Diffstat (limited to 'libre/virtualbox-libre')
-rw-r--r--libre/virtualbox-libre/PKGBUILD2
-rw-r--r--libre/virtualbox-libre/libre.patch13
2 files changed, 7 insertions, 8 deletions
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 8a578eeda..e167382d1 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800'
'c7951fe6888d939f3a7d0dafe477e82b'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
- '5ea240a7f85a1f2e875dbd247a6982aa'
+ '8db59591250dd0c7b395a394caa4f246'
'50387fba578646a9d29de3f917a199d2')
prepare() {
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index dec34abb9..1e91c5b96 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -420,7 +420,7 @@
echo "Successfully generated '$CNF' and '$ENV'."
--- VirtualBox-4.2.12.orig/Makefile.kmk 2013-04-12 07:33:55.000000000 -0300
+++ VirtualBox-4.2.12/Makefile.kmk 2013-05-09 23:09:45.756804164 -0300
-@@ -177,41 +177,6 @@
+@@ -177,40 +177,6 @@
INSTALLS += buildserver-additions
endif
@@ -458,11 +458,10 @@
-buildserver-additions-affinity-hack:
- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp
- endif
--endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
+ endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER
- #
-@@ -327,18 +292,6 @@
+@@ -327,18 +293,6 @@
ifn1of ($(KBUILD_TARGET), l4 linux win)
VBOX_PATH_STAGED ?= .
@@ -481,7 +480,7 @@
# guesttool.exe
ifndef VBOX_WITH_WIN32_ADDITIONS
ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),)
-@@ -388,7 +341,6 @@
+@@ -388,7 +342,6 @@
include/VBox \
include/VBox/vmm \
include/VBox/com \
@@ -489,7 +488,7 @@
include/VBox/HostServices \
include/VBox/GuestHost \
include/VBox/HGSMI \
-@@ -983,17 +935,8 @@
+@@ -983,17 +936,8 @@
additions-packing:
+ $(KMK) VBOX_ONLY_ADDITIONS=1 \
@@ -507,7 +506,7 @@
-C src/VBox/Additions \
$(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip
-@@ -1010,200 +953,6 @@
+@@ -1010,200 +954,6 @@
#