[Pkg-virtualbox-commits] [virtualbox] 04/05: Drop old patches
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Tue Nov 22 12:28:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository virtualbox.
commit c0029b7cbdfdb7f687e184c8c3e11f5e409a73d5
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Tue Nov 22 13:25:06 2016 +0100
Drop old patches
---
debian/patches/29-fix-ftbfs-as-needed.patch | 2 +-
debian/patches/36-fix-vnc-version-string.patch | 2 +-
debian/patches/fix-build.patch | 55 ----------------
debian/patches/linux-4.9-fix.patch | 87 --------------------------
debian/patches/old-python.patch | 14 -----
debian/patches/python3.patch | 81 ------------------------
debian/patches/series | 4 --
7 files changed, 2 insertions(+), 243 deletions(-)
diff --git a/debian/patches/29-fix-ftbfs-as-needed.patch b/debian/patches/29-fix-ftbfs-as-needed.patch
index ed9b5da..3c34fd9 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
-@@ -6108,7 +6108,7 @@
+@@ -6136,7 +6136,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 2ac389c..0077bcc 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
-@@ -2936,6 +2936,7 @@
+@@ -2963,6 +2963,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 54ce32f..0000000
--- a/debian/patches/fix-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: Upstream changeset 64324 and 64325 to fix build failure with gcc-7 (and 6.2.0-7 backported patch)
-
-Index: virtualbox/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp
-===================================================================
---- virtualbox.orig/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp
-+++ virtualbox/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp
-@@ -110,8 +110,16 @@
- */
- typedef struct USBPROXYURBLNX
- {
-- /** The kernel URB data */
-+ /** The kernel URB data. */
-+#if RT_GNUC_PREREQ(6, 0)
-+ /* gcc 6.2 complains about the [] member of KUrb */
-+# pragma GCC diagnostic push
-+# pragma GCC diagnostic ignored "-Wpedantic"
-+#endif
- struct usbdevfs_urb KUrb;
-+#if RT_GNUC_PREREQ(6, 0)
-+# pragma GCC diagnostic pop
-+#endif
- /** Space filler for the isochronous packets. */
- struct usbdevfs_iso_packet_desc aIsocPktsDonUseTheseUseTheOnesInKUrb[8];
- /** Node to link the URB in of the existing lists. */
-@@ -121,11 +129,11 @@
- /** The next linux URB if split up. */
- struct USBPROXYURBLNX *pSplitNext;
- /** Don't report these back. */
-- bool fCanceledBySubmit;
-+ bool fCanceledBySubmit;
- /** This split element is reaped. */
-- bool fSplitElementReaped;
-+ bool fSplitElementReaped;
- /** Size to transfer in remaining fragments of a split URB */
-- uint32_t cbSplitRemaining;
-+ uint32_t cbSplitRemaining;
- } USBPROXYURBLNX, *PUSBPROXYURBLNX;
-
- /**
-Index: virtualbox/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp
-===================================================================
---- virtualbox.orig/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp
-+++ virtualbox/src/VBox/Main/src-server/linux/HostDnsServiceLinux.cpp
-@@ -34,6 +34,11 @@
-
- #include <linux/limits.h>
-
-+/* Workaround for <sys/cdef.h> defining __flexarr to [] which beats us in
-+ * struct inotify_event (char name __flexarr). */
-+#include <sys/cdefs.h>
-+#undef __flexarr
-+#define __flexarr [0]
- #include <sys/inotify.h>
- #include <sys/types.h>
- #include <sys/socket.h>
diff --git a/debian/patches/linux-4.9-fix.patch b/debian/patches/linux-4.9-fix.patch
deleted file mode 100644
index 07ed297..0000000
--- a/debian/patches/linux-4.9-fix.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: cherry-pick upstream 64561 64562 and 64534
-Index: src/VBox/Additions/linux/drm/vbox_ttm.c
-===================================================================
---- a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -224,6 +224,8 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
- r = ttm_bo_move_memcpy(bo, evict, no_wait_gpu, new_mem);
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
-+ r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
- #else
-- r = ttm_bo_move_memcpy(bo, evict, interruptible, no_wait_gpu, new_mem);
-+ r = ttm_bo_move_memcpy(bo, interruptible, no_wait_gpu, new_mem);
- #endif
- return r;
-
-Index: src/VBox/Additions/linux/sharedfolders/dirops.c
-===================================================================
---- a/src/VBox/Additions/linux/sharedfolders/dirops.c
-+++ b/src/VBox/Additions/linux/sharedfolders/dirops.c
-@@ -749,5 +749,9 @@
- */
- static int sf_rename(struct inode *old_parent, struct dentry *old_dentry,
-- struct inode *new_parent, struct dentry *new_dentry)
-+ struct inode *new_parent, struct dentry *new_dentry
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+ , unsigned flags
-+#endif
-+ )
- {
- int err = 0, rc = VINF_SUCCESS;
-@@ -755,4 +759,12 @@
-
- TRACE();
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+ if (flags)
-+ {
-+ LogFunc(("rename with flags=%x\n", flags));
-+ return -EINVAL;
-+ }
-+#endif
-
- if (sf_g != GET_GLOB_INFO(new_parent->i_sb))
-Index: src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-===================================================================
---- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -1050,6 +1050,12 @@
- rc = get_user_pages(R3Ptr, /* Where from. */
- cPages, /* How many pages. */
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+ fWrite ? FOLL_WRITE | /* Write to memory. */
-+ FOLL_FORCE /* force write access. */
-+ : 0, /* Write to memory. */
-+# else
- fWrite, /* Write to memory. */
- fWrite, /* force write access. */
-+# endif
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs); /* vmas */
-@@ -1064,6 +1070,12 @@
- R3Ptr, /* Where from. */
- cPages, /* How many pages. */
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+ fWrite ? FOLL_WRITE | /* Write to memory. */
-+ FOLL_FORCE /* force write access. */
-+ : 0, /* Write to memory. */
-+# else
- fWrite, /* Write to memory. */
- fWrite, /* force write access. */
-+# endif
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs); /* vmas */
-@@ -1073,6 +1085,12 @@
- R3Ptr, /* Where from. */
- cPages, /* How many pages. */
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)
-+ fWrite ? FOLL_WRITE | /* Write to memory. */
-+ FOLL_FORCE /* force write access. */
-+ : 0, /* Write to memory. */
-+# else
- fWrite, /* Write to memory. */
- fWrite, /* force write access. */
-+# endif
- &pMemLnx->apPages[0], /* Page array. */
- papVMAs); /* vmas */
diff --git a/debian/patches/old-python.patch b/debian/patches/old-python.patch
deleted file mode 100644
index 1f43361..0000000
--- a/debian/patches/old-python.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Consider the old pyton in jessie as working
-Author: Gianfranco Costamagna <locutusofborg at debian.org>
-
---- virtualbox-5.1.8-dfsg.orig/configure
-+++ virtualbox-5.1.8-dfsg/configure
-@@ -2114,7 +2114,7 @@ extern "C" int main(void)
- }
- EOF
- found=
-- SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.5 python3.5m"
-+ SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 python3.4m python3.5 python3.5m"
- for p in $PYTHONDIR; do
- for d in $SUPPYTHONLIBS; do
- for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
deleted file mode 100644
index f168f3b..0000000
--- a/debian/patches/python3.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Origin: https://www.virtualbox.org/changeset/64330/vbox
-Index: virtualbox/src/libs/xpcom18a4/python/src/PyIID.cpp
-===================================================================
---- virtualbox.orig/src/libs/xpcom18a4/python/src/PyIID.cpp
-+++ virtualbox/src/libs/xpcom18a4/python/src/PyIID.cpp
-@@ -318,12 +318,21 @@
- return ret;
- }
-
-+#if PY_VERSION_HEX >= 0x03020000
-+/* static */Py_hash_t
-+Py_nsIID::PyTypeMethod_hash(PyObject *self)
-+#else
- /* static */long
- Py_nsIID::PyTypeMethod_hash(PyObject *self)
-+#endif
- {
- const nsIID &iid = ((Py_nsIID *)self)->m_iid;
-
-+#if PY_VERSION_HEX >= 0x03020000
-+ Py_hash_t ret = iid.m0 + iid.m1 + iid.m2;
-+#else
- long ret = iid.m0 + iid.m1 + iid.m2;
-+#endif
- for (int i=0;i<7;i++)
- ret += iid.m3[i];
- if ( ret == -1 )
-Index: virtualbox/src/libs/xpcom18a4/python/src/PyXPCOM.h
-===================================================================
---- virtualbox.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
-+++ virtualbox/src/libs/xpcom18a4/python/src/PyXPCOM.h
-@@ -286,7 +286,11 @@
- static int Py_setattr(PyObject *op, char *name, PyObject *v);
- static int Py_cmp(PyObject *ob1, PyObject *ob2);
- static PyObject *Py_richcmp(PyObject *ob1, PyObject *ob2, int op);
-+#if PY_VERSION_HEX >= 0x03020000
-+ static Py_hash_t Py_hash(PyObject *self);
-+#else
- static long Py_hash(PyObject *self);
-+#endif
- };
-
- //////////////////////////////////////////////////////////////////////////
-@@ -442,7 +446,11 @@
- #endif
- static PyObject *PyTypeMethod_richcompare(PyObject *self, PyObject *ob, int op);
- static PyObject *PyTypeMethod_repr(PyObject *self);
-+#if PY_VERSION_HEX >= 0x03020000
-+ static Py_hash_t PyTypeMethod_hash(PyObject *self);
-+#else
- static long PyTypeMethod_hash(PyObject *self);
-+#endif
- static PyObject *PyTypeMethod_str(PyObject *self);
- static void PyTypeMethod_dealloc(PyObject *self);
- static NS_EXPORT_STATIC_MEMBER_(PyTypeObject) type;
-Index: virtualbox/src/libs/xpcom18a4/python/src/TypeObject.cpp
-===================================================================
---- virtualbox.orig/src/libs/xpcom18a4/python/src/TypeObject.cpp
-+++ virtualbox/src/libs/xpcom18a4/python/src/TypeObject.cpp
-@@ -155,13 +155,21 @@
- }
-
- // @pymethod int|Py_nsISupports|__hash__|Implement a hash-code for the XPCOM object using XPCOM identity rules.
-+#if PY_VERSION_HEX >= 0x03020000
-+/*static*/Py_hash_t PyXPCOM_TypeObject::Py_hash(PyObject *self)
-+#else
- /*static*/long PyXPCOM_TypeObject::Py_hash(PyObject *self)
-+#endif
- {
- // We always return the value of the nsISupports *.
- nsISupports *pUnkThis;
- if (!Py_nsISupports::InterfaceFromPyObject(self, NS_GET_IID(nsISupports), &pUnkThis, PR_FALSE))
- return -1;
-+#if PY_VERSION_HEX >= 0x03020000
-+ Py_hash_t ret = _Py_HashPointer(pUnkThis);
-+#else
- long ret = _Py_HashPointer(pUnkThis);
-+#endif
- pUnkThis->Release();
- return ret;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 6d6394c..5b32c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,3 @@
32-disable-guest-version-check.patch
35-libvdeplug-soname.patch
36-fix-vnc-version-string.patch
-fix-build.patch
-python3.patch
-old-python.patch
-linux-4.9-fix.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