From 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Oct 2013 02:34:09 -0700 Subject: Tue Oct 8 02:32:53 PDT 2013 --- extra/gthumb/PKGBUILD | 17 ++++++++++++----- extra/gthumb/gtk310.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 extra/gthumb/gtk310.patch (limited to 'extra/gthumb') diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 5f9b9ded9..49267ecbf 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 189883 2013-07-10 14:53:39Z heftig $ +# $Id: PKGBUILD 196101 2013-10-07 11:52:31Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Tobias Kieslich pkgname=gthumb pkgver=3.2.3 -pkgrel=1 +pkgrel=4 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=(GPL) url="http://live.gnome.org/gthumb" depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret - libsoup webkitgtk3 json-glib) + libsoup webkitgtk json-glib) makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl) optdepends=('libopenraw: read RAW files' 'exiv2: metadata support' @@ -21,8 +21,15 @@ optdepends=('libopenraw: read RAW files' 'liboauth: web albums') options=('!libtool' '!emptydirs') install=gthumb.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gtk310.patch) +sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a' + 'dcbfad2eb7047c1ea4210dc0af1054dc2ec863331f12fcd59c05021570d38bfe') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../gtk310.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gthumb/gtk310.patch b/extra/gthumb/gtk310.patch new file mode 100644 index 000000000..86f0e99e8 --- /dev/null +++ b/extra/gthumb/gtk310.patch @@ -0,0 +1,29 @@ +From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001 +From: Paolo Bacchilega +Date: Fri, 27 Sep 2013 15:40:33 +0000 +Subject: Fixed broken window layout with gtk+ 3.10 + +[bug #708800] +--- +diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c +index a2960bc..a2cce99 100644 +--- a/gthumb/gth-window.c ++++ b/gthumb/gth-window.c +@@ -324,6 +324,7 @@ gth_window_attach (GthWindow *window, + return; + } + ++ gtk_widget_set_vexpand (child, FALSE); + gtk_grid_attach (GTK_GRID (window->priv->grid), + child, + 0, position, +@@ -362,6 +363,7 @@ gth_window_attach_content (GthWindow *window, + + _gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL); + gtk_widget_set_hexpand (child, TRUE); ++ gtk_widget_set_vexpand (child, TRUE); + gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child); + } + +-- +cgit v0.9.2 -- cgit v1.2.3-54-g00ecf