[Pkg-virtualbox-commits] [virtualbox] 02/03: Drop old patches, update patches for new release
Gianfranco Costamagna
locutusofborg-guest at moszumanska.debian.org
Sat Oct 3 15:48:15 UTC 2015
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to branch master
in repository virtualbox.
commit d73d857a46ae6e26d404562fe172ba90c3e3eace
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Sat Oct 3 16:07:43 2015 +0200
Drop old patches, update patches for new release
---
debian/patches/01-build-arch.patch | 2 +-
debian/patches/04-vboxdrv-references.patch | 6 +++---
debian/patches/16-no-update.patch | 6 +++---
debian/patches/23-remove-invalid-chars-check.patch | 2 +-
debian/patches/27-hide-host-cache-warning.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
debian/patches/fix-build.patch | 16 ----------------
debian/patches/fix-gcc-5.2.patch | 15 ---------------
debian/patches/series | 2 --
10 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index bd8908f..99c0989 100644
--- a/debian/patches/01-build-arch.patch
+++ b/debian/patches/01-build-arch.patch
@@ -5,7 +5,7 @@ Index: virtualbox/configure
===================================================================
--- virtualbox.orig/configure 2013-11-19 03:40:50.133475296 -0500
+++ virtualbox/configure 2013-11-19 03:40:50.129475296 -0500
-@@ -337,7 +337,7 @@
+@@ -350,7 +350,7 @@
check_environment()
{
test_header environment
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 9f05415..624507f 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -12,7 +12,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
- pszError = N_("One of the kernel modules was not successfully loaded. Make sure "
- "that no kernel modules from an older version of VirtualBox exist. "
- "Then try to recompile and reload the kernel modules by executing "
-- "'/etc/init.d/vboxdrv setup' as root");
+- "'/sbin/rcvboxdrv setup' as root");
+ pszError = N_("Please install the virtualbox-dkms package "
+ "and execute 'modprobe vboxdrv' as root");
break;
@@ -25,7 +25,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
- pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
- "was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
-- "'/etc/init.d/vboxdrv setup' as root");
+- "'/sbin/rcvboxdrv setup' as root");
+ pszError = N_("Please install the virtualbox-dkms package "
+ "and execute 'modprobe vboxdrv' as root");
#else
@@ -38,7 +38,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
- pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
- "was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
-- "'/etc/init.d/vboxdrv setup' as root");
+- "'/sbin/rcvboxdrv setup' as root");
+ pszError = N_("Please install the virtualbox-dkms package "
+ "and execute 'modprobe vboxdrv' as root");
#else
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index ee1938c..89eebc7 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -21,7 +21,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
-@@ -991,7 +991,6 @@ void UIActionPool::preparePool()
+@@ -996,7 +996,6 @@ void UIActionPool::preparePool()
m_pool[UIActionIndex_M_Application_S_Preferences] = new UIActionSimplePreferences(this);
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
m_pool[UIActionIndex_M_Application_S_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
@@ -29,7 +29,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
m_pool[UIActionIndex_M_Application_S_ResetWarnings] = new UIActionSimpleResetWarnings(this);
m_pool[UIActionIndex_M_Application_S_Close] = new UIActionSimplePerformClose(this);
-@@ -1034,8 +1033,6 @@ void UIActionPool::prepareConnections()
+@@ -1039,8 +1038,6 @@ void UIActionPool::prepareConnections()
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
gNetworkManager, SLOT(show()), Qt::UniqueConnection);
@@ -38,7 +38,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
&msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
-@@ -1110,7 +1107,7 @@ void UIActionPool::updateConfiguration()
+@@ -1115,7 +1112,7 @@ void UIActionPool::updateConfiguration()
if (!fUpdateAllowed)
{
m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType)
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index 63e55bb..a5f0ce8 100644
--- a/debian/patches/23-remove-invalid-chars-check.patch
+++ b/debian/patches/23-remove-invalid-chars-check.patch
@@ -6,7 +6,7 @@ Index: virtualbox/configure
===================================================================
--- virtualbox.orig/configure 2013-11-19 04:36:42.817631012 -0500
+++ virtualbox/configure 2013-11-19 04:36:42.813631012 -0500
-@@ -169,11 +169,6 @@
+@@ -176,11 +176,6 @@
# the restricting tool is ar (mri mode).
INVALID_CHARS="[^A-Za-z0-9/\\$:._-]"
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index a958d46..48a1f32 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -6,7 +6,7 @@ Index: virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- virtualbox.orig/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.415740583 +0200
+++ virtualbox/src/VBox/Main/src-client/ConsoleImpl2.cpp 2015-04-02 15:46:54.411740580 +0200
-@@ -3953,34 +3953,12 @@
+@@ -3968,34 +3968,12 @@
if ( enmFsTypeFile == RTFSTYPE_EXT4
|| enmFsTypeFile == RTFSTYPE_XFS)
{
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 1a916ad..b10126d 100644
--- a/debian/patches/29-fix-ftbfs-as-needed.patch
+++ b/debian/patches/29-fix-ftbfs-as-needed.patch
@@ -5,7 +5,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:46:59.611743003 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:46:59.611743003 +0200
-@@ -5404,7 +5404,7 @@
+@@ -5456,7 +5456,7 @@
TEMPLATE_VBoxBldProg_LDFLAGS.amd64 = -m64
TEMPLATE_VBoxBldProg_LDFLAGS.sparc64 = -m64
ifeq ($(KBUILD_HOST),linux)
diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch
index 5a84828..bf81699 100644
--- a/debian/patches/36-fix-vnc-version-string.patch
+++ b/debian/patches/36-fix-vnc-version-string.patch
@@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk
===================================================================
--- virtualbox.orig/Config.kmk 2015-04-02 15:47:04.439745251 +0200
+++ virtualbox/Config.kmk 2015-04-02 15:47:04.435745250 +0200
-@@ -2619,6 +2619,7 @@
+@@ -2620,6 +2620,7 @@
-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
diff --git a/debian/patches/fix-build.patch b/debian/patches/fix-build.patch
deleted file mode 100644
index 6a4afdd..0000000
--- a/debian/patches/fix-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: cherry-pick upstream changeset 57658
-Author: Frank Mehnert <frank.mehnert at oracle.com>
-
-Index: src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-===================================================================
---- a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-+++ b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-@@ -104,6 +104,6 @@
- unsigned char *mFrameBuffer;
- uint32_t uClients;
-- static DECLCALLBACK(enum rfbNewClientAction) rfbNewClientEvent(rfbClientPtr cl);
-- static DECLCALLBACK(void) vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
-+ static enum rfbNewClientAction rfbNewClientEvent(rfbClientPtr cl);
-+ static void vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
- static void vncKeyboardEvent(rfbBool down, rfbKeySym keySym, rfbClientPtr cl);
- static void clientGoneHook(rfbClientPtr cl);
diff --git a/debian/patches/fix-gcc-5.2.patch b/debian/patches/fix-gcc-5.2.patch
deleted file mode 100644
index e6ccfb5..0000000
--- a/debian/patches/fix-gcc-5.2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Allow gcc-5.2 during build
---- virtualbox-5.0.2-dfsg.orig/configure
-+++ virtualbox-5.0.2-dfsg/configure
-@@ -417,9 +417,9 @@ check_gcc()
- -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
- -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
- -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
-- -o \( $cc_maj -eq 5 -a $cc_min -gt 1 \) \
-+ -o \( $cc_maj -eq 5 -a $cc_min -gt 2 \) \
- -o $cc_maj -gt 5 ]; then
-- log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.1"
-+ log_failure "gcc version $cc_maj.$cc_min found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10 or gcc 5.x with 0<x<3"
- fail really
- else
- log_success "found version $cc_ver"
diff --git a/debian/patches/series b/debian/patches/series
index d62bc03..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,3 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
-fix-gcc-5.2.patch
-fix-build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git
More information about the Pkg-virtualbox-commits
mailing list