Date: Monday, May 16, 2016 @ 21:23:57 Author: alucryd Revision: 175506
upgpkg: geary 0.11.0-3 Modified: geary/trunk/PKGBUILD Deleted: geary/trunk/geary-gtk3.14.patch ---------------------+ PKGBUILD | 12 ++++++++---- geary-gtk3.14.patch | 44 -------------------------------------------- 2 files changed, 8 insertions(+), 48 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-16 18:56:31 UTC (rev 175505) +++ PKGBUILD 2016-05-16 19:23:57 UTC (rev 175506) @@ -4,7 +4,7 @@ # Contributor: Massimiliano Torromeo <[email protected]> pkgname=geary -pkgver=0.10.0 +pkgver=0.11.0 pkgrel=3 pkgdesc='A lightweight email client for the GNOME desktop' arch=('i686' 'x86_64') @@ -15,16 +15,20 @@ makedepends=('cmake' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala') source=("https://download.gnome.org/sources/geary/${pkgver%.?}/geary-${pkgver}.tar.xz";) -sha256sums=('46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5') +sha256sums=('c947bb1e70bd3d3f4799e59ddd05b27b08a8132674f64c68c919974595bdcd9f') -build() { +prepare() { cd geary-${pkgver} if [[ -d build ]]; then rm -rf build fi - mkdir build && cd build + mkdir build +} +build() { + cd geary-${pkgver}/build + cmake .. \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DDESKTOP_UPDATE='FALSE' \ Deleted: geary-gtk3.14.patch =================================================================== --- geary-gtk3.14.patch 2016-05-16 18:56:31 UTC (rev 175505) +++ geary-gtk3.14.patch 2016-05-16 19:23:57 UTC (rev 175506) @@ -1,44 +0,0 @@ -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 - -
