From b2027398cd7d833a366f91572de260fa4016f352 Mon Sep 17 00:00:00 2001 From: Max Gaukler Date: Tue, 25 Jun 2024 19:08:35 +0200 Subject: [PATCH] Windows MSI installer: Fix upgrading from old MSI When 1. Inkscape was installed from .MSI from Inkscape 1.3.x 2. A newer Inkscape 1.4.x was built with CMake 3.29.{0...4} and then installed from .MSI then the user had two half-broken installations instead of one new Inkscape version. This is due to a CMake regression https://gitlab.kitware.com/cmake/cmake/-/issues/26029 The underlying change in CMake had originally intended to solve https://gitlab.com/inkscape/inkscape/-/issues/1617 https://gitlab.com/inkscape/inkscape/-/issues/1618 but was effectively reverted in CMake 3.29.5 because it created these half-broken installs. Now we effectively re-open the two above bugs to avoid the new half-broken installation. --- CMakeScripts/ConfigCPack.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake index 6a82baaac6..394918f090 100644 --- a/CMakeScripts/ConfigCPack.cmake +++ b/CMakeScripts/ConfigCPack.cmake @@ -95,6 +95,9 @@ set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/share/branding/inkscape.ico") set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/packaging/wix/Bitmaps/banner.bmp") set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/packaging/wix/Bitmaps/dialog.bmp") set(CPACK_WIX_UI_REF "WixUI_FeatureTree_NoLicense") +# install scope should ideally be 'perMachine', but can't be due to https://gitlab.kitware.com/cmake/cmake/-/issues/26029 :-( +# This blocks fixing https://gitlab.com/inkscape/inkscape/-/issues/1617 and https://gitlab.com/inkscape/inkscape/-/issues/1618 . +set(CPACK_WIX_INSTALL_SCOPE NONE) set(CPACK_WIX_PROPERTY_ARPHELPLINK "${CPACK_PACKAGE_HOMEPAGE_URL}") set(CPACK_WIX_PROPERTY_ARPURLINFOABOUT "${CPACK_PACKAGE_HOMEPAGE_URL}") set(CPACK_WIX_PROPERTY_ARPURLUPDATEINFO "${CPACK_PACKAGE_HOMEPAGE_URL}/release") -- GitLab