Date: Wednesday, January 18, 2023 @ 14:23:38
Author: heftig
Revision: 466910
archrelease: copy trunk to extra-x86_64
Added:
gthumb/repos/extra-x86_64/PKGBUILD
(from rev 466908, gthumb/trunk/PKGBUILD)
Deleted:
gthumb/repos/extra-x86_64/PKGBUILD
gthumb/repos/extra-x86_64/gthumb-libraw-0.21.patch
--------------------------+
PKGBUILD | 96 ++++++++++++++++++++++-----------------------
gthumb-libraw-0.21.patch | 35 ----------------
2 files changed, 48 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-18 14:23:37 UTC (rev 466909)
+++ PKGBUILD 2023-01-18 14:23:38 UTC (rev 466910)
@@ -1,48 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-# Contributor: Jan de Groot <[email protected]>
-# Contributor: Tobias Kieslich <[email protected]>
-
-pkgname=gthumb
-pkgver=3.12.2
-pkgrel=3
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-url="https://wiki.gnome.org/Apps/gthumb";
-arch=(x86_64)
-license=(GPL)
-depends=(dconf librsvg clutter-gtk gst-plugins-base-libs
gsettings-desktop-schemas libwebp
- libsecret libsoup webkit2gtk json-glib gst-plugin-gtk libjxl libheif)
-makedepends=(libchamplain exiv2 brasero libraw liboauth docbook-xsl yelp-tools
meson git)
-optdepends=('libraw: read RAW files'
- 'exiv2: metadata support'
- 'libchamplain: map viewer'
- 'brasero: burn discs'
- 'liboauth: web albums')
-options=(debug)
-_commit=3132c5f25ffe6f22314ab0fbfb08e63ba523afab # tags/3.12.2^0
-source=("git+https://gitlab.gnome.org/GNOME/gthumb.git#commit=$_commit";
- gthumb-libraw-0.21.patch)
-sha256sums=('SKIP'
- '6af50b3f6df26ecc2e6e288e6d4151baa3cdc2b84cdb60d76fd0062757a4d8e4')
-
-pkgver() {
- cd gthumb
- git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd gthumb
- patch -p1 < ../gthumb-libraw-0.21.patch # Fix build with libraw 0.21
-}
-
-build() {
- arch-meson gthumb build -D libchamplain=true
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
Copied: gthumb/repos/extra-x86_64/PKGBUILD (from rev 466908,
gthumb/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-01-18 14:23:38 UTC (rev 466910)
@@ -0,0 +1,48 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+# Contributor: Jan de Groot <[email protected]>
+# Contributor: Tobias Kieslich <[email protected]>
+
+pkgname=gthumb
+pkgver=3.12.2
+pkgrel=4
+pkgdesc="Image browser and viewer for the GNOME Desktop"
+url="https://wiki.gnome.org/Apps/gthumb";
+arch=(x86_64)
+license=(GPL)
+depends=(dconf librsvg clutter-gtk gst-plugins-base-libs
gsettings-desktop-schemas libwebp
+ libsecret libsoup webkit2gtk json-glib gst-plugin-gtk libjxl libheif)
+makedepends=(exiv2 brasero libraw liboauth docbook-xsl yelp-tools meson git)
+optdepends=('libraw: read RAW files'
+ 'exiv2: metadata support'
+ 'brasero: burn discs'
+ 'liboauth: web albums')
+_commit=3132c5f25ffe6f22314ab0fbfb08e63ba523afab # tags/3.12.2^0
+source=("git+https://gitlab.gnome.org/GNOME/gthumb.git#commit=$_commit";)
+sha256sums=('SKIP')
+
+pkgver() {
+ cd gthumb
+ git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd gthumb
+
+ # Fix build with libraw 0.21
+ git cherry-pick -n da0d3f22a5c3a141211d943e7d963d14090011ec
+}
+
+build() {
+ arch-meson gthumb build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: gthumb-libraw-0.21.patch
===================================================================
--- gthumb-libraw-0.21.patch 2023-01-18 14:23:37 UTC (rev 466909)
+++ gthumb-libraw-0.21.patch 2023-01-18 14:23:38 UTC (rev 466910)
@@ -1,35 +0,0 @@
-diff --git a/extensions/raw_files/gth-metadata-provider-raw.c
b/extensions/raw_files/gth-metadata-provider-raw.c
-index 2d9f5020..b03f4899 100644
---- a/extensions/raw_files/gth-metadata-provider-raw.c
-+++ b/extensions/raw_files/gth-metadata-provider-raw.c
-@@ -62,7 +62,7 @@ gth_metadata_provider_raw_read (GthMetadataProvider *self,
- if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data)))
- return;
-
-- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK |
LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
-+ raw_data = libraw_init (LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
- if (raw_data == NULL)
- goto fatal_error;
-
-diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
-index 25829c12..a6ebdc15 100644
---- a/extensions/raw_files/main.c
-+++ b/extensions/raw_files/main.c
-@@ -213,7 +213,7 @@ _cairo_image_surface_create_from_raw (GInputStream
*istream,
- size_t size;
- GthImage *image = NULL;
-
-- raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK |
LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
-+ raw_data = libraw_init (LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
- if (raw_data == NULL) {
- _libraw_set_gerror (error, errno);
- goto fatal_error;
-@@ -300,7 +300,7 @@ _cairo_image_surface_create_from_raw (GInputStream
*istream,
- if ((original_width != NULL) && (original_height != NULL)) {
- libraw_close (raw_data);
-
-- raw_data = libraw_init
(LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
-+ raw_data = libraw_init
(LIBRAW_OPIONS_NO_DATAERR_CALLBACK);
- if (raw_data == NULL)
- goto fatal_error;
-
