1
0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 09:32:37 +01:00

gnome-extra/sushi: add upstream patch to depend on GtkSourceView 4

This commit is contained in:
2020-01-05 16:30:06 +01:00
parent e21370b6f7
commit 0b9b794493
4 changed files with 136 additions and 0 deletions

View File

@@ -0,0 +1,4 @@
AUX sushi-3.32.1-port-to-GtkSourceView-4.patch 2671 BLAKE2B 04b5d50d51acf15971cff8f14dcefd134876db73069381a4035134c74df57e94c45f07f7198286f925b19c3e3bcadf07676f4e038f09e4758875b505391b08e0 SHA512 7e5ea7ada9ee698c9886619ea5010f3a6288e22db063616173dc578b16b2b17b33bc1abdac491d77c10bea8c5e4c5af9cfee811e23a8bafba4ab3bfb01ed6856
DIST sushi-3.32.1.tar.xz 65172 BLAKE2B ad6d085e3c67527c988695195408e2dd8f82effeb0dacccb63eec9d3896c82fb1abf8d0fb92aeb6934146e67e8e203e438a900d4164d673b19cbe6af9d9a27b7 SHA512 db38b690591f7c7a5e55b7ad7a37022cd0624f48af6fe1c56ae05aa74598d767b61a1636d01ba207c399739c0cee6d266a52207a74f65f3e27216c5dfdd17909
EBUILD sushi-3.32.1.ebuild 1410 BLAKE2B 220618d9452e982b791f8fb961bf99b058247ba61021975974b37f245eb841574aeb0363af521959dcae8272b478316e5ac1b7c669d4c5db5e5b3b571b3a7665 SHA512 3dc5ef02e76ed4cd1080a9ea6372d8b806c0fa6eedae9f8e8461c2b609f4af45461cfeb1dbccb3255efb8237118d5868b9d980866ceff25d76876fc9148b1b19
MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651

View File

@@ -0,0 +1,72 @@
From bafeb19233325a7fc7c2e82b488abfb7a7556f61 Mon Sep 17 00:00:00 2001
From: Martin Blanchard <tchaik@gmx.com>
Date: Sun, 19 May 2019 22:31:37 +0200
Subject: [PATCH] Port to GtkSourceView 4
GtkSourceView 3 isn't maintained any more.
https://gitlab.gnome.org/GNOME/sushi/issues/6
---
flatpak/org.gnome.NautilusPreviewer.json | 4 ++--
meson.build | 2 +-
src/js/viewers/text.js | 2 +-
src/libsushi/meson.build | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/flatpak/org.gnome.NautilusPreviewer.json b/flatpak/org.gnome.NautilusPreviewer.json
index 4565b82..9a60827 100644
--- a/flatpak/org.gnome.NautilusPreviewer.json
+++ b/flatpak/org.gnome.NautilusPreviewer.json
@@ -102,8 +102,8 @@
"sources": [
{
"type": "archive",
- "url": "http://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.8.tar.xz",
- "sha256": "1e9bb8ff190db705deb916dd23ff681f0e8803aec407bf0fd64c7e615ac436fe"
+ "url": "https://download.gnome.org/sources/gtksourceview/4.2/gtksourceview-4.2.0.tar.xz",
+ "sha256": "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675"
}
]
},
diff --git a/meson.build b/meson.build
index 56398d9..538dc4b 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,7 @@ gstreamer_base_dep = dependency('gstreamer-base-1.0')
gstreamer_pbutils_dep = dependency('gstreamer-pbutils-1.0')
gstreamer_tag_dep = dependency('gstreamer-tag-1.0')
gtk_dep = dependency('gtk+-3.0', version: '>=3.13.2')
-gtksourceview_dep = dependency('gtksourceview-3.0')
+gtksourceview_dep = dependency('gtksourceview-4', version: '>=4.0.3')
harfbuzz_dep = dependency('harfbuzz', version: '>=0.9.9')
introspection_dep = dependency('gobject-introspection-1.0', version: '>=1.0.1')
musicbrainz_dep = dependency('libmusicbrainz5')
diff --git a/src/js/viewers/text.js b/src/js/viewers/text.js
index 9566adb..a044fbe 100644
--- a/src/js/viewers/text.js
+++ b/src/js/viewers/text.js
@@ -23,7 +23,7 @@
*
*/
-imports.gi.versions.GtkSource = '3.0';
+imports.gi.versions.GtkSource = '4';
const Gdk = imports.gi.Gdk;
const GtkClutter = imports.gi.GtkClutter;
diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build
index c8ff6fa..66ef646 100644
--- a/src/libsushi/meson.build
+++ b/src/libsushi/meson.build
@@ -62,7 +62,7 @@ gnome.generate_gir(
'GstTag-1.0',
'GdkPixbuf-2.0',
'Gtk-3.0',
- 'GtkSource-3.0',
+ 'GtkSource-4',
'EvinceDocument-3.0',
],
install: true,
--
2.22.0

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
<flag name="office">Support viewing file formats such as generated by
<pkg>app-office/libreoffice</pkg></flag>
</use>
</pkgmetadata>

View File

@@ -0,0 +1,48 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit gnome.org meson xdg
DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
HOMEPAGE="https://git.gnome.org/browse/sushi"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="office"
PATCHES=(
"${FILESDIR}/${P}-port-to-GtkSourceView-4.patch"
)
# Optional app-office/libreoffice support (OOo to pdf and then preview)
# gtk+[X] optionally needed for sushi_create_foreign_window(); clutter-x11.h unconditionally included
COMMON_DEPEND="
>=media-libs/clutter-1.11.4:1.0[X,introspection]
media-libs/clutter-gst:3.0[introspection]
>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
>=app-text/evince-3.0[introspection]
media-libs/freetype:2
>=x11-libs/gdk-pixbuf-2.23.0[introspection]
>=dev-libs/gjs-1.40
>=dev-libs/glib-2.29.14:2
media-libs/gstreamer:1.0[introspection]
media-libs/gst-plugins-base:1.0[introspection]
>=x11-libs/gtk+-3.13.2:3[X,introspection]
x11-libs/gtksourceview:4[introspection]
>=media-libs/harfbuzz-0.9.9:=
>=dev-libs/gobject-introspection-1.54:=
media-libs/musicbrainz:5=
net-libs/webkit-gtk:4[introspection]
"
DEPEND="${RDEPEND}
dev-util/glib-utils
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
"
RDEPEND="${COMMON_DEPEND}
>=gnome-base/nautilus-3.1.90
office? ( app-office/libreoffice )
"