Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Pango fixes #674

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Pango fixes #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d149618
Update pango
certik Feb 23, 2015
692f306
Update Cairo
certik Feb 23, 2015
1a14fe5
[WIP] Rest of stuff (may not be actually needed)
certik Feb 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkgs/cairo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ defaults:
relocatable: false

dependencies:
build: [python, pkg-config, png, pixman, fontconfig, freetype, zlib]
build: [python, glib2, pkg-config, png, pixman, fontconfig, freetype, zlib]
run: [pkg-config]

sources:
#- key: tar.gz:k4v23ikvs3wiocbzfwy27c4tugxxlssh
# url: http://cairographics.org/releases/cairo-1.8.10.tar.gz
#- key: tar.gz:giayy6mygwhoxqvnk6h7rwcvtu2pzabf
# url: http://cairographics.org/releases/cairo-1.10.2.tar.gz
- key: tar.gz:v5s3ozw76en46pf2d6jnskq3ykhxrxbj
url: http://www.cairographics.org/releases/cairo-1.12.0.tar.gz
- key: tar.xz:ft27qfbs457kinm27honb5h26n6qcwju
url: http://cairographics.org/releases/cairo-1.14.0.tar.xz

build_stages:
- name: configure
global_flags: true

when_build_dependency:
- prepend_path: PKG_CONFIG_PATH
Expand Down
4 changes: 4 additions & 0 deletions pkgs/glib2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ dependencies:
defaults:
relocatable: false

build_stages:
- name: configure
global_flags: true

sources:
- key: tar.xz:r47qqzjibzc3rtuebylw56b3z7krcfej
url: http://ftp.gnome.org/pub/gnome/sources/glib/2.42/glib-2.42.1.tar.xz
Expand Down
14 changes: 6 additions & 8 deletions pkgs/pango.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,18 @@ defaults:
relocatable: false

dependencies:
build: [pkg-config, glib2, cairo, gobject-introspection, fontconfig, freetype, atk]
build: [pkg-config, glib2, bzip2, zlib, cairo, gobject-introspection,
fontconfig, freetype, atk]
run: [pkg-config]

sources:
#- key: tar.bz2:r47kvnig6yj52jn3d6tf5kd2crovepig
# url: http://ftp.gnome.org/pub/gnome/sources/pango/1.28/pango-1.28.1.tar.bz2
#- key: tar.bz2:p2ydlpgbbxibk2ncctk6fpbug7pjlwnm
# url: http://ftp.gnome.org/pub/gnome/sources/pango/1.28/pango-1.28.4.tar.bz2
- key: tar.bz2:f7du3sywfxkhcgml4ltiwewoouup4bm4
url: http://ftp.gnome.org/pub/gnome/sources/pango/1.29/pango-1.29.5.tar.bz2
- key: tar.xz:ddn3kg4k4ev24cvxvfmoptztc7e2z7ek
url: http://ftp.gnome.org/pub/gnome/sources/pango/1.36/pango-1.36.8.tar.xz

build_stages:
- name: configure
extra: ['CAIRO_CFLAGS=-I${CAIRO_DIR}/include/cairo']
extra: ['CAIRO_CFLAGS=-I${CAIRO_DIR}/include/cairo -I${GLIB2_DIR}/include/glib-2.0']
global_flags: true

when_build_dependency:
- prepend_path: PKG_CONFIG_PATH
Expand Down