mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
nautilus: upgrade 3.18.5 -> 3.34.1
bumping high requires rewrite from scratch almost: * meson-build * remove backported patch Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
-40
@@ -1,40 +0,0 @@
|
||||
From a4ed38e95cbe07f02028249b8b315565a5ac1e43 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 5 May 2018 22:32:45 -0700
|
||||
Subject: [PATCH] nautilus: drop gnome-desktop thumbnail API with new
|
||||
gdk-pixbuf
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If gdk-pixbuf >= 2.36.5 is available, its scaling API can do what we
|
||||
want, so we don’t need to use the deprecated gnome-desktop one.
|
||||
|
||||
Also fixes compile errors seen on master
|
||||
nautilus-properties-window.c:5101: undefined reference to `gnome_desktop_thumbnail_scale_down_pixbuf'
|
||||
|
||||
Upstream-Status: Backport
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/nautilus-properties-window.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
|
||||
index dea8b0f..fad9bd1 100644
|
||||
--- a/src/nautilus-properties-window.c
|
||||
+++ b/src/nautilus-properties-window.c
|
||||
@@ -5098,10 +5098,11 @@ update_preview_callback (GtkFileChooser *icon_chooser,
|
||||
scale = (double)gdk_pixbuf_get_height (pixbuf) /
|
||||
gdk_pixbuf_get_width (pixbuf);
|
||||
|
||||
- scaled_pixbuf = gnome_desktop_thumbnail_scale_down_pixbuf
|
||||
+ scaled_pixbuf = gdk_pixbuf_scale_simple
|
||||
(pixbuf,
|
||||
PREVIEW_IMAGE_WIDTH,
|
||||
- scale * PREVIEW_IMAGE_WIDTH);
|
||||
+ scale * PREVIEW_IMAGE_WIDTH,
|
||||
+ GDK_INTERP_HYPER);
|
||||
g_object_unref (pixbuf);
|
||||
pixbuf = scaled_pixbuf;
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
SUMMARY = "File manager for GNOME"
|
||||
SECTION = "x11/gnome"
|
||||
|
||||
LICENSE="GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=36cf660aea2b8beffba7945f44a7e748 \
|
||||
file://COPYING.EXTENSIONS;md5=7579d6678402a1868631bf82c93ff0d4 \
|
||||
file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a"
|
||||
|
||||
inherit distro_features_check autotools pkgconfig gobject-introspection
|
||||
|
||||
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
|
||||
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/${MAJ_VER}/nautilus-${PV}.tar.xz \
|
||||
file://0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "0f578bda5655c0ce204befafca5803d7"
|
||||
SRC_URI[sha256sum] = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15"
|
||||
|
||||
DEPENDS = "gtk+3 gnome-desktop3 gsettings-desktop-schemas glib-2.0-native intltool-native pango"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--disable-gtk-doc \
|
||||
--disable-update-mimedb \
|
||||
--disable-nst-extension \
|
||||
--enable-tracker=no \
|
||||
--disable-schemas-compile \
|
||||
--enable-xmp=no \
|
||||
--enable-libexif=no \
|
||||
"
|
||||
|
||||
FILES_${PN} += "${datadir}/*"
|
||||
@@ -0,0 +1,32 @@
|
||||
SUMMARY = "File manager for GNOME"
|
||||
SECTION = "x11/gnome"
|
||||
|
||||
LICENSE="GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
GNOMEBASEBUILDCLASS = "meson"
|
||||
|
||||
DEPENDS = " \
|
||||
fontconfig \
|
||||
gtk+3 \
|
||||
gnome-desktop3 \
|
||||
gsettings-desktop-schemas \
|
||||
gnome-autoar \
|
||||
tracker \
|
||||
"
|
||||
|
||||
inherit gnomebase gobject-introspection gtk-doc gettext distro_features_check
|
||||
|
||||
SRC_URI[archive.md5sum] = "19e4f1d89fb9d0ff135d5b1974ce43b5"
|
||||
SRC_URI[archive.sha256sum] = "37ce2c16a610c589dcc7660f9092446465568e38e29bce6ed8c24f2e8e0077f3"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
PACKAGECONFIG = "extensions"
|
||||
PACKAGECONFIG[extensions] = "-Dextensions=true,-Dextensions=false, gexiv2 gstreamer1.0-plugins-base"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${datadir}/dbus-1 \
|
||||
${datadir}/metainfo \
|
||||
${datadir}/gnome-shell \
|
||||
"
|
||||
Reference in New Issue
Block a user