diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-28 10:07:53 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de> | 2017-11-28 10:16:15 +0000 |
| commit | caed76f7988989d6cef19e8902262ffeb98e8246 (patch) | |
| tree | 1875f43b506499c25026cfa12bbba0cc59bb02a6 | |
| parent | 64cbaf56f14518ebd10bda62964706dac289ebdc (diff) | |
| download | midipix_build-caed76f7988989d6cef19e8902262ffeb98e8246.tar.bz2 midipix_build-caed76f7988989d6cef19e8902262ffeb98e8246.tar.xz | |
patches/gtk2-2.24.31.local.patch:configure: always use ${PKG_CONFIG}.
vars/gdk.vars: patch incorrectly missing gio-2.0 (glib) dependency into .pc file.
vars/glib.vars:pkg_glib_install_pkgconfig_post(): fix library order.
| -rw-r--r-- | patches/gtk2-2.24.31.local.patch | 11 | ||||
| -rw-r--r-- | vars/gdk.vars | 13 | ||||
| -rw-r--r-- | vars/glib.vars | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/patches/gtk2-2.24.31.local.patch b/patches/gtk2-2.24.31.local.patch index 050f26cd..72c378f1 100644 --- a/patches/gtk2-2.24.31.local.patch +++ b/patches/gtk2-2.24.31.local.patch @@ -51,3 +51,14 @@ diff -ru gtk+-2.24.31.orig/Makefile.in gtk+-2.24.31/Makefile.in # require automake 1.4 +--- gtk+-2.24.31/configure.orig 2016-09-09 19:33:11.000000000 +0000 ++++ gtk+-2.24.31/configure 2017-11-28 09:52:56.536000000 +0000 +@@ -24351,7 +24351,7 @@ + GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" + ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`" + PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`" +-CAIRO_PREFIX="`pkg-config --variable=prefix cairo`" ++CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`" + + + diff --git a/vars/gdk.vars b/vars/gdk.vars new file mode 100644 index 00000000..16d03deb --- /dev/null +++ b/vars/gdk.vars @@ -0,0 +1,13 @@ +# +# set -o errexit -o noglob are assumed. +# + +pkg_gdk_install_pkgconfig_post() { + local _pc_path; + for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do + sed -i"" -e '/^Requires:\s\+gobject-2.0$/s/^.*$/& gio-2.0/' \ + "${_pc_path}"; + done; +}; + +# vim:filetype=sh diff --git a/vars/glib.vars b/vars/glib.vars index 86de74ee..fea598c4 100644 --- a/vars/glib.vars +++ b/vars/glib.vars @@ -5,7 +5,7 @@ pkg_glib_install_pkgconfig_post() { local _pc_path; for _pc_path in $(find "${PKG_DESTDIR}"/lib/pkgconfig -name \*.pc); do - sed -i"" -e '/^Libs:\s/s/-L\${libdir}/& -lffi -lpcre -lz/' \ + sed -i"" -e '/^Libs:/s/^\(Libs:\s\+-L\${libdir}\)\s\+\(.\+\)$/\1 \2 -lffi -lpcre -lz/' \ "${_pc_path}"; done; }; |