[arch-commits] Commit in gthumb/repos (10 files)
Jan Steffens
heftig at nymeria.archlinux.org
Sat Sep 28 04:26:56 UTC 2013
Date: Saturday, September 28, 2013 @ 06:26:55
Author: heftig
Revision: 195222
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
gthumb/repos/gnome-unstable-i686/PKGBUILD
(from rev 195221, gthumb/trunk/PKGBUILD)
gthumb/repos/gnome-unstable-i686/gthumb.install
(from rev 195221, gthumb/trunk/gthumb.install)
gthumb/repos/gnome-unstable-i686/gtk310.patch
(from rev 195221, gthumb/trunk/gtk310.patch)
gthumb/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 195221, gthumb/trunk/PKGBUILD)
gthumb/repos/gnome-unstable-x86_64/gthumb.install
(from rev 195221, gthumb/trunk/gthumb.install)
gthumb/repos/gnome-unstable-x86_64/gtk310.patch
(from rev 195221, gthumb/trunk/gtk310.patch)
Deleted:
gthumb/repos/gnome-unstable-i686/PKGBUILD
gthumb/repos/gnome-unstable-i686/gthumb.install
gthumb/repos/gnome-unstable-x86_64/PKGBUILD
gthumb/repos/gnome-unstable-x86_64/gthumb.install
--------------------------------------+
/PKGBUILD | 108 +++++++++++++++++++++++++++++++++
/gthumb.install | 38 +++++++++++
gnome-unstable-i686/PKGBUILD | 47 --------------
gnome-unstable-i686/gthumb.install | 19 -----
gnome-unstable-i686/gtk310.patch | 29 ++++++++
gnome-unstable-x86_64/PKGBUILD | 47 --------------
gnome-unstable-x86_64/gthumb.install | 19 -----
gnome-unstable-x86_64/gtk310.patch | 29 ++++++++
8 files changed, 204 insertions(+), 132 deletions(-)
Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD 2013-09-28 04:25:23 UTC (rev 195221)
+++ gnome-unstable-i686/PKGBUILD 2013-09-28 04:26:55 UTC (rev 195222)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-
-pkgname=gthumb
-pkgver=3.2.3
-pkgrel=2
-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 webkitgtk json-glib)
-makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
-optdepends=('libopenraw: read RAW files'
- 'exiv2: metadata support'
- 'libchamplain: map viewer'
- 'brasero: burn discs'
- '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')
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-libchamplain --enable-libopenraw
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gthumb/repos/gnome-unstable-i686/PKGBUILD (from rev 195221, gthumb/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2013-09-28 04:26:55 UTC (rev 195222)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+
+pkgname=gthumb
+pkgver=3.2.3
+pkgrel=3
+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 webkitgtk json-glib)
+makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
+optdepends=('libopenraw: read RAW files'
+ 'exiv2: metadata support'
+ 'libchamplain: map viewer'
+ 'brasero: burn discs'
+ 'liboauth: web albums')
+options=('!libtool' '!emptydirs')
+install=gthumb.install
+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
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-libchamplain --enable-libopenraw
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: gnome-unstable-i686/gthumb.install
===================================================================
--- gnome-unstable-i686/gthumb.install 2013-09-28 04:25:23 UTC (rev 195221)
+++ gnome-unstable-i686/gthumb.install 2013-09-28 04:26:55 UTC (rev 195222)
@@ -1,19 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.1) < 0 )); then
- gconfpkg --uninstall gthumb
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gthumb/repos/gnome-unstable-i686/gthumb.install (from rev 195221, gthumb/trunk/gthumb.install)
===================================================================
--- gnome-unstable-i686/gthumb.install (rev 0)
+++ gnome-unstable-i686/gthumb.install 2013-09-28 04:26:55 UTC (rev 195222)
@@ -0,0 +1,19 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 2.90.1) < 0 )); then
+ gconfpkg --uninstall gthumb
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gthumb/repos/gnome-unstable-i686/gtk310.patch (from rev 195221, gthumb/trunk/gtk310.patch)
===================================================================
--- gnome-unstable-i686/gtk310.patch (rev 0)
+++ gnome-unstable-i686/gtk310.patch 2013-09-28 04:26:55 UTC (rev 195222)
@@ -0,0 +1,29 @@
+From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac at src.gnome.org>
+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
Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD 2013-09-28 04:25:23 UTC (rev 195221)
+++ gnome-unstable-x86_64/PKGBUILD 2013-09-28 04:26:55 UTC (rev 195222)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-
-pkgname=gthumb
-pkgver=3.2.3
-pkgrel=2
-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 webkitgtk json-glib)
-makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
-optdepends=('libopenraw: read RAW files'
- 'exiv2: metadata support'
- 'libchamplain: map viewer'
- 'brasero: burn discs'
- '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')
-
-build() {
- cd $pkgname-$pkgver
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-libchamplain --enable-libopenraw
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gthumb/repos/gnome-unstable-x86_64/PKGBUILD (from rev 195221, gthumb/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2013-09-28 04:26:55 UTC (rev 195222)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+
+pkgname=gthumb
+pkgver=3.2.3
+pkgrel=3
+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 webkitgtk json-glib)
+makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
+optdepends=('libopenraw: read RAW files'
+ 'exiv2: metadata support'
+ 'libchamplain: map viewer'
+ 'brasero: burn discs'
+ 'liboauth: web albums')
+options=('!libtool' '!emptydirs')
+install=gthumb.install
+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
+
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-libchamplain --enable-libopenraw
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: gnome-unstable-x86_64/gthumb.install
===================================================================
--- gnome-unstable-x86_64/gthumb.install 2013-09-28 04:25:23 UTC (rev 195221)
+++ gnome-unstable-x86_64/gthumb.install 2013-09-28 04:26:55 UTC (rev 195222)
@@ -1,19 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if (( $(vercmp $2 2.90.1) < 0 )); then
- gconfpkg --uninstall gthumb
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: gthumb/repos/gnome-unstable-x86_64/gthumb.install (from rev 195221, gthumb/trunk/gthumb.install)
===================================================================
--- gnome-unstable-x86_64/gthumb.install (rev 0)
+++ gnome-unstable-x86_64/gthumb.install 2013-09-28 04:26:55 UTC (rev 195222)
@@ -0,0 +1,19 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if (( $(vercmp $2 2.90.1) < 0 )); then
+ gconfpkg --uninstall gthumb
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: gthumb/repos/gnome-unstable-x86_64/gtk310.patch (from rev 195221, gthumb/trunk/gtk310.patch)
===================================================================
--- gnome-unstable-x86_64/gtk310.patch (rev 0)
+++ gnome-unstable-x86_64/gtk310.patch 2013-09-28 04:26:55 UTC (rev 195222)
@@ -0,0 +1,29 @@
+From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac at src.gnome.org>
+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
More information about the arch-commits
mailing list