diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-03-27 23:13:48 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-28 18:35:38 +0000 |
| commit | f17c229ea0ac44212262929feef45c41ee5e3700 (patch) | |
| tree | f536bebb70f5ab995d1e49a3de927eda84fa8f2d /main/gtk+3.0 | |
| parent | b43cf0ddad95179978d909e8c8eb807d3cb4bedd (diff) | |
| download | aports-f17c229ea0ac44212262929feef45c41ee5e3700.tar.bz2 aports-f17c229ea0ac44212262929feef45c41ee5e3700.tar.xz | |
main/gtk+3.0: upgrade to 3.24.16
Also switch to building w/ meson
Diffstat (limited to 'main/gtk+3.0')
| -rw-r--r-- | main/gtk+3.0/APKBUILD | 61 |
1 files changed, 26 insertions, 35 deletions
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD index 16fd3514e2..fbb9eb723a 100644 --- a/main/gtk+3.0/APKBUILD +++ b/main/gtk+3.0/APKBUILD @@ -2,14 +2,14 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gtk+3.0 -pkgver=3.24.14 +pkgver=3.24.16 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" arch="all" -options="!check" # Test suite is known to fail upstream license="LGPL-2.1-or-later" +options="!check" # Most glade tests fail :c subpackages="$pkgname-demo $pkgname-dev $pkgname-doc $pkgname-lang $pkgname-dbg" depends="shared-mime-info gtk-update-icon-cache" @@ -30,7 +30,6 @@ depends_dev=" " makedepends=" $depends_dev - perl cups-dev expat-dev gettext-dev @@ -49,7 +48,17 @@ makedepends=" libxcursor-dev libxdamage-dev libxfixes-dev - libxrandr-dev" + libxrandr-dev + meson + gtk-doc + iso-codes-dev + " +checkdepends=" + xvfb-run + ibus + librsvg + gdk-pixbuf + " source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch " @@ -57,43 +66,26 @@ source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz builddir="$srcdir/gtk+-$pkgver" -prepare() { - default_prepare - - sed 's|/usr/bin/sh|/bin/sh|' \ - -i build-aux/compile \ - -i build-aux/missing \ - -i build-aux/install-sh \ - -i build-aux/depcomp \ - -i build-aux/config.sub \ - -i build-aux/config.guess -} - build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson \ --prefix=/usr \ --sysconfdir=/etc \ + --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-xkb \ - --enable-xinerama \ - --enable-xrandr \ - --enable-xfixes \ - --enable-xcomposite \ - --enable-xdamage \ - --enable-x11-backend \ - --enable-wayland-backend \ - --enable-broadway-backend - - # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + --buildtype=plain \ + -Dman=true \ + -Dgtk_doc=true \ + -Dbroadway_backend=true \ + output + ninja -C output +} - make +check() { + xvfb-run ninja -C output test } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -C output install # use gtk-update-icon-cache from gtk+2.0 for now rm -f "$pkgdir"/usr/bin/gtk-update-icon-cache @@ -109,7 +101,6 @@ demo() { install -Dm644 "$pkgdir"/usr/share/gtk-3.0/gtkbuilder.rng \ -t "$subpkgdir"/usr/share/gtk-3.0 install -Dm644 "$pkgdir"/usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml \ - "$pkgdir"/usr/share/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml \ -t "$subpkgdir"/usr/share/glib-2.0/schemas install -Dm644 "$pkgdir"/usr/share/applications/gtk3-widget-factory.desktop \ "$pkgdir"/usr/share/applications/gtk3-demo.desktop \ @@ -128,5 +119,5 @@ doc() { default_doc } -sha512sums="a5ce659508933f6a3825aaafe9b30f51bd1357a62a6c66526ebd716627c829aa24543b4f8bd6f701dceda1d9fff94ad105f89f02a14d53749744e868bdff26bf gtk+-3.24.14.tar.xz +sha512sums="181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb gtk+-3.24.16.tar.xz e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch" |