From patchwork Wed May 9 19:00:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 135362 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp107841lji; Wed, 9 May 2018 12:01:53 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqNeNWjShk90P3Z5n9zmhxx9I1CXpAkgm0o+eMEM/5++k+nFAZs1L8qW7ml7n+OqNRl4+Ua X-Received: by 2002:a17:902:624:: with SMTP id 33-v6mr46654740plg.361.1525892513737; Wed, 09 May 2018 12:01:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525892513; cv=none; d=google.com; s=arc-20160816; b=saM128cy9/AskdKONf9zIkvtjQBmREFrI8IhwgsWldesX44d7AZxOLcld3w9Z8cHW6 ChC4Dy7xCVpeCBGEF+1Jrna/uDwjBXMKdz7+WOxwl8jpJrvqDc38VHUpCCTjUlnA9Hxh 9EfgwfGPfpgM5hzUWCxBM2bmNC4xuGNtpftKo/DHeUkw0t8MbABzp61D5+VxVlrOfF/r e7C8zDCz49uHfe2dJ1io+GGzPNz6FmOSIGlEkjX+khrWJQeQHl2nulKQgTdrE+eacbhT +ZCTxmDFfYtPyytnYtm+NTSJUtHLsv31kAp+7lkoFe+mbMkWDwKTXrw8Qt7Ql4StPg2d g/Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=ECgmaDfNRTs70cR5+J6yGP0I938LjxjJgQz7/MGv0gw=; b=T+I+014/hGxzouROTTwFJNdIs0/d/kAbQPRy0QBB0lAiWP9cei2AMB5m+IQ0SNOHRx gdinA3CwI6MYs0vMPVpqQKw4Wpo7NlQyuLAqmstUWF+db7q6FTuiPUUQLYV7rwP6heU4 bPMx5J0NJFKnUz2JbvABvZKlKhmYIdA8ccsSdXw3GQSL6q3/PS+RJuM+nAsNUOyBViks XQDv648NJBD/o8tLGjzoRib+AfZ9WO/Pi0wPZ01eDgUAbakvL0lm4JM/6GDYNjT03hm+ Sp1fpnBw9PUUHXOh6kQxTHOKg4+HmsYXJRw3gTwoReqNIk2kPiY8vbLUejgzwYTLw0xC 7YAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DzXkU+TD; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j10-v6si26630301plg.396.2018.05.09.12.01.53; Wed, 09 May 2018 12:01:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DzXkU+TD; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id AA5CF74FFC; Wed, 9 May 2018 19:00:52 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by mail.openembedded.org (Postfix) with ESMTP id 64B9A74A0E for ; Wed, 9 May 2018 19:00:29 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id f189so26070980pfa.7 for ; Wed, 09 May 2018 12:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=35pJOihlTfPbyIwxYCfsmGYuSF93AF6m5ivqDlPhTv4=; b=DzXkU+TDoY+KROyiE24ylXqFarPMeo9f/RFn454ZuOBkHeblcwFNh6I9Ul5RHApmx+ /v5gYOZsnuqQK0kiTAjwkMx4/CCS3k5BygUswNP30s0tqY8OCD8K1PMpTcu1304GiFy2 HdMe/CQvo4WpzyVva6dq+dCg3H6ElT8QTjlWAdhEVwlMlt5PN+DHFbHOOSYC9efp3gUo HPFQwxDAUopQ1/obOZwMsVgvYEoEhF+3UhAm7ImlPef77kZbEdhyjKuB9Hy5vhYcCPfS yMqHkpTlKz0EYxhE0KyP4mO9C7gfnkw0OzxhsqwK0KwPIyQYeAl0npELq8310SLr+RHf HPoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=35pJOihlTfPbyIwxYCfsmGYuSF93AF6m5ivqDlPhTv4=; b=NfdHFfrKE58IHf2l5VsCqLtb7FRj9fiwg53ixdsT2ersDju95b1Aos/qysse9TbJwT oANqprWTwpDVxXHDamkFBCFPT/NikfZzOqeeNTm/lfXXv3J4ane6ksFNxFTtgm3lVgj8 /C5VWGuJsfgRMO+TVZ1W4XyfrlqEwuh7ZRxnYO0JfsOJSqpCVkcsE8rwATYH2Y8XMnwl eypuSLF1/0tH1W8sRmoWqFvUIFvDPsAPFfZEWlVBDQBXkT7Lm8CqF2d6nngOIHvZcoZp otZaPGAYaN0tHqM6HbbmNfThbIwtPSAzfUKWh9XfmdQ0q1ejmLwh/EahSuFgkiJdV0ax dCVA== X-Gm-Message-State: ALQs6tDDIwdebKYOoq3pbqdmG9qiIVv70JmNxBj0tVPx8dh7HxqaaPPt ul+zyw0RQlCZx0RNNQlhF+htdw== X-Received: by 10.98.227.15 with SMTP id g15mr45177919pfh.68.1525892430285; Wed, 09 May 2018 12:00:30 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::c68]) by smtp.gmail.com with ESMTPSA id 131sm27732437pfa.128.2018.05.09.12.00.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 12:00:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 9 May 2018 12:00:05 -0700 Message-Id: <20180509190011.30006-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509190011.30006-1-raj.khem@gmail.com> References: <20180509190011.30006-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-gnome][PATCH 10/16] nautilus: Fix build with gdx-pixbuf >= to 2.36.11 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org OE-Core has updates to 2.36.11, so we have to replace obsolete API uses Signed-off-by: Khem Raj --- ...ome-desktop-thumbnail-API-with-new-g.patch | 40 +++++++++++++++++++ .../recipes-gnome/nautilus/nautilus_3.18.5.bb | 10 +++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch new file mode 100644 index 0000000000..f19eb49798 --- /dev/null +++ b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-nautilus-drop-gnome-desktop-thumbnail-API-with-new-g.patch @@ -0,0 +1,40 @@ +From a4ed38e95cbe07f02028249b8b315565a5ac1e43 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- + 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; + } diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb index 8fdbf6ac2b..bdb2f3c884 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_3.18.5.bb @@ -6,14 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=36cf660aea2b8beffba7945f44a7e748 \ file://COPYING.EXTENSIONS;md5=7579d6678402a1868631bf82c93ff0d4 \ file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/nautilus/3.18/nautilus-${PV}.tar.xz" +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" -inherit distro_features_check autotools pkgconfig gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = " \ @@ -23,7 +27,7 @@ EXTRA_OECONF = " \ --enable-tracker=no \ --disable-schemas-compile \ --enable-xmp=no \ - --enable-libexif=no \ + --enable-libexif=no \ " FILES_${PN} += "${datadir}/*"