From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B12D0158021 for ; Sun, 4 Dec 2022 19:42:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0221CE07E2; Sun, 4 Dec 2022 19:42:06 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF4E3E07F9 for ; Sun, 4 Dec 2022 19:42:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CCEF34129C for ; Sun, 4 Dec 2022 19:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 956DA772 for ; Sun, 4 Dec 2022 19:42:03 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1670182908.61fb2967dfe3da729a2cc6af871330a862cbeb08.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-directory-thumbnailer/files/, ... X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/gnome-directory-thumbnailer/files/0.1.11-Update-for-gnome-desktop-43-API-change.patch gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11-r1.ebuild gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild X-VCS-Directories: gnome-extra/gnome-directory-thumbnailer/ gnome-extra/gnome-directory-thumbnailer/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 61fb2967dfe3da729a2cc6af871330a862cbeb08 X-VCS-Branch: master Date: Sun, 4 Dec 2022 19:42:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 444d4256-6c4a-4f43-ac79-d5173160ac7c X-Archives-Hash: db63845930d7bc2ee1d0b776a7271d17 commit: 61fb2967dfe3da729a2cc6af871330a862cbeb08 Author: Matt Turner gentoo org> AuthorDate: Sun Dec 4 19:23:49 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Dec 4 19:41:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fb2967 gnome-extra/gnome-directory-thumbnailer: Update for gnome-desktop-43 API change Also update to EAPI=8. Closes: https://bugs.gentoo.org/882471 Signed-off-by: Matt Turner gentoo.org> ...11-Update-for-gnome-desktop-43-API-change.patch | 37 ++++++++++++++++++++++ ...> gnome-directory-thumbnailer-0.1.11-r1.ebuild} | 12 ++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/gnome-extra/gnome-directory-thumbnailer/files/0.1.11-Update-for-gnome-desktop-43-API-change.patch b/gnome-extra/gnome-directory-thumbnailer/files/0.1.11-Update-for-gnome-desktop-43-API-change.patch new file mode 100644 index 000000000000..9094c07122d2 --- /dev/null +++ b/gnome-extra/gnome-directory-thumbnailer/files/0.1.11-Update-for-gnome-desktop-43-API-change.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/882471 +https://gitlab.gnome.org/GNOME/gnome-directory-thumbnailer/-/merge_requests/2 + +From 8b39714ff8fd5de6643b5fdcf7fb01da35b82334 Mon Sep 17 00:00:00 2001 +From: Matt Turner +Date: Sun, 4 Dec 2022 14:20:23 -0500 +Subject: [PATCH] Update for gnome-desktop-43 API change + +Fixes: https://gitlab.gnome.org/GNOME/gnome-directory-thumbnailer/-/issues/8 +--- + src/main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/main.c b/src/main.c +index 64aa7da..c5c6d34 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -373,12 +373,16 @@ copy_thumbnail_from_file (GnomeDesktopThumbnailFactory *factory, const gchar *fi + g_setenv ("GNOME_DIRECTORY_THUMBNAILER_RECURSION_LIMIT", new_recursion_limit_str, TRUE); + g_free (new_recursion_limit_str); + ++#if defined(GNOME_DESKTOP_PLATFORM_VERSION) && GNOME_DESKTOP_PLATFORM_VERSION >= 43 ++ pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, file_uri, file_mime_type, NULL, error); ++#else + pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (factory, file_uri, file_mime_type); + if (pixbuf == NULL) { + /* gnome-desktop doesn't set an error so we have to. */ + g_debug ("Error generating thumbnail."); + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, _("Error generating thumbnail for file ‘%s’."), file_uri); + } ++#endif + } else { + g_debug ("Didn’t generate thumbnail due to hitting the recursion limit."); + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT, _("Error generating thumbnail for file ‘%s’: recursion limit reached."), file_uri); +-- +2.37.4 + diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11-r1.ebuild similarity index 73% rename from gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild rename to gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11-r1.ebuild index c040bc6b4468..415cfeb9c570 100644 --- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild +++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit gnome2 DESCRIPTION="Thumbnail generator for directories" @@ -9,16 +9,20 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer" LICENSE="LGPL-2.1+" SLOT="0" -IUSE="" KEYWORDS="amd64 x86" +PATCHES=( + "${FILESDIR}"/${PV}-Update-for-gnome-desktop-43-API-change.patch +) + RDEPEND=" >=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" >=dev-util/intltool-0.40 virtual/pkgconfig "