diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-04-16 12:17:27 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-04-16 12:17:27 -0300 |
| commit | d468718cdba4c8ac4bad5141e71cd4357072ec9a (patch) | |
| tree | 6b223d264b28de2f1f67f8790c66e4668e9bf10f /libre/virtualbox-libre/libre.patch | |
| parent | 81f86bc4de7ecaae19f82960c34fe225e13a06f7 (diff) | |
| parent | e6ae96ab0320ff1ea91b78dd2c1d5ed337107a31 (diff) | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/pandoc/PKGBUILD
Diffstat (limited to 'libre/virtualbox-libre/libre.patch')
| -rw-r--r-- | libre/virtualbox-libre/libre.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index e93fe80e8..a696f9a0d 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -681,8 +681,8 @@ ifdef VBOX_WITH_INSTALLER include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk # Keep this last. endif ---- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk 2012-07-24 21:23:26.938013023 -0300 -+++ VirtualBox-4.1.18/src/libs/Makefile.kmk 2012-07-24 21:43:42.557911752 -0300 +--- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk 2013-04-12 07:39:14.000000000 -0300 ++++ VirtualBox-4.2.12/src/libs/Makefile.kmk 2013-04-13 02:00:29.294392443 -0300 @@ -48,13 +48,6 @@ include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk endif @@ -691,7 +691,7 @@ -if !defined(VBOX_ONLY_SDK) \ - && ( "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \ - || defined(VBOX_WITH_EXTPACK_PUEL_BUILD)) -- include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk +- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk -endif - # libjpeg for VRDP video redirection |