[Pkg-virtualbox-commits] [virtualbox] 03/03: Drop xorg patches, patch refresh
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Wed Oct 18 18:32:12 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit d8ffd6b9bea73e209deb4d01faa3f2d1c8d2dc75
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Wed Oct 18 20:30:52 2017 +0200
Drop xorg patches, patch refresh
---
debian/patches/01-build-arch.patch | 2 +-
debian/patches/02-gsoap-build-fix.patch | 2 +-
debian/patches/04-vboxdrv-references.patch | 10 +-
debian/patches/12-make-module.patch | 153 ++-----------------
debian/patches/13-module-mismatch.patch | 2 +-
debian/patches/16-no-update.patch | 32 ++--
debian/patches/18-system-xorg.patch | 59 --------
debian/patches/23-remove-invalid-chars-check.patch | 8 +-
debian/patches/27-hide-host-cache-warning.patch | 78 +++++-----
debian/patches/28-no-selinux-fedora.patch | 2 +-
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
debian/patches/37-python-3.6-support.patch | 2 +-
debian/patches/new-xorg-1.19.patch | 165 ---------------------
debian/patches/series | 2 -
15 files changed, 83 insertions(+), 438 deletions(-)
diff --git a/debian/patches/01-build-arch.patch b/debian/patches/01-build-arch.patch
index 4bcf61f..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
-@@ -360,7 +360,7 @@
+@@ -350,7 +350,7 @@
check_environment()
{
test_header environment
diff --git a/debian/patches/02-gsoap-build-fix.patch b/debian/patches/02-gsoap-build-fix.patch
index 50ae501..e979005 100644
--- a/debian/patches/02-gsoap-build-fix.patch
+++ b/debian/patches/02-gsoap-build-fix.patch
@@ -3,7 +3,7 @@ Index: virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- virtualbox-git-orig.orig/src/VBox/Main/webservice/Makefile.kmk 2013-12-02 12:32:51.211124975 -0500
+++ virtualbox-git-orig/src/VBox/Main/webservice/Makefile.kmk 2013-12-02 12:36:04.531133954 -0500
-@@ -733,7 +733,7 @@
+@@ -758,7 +758,7 @@
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
diff --git a/debian/patches/04-vboxdrv-references.patch b/debian/patches/04-vboxdrv-references.patch
index 5397a8c..e870756 100644
--- a/debian/patches/04-vboxdrv-references.patch
+++ b/debian/patches/04-vboxdrv-references.patch
@@ -5,7 +5,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
===================================================================
--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp 2015-04-02 14:37:11.989792459 +0200
+++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp 2015-04-02 14:37:11.989792459 +0200
-@@ -308,10 +308,8 @@
+@@ -306,10 +306,8 @@
#ifdef RT_OS_LINUX
case VERR_SUPDRV_COMPONENT_NOT_FOUND:
@@ -18,7 +18,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
break;
#endif
-@@ -374,10 +372,8 @@
+@@ -372,10 +370,8 @@
{
case VERR_VM_DRIVER_LOAD_ERROR:
#ifdef RT_OS_LINUX
@@ -31,7 +31,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
-@@ -416,10 +412,8 @@
+@@ -414,10 +410,8 @@
case VERR_INVALID_HANDLE: /** @todo track down and fix this error. */
case VERR_VM_DRIVER_NOT_INSTALLED:
#ifdef RT_OS_LINUX
@@ -48,7 +48,7 @@ diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/Vir
index b4c8f19..4d1e83d 100644
--- a/src/VBox/Frontends/VirtualBox/src/main.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp
-@@ -102,9 +102,9 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
+@@ -97,9 +97,9 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr(
QString g_QStrHintLinuxNoDriver = QApplication::tr(
"The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
@@ -61,7 +61,7 @@ index b4c8f19..4d1e83d 100644
"as root."
);
-@@ -119,7 +119,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
+@@ -114,7 +114,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
diff --git a/debian/patches/12-make-module.patch b/debian/patches/12-make-module.patch
index 0efe76c..aebce27 100644
--- a/debian/patches/12-make-module.patch
+++ b/debian/patches/12-make-module.patch
@@ -1,143 +1,14 @@
Description: Fix ARCH setting in modules Makefiles.
-Author: Michael Meskes <meskes at debian.org>
+Author: Michael Meskes <meskes at debian.org>, Gianfranco Costamagna <locutusofborg at debian.org>
-Index: virtualbox/src/VBox/HostDrivers/Support/linux/Makefile
-===================================================================
---- virtualbox.orig/src/VBox/HostDrivers/Support/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
-+++ virtualbox/src/VBox/HostDrivers/Support/linux/Makefile 2013-11-19 03:41:05.817476025 -0500
-@@ -44,9 +44,21 @@
- BUILD_TARGET_ARCH := amd64
- else
- ifeq ($(ARCH),i386)
-- BUILD_TARGET_ARCH := x86
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
- else
-- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ ifeq ($(ARCH),x86)
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
-+ else
-+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ endif
- endif
- endif
- else
-Index: virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
-===================================================================
---- virtualbox.orig/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
-+++ virtualbox/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 2013-11-19 03:41:05.817476025 -0500
-@@ -35,9 +35,21 @@
- BUILD_TARGET_ARCH := amd64
- else
- ifeq ($(ARCH),i386)
-- BUILD_TARGET_ARCH := x86
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
- else
-- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ ifeq ($(ARCH),x86)
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
-+ else
-+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ endif
- endif
- endif
- else
-Index: virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
-===================================================================
---- virtualbox.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
-+++ virtualbox/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
-@@ -35,9 +35,21 @@
- BUILD_TARGET_ARCH := amd64
- else
- ifeq ($(ARCH),i386)
-- BUILD_TARGET_ARCH := x86
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
- else
-- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ ifeq ($(ARCH),x86)
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
-+ else
-+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ endif
- endif
- endif
- else
-Index: virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile
-===================================================================
---- virtualbox.orig/src/VBox/HostDrivers/VBoxPci/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
-+++ virtualbox/src/VBox/HostDrivers/VBoxPci/linux/Makefile 2013-11-19 03:41:05.821476025 -0500
-@@ -35,9 +35,21 @@
- BUILD_TARGET_ARCH := amd64
- else
- ifeq ($(ARCH),i386)
-- BUILD_TARGET_ARCH := x86
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
- else
-- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ ifeq ($(ARCH),x86)
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
-+ else
-+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ endif
- endif
- endif
- else
-Index: virtualbox/src/VBox/Installer/linux/Makefile.include.header
-===================================================================
---- virtualbox.orig/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
-+++ virtualbox/src/VBox/Installer/linux/Makefile.include.header 2013-11-19 03:41:05.821476025 -0500
-@@ -60,9 +60,21 @@
- BUILD_TARGET_ARCH := amd64
- else
- ifeq ($(ARCH),i386)
-- BUILD_TARGET_ARCH := x86
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
- else
-- BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ ifeq ($(ARCH),x86)
-+ ifeq ($(CONFIG_X86_32),y)
-+ BUILD_TARGET_ARCH := x86
-+ else
-+ BUILD_TARGET_ARCH := amd64
-+ endif
-+ else
-+ BUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH_DEF)
-+ endif
- endif
- endif
- else
+--- a/src/VBox/Installer/linux/Makefile.include.header
++++ b/src/VBox/Installer/linux/Makefile.include.header
+@@ -43,7 +43,7 @@
+ # (We have to support basic cross building (ARCH=i386|x86_64).)
+ # While at it, warn about BUILD_* vars found to help with user problems.
+ #
+-ifeq ($(filter-out x86_64 amd64 AMD64,$(shell uname -m)),)
++ifeq ($(filter-out x86_64 amd64 AMD64,$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)),)
+ BUILD_TARGET_ARCH_DEF := amd64
+ else
+ BUILD_TARGET_ARCH_DEF := x86
diff --git a/debian/patches/13-module-mismatch.patch b/debian/patches/13-module-mismatch.patch
index 60812c3..9ece920 100644
--- a/debian/patches/13-module-mismatch.patch
+++ b/debian/patches/13-module-mismatch.patch
@@ -5,7 +5,7 @@ Index: virtualbox/src/VBox/VMM/VMMR3/VM.cpp
===================================================================
--- virtualbox.orig/src/VBox/VMM/VMMR3/VM.cpp 2015-04-02 14:37:20.225796295 +0200
+++ virtualbox/src/VBox/VMM/VMMR3/VM.cpp 2015-04-02 14:37:20.221796293 +0200
-@@ -423,9 +423,11 @@
+@@ -421,9 +421,11 @@
break;
case VERR_VERSION_MISMATCH:
case VERR_VM_DRIVER_VERSION_MISMATCH:
diff --git a/debian/patches/16-no-update.patch b/debian/patches/16-no-update.patch
index e117580..5c0acd9 100644
--- a/debian/patches/16-no-update.patch
+++ b/debian/patches/16-no-update.patch
@@ -7,7 +7,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
-@@ -481,6 +481,8 @@
+@@ -471,6 +471,8 @@
void UIUpdateManager::sltForceCheck()
{
@@ -20,7 +20,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
-@@ -1115,7 +1115,6 @@
+@@ -1116,7 +1116,6 @@
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);
@@ -28,16 +28,16 @@ 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);
-@@ -1161,8 +1160,6 @@
+@@ -1162,8 +1161,6 @@
#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
- connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), SIGNAL(triggered()),
- gNetworkManager, SLOT(show()), Qt::UniqueConnection);
-- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), SIGNAL(triggered()),
-- gUpdateManager, SLOT(sltForceCheck()), Qt::UniqueConnection);
+ connect(action(UIActionIndex_M_Application_S_NetworkAccessManager), &UIAction::triggered,
+ gNetworkManager, &UINetworkManager::show, Qt::UniqueConnection);
+- connect(action(UIActionIndex_M_Application_S_CheckForUpdates), &UIAction::triggered,
+- gUpdateManager, &UIUpdateManager::sltForceCheck, Qt::UniqueConnection);
#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
- connect(action(UIActionIndex_M_Application_S_ResetWarnings), SIGNAL(triggered()),
- &msgCenter(), SLOT(sltResetSuppressedMessages()), Qt::UniqueConnection);
-@@ -1243,7 +1240,7 @@
+ connect(action(UIActionIndex_M_Application_S_ResetWarnings), &UIAction::triggered,
+ &msgCenter(), &UIMessageCenter::sltResetSuppressedMessages, Qt::UniqueConnection);
+@@ -1244,7 +1241,7 @@
if (!fUpdateAllowed)
{
m_restrictedActionsMenuApplication[UIActionRestrictionLevel_Base] = (UIExtraDataMetaDefs::MenuApplicationActionType)
@@ -62,7 +62,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpe
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
-@@ -308,6 +308,10 @@
+@@ -304,6 +304,10 @@
#endif /* !VBOX_WITH_NETFLT */
break;
}
@@ -77,7 +77,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
===================================================================
--- virtualbox.orig/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
+++ virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
-@@ -1312,8 +1312,6 @@
+@@ -1436,8 +1436,6 @@
/* 'About' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_About));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
@@ -86,8 +86,8 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
/* 'Network Access Manager' action goes to Application menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-@@ -1353,7 +1351,7 @@ void UISelectorWindow::prepareMenuFile(QMenu *pMenu)
- addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowMediumManager));
+@@ -1480,7 +1478,7 @@
+ addAction(actionPool()->action(UIActionIndexST_M_File_S_ShowHostNetworkManager));
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
- addAction(actionPool()->action(UIActionIndex_M_Application_S_CheckForUpdates));
@@ -95,7 +95,7 @@ Index: virtualbox/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cp
# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
addAction(actionPool()->action(UIActionIndex_M_Application_S_ResetWarnings));
addAction(actionPool()->action(UIActionIndexST_M_File_S_Close));
-@@ -1378,9 +1376,6 @@
+@@ -1507,9 +1505,6 @@
# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
/* 'Network Access Manager' action goes to 'File' menu: */
pMenu->addAction(actionPool()->action(UIActionIndex_M_Application_S_NetworkAccessManager));
@@ -109,7 +109,7 @@ Index: virtualbox/doc/manual/en_US/user_Introduction.xml
===================================================================
--- virtualbox.orig/doc/manual/en_US/user_Introduction.xml
+++ virtualbox/doc/manual/en_US/user_Introduction.xml
-@@ -1762,10 +1762,12 @@
+@@ -1764,10 +1764,12 @@
used to trigger certain VM actions (see <xref
linkend="specialcharacters"/>)</para>
</listitem>
diff --git a/debian/patches/18-system-xorg.patch b/debian/patches/18-system-xorg.patch
deleted file mode 100644
index f17c7ff..0000000
--- a/debian/patches/18-system-xorg.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes at debian.org>, Felix Geyer <fgeyer at debian.org>
-
-Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
-===================================================================
---- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
-+++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
-@@ -40,8 +40,6 @@
- VBoxGuestR3LibShared
- ifndef VBOX_ONLY_VALIDATIONKIT
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
-- LIBRARIES += \
-- VBoxGuestR3LibXFree86
- endif
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- LIBRARIES += \
-Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-===================================================================
---- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
-+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 15:44:24.955670965 +0200
-@@ -68,18 +68,12 @@
- VBoxOGL_INCS = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_INCS += \
-- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
-- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
-- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
-- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
-- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
-- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
-- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
-- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
-- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+ /usr/include/x11 \
-+ /usr/include/xorg \
-+ /usr/include/pixman-1 \
- $(VBOX_MESA_INCS) \
-- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+ /usr/include/drm \
-+ /usr/include/libdrm
- VBoxOGL_DEFS += VBOX_NO_NATIVEGL
- endif
-
-@@ -214,10 +208,10 @@
-
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
-- $(PATH_STAGE_LIB)/libXcomposite.so \
-- $(PATH_STAGE_LIB)/libXdamage.so \
-- $(PATH_STAGE_LIB)/libXfixes.so \
-- $(PATH_STAGE_LIB)/libXext.so
-+ Xcomposite \
-+ Xdamage \
-+ Xfixes \
-+ Xext
- ifdef VBoxOGL_FAKEDRI
- ifeq ($(KBUILD_TARGET), freebsd)
- VBoxOGL_LIBS += \
diff --git a/debian/patches/23-remove-invalid-chars-check.patch b/debian/patches/23-remove-invalid-chars-check.patch
index fc445b6..bb4a935 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
-@@ -181,11 +181,6 @@
+@@ -180,11 +180,6 @@
# the restricting tool is ar (mri mode).
INVALID_CHARS="[^A-Za-z0-9/\\$:._-]"
@@ -15,6 +15,6 @@ Index: virtualbox/configure
- exit 1
-fi
-
- # darwin /bin/sh has a builtin echo that doesn't grok -n. gotta love it.
- if [ "$OS" = "darwin" ]; then
- ECHO_N="/bin/echo -n"
+ # Posix /bin/sh isn't supporting echo -n. Use printf instead.
+ ECHO_N="printf"
+
diff --git a/debian/patches/27-hide-host-cache-warning.patch b/debian/patches/27-hide-host-cache-warning.patch
index 3cd07f8..520bcc3 100644
--- a/debian/patches/27-hide-host-cache-warning.patch
+++ b/debian/patches/27-hide-host-cache-warning.patch
@@ -2,42 +2,42 @@ Description: Silently enable the host I/O cache when the image is on an ext4/XFS
No need to warn users about it.
Author: Felix Geyer <fgeyer at debian.org>
-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
-@@ -4138,34 +4138,12 @@ int Console::i_configMediumAttachment(const char *pcszDevice,
- if ( enmFsTypeFile == RTFSTYPE_EXT4
- || enmFsTypeFile == RTFSTYPE_XFS)
- {
-- i_atVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
-- N_("The host I/O cache for at least one controller is disabled "
-- "and the medium '%ls' for this VM "
-- "is located on an %s partition. There is a known Linux "
-- "kernel bug which can lead to the corruption of the virtual "
-- "disk image under these conditions.\n"
-- "Either enable the host I/O cache permanently in the VM "
-- "settings or put the disk image and the snapshot folder "
-- "onto a different file system.\n"
-- "The host I/O cache will now be enabled for this medium"),
-- strFile.raw(), enmFsTypeFile == RTFSTYPE_EXT4 ? "ext4" : "xfs");
- fUseHostIOCache = true;
- }
- else if ( ( enmFsTypeSnap == RTFSTYPE_EXT4
- || enmFsTypeSnap == RTFSTYPE_XFS)
- && !mfSnapshotFolderExt4WarningShown)
- {
-- i_atVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
-- N_("The host I/O cache for at least one controller is disabled "
-- "and the snapshot folder for this VM "
-- "is located on an %s partition. There is a known Linux "
-- "kernel bug which can lead to the corruption of the virtual "
-- "disk image under these conditions.\n"
-- "Either enable the host I/O cache permanently in the VM "
-- "settings or put the disk image and the snapshot folder "
-- "onto a different file system.\n"
-- "The host I/O cache will now be enabled for this medium"),
-- enmFsTypeSnap == RTFSTYPE_EXT4 ? "ext4" : "xfs");
- fUseHostIOCache = true;
- mfSnapshotFolderExt4WarningShown = true;
- }
+diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp
+index 61dbf0a59..cfb76fc48 100644
+--- a/src/VBox/Main/src-client/ConsoleImpl2.cpp
++++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp
+@@ -4056,34 +4056,12 @@ int Console::i_checkMediumLocation(IMedium *pMedium, bool *pfUseHostIOCache)
+ if ( enmFsTypeFile == RTFSTYPE_EXT4
+ || enmFsTypeFile == RTFSTYPE_XFS)
+ {
+- i_atVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
+- N_("The host I/O cache for at least one controller is disabled "
+- "and the medium '%ls' for this VM "
+- "is located on an %s partition. There is a known Linux "
+- "kernel bug which can lead to the corruption of the virtual "
+- "disk image under these conditions.\n"
+- "Either enable the host I/O cache permanently in the VM "
+- "settings or put the disk image and the snapshot folder "
+- "onto a different file system.\n"
+- "The host I/O cache will now be enabled for this medium"),
+- strFile.raw(), enmFsTypeFile == RTFSTYPE_EXT4 ? "ext4" : "xfs");
+ *pfUseHostIOCache = true;
+ }
+ else if ( ( enmFsTypeSnap == RTFSTYPE_EXT4
+ || enmFsTypeSnap == RTFSTYPE_XFS)
+ && !mfSnapshotFolderExt4WarningShown)
+ {
+- i_atVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
+- N_("The host I/O cache for at least one controller is disabled "
+- "and the snapshot folder for this VM "
+- "is located on an %s partition. There is a known Linux "
+- "kernel bug which can lead to the corruption of the virtual "
+- "disk image under these conditions.\n"
+- "Either enable the host I/O cache permanently in the VM "
+- "settings or put the disk image and the snapshot folder "
+- "onto a different file system.\n"
+- "The host I/O cache will now be enabled for this medium"),
+- enmFsTypeSnap == RTFSTYPE_EXT4 ? "ext4" : "xfs");
+ *pfUseHostIOCache = true;
+ mfSnapshotFolderExt4WarningShown = true;
+ }
diff --git a/debian/patches/28-no-selinux-fedora.patch b/debian/patches/28-no-selinux-fedora.patch
index 106d01a..97a15f6 100644
--- a/debian/patches/28-no-selinux-fedora.patch
+++ b/debian/patches/28-no-selinux-fedora.patch
@@ -3,7 +3,7 @@ Author: Felix Geyer <fgeyer at debian.org>
--- a/src/VBox/Additions/linux/Makefile.kmk
+++ b/src/VBox/Additions/linux/Makefile.kmk
-@@ -346,9 +346,7 @@ lnx_add_inst-noexec_INST = $(VBOX_LN
+@@ -297,9 +297,7 @@ lnx_add_inst-noexec_INST = $(VBOX_LN
lnx_add_inst-noexec_SOURCES = \
$(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
$(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index 7f4b932..268f293 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
-@@ -6121,7 +6121,7 @@
+@@ -6237,7 +6237,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 f6c2fcb..7b829c9 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
-@@ -2958,6 +2958,7 @@
+@@ -3053,6 +3053,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/37-python-3.6-support.patch b/debian/patches/37-python-3.6-support.patch
index de1af67..8ca7405 100644
--- a/debian/patches/37-python-3.6-support.patch
+++ b/debian/patches/37-python-3.6-support.patch
@@ -6,7 +6,7 @@ Last-Update: 2017-06-23
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure
+++ b/configure
-@@ -2146,7 +2146,7 @@
+@@ -1982,7 +1982,7 @@
}
EOF
found=
diff --git a/debian/patches/new-xorg-1.19.patch b/debian/patches/new-xorg-1.19.patch
deleted file mode 100644
index 65d73b6..0000000
--- a/debian/patches/new-xorg-1.19.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-Description: upstream: 64269 64270
-Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-===================================================================
---- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -71,7 +71,7 @@
- /usr/include/x11 \
- /usr/include/xorg \
- /usr/include/pixman-1 \
-- $(VBOX_MESA_INCS) \
-+ $(VBOX_GL_INCS) \
- /usr/include/drm \
- /usr/include/libdrm
- VBoxOGL_DEFS += VBOX_NO_NATIVEGL
-@@ -439,7 +439,7 @@
- array
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLarrayspu_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
- VBoxOGLarrayspu_INSTTYPE.win = none
-@@ -487,7 +487,7 @@
- passthrough
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLpassthroughspu_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
- VBoxOGLpassthroughspu_INSTTYPE.win = none
-@@ -536,7 +536,7 @@
- pack
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLpackspu_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
- VBoxOGLpackspu_INSTTYPE.win = none
-@@ -642,7 +642,7 @@
- feedback
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLfeedbackspu_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
- VBoxOGLfeedbackspu_INSTTYPE.win = none
-Index: virtualbox/src/VBox/Additions/x11/Makefile.kmk
-===================================================================
---- virtualbox.orig/src/VBox/Additions/x11/Makefile.kmk
-+++ virtualbox/src/VBox/Additions/x11/Makefile.kmk
-@@ -20,12 +20,18 @@
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
- include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
-- ifneq ($(KBUILD_TARGET), solaris)
-- include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
-- endif
-- ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
-+ ifndef VBOX_NO_LEGACY_XORG_X11
-+ include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
-+ ifneq ($(KBUILD_TARGET), solaris)
-+ include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
-+ endif
-+ # This should logically only be controlled by VBOX_NO_LEGACY_XORG_X11,
-+ # as it is not used for drivers at all, but rather to build X11 clients
-+ # on systems missing needed libraries.
-+ ## @todo fix at some later point when it will not break people's workflows.
-+ ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-+ include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
-+ endif
- endif
- endif
-
-Index: virtualbox/src/VBox/GuestHost/OpenGL/Makefile.kmk
-===================================================================
---- virtualbox.orig/src/VBox/GuestHost/OpenGL/Makefile.kmk
-+++ virtualbox/src/VBox/GuestHost/OpenGL/Makefile.kmk
-@@ -54,7 +54,7 @@
- VBoxOGLcrutil_INTERMEDIATES = $(VBOX_PATH_CROGL_GENFILES)/cr_opcodes.h
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLcrutil_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- VBoxOGLcrutil_SOURCES = \
- util/bbox.c \
-@@ -199,7 +199,7 @@
- packer
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLcrpacker_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- VBoxOGLcrpacker_INTERMEDIATES = \
- $(VBOX_PATH_CROGL_GENFILES)/cr_packfunctions.h \
-@@ -350,7 +350,7 @@
- $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLspuload_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- VBoxOGLspuload_SOURCES = \
- spu_loader/spuinit.c \
-@@ -423,7 +423,7 @@
- state_tracker
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLcrstate_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- VBoxOGLcrstate_INTERMEDIATES = \
- $(VBOX_PATH_CROGL_GENFILES)/state/cr_statefuncs.h \
-@@ -624,7 +624,7 @@
- $(VBOX_PATH_CROGL_GENFILES)/spu_dispatch_table.h
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGLerrorspu_INCS += \
-- $(VBOX_MESA_INCS)
-+ $(VBOX_GL_INCS)
- endif
- VBoxOGLerrorspu_SOURCES = \
- $(VBOX_PATH_CROGL_GENFILES)/errorspu.c \
-Index: virtualbox/src/VBox/Additions/x11/vboxvideo/helpers.c
-===================================================================
---- virtualbox.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
-+++ virtualbox/src/VBox/Additions/x11/vboxvideo/helpers.c
-@@ -82,7 +82,7 @@
-
- property_name = MakeAtom(pszName, strlen(pszName), TRUE);
- VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
-- ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
-+ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
- }
-
- void vbvxReprobeCursor(ScrnInfoPtr pScrn)
-Index: virtualbox/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-===================================================================
---- virtualbox.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-+++ virtualbox/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
-@@ -1229,7 +1229,7 @@
- updateGraphicsCapability(pScrn, TRUE);
-
- /* Register block and wake-up handlers for getting new screen size hints. */
-- RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
-+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
-
- /* software cursor */
- miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
---- virtualbox-5.1.10-dfsg.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-+++ virtualbox-5.1.10-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
-@@ -376,7 +376,7 @@ vboxvideo_drv_118_SOURCES := $(vboxvideo
-
- ifdef VBOX_USE_SYSTEM_XORG_HEADERS
- # Build using local X.Org headers. We assume X.Org Server 1.7 or later.
-- DLLS := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
-+ DLLS := $(filter-out vboxvideo_drv_%,$(DLLS))
- SYSMODS := $(filter-out vboxvideo_drv%,$(SYSMODS))
- vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_system_CFLAGS := \
diff --git a/debian/patches/series b/debian/patches/series
index f62325e..4badabe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
12-make-module.patch
13-module-mismatch.patch
16-no-update.patch
-18-system-xorg.patch
23-remove-invalid-chars-check.patch
27-hide-host-cache-warning.patch
28-no-selinux-fedora.patch
@@ -14,5 +13,4 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
-new-xorg-1.19.patch
37-python-3.6-support.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