Merge pull request ocaml#28011 from punchagan/fix-win-availability

mseri · web-flow · commit a9c54a2931d5 · 2025-06-12T15:22:53.000+02:00
Fix Windows availability and installation of a bunch of conf- packages
diff --git a/packages/conf-cairo/conf-cairo.1/opam b/packages/conf-cairo/conf-cairo.1/opam
@@ -25,7 +25,7 @@ depexts: [
   ["cairo"] {os-family = "arch"}
   ["cairo"] {os = "macos" & os-distribution = "homebrew"}
   ["cairo"] {os = "win32" & os-distribution = "cygwinports"}
-  ["libcairo-devel"] {os = "cygwin"}
+  ["libcairo-devel"] {os = "win32" & os-distribution = "cygwin"}
 ]
 synopsis: "Virtual package relying on a Cairo system installation"
 description:
diff --git a/packages/conf-clang/conf-clang.1/opam b/packages/conf-clang/conf-clang.1/opam
@@ -16,6 +16,7 @@ depexts: [
   ["clang"] {os-distribution = "ol"}
   ["clang"] {os-distribution = "arch"}
   # on FreeBSD clang is already part of the base system in contrib/llvm-project/clang
+  ["clang"] {os = "win32"}
 ]
 synopsis: "Virtual package relying on clang"
 description:
diff --git a/packages/conf-gtk3/conf-gtk3.18/opam b/packages/conf-gtk3/conf-gtk3.18/opam
@@ -3,7 +3,10 @@ maintainer: "garrigue@math.nagoya-u.ac.jp"
 authors: "The GTK Toolkit"
 homepage: "https://developer.gnome.org/"
 bug-reports: "https://github.com/garrigue/lablgtk/issues"
-build: [["pkg-config" "--short-errors" "--print-errors" "--atleast-version" "3.18" "gtk+-3.0"]]
+build: [
+  ["pkgconf" "gtk+-3.0"] {os = "win32" & os-distribution != "cygwinports"}
+  ["pkg-config" "--short-errors" "--print-errors" "--atleast-version" "3.18" "gtk+-3.0"] {os != "win32" | os-distribution != "cygwin"}
+]
 depends: ["conf-pkg-config" {build}]
 depexts: [
   ["libgtk-3-dev" "libexpat1-dev"] {os-family = "debian" | os-family = "ubuntu"}
@@ -16,7 +19,7 @@ depexts: [
   ["gtk3-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["gtk3"] {os-family = "arch"}
   ["gtk3"] {os = "win32" & os-distribution = "cygwinports"}
-  ["libgtk3-devel"] {os = "cygwin"}
+  ["libgtk3-devel"] {os = "win32" & os-distribution = "cygwin"}
   ["gtk3"] {os = "freebsd"}
 ]
 post-messages: [
diff --git a/packages/conf-libev/conf-libev.4-11/opam b/packages/conf-libev/conf-libev.4-11/opam
@@ -27,6 +27,7 @@ Libev is modelled (very loosely) after libevent and the Event perl
 module, but is faster, scales better and is more correct, and also more
 featureful. And also smaller. Yay."""
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
+available: os != "win32"
 flags: conf
 extra-source "discover.ml" {
   src:
diff --git a/packages/conf-mpfr/conf-mpfr.3/opam b/packages/conf-mpfr/conf-mpfr.3/opam
@@ -25,6 +25,7 @@ depexts: [
   ["mpfr-dev"] {os-family = "alpine"}
   ["mpfr-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["mpfr"] {os = "win32" & os-distribution = "cygwinports"}
+  ["libmpfr-devel"] {os = "win32" & os-distribution = "cygwin"}
 ]
 synopsis: "Virtual package relying on library MPFR installation"
 description:
diff --git a/packages/omake/omake.0.10.3/opam b/packages/omake/omake.0.10.3/opam
@@ -9,7 +9,7 @@ authors: [
 license: "GPL-2.0-only"
 dev-repo: "git+https://github.com/ocaml-omake/omake.git"
 homepage: "http://projects.camlcity.org/projects/omake.html"
-bug-reports: "https://github.com/ocaml-omake/issues"
+bug-reports: "https://github.com/ocaml-omake/omake/issues"
 
 patches: ["lib_build_OCaml.om.diff"]
 
diff --git a/packages/omake/omake.0.10.5/opam b/packages/omake/omake.0.10.5/opam
@@ -9,7 +9,7 @@ authors: [
 license: "GPL-2.0-only"
 dev-repo: "git+https://github.com/ocaml-omake/omake.git"
 homepage: "http://projects.camlcity.org/projects/omake.html"
-bug-reports: "https://github.com/ocaml-omake/issues"
+bug-reports: "https://github.com/ocaml-omake/omake/issues"
 
 build: [
   ["./configure" "-prefix" "%{prefix}%"]
diff --git a/packages/omake/omake.0.10.6/opam b/packages/omake/omake.0.10.6/opam
@@ -9,7 +9,7 @@ authors: [
 license: "GPL-2.0-only"
 dev-repo: "git+https://github.com/ocaml-omake/omake.git"
 homepage: "http://projects.camlcity.org/projects/omake.html"
-bug-reports: "https://github.com/ocaml-omake/issues"
+bug-reports: "https://github.com/ocaml-omake/omake/issues"
 
 build-env: OCAMLPARAM = "_,w=-46,keywords=5.2"
 
diff --git a/packages/omake/omake.0.10.7/opam b/packages/omake/omake.0.10.7/opam
@@ -10,7 +10,7 @@ authors: [
 license: "GPL-2.0-only"
 dev-repo: "git+https://github.com/ocaml-omake/omake.git"
 homepage: "http://projects.camlcity.org/projects/omake.html"
-bug-reports: "https://github.com/ocaml-omake/issues"
+bug-reports: "https://github.com/ocaml-omake/omake/issues"
 
 build: [
   ["./configure" "-prefix" "%{prefix}%"]

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ depexts: [`
`25`	`25`	`["cairo"] {os-family = "arch"}`
`26`	`26`	`["cairo"] {os = "macos" & os-distribution = "homebrew"}`
`27`	`27`	`["cairo"] {os = "win32" & os-distribution = "cygwinports"}`
`28`		`- ["libcairo-devel"] {os = "cygwin"}`
	`28`	`+ ["libcairo-devel"] {os = "win32" & os-distribution = "cygwin"}`
`29`	`29`	`]`
`30`	`30`	`synopsis: "Virtual package relying on a Cairo system installation"`
`31`	`31`	`description:`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ depexts: [`
`16`	`16`	`["clang"] {os-distribution = "ol"}`
`17`	`17`	`["clang"] {os-distribution = "arch"}`
`18`	`18`	`# on FreeBSD clang is already part of the base system in contrib/llvm-project/clang`
	`19`	`+ ["clang"] {os = "win32"}`
`19`	`20`	`]`
`20`	`21`	`synopsis: "Virtual package relying on clang"`
`21`	`22`	`description:`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ depexts: [`
`25`	`25`	`["mpfr-dev"] {os-family = "alpine"}`
`26`	`26`	`["mpfr-devel"] {os-family = "suse" \| os-family = "opensuse"}`
`27`	`27`	`["mpfr"] {os = "win32" & os-distribution = "cygwinports"}`
	`28`	`+ ["libmpfr-devel"] {os = "win32" & os-distribution = "cygwin"}`
`28`	`29`	`]`
`29`	`30`	`synopsis: "Virtual package relying on library MPFR installation"`
`30`	`31`	`description:`