[arch-commits] Commit in geeqie/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Tue Jan 2 23:43:48 UTC 2018
Date: Tuesday, January 2, 2018 @ 23:43:47
Author: arojas
Revision: 313933
archrelease: copy trunk to extra-x86_64
Added:
geeqie/repos/extra-x86_64/PKGBUILD
(from rev 313932, geeqie/trunk/PKGBUILD)
geeqie/repos/extra-x86_64/geeqie-no-changelog.patch
(from rev 313932, geeqie/trunk/geeqie-no-changelog.patch)
Deleted:
geeqie/repos/extra-x86_64/0001-Work-around-changed-c-11-std-string-implementation.patch
geeqie/repos/extra-x86_64/PKGBUILD
---------------------------------------------------------------+
0001-Work-around-changed-c-11-std-string-implementation.patch | 66 --------
PKGBUILD | 76 ++++------
geeqie-no-changelog.patch | 14 +
3 files changed, 51 insertions(+), 105 deletions(-)
Deleted: 0001-Work-around-changed-c-11-std-string-implementation.patch
===================================================================
--- 0001-Work-around-changed-c-11-std-string-implementation.patch 2018-01-02 23:43:24 UTC (rev 313932)
+++ 0001-Work-around-changed-c-11-std-string-implementation.patch 2018-01-02 23:43:47 UTC (rev 313933)
@@ -1,66 +0,0 @@
-From 0b044d1d685307e5755917e31d56a1a3104cd505 Mon Sep 17 00:00:00 2001
-From: David Kalnischkies <david at kalnischkies.de>
-Date: Fri, 27 May 2016 12:04:40 +0100
-Subject: [PATCH] Work around changed c++11 std::string implementation
-
-Bug was already partly fixed by 96db62d but there was even more
-positions that was unseen by Solomon.
-
-The patch is originally from Debian bug report #800350.
-
-Signed-off-by: Klaus Ethgen <Klaus at Ethgen.de>
----
- src/exiv2.cc | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/exiv2.cc b/src/exiv2.cc
-index 1dbe1182..49b8e07c 100644
---- a/src/exiv2.cc
-+++ b/src/exiv2.cc
-@@ -25,6 +25,7 @@
- #include <exiv2/image.hpp>
- #include <exiv2/exif.hpp>
- #include <iostream>
-+#include <string>
-
- // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer.
- #ifndef EXIV2_TEST_VERSION
-@@ -1140,8 +1141,9 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
-
- if (!exif->image()) return NULL;
-
-+ std::string const path = exif->image()->io().path();
- /* given image pathname, first do simple (and fast) file extension test */
-- gboolean is_raw = filter_file_class(exif->image()->io().path().c_str(), FORMAT_CLASS_RAWIMAGE);
-+ gboolean is_raw = filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE);
-
- if (!is_raw && requested_width == 0) return NULL;
-
-@@ -1241,10 +1243,10 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
- if (!exif) return NULL;
- if (!exif->image()) return NULL;
-
-- const char* path = exif->image()->io().path().c_str();
-+ std::string const path = exif->image()->io().path();
-
- /* given image pathname, first do simple (and fast) file extension test */
-- if (!filter_file_class(path, FORMAT_CLASS_RAWIMAGE)) return NULL;
-+ if (!filter_file_class(path.c_str(), FORMAT_CLASS_RAWIMAGE)) return NULL;
-
- try {
- struct stat st;
-@@ -1255,9 +1257,9 @@ extern "C" guchar *exif_get_preview(ExifData *exif, guint *data_len, gint reques
-
- RawFile rf(exif->image()->io());
- offset = rf.preview_offset();
-- DEBUG_1("%s: offset %lu", path, offset);
-+ DEBUG_1("%s: offset %lu", path.c_str(), offset);
-
-- fd = open(path, O_RDONLY);
-+ fd = open(path.c_str(), O_RDONLY);
- if (fd == -1)
- {
- return NULL;
---
-2.13.2
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-02 23:43:24 UTC (rev 313932)
+++ PKGBUILD 2018-01-02 23:43:47 UTC (rev 313933)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-
-pkgname=geeqie
-pkgver=1.3
-pkgrel=3
-pkgdesc="A lightweight image browser and viewer"
-arch=('i686' 'x86_64')
-url="http://www.geeqie.org/"
-license=('GPL2')
-depends=('exiv2' 'gtk2' 'lcms')
-makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'git')
-optdepends=('librsvg: SVG rendering'
- 'fbida: for jpeg rotation'
- 'exiv2: for tiff and png rotation')
-validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C')
-source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz{,.asc}
- 0001-Work-around-changed-c-11-std-string-implementation.patch)
-sha1sums=('f991b44d8587f2f42d5793700c5f6882bed6abf9'
- 'SKIP'
- '45dea6145ab6d74ed69a81a6e5871300f51450eb')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../0001-Work-around-changed-c-11-std-string-implementation.patch
- ./autogen.sh
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: geeqie/repos/extra-x86_64/PKGBUILD (from rev 313932, geeqie/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-02 23:43:47 UTC (rev 313933)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+
+pkgname=geeqie
+pkgver=1.4
+pkgrel=1
+pkgdesc="A lightweight image browser and viewer"
+arch=('x86_64')
+url="http://www.geeqie.org/"
+license=('GPL2')
+depends=('exiv2' 'clutter-gtk' 'lcms' 'ffmpegthumbnailer')
+makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'python')
+optdepends=('librsvg: SVG rendering'
+ 'fbida: for jpeg rotation')
+validpgpkeys=('85D4CA42952C949B175362B379D0B06F4E20AF1C')
+source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz{,.asc} geeqie-no-changelog.patch)
+sha1sums=('bef0e6c6a0aba8b957375087bcb570cb9dac64b1'
+ 'SKIP'
+ '9681536c6063e4f8869ac99d174b39b4ae9309f5')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../geeqie-no-changelog.patch # Workaround missing changelog (Fedora)
+ ./autogen.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: geeqie/repos/extra-x86_64/geeqie-no-changelog.patch (from rev 313932, geeqie/trunk/geeqie-no-changelog.patch)
===================================================================
--- geeqie-no-changelog.patch (rev 0)
+++ geeqie-no-changelog.patch 2018-01-02 23:43:47 UTC (rev 313933)
@@ -0,0 +1,14 @@
+--- geeqie-1.4.orig/Makefile.am 2017-12-31 07:31:21.000000000 -0500
++++ geeqie-1.4/Makefile.am 2018-01-01 15:05:58.742068166 -0500
+@@ -10,9 +10,9 @@
+ readmedir = @readmedir@
+
+ if HAVE_MARKDOWN
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS README.html
+ else
+-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
++readme_DATA = README.md COPYING TODO README.lirc AUTHORS
+ endif
+
+ desktopdir = $(datadir)/applications
More information about the arch-commits
mailing list