From d1496184507c08d4a4c4d6df290c4edeb43d039f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 23 Feb 2015 14:54:50 -0700 Subject: [PATCH 1/3] Update pango --- pkgs/pango.yaml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/pango.yaml b/pkgs/pango.yaml index 1cf119610..6629d845d 100644 --- a/pkgs/pango.yaml +++ b/pkgs/pango.yaml @@ -4,16 +4,13 @@ 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 From 692f306a9813f58d3480809446589aaaadfc9380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 23 Feb 2015 14:59:34 -0700 Subject: [PATCH 2/3] Update Cairo --- pkgs/cairo.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/cairo.yaml b/pkgs/cairo.yaml index dbb73aadb..941d4e589 100644 --- a/pkgs/cairo.yaml +++ b/pkgs/cairo.yaml @@ -8,12 +8,8 @@ dependencies: 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 when_build_dependency: - prepend_path: PKG_CONFIG_PATH From 1a14fe5524a2921fc042732ae8d826adf1897757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Mon, 23 Feb 2015 15:17:42 -0700 Subject: [PATCH 3/3] [WIP] Rest of stuff (may not be actually needed) Each of these must be investigated and seen if it is really needed. --- pkgs/cairo.yaml | 6 +++++- pkgs/glib2.yaml | 4 ++++ pkgs/pango.yaml | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/cairo.yaml b/pkgs/cairo.yaml index 941d4e589..b85f0d82f 100644 --- a/pkgs/cairo.yaml +++ b/pkgs/cairo.yaml @@ -4,13 +4,17 @@ 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.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 value: '${ARTIFACT}/lib/pkgconfig' diff --git a/pkgs/glib2.yaml b/pkgs/glib2.yaml index a49bbf194..b2420fd63 100644 --- a/pkgs/glib2.yaml +++ b/pkgs/glib2.yaml @@ -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 diff --git a/pkgs/pango.yaml b/pkgs/pango.yaml index 6629d845d..d0b8a7fe1 100644 --- a/pkgs/pango.yaml +++ b/pkgs/pango.yaml @@ -14,7 +14,8 @@ sources: 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