[arch-commits] Commit in gthumb/repos (12 files)

Jan Steffens heftig at archlinux.org
Tue Apr 14 17:48:59 UTC 2015


    Date: Tuesday, April 14, 2015 @ 19:48:59
  Author: heftig
Revision: 236552

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gthumb/repos/extra-i686/PKGBUILD
    (from rev 236551, gthumb/trunk/PKGBUILD)
  gthumb/repos/extra-i686/gthumb.install
    (from rev 236551, gthumb/trunk/gthumb.install)
  gthumb/repos/extra-i686/webkit2gtk-4.0.patch
    (from rev 236551, gthumb/trunk/webkit2gtk-4.0.patch)
  gthumb/repos/extra-x86_64/PKGBUILD
    (from rev 236551, gthumb/trunk/PKGBUILD)
  gthumb/repos/extra-x86_64/gthumb.install
    (from rev 236551, gthumb/trunk/gthumb.install)
  gthumb/repos/extra-x86_64/webkit2gtk-4.0.patch
    (from rev 236551, gthumb/trunk/webkit2gtk-4.0.patch)
Deleted:
  gthumb/repos/extra-i686/PKGBUILD
  gthumb/repos/extra-i686/gthumb.install
  gthumb/repos/extra-i686/webkit2gtk-4.0.patch
  gthumb/repos/extra-x86_64/PKGBUILD
  gthumb/repos/extra-x86_64/gthumb.install
  gthumb/repos/extra-x86_64/webkit2gtk-4.0.patch

-----------------------------------+
 /PKGBUILD                         |  104 ++++++++++++++++++++++++++++++++++++
 /gthumb.install                   |   38 +++++++++++++
 /webkit2gtk-4.0.patch             |   62 +++++++++++++++++++++
 extra-i686/PKGBUILD               |   56 -------------------
 extra-i686/gthumb.install         |   19 ------
 extra-i686/webkit2gtk-4.0.patch   |   31 ----------
 extra-x86_64/PKGBUILD             |   56 -------------------
 extra-x86_64/gthumb.install       |   19 ------
 extra-x86_64/webkit2gtk-4.0.patch |   31 ----------
 9 files changed, 204 insertions(+), 212 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-04-14 17:47:15 UTC (rev 236551)
+++ extra-i686/PKGBUILD	2015-04-14 17:48:59 UTC (rev 236552)
@@ -1,56 +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.8
-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 webkit2gtk json-glib)
-makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg
-             libopenraw liboauth docbook-xsl yelp-tools gnome-common)
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'liboauth: web albums')
-options=('!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        webkit2gtk-4.0.patch)
-sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8'
-            '0174bdff5d193962d52cb018f233570b8f18a740281f51b79bc52f18c4e9a929')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../webkit2gtk-4.0.patch
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
-}
-
-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/extra-i686/PKGBUILD (from rev 236551, gthumb/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-04-14 17:48:59 UTC (rev 236552)
@@ -0,0 +1,52 @@
+# $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.4.0
+pkgrel=1
+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 webkit2gtk json-glib)
+makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth
+             docbook-xsl yelp-tools gnome-common flex)
+optdepends=('libraw: read RAW files'
+            'exiv2: metadata support'
+            'libchamplain: map viewer'
+            'brasero: burn discs'
+            'liboauth: web albums')
+options=('!emptydirs')
+install=gthumb.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('abd1afe457c65289af31c6db7037452faa3838356480857d8cdc19f0ecde4933')
+
+prepare() {
+  cd $pkgname-$pkgver
+}
+
+build() {
+  cd $pkgname-$pkgver
+  
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --enable-libchamplain
+  
+  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: extra-i686/gthumb.install
===================================================================
--- extra-i686/gthumb.install	2015-04-14 17:47:15 UTC (rev 236551)
+++ extra-i686/gthumb.install	2015-04-14 17:48:59 UTC (rev 236552)
@@ -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/extra-i686/gthumb.install (from rev 236551, gthumb/trunk/gthumb.install)
===================================================================
--- extra-i686/gthumb.install	                        (rev 0)
+++ extra-i686/gthumb.install	2015-04-14 17:48:59 UTC (rev 236552)
@@ -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
+}

Deleted: extra-i686/webkit2gtk-4.0.patch
===================================================================
--- extra-i686/webkit2gtk-4.0.patch	2015-04-14 17:47:15 UTC (rev 236551)
+++ extra-i686/webkit2gtk-4.0.patch	2015-04-14 17:48:59 UTC (rev 236552)
@@ -1,31 +0,0 @@
-From 4c64cb990fc1e32e269571b34065d7aa8d92c79e Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar at opensuse.org>
-Date: Fri, 15 Aug 2014 16:47:27 +0200
-Subject: Build against either webkit2gtk-3.0 or webkit2gtk-4.0
-
-The API changes were minor and none affected gthumb.
-
-diff --git a/configure.ac b/configure.ac
-index 6f9f03e..da246f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -508,10 +508,14 @@ AC_ARG_ENABLE([webkit2],
- 
- if test x$enable_webkit2 = xyes ; then
- 	PKG_CHECK_MODULES(WEBKIT2,
--			  [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
-+			  [webkit2gtk-4.0 >= $WEBKIT2_REQUIRED],
- 			  [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
- 			   enable_webkit2=yes],
--			  [enable_webkit2=no])
-+			  [PKG_CHECK_MODULES(WEBKIT2,
-+					     [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
-+					     [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
-+					      enable_webkit2=yes],
-+					     [enable_webkit2=no])])
- fi
- AC_SUBST(WEBKIT2_CFLAGS)
- AC_SUBST(WEBKIT2_LIBS)
--- 
-cgit v0.10.1
-

Copied: gthumb/repos/extra-i686/webkit2gtk-4.0.patch (from rev 236551, gthumb/trunk/webkit2gtk-4.0.patch)
===================================================================
--- extra-i686/webkit2gtk-4.0.patch	                        (rev 0)
+++ extra-i686/webkit2gtk-4.0.patch	2015-04-14 17:48:59 UTC (rev 236552)
@@ -0,0 +1,31 @@
+From 4c64cb990fc1e32e269571b34065d7aa8d92c79e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Fri, 15 Aug 2014 16:47:27 +0200
+Subject: Build against either webkit2gtk-3.0 or webkit2gtk-4.0
+
+The API changes were minor and none affected gthumb.
+
+diff --git a/configure.ac b/configure.ac
+index 6f9f03e..da246f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -508,10 +508,14 @@ AC_ARG_ENABLE([webkit2],
+ 
+ if test x$enable_webkit2 = xyes ; then
+ 	PKG_CHECK_MODULES(WEBKIT2,
+-			  [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
++			  [webkit2gtk-4.0 >= $WEBKIT2_REQUIRED],
+ 			  [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
+ 			   enable_webkit2=yes],
+-			  [enable_webkit2=no])
++			  [PKG_CHECK_MODULES(WEBKIT2,
++					     [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
++					     [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
++					      enable_webkit2=yes],
++					     [enable_webkit2=no])])
+ fi
+ AC_SUBST(WEBKIT2_CFLAGS)
+ AC_SUBST(WEBKIT2_LIBS)
+-- 
+cgit v0.10.1
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-04-14 17:47:15 UTC (rev 236551)
+++ extra-x86_64/PKGBUILD	2015-04-14 17:48:59 UTC (rev 236552)
@@ -1,56 +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.8
-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 webkit2gtk json-glib)
-makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg
-             libopenraw liboauth docbook-xsl yelp-tools gnome-common)
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'liboauth: web albums')
-options=('!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        webkit2gtk-4.0.patch)
-sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8'
-            '0174bdff5d193962d52cb018f233570b8f18a740281f51b79bc52f18c4e9a929')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../webkit2gtk-4.0.patch
-  AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
-}
-
-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/extra-x86_64/PKGBUILD (from rev 236551, gthumb/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-04-14 17:48:59 UTC (rev 236552)
@@ -0,0 +1,52 @@
+# $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.4.0
+pkgrel=1
+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 webkit2gtk json-glib)
+makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth
+             docbook-xsl yelp-tools gnome-common flex)
+optdepends=('libraw: read RAW files'
+            'exiv2: metadata support'
+            'libchamplain: map viewer'
+            'brasero: burn discs'
+            'liboauth: web albums')
+options=('!emptydirs')
+install=gthumb.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('abd1afe457c65289af31c6db7037452faa3838356480857d8cdc19f0ecde4933')
+
+prepare() {
+  cd $pkgname-$pkgver
+}
+
+build() {
+  cd $pkgname-$pkgver
+  
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --enable-libchamplain
+  
+  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: extra-x86_64/gthumb.install
===================================================================
--- extra-x86_64/gthumb.install	2015-04-14 17:47:15 UTC (rev 236551)
+++ extra-x86_64/gthumb.install	2015-04-14 17:48:59 UTC (rev 236552)
@@ -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/extra-x86_64/gthumb.install (from rev 236551, gthumb/trunk/gthumb.install)
===================================================================
--- extra-x86_64/gthumb.install	                        (rev 0)
+++ extra-x86_64/gthumb.install	2015-04-14 17:48:59 UTC (rev 236552)
@@ -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
+}

Deleted: extra-x86_64/webkit2gtk-4.0.patch
===================================================================
--- extra-x86_64/webkit2gtk-4.0.patch	2015-04-14 17:47:15 UTC (rev 236551)
+++ extra-x86_64/webkit2gtk-4.0.patch	2015-04-14 17:48:59 UTC (rev 236552)
@@ -1,31 +0,0 @@
-From 4c64cb990fc1e32e269571b34065d7aa8d92c79e Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar at opensuse.org>
-Date: Fri, 15 Aug 2014 16:47:27 +0200
-Subject: Build against either webkit2gtk-3.0 or webkit2gtk-4.0
-
-The API changes were minor and none affected gthumb.
-
-diff --git a/configure.ac b/configure.ac
-index 6f9f03e..da246f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -508,10 +508,14 @@ AC_ARG_ENABLE([webkit2],
- 
- if test x$enable_webkit2 = xyes ; then
- 	PKG_CHECK_MODULES(WEBKIT2,
--			  [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
-+			  [webkit2gtk-4.0 >= $WEBKIT2_REQUIRED],
- 			  [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
- 			   enable_webkit2=yes],
--			  [enable_webkit2=no])
-+			  [PKG_CHECK_MODULES(WEBKIT2,
-+					     [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
-+					     [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
-+					      enable_webkit2=yes],
-+					     [enable_webkit2=no])])
- fi
- AC_SUBST(WEBKIT2_CFLAGS)
- AC_SUBST(WEBKIT2_LIBS)
--- 
-cgit v0.10.1
-

Copied: gthumb/repos/extra-x86_64/webkit2gtk-4.0.patch (from rev 236551, gthumb/trunk/webkit2gtk-4.0.patch)
===================================================================
--- extra-x86_64/webkit2gtk-4.0.patch	                        (rev 0)
+++ extra-x86_64/webkit2gtk-4.0.patch	2015-04-14 17:48:59 UTC (rev 236552)
@@ -0,0 +1,31 @@
+From 4c64cb990fc1e32e269571b34065d7aa8d92c79e Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Fri, 15 Aug 2014 16:47:27 +0200
+Subject: Build against either webkit2gtk-3.0 or webkit2gtk-4.0
+
+The API changes were minor and none affected gthumb.
+
+diff --git a/configure.ac b/configure.ac
+index 6f9f03e..da246f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -508,10 +508,14 @@ AC_ARG_ENABLE([webkit2],
+ 
+ if test x$enable_webkit2 = xyes ; then
+ 	PKG_CHECK_MODULES(WEBKIT2,
+-			  [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
++			  [webkit2gtk-4.0 >= $WEBKIT2_REQUIRED],
+ 			  [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
+ 			   enable_webkit2=yes],
+-			  [enable_webkit2=no])
++			  [PKG_CHECK_MODULES(WEBKIT2,
++					     [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
++					     [AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
++					      enable_webkit2=yes],
++					     [enable_webkit2=no])])
+ fi
+ AC_SUBST(WEBKIT2_CFLAGS)
+ AC_SUBST(WEBKIT2_LIBS)
+-- 
+cgit v0.10.1
+



More information about the arch-commits mailing list