[arch-commits] Commit in geary/repos (10 files)
Maxime Gauduin
alucryd at archlinux.org
Mon Sep 29 14:06:04 UTC 2014
Date: Monday, September 29, 2014 @ 16:06:02
Author: alucryd
Revision: 119776
archrelease: copy trunk to community-i686, community-x86_64
Added:
geary/repos/community-i686/PKGBUILD
(from rev 119775, geary/trunk/PKGBUILD)
geary/repos/community-i686/geary-gtk3.14.patch
(from rev 119775, geary/trunk/geary-gtk3.14.patch)
geary/repos/community-i686/geary.install
(from rev 119775, geary/trunk/geary.install)
geary/repos/community-x86_64/PKGBUILD
(from rev 119775, geary/trunk/PKGBUILD)
geary/repos/community-x86_64/geary-gtk3.14.patch
(from rev 119775, geary/trunk/geary-gtk3.14.patch)
geary/repos/community-x86_64/geary.install
(from rev 119775, geary/trunk/geary.install)
Deleted:
geary/repos/community-i686/PKGBUILD
geary/repos/community-i686/geary.install
geary/repos/community-x86_64/PKGBUILD
geary/repos/community-x86_64/geary.install
--------------------------------------+
/PKGBUILD | 92 +++++++++++++++++++++++++++++++++
/geary.install | 34 ++++++++++++
community-i686/PKGBUILD | 38 -------------
community-i686/geary-gtk3.14.patch | 44 +++++++++++++++
community-i686/geary.install | 17 ------
community-x86_64/PKGBUILD | 38 -------------
community-x86_64/geary-gtk3.14.patch | 44 +++++++++++++++
community-x86_64/geary.install | 17 ------
8 files changed, 214 insertions(+), 110 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-09-29 14:05:48 UTC (rev 119775)
+++ community-i686/PKGBUILD 2014-09-29 14:06:02 UTC (rev 119776)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor : sebikul <sebikul at gmail.com>
-# Contributor : Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=geary
-pkgver=0.8.0
-pkgrel=1
-pkgdesc='A lightweight email client for the GNOME desktop'
-arch=('i686' 'x86_64')
-url='http://www.yorba.org/projects/geary/'
-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')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build && cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \
- -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='FALSE'
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/build
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: geary/repos/community-i686/PKGBUILD (from rev 119775, geary/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-09-29 14:06:02 UTC (rev 119776)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor : sebikul <sebikul at gmail.com>
+# Contributor : Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=geary
+pkgver=0.8.0
+pkgrel=2
+pkgdesc='A lightweight email client for the GNOME desktop'
+arch=('i686' 'x86_64')
+url='http://www.yorba.org/projects/geary/'
+license=('GPL3')
+depends=('gnome-keyring' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk')
+makedepends=('cmake' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala')
+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 geary-${pkgver}
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \
+ -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='FALSE'
+ make
+}
+
+package() {
+ cd geary-${pkgver}/build
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Copied: geary/repos/community-i686/geary-gtk3.14.patch (from rev 119775, geary/trunk/geary-gtk3.14.patch)
===================================================================
--- community-i686/geary-gtk3.14.patch (rev 0)
+++ community-i686/geary-gtk3.14.patch 2014-09-29 14:06:02 UTC (rev 119776)
@@ -0,0 +1,44 @@
+From f1fc86f2dbd1ca6b10296744b88267d18d7a25e7 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+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 <j at bitron.ch>
+ Yosef Or Boczko <yoseforb at gmail.com>
+ Martijn Braam <pizzamartijn at gmail.com>
+ Attila Bukor <r1pp3rj4ck at w4it.eu>
++Matthias Clasen <mclasen at redhat.com>
+ Andrea Corbellini <corbellini.andrea at gmail.com>
+ Sergey Shnatsel Davidoff <sergey at elementaryos.org>
+ Joanmarie Diggs <jdiggs at igalia.com>
+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
+
+
Deleted: community-i686/geary.install
===================================================================
--- community-i686/geary.install 2014-09-29 14:05:48 UTC (rev 119775)
+++ community-i686/geary.install 2014-09-29 14:06:02 UTC (rev 119776)
@@ -1,17 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade()
-{
- post_install
-}
-
-post_remove()
-{
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: geary/repos/community-i686/geary.install (from rev 119775, geary/trunk/geary.install)
===================================================================
--- community-i686/geary.install (rev 0)
+++ community-i686/geary.install 2014-09-29 14:06:02 UTC (rev 119776)
@@ -0,0 +1,17 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+post_remove()
+{
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-09-29 14:05:48 UTC (rev 119775)
+++ community-x86_64/PKGBUILD 2014-09-29 14:06:02 UTC (rev 119776)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor : sebikul <sebikul at gmail.com>
-# Contributor : Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=geary
-pkgver=0.8.0
-pkgrel=1
-pkgdesc='A lightweight email client for the GNOME desktop'
-arch=('i686' 'x86_64')
-url='http://www.yorba.org/projects/geary/'
-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')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build && cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \
- -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='FALSE'
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/build
-
- make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
Copied: geary/repos/community-x86_64/PKGBUILD (from rev 119775, geary/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-09-29 14:06:02 UTC (rev 119776)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor : sebikul <sebikul at gmail.com>
+# Contributor : Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=geary
+pkgver=0.8.0
+pkgrel=2
+pkgdesc='A lightweight email client for the GNOME desktop'
+arch=('i686' 'x86_64')
+url='http://www.yorba.org/projects/geary/'
+license=('GPL3')
+depends=('gnome-keyring' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk')
+makedepends=('cmake' 'gnome-doc-utils' 'gobject-introspection' 'intltool' 'vala')
+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 geary-${pkgver}
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \
+ -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='FALSE'
+ make
+}
+
+package() {
+ cd geary-${pkgver}/build
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Copied: geary/repos/community-x86_64/geary-gtk3.14.patch (from rev 119775, geary/trunk/geary-gtk3.14.patch)
===================================================================
--- community-x86_64/geary-gtk3.14.patch (rev 0)
+++ community-x86_64/geary-gtk3.14.patch 2014-09-29 14:06:02 UTC (rev 119776)
@@ -0,0 +1,44 @@
+From f1fc86f2dbd1ca6b10296744b88267d18d7a25e7 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+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 <j at bitron.ch>
+ Yosef Or Boczko <yoseforb at gmail.com>
+ Martijn Braam <pizzamartijn at gmail.com>
+ Attila Bukor <r1pp3rj4ck at w4it.eu>
++Matthias Clasen <mclasen at redhat.com>
+ Andrea Corbellini <corbellini.andrea at gmail.com>
+ Sergey Shnatsel Davidoff <sergey at elementaryos.org>
+ Joanmarie Diggs <jdiggs at igalia.com>
+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
+
+
Deleted: community-x86_64/geary.install
===================================================================
--- community-x86_64/geary.install 2014-09-29 14:05:48 UTC (rev 119775)
+++ community-x86_64/geary.install 2014-09-29 14:06:02 UTC (rev 119776)
@@ -1,17 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
- gtk-update-icon-cache -ftq usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade()
-{
- post_install
-}
-
-post_remove()
-{
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: geary/repos/community-x86_64/geary.install (from rev 119775, geary/trunk/geary.install)
===================================================================
--- community-x86_64/geary.install (rev 0)
+++ community-x86_64/geary.install 2014-09-29 14:06:02 UTC (rev 119776)
@@ -0,0 +1,17 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+ gtk-update-icon-cache -ftq usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+post_remove()
+{
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list