Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Upgrade pango to 1.32.6 #16900

Closed
wants to merge 2 commits into from

6 participants

@staticfloat

As requested, a new pull request to upgrade pango

@adamv
Owner

"LATEST-IS-1.32.5"

@staticfloat

Updated. I have also added a check for imagemagick when testing pango, but unfortunately, the test is failing for me. pango-view dies immediately from a SIGPIPE, I think there may be an incompatibility between pango-view and the display subprocess.

@manphiz
Collaborator

Maybe also check for #16281.

@adamv
Owner

Thanks, @manphiz for reminding me why we reverted.

@adamv
Owner

Will need HarfBuzz and Graphite for the new version of Pango.

@staticfloat

Added Harfbuzz, it seems pango can use either Harfbuzz or Graphite. Should I add both? libpangoft is being created, but I don't have a test to see if Harfbuzz is sufficient or Graphite is indeed also necessary.

@adamv
Owner

I... I don't know what to suggest here.

@staticfloat

I will test gtk+ and report on whether it breaks. If it doesn't, perhaps this resolves the issues in #16281.

@adamv
Owner

Someone add harfbuzz

@staticfloat

Harfbuzz is included in this commit, and unfortunately I haven't had the time to test gtk+, perhaps will be able to do so over the weekend.

@staticfloat

Updated. Can someone else please test to see if the pango test is failing on their machine? It fails on my machine, but the old test failed for me as well; it'd be nice to figure out if this test has been failing for a long time, or if it's just my machine.

@adamv
Owner

What would be some good GTK+ software to use to test this out?

Library/Formula/pango.rb
@@ -49,9 +50,15 @@ def install
system "make install"
end
- test do
- system "#{bin}/pango-view", "-t", "test-image",
- "--waterfall", "--rotate=10",
- "--annotate=1", "--header"
+ def test
+ if not Formula.factory('imagemagick').installed?
+ opoo "Imagemagick must be installed to test pango"
+ end
@mikemcquaid Owner

Why? It's not a dependency?

@mikemcquaid Owner

Which command line tool? What happens if you run without it? Would be good if we could make some sort of test that doesn't have that dependency.

Running with imagemagick unlinked causes the following:

$ brew test pango
Testing pango
==> /Users/sabae/.homebrew/Cellar/pango/1.32.6/bin/pango-view -t test-image --waterfall --rotate=10 --annotate=1 --header
pango-view: When running ImageMagick 'display' command: Failed to execute child process "display" (No such file or directory)
Error: pango: failed

I agree it would be best to have a better test, especially as this test fails for me even with imagemagick linked and all. I will investigate other methods of testing pango.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@mikemcquaid
Owner

@adamv abiword.

@staticfloat

Updated to have a test that uses the other binary shipped with pango, hopefully this test is more reasonable.

@jacknagel
Owner
  • I got a sha1 mismatch on harfbuzz
  • looks like harfbuzz needs newer autotools on all platforms
  • can we get harfbuzz as a separate commit?
  • imagemagick warning is still in the test
@staticfloat

For some reason, parts of my local commits made it through to github and others didn't (e.g. the imagemagick warning was not present in my local files, and git push said everything up to date!), so I've started from scratch.

I've split the two formulae into their own commits.

I've upgraded Harfbuzz to 0.9.12, the latest, and updated the corresponding hash.

I've followed the example of freeradius-server.rb for requiring new autotools on all platforms, but I must admit I don't understand the difference between requiring 'autoconf' and requiring :autoconf. Can you please explain this?

@jacknagel
Owner

The symbol style has an implicit "if Xcode.version >= 4.3" conditional built in, since prior to that Xcode shipped autotools.

@jacknagel
Owner

I had to make some further changes to get pango to build the xft backend: the latest fontconfig is required to build pango-xft, which is required by gtk+, and in order to do this harfbuzz needs a fontconfig dep as well. After doing this I was able to get everything to build and run correctly.

@jacknagel jacknagel closed this pull request from a commit
@staticfloat staticfloat pango 1.32.6
 - Updating test
 - Add dep on harfbuzz

Closes #16900.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
0a23073
@jacknagel jacknagel closed this in 0a23073
@jsallis jsallis referenced this pull request from a commit
@staticfloat staticfloat pango 1.32.6
 - Updating test
 - Add dep on harfbuzz

Closes #16900.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
4d0d225
@fgeller fgeller referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@n1k0 n1k0 referenced this pull request from a commit
@staticfloat staticfloat pango 1.32.6
 - Updating test
 - Add dep on harfbuzz

Closes #16900.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
7de271b
@cooljeanius cooljeanius referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@erbmicha erbmicha referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@phatblat phatblat referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@rajeeja rajeeja referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 29 additions and 6 deletions.
  1. +24 −0 Library/Formula/harfbuzz.rb
  2. +5 −6 Library/Formula/pango.rb
View
24 Library/Formula/harfbuzz.rb
@@ -0,0 +1,24 @@
+require 'formula'
+
+class Harfbuzz < Formula
+ homepage 'http://www.freedesktop.org/wiki/Software/HarfBuzz'
+ url 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.12.tar.bz2'
+ sha256 'c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5'
+
+ depends_on 'pkg-config' => :build
+
+ # Requires newer autotools on all platforms
+ depends_on 'autoconf' => :build
+ depends_on 'automake' => :build
+ depends_on 'libtool' => :build
+ depends_on 'glib'
+ depends_on 'icu4c' => :recommended
+
+ def install
+ system "./autogen.sh"
+ system "./configure", "--disable-debug", "--disable-dependency-tracking",
+ "--prefix=#{prefix}"
+ system "make install"
+ end
+
+end
View
11 Library/Formula/pango.rb
@@ -2,14 +2,15 @@
class Pango < Formula
homepage 'http://www.pango.org/'
- url 'http://ftp.gnome.org/pub/GNOME/sources/pango/1.30/pango-1.30.1.tar.xz'
- sha256 '3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe'
+ url 'http://ftp.gnome.org/pub/GNOME/sources/pango/1.32/pango-1.32.6.tar.xz'
+ sha256 '8e9a3eadebf30a31640f2b3ae0fb455cf92d10d1cad246d0ffe72ec595905174'
option 'without-x', 'Build without X11 support'
depends_on 'pkg-config' => :build
depends_on 'xz' => :build
depends_on 'glib'
+ depends_on 'harfbuzz'
depends_on :x11 unless build.include? 'without-x'
if MacOS.version == :leopard
@@ -49,9 +50,7 @@ def install
system "make install"
end
- test do
- system "#{bin}/pango-view", "-t", "test-image",
- "--waterfall", "--rotate=10",
- "--annotate=1", "--header"
+ def test
+ system "#{bin}/pango-querymodules", "--version"
end
end
Something went wrong with that request. Please try again.