Changeset 96038 in vbox for trunk/src/VBox

Timestamp:

Aug 4, 2022 8:55:51 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152836

Message:

COPYING, /Config.kmk, doc, installer: Update license files, now using GPLv3 (required for compatibility with license of Qt 5.7 and later). bugref:10229

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Installer/Makefile.kmk (modified) (1 diff)
• Installer/win/Scripts/Combined-3-RepackAdditions.cmd (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -336 +336 @@
         $(VBOX_NSIS_ICON_FILE)=>VirtualBoxGA-nsis.ico \
         iexplore.ico \
-        $(PATH_ROOT)/doc/License-gpl-2.0.rtf \
+        $(PATH_ROOT)/doc/License-gpl-3.0.rtf \
         VBoxGuestAdditions.nsi \
         dumplog.nsh \

trunk/src/VBox/Installer/win/Scripts/Combined-3-RepackAdditions.cmd

@@ -235 +235 @@
         -E "VBOX_WITH_GUEST_INSTALL_HELPER=1" -E "VBOX_WITH_GUEST_INSTALLER_UNICODE=1" -E "VBOX_WITH_LICENSE_INSTALL_RTF=1" ^
         -E "VBOX_WITH_WDDM=1" -E "VBOX_WITH_MESA3D=1" -E "VBOX_BRAND_WIN_ADD_INST_DLGBMP=%_MY_OPT_SRC_DIR%\welcome.bmp" ^
-        -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-2.0.rtf"  -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=amd64" ^
+        -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-3.0.rtf"  -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=amd64" ^
         --  %KBUILD_DEVTOOLS%/win.x86/nsis/v3.04-log/makensis.exe /NOCD /V2 ^
                 "/DVBOX_SIGN_ADDITIONS=1" ^
@@ -266 +266 @@
         -E "VBOX_WITH_GUEST_INSTALL_HELPER=1" -E "VBOX_WITH_GUEST_INSTALLER_UNICODE=1" -E "VBOX_WITH_LICENSE_INSTALL_RTF=1" ^
         -E "VBOX_WITH_WDDM=1" -E "VBOX_WITH_MESA3D=1" -E "VBOX_BRAND_WIN_ADD_INST_DLGBMP=%_MY_OPT_SRC_DIR%\welcome.bmp" ^
-        -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-2.0.rtf"  -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=x86" ^
+        -E "VBOX_BRAND_LICENSE_RTF=%_MY_OPT_SRC_DIR%\License-gpl-3.0.rtf"  -E "KBUILD_TYPE=%_MY_OPT_BUILD_TYPE%" -E "KBUILD_TARGET_ARCH=x86" ^
         --  %KBUILD_DEVTOOLS%/win.x86/nsis/v3.04-log/makensis.exe /NOCD /V2 ^
                 "/DVBOX_SIGN_ADDITIONS=1" ^