public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/, mail-client/geary/files/
@ 2019-12-29 14:45 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2019-12-29 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f3a1dd273fde122cd45ef342b21dee01cbef7205
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 13:40:25 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 14:35:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a1dd27

mail-client/geary: various package fixes and touchups

* Fix tests (one needs virtx)
* Fix some minimum deps and sort in meson.build occurrence order
* Require webkit-gtk-2.26 to ensure a build conditional
  compatibility branch is used (building against 2.24 and then
  upgrading webkitgtk to 2.26 without geary rebuild may end up
  taking lots of CPU for some operations, afaiu)
* Fix automagic dep on ytnef (previously may have linked against
  it even with USE=-ytnef if the library was present)
* Drop conditional unwind support, as it's automagic and as it's
  a small dep, didn't fix it fully (much more involved than for
  ytnef)
* Move introspection,vala USE flag requirements to build-time
  only - these aren't needed at runtime for geary.
* Add missing itstool build depend
* Drop old LINGUAS based translation file dropping - it's not
  done for almost all meson based packages, and we aren't special
  in any way
* Drop dconf dep - again, don't think geary is more special than
  any other GSettings using application that don't dep on it for
  persistent configuration storage
* Explicit meson_options settings where appropriate, resorted in
  meson_options.txt order

Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 .../geary/files/3.34.2-fix-ytnef-automagic.patch   |  32 +++++++
 mail-client/geary/geary-3.34.2-r1.ebuild           | 101 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
new file mode 100644
index 00000000000..dccc40aab8c
--- /dev/null
+++ b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
@@ -0,0 +1,32 @@
+From 91f78fb411bc2bf1e2269ceab02740e9cb969c9b Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 26 Dec 2019 19:28:07 +0200
+Subject: [PATCH] build: Fix automagic dependency on ytnef library
+
+It would be best to use meson feature option type for ytnef and unwind,
+but for now fix the automagic dependency on ytnef with the existing
+meson_options.txt setup.
+It was adding ytnef to list of dependencies unconditionally, and then
+also if tnef-support was enabled. So if the option was disabled, but the
+pkg-config file was present, it would still link to it surprisingly.
+Just remove the unconditional addition to dep, and rely on the already
+existing conditional addition to deps.
+---
+ src/engine/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/engine/meson.build b/src/engine/meson.build
+index cb61c2aa..23b5fa48 100644
+--- a/src/engine/meson.build
++++ b/src/engine/meson.build
+@@ -325,7 +325,6 @@ geary_engine_dependencies = [
+   gmime,
+   libmath,
+   libxml,
+-  libytnef,
+   posix,
+   sqlite
+ ]
+-- 
+2.20.1
+

diff --git a/mail-client/geary/geary-3.34.2-r1.ebuild b/mail-client/geary/geary-3.34.2-r1.ebuild
new file mode 100644
index 00000000000..3b14c01f5f8
--- /dev/null
+++ b/mail-client/geary/geary-3.34.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_MIN_API_VERSION="0.44"
+
+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+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
+SLOT="0"
+
+IUSE="ytnef"
+
+KEYWORDS="~amd64"
+
+# for now both enchants work
+# FIXME: add valadoc support
+
+# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it.
+# If not, it could be compiled against 2.24 and then webkit-gtk upgraded and
+# geary not rebuilt, ending up in geary issues #558 and #559 still.
+DEPEND="
+	>=dev-libs/glib-2.54:2
+	>=x11-libs/gtk+-3.24.7:3
+	>=net-libs/webkit-gtk-2.26:4=
+	>=dev-libs/gmime-2.6.17:2.6
+	>=dev-db/sqlite-3.12:3
+
+	>=dev-libs/appstream-glib-0.7.10
+	app-text/enchant
+	>=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
+	app-text/gspell
+	app-text/iso-codes
+	>=dev-libs/json-glib-1.0
+	>=media-libs/libcanberra-0.28
+	>=gui-libs/libhandy-0.0.9:0.0=
+	>=app-crypt/libsecret-0.11
+	>=net-libs/libsoup-2.48:2.4
+	>=sys-libs/libunwind-1.1:7
+	>=dev-libs/libxml2-2.7.8:2
+	ytnef? ( >=net-mail/ytnef-1.9.3 )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+
+	$(vala_depend)
+	x11-libs/gtk+:3[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	app-crypt/gcr:0[introspection,vala]
+	dev-libs/libgee:0.8[introspection]
+	app-text/gspell[vala]
+	app-crypt/libsecret[introspection,vala]
+	net-libs/libsoup:2.4[introspection,vala]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-ytnef-automagic.patch # https://gitlab.gnome.org/GNOME/geary/merge_requests/390
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dvaladoc=false
+		-Dcontractor=false
+		-Dpoodle=true
+		-Dlibunwind_optional=false # TODO: Automagical if optional=true
+		$(meson_use ytnef tnef-support)
+		-Dprofile=default
+	)
+
+	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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/, mail-client/geary/files/
@ 2020-07-19 17:31 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2020-07-19 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     a296d61d8051a9abfabe5286e28a345e77d5a998
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 17:27:48 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 17:27:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a296d61d

mail-client/geary: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 mail-client/geary/Manifest                         |   3 -
 .../geary/files/3.34.2-fix-ytnef-automagic.patch   |  32 -------
 mail-client/geary/geary-3.34.2-r3.ebuild           | 102 ---------------------
 mail-client/geary/geary-3.36.0.ebuild              |  97 --------------------
 mail-client/geary/geary-3.36.1.ebuild              |  97 --------------------
 5 files changed, 331 deletions(-)

diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 8883f1fa5da..f55f4210f46 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,4 +1 @@
-DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
-DIST geary-3.36.0.tar.xz 2393620 BLAKE2B 06b06a948c0932f24fd3cbb70727d9fa1746dc506c80b29f100524a6b8adbfccadee5c3d5b6524c98ed6f902e68bd3151d3c3246cce4c2a825d9e99efa7a9fed SHA512 aefc29e64acc8e4416eb213de8948b6d51dc12f1087b9376ddc8e4991efc171b36c35868043ab3159eef614916da82c046222c5ea6256b51cbc72bce9cfec7d6
-DIST geary-3.36.1.tar.xz 2400548 BLAKE2B 84240b7b5b80e6172e875d46554caca5d3a10f85965f65916603a4dcf3ada8ed8a23f6c1e2ceb64922e0eaa072122bd41b22bbc2f37b35b2205f703f49887a4b SHA512 7d5812ece5f5315245237a57de26475c4db58c4bdcce4399a3d304e25d60093dfbe1332764e056f94bf754b19be2279d0b4237b628746202b6f5dc5755b11ca8
 DIST geary-3.36.2.tar.xz 2416928 BLAKE2B 983357ffe5e6be637d992a530d8bee3ff90257620a73df628b6e36f18dc021d97eba6f2ef59290d3ab8e7c781a39c50b67e42104d51f0ad51e65f2de00c95352 SHA512 a3cca301a3668eb2e70f8bfc147abef9088de4e822efab4ecc44830fbc394265d1fa37267a1f8fa97b6e8d1ac8a8adb76e5dd9e509490ac567e05bd243e8ea20

diff --git a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
deleted file mode 100644
index dccc40aab8c..00000000000
--- a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 91f78fb411bc2bf1e2269ceab02740e9cb969c9b Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 26 Dec 2019 19:28:07 +0200
-Subject: [PATCH] build: Fix automagic dependency on ytnef library
-
-It would be best to use meson feature option type for ytnef and unwind,
-but for now fix the automagic dependency on ytnef with the existing
-meson_options.txt setup.
-It was adding ytnef to list of dependencies unconditionally, and then
-also if tnef-support was enabled. So if the option was disabled, but the
-pkg-config file was present, it would still link to it surprisingly.
-Just remove the unconditional addition to dep, and rely on the already
-existing conditional addition to deps.
----
- src/engine/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/engine/meson.build b/src/engine/meson.build
-index cb61c2aa..23b5fa48 100644
---- a/src/engine/meson.build
-+++ b/src/engine/meson.build
-@@ -325,7 +325,6 @@ geary_engine_dependencies = [
-   gmime,
-   libmath,
-   libxml,
--  libytnef,
-   posix,
-   sqlite
- ]
--- 
-2.20.1
-

diff --git a/mail-client/geary/geary-3.34.2-r3.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild
deleted file mode 100644
index 60b47844977..00000000000
--- a/mail-client/geary/geary-3.34.2-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.44"
-
-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+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
-SLOT="0"
-
-IUSE="ytnef"
-
-KEYWORDS="~amd64 ~x86"
-
-# for now both enchants work, but ensuring enchant:2
-# FIXME: add valadoc support
-
-# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
-# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it;
-# If not, it could be compiled against 2.24 and then webkit-gtk upgraded and
-# geary not rebuilt, ending up in geary issues #558 and #559 still.
-DEPEND="
-	>=dev-libs/glib-2.54:2
-	>=x11-libs/gtk+-3.24.7:3
-	>=net-libs/webkit-gtk-2.26.4-r1:4=
-	>=dev-libs/gmime-2.6.17:2.6
-	>=dev-db/sqlite-3.12:3
-
-	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
-	>=app-text/gspell-1.7:=
-	app-text/iso-codes
-	>=dev-libs/json-glib-1.0
-	>=media-libs/libcanberra-0.28
-	>=gui-libs/libhandy-0.0.9:0.0=
-	>=app-crypt/libsecret-0.11
-	>=net-libs/libsoup-2.48:2.4
-	>=sys-libs/libunwind-1.1:0
-	>=dev-libs/libxml2-2.7.8:2
-	ytnef? ( >=net-mail/ytnef-1.9.3 )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	>=dev-libs/appstream-glib-0.7.10
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	$(vala_depend)
-	x11-libs/gtk+:3[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	app-crypt/gcr:0[introspection,vala]
-	dev-libs/libgee:0.8[introspection]
-	app-text/gspell[vala]
-	app-crypt/libsecret[introspection,vala]
-	net-libs/libsoup:2.4[introspection,vala]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-ytnef-automagic.patch # https://gitlab.gnome.org/GNOME/geary/merge_requests/390
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dvaladoc=false
-		-Dcontractor=false
-		-Dpoodle=true
-		-Dlibunwind_optional=false # TODO: Automagical if optional=true
-		$(meson_use ytnef tnef-support)
-		-Dprofile=default
-	)
-
-	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
-}

diff --git a/mail-client/geary/geary-3.36.0.ebuild b/mail-client/geary/geary-3.36.0.ebuild
deleted file mode 100644
index 53757eb7516..00000000000
--- a/mail-client/geary/geary-3.36.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.44"
-
-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+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
-SLOT="0"
-
-IUSE="ytnef"
-
-KEYWORDS="~amd64 ~x86"
-
-# for now both enchants work, but ensuring enchant:2
-
-# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
-DEPEND="
-	>=dev-libs/glib-2.60.4:2
-	>=x11-libs/gtk+-3.24.7:3
-	>=net-libs/webkit-gtk-2.26.4-r1:4=
-	>=dev-libs/gmime-3.2.4:3.0
-	>=dev-db/sqlite-3.24:3
-
-	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
-	>=app-text/gspell-1.7:=
-	app-text/iso-codes
-	>=dev-libs/json-glib-1.0
-	>=gui-libs/libhandy-0.0.10:0.0=
-	>=dev-libs/libpeas-1.24.0
-	>=app-crypt/libsecret-0.11
-	>=net-libs/libsoup-2.48:2.4
-	>=sys-libs/libunwind-1.1:0
-	>=dev-libs/libxml2-2.7.8:2
-	ytnef? ( >=net-mail/ytnef-1.9.3 )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	>=dev-libs/appstream-glib-0.7.10
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	$(vala_depend)
-	x11-libs/gtk+:3[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	dev-libs/gmime:3.0[vala]
-	app-crypt/gcr:0[introspection,vala]
-	dev-libs/libgee:0.8[introspection]
-	app-text/gspell[vala]
-	gui-libs/libhandy:0.0[vala]
-	app-crypt/libsecret[introspection,vala]
-	net-libs/libsoup:2.4[introspection,vala]
-"
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcontractor=false
-		-Dlibunwind_optional=false # TODO: Automagical if optional=true
-		-Dpoodle=true
-		$(meson_use ytnef tnef-support)
-		-Dvaladoc=false
-		-Dprofile=default
-	)
-
-	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
-}

diff --git a/mail-client/geary/geary-3.36.1.ebuild b/mail-client/geary/geary-3.36.1.ebuild
deleted file mode 100644
index 53757eb7516..00000000000
--- a/mail-client/geary/geary-3.36.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.44"
-
-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+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
-SLOT="0"
-
-IUSE="ytnef"
-
-KEYWORDS="~amd64 ~x86"
-
-# for now both enchants work, but ensuring enchant:2
-
-# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
-DEPEND="
-	>=dev-libs/glib-2.60.4:2
-	>=x11-libs/gtk+-3.24.7:3
-	>=net-libs/webkit-gtk-2.26.4-r1:4=
-	>=dev-libs/gmime-3.2.4:3.0
-	>=dev-db/sqlite-3.24:3
-
-	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
-	>=app-text/gspell-1.7:=
-	app-text/iso-codes
-	>=dev-libs/json-glib-1.0
-	>=gui-libs/libhandy-0.0.10:0.0=
-	>=dev-libs/libpeas-1.24.0
-	>=app-crypt/libsecret-0.11
-	>=net-libs/libsoup-2.48:2.4
-	>=sys-libs/libunwind-1.1:0
-	>=dev-libs/libxml2-2.7.8:2
-	ytnef? ( >=net-mail/ytnef-1.9.3 )
-"
-RDEPEND="${DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-BDEPEND="
-	>=dev-libs/appstream-glib-0.7.10
-	dev-libs/libxml2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-
-	$(vala_depend)
-	x11-libs/gtk+:3[introspection]
-	net-libs/webkit-gtk:4[introspection]
-	dev-libs/gmime:3.0[vala]
-	app-crypt/gcr:0[introspection,vala]
-	dev-libs/libgee:0.8[introspection]
-	app-text/gspell[vala]
-	gui-libs/libhandy:0.0[vala]
-	app-crypt/libsecret[introspection,vala]
-	net-libs/libsoup:2.4[introspection,vala]
-"
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcontractor=false
-		-Dlibunwind_optional=false # TODO: Automagical if optional=true
-		-Dpoodle=true
-		$(meson_use ytnef tnef-support)
-		-Dvaladoc=false
-		-Dprofile=default
-	)
-
-	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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/, mail-client/geary/files/
@ 2022-09-15 21:00 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-09-15 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ed9026c4952af368562337687d3eecde930476b2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 20:44:46 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 21:00:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9026c4

mail-client/geary: Fix test failure with libxml2 >= 2.9.14

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...the-conditional-comments-in-the-test-data.patch | 38 ++++++++++++++++++++++
 mail-client/geary/geary-40.0-r1.ebuild             |  4 +++
 2 files changed, 42 insertions(+)

diff --git a/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
new file mode 100644
index 000000000000..5c01bf9a32f7
--- /dev/null
+++ b/mail-client/geary/files/40.0-Correct-the-conditional-comments-in-the-test-data.patch
@@ -0,0 +1,38 @@
+From 8fb10db1de1fac2ca99fab246a276620ffd6f02b Mon Sep 17 00:00:00 2001
+From: Richard Adenling <dreeze@gmail.com>
+Date: Tue, 10 May 2022 21:18:01 +0200
+Subject: [PATCH] Correct the conditional comments in the test data
+
+This fixes the problem with libxml2 2.9.14 not considering <![ to be a
+valid way to open a tag anymore.
+
+Closes #1367
+---
+ test/engine/rfc822/rfc822-message-data-test.vala | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/engine/rfc822/rfc822-message-data-test.vala b/test/engine/rfc822/rfc822-message-data-test.vala
+index 613e4b9a..d5e25ea0 100644
+--- a/test/engine/rfc822/rfc822-message-data-test.vala
++++ b/test/engine/rfc822/rfc822-message-data-test.vala
+@@ -763,7 +763,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
+ t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
+ "></td>
+ </tr>
+-<![if ! gte mso 9]>
++<!--[if ! gte mso 9]>
+ <tr>
+ <td style=3D"border-collapse: collapse !important;
+ border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
+@@ -803,7 +803,7 @@ ttp://p.ebaystatic.com/aw/email/Welcome_Day_0/spacer.gif" width=3D"5" heigh=
+ t=3D"1" alt=3D"" border=3D"0" style=3D"display:block; width: 5px !important=
+ "></td>
+ </tr>
+-<![if ! gte mso 9]>
++<!--[if ! gte mso 9]>
+ <tr>
+ <td style=3D"border-collapse: collapse !important;
+ border-spacing: 0; !important; padding: 0"><img src=3D"http://p.ebaystatic.=
+-- 
+2.35.1
+

diff --git a/mail-client/geary/geary-40.0-r1.ebuild b/mail-client/geary/geary-40.0-r1.ebuild
index 9b3196a2df32..46711534adaf 100644
--- a/mail-client/geary/geary-40.0-r1.ebuild
+++ b/mail-client/geary/geary-40.0-r1.ebuild
@@ -69,6 +69,10 @@ BDEPEND="
 	net-libs/libsoup:2.4[introspection,vala]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-Correct-the-conditional-comments-in-the-test-data.patch
+)
+
 src_prepare() {
 	vala_src_prepare
 	gnome2_environment_reset


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/, mail-client/geary/files/
@ 2022-09-15 21:00 Matt Turner
  0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-09-15 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     0a302053d3e716e3a566073d1b598306fc8f0e87
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 20:13:24 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 21:00:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a302053

mail-client/geary: Remove vala version restrictions

Also bump to EAPI=8 and add Python 3.11 compatibility while we're here.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 ...bility-issues-with-initializer-of-constan.patch | 40 ++++++++++++++++++++++
 ...Lru-Workaround-missing-generic-type-argum.patch | 25 ++++++++++++++
 .../{geary-40.0-r1.ebuild => geary-40.0-r2.ebuild} | 10 +++---
 3 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
new file mode 100644
index 000000000000..3772fe81c99a
--- /dev/null
+++ b/mail-client/geary/files/40.0-Fix-accessibility-issues-with-initializer-of-constan.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2..e6ba8533 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+ 
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+ 
+ 
+-- 
+2.35.1
+

diff --git a/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
new file mode 100644
index 000000000000..4b9ecbec18b5
--- /dev/null
+++ b/mail-client/geary/files/40.0-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e..ecc275e8 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+     private class CacheEntry<T> {
+ 
+ 
+-        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++        public static int lru_compare(CacheEntry a, CacheEntry b) {
+             if (a.key == b.key) {
+                 return 0;
+             }
+-- 
+2.35.1
+

diff --git a/mail-client/geary/geary-40.0-r1.ebuild b/mail-client/geary/geary-40.0-r2.ebuild
similarity index 91%
rename from mail-client/geary/geary-40.0-r1.ebuild
rename to mail-client/geary/geary-40.0-r2.ebuild
index 46711534adaf..6b149be7cd8b 100644
--- a/mail-client/geary/geary-40.0-r1.ebuild
+++ b/mail-client/geary/geary-40.0-r2.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.48"
-VALA_MAX_API_VERSION="0.54"
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
 
@@ -70,11 +68,13 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PV}-Fix-accessibility-issues-with-initializer-of-constan.patch
+	"${FILESDIR}"/${PV}-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch
 	"${FILESDIR}"/${PV}-Correct-the-conditional-comments-in-the-test-data.patch
 )
 
 src_prepare() {
-	vala_src_prepare
+	vala_setup
 	gnome2_environment_reset
 	default
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-15 21:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-15 21:00 [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/, mail-client/geary/files/ Matt Turner
  -- strict thread matches above, loose matches on Subject: below --
2022-09-15 21:00 Matt Turner
2020-07-19 17:31 Mart Raudsepp
2019-12-29 14:45 Mart Raudsepp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox