From 8e1304bd070b94f2ebc3ab6d6a5cad7b6594e9c5 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sat, 20 Jan 2018 05:56:39 +0100 Subject: nonprism/gthumb: updated to 3.6.0 --- nonprism/gthumb/PKGBUILD | 33 +++++------ nonprism/gthumb/nonprism.patch | 128 ++++++----------------------------------- 2 files changed, 33 insertions(+), 128 deletions(-) (limited to 'nonprism') diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD index a0c21d66e..1866fe54a 100644 --- a/nonprism/gthumb/PKGBUILD +++ b/nonprism/gthumb/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 288880 2017-02-13 13:39:34Z jgc $ +# $Id$ # Maintainer (Arch): Jan Alexander Steffens (heftig) # Contributor (Arch): Jan de Groot # Contributor (Arch): Tobias Kieslich -# Maintainer: André Silva +# Contributor: Andreas Grapentin +# Contributor: André Silva # Contributor: Márcio Silva +# parabola changes and rationale: +# - removed support for possibly unsafe protocols + pkgname=gthumb -pkgver=3.4.4.1 -pkgrel=3.nonprism1 +pkgver=3.6.0 +pkgrel=1.nonprism1 pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols" url="https://wiki.gnome.org/Apps/gthumb" -arch=(i686 x86_64) +arch=(x86_64 i686 armv7h) license=(GPL) -replaces=(${pkgname}-nonprism) -conflicts=(${pkgname}-nonprism) depends=(dconf librsvg clutter-gtk gst-plugins-base-libs gsettings-desktop-schemas libwebp - libsecret libsoup webkit2gtk json-glib) + libsecret libsoup webkit2gtk json-glib gtk3-print-backends) makedepends=(intltool libchamplain exiv2 itstool brasero libraw liboauth docbook-xsl yelp-tools flex gnome-common git) +options=(debug !strip) optdepends=('libraw: read RAW files' 'exiv2: metadata support' 'libchamplain: map viewer' 'brasero: burn discs' 'liboauth: web albums') -_commit=849e68f5ba606c25988a1e9e6669519734a7449a # gthumb-3-4 +_commit=9645b9dd5892a1bde68bfed38c2a07dd017b37c4 # tags/3.6.0^0 source=("git+https://git.gnome.org/browse/gthumb#commit=$_commit" - 0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch nonprism.patch) sha256sums=('SKIP' - '9cdffadd2b2c21904a997b4ab4ef311c18a59dfa6a3b236570af7f1465a36c60' - 'b1cd2463ab6475ce91a2b2e83dfcb1835ffaa9640c59d7bcfbe611163327fa45') + 'cdc1c15a5c62f3b6ae26f26badbcdb0a2e6dacac2b46037643a919065e8221a4') pkgver() { cd $pkgname @@ -38,22 +39,16 @@ pkgver() { prepare() { cd $pkgname - # Fixup tags for pkgver() - git tag -f 3.4.4.1 849e68f5ba606c25988a1e9e6669519734a7449a - NOCONFIGURE=1 ./autogen.sh - patch -Np1 -i ../0001-Do-not-process-bitmap-thumbnails-with-invalid-color-.patch patch -Np1 -i ../nonprism.patch + NOCONFIGURE=1 ./autogen.sh } build() { cd $pkgname - ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-libchamplain - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make } diff --git a/nonprism/gthumb/nonprism.patch b/nonprism/gthumb/nonprism.patch index 5c8374b51..6e953d5bd 100644 --- a/nonprism/gthumb/nonprism.patch +++ b/nonprism/gthumb/nonprism.patch @@ -2,81 +2,25 @@ diff -Nur gthumb-3.2.7.orig/data/Makefile.am gthumb-3.2.7/data/Makefile.am --- gthumb-3.2.7.orig/data/Makefile.am 2013-04-30 13:56:12.000000000 -0300 +++ gthumb-3.2.7/data/Makefile.am 2014-04-19 12:30:38.520987588 -0300 @@ -16,15 +16,12 @@ - org.gnome.gthumb.contact-sheet.gschema.xml.in \ - org.gnome.gthumb.convert-format.gschema.xml.in \ - org.gnome.gthumb.crop.gschema.xml.in \ -- org.gnome.gthumb.facebook.gschema.xml.in \ - org.gnome.gthumb.file-manager.gschema.xml.in \ -- org.gnome.gthumb.flickr.gschema.xml.in \ - org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ - org.gnome.gthumb.image-print.gschema.xml.in \ - org.gnome.gthumb.image-viewer.gschema.xml.in \ - org.gnome.gthumb.importer.gschema.xml.in \ - org.gnome.gthumb.photo-importer.gschema.xml.in \ -- org.gnome.gthumb.picasaweb.gschema.xml.in \ - org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ - org.gnome.gthumb.rename-series.gschema.xml.in \ - org.gnome.gthumb.resize.gschema.xml.in \ -diff -Nur gthumb-3.4.0.orig/data/Makefile.in gthumb-3.4.0/data/Makefile.in ---- gthumb-3.4.0.orig/data/Makefile.in 2015-04-14 12:12:24.000000000 -0300 -+++ gthumb-3.4.0/data/Makefile.in 2015-04-15 03:26:24.760821523 -0300 -@@ -445,15 +445,12 @@ - org.gnome.gthumb.contact-sheet.gschema.xml.in \ - org.gnome.gthumb.convert-format.gschema.xml.in \ - org.gnome.gthumb.crop.gschema.xml.in \ -- org.gnome.gthumb.facebook.gschema.xml.in \ - org.gnome.gthumb.file-manager.gschema.xml.in \ -- org.gnome.gthumb.flickr.gschema.xml.in \ - org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ - org.gnome.gthumb.image-print.gschema.xml.in \ - org.gnome.gthumb.image-viewer.gschema.xml.in \ - org.gnome.gthumb.importer.gschema.xml.in \ - org.gnome.gthumb.photo-importer.gschema.xml.in \ -- org.gnome.gthumb.picasaweb.gschema.xml.in \ - org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ - org.gnome.gthumb.rename-series.gschema.xml.in \ - org.gnome.gthumb.resize.gschema.xml.in \ -diff -Nur gthumb-3.2.7.orig/data/gthumb.convert gthumb-3.2.7/data/gthumb.convert ---- gthumb-3.2.7.orig/data/gthumb.convert 2013-04-30 13:56:12.000000000 -0300 -+++ gthumb-3.2.7/data/gthumb.convert 2014-04-19 12:55:21.982561697 -0300 -@@ -79,9 +79,6 @@ - [org.gnome.gthumb.dialogs.add-to-catalog] - view = /apps/gthumb/general/add_to_catalog/view - --[org.gnome.gthumb.facebook] --max-resolution = /apps/gthumb/ext/facebook/max_resolution -- - [org.gnome.gthumb.file-manager] - last-folder = /apps/gthumb/ext/file_manager/copy_move/last_folder - view-destination = /apps/gthumb/ext/file_manager/copy_move/view_destination -@@ -125,9 +122,6 @@ - delete-from-device = /apps/gthumb/ext/photo_importer/delete_from_device - adjust-orientation = /apps/gthumb/ext/photo_importer/adjust_orientation - --[org.gnome.gthumb.picasaweb] --synchronize = /apps/gthumb/ext/picasaweb/synchronize -- - [org.gnome.gthumb.pixbuf-savers.jpeg] - default-ext = /apps/gthumb/save_options/jpeg/default_ext - quality = /apps/gthumb/save_options/jpeg/quality + org.gnome.gthumb.contact-sheet.gschema.xml \ + org.gnome.gthumb.convert-format.gschema.xml \ + org.gnome.gthumb.crop.gschema.xml \ +- org.gnome.gthumb.facebook.gschema.xml \ + org.gnome.gthumb.file-manager.gschema.xml \ +- org.gnome.gthumb.flickr.gschema.xml \ + org.gnome.gthumb.gstreamer-tools.gschema.xml \ + org.gnome.gthumb.image-print.gschema.xml \ + org.gnome.gthumb.image-viewer.gschema.xml \ + org.gnome.gthumb.importer.gschema.xml \ + org.gnome.gthumb.photo-importer.gschema.xml \ +- org.gnome.gthumb.picasaweb.gschema.xml \ + org.gnome.gthumb.pixbuf-savers.gschema.xml \ + org.gnome.gthumb.rename-series.gschema.xml \ + org.gnome.gthumb.resize.gschema.xml \ diff -Nur gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.am --- gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.am 2015-03-30 17:08:32.000000000 -0300 +++ gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.am 2015-04-15 03:27:36.753875539 -0300 -@@ -42,10 +42,6 @@ - map-symbolic.svg \ - palette-symbolic.svg \ - presets-symbolic.svg \ -- site-facebook.png \ -- site-flickr.png \ -- site-photobucket.png \ -- site-picasaweb.png \ - site-twentythree.png \ - special-effects-symbolic.svg \ - swap-values-symbolic.svg \ -diff -Nur gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.in ---- gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.in 2015-04-14 12:12:24.000000000 -0300 -+++ gthumb-3.4.0/data/icons/hicolor/16x16/actions/Makefile.in 2015-04-15 03:28:08.005640761 -0300 -@@ -406,10 +406,6 @@ +@@ -43,10 +43,6 @@ map-symbolic.svg \ palette-symbolic.svg \ presets-symbolic.svg \ @@ -90,7 +34,7 @@ diff -Nur gthumb-3.4.0.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb- diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makefile.am --- gthumb-3.2.7.orig/extensions/Makefile.am 2013-04-30 13:56:12.000000000 -0300 +++ gthumb-3.2.7/extensions/Makefile.am 2014-04-19 13:12:36.788627648 -0300 -@@ -4,18 +4,14 @@ +@@ -4,17 +4,14 @@ FLICKR_EXPORTERS = \ 23hq \ @@ -104,37 +48,14 @@ diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makef - facebook \ flicker_utils \ $(FLICKR_EXPORTERS) \ -- photobucket \ - picasaweb \ webalbums \ $(NULL) -diff -Nur gthumb-3.4.0.orig/extensions/Makefile.in gthumb-3.4.0/extensions/Makefile.in ---- gthumb-3.4.0.orig/extensions/Makefile.in 2015-04-14 12:12:24.000000000 -0300 -+++ gthumb-3.4.0/extensions/Makefile.in 2015-04-15 03:26:24.760821523 -0300 -@@ -400,18 +400,14 @@ - - FLICKR_EXPORTERS = \ - 23hq \ -- flicker \ - $(NULL) - - EXPORTERS = \ - export_tools \ - burn_disc \ - contact_sheet \ -- facebook \ - flicker_utils \ - $(FLICKR_EXPORTERS) \ -- photobucket \ -- picasaweb \ - webalbums \ - $(NULL) - diff -Nur gthumb-3.4.0.orig/gthumb/gth-main.c gthumb-3.4.0/gthumb/gth-main.c --- gthumb-3.4.0.orig/gthumb/gth-main.c 2015-04-04 16:27:06.000000000 -0300 +++ gthumb-3.4.0/gthumb/gth-main.c 2015-04-15 03:29:03.749510547 -0300 -@@ -1221,10 +1221,8 @@ +@@ -1233,10 +1233,8 @@ "desktop_background", "edit_metadata", "exiv2_tools", @@ -145,7 +66,7 @@ diff -Nur gthumb-3.4.0.orig/gthumb/gth-main.c gthumb-3.4.0/gthumb/gth-main.c "gstreamer_tools", "gstreamer_utils", "image_print", -@@ -1234,8 +1232,6 @@ +@@ -1246,8 +1244,6 @@ "list_tools", "oauth", "photo_importer", @@ -165,14 +86,3 @@ diff -Nur gthumb-3.2.7.orig/help/Makefile.am gthumb-3.2.7/help/Makefile.am wallpaper.page \ bookmarks.page \ import.page \ -diff -Nur gthumb-3.4.0.orig/help/Makefile.in gthumb-3.4.0/help/Makefile.in ---- gthumb-3.4.0.orig/help/Makefile.in 2015-04-14 12:12:28.000000000 -0300 -+++ gthumb-3.4.0/help/Makefile.in 2015-04-15 03:26:24.760821523 -0300 -@@ -363,7 +363,6 @@ - printing.page \ - shortcuts.page \ - sharing-disc.page \ -- sharing-social.page \ - wallpaper.page \ - bookmarks.page \ - import.page \ -- cgit v1.2.3