From a85e9179a439fda96f63116496072cfdb090df2f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 1 Dec 2014 19:23:27 +0000 Subject: gtk3: update to 3.14.5. dep of handbrake --- abs/extra/gtk3/PKGBUILD | 41 ++++++++++++++++++++++------------------- abs/extra/gtk3/gtk3.install | 2 ++ abs/extra/gtk3/settings.ini | 4 +++- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/abs/extra/gtk3/PKGBUILD b/abs/extra/gtk3/PKGBUILD index 9d4a7a1..5557008 100644 --- a/abs/extra/gtk3/PKGBUILD +++ b/abs/extra/gtk3/PKGBUILD @@ -1,42 +1,45 @@ -# $Id: PKGBUILD 163899 2012-07-21 19:20:27Z ibiru $ +# $Id$ # Maintainer: Ionut Biru +# Maintainer: Jan Alexander Steffens (heftig) pkgname=gtk3 -pkgver=3.4.4 +pkgver=3.14.5 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord') -makedepends=('gobject-introspection') -options=('!libtool') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini wacom.patch) -sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') +depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi + libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon + adwaita-icon-theme json-glib rest) +makedepends=(gobject-introspection python2) +license=(LGPL) +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz) +sha256sums=('ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2') + +prepare() { + cd gtk+-$pkgver +} + build() { cd "gtk+-$pkgver" - # Partially revert BGO#673440 in order to fix BGO#674157 - patch -Np1 -i ../wacom.patch - CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --enable-gtk2-dependency \ - --disable-schemas-compile + --disable-schemas-compile \ + --enable-x11-backend \ + --enable-broadway-backend \ + --enable-wayland-backend + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" } diff --git a/abs/extra/gtk3/gtk3.install b/abs/extra/gtk3/gtk3.install index ca20d28..f57b1bf 100644 --- a/abs/extra/gtk3/gtk3.install +++ b/abs/extra/gtk3/gtk3.install @@ -1,6 +1,7 @@ post_install() { /usr/bin/gtk-query-immodules-3.0 --update-cache /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { @@ -13,4 +14,5 @@ pre_remove() { post_remove() { /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/abs/extra/gtk3/settings.ini b/abs/extra/gtk3/settings.ini index 039000d..6a0643b 100644 --- a/abs/extra/gtk3/settings.ini +++ b/abs/extra/gtk3/settings.ini @@ -1,2 +1,4 @@ [Settings] -gtk-fallback-icon-theme = gnome +gtk-icon-theme-name = gnome +gtk-theme-name = Adwaita +gtk-font-name = Cantarell 11 -- cgit v0.12