From f16197d90fce6aa9dfd507388c86cedc78b053c7 Mon Sep 17 00:00:00 2001 From: Tom Date: Sun, 21 Apr 2024 22:46:37 -0400 Subject: [PATCH 1/2] CONTRIBUTING: Improve the windows support section --- CONTRIBUTING.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5cb54e91..03271569 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -115,12 +115,24 @@ To run on windows, install [msys2](msys2.org) and follow the instructions to set ```bash $ pacman -Suy -$ pacman -S git mingw-w64-ucrt-x86_64-meson mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-python3 mingw-w64-ucrt-x86_64-python3-gobject mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-gstreamer mingw-w64-ucrt-x86_64-gst-plugins-good mingw-w64-ucrt-x86_64-gtksourceview5 mingw-w64-ucrt-x86_64-librsvg mingw-w64-ucrt-x86_64-desktop-file-utils +$ pacman -S git mingw-w64-ucrt-x86_64-meson mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-python3 mingw-w64-ucrt-x86_64-python3-gobject mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-gstreamer mingw-w64-ucrt-x86_64-gst-plugins-good mingw-w64-ucrt-x86_64-gtksourceview5 mingw-w64-ucrt-x86_64-librsvg mingw-w64-ucrt-x86_64-desktop-file-utils unzip ``` -Additionally, [download](https://pandoc.org/installing.html) and copy `pandoc.exe` to `msys2/usr/bin`. -Lastly, make sure to copy gettext ITS files from `msys2/ucrt64/share/gettext/its` to `msys2/usr/share/gettext/its`. +Now we download pandoc and copy it to `/usr/bin` by entering the msys2 terminal and typing the following commands +```bash +$ cd /tmp # Go to temporary directory +$ wget https://github.com/jgm/pandoc/releases/download/3.1.13/pandoc-3.1.13-windows-x86_64.zip # Download pandoc zip +$ unzip pandoc-3.1.13-windows-x86_64.zip # Unzip it +$ cp pandoc-3.1.13/pandoc.exe /usr/bin # Copy it +``` + + +Lastly, make sure to copy gettext ITS files from `/ucrt64/share/gettext/its` to `/usr/share/gettext/its`. +```bash +$ mkdir -p /usr/share/gettext/its # Create the directory if it does not exist +$ cp /ucrt64/share/gettext/its/* /usr/share/gettext/its -rf # and copy the files +``` ## License From c863e66b736184e631bcf1d899f6f0701b1eac9c Mon Sep 17 00:00:00 2001 From: Tom Date: Mon, 22 Apr 2024 20:01:02 -0400 Subject: [PATCH 2/2] CONTRIBUTING: Adding titles to the setup steps in windows --- CONTRIBUTING.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 03271569..b331c349 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,13 +111,16 @@ $ meson test ## Windows support (experimental) -To run on windows, install [msys2](msys2.org) and follow the instructions to set up a development environment. Once the setup is done, install the following dependencies: +To run on windows, install [msys2](msys2.org) and follow the instructions to set up a development environment. Once the configuration is done, follow the instructions: + +### Install the dependencies ```bash $ pacman -Suy -$ pacman -S git mingw-w64-ucrt-x86_64-meson mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-python3 mingw-w64-ucrt-x86_64-python3-gobject mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-gstreamer mingw-w64-ucrt-x86_64-gst-plugins-good mingw-w64-ucrt-x86_64-gtksourceview5 mingw-w64-ucrt-x86_64-librsvg mingw-w64-ucrt-x86_64-desktop-file-utils unzip +$ pacman -S git mingw-w64-ucrt-x86_64-meson mingw-w64-ucrt-x86_64-gtk4 mingw-w64-ucrt-x86_64-python3 mingw-w64-ucrt-x86_64-python3-gobject mingw-w64-ucrt-x86_64-libadwaita mingw-w64-ucrt-x86_64-gstreamer mingw-w64-ucrt-x86_64-gst-plugins-good mingw-w64-ucrt-x86_64-gtksourceview5 mingw-w64-ucrt-x86_64-librsvg mingw-w64-ucrt-x86_64-desktop-file-utils unzip meson cmake ``` +### Install pandoc Now we download pandoc and copy it to `/usr/bin` by entering the msys2 terminal and typing the following commands ```bash @@ -127,12 +130,15 @@ $ unzip pandoc-3.1.13-windows-x86_64.zip # Unzip it $ cp pandoc-3.1.13/pandoc.exe /usr/bin # Copy it ``` +### Copy gettext files Lastly, make sure to copy gettext ITS files from `/ucrt64/share/gettext/its` to `/usr/share/gettext/its`. ```bash $ mkdir -p /usr/share/gettext/its # Create the directory if it does not exist $ cp /ucrt64/share/gettext/its/* /usr/share/gettext/its -rf # and copy the files ``` +#### Note: in windows you have to disable the webkit by using `meson setup build -Dwebkit=disabled` + ## License