diff options
author | Juergen Daubert <jue@jue.li> | 2020-11-14 11:43:49 +0000 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2020-11-14 11:43:49 +0000 |
commit | b1ce8102cce61a9815ce79a223e550fdf9eccba7 (patch) | |
tree | 85cd29bb28404909c3d456c8843323580eeac74f /pango | |
parent | 9b6d796bd616de9868fa4a17804e30e0c0c0d063 (diff) | |
parent | 1b1121b7824f4a4b818ac2f2eb33a4c9969beded (diff) | |
download | opt-b1ce8102cce61a9815ce79a223e550fdf9eccba7.tar.gz opt-b1ce8102cce61a9815ce79a223e550fdf9eccba7.tar.xz |
Merge branch '3.5' into 3.6
Conflicts:
faudio/Pkgfile
meson/.footprint
meson/.signature
pango/.signature
Diffstat (limited to 'pango')
-rw-r--r-- | pango/.signature | 4 | ||||
-rw-r--r-- | pango/Pkgfile | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pango/.signature b/pango/.signature index 13719bc17..f416feee8 100644 --- a/pango/.signature +++ b/pango/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Y8hBrO1nohuX2wFQuyDaVU+YY3U4bNpPya2GZOkYBe9YYE43JoSGxDFAdXXWE75FmhJbGlc/UMbXe08FrQkxwE= -SHA256 (Pkgfile) = 9d69acec1ddf237e3fea6a81042f903710b878dd480f65551b1671edfe263c15 +RWSE3ohX2g5d/WwU0pB3Fm+hZ+uyPiZGZQ5+01EvU+ar0+lHPtVz+Yf1DwIPL1Pv7sY6R3ImiSxeU4aWAprHTrT6rcz0VzXkSQc= +SHA256 (Pkgfile) = 8ff70d55238d054f495dd4507270565efc50fcb6897df8b598039974021bfc2e SHA256 (.footprint) = 57837fbc7947df43e07735250e2552d107216f95ce09654d457f413256249f61 SHA256 (pango-1.48.0.tar.xz) = 391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6 diff --git a/pango/Pkgfile b/pango/Pkgfile index af52f30d8..b61c66ddb 100644 --- a/pango/Pkgfile +++ b/pango/Pkgfile @@ -9,8 +9,10 @@ release=1 source=(http://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz) build () { - cd $name-$version + meson build $name-$version \ + --prefix=/usr \ + --buildtype=plain - meson build --prefix=/usr - DESTDIR=$PKG ninja -C build install + meson compile -C build -j ${JOBS:-1} + DESTDIR=$PKG meson install -C build } |