Skip to content

Commit 2e901d3

Browse files
committed
Merge branch 'sf/homebrew'
2 parents e18b549 + 888cb58 commit 2e901d3

File tree

4 files changed

+30
-15
lines changed

4 files changed

+30
-15
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
*.swp
2+
deps/deps.jl
3+
.DS_Store

REQUIRE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ Cairo 0.2.2
22
julia 0.2-
33
BinDeps
44
@windows WinRPM
5+
@osx Homebrew

deps/build.jl

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ using BinDeps
22

33
@BinDeps.setup
44

5+
group = library_group("gtk")
6+
57
deps = [
6-
gtk = library_dependency("gtk", aliases = ["libgtk-3", "libgtk-3-0"])
7-
@windows_only begin
8-
gdk = library_dependency("gdk", aliases = ["libgdk-3-0"])
9-
gdk_pixbuf = library_dependency("gdk_pixbuf", aliases = ["libgdk_pixbuf-2.0-0"])
10-
glib = library_dependency("glib", aliases = ["libglib-2.0-0"], os = :Windows)
11-
gobject = library_dependency("gobject", aliases = ["libgobject-2.0-0", "libgobject-2.0", "libgobject-2_0-0"], os = :Windows)
12-
gio = library_dependency("gio", aliases = ["libgio-2.0-0"])
13-
end
8+
gtk = library_dependency("gtk", aliases = ["libgtk-3", "libgtk-3-0"], group = group)
9+
glib = library_dependency("glib", aliases = ["libglib-2.0", "libglib-2.0-0"], group = group)
10+
gdk = library_dependency("gdk", aliases = ["libgdk-3-0", "libgdk-3.0"], group = group)
11+
gdk_pixbuf = library_dependency("gdk_pixbuf", aliases = ["libgdk_pixbuf-2.0-0", "libgdk_pixbuf-2.0.0"], group = group)
12+
gio = library_dependency("gio", aliases = ["libgio-2.0-0","libgio-2.0.0"], group = group)
13+
gobject = library_dependency("gobject", aliases = ["libgobject-2.0.0", "libgobject-2.0-0", "libgobject-2.0", "libgobject-2_0-0"], group = group)
1414
]
1515

1616
@linux_only begin
@@ -20,19 +20,31 @@ end
2020

2121
@windows_only begin
2222
using WinRPM
23-
provides(WinRPM.RPM,"gtk3", [gtk,gdk,gdk_pixbuf,glib,gio], os = :Windows)
23+
provides(WinRPM.RPM,"gtk3", [gtk,gdk,gdk_pixbuf,glib,gio], os = :Windows )
2424
provides(WinRPM.RPM,"libgobject-2_0-0", [gobject], os = :Windows)
2525
end
2626

27-
if OS_NAME == :Windows
27+
@osx_only begin
28+
using Homebrew
29+
provides(Homebrew.HB, "gtk+3", [gtk, gdk, gobject], os = :Darwin, onload =
30+
"""
31+
function __init__()
32+
if "XDG_DATA_DIRS" in ENV
33+
ENV["XDG_DATA_DIRS"] *= ":" * joinpath("$(Homebrew.brew_prefix)", "share")
34+
else
35+
ENV["XDG_DATA_DIRS"] = joinpath("$(Homebrew.brew_prefix)", "share")
36+
end
37+
end
38+
""" )
39+
provides(Homebrew.HB, "glib", [glib, gio], os = :Darwin)
40+
provides(Homebrew.HB, "gdk-pixbuf", gdk_pixbuf, os = :Darwin)
41+
end
42+
2843
@BinDeps.install [
2944
:gtk => :libgtk,
3045
:gdk => :libgdk,
3146
:gdk_pixbuf => :libgdk_pixbuf,
3247
:gio => :libgio,
3348
:gobject => :libgobject,
3449
:glib => :libglib
35-
]
36-
else
37-
@BinDeps.install
38-
end
50+
]

deps/ext_glib.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ else
1010
const libgobject = "libgobject-2.0"
1111
const libglib = "libglib-2.0"
1212
end
13-
end
13+
end

0 commit comments

Comments
 (0)