Merge pull request #28939 from jmid/conf-msys2-fixes-part1

mseri · web-flow · commit b3c731b6e208 · 2025-11-23T11:32:17.000+01:00
Fix MSys2 side-conditions for conf-packages, part 1/3
diff --git a/packages/conf-ao/conf-ao.1/opam b/packages/conf-ao/conf-ao.1/opam
@@ -5,10 +5,10 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
 authors: "libao dev team"
 license: "GPL-2.0-only"
 build: [
-  ["pkgconf" {os = "win32" & os-distribution = "cygwin"}
-     "--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
-     "--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-   "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+  ["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
+     "--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
+     "--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
+   "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
    "--print-errors" "--exists" "ao"]
 ]
 depends: [
diff --git a/packages/conf-cairo/conf-cairo.1/opam b/packages/conf-cairo/conf-cairo.1/opam
@@ -4,8 +4,8 @@ homepage: "http://cairographics.org/"
 authors: ["Keith Packard" "Carl Worth" "Behdad Esfahbod"]
 license: ["LGPL-2.1-only" "MPL-1.1"]
 build: [
-  ["pkgconf" "--personality=i686-w64-mingw32" "cairo"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
-  ["pkgconf" "--personality=x86_64-w64-mingw32" "cairo"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
+  ["pkgconf" "--personality=i686-w64-mingw32" "cairo"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
+  ["pkgconf" "--personality=x86_64-w64-mingw32" "cairo"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
   ["pkg-config" "cairo"] {os != "macos" & os != "win32"}
   ["sh" "-exc"
    "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/; pkg-config --libs cairo"]
diff --git a/packages/conf-freetype/conf-freetype.1/opam b/packages/conf-freetype/conf-freetype.1/opam
@@ -5,9 +5,9 @@ homepage: "http://www.freetype.org"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 license: "GPL-1.0-or-later"
 build: [
-  ["pkgconf" "--personality=i686-w64-mingw32" "freetype2"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
-  ["pkgconf" "--personality=x86_64-w64-mingw32" "freetype2"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-  ["pkg-config" "freetype2"] {os != "win32" | os-distribution != "cygwin"}
+  ["pkgconf" "--personality=i686-w64-mingw32" "freetype2"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
+  ["pkgconf" "--personality=x86_64-w64-mingw32" "freetype2"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
+  ["pkg-config" "freetype2"] {os != "win32" | os-distribution = "cygwinports"}
 ]
 depends: [
   "conf-pkg-config" {build}
diff --git a/packages/conf-glade/conf-glade.2/opam b/packages/conf-glade/conf-glade.2/opam
@@ -12,7 +12,7 @@ build: [
   "--personality=x86_64-w64-mingw32"
     {os = "win32" & os-distribution != "cygwinports" &
      host-arch-x86_64:installed}
-  "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+  "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
   "libglade-2.0"
 ]
 depexts: [
diff --git a/packages/conf-gnomecanvas/conf-gnomecanvas.2/opam b/packages/conf-gnomecanvas/conf-gnomecanvas.2/opam
@@ -4,10 +4,10 @@ homepage: "https://developer.gnome.org/libgnomecanvas/2.30/"
 authors: "The GNOME Project"
 license: "LGPL-2.1-or-later"
 build: [
-  ["pkgconf" {os = "win32" & os-distribution = "cygwin"}
-   "--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
-   "--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-   "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+  ["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
+   "--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
+   "--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
+   "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
    "libgnomecanvas-2.0"]
 ]
 depexts: [
diff --git a/packages/conf-gnutls/conf-gnutls.1/opam b/packages/conf-gnutls/conf-gnutls.1/opam
@@ -11,7 +11,7 @@ build: [
   "--personality=x86_64-w64-mingw32"
     {os = "win32" & os-distribution != "cygwinports" &
      host-arch-x86_64:installed}
-  "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+  "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
   "gnutls" "nettle"
 ]
 depends: [
diff --git a/packages/conf-gtk2/conf-gtk2.1/opam b/packages/conf-gtk2/conf-gtk2.1/opam
@@ -5,10 +5,10 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues"
 authors: ["The GNOME Project"]
 license: "LGPL-2.1-or-later"
 build: [
-  ["pkgconf" {os = "win32" & os-distribution = "cygwin"}
-      "--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
-      "--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-   "pkg-config" {os != "win32" | os-distribution != "cygwin"}
+  ["pkgconf" {os = "win32" & os-distribution != "cygwinports"}
+      "--personality=i686-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
+      "--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
+   "pkg-config" {os != "win32" | os-distribution = "cygwinports"}
    "--exists" "gtk+-2.0"]
 ]
 depends: [
diff --git a/packages/conf-gtk3/conf-gtk3.18/opam b/packages/conf-gtk3/conf-gtk3.18/opam
@@ -5,9 +5,9 @@ license: "LGPL-2.1-or-later"
 homepage: "https://www.gtk.org/"
 bug-reports: "https://github.com/garrigue/lablgtk/issues"
 build: [
-  ["pkgconf" "--personality=i686-w64-mingw32" "--print-errors" "--exists" "gtk+-3.0"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
-  ["pkgconf" "--personality=x86_64-w64-mingw32" "--print-errors" "--exists" "gtk+-3.0"] {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
-  ["pkg-config" "--short-errors" "--print-errors" "--atleast-version" "3.18" "gtk+-3.0"] {os != "win32" | os-distribution != "cygwin"}
+  ["pkgconf" "--personality=i686-w64-mingw32" "--print-errors" "--exists" "gtk+-3.0"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_32:installed}
+  ["pkgconf" "--personality=x86_64-w64-mingw32" "--print-errors" "--exists" "gtk+-3.0"] {os = "win32" & os-distribution != "cygwinports" & host-arch-x86_64:installed}
+  ["pkg-config" "--short-errors" "--print-errors" "--atleast-version" "3.18" "gtk+-3.0"] {os != "win32" | os-distribution = "cygwinports"}
 ]
 depends: [
   "conf-pkg-config" {build}
diff --git a/packages/conf-mingw-w64-glade-i686/conf-mingw-w64-glade-i686.1/opam b/packages/conf-mingw-w64-glade-i686/conf-mingw-w64-glade-i686.1/opam
@@ -16,5 +16,5 @@ description:
 maintainer: "David Allsopp <david@tarides.com>"
 depexts: [
   ["mingw64-i686-libglade2.0"] {os = "win32" & os-distribution = "cygwin"}
-  ["mingw-w64-i686-libglade2.0"] {os = "win32" & os-distribution = "msys2"}
+  # no "mingw-w64-i686-libglade" package available at https://packages.msys2.org/base/mingw-w64-libglade
 ]
diff --git a/packages/conf-mingw-w64-glade-x86_64/conf-mingw-w64-glade-x86_64.1/opam b/packages/conf-mingw-w64-glade-x86_64/conf-mingw-w64-glade-x86_64.1/opam
@@ -16,5 +16,5 @@ description:
 maintainer: "David Allsopp <david@tarides.com>"
 depexts: [
   ["mingw64-x86_64-libglade2.0"] {os = "win32" & os-distribution = "cygwin"}
-  ["mingw-w64-x86_64-libglade2.0"] {os = "win32" & os-distribution = "msys2"}
+  ["mingw-w64-x86_64-libglade"] {os = "win32" & os-distribution = "msys2"}
 ]

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ build: [`
`12`	`12`	`"--personality=x86_64-w64-mingw32"`
`13`	`13`	`{os = "win32" & os-distribution != "cygwinports" &`
`14`	`14`	`host-arch-x86_64:installed}`
`15`		`- "pkg-config" {os != "win32" \| os-distribution != "cygwin"}`
	`15`	`+ "pkg-config" {os != "win32" \| os-distribution = "cygwinports"}`
`16`	`16`	`"libglade-2.0"`
`17`	`17`	`]`
`18`	`18`	`depexts: [`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ build: [`
`11`	`11`	`"--personality=x86_64-w64-mingw32"`
`12`	`12`	`{os = "win32" & os-distribution != "cygwinports" &`
`13`	`13`	`host-arch-x86_64:installed}`
`14`		`- "pkg-config" {os != "win32" \| os-distribution != "cygwin"}`
	`14`	`+ "pkg-config" {os != "win32" \| os-distribution = "cygwinports"}`
`15`	`15`	`"gnutls" "nettle"`
`16`	`16`	`]`
`17`	`17`	`depends: [`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ description:`
`16`	`16`	`maintainer: "David Allsopp <[email protected]>"`
`17`	`17`	`depexts: [`
`18`	`18`	`["mingw64-i686-libglade2.0"] {os = "win32" & os-distribution = "cygwin"}`
`19`		`- ["mingw-w64-i686-libglade2.0"] {os = "win32" & os-distribution = "msys2"}`
	`19`	`+ # no "mingw-w64-i686-libglade" package available at https://packages.msys2.org/base/mingw-w64-libglade`
`20`	`20`	`]`