This repository has been archived by the owner on Jul 4, 2023. It is now read-only.
GObject introspection support #22314
Closed
Closed
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
899b1c7
gdk-pixbuf: Enable gobject introspection
krrk 3b27170
atk: Enable gobject introspection
krrk df6a860
gtk+3: Enable gobject introspection
krrk 1652dd9
pango: Enable gobject introspection
krrk 1ff4e1a
gobject-introspection: Override GOBJECT_INTROSPECTION_LIBDIR
krrk afbd4ea
gobject-introspection: Add optional tests
krrk 9afd706
pygobject3: Add formula for 3.8.3
krrk d3db3cf
pygobject3: Add tests
krrk 651ad1b
pygobject3: Fix XDG_DATA_DIRS
krrk db79bcb
py3cairo: Add formula for py3cairo 1.10.0. This seems necessary as `p…
krrk 72d0c70
pango: make '--enable-introspection=yes' explicit
krrk eac26fa
gtk+3: Make '--enable-introspection=yes' explicit
krrk 30ca847
Clean up execution of --with-tests
krrk File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
class Gtkx3 < Formula | ||
homepage 'http://gtk.org/' | ||
url 'http://ftp.gnome.org/pub/gnome/sources/gtk+/3.10/gtk+-3.10.1.tar.xz' | ||
sha1 '6840ce0c7180344b063147332d4bf515a79ccebf' | ||
sha256 'c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8' | ||
|
||
depends_on :x11 => '2.5' # needs XInput2, introduced in libXi 1.3 | ||
depends_on 'pkg-config' => :build | ||
|
@@ -17,14 +17,16 @@ class Gtkx3 < Formula | |
depends_on 'jasper' => :optional | ||
depends_on 'atk' | ||
depends_on 'at-spi2-atk' | ||
depends_on 'gobject-introspection' | ||
|
||
def install | ||
system "./configure", "--disable-debug", | ||
"--disable-dependency-tracking", | ||
"--prefix=#{prefix}", | ||
"--disable-glibtest", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer to be explicit here with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have pushed a commit for this. |
||
"--disable-introspection", | ||
"--enable-x11-backend" | ||
"--enable-x11-backend", | ||
"--enable-introspection=yes" | ||
|
||
system "make install" | ||
# Prevent a conflict between this and Gtk+2 | ||
mv bin/'gtk-update-icon-cache', bin/'gtk3-update-icon-cache' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ class Pango < Formula | |
depends_on 'harfbuzz' | ||
depends_on 'fontconfig' | ||
depends_on :x11 unless build.without? 'x' | ||
depends_on 'gobject-introspection' | ||
|
||
fails_with :llvm do | ||
build 2326 | ||
|
@@ -26,7 +27,7 @@ def install | |
--prefix=#{prefix} | ||
--enable-man | ||
--with-html-dir=#{share}/doc | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prefer to be explicit here with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have pushed a commit for this. |
||
--disable-introspection | ||
--enable-introspection=yes | ||
] | ||
|
||
if build.include? 'without-x' | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
require 'formula' | ||
|
||
class Py3cairo < Formula | ||
homepage 'http://cairographics.org/pycairo/' | ||
url 'http://cairographics.org/releases/pycairo-1.10.0.tar.bz2' | ||
sha1 'b4283aa1cc9aafd12fd72ad371303a486da1d014' | ||
|
||
depends_on 'pkg-config' => :build | ||
depends_on 'cairo' | ||
depends_on :x11 | ||
depends_on :python3 | ||
|
||
def install | ||
python3 do | ||
ENV['PYTHON'] = "python3" | ||
system "./waf", "configure", "--prefix=#{prefix}" | ||
system "./waf", "build" | ||
system "./waf", "install" | ||
end | ||
end | ||
|
||
test do | ||
system "python3", "-c", "import cairo; print(cairo.version)" | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
require 'formula' | ||
|
||
class Pygobject3 < Formula | ||
homepage 'http://live.gnome.org/PyGObject' | ||
url 'http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.8/pygobject-3.8.3.tar.xz' | ||
sha256 '384b3e1b8d1e7c8796d7eb955380d62946dd0ed9c54ecf0817af2d6b254e082c' | ||
|
||
option 'with-tests', 'run tests' | ||
|
||
depends_on 'pkg-config' => :build | ||
depends_on 'xz' => :build | ||
if build.with? 'tests' | ||
depends_on 'automake' => :build | ||
depends_on 'autoconf' => :build | ||
depends_on 'gnome-common' => :build | ||
depends_on 'libtool' => :build | ||
depends_on 'gtk+3' => :build | ||
end | ||
depends_on 'glib' | ||
depends_on :python | ||
depends_on 'py2cairo' | ||
depends_on 'gobject-introspection' | ||
|
||
option :universal | ||
|
||
if build.with? 'tests' | ||
def patches | ||
# necessary for tests | ||
"https://gist.github.com/krrk/6439665/download" | ||
end | ||
end | ||
|
||
def install | ||
ENV.universal_binary if build.universal? | ||
|
||
python do | ||
if build.with? 'tests' | ||
# autogen.sh is necessary to update the build system after the above | ||
# patch and XDG_DATA_DIRS needs to be fixed for some tests to run | ||
inreplace 'tests/Makefile.am', '/usr/share', HOMEBREW_PREFIX/'share' | ||
system "./autogen.sh" | ||
end | ||
|
||
system "./configure", "--disable-dependency-tracking", | ||
"--prefix=#{prefix}" | ||
system "make" | ||
system "make install" | ||
end | ||
|
||
if build.with? 'tests' | ||
system "make check" | ||
end | ||
end | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of repeating this, use an array for the arguments and conditionally push "--with-cairo" onto the array:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a very neat way of doing it! I've committed it.