Merge pull request #296 from gaphor/fix-window-package-names

Fix MSYS2 Package Names
gaphor · Apr 11, 2020 · 62b8aa7 · 62b8aa7
2 parents 18044de + 1ec69a8
commit 62b8aa7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -109,11 +109,11 @@ To setup a development environment in Windows:
 1) Run ``C:\msys64\mingw64.exe`` - a terminal window should pop up
 ```bash
 $ pacman -Suy
-$ pacman -S git mingw-w64-x86-64-gcc mingw-w64-x86-64-gtk3 \
-mingw-w64-x86-64-pkg-config mingw-w64-x86-64-cairo \
-mingw-w64-x86-64-gobject-introspection mingw-w64-x86-64-python3 \
-mingw-w64-x86-64-python3-gobject mingw-w64-x86-64-python3-cairo \
-mingw-w64-x86-64-python3-pip mingw-w64-x86-64-python3-setuptools
+$ pacman -S git mingw-w64-x86_64-gcc mingw-w64-x86_64-gtk3 \
+mingw-w64-x86_64-pkg-config mingw-w64-x86_64-cairo \
+mingw-w64-x86_64-gobject-introspection mingw-w64-x86_64-python \
+mingw-w64-x86_64-python-gobject mingw-w64-x86_64-python-cairo \
+mingw-w64-x86_64-python-pip
 ```
 
 Ensure `/mingw64/bin` is added to your `PATH`:

diff --git a/docs/windows.md b/docs/windows.md
@@ -8,13 +8,11 @@ To setup a development environment in Windows:
 1) Run ``C:\msys64\mingw64.exe`` - a terminal window should pop up
 ```bash
 $ pacman -Suy
-$ pacman -S git mingw-w64-x86-64-gcc mingw-w64-x86-64-gtk3 \
-mingw-w64-x86-64-pkg-config mingw-w64-x86-64-cairo \
-mingw-w64-x86-64-gobject-introspection mingw-w64-x86-64-python3 \
-mingw-w64-x86-64-python3-importlib-metadata mingw-w64-x86-64-python3-gobject \
-mingw-w64-x86-64-python3-cairo mingw-w64-x86-64-python3-pip \
-mingw-w64-x86-64-python3-setuptools mingw-w64-x86-64-python3-zope.interface \
-mingw-w64-x86-64-python3-coverage mingw-w64-x86-64-python3-pytest
+$ pacman -S git mingw-w64-x86_64-gcc mingw-w64-x86_64-gtk3 \
+mingw-w64-x86_64-pkg-config mingw-w64-x86_64-cairo \
+mingw-w64-x86_64-gobject-introspection mingw-w64-x86_64-python \
+mingw-w64-x86_64-python-gobject mingw-w64-x86_64-python-cairo \
+mingw-w64-x86_64-python-pip
 ```
 
 [Clone the

diff --git a/win-installer/msys2-install.sh b/win-installer/msys2-install.sh
@@ -15,11 +15,10 @@ pacman --noconfirm -S --needed \
     mingw-w64-"$MSYS2_ARCH"-pkg-config \
     mingw-w64-"$MSYS2_ARCH"-cairo \
     mingw-w64-"$MSYS2_ARCH"-gobject-introspection \
-    mingw-w64-"$MSYS2_ARCH"-python3 \
-    mingw-w64-"$MSYS2_ARCH"-python3-gobject \
-    mingw-w64-"$MSYS2_ARCH"-python3-cairo \
-    mingw-w64-"$MSYS2_ARCH"-python3-pip \
-    mingw-w64-"$MSYS2_ARCH"-python3-setuptools
+    mingw-w64-"$MSYS2_ARCH"-python \
+    mingw-w64-"$MSYS2_ARCH"-python-gobject \
+    mingw-w64-"$MSYS2_ARCH"-python-cairo \
+    mingw-w64-"$MSYS2_ARCH"-python-pip \
 
 source "$DIR"/../venv
 pip install pyinstaller