From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- gnome-base/nautilus/Manifest | 3 - .../nautilus/files/3.34.2-pango-1.42-compat.patch | 106 --------------------- gnome-base/nautilus/nautilus-3.34.3.ebuild | 106 --------------------- 3 files changed, 215 deletions(-) delete mode 100644 gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch delete mode 100644 gnome-base/nautilus/nautilus-3.34.3.ebuild (limited to 'gnome-base/nautilus') diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest index 29c186fa3b21..172a263df3b3 100644 --- a/gnome-base/nautilus/Manifest +++ b/gnome-base/nautilus/Manifest @@ -1,8 +1,5 @@ AUX 3.30.5-docs-build.patch 1054 BLAKE2B c4a9bbd1f63f74130d48737e430a4e3e5e894049df2dfdebf75f0f519eb715aba5bd590f4b57a718f78238ee50242215ef2b648fd3e3e8e8dddebc2ff1b45be2 SHA512 3a0925262643eb84d4c1731cad6b3c2c427def000503a3a680b06b68828f53492b4367d02ac6de36c35b6460e3d0967e3ce26203f8257271b222883990047459 AUX 3.32.3-optional-gstreamer.patch 1592 BLAKE2B 5c0326638ed4c2714fe72e460256bd01cfad547c6455e1ec3e0273550d5f16e7ddf2e32e4928b7d45e1ea877625fce5a8ea3171d67f5c87359a9ddc2944fe9cc SHA512 40bcbbad8ad7d831e7af0659a710af0f378e8aaafff89f764528f577dcb78d96d38af475112bcd4c615d5c78249955c31ce196bcbebd590bdeb6f52127ce3a3a -AUX 3.34.2-pango-1.42-compat.patch 3896 BLAKE2B 022cc2667db62a9956684f3b16f466a6dbb3112caabd80629775be0e50677fbe657e2fe9c3202f3d7c54c0c1fc7e80fe189583f30cf98d03196c131331e3fc2b SHA512 ee293078db3e17ca0f0e5cee560142f272855515f3f59b59c0743a544a3149bed5d904a2022deb210ce61c09673de903c82e288803545d30f068985f0db0f03d -DIST nautilus-3.34.3.tar.xz 3213260 BLAKE2B a417ee5d5e032befed704b71b9ffd29cc9a2a6fae0612f96601756b876b0990625cc78eb2c7679bdce914f3dd30208b60243f403a508cf87a6761ea56251140d SHA512 f8ef86b5b67ef2b8eced492ee6b8d77155a9d6ec5ba6bb18132d678e6f12870963da9bcf4ff0bfbb8f4791bf068314557f9551febc23234c48d722e529c6ed9d DIST nautilus-3.36.3.tar.xz 3201908 BLAKE2B ec7be7ad523e29c853a1a16dd6381257bd7f7af0004d4b84a9ef13539f5c8ea431c61f819eee6c0d396037846d390ae112b3fe2771276cde6128e7fad95eb4f4 SHA512 4dce01c20a34ed9bbff53a9886775af431754d02a4300e4647d87830502103e7436e53127b2e503af8e3a90785aa864514dbde22508ffb3e06eb43d4633fddde -EBUILD nautilus-3.34.3.ebuild 2904 BLAKE2B 22da3640ed42c7f9f2b965ca0ded92c5add51f7134420a1b49351fd47fd4432d98cce7b571cf12296320ef0d55a2690636293bd4d1786478f2399ff902b16b9c SHA512 8c180ed68480d9cf5a341a6f49f7ac9295e9166da963f865686c7dc60c9010f5dabaa7c9813d88011d819b512304f9f173f94014065e0de0bc675c0e64f90ac9 EBUILD nautilus-3.36.3.ebuild 2858 BLAKE2B e6336c2c17144faa3823282c48a43af4fd8788b6ff343e1c7985d01640e12b0d4d25cd66de66ec6dd1125bb841be3d5a9d28ef60dae0afd63158fdbedfe8c12d SHA512 04b09cfad516cbc709883467cfee1ffec1f1e63596b3e62c3628c2a4b9613fef7f534862055b8e4cf3570f4840381966b9822fe6397a7b180f981e32fde80e0c MISC metadata.xml 553 BLAKE2B 51c14fbccc3b060cb5fac644a8213672250edb2c2092076bb4e0c390bfc8562a950fd362ae4294ac1215e774fcd4dd4de6c709b126c04fa705cf10be0e6e836f SHA512 77102dd05a5180dffca7ef03d66e3d0dc113f272e583da442027a94cb4e9fc67f0c267d9f2d5d0a4ef895d58604aed78fbe01c19b3f018972ff675d392786b7c diff --git a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch b/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch deleted file mode 100644 index 76ab1fb1c2e2..000000000000 --- a/gnome-base/nautilus/files/3.34.2-pango-1.42-compat.patch +++ /dev/null @@ -1,106 +0,0 @@ -From a9cd85a7bc045ae4b4661f0e6f9ece362a26c0c3 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -Date: Wed, 27 Nov 2019 14:08:27 +0000 -Subject: [PATCH] Conditionally depend on Pango 1.44.4 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We're using newly introduced Pango API, but we're not doing a version -check on it. One option is to force a Pango ≥ 1.44.4 dependency; another -is to do a compile time check and only use the new API if we're building -against a new enough Pango. ---- - src/nautilus-canvas-item.c | 14 +++++++++----- - src/nautilus-view-icon-item-ui.c | 16 ++++++++++------ - 2 files changed, 19 insertions(+), 11 deletions(-) - -diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c -index 4d33d119b..5b5d3312f 100644 ---- a/src/nautilus-canvas-item.c -+++ b/src/nautilus-canvas-item.c -@@ -1381,14 +1381,12 @@ create_label_layout (NautilusCanvasItem *item, - GString *str; - char *zeroified_text; - const char *p; -- PangoAttrList *attr_list; - - canvas_item = EEL_CANVAS_ITEM (item); - - container = NAUTILUS_CANVAS_CONTAINER (canvas_item->canvas); - context = gtk_widget_get_pango_context (GTK_WIDGET (canvas_item->canvas)); - layout = pango_layout_new (context); -- attr_list = pango_attr_list_new (); - - zeroified_text = NULL; - -@@ -1417,8 +1415,15 @@ create_label_layout (NautilusCanvasItem *item, - pango_layout_set_spacing (layout, LABEL_LINE_SPACING); - pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); - -- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE)); -- pango_layout_set_attributes (layout, attr_list); -+#if PANGO_VERSION_CHECK (1, 44, 4) -+ { -+ PangoAttrList *attr_list = pango_attr_list_new (); -+ -+ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE)); -+ pango_layout_set_attributes (layout, attr_list); -+ pango_attr_list_unref (attr_list); -+ } -+#endif - - /* Create a font description */ - if (container->details->font) -@@ -1432,7 +1437,6 @@ create_label_layout (NautilusCanvasItem *item, - pango_layout_set_font_description (layout, desc); - pango_font_description_free (desc); - g_free (zeroified_text); -- pango_attr_list_unref (attr_list); - - return layout; - } -diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c -index d192e28fa..837dc54a9 100644 ---- a/src/nautilus-view-icon-item-ui.c -+++ b/src/nautilus-view-icon-item-ui.c -@@ -128,7 +128,6 @@ constructed (GObject *object) - GtkBox *container; - GtkBox *item_selection_background; - GtkLabel *label; -- PangoAttrList *attr_list; - GtkStyleContext *style_context; - NautilusFile *file; - guint icon_size; -@@ -150,9 +149,16 @@ constructed (GObject *object) - - label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file))); - gtk_widget_show (GTK_WIDGET (label)); -- attr_list = pango_attr_list_new (); -- pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE)); -- gtk_label_set_attributes (label, attr_list); -+ -+#if PANGO_VERSION_CHECK (1, 44, 4) -+ { -+ PangoAttrList *attr_list = pango_attr_list_new (); -+ pango_attr_list_insert (attr_list, pango_attr_insert_hyphens_new (FALSE)); -+ gtk_label_set_attributes (label, attr_list); -+ pango_attr_list_unref (attr_list); -+ } -+#endif -+ - gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE); - gtk_label_set_line_wrap (label, TRUE); - gtk_label_set_line_wrap_mode (label, PANGO_WRAP_WORD_CHAR); -@@ -182,8 +188,6 @@ constructed (GObject *object) - (GCallback) on_view_item_size_changed, self); - g_signal_connect (self->model, "notify::file", - (GCallback) on_view_item_file_changed, self); -- -- pango_attr_list_unref (attr_list); - } - - static void --- -2.20.1 - diff --git a/gnome-base/nautilus/nautilus-3.34.3.ebuild b/gnome-base/nautilus/nautilus-3.34.3.ebuild deleted file mode 100644 index 6a35a0d8f4eb..000000000000 --- a/gnome-base/nautilus/nautilus-3.34.3.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg - -DESCRIPTION="Default file manager for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus" - -LICENSE="GPL-3+ LGPL-2.1+" -SLOT="0" -IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto" - -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" - -DEPEND=" - >=dev-libs/glib-2.58.1:2 - >=media-libs/gexiv2-0.10.0 - gstreamer? ( media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) - >=app-arch/gnome-autoar-0.2.1 - >=gnome-base/gnome-desktop-3.0.0:3= - >=x11-libs/gtk+-3.22.27:3[X,introspection?] - >=x11-libs/pango-1.28.3 - selinux? ( >=sys-libs/libselinux-2.0 ) - >=app-misc/tracker-2.0:= - x11-libs/libX11 - >=dev-libs/libxml2-2.7.8:2 - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) -" -RDEPEND="${DEPEND} - sendto? ( !=app-misc/tracker-miners-2.0:= -" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners -BDEPEND=" - >=dev-util/gdbus-codegen-2.51.2 - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gtk-doc-1.10 - app-text/docbook-xml-dtd:4.1.2 ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto -" -PDEPEND=" - gnome? ( x11-themes/adwaita-icon-theme ) - previewer? ( >=gnome-extra/sushi-0.1.9 ) - sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) - >=gnome-base/gvfs-1.14[gtk(+)] -" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34 - -PATCHES=( - "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc - "${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build - "${FILESDIR}"/3.34.2-pango-1.42-compat.patch -) - -src_prepare() { - if use previewer; then - DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files. - To activate the previewer, select a file and press space; to - close the previewer, press space again." - fi - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc docs) - -Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true - $(meson_use gstreamer) # gstreamer audio-video-properties extension - $(meson_use introspection) - -Dpackagekit=false - $(meson_use selinux) - -Dprofiling=false - -Dtests=$(usex test all none) - ) - meson_src_configure -} - -src_install() { - use previewer && readme.gentoo_create_doc - meson_src_install -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if use previewer; then - readme.gentoo_print_elog - else - elog "To preview media files, emerge nautilus with USE=previewer" - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} -- cgit v1.2.3