Date: Wednesday, May 13, 2015 @ 18:42:49 Author: heftig Revision: 239302
Add back settings.ini (mostly for default font) and move gtk-update-icon-cache from gtk2 Added: gtk3/trunk/gtk-update-icon-cache.install Modified: gtk3/trunk/PKGBUILD gtk3/trunk/settings.ini -------------------------------+ PKGBUILD | 40 ++++++++++++++++++++++++++++++---------- gtk-update-icon-cache.install | 3 +++ settings.ini | 2 +- 3 files changed, 34 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-05-13 16:37:42 UTC (rev 239301) +++ PKGBUILD 2015-05-13 16:42:49 UTC (rev 239302) @@ -2,21 +2,22 @@ # Maintainer: Ionut Biru <ib...@archlinux.org> # Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -pkgname=gtk3 +pkgbase=gtk3 +pkgname=(gtk3 gtk-update-icon-cache) pkgver=3.16.3 -pkgrel=1 -pkgdesc="GObject-based multi-platform GUI toolkit (v3)" +pkgrel=2 +pkgdesc="GObject-based multi-platform GUI toolkit" arch=(i686 x86_64) url="http://www.gtk.org/" -install=gtk3.install -depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libepoxy +depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon adwaita-icon-theme json-glib rest) makedepends=(gobject-introspection libcanberra) -optdepends=('libcanberra: gtk3-widget-factory demo') license=(LGPL) -source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz) -sha256sums=('2943fd4a6b02c2a9b2edd231c1d8f7a1d2f8d36996f14310d34f503dca9ebea4') +source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz + settings.ini) +sha256sums=('2943fd4a6b02c2a9b2edd231c1d8f7a1d2f8d36996f14310d34f503dca9ebea4' + '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202') prepare() { cd gtk+-$pkgver @@ -39,8 +40,27 @@ make } -package() { +package_gtk3() { + depends+=(gtk-update-icon-cache) + optdepends=('libcanberra: gtk3-widget-factory demo' + 'adwaita-icon-theme: Default icon theme') + install=gtk3.install + cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install - rm -f "$pkgdir/usr/bin/gtk-update-icon-cache" + install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" + + # split this out to use with gtk2 too + rm "$pkgdir/usr/bin/gtk-update-icon-cache" } + +package_gtk-update-icon-cache() { + pkgdesc="GTK+ icon cache updater" + depends=(gdk-pixbuf2 hicolor-icon-theme) + install=gtk-update-icon-cache.install + + cd gtk+-$pkgver/gtk + install -Dm755 gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache" +} + +# vim:set noet sw=4: Added: gtk-update-icon-cache.install =================================================================== --- gtk-update-icon-cache.install (rev 0) +++ gtk-update-icon-cache.install 2015-05-13 16:42:49 UTC (rev 239302) @@ -0,0 +1,3 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} Modified: settings.ini =================================================================== --- settings.ini 2015-05-13 16:37:42 UTC (rev 239301) +++ settings.ini 2015-05-13 16:42:49 UTC (rev 239302) @@ -1,4 +1,4 @@ [Settings] -gtk-icon-theme-name = gnome +gtk-icon-theme-name = Adwaita gtk-theme-name = Adwaita gtk-font-name = Cantarell 11