removed upstreamed
This commit is contained in:
		@@ -1 +0,0 @@
 | 
				
			|||||||
DIST geary-43.0.tar.xz 2476748 BLAKE2B 760820be83deae838a09c55adc4416348259073be26359bbf10e7998d8d794bd519b8601d79ff15f7980f87d68cdd1603188244b9931c227205f1db1ed014668 SHA512 71bf774aa27d4edef61932197bbf9b58b67ace8dd7969c4669fcd45e33c05a08d3d6eae280ea6a7e9f58db626f541f15b0f0d33f3162bef5fd21a368122dbba0
 | 
					 | 
				
			||||||
@@ -1,58 +0,0 @@
 | 
				
			|||||||
From 4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Rico Tzschichholz <ricotz@ubuntu.com>
 | 
					 | 
				
			||||||
Date: Sat, 8 Apr 2023 13:06:50 +0200
 | 
					 | 
				
			||||||
Subject: [PATCH] client: Add missing type-arguments for interfaces to fix
 | 
					 | 
				
			||||||
 build with newer vala
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 src/client/accounts/accounts-editor-row.vala          | 2 +-
 | 
					 | 
				
			||||||
 src/client/accounts/accounts-editor-servers-pane.vala | 6 +++---
 | 
					 | 
				
			||||||
 2 files changed, 4 insertions(+), 4 deletions(-)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/src/client/accounts/accounts-editor-row.vala b/src/client/accounts/accounts-editor-row.vala
 | 
					 | 
				
			||||||
index 6e7ac2ab9..70223d717 100644
 | 
					 | 
				
			||||||
--- a/src/client/accounts/accounts-editor-row.vala
 | 
					 | 
				
			||||||
+++ b/src/client/accounts/accounts-editor-row.vala
 | 
					 | 
				
			||||||
@@ -386,7 +386,7 @@ private abstract class Accounts.ServiceRow<PaneType,V> : AccountRow<PaneType,V>
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 /** Interface for rows that use a validator for editable values. */
 | 
					 | 
				
			||||||
-internal interface Accounts.ValidatingRow : EditorRow {
 | 
					 | 
				
			||||||
+internal interface Accounts.ValidatingRow<PaneType> : EditorRow<PaneType> {
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
     /** The row's validator */
 | 
					 | 
				
			||||||
diff --git a/src/client/accounts/accounts-editor-servers-pane.vala b/src/client/accounts/accounts-editor-servers-pane.vala
 | 
					 | 
				
			||||||
index 8bd9bde1f..982acd5cf 100644
 | 
					 | 
				
			||||||
--- a/src/client/accounts/accounts-editor-servers-pane.vala
 | 
					 | 
				
			||||||
+++ b/src/client/accounts/accounts-editor-servers-pane.vala
 | 
					 | 
				
			||||||
@@ -694,7 +694,7 @@ private class Accounts.SaveSentRow :
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 private class Accounts.ServiceHostRow :
 | 
					 | 
				
			||||||
-    ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow {
 | 
					 | 
				
			||||||
+    ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> {
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
     public Components.Validator validator {
 | 
					 | 
				
			||||||
@@ -848,7 +848,7 @@ private class Accounts.ServiceSecurityRow :
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 private class Accounts.ServiceLoginRow :
 | 
					 | 
				
			||||||
-    ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow {
 | 
					 | 
				
			||||||
+    ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> {
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
     public Components.Validator validator {
 | 
					 | 
				
			||||||
@@ -972,7 +972,7 @@ private class Accounts.ServiceLoginRow :
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 private class Accounts.ServicePasswordRow :
 | 
					 | 
				
			||||||
-    ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow {
 | 
					 | 
				
			||||||
+    ServiceRow<EditorServersPane,Gtk.Entry>, ValidatingRow<EditorServersPane> {
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
     public Components.Validator validator {
 | 
					 | 
				
			||||||
-- 
 | 
					 | 
				
			||||||
GitLab
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@@ -1,104 +0,0 @@
 | 
				
			|||||||
# Copyright 1999-2022 Gentoo Authors
 | 
					 | 
				
			||||||
# Distributed under the terms of the GNU General Public License v2
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
EAPI=8
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
inherit gnome.org gnome2-utils meson vala virtualx xdg
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
 | 
					 | 
				
			||||||
HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
LICENSE="LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, CC licenses for some icons
 | 
					 | 
				
			||||||
SLOT="0"
 | 
					 | 
				
			||||||
IUSE="test ytnef"
 | 
					 | 
				
			||||||
RESTRICT="!test? ( test )"
 | 
					 | 
				
			||||||
KEYWORDS="~amd64 ~arm64 ~x86"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# >=gspell-1.7 dep to ensure all libraries used use enchant:2
 | 
					 | 
				
			||||||
DEPEND="
 | 
					 | 
				
			||||||
	>=dev-libs/glib-2.68:2
 | 
					 | 
				
			||||||
	>=x11-libs/gtk+-3.24.23:3
 | 
					 | 
				
			||||||
	>=net-libs/webkit-gtk-2.38:4.1=
 | 
					 | 
				
			||||||
	>=dev-libs/gmime-3.2.4:3.0
 | 
					 | 
				
			||||||
	>=dev-db/sqlite-3.24:3
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	x11-libs/cairo[glib]
 | 
					 | 
				
			||||||
	app-text/enchant:2
 | 
					 | 
				
			||||||
	>=dev-libs/folks-0.11:0=
 | 
					 | 
				
			||||||
	>=app-crypt/gcr-3.10.1:0=
 | 
					 | 
				
			||||||
	>=dev-libs/libgee-0.8.5:0.8=
 | 
					 | 
				
			||||||
	net-libs/gnome-online-accounts
 | 
					 | 
				
			||||||
	media-libs/gsound
 | 
					 | 
				
			||||||
	>=app-text/gspell-1.7:=
 | 
					 | 
				
			||||||
	>=dev-libs/icu-60:=
 | 
					 | 
				
			||||||
	app-text/iso-codes
 | 
					 | 
				
			||||||
	>=dev-libs/json-glib-1.0
 | 
					 | 
				
			||||||
	>=gui-libs/libhandy-1.2.1:1=
 | 
					 | 
				
			||||||
	>=dev-libs/libpeas-1.24.0
 | 
					 | 
				
			||||||
	>=app-crypt/libsecret-0.11
 | 
					 | 
				
			||||||
	net-libs/libsoup:3.0
 | 
					 | 
				
			||||||
	dev-libs/snowball-stemmer:=
 | 
					 | 
				
			||||||
	>=dev-libs/libxml2-2.7.8:2
 | 
					 | 
				
			||||||
	ytnef? ( >=net-mail/ytnef-1.9.3 )
 | 
					 | 
				
			||||||
"
 | 
					 | 
				
			||||||
RDEPEND="${DEPEND}
 | 
					 | 
				
			||||||
	gnome-base/gsettings-desktop-schemas
 | 
					 | 
				
			||||||
"
 | 
					 | 
				
			||||||
BDEPEND="
 | 
					 | 
				
			||||||
	${PYTHON_DEPS}
 | 
					 | 
				
			||||||
	>=dev-libs/appstream-glib-0.7.10
 | 
					 | 
				
			||||||
	dev-libs/libxml2
 | 
					 | 
				
			||||||
	dev-util/itstool
 | 
					 | 
				
			||||||
	>=sys-devel/gettext-0.19.8
 | 
					 | 
				
			||||||
	virtual/pkgconfig
 | 
					 | 
				
			||||||
	test? ( net-libs/gnutls[tools] )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	$(vala_depend)
 | 
					 | 
				
			||||||
	x11-libs/gtk+:3[introspection]
 | 
					 | 
				
			||||||
	net-libs/webkit-gtk:4.1[introspection]
 | 
					 | 
				
			||||||
	dev-libs/gmime:3.0[vala]
 | 
					 | 
				
			||||||
	app-crypt/gcr:0[introspection,vala]
 | 
					 | 
				
			||||||
	dev-libs/libgee:0.8[introspection]
 | 
					 | 
				
			||||||
	media-libs/gsound[vala]
 | 
					 | 
				
			||||||
	app-text/gspell[vala]
 | 
					 | 
				
			||||||
	gui-libs/libhandy:1[vala]
 | 
					 | 
				
			||||||
	app-crypt/libsecret[introspection,vala]
 | 
					 | 
				
			||||||
	net-libs/libsoup:3.0[introspection,vala]
 | 
					 | 
				
			||||||
"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
PATCHES=(
 | 
					 | 
				
			||||||
	"${FILESDIR}"/780.patch
 | 
					 | 
				
			||||||
)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
src_prepare() {
 | 
					 | 
				
			||||||
	vala_setup
 | 
					 | 
				
			||||||
	gnome2_environment_reset
 | 
					 | 
				
			||||||
	default
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
src_configure() {
 | 
					 | 
				
			||||||
	local emesonargs=(
 | 
					 | 
				
			||||||
		-Dprofile=release
 | 
					 | 
				
			||||||
		-Drevno="${PR}"
 | 
					 | 
				
			||||||
		-Dvaladoc=disabled
 | 
					 | 
				
			||||||
		-Dcontractor=disabled
 | 
					 | 
				
			||||||
		-Dlibunwind=disabled
 | 
					 | 
				
			||||||
		$(meson_feature ytnef tnef)
 | 
					 | 
				
			||||||
	)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	meson_src_configure
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
src_test() {
 | 
					 | 
				
			||||||
	virtx meson_src_test
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
pkg_postinst() {
 | 
					 | 
				
			||||||
	xdg_pkg_postinst
 | 
					 | 
				
			||||||
	gnome2_schemas_update
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
pkg_postrm() {
 | 
					 | 
				
			||||||
	xdg_pkg_postrm
 | 
					 | 
				
			||||||
	gnome2_schemas_update
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -212,7 +212,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/Incubator/snapshot"
 | 
				
			|||||||
SRC_URI="https://gitlab.gnome.org/GNOME/Incubator/snapshot/-/archive/${PV}/snapshot-${PV}.tar.gz"
 | 
					SRC_URI="https://gitlab.gnome.org/GNOME/Incubator/snapshot/-/archive/${PV}/snapshot-${PV}.tar.gz"
 | 
				
			||||||
SRC_URI+=" $(cargo_crate_uris ${CRATES})"
 | 
					SRC_URI+=" $(cargo_crate_uris ${CRATES})"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
RESTRICT="network-sandbox"
 | 
					#RESTRICT="network-sandbox"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
LICENSE="GPL-3"
 | 
					LICENSE="GPL-3"
 | 
				
			||||||
SLOT="0"
 | 
					SLOT="0"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user