From 20d60014920beaf2c8c4edb8658b6baee8dfe146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Sat, 21 May 2022 18:46:49 +0200
Subject: [PATCH] update Windows installation

---
 .github/workflows/build.yml            |  4 ++++
 inst/share/udunits/udunits2-common.xml | 18 ++++++++++++++++--
 src/Makevars.ucrt                      | 12 +++---------
 src/Makevars.win                       |  3 ---
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36f4c6fa..d0219949 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,6 +40,10 @@ jobs:
       if: ${{ runner.os == 'macOS' }}
       run: brew install automake udunits
 
+    - name: Install Windows dependencies
+      if: ${{ runner.os == 'Windows' }}
+      run: pacman -Syu --noconfirm mingw-w64-ucrt-x86_64-udunits
+
     - uses: r-lib/actions/setup-r-dependencies@v2
       with:
         extra-packages: rcmdcheck, covr
diff --git a/inst/share/udunits/udunits2-common.xml b/inst/share/udunits/udunits2-common.xml
index e992b851..7c16006f 100644
--- a/inst/share/udunits/udunits2-common.xml
+++ b/inst/share/udunits/udunits2-common.xml
@@ -128,6 +128,20 @@ elements appear only within <aliases>.
             </aliases>
             <definition>number of parts per hundred</definition>
         </unit>
+        <!-- I loathe and despise units like this: one's that contain 
+        information about the physical quantity in their name or symbol (e.g.,
+        "parts by volume". Such information is better conveyed by the name of
+        the physical quantity (e.g., "volume fraction"). Eschewing such 
+        information in the unit provides for a better separation between
+        physical quantities and units and enables fewer and simpler units. -->
+        <unit>
+            <comment>Constant</comment>
+            <def>1</def>
+            <aliases>
+                <symbol>ppv</symbol>
+            </aliases>
+            <definition>parts per volume</definition>
+        </unit>
         <unit>
             <comment>Constant</comment>
             <def>1e-6</def>
@@ -923,7 +937,7 @@ elements appear only within <aliases>.
             <aliases>
                 <name> <singular>sidereal_second</singular> </name>
             </aliases>
-            <definition>unit of time equal to 1/60 sidereal second</definition>
+            <definition>unit of time equal to 1/60 sidereal minute</definition>
         </unit>
         <unit>
             <def>3.155815e7 s</def>
@@ -1575,7 +1589,7 @@ elements appear only within <aliases>.
         <unit>
             <def>lg(re 1 mW)</def>
             <aliases> <symbol>Bm</symbol> </aliases>
-            <definition>unit of power in decibel scale, referenced to 1 milliwatt; the power in bel-milliwatts is equal to 100 times the base 10 logarithm of the power in milliwatts (making decibel-milliwatt, the more common term, 10 times the base 10 log of the power in watts)</definition>
+            <definition>unit of power in decibel scale, referenced to 1 milliwatt; the power in bel-milliwatts is equal to 100 times the base 10 logarithm of the power in milliwatts (making decibel-milliwatt, the more common term, 10 times the base 10 log of the power in milliwatts)</definition>
         </unit>
 
     <!-- Heat -->
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
index 8684c56d..cb8f50c7 100644
--- a/src/Makevars.ucrt
+++ b/src/Makevars.ucrt
@@ -1,15 +1,9 @@
-PKG_CPPFLAGS = -DUDUNITS2_DIR=0 
+PKG_CPPFLAGS = -DUDUNITS2_DIR=0
 PKG_LIBS = -ludunits2 -lexpat
 
-all: clean winlibs
+all: clean
 
 clean:
 	rm -Rf $(SHLIB) $(OBJECTS)
 
-winlibs:
-	rm -Rf ../inst/share
-	mkdir -p ../inst/share/
-	cp -r $(LOCAL_SOFT)/share/udunits ../inst/share
-
-
-.PHONY: all winlibs clean
+.PHONY: all clean
diff --git a/src/Makevars.win b/src/Makevars.win
index 65999b72..dfaa3513 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -7,9 +7,6 @@ all: clean winlibs
 
 winlibs:
 	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
-	mkdir -p ../inst
-	rm -Rf ../inst/share
-	cp -r ${RWINLIB}/share ../inst/
 
 clean:
 	rm -Rf $(SHLIB) $(OBJECTS)