From 0fa5c3c25e4eb9aa7b7ad87996cb9151cc11831b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff.email> Date: Sun, 2 Oct 2022 08:03:40 +0200 Subject: Cherry-pick patch for Shotwell Viewer to open webp files --- debian/changelog | 3 +++ debian/control | 3 ++- debian/patches/0100-webp.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0100-webp.patch diff --git a/debian/changelog b/debian/changelog index 0917cfe..4bb4f4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ shotwell (0.30.17-1) UNRELEASED; urgency=medium * New upstream release. * Declare compliance with Debian Policy 4.6.1.0 (No changes needed). * Delete not used patches. + * Cherry-pick patch for Shotwell Viewer to open webp files (Closes: #1018025). + - New debian/patches/0100-webp.patch. + - debian/control: Add webp-pixbuf-loader to Build-Depends. -- Jörg Frings-Fürst <debian@jff.email> Sat, 01 Oct 2022 21:55:48 +0200 diff --git a/debian/control b/debian/control index 2fdcdb3..4a37625 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,8 @@ Build-Depends: libxml2 (>= 2.6.32), meson, ninja-build, - valac (>= 0.46.0) + valac (>= 0.46.0), + webp-pixbuf-loader Standards-Version: 4.6.1.0 Rules-Requires-Root: binary-targets Homepage: https://wiki.gnome.org/Apps/Shotwell diff --git a/debian/patches/0100-webp.patch b/debian/patches/0100-webp.patch new file mode 100644 index 0000000..2686139 --- /dev/null +++ b/debian/patches/0100-webp.patch @@ -0,0 +1,21 @@ +Description: data: Declare support for WebP and GIF in viewer +Author: Jens Georg <mail@jensge.org> +Origin: upstream, https://gitlab.gnome.org/GNOME/shotwell/-/commit/82c6707284bd590c5813691d602d87d8d237ac00 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018025 +Forwarded: no +Last-Update: 2022-10-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +diff --git a/misc/shotwell-viewer.desktop.in b/misc/shotwell-viewer.desktop.in +index b5e41f3..20b2f6e 100644 +--- a/misc/shotwell-viewer.desktop.in ++++ b/misc/shotwell-viewer.desktop.in +@@ -8,7 +8,7 @@ Icon=shotwell + Terminal=false + NoDisplay=true + Type=Application +-MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f; ++MimeType=image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-3fr;image/x-adobe-dng;image/x-arw;image/x-bay;image/x-bmp;image/x-canon-cr2;image/x-canon-crw;image/x-cap;image/x-cr2;image/x-crw;image/x-dcr;image/x-dcraw;image/x-dcs;image/x-dng;image/x-drf;image/x-eip;image/x-erf;image/x-fff;image/x-fuji-raf;image/x-iiq;image/x-k25;image/x-kdc;image/x-mef;image/x-minolta-mrw;image/x-mos;image/x-mrw;image/x-nef;image/x-nikon-nef;image/x-nrw;image/x-olympus-orf;image/x-orf;image/x-panasonic-raw;image/x-pef;image/x-pentax-pef;image/x-png;image/x-ptx;image/x-pxn;image/x-r3d;image/x-raf;image/x-raw;image/x-rw2;image/x-rwl;image/x-rwz;image/x-sigma-x3f;image/x-sony-arw;image/x-sony-sr2;image/x-sony-srf;image/x-sr2;image/x-srf;image/x-x3f;image/gif;image/webp + Categories=Graphics;Viewer;Photography;GNOME;GTK; + X-GIO-NoFuse=true + X-GNOME-Gettext-Domain=shotwell diff --git a/debian/patches/series b/debian/patches/series index e69de29..f7b4a86 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +0100-webp.patch -- cgit v1.2.3