From 45ff1c4e7dc4e4b75c68be8083122f5ef8e1d866 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Thu, 6 Mar 2025 10:43:23 +0000
Subject: [PATCH] paint.net -> 5.1.4
It looks like previously we were creating an msi for ourselves, but
there are now MSIs available direcly from the project's github repo so
we should use those instead.
---
packages/paint.net.xml | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/packages/paint.net.xml b/packages/paint.net.xml
index 30cc0aa4..c9598c81 100755
--- a/packages/paint.net.xml
+++ b/packages/paint.net.xml
@@ -1,23 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<packages:packages xmlns:packages="http://www.wpkg.org/packages">
-
- <!-- We need to make the msi from the downloaded exe file. AS THE SYSTEM USER!! run the command:
- c:\tmp\paint.net.4.0.12.install.exe CHECKFORUPDATES=0 CHECKFORBETAS=0 DESKTOPSHORTCUT=0 JPGPNGBMPEDITOR=0 TGAEDITOR=0 /createmsi
- The resulting 32 and 64 bit msi files will be in c:\windows\system32\config\systemprofile\Desktop\PaintDotNetMsi\ -->
+
+ <!-- get MSI from https://github.com/paintdotnet/release -->
<package id="paint.net" name="Paint.net" revision="%version%.1" reboot="false" priority="68">
- <variable name="GIT_CITEST" value="broken" /><!-- No longer distributed in Chemistry -->
- <variable name="version" value="4.2.10"/>
- <check type="uninstall" condition="versiongreaterorequal" path="paint.net" value="%version%" />
+ <variable name="version" value="5.1.4"/>
+ <check type="uninstall" condition="versiongreaterorequal" path="Paint.NET" value="%version%" />
- <install cmd='msiexec /l* %WPKGLOGDIR%\paint.net_%version%_install.log /qn /norestart /i "%WPKGSOFTWARE%\paint.net\%version%\PaintDotNet_x64.msi" ALLUSERS=1 DESKTOPSHORTCUT=0 CHECKFORUPDATES=0' />
+ <install cmd='msiexec /l* %WPKGLOGDIR%\paint.net_%version%_install.log /qn /norestart /i "%WPKGSOFTWARE%\paint.net\paint.net.%version%.winmsi.x64.msi" ALLUSERS=1 DESKTOPSHORTCUT=0 CHECKFORUPDATES=0' />
<upgrade include='remove' />
<upgrade include='install' />
+ <!-- try to remove old locally-built MSI -->
<remove cmd='msiexec /qn /x {15BCA3AB-444B-4AC5-A04F-F2AD0F7AD3EC}'>
<exit code='1605' />
</remove>
+
+ <remove cmd='msiexec /qn /X{E0C619C7-18CB-490E-B6A8-324BCD1D5AA4}'>
+ <exit code='1605' />
+ </remove>
+
</package>
</packages:packages>
--
GitLab