Skip to content

Commit 0763422

Browse files
authored
Merge pull request #27917 from jmid/conf-gnomecanvas-mingw
Extend conf-gnomecanvas support to MinGW and MSys2
1 parent bd0bcfe commit 0763422

File tree

3 files changed

+55
-2
lines changed
  • packages
    • conf-gnomecanvas/conf-gnomecanvas.2
    • conf-mingw-w64-gnomecanvas-i686/conf-mingw-w64-gnomecanvas-i686.1
    • conf-mingw-w64-gnomecanvas-x86_64/conf-mingw-w64-gnomecanvas-x86_64.1

3 files changed

+55
-2
lines changed

packages/conf-gnomecanvas/conf-gnomecanvas.2/opam

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,23 @@ maintainer: "[email protected]"
33
homepage: "https://developer.gnome.org/libgnomecanvas/2.30/"
44
authors: "The GNOME Project"
55
license: "LGPL-2.1-or-later"
6-
build: [["pkg-config" "libgnomecanvas-2.0"]]
6+
build: [
7+
["pkgconf" {os = "win32" & os-distribution = "cygwin"}
8+
"--personality=i686-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_32:installed}
9+
"--personality=x86_64-w64-mingw32" {os = "win32" & os-distribution = "cygwin" & host-arch-x86_64:installed}
10+
"pkg-config" {os != "win32" | os-distribution != "cygwin"}
11+
"libgnomecanvas-2.0"]
12+
]
713
depexts: [
814
["libgnomecanvas2-dev"] {os-family = "debian"}
915
["libgnomecanvas2-dev"] {os-family = "ubuntu"}
1016
["libgnomecanvas-devel"] {os-family = "fedora" | os-family = "rhel"}
1117
["libgnomecanvas"] {os = "macos" & os-distribution = "homebrew"}
18+
["libgnomecanvas"] {os = "macos" & os-distribution = "macports"}
1219
["libgnomecanvas-dev@testing" "libart-lgpl-dev"] {os-family = "alpine"}
1320
["libgnomecanvas2"] {os = "win32" & os-distribution = "cygwinports"}
1421
["libgnomecanvas"] {os-family = "arch"}
22+
["libgnomecanvas-devel"] {os-family = "opensuse"}
1523
["libgnomecanvas"] {os = "freebsd"}
1624
["libgnomecanvas"] {os = "openbsd"}
1725
["gnome2.libgnomecanvas"] {os-distribution = "nixos"}
@@ -26,6 +34,10 @@ synopsis: "Virtual package relying on a Gnomecanvas system installation"
2634
description: """
2735
This package can only install if libgnomecanvas2-dev is installed
2836
on the system."""
29-
depends: ["conf-pkg-config" {build}]
37+
depends: [
38+
"conf-pkg-config" {build}
39+
("host-arch-x86_32" {os = "win32" & os-distribution != "cygwinports"} & "conf-mingw-w64-gnomecanvas-i686" {os = "win32" & os-distribution != "cygwinports"} |
40+
"host-arch-x86_64" {os = "win32" & os-distribution != "cygwinports"} & "conf-mingw-w64-gnomecanvas-x86_64" {os = "win32" & os-distribution != "cygwinports"})
41+
]
3042
bug-reports: "https://github.com/ocaml/opam-repository/issues"
3143
flags: conf
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
opam-version: "2.0"
2+
synopsis: "gnomecanvas for i686 mingw-w64 (32-bit x86)"
3+
description: "Ensures the i686 version of gnomecanvas for the mingw-w64 project is available"
4+
maintainer: "David Allsopp <[email protected]>"
5+
authors: "The GNOME Project"
6+
license: "LGPL-2.1-or-later"
7+
homepage: "https://developer.gnome.org/libgnomecanvas/2.30/"
8+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
9+
flags: conf
10+
available: os = "win32" & os-distribution = "cygwin"
11+
build: ["pkgconf" "--personality=i686-w64-mingw32" "libgnomecanvas-2.0"]
12+
depends: [
13+
"conf-pkg-config" {build}
14+
"conf-mingw-w64-gcc-i686" {build}
15+
]
16+
depexts: [
17+
["mingw64-i686-libgnomecanvas2"] {os = "win32" & os-distribution = "cygwin"}
18+
# i686 variant not available on MSys https://packages.msys2.org/base/mingw-w64-libgnomecanvas
19+
]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
opam-version: "2.0"
2+
synopsis: "gnomecanvas for x86_64 mingw-w64 (64-bit x86_64)"
3+
description: "Ensures the x86_64 version of gnomecanvas for the mingw-w64 project is available"
4+
maintainer: "David Allsopp <[email protected]>"
5+
authors: "The GNOME Project"
6+
license: "LGPL-2.1-or-later"
7+
homepage: "https://developer.gnome.org/libgnomecanvas/2.30/"
8+
bug-reports: "https://github.com/ocaml/opam-repository/issues"
9+
flags: conf
10+
available: os = "win32"
11+
build: [
12+
["pkgconf" "--personality=x86_64-w64-mingw32" "libgnomecanvas-2.0"] {os = "win32" & os-distribution = "cygwin"}
13+
["pkg-config" "libgnomecanvas-2.0"] {os = "win32" & os-distribution = "msys2"}
14+
]
15+
depends: [
16+
"conf-pkg-config" {build}
17+
"conf-mingw-w64-gcc-x86_64" {build}
18+
]
19+
depexts: [
20+
["mingw64-x86_64-libgnomecanvas2"] {os = "win32" & os-distribution = "cygwin"}
21+
["mingw-w64-x86_64-libgnomecanvas"] {os = "win32" & os-distribution = "msys2"}
22+
]

0 commit comments

Comments
 (0)