diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-02-21 20:25:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-21 20:25:12 +0000 |
commit | d37f8725bb68034ef10d8882fb4411a49f2f666e (patch) | |
tree | 2b530ee04815bacc1dc051db24c2727d3056b77b /app-emulation/virtualbox/files | |
parent | 171d09fa1f429aa43835c618a2c21753ad5209a4 (diff) |
gentoo auto-resync : 21:02:2023 - 20:25:12
Diffstat (limited to 'app-emulation/virtualbox/files')
-rw-r--r-- | app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch | 59 | ||||
-rw-r--r-- | app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch | 16 |
2 files changed, 0 insertions, 75 deletions
diff --git a/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch b/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch deleted file mode 100644 index 7eb1e1793a7f..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-5.2.8-paxmark-bldprogs.patch +++ /dev/null @@ -1,59 +0,0 @@ -2017-02-20 Quentin Minster <quentin@minster.io> - - #https://bugs.gentoo.org/show_bug.cgi?id=591582 - * Config.kmk: add paxmark befor VBOX_VBOXTPG get run. - * src/VBox/VMM/Makefile.kmk: add paxmark befor VBOX_VBOXCPP get run. - * src/VBox/Main/Makefile.kmk: add paxmark befor USBIdDatabaseGenerator_1_TARGET get run. - ---- a/Config.kmk -+++ b/Config.kmk 2016-09-21 02:22:28 -@@ -3719,11 +3719,13 @@ - $(if-expr $(intersects $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES_64)),-64,-32) \ - -h --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv - define TOOL_VBoxTpG_DTRACE_HDR_CMDS -+ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" - $(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" - endef - TOOL_VBoxTpG_DTRACE_OBJ_NOT_NEEDED := - TOOL_VBoxTpG_DTRACE_OBJ_FLAGS := -G --host-$(VBOX_HC_ARCH_BITS)-bit #-vvv - define TOOL_VBoxTpG_DTRACE_OBJ_CMDS -+ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" - $(QUIET)$(VBOX_VBOXTPG) \ - $(if-expr $(intersects $(bld_trg_arch),$(KBUILD_ARCHES_64)),-64,-32) \ - $(flags) \ -@@ -3738,6 +3740,7 @@ - TOOL_VBoxTpG-Disabled_DTRACE_DEPORD = $(VBOX_VBOXTPG) - TOOL_VBoxTpG-Disabled_DTRACE_HDR_FLAGS := -h - define TOOL_VBoxTpG-Disabled_DTRACE_HDR_CMDS -+ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" - $(QUIET)$(VBOX_VBOXTPG) $(flags) -o "$(out)" -s "$(source)" - endef - TOOL_VBoxTpG-Disabled_DTRACE_OBJ_NOT_NEEDED := $(KBUILD_OSES) -@@ -3752,6 +3755,7 @@ - TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS = - define TOOL_DTraceAndVBoxTpG_DTRACE_HDR_CMDS - $(TOOL_StandardDTrace_DTRACE_HDR_CMDS) -+ $(QUIET)paxmark.sh -m "$(VBOX_VBOXTPG)" - $(QUIET)$(VBOX_VBOXTPG) --generate-wrapper-header --host-$(VBOX_HC_ARCH_BITS)-bit --ring-3-context \ - $(filter-out -C, $(filter-out -h,$(flags))) \ - -o "$(out).tmp" -s "$(source)" ---- a/src/VBox/VMM/Makefile.kmk 2018-04-10 15:26:24.622867735 +0300 -+++ b/src/VBox/VMM/Makefile.kmk 2018-04-10 15:24:35.901998796 +0300 -@@ -896,6 +896,7 @@ - $$(VMMLibDTrace_0_OUTDIR)/$1: $2 $$(VBOX_VBOXCPP) | $$$$(dir $$$$@) - $$(call KB_FN_AUTO_CMD_DEPS_COMMANDS) - $$(QUIET)$$(call MSG_GENERATE,VMMLibDTrace,$$@,$2) -+ $$(QUIET)paxmark.sh -m "$(VBOX_VBOXCPP)" - $$(QUIET)$(VBOX_VBOXCPP) -d \ - -D VBOX_FOR_DTRACE_LIB \ - -D VBOX_FOR_DTRACE_LIB_$(toupper $(KBUILD_TARGET_ARCH)) \ ---- a/src/VBox/Main/Makefile.kmk 2018-04-10 15:26:15.292793067 +0300 -+++ b/src/VBox/Main/Makefile.kmk 2018-04-10 15:25:14.042303341 +0300 -@@ -607,6 +607,7 @@ - $(PATH_SUB_CURRENT)/src-server/usb.ids $(PATH_SUB_CURRENT)/src-server/custom.ids | $$(dir $$@) - $(call KB_FN_AUTO_CMD_DEPS_COMMANDS) - $(call MSG_GENERATE,USBIdDatabase,$@,$(USBIdDatabaseGenerator_1_TARGET)) -+ $(QUIET)paxmark.sh -m "$(USBIdDatabaseGenerator_1_TARGET)" - $(QUIET)$(USBIdDatabaseGenerator_1_TARGET) -o "$@" $(filter %.ids,$^) - - BLDPROGS += USBIdDatabaseGenerator diff --git a/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch b/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch deleted file mode 100644 index 90157ada7d96..000000000000 --- a/app-emulation/virtualbox/files/virtualbox-6.1.36-python3.10.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/002-python310.patch -https://github.com/archlinux/svntogit-community/blob/b103146beee8b7c70d04685033a8536aed2e5aea/trunk/003-pyunicode.patch - -https://www.virtualbox.org/changeset/90537/vbox -https://www.virtualbox.org/changeset/86623/vbox ---- a/src/libs/xpcom18a4/python/src/PyXPCOM.h -+++ b/src/libs/xpcom18a4/python/src/PyXPCOM.h -@@ -137,7 +137,7 @@ - # define PyInt_Check(o) PyLong_Check(o) - # define PyInt_AsLong(o) PyLong_AsLong(o) - # define PyNumber_Int(o) PyNumber_Long(o) --# if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */ -+# if !defined(Py_LIMITED_API) && PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */ - # ifndef PyUnicode_AsUTF8 - # define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o) - # endif |