Date: Monday, September 29, 2014 @ 16:05:48 Author: alucryd Revision: 119775
FS#42163: geary 0.8.0-2 Added: geary/trunk/geary-gtk3.14.patch Modified: geary/trunk/PKGBUILD ---------------------+ PKGBUILD | 22 +++++++++++++++------- geary-gtk3.14.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-29 11:50:17 UTC (rev 119774) +++ PKGBUILD 2014-09-29 14:05:48 UTC (rev 119775) @@ -1,11 +1,11 @@ # $Id$ -# Maintainer: Maxime Gauduin <[email protected]> +# Maintainer: Maxime Gauduin <[email protected]> # Contributor : sebikul <[email protected]> # Contributor : Massimiliano Torromeo <[email protected]> pkgname=geary pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc='A lightweight email client for the GNOME desktop' arch=('i686' 'x86_64') url='http://www.yorba.org/projects/geary/' @@ -12,12 +12,20 @@ license=('GPL3') depends=('gnome-keyring' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk') makedepends=('cmake' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala') -install="${pkgname}.install" -source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz";) -sha256sums=('4d4c168180d1c5193ba2784902f75b90b9c13d674204da4014e70d5bee14bd48') +install='geary.install' +source=("https://download.gnome.org/sources/geary/${pkgver%.?}/geary-${pkgver}.tar.xz"; + 'geary-gtk3.14.patch') +sha256sums=('4d4c168180d1c5193ba2784902f75b90b9c13d674204da4014e70d5bee14bd48' + '2a90d4cfe33c8317090e2908ff135d58ce99fc0070fda121bd85a3ebf39880c4') +prepare() { + cd geary-${pkgver} + + patch -Np1 -i ../geary-gtk3.14.patch +} + build() { - cd ${pkgname}-${pkgver} + cd geary-${pkgver} if [[ -d build ]]; then rm -rf build @@ -30,7 +38,7 @@ } package() { - cd ${pkgname}-${pkgver}/build + cd geary-${pkgver}/build make DESTDIR="${pkgdir}" install } Added: geary-gtk3.14.patch =================================================================== --- geary-gtk3.14.patch (rev 0) +++ geary-gtk3.14.patch 2014-09-29 14:05:48 UTC (rev 119775) @@ -0,0 +1,44 @@ +From f1fc86f2dbd1ca6b10296744b88267d18d7a25e7 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +Date: Thu, 25 Sep 2014 16:46:59 -0700 +Subject: Fix toolbar icon size in GTK+ 3.14: Bug #732065 + +By setting the icon pixel size, that forces GTK+ to load images +installed in our locations rather than the theme's. + +diff --git a/THANKS b/THANKS +index 007ab81..f35d8ad 100644 +--- a/THANKS ++++ b/THANKS +@@ -5,6 +5,7 @@ Jürg Billeter <[email protected]> + Yosef Or Boczko <[email protected]> + Martijn Braam <[email protected]> + Attila Bukor <[email protected]> ++Matthias Clasen <[email protected]> + Andrea Corbellini <[email protected]> + Sergey Shnatsel Davidoff <[email protected]> + Joanmarie Diggs <[email protected]> +diff --git a/src/client/components/pill-toolbar.vala b/src/client/components/pill-toolbar.vala +index 498236c..1c9a1a9 100644 +--- a/src/client/components/pill-toolbar.vala ++++ b/src/client/components/pill-toolbar.vala +@@ -38,8 +38,14 @@ public interface PillBar : Gtk.Container { + b.related_action = action_group.get_action(action_name); + b.tooltip_text = b.related_action.tooltip; + b.related_action.notify["tooltip"].connect(() => { b.tooltip_text = b.related_action.tooltip; }); +- b.image = new Gtk.Image.from_icon_name(icon_name != null ? icon_name : ++ ++ // set pixel size to force GTK+ to load our images from our installed directory, not the theme ++ // directory ++ Gtk.Image image = new Gtk.Image.from_icon_name(icon_name != null ? icon_name : + b.related_action.icon_name, Gtk.IconSize.MENU); ++ image.set_pixel_size(16); ++ b.image = image; ++ + // Unity buttons are a bit tight + #if ENABLE_UNITY + b.image.margin = b.image.margin + 4; +-- +cgit v0.10.1 + + Property changes on: geary/trunk/geary-gtk3.14.patch ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property
