* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/files/, mail-client/geary/
@ 2016-12-06 8:53 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2016-12-06 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 161105c3bbf17ebe14f70be1266a5ea1004b4111
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 08:52:44 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 08:53:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161105c3
mail-client/geary: Fix warnings with vala-0.34 (#601778 by Toralf Förster), don't make warnings fatal.
Package-Manager: portage-2.3.2
.../geary/files/geary-0.11.2-vala-0.34.patch | 72 ++++++++++++++++++++++
mail-client/geary/geary-0.11.2.ebuild | 4 ++
2 files changed, 76 insertions(+)
diff --git a/mail-client/geary/files/geary-0.11.2-vala-0.34.patch b/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
new file mode 100644
index 00000000..b01f577
--- /dev/null
+++ b/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
@@ -0,0 +1,72 @@
+From 8af85ac5a836d877428a6958fbae4b36e29279b0 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Fri, 8 Jul 2016 09:56:42 +0200
+Subject: Fix compile warnings with vala git
+
+---
+ src/client/application/geary-application.vala | 4 ++--
+ src/client/components/conversation-find-bar.vala | 2 +-
+ src/client/dialogs/attachment-dialog.vala | 4 ++--
+ src/console/main.vala | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
+index 3d04f96..2480aab 100644
+--- a/src/client/application/geary-application.vala
++++ b/src/client/application/geary-application.vala
+@@ -36,9 +36,9 @@ public class GearyApplication : Gtk.Application {
+ null
+ };
+
+- private static const string ACTION_ENTRY_COMPOSE = "compose";
++ private const string ACTION_ENTRY_COMPOSE = "compose";
+
+- public static const ActionEntry[] action_entries = {
++ public const ActionEntry[] action_entries = {
+ {ACTION_ENTRY_COMPOSE, activate_compose, "s"},
+ };
+
+diff --git a/src/client/components/conversation-find-bar.vala b/src/client/components/conversation-find-bar.vala
+index 008f4d3..a625896 100644
+--- a/src/client/components/conversation-find-bar.vala
++++ b/src/client/components/conversation-find-bar.vala
+@@ -5,7 +5,7 @@
+ */
+
+ public class ConversationFindBar : Gtk.Layout {
+- private static const string entry_not_found_style =
++ private const string entry_not_found_style =
+ """
+ .geary-not-found {
+ color: white;
+diff --git a/src/client/dialogs/attachment-dialog.vala b/src/client/dialogs/attachment-dialog.vala
+index 79884fa..980e67f 100644
+--- a/src/client/dialogs/attachment-dialog.vala
++++ b/src/client/dialogs/attachment-dialog.vala
+@@ -5,8 +5,8 @@
+ */
+
+ public class AttachmentDialog : Gtk.FileChooserDialog {
+- private static const int PREVIEW_SIZE = 180;
+- private static const int PREVIEW_PADDING = 3;
++ private const int PREVIEW_SIZE = 180;
++ private const int PREVIEW_PADDING = 3;
+
+ private static string? current_folder = null;
+
+diff --git a/src/console/main.vala b/src/console/main.vala
+index 6ae3fff..7d0ba12 100644
+--- a/src/console/main.vala
++++ b/src/console/main.vala
+@@ -15,7 +15,7 @@ errordomain CommandException {
+ class ImapConsole : Gtk.Window {
+ public const string VERSION = _VERSION;
+
+- private static const int KEEPALIVE_SEC = 60 * 10;
++ private const int KEEPALIVE_SEC = 60 * 10;
+
+ private Gtk.TextView console = new Gtk.TextView();
+ private Gtk.Entry cmdline = new Gtk.Entry();
+--
+cgit v0.12
+
diff --git a/mail-client/geary/geary-0.11.2.ebuild b/mail-client/geary/geary-0.11.2.ebuild
index 9382f6a..0e54e82 100644
--- a/mail-client/geary/geary-0.11.2.ebuild
+++ b/mail-client/geary/geary-0.11.2.ebuild
@@ -51,6 +51,9 @@ src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=751558
eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
+ # vala-0.34 compat, fixed in next version, bug #601778
+ eapply "${FILESDIR}"/${P}-vala-0.34.patch
+
local i
if use nls ; then
if [[ -n "${LINGUAS+x}" ]] ; then
@@ -72,6 +75,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DDESKTOP_UPDATE=OFF
+ -DNO_FATAL_WARNINGS=ON
-DGSETTINGS_COMPILE=OFF
-DICON_UPDATE=OFF
-DVALA_EXECUTABLE="${VALAC}"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/files/, mail-client/geary/
@ 2017-02-15 20:38 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2017-02-15 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 134b4b11a51e9d36f3b2d89dfe95dc908a81704d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 20:06:48 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 20:36:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134b4b11
mail-client/geary: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/geary/Manifest | 2 -
.../geary/files/geary-0.11.2-vala-0.34.patch | 72 ------------------
mail-client/geary/geary-0.11.1.ebuild | 81 --------------------
mail-client/geary/geary-0.11.2.ebuild | 87 ----------------------
4 files changed, 242 deletions(-)
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index d0a7244a38..04e6689767 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1 @@
-DIST geary-0.11.1.tar.xz 958616 SHA256 6efc5e1a944ca1c1a991d50d558fbe46ed58763b3f8b7bcd451b15078a9b2eb2 SHA512 5dc50c2c004a48d1df6c17ba492f24a27c51fa1ab2ea01c77d633611783781e9714aeec9bd6dad58856675c3d10d8223d5c75800a32676d7425e896d8479e4ad WHIRLPOOL 3cf0efd34fb4a97a0fb99fe118d6b34d20489a3bae7cd967e833327650596bfa0d49464601dd9cc1ff7d43fd94ee21a4e28726ecdba5c42e9dded724d72e90ea
-DIST geary-0.11.2.tar.xz 961724 SHA256 5c9e20ecd53672a42e22a436b9d3b6b9e9bf81ddf77163414a1c55986f9b4631 SHA512 cbfb7461d3125c94e24a32c1cf6baad417d07ac274f1f1f1df4ef7f07b6c6b872a32a35e69bf33c6c6b8960ac4cf8135984ca33f4d4c8861e4c0a1f22525ba88 WHIRLPOOL 876611449868bd03ae26b4dde13c11c16ee8da7497016235a9e8cca10563bad793a5ae5c80147dfcb2e5c41be4f342d372172702de02880525ff3b797ca9a1bb
DIST geary-0.11.3.tar.xz 964024 SHA256 419e9875c81d00e990aab61d419e64ca925928f046af88362d9029a7ba8c82e4 SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b WHIRLPOOL 3314a7f4b87c5d9e52d9abaefb7b26f1b0713afaadb05f396da92f5dc842745e223f84f1aedad00eafe20e95def6836058175acdb1a5a96d3628f664a29be3ae
diff --git a/mail-client/geary/files/geary-0.11.2-vala-0.34.patch b/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
deleted file mode 100644
index b01f5772ad..0000000000
--- a/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8af85ac5a836d877428a6958fbae4b36e29279b0 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Fri, 8 Jul 2016 09:56:42 +0200
-Subject: Fix compile warnings with vala git
-
----
- src/client/application/geary-application.vala | 4 ++--
- src/client/components/conversation-find-bar.vala | 2 +-
- src/client/dialogs/attachment-dialog.vala | 4 ++--
- src/console/main.vala | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
-index 3d04f96..2480aab 100644
---- a/src/client/application/geary-application.vala
-+++ b/src/client/application/geary-application.vala
-@@ -36,9 +36,9 @@ public class GearyApplication : Gtk.Application {
- null
- };
-
-- private static const string ACTION_ENTRY_COMPOSE = "compose";
-+ private const string ACTION_ENTRY_COMPOSE = "compose";
-
-- public static const ActionEntry[] action_entries = {
-+ public const ActionEntry[] action_entries = {
- {ACTION_ENTRY_COMPOSE, activate_compose, "s"},
- };
-
-diff --git a/src/client/components/conversation-find-bar.vala b/src/client/components/conversation-find-bar.vala
-index 008f4d3..a625896 100644
---- a/src/client/components/conversation-find-bar.vala
-+++ b/src/client/components/conversation-find-bar.vala
-@@ -5,7 +5,7 @@
- */
-
- public class ConversationFindBar : Gtk.Layout {
-- private static const string entry_not_found_style =
-+ private const string entry_not_found_style =
- """
- .geary-not-found {
- color: white;
-diff --git a/src/client/dialogs/attachment-dialog.vala b/src/client/dialogs/attachment-dialog.vala
-index 79884fa..980e67f 100644
---- a/src/client/dialogs/attachment-dialog.vala
-+++ b/src/client/dialogs/attachment-dialog.vala
-@@ -5,8 +5,8 @@
- */
-
- public class AttachmentDialog : Gtk.FileChooserDialog {
-- private static const int PREVIEW_SIZE = 180;
-- private static const int PREVIEW_PADDING = 3;
-+ private const int PREVIEW_SIZE = 180;
-+ private const int PREVIEW_PADDING = 3;
-
- private static string? current_folder = null;
-
-diff --git a/src/console/main.vala b/src/console/main.vala
-index 6ae3fff..7d0ba12 100644
---- a/src/console/main.vala
-+++ b/src/console/main.vala
-@@ -15,7 +15,7 @@ errordomain CommandException {
- class ImapConsole : Gtk.Window {
- public const string VERSION = _VERSION;
-
-- private static const int KEEPALIVE_SEC = 60 * 10;
-+ private const int KEEPALIVE_SEC = 60 * 10;
-
- private Gtk.TextView console = new Gtk.TextView();
- private Gtk.Entry cmdline = new Gtk.Entry();
---
-cgit v0.12
-
diff --git a/mail-client/geary/geary-0.11.1.ebuild b/mail-client/geary/geary-0.11.1.ebuild
deleted file mode 100644
index 4d2f6ecfee..0000000000
--- a/mail-client/geary/geary-0.11.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit eutils gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="
- >=app-crypt/gcr-3.10.1[gtk,introspection,vala]
- app-crypt/libsecret
- dev-db/sqlite:3
- dev-libs/glib:2[dbus]
- >=dev-libs/libgee-0.8.5:0.8
- dev-libs/libxml2:2
- dev-libs/gmime:2.6
- media-libs/libcanberra
- >=net-libs/webkit-gtk-1.10.0:3[introspection]
- >=x11-libs/gtk+-3.10.0:3[introspection]
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- gnome-base/gsettings-desktop-schemas
- nls? ( virtual/libintl )
-"
-DEPEND="${DEPEND}
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- nls? ( sys-devel/gettext )
- $(vala_depend)
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=751556
- eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751558
- eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
-
- local i
- if use nls ; then
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
- else
- sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESKTOP_UPDATE=OFF
- -DGSETTINGS_COMPILE=OFF
- -DICON_UPDATE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DWITH_UNITY=OFF
- -DDESKTOP_VALIDATE=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/mail-client/geary/geary-0.11.2.ebuild b/mail-client/geary/geary-0.11.2.ebuild
deleted file mode 100644
index 0e54e825ea..0000000000
--- a/mail-client/geary/geary-0.11.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit eutils gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- app-crypt/libsecret
- dev-db/sqlite:3
- dev-libs/glib:2[dbus]
- >=dev-libs/libgee-0.8.5:0.8=
- dev-libs/libxml2:2
- dev-libs/gmime:2.6
- media-libs/libcanberra
- >=net-libs/webkit-gtk-1.10.0:3=[introspection]
- >=x11-libs/gtk+-3.10.0:3[introspection]
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- gnome-base/gsettings-desktop-schemas
- nls? ( virtual/libintl )
-"
-DEPEND="${DEPEND}
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- nls? ( sys-devel/gettext )
- $(vala_depend)
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=751556
- # https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in
- # 0.12)
- eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751558
- eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
-
- # vala-0.34 compat, fixed in next version, bug #601778
- eapply "${FILESDIR}"/${P}-vala-0.34.patch
-
- local i
- if use nls ; then
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
- else
- sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESKTOP_UPDATE=OFF
- -DNO_FATAL_WARNINGS=ON
- -DGSETTINGS_COMPILE=OFF
- -DICON_UPDATE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DWITH_UNITY=OFF
- -DDESKTOP_VALIDATE=OFF
- )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/files/, mail-client/geary/
@ 2018-02-03 22:35 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2018-02-03 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 6b0f35bed6e73ab5000b2102a13e3aef1a4b9798
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 22:31:18 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 22:34:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0f35be
mail-client/geary: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
mail-client/geary/Manifest | 1 -
mail-client/geary/files/geary-0.5.3-vapigen.patch | 29 --------
.../geary/files/geary-0.6.0-desktopfile.patch | 12 ----
mail-client/geary/files/geary-0.7.2-cflags.patch | 27 -------
mail-client/geary/geary-0.11.3.ebuild | 83 ----------------------
5 files changed, 152 deletions(-)
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index d438ea5e588..aed6522e175 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,2 +1 @@
-DIST geary-0.11.3.tar.xz 964024 BLAKE2B daf30b11f045741b4f5ec00d245afdcc04763f25526f3c5d12b0408fec9b0ce96a5ef53f01b622b4aed4bb43e879903385a545430d1e0e1bca14a80bce159f8b SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b
DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch
deleted file mode 100644
index 18b3c8049b4..00000000000
--- a/mail-client/geary/files/geary-0.5.3-vapigen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Feb 2 00:17:18 UTC 2014
-Subject: gentoo specific
-
---- geary-0.5.1.tar.xz/src/CMakeLists.txt
-+++ geary-0.5.1.tar.xz/src/CMakeLists.txt
-@@ -399,12 +399,7 @@
- include(ValaPrecompile)
-
- # Vapigen
--find_program(VAPIGEN vapigen)
--if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
-- message(FATAL_ERROR "vapigen must be installed to build Geary.")
--else ()
-- message(STATUS "Found vapigen: " ${VAPIGEN})
--endif ()
-+set(VAPIGEN $ENV{VAPIGEN})
-
- # Packages
- if (LIBMESSAGINGMENU_FOUND)
-@@ -615,7 +610,7 @@
- WORKING_DIRECTORY
- ${CMAKE_SOURCE_DIR}/bindings/metadata
- COMMAND
-- vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
-+ $ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
- )
-
- # Geary client app
diff --git a/mail-client/geary/files/geary-0.6.0-desktopfile.patch b/mail-client/geary/files/geary-0.6.0-desktopfile.patch
deleted file mode 100644
index 3ba892f0bb3..00000000000
--- a/mail-client/geary/files/geary-0.6.0-desktopfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Mar 23 22:56:46 UTC 2014
-Subject: fix desktop file
-
---- a/desktop/geary.desktop.in
-+++ b/desktop/geary.desktop.in
-@@ -17,5 +17,3 @@
- [Desktop Action Compose]
- _Name=Compose Message
- Exec=geary mailto:
--OnlyShowIn=X-Messaging Menu;Unity;
--
diff --git a/mail-client/geary/files/geary-0.7.2-cflags.patch b/mail-client/geary/files/geary-0.7.2-cflags.patch
deleted file mode 100644
index 959ae4b1f34..00000000000
--- a/mail-client/geary/files/geary-0.7.2-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
-Author: hasufell <hasufell@gentoo.org>
-Date: Tue Aug 27 01:40:58 2013 +0200
-
- respect system CFLAGS
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5202b99..949d494 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -471,16 +471,8 @@ set(CFLAGS
- -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
- -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
- -DGCR_API_SUBJECT_TO_CHANGE
-- -g
- )
-
--if (NOT DEBUG)
-- set(CFLAGS
-- ${CFLAGS}
-- -O2
-- )
--endif ()
--
- if (REF_TRACKING)
- message(STATUS "Reference tracking: ON")
- set(EXTRA_VALA_OPTIONS
diff --git a/mail-client/geary/geary-0.11.3.ebuild b/mail-client/geary/geary-0.11.3.ebuild
deleted file mode 100644
index 3a15736c959..00000000000
--- a/mail-client/geary/geary-0.11.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- app-crypt/libsecret
- dev-db/sqlite:3
- dev-libs/glib:2[dbus]
- >=dev-libs/libgee-0.8.5:0.8=
- dev-libs/libxml2:2
- dev-libs/gmime:2.6
- media-libs/libcanberra
- >=net-libs/webkit-gtk-1.10.0:3=[introspection]
- >=x11-libs/gtk+-3.10.0:3[introspection]
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- gnome-base/gsettings-desktop-schemas
- nls? ( virtual/libintl )
-"
-DEPEND="${DEPEND}
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- nls? ( sys-devel/gettext )
- $(vala_depend)
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=751556
- # https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in
- # 0.12)
- eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751558
- eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
-
- local i
- if use nls ; then
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
- else
- sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESKTOP_UPDATE=OFF
- -DNO_FATAL_WARNINGS=ON
- -DGSETTINGS_COMPILE=OFF
- -DICON_UPDATE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DWITH_UNITY=OFF
- -DDESKTOP_VALIDATE=OFF
- )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/files/, mail-client/geary/
@ 2019-02-13 23:37 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-02-13 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 617c218e23fa815cb685b10f5b180f0ee80c1e8d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 23:14:29 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 23:35:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=617c218e
mail-client/geary: bump to 0.12.4, fix build
Closes: https://bugs.gentoo.org/670749
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
mail-client/geary/Manifest | 1 +
.../geary/files/0.12.4-fix-cancellable.patch | 25 +
mail-client/geary/files/geary-0.12-libdir.patch | 54 +++
.../geary/files/geary-0.12-use-upstream-jsc.patch | 511 +++++++++++++++++++++
mail-client/geary/geary-0.12.4.ebuild | 81 ++++
5 files changed, 672 insertions(+)
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 03044b6c872..be51845e507 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1 +1,2 @@
DIST geary-0.12.3.tar.xz 1069444 BLAKE2B 73f4382cd97813fcb3921daeab4338f4797bef2b5dcb1f7df1afeb75be48877109dcb15317f9bbe595326ee38f9ea3359a7d062c39ea3d83e1d36c34b680e707 SHA512 0e22b7ad8b79d17e55f6ab75a13883db04b21b1be9c2b06b08009e48fe433de323e23414ae8e47543bcb7785d6aa90bea582a2e20eaed1ce7bcb02687a69b9b6
+DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c
diff --git a/mail-client/geary/files/0.12.4-fix-cancellable.patch b/mail-client/geary/files/0.12.4-fix-cancellable.patch
new file mode 100644
index 00000000000..6549bd0d622
--- /dev/null
+++ b/mail-client/geary/files/0.12.4-fix-cancellable.patch
@@ -0,0 +1,25 @@
+From 088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 27 Nov 2018 14:53:56 +0100
+Subject: [PATCH] Actually use error variable to check for IOError.CANCELLED
+
+---
+ src/client/application/geary-controller.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
+index 3e6c8fcb..6bfeaab9 100644
+--- a/src/client/application/geary-controller.vala
++++ b/src/client/application/geary-controller.vala
+@@ -2599,7 +2599,7 @@ public class GearyController : Geary.BaseObject {
+ yield do_empty_folder_async(emptyable, cancellable);
+ } catch (Error err) {
+ // don't report to user if cancelled
+- if (cancellable is IOError.CANCELLED)
++ if (err is IOError.CANCELLED)
+ return;
+
+ ErrorDialog dialog = new ErrorDialog(main_window,
+--
+2.18.1
+
diff --git a/mail-client/geary/files/geary-0.12-libdir.patch b/mail-client/geary/files/geary-0.12-libdir.patch
new file mode 100644
index 00000000000..8e84ffa018b
--- /dev/null
+++ b/mail-client/geary/files/geary-0.12-libdir.patch
@@ -0,0 +1,54 @@
+diff -up geary-0.12.0/src/client/application/geary-application.vala.orig geary-0.12.0/src/client/application/geary-application.vala
+--- geary-0.12.0/src/client/application/geary-application.vala.orig 2017-10-02 11:53:11.000000000 +0200
++++ geary-0.12.0/src/client/application/geary-application.vala 2017-10-04 09:06:00.563953050 +0200
+@@ -7,6 +7,7 @@
+ // Defined by CMake build script.
+ extern const string _INSTALL_PREFIX;
+ extern const string _GSETTINGS_DIR;
++extern const string _LIB_SUFFIX;
+ extern const string _SOURCE_ROOT_DIR;
+ extern const string _BUILD_ROOT_DIR;
+ extern const string GETTEXT_PACKAGE;
+@@ -28,6 +29,7 @@ public class GearyApplication : Gtk.Appl
+ public const string VERSION = Geary.Version.GEARY_VERSION;
+ public const string INSTALL_PREFIX = _INSTALL_PREFIX;
+ public const string GSETTINGS_DIR = _GSETTINGS_DIR;
++ public const string LIB_SUFFIX = _LIB_SUFFIX;
+ public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;
+ public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR;
+
+@@ -302,12 +304,12 @@ public class GearyApplication : Gtk.Appl
+ * Returns the directory containing the application's WebExtension libs.
+ *
+ * If the application is installed, this will be
+- * `$INSTALL_PREFIX/lib/geary/web-extension`, else it will be
++ * `$INSTALL_PREFIX/lib$LIB_SUFFIX/geary/web-extension`, else it will be
+ */
+ public File get_web_extensions_dir() {
+ File? dir = get_install_dir();
+ if (dir != null)
+- dir = dir.get_child("lib").get_child("geary").get_child("web-extensions");
++ dir = dir.get_child("lib" + LIB_SUFFIX).get_child("geary").get_child("web-extensions");
+ else
+ dir = File.new_for_path(BUILD_ROOT_DIR).get_child("src");
+ return dir;
+diff -up geary-0.12.0/src/CMakeLists.txt.orig geary-0.12.0/src/CMakeLists.txt
+--- geary-0.12.0/src/CMakeLists.txt.orig 2017-10-02 11:53:11.000000000 +0200
++++ geary-0.12.0/src/CMakeLists.txt 2017-10-04 09:06:00.565953028 +0200
+@@ -567,6 +567,7 @@ set(CFLAGS
+ ${DEPS_CFLAGS}
+ ${DEPS_CFLAGS_OTHER}
+ -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
++ -D_LIB_SUFFIX=\"${LIB_SUFFIX}\"
+ -D_BUILD_ROOT_DIR=\"${CMAKE_BINARY_DIR}\"
+ -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\"
+ -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
+@@ -745,7 +746,7 @@ OPTIONS
+
+ add_library(geary-web-process MODULE ${WEB_PROCESS_VALA_C})
+ target_link_libraries(geary-web-process PRIVATE ${DEPS_LIBRARIES} geary-engine)
+-install(TARGETS geary-web-process LIBRARY DESTINATION lib/geary/web-extensions)
++install(TARGETS geary-web-process LIBRARY DESTINATION lib${LIB_SUFFIX}/geary/web-extensions)
+
+ # Console app
+ #################################################
diff --git a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
new file mode 100644
index 00000000000..c7965ccf315
--- /dev/null
+++ b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
@@ -0,0 +1,511 @@
+commit a0b1827298dc3210ad0ad16b09cff3507c3ad333
+Author: Thomas Moschny <thomas.moschny@gmx.de>
+Date: Sat Jul 14 12:33:47 2018
+
+ Squashed commit of the following:
+
+ commit e091f24b00ec421e1aadd5e360d1550e658ad5ef
+ Author: Michael James Gratton <mike@vee.net>
+ Date: Sun May 20 19:07:56 2018 +1000
+
+ Clean up JS util API courtesy the new bindings.
+
+ commit 0d966950a2cba888873cd3a7f4f42bb7a017dc6d
+ Author: Rico Tzschichholz <ricotz@ubuntu.com>
+ Date: Mon Apr 23 19:56:18 2018 +0200
+
+ Adjust to upstream javascriptcore-4.0 bindings
+
+ commit 5d0f711426d76f878cf9b71f7e8f785199c7cde1
+ Author: Rico Tzschichholz <ricotz@ubuntu.com>
+ Date: Thu Jun 22 15:01:19 2017 +0200
+
+ bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 vapi
+
+diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata
+deleted file mode 100644
+index f3e72e8..0000000
+--- a/bindings/metadata/Soup-2.4.metadata
++++ /dev/null
+@@ -1,3 +0,0 @@
+-AuthDomain.accepts skip
+-AuthDomain.challenge skip
+-
+diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata
+deleted file mode 100644
+index 3e3044f..0000000
+--- a/bindings/metadata/WebKit2-4.0.metadata
++++ /dev/null
+@@ -1,15 +0,0 @@
+-
+-JavascriptResult
+- .get_global_context nullable=false unowned=true
+- .get_value nullable=false unowned=true
+-
+-//Forward upstream
+-Download
+- .failed#signal.error type="WebKit.DownloadError"
+-PrintOperation
+- .failed#signal.error type="WebKit.PrintError"
+-WebResource
+- .failed#signal.error type="GLib.Error"
+-WebView
+- .load_failed#signal.error type="GLib.Error"
+- .show_option_menu#signal skip
+diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
+deleted file mode 100644
+index a994a77..0000000
+--- a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
++++ /dev/null
+@@ -1,5 +0,0 @@
+-namespace WebKit {
+- namespace DOM {
+- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
+- }
+-}
+diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata
+deleted file mode 100644
+index c496dba..0000000
+--- a/bindings/metadata/WebKit2WebExtension-4.0.metadata
++++ /dev/null
+@@ -1,9 +0,0 @@
+-DOM* parent="WebKit.DOM" name="DOM(.+)"
+-
+-DOMEventTarget.add_event_listener skip
+-_ContextMenu skip
+-_ContextMenuItem skip
+-
+-Frame.get_javascript_* nullable=false unowned=true
+-
+-DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc"
+diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi
+deleted file mode 100644
+index d152ce2..0000000
+--- a/bindings/vapi/javascriptcore-4.0.vapi
++++ /dev/null
+@@ -1,155 +0,0 @@
+-/*
+- * Copyright 2017 Michael Gratton <mike@vee.net>
+- *
+- * This software is licensed under the GNU Lesser General Public License
+- * (version 2.1 or later). See the COPYING file in this distribution.
+- */
+-
+-[CCode (cprefix = "JS",
+- gir_namespace = "JavaScriptCore",
+- gir_version = "4.0",
+- lower_case_cprefix = "JS_",
+- cheader_filename = "JavaScriptCore/JavaScript.h")]
+-namespace JS {
+-
+- [CCode (cname = "JSContextRef")]
+- [SimpleType]
+- public struct Context {
+-
+- [CCode (cname = "JSEvaluateScript")]
+- public Value evaluate_script(String script,
+- Object? thisObject,
+- String? sourceURL,
+- int startingLineNumber,
+- out Value? exception);
+-
+- [CCode (cname = "JSCheckScriptSyntax")]
+- public Value check_script_syntax(String script,
+- String? sourceURL,
+- int startingLineNumber,
+- out Value? exception);
+-
+- }
+-
+- [CCode (cname = "JSGlobalContextRef")]
+- [SimpleType]
+- public struct GlobalContext : Context {
+-
+- [CCode (cname = "JSGlobalContextRetain")]
+- public bool retain();
+-
+- [CCode (cname = "JSGlobalContextRelease")]
+- public bool release();
+-
+- }
+-
+- [CCode (cname = "JSType", has_type_id = false)]
+- public enum Type {
+-
+- [CCode (cname = "kJSTypeUndefined")]
+- UNDEFINED,
+-
+- [CCode (cname = "kJSTypeNull")]
+- NULL,
+-
+- [CCode (cname = "kJSTypeBoolean")]
+- BOOLEAN,
+-
+- [CCode (cname = "kJSTypeNumber")]
+- NUMBER,
+-
+- [CCode (cname = "kJSTypeString")]
+- STRING,
+-
+- [CCode (cname = "kJSTypeObject")]
+- OBJECT
+- }
+-
+- [CCode (cname = "JSObjectRef")]
+- [SimpleType]
+- public struct Object {
+-
+- [CCode (cname = "JSObjectMakeFunction")]
+- public Object.make_function(String? name,
+- [CCode (array_length_pos=1.5)]
+- String[]? parameterNames,
+- String body,
+- String? sourceURL,
+- int startingLineNumber,
+- out Value? exception);
+-
+- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)]
+- public Value call_as_function(Context ctx,
+- Object? thisObject,
+- [CCode (array_length_pos=2.5)]
+- Value[]? arguments,
+- out Value? exception);
+-
+- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
+- public bool has_property(Context ctx, String property_name);
+-
+- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)]
+- public Value get_property(Context ctx,
+- String property_name,
+- out Value? exception);
+-
+- }
+-
+- [CCode (cname = "JSValueRef")]
+- [SimpleType]
+- public struct Value {
+-
+- [CCode (cname = "JSValueGetType", instance_pos = 1.1)]
+- public Type get_type(Context context);
+-
+- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)]
+- public bool is_boolean(Context ctx);
+-
+- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)]
+- public bool is_number(Context ctx);
+-
+- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)]
+- public bool is_object(Context ctx);
+-
+- [CCode (cname = "JSValueIsString", instance_pos = 1.1)]
+- public bool is_string(Context ctx);
+-
+- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)]
+- public bool to_boolean(Context ctx);
+-
+- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)]
+- public double to_number(Context ctx, out Value exception);
+-
+- [CCode (cname = "JSValueToObject", instance_pos = 1.1)]
+- public Object to_object(Context ctx, out Value exception);
+-
+- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)]
+- public String to_string_copy(Context ctx, out Value exception);
+-
+- }
+-
+- [CCode (cname = "JSStringRef")]
+- [SimpleType]
+- public struct String {
+-
+- [CCode (cname = "JSStringCreateWithUTF8CString")]
+- public String.create_with_utf8_cstring(string str);
+-
+- [CCode (cname = "JSStringGetLength")]
+- public int String.get_length();
+-
+- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")]
+- public int String.get_maximum_utf8_cstring_size();
+-
+- [CCode (cname = "JSStringGetUTF8CString")]
+- public void String.get_utf8_cstring(string* buffer, int bufferSize);
+-
+- [CCode (cname = "JSStringRetain")]
+- public void String.retain();
+-
+- [CCode (cname = "JSStringRelease")]
+- public void String.release();
+-
+- }
+-
+-}
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1e4213f..e0bebdf 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES
+ gio-2.0
+ glib-2.0
+ gmime-2.6
+- javascriptcore-4.0
++ javascriptcoregtk-4.0
+ libxml-2.0
+ posix
+ sqlite3
+@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES
+ geary-engine
+ gee-0.8
+ gtk+-3.0
+- javascriptcore-4.0
++ javascriptcoregtk-4.0
+ libsoup-2.4
+ webkit2gtk-web-extension-4.0
+ )
+@@ -618,7 +618,6 @@ add_definitions(${CFLAGS})
+ set(VALAC_OPTIONS
+ --vapidir=${CMAKE_BINARY_DIR}/src
+ --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
+ --target-glib=${TARGET_GLIB}
+ --thread
+ --debug
+@@ -650,38 +649,6 @@ set_property(
+ )
+ target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn)
+
+-# WebKit2GTK VAPI generation
+-#################################################
+-add_custom_target(webkit2gtk-vapi
+- DEPENDS
+- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi"
+- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
+- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
+-)
+-add_custom_command(
+- OUTPUT
+- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi
+- DEPENDS
+- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata"
+- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
+- WORKING_DIRECTORY
+- "${CMAKE_SOURCE_DIR}/bindings/metadata"
+- COMMAND
+- vapigen --library=webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2-4.0.gir
+-)
+-add_custom_command(
+- OUTPUT
+- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
+- DEPENDS
+- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata"
+- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala"
+- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
+- WORKING_DIRECTORY
+- "${CMAKE_SOURCE_DIR}/bindings/metadata"
+- COMMAND
+- vapigen --library=webkit2gtk-web-extension-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2WebExtension-4.0.gir WebKit2WebExtension-4.0-custom.vala
+-)
+-
+ # Client library (static lib used for building client and unit tests)
+ #################################################
+
+@@ -698,7 +665,7 @@ OPTIONS
+ )
+
+ add_library(geary-client STATIC ${CLIENT_VALA_C})
+-add_dependencies(geary-client resource_copy webkit2gtk-vapi)
++add_dependencies(geary-client resource_copy)
+ target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine)
+
+ # Main client application binary
+diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala
+index 588d39b..d851235 100644
+--- a/src/client/conversation-viewer/conversation-web-view.vala
++++ b/src/client/conversation-viewer/conversation-web-view.vala
+@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView {
+
+ private void on_deceptive_link_clicked(WebKit.JavascriptResult result) {
+ try {
+- JS.GlobalContext context = result.get_global_context();
++ unowned JS.GlobalContext context = result.get_global_context();
+ JS.Object details = WebKitUtil.to_object(result);
+
+ uint reason = (uint) Geary.JS.to_number(
+diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
+index 319e28a..45a27c4 100644
+--- a/src/client/util/util-webkit.vala
++++ b/src/client/util/util-webkit.vala
+@@ -18,8 +18,8 @@ namespace WebKitUtil {
+ */
+ public bool to_bool(WebKit.JavascriptResult result)
+ throws Geary.JS.Error {
+- JS.GlobalContext context = result.get_global_context();
+- JS.Value value = result.get_value();
++ unowned JS.GlobalContext context = result.get_global_context();
++ unowned JS.Value value = result.get_value();
+ if (!value.is_boolean(context)) {
+ throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object");
+ }
+@@ -59,12 +59,12 @@ namespace WebKitUtil {
+ */
+ public string as_string(WebKit.JavascriptResult result)
+ throws Geary.JS.Error {
+- JS.GlobalContext context = result.get_global_context();
+- JS.Value js_str_value = result.get_value();
++ unowned JS.GlobalContext context = result.get_global_context();
++ unowned JS.Value js_str_value = result.get_value();
+ JS.Value? err = null;
+ JS.String js_str = js_str_value.to_string_copy(context, out err);
+ Geary.JS.check_exception(context, err);
+- return Geary.JS.to_string_released(js_str);
++ return Geary.JS.to_native_string(js_str);
+ }
+
+ /**
+diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
+index ee89139..1f478a6 100644
+--- a/src/client/web-process/web-process-extension.vala
++++ b/src/client/web-process/web-process-extension.vala
+@@ -87,10 +87,9 @@ public class GearyWebExtension : Object {
+ bool should_load = false;
+ WebKit.Frame frame = page.get_main_frame();
+ // Explicit cast fixes build on s390x/ppc64. Bug 783882
+- JS.GlobalContext context = (JS.GlobalContext)
+- frame.get_javascript_global_context();
++ unowned JS.GlobalContext context = frame.get_javascript_global_context();
+ try {
+- JS.Value ret = execute_script(
++ unowned JS.Value ret = execute_script(
+ context, "geary.allowRemoteImages", int.parse("__LINE__")
+ );
+ should_load = ret.to_boolean(context);
+@@ -106,8 +105,7 @@ public class GearyWebExtension : Object {
+ private void remote_image_load_blocked(WebKit.WebPage page) {
+ WebKit.Frame frame = page.get_main_frame();
+ // Explicit cast fixes build on s390x/ppc64. Bug 783882
+- JS.GlobalContext context = (JS.GlobalContext)
+- frame.get_javascript_global_context();
++ unowned JS.GlobalContext context = frame.get_javascript_global_context();
+ try {
+ execute_script(
+ context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__")
+@@ -123,8 +121,7 @@ public class GearyWebExtension : Object {
+ private void selection_changed(WebKit.WebPage page) {
+ WebKit.Frame frame = page.get_main_frame();
+ // Explicit cast fixes build on s390x/ppc64. Bug 783882
+- JS.GlobalContext context = (JS.GlobalContext)
+- frame.get_javascript_global_context();
++ unowned JS.GlobalContext context = frame.get_javascript_global_context();
+ try {
+ execute_script(
+ context, "geary.selectionChanged();", int.parse("__LINE__")
+@@ -136,20 +133,18 @@ public class GearyWebExtension : Object {
+
+ // Return type is nullable as a workaround for Bug 778046, it will
+ // never actually be null.
+- private JS.Value? execute_script(JS.Context context, string script, int line)
++ private unowned JS.Value? execute_script(JS.Context context, string script, int line)
+ throws Geary.JS.Error {
+ JS.String js_script = new JS.String.create_with_utf8_cstring(script);
+ JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__");
+ JS.Value? err = null;
+ try {
+- JS.Value ret = context.evaluate_script(
++ unowned JS.Value ret = context.evaluate_script(
+ js_script, null, js_source, line, out err
+ );
+ Geary.JS.check_exception(context, err);
+ return ret;
+ } finally {
+- js_script.release();
+- js_source.release();
+ }
+ }
+
+diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
+index 4d22429..a98d798 100644
+--- a/src/engine/util/util-js.vala
++++ b/src/engine/util/util-js.vala
+@@ -10,6 +10,16 @@
+ */
+ namespace Geary.JS {
+
++#if !VALA_0_42
++ // Workaround broken version of this in the vala bindings. See Bug
++ // 788113.
++ [CCode (cname = "JSStringGetUTF8CString")]
++ private extern size_t js_string_get_utf8_cstring(
++ global::JS.String js,
++ [CCode (array_length_type = "gsize")] char[] buffer
++ );
++#endif
++
+ /**
+ * Errors produced by functions in {@link Geary.JS}.
+ */
+@@ -72,7 +82,7 @@ namespace Geary.JS {
+ global::JS.String js_str = value.to_string_copy(context, out err);
+ Geary.JS.check_exception(context, err);
+
+- return Geary.JS.to_string_released(js_str);
++ return to_native_string(js_str);
+ }
+
+ /**
+@@ -101,12 +111,15 @@ namespace Geary.JS {
+ /**
+ * Returns a JSC {@link JS.String} as a Vala {@link string}.
+ */
+- public inline string to_string_released(global::JS.String js) {
+- int len = js.get_maximum_utf8_cstring_size();
+- string str = string.nfill(len, 0);
+- js.get_utf8_cstring(str, len);
+- js.release();
+- return str;
++ public inline string to_native_string(global::JS.String js) {
++ size_t len = js.get_maximum_utf8_cstring_size();
++ uint8[] str = new uint8[len];
++#if VALA_0_42
++ js.get_utf8_cstring(str);
++#else
++ js_string_get_utf8_cstring(js, (char[]) str);
++#endif
++ return (string) str;
+ }
+
+ /**
+@@ -125,11 +138,8 @@ namespace Geary.JS {
+ global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name);
+ global::JS.Value? err = null;
+ global::JS.Value prop = object.get_property(context, js_name, out err);
+- try {
+- Geary.JS.check_exception(context, err);
+- } finally {
+- js_name.release();
+- }
++ Geary.JS.check_exception(context, err);
++
+ return prop;
+ }
+
+@@ -157,7 +167,7 @@ namespace Geary.JS {
+
+ throw new Error.EXCEPTION(
+ "JS exception thrown [%s]: %s"
+- .printf(err_type.to_string(), to_string_released(err_str))
++ .printf(err_type.to_string(), to_native_string(err_str))
+ );
+ }
+ }
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index afcca95..7517b3d 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -56,7 +56,7 @@ set(TEST_PACKAGES
+ glib-2.0
+ gmime-2.6
+ gtk+-3.0
+- javascriptcore-4.0
++ javascriptcoregtk-4.0
+ libsoup-2.4
+ webkit2gtk-4.0
+ )
diff --git a/mail-client/geary/geary-0.12.4.ebuild b/mail-client/geary/geary-0.12.4.ebuild
new file mode 100644
index 00000000000..335d1517904
--- /dev/null
+++ b/mail-client/geary/geary-0.12.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_MIN_API_VERSION="0.40"
+# Keep cmake-utils at the end
+inherit gnome2 vala cmake-utils
+
+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"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=dev-libs/glib-2.42:2
+ >=x11-libs/gtk+-3.14.0:3[introspection]
+ >=net-libs/webkit-gtk-2.10.0:4=[introspection]
+ app-text/iso-codes
+ >=dev-db/sqlite-3.12:3
+
+ >=net-libs/libsoup-2.48:2.4[introspection]
+ >=dev-libs/libgee-0.8.5:0.8=[introspection]
+ >=x11-libs/libnotify-0.7.5[introspection]
+ >=media-libs/libcanberra-0.28
+ >=dev-libs/gmime-2.6.17:2.6
+ >=app-crypt/libsecret-0.11[introspection,vala]
+ >=dev-libs/libxml2-2.7.8:2
+ >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
+ >=app-text/enchant-1.6:0
+"
+RDEPEND="${DEPEND}
+ gnome-base/dconf
+ gnome-base/gsettings-desktop-schemas
+" # org.gnome.desktop.interface clock-format global setting usage
+# gnome-doc-utils for xml2po for TRANSLATE_HELP option
+DEPEND="${DEPEND}
+ sys-devel/gettext
+ app-text/gnome-doc-utils
+ dev-util/desktop-file-utils
+ virtual/pkgconfig
+ $(vala_depend)
+"
+
+src_prepare() {
+ eapply "${FILESDIR}"/geary-0.12-libdir.patch
+ eapply "${FILESDIR}"/geary-0.12-use-upstream-jsc.patch
+ eapply "${FILESDIR}"/${PV}-fix-cancellable.patch
+ # https://bugzilla.gnome.org/show_bug.cgi?id=751557
+ sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die
+
+ local i
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ for i in $(cd po ; echo *.po) ; do
+ if ! has ${i%.po} ${LINGUAS} ; then
+ sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
+ fi
+ done
+ fi
+
+ cmake-utils_src_prepare
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DICON_UPDATE=OFF
+ -DDESKTOP_UPDATE=OFF
+ -DDESKTOP_VALIDATE=OFF
+ -DTRANSLATE_HELP=ON
+
+ -DNO_FATAL_WARNINGS=ON
+ -DGSETTINGS_COMPILE=OFF
+ -DVALA_EXECUTABLE="${VALAC}"
+ -DVAPIGEN="${VAPIGEN}"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/files/, mail-client/geary/
@ 2019-12-29 14:45 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-12-29 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 9fbc3efc7330d505fca1f63b3f9c738a19eda503
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 14:44:48 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 14:44:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbc3efc
mail-client/geary: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
mail-client/geary/Manifest | 2 -
.../geary/files/0.12.4-fix-cancellable.patch | 25 -
mail-client/geary/files/geary-0.12-libdir.patch | 54 ---
.../geary/files/geary-0.12-use-upstream-jsc.patch | 511 ---------------------
mail-client/geary/geary-0.12.4.ebuild | 83 ----
mail-client/geary/geary-3.32.0-r1.ebuild | 90 ----
6 files changed, 765 deletions(-)
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 78b991cdcef..2b86dbfcbd7 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1 @@
-DIST geary-0.12.4.tar.xz 1070368 BLAKE2B 7d4c07184cd99ed507839e3f2c53171bf75809e76ef92283a15d93bd3f074ed700f6db2de14263bf8f7c060526023a81e9123433cf11a353c68497a3b70e2bdd SHA512 5bf05390e06ecd7e3b3de35fcfa068e5ad475f1e4f67c4b2ff65d9f8162759cccc1aa47f0ed9c3a0a8d68059fa404d4360e019ac42cdfc86a8258790f0a6df7c
-DIST geary-3.32.0.tar.xz 2228056 BLAKE2B b9ee9e48fb901aa8fe8ef291b8332ac222d7581d1700170aa605071698ea0d8b698511c6e372c9a5056c3d7bf4885ec84aa389f7558fdd00cb4eeb43d745ee39 SHA512 eec6a552fe87c74d364d7242631f6ddfb6cfe35dc4f634ec7aa80342f9e02439255a2a4b12b0f88ee6369962058bbbdc64c390189bd6480a225685ad52cb68f8
DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0
diff --git a/mail-client/geary/files/0.12.4-fix-cancellable.patch b/mail-client/geary/files/0.12.4-fix-cancellable.patch
deleted file mode 100644
index 6549bd0d622..00000000000
--- a/mail-client/geary/files/0.12.4-fix-cancellable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 088cb2c0aa35ad4b54ea5a0a2edaf0ff96c64b45 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 27 Nov 2018 14:53:56 +0100
-Subject: [PATCH] Actually use error variable to check for IOError.CANCELLED
-
----
- src/client/application/geary-controller.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
-index 3e6c8fcb..6bfeaab9 100644
---- a/src/client/application/geary-controller.vala
-+++ b/src/client/application/geary-controller.vala
-@@ -2599,7 +2599,7 @@ public class GearyController : Geary.BaseObject {
- yield do_empty_folder_async(emptyable, cancellable);
- } catch (Error err) {
- // don't report to user if cancelled
-- if (cancellable is IOError.CANCELLED)
-+ if (err is IOError.CANCELLED)
- return;
-
- ErrorDialog dialog = new ErrorDialog(main_window,
---
-2.18.1
-
diff --git a/mail-client/geary/files/geary-0.12-libdir.patch b/mail-client/geary/files/geary-0.12-libdir.patch
deleted file mode 100644
index 8e84ffa018b..00000000000
--- a/mail-client/geary/files/geary-0.12-libdir.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -up geary-0.12.0/src/client/application/geary-application.vala.orig geary-0.12.0/src/client/application/geary-application.vala
---- geary-0.12.0/src/client/application/geary-application.vala.orig 2017-10-02 11:53:11.000000000 +0200
-+++ geary-0.12.0/src/client/application/geary-application.vala 2017-10-04 09:06:00.563953050 +0200
-@@ -7,6 +7,7 @@
- // Defined by CMake build script.
- extern const string _INSTALL_PREFIX;
- extern const string _GSETTINGS_DIR;
-+extern const string _LIB_SUFFIX;
- extern const string _SOURCE_ROOT_DIR;
- extern const string _BUILD_ROOT_DIR;
- extern const string GETTEXT_PACKAGE;
-@@ -28,6 +29,7 @@ public class GearyApplication : Gtk.Appl
- public const string VERSION = Geary.Version.GEARY_VERSION;
- public const string INSTALL_PREFIX = _INSTALL_PREFIX;
- public const string GSETTINGS_DIR = _GSETTINGS_DIR;
-+ public const string LIB_SUFFIX = _LIB_SUFFIX;
- public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR;
- public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR;
-
-@@ -302,12 +304,12 @@ public class GearyApplication : Gtk.Appl
- * Returns the directory containing the application's WebExtension libs.
- *
- * If the application is installed, this will be
-- * `$INSTALL_PREFIX/lib/geary/web-extension`, else it will be
-+ * `$INSTALL_PREFIX/lib$LIB_SUFFIX/geary/web-extension`, else it will be
- */
- public File get_web_extensions_dir() {
- File? dir = get_install_dir();
- if (dir != null)
-- dir = dir.get_child("lib").get_child("geary").get_child("web-extensions");
-+ dir = dir.get_child("lib" + LIB_SUFFIX).get_child("geary").get_child("web-extensions");
- else
- dir = File.new_for_path(BUILD_ROOT_DIR).get_child("src");
- return dir;
-diff -up geary-0.12.0/src/CMakeLists.txt.orig geary-0.12.0/src/CMakeLists.txt
---- geary-0.12.0/src/CMakeLists.txt.orig 2017-10-02 11:53:11.000000000 +0200
-+++ geary-0.12.0/src/CMakeLists.txt 2017-10-04 09:06:00.565953028 +0200
-@@ -567,6 +567,7 @@ set(CFLAGS
- ${DEPS_CFLAGS}
- ${DEPS_CFLAGS_OTHER}
- -D_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\"
-+ -D_LIB_SUFFIX=\"${LIB_SUFFIX}\"
- -D_BUILD_ROOT_DIR=\"${CMAKE_BINARY_DIR}\"
- -D_SOURCE_ROOT_DIR=\"${CMAKE_SOURCE_DIR}\"
- -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
-@@ -745,7 +746,7 @@ OPTIONS
-
- add_library(geary-web-process MODULE ${WEB_PROCESS_VALA_C})
- target_link_libraries(geary-web-process PRIVATE ${DEPS_LIBRARIES} geary-engine)
--install(TARGETS geary-web-process LIBRARY DESTINATION lib/geary/web-extensions)
-+install(TARGETS geary-web-process LIBRARY DESTINATION lib${LIB_SUFFIX}/geary/web-extensions)
-
- # Console app
- #################################################
diff --git a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch b/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
deleted file mode 100644
index c7965ccf315..00000000000
--- a/mail-client/geary/files/geary-0.12-use-upstream-jsc.patch
+++ /dev/null
@@ -1,511 +0,0 @@
-commit a0b1827298dc3210ad0ad16b09cff3507c3ad333
-Author: Thomas Moschny <thomas.moschny@gmx.de>
-Date: Sat Jul 14 12:33:47 2018
-
- Squashed commit of the following:
-
- commit e091f24b00ec421e1aadd5e360d1550e658ad5ef
- Author: Michael James Gratton <mike@vee.net>
- Date: Sun May 20 19:07:56 2018 +1000
-
- Clean up JS util API courtesy the new bindings.
-
- commit 0d966950a2cba888873cd3a7f4f42bb7a017dc6d
- Author: Rico Tzschichholz <ricotz@ubuntu.com>
- Date: Mon Apr 23 19:56:18 2018 +0200
-
- Adjust to upstream javascriptcore-4.0 bindings
-
- commit 5d0f711426d76f878cf9b71f7e8f785199c7cde1
- Author: Rico Tzschichholz <ricotz@ubuntu.com>
- Date: Thu Jun 22 15:01:19 2017 +0200
-
- bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 vapi
-
-diff --git a/bindings/metadata/Soup-2.4.metadata b/bindings/metadata/Soup-2.4.metadata
-deleted file mode 100644
-index f3e72e8..0000000
---- a/bindings/metadata/Soup-2.4.metadata
-+++ /dev/null
-@@ -1,3 +0,0 @@
--AuthDomain.accepts skip
--AuthDomain.challenge skip
--
-diff --git a/bindings/metadata/WebKit2-4.0.metadata b/bindings/metadata/WebKit2-4.0.metadata
-deleted file mode 100644
-index 3e3044f..0000000
---- a/bindings/metadata/WebKit2-4.0.metadata
-+++ /dev/null
-@@ -1,15 +0,0 @@
--
--JavascriptResult
-- .get_global_context nullable=false unowned=true
-- .get_value nullable=false unowned=true
--
--//Forward upstream
--Download
-- .failed#signal.error type="WebKit.DownloadError"
--PrintOperation
-- .failed#signal.error type="WebKit.PrintError"
--WebResource
-- .failed#signal.error type="GLib.Error"
--WebView
-- .load_failed#signal.error type="GLib.Error"
-- .show_option_menu#signal skip
-diff --git a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala b/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
-deleted file mode 100644
-index a994a77..0000000
---- a/bindings/metadata/WebKit2WebExtension-4.0-custom.vala
-+++ /dev/null
-@@ -1,5 +0,0 @@
--namespace WebKit {
-- namespace DOM {
-- public delegate void EventTargetFunc (WebKit.DOM.EventTarget target, WebKit.DOM.Event event);
-- }
--}
-diff --git a/bindings/metadata/WebKit2WebExtension-4.0.metadata b/bindings/metadata/WebKit2WebExtension-4.0.metadata
-deleted file mode 100644
-index c496dba..0000000
---- a/bindings/metadata/WebKit2WebExtension-4.0.metadata
-+++ /dev/null
-@@ -1,9 +0,0 @@
--DOM* parent="WebKit.DOM" name="DOM(.+)"
--
--DOMEventTarget.add_event_listener skip
--_ContextMenu skip
--_ContextMenuItem skip
--
--Frame.get_javascript_* nullable=false unowned=true
--
--DOMEventTarget.add_event_listener_with_closure.handler type="owned WebKit.DOM.EventTargetFunc"
-diff --git a/bindings/vapi/javascriptcore-4.0.vapi b/bindings/vapi/javascriptcore-4.0.vapi
-deleted file mode 100644
-index d152ce2..0000000
---- a/bindings/vapi/javascriptcore-4.0.vapi
-+++ /dev/null
-@@ -1,155 +0,0 @@
--/*
-- * Copyright 2017 Michael Gratton <mike@vee.net>
-- *
-- * This software is licensed under the GNU Lesser General Public License
-- * (version 2.1 or later). See the COPYING file in this distribution.
-- */
--
--[CCode (cprefix = "JS",
-- gir_namespace = "JavaScriptCore",
-- gir_version = "4.0",
-- lower_case_cprefix = "JS_",
-- cheader_filename = "JavaScriptCore/JavaScript.h")]
--namespace JS {
--
-- [CCode (cname = "JSContextRef")]
-- [SimpleType]
-- public struct Context {
--
-- [CCode (cname = "JSEvaluateScript")]
-- public Value evaluate_script(String script,
-- Object? thisObject,
-- String? sourceURL,
-- int startingLineNumber,
-- out Value? exception);
--
-- [CCode (cname = "JSCheckScriptSyntax")]
-- public Value check_script_syntax(String script,
-- String? sourceURL,
-- int startingLineNumber,
-- out Value? exception);
--
-- }
--
-- [CCode (cname = "JSGlobalContextRef")]
-- [SimpleType]
-- public struct GlobalContext : Context {
--
-- [CCode (cname = "JSGlobalContextRetain")]
-- public bool retain();
--
-- [CCode (cname = "JSGlobalContextRelease")]
-- public bool release();
--
-- }
--
-- [CCode (cname = "JSType", has_type_id = false)]
-- public enum Type {
--
-- [CCode (cname = "kJSTypeUndefined")]
-- UNDEFINED,
--
-- [CCode (cname = "kJSTypeNull")]
-- NULL,
--
-- [CCode (cname = "kJSTypeBoolean")]
-- BOOLEAN,
--
-- [CCode (cname = "kJSTypeNumber")]
-- NUMBER,
--
-- [CCode (cname = "kJSTypeString")]
-- STRING,
--
-- [CCode (cname = "kJSTypeObject")]
-- OBJECT
-- }
--
-- [CCode (cname = "JSObjectRef")]
-- [SimpleType]
-- public struct Object {
--
-- [CCode (cname = "JSObjectMakeFunction")]
-- public Object.make_function(String? name,
-- [CCode (array_length_pos=1.5)]
-- String[]? parameterNames,
-- String body,
-- String? sourceURL,
-- int startingLineNumber,
-- out Value? exception);
--
-- [CCode (cname = "JSObjectCallAsFunction", instance_pos = 1.1)]
-- public Value call_as_function(Context ctx,
-- Object? thisObject,
-- [CCode (array_length_pos=2.5)]
-- Value[]? arguments,
-- out Value? exception);
--
-- [CCode (cname = "JSObjectHasProperty", instance_pos = 1.1)]
-- public bool has_property(Context ctx, String property_name);
--
-- [CCode (cname = "JSObjectGetProperty", instance_pos = 1.1)]
-- public Value get_property(Context ctx,
-- String property_name,
-- out Value? exception);
--
-- }
--
-- [CCode (cname = "JSValueRef")]
-- [SimpleType]
-- public struct Value {
--
-- [CCode (cname = "JSValueGetType", instance_pos = 1.1)]
-- public Type get_type(Context context);
--
-- [CCode (cname = "JSValueIsBoolean", instance_pos = 1.1)]
-- public bool is_boolean(Context ctx);
--
-- [CCode (cname = "JSValueIsNumber", instance_pos = 1.1)]
-- public bool is_number(Context ctx);
--
-- [CCode (cname = "JSValueIsObject", instance_pos = 1.1)]
-- public bool is_object(Context ctx);
--
-- [CCode (cname = "JSValueIsString", instance_pos = 1.1)]
-- public bool is_string(Context ctx);
--
-- [CCode (cname = "JSValueToBoolean", instance_pos = 1.1)]
-- public bool to_boolean(Context ctx);
--
-- [CCode (cname = "JSValueToNumber", instance_pos = 1.1)]
-- public double to_number(Context ctx, out Value exception);
--
-- [CCode (cname = "JSValueToObject", instance_pos = 1.1)]
-- public Object to_object(Context ctx, out Value exception);
--
-- [CCode (cname = "JSValueToStringCopy", instance_pos = 1.1)]
-- public String to_string_copy(Context ctx, out Value exception);
--
-- }
--
-- [CCode (cname = "JSStringRef")]
-- [SimpleType]
-- public struct String {
--
-- [CCode (cname = "JSStringCreateWithUTF8CString")]
-- public String.create_with_utf8_cstring(string str);
--
-- [CCode (cname = "JSStringGetLength")]
-- public int String.get_length();
--
-- [CCode (cname = "JSStringGetMaximumUTF8CStringSize")]
-- public int String.get_maximum_utf8_cstring_size();
--
-- [CCode (cname = "JSStringGetUTF8CString")]
-- public void String.get_utf8_cstring(string* buffer, int bufferSize);
--
-- [CCode (cname = "JSStringRetain")]
-- public void String.retain();
--
-- [CCode (cname = "JSStringRelease")]
-- public void String.release();
--
-- }
--
--}
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 1e4213f..e0bebdf 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -526,7 +526,7 @@ set(ENGINE_PACKAGES
- gio-2.0
- glib-2.0
- gmime-2.6
-- javascriptcore-4.0
-+ javascriptcoregtk-4.0
- libxml-2.0
- posix
- sqlite3
-@@ -551,7 +551,7 @@ set(WEB_PROCESS_PACKAGES
- geary-engine
- gee-0.8
- gtk+-3.0
-- javascriptcore-4.0
-+ javascriptcoregtk-4.0
- libsoup-2.4
- webkit2gtk-web-extension-4.0
- )
-@@ -618,7 +618,6 @@ add_definitions(${CFLAGS})
- set(VALAC_OPTIONS
- --vapidir=${CMAKE_BINARY_DIR}/src
- --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
-- --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata
- --target-glib=${TARGET_GLIB}
- --thread
- --debug
-@@ -650,38 +649,6 @@ set_property(
- )
- target_link_libraries(geary-engine m ${DEPS_LIBRARIES} sqlite3-unicodesn)
-
--# WebKit2GTK VAPI generation
--#################################################
--add_custom_target(webkit2gtk-vapi
-- DEPENDS
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi"
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
--)
--add_custom_command(
-- OUTPUT
-- ${CMAKE_BINARY_DIR}/src/webkit2gtk-4.0.vapi
-- DEPENDS
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2-4.0.metadata"
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
-- WORKING_DIRECTORY
-- "${CMAKE_SOURCE_DIR}/bindings/metadata"
-- COMMAND
-- vapigen --library=webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2-4.0.gir
--)
--add_custom_command(
-- OUTPUT
-- "${CMAKE_BINARY_DIR}/src/webkit2gtk-web-extension-4.0.vapi"
-- DEPENDS
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0.metadata"
-- "${CMAKE_SOURCE_DIR}/bindings/metadata/WebKit2WebExtension-4.0-custom.vala"
-- "${CMAKE_SOURCE_DIR}/bindings/vapi/javascriptcore-4.0.vapi"
-- WORKING_DIRECTORY
-- "${CMAKE_SOURCE_DIR}/bindings/metadata"
-- COMMAND
-- vapigen --library=webkit2gtk-web-extension-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg javascriptcore-4.0 --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --metadatadir=${CMAKE_SOURCE_DIR}/bindings/metadata --directory=${CMAKE_BINARY_DIR}/src `${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`/WebKit2WebExtension-4.0.gir WebKit2WebExtension-4.0-custom.vala
--)
--
- # Client library (static lib used for building client and unit tests)
- #################################################
-
-@@ -698,7 +665,7 @@ OPTIONS
- )
-
- add_library(geary-client STATIC ${CLIENT_VALA_C})
--add_dependencies(geary-client resource_copy webkit2gtk-vapi)
-+add_dependencies(geary-client resource_copy)
- target_link_libraries(geary-client m ${DEPS_LIBRARIES} geary-engine)
-
- # Main client application binary
-diff --git a/src/client/conversation-viewer/conversation-web-view.vala b/src/client/conversation-viewer/conversation-web-view.vala
-index 588d39b..d851235 100644
---- a/src/client/conversation-viewer/conversation-web-view.vala
-+++ b/src/client/conversation-viewer/conversation-web-view.vala
-@@ -183,7 +183,7 @@ public class ConversationWebView : ClientWebView {
-
- private void on_deceptive_link_clicked(WebKit.JavascriptResult result) {
- try {
-- JS.GlobalContext context = result.get_global_context();
-+ unowned JS.GlobalContext context = result.get_global_context();
- JS.Object details = WebKitUtil.to_object(result);
-
- uint reason = (uint) Geary.JS.to_number(
-diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
-index 319e28a..45a27c4 100644
---- a/src/client/util/util-webkit.vala
-+++ b/src/client/util/util-webkit.vala
-@@ -18,8 +18,8 @@ namespace WebKitUtil {
- */
- public bool to_bool(WebKit.JavascriptResult result)
- throws Geary.JS.Error {
-- JS.GlobalContext context = result.get_global_context();
-- JS.Value value = result.get_value();
-+ unowned JS.GlobalContext context = result.get_global_context();
-+ unowned JS.Value value = result.get_value();
- if (!value.is_boolean(context)) {
- throw new Geary.JS.Error.TYPE("Result is not a JS Boolean object");
- }
-@@ -59,12 +59,12 @@ namespace WebKitUtil {
- */
- public string as_string(WebKit.JavascriptResult result)
- throws Geary.JS.Error {
-- JS.GlobalContext context = result.get_global_context();
-- JS.Value js_str_value = result.get_value();
-+ unowned JS.GlobalContext context = result.get_global_context();
-+ unowned JS.Value js_str_value = result.get_value();
- JS.Value? err = null;
- JS.String js_str = js_str_value.to_string_copy(context, out err);
- Geary.JS.check_exception(context, err);
-- return Geary.JS.to_string_released(js_str);
-+ return Geary.JS.to_native_string(js_str);
- }
-
- /**
-diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
-index ee89139..1f478a6 100644
---- a/src/client/web-process/web-process-extension.vala
-+++ b/src/client/web-process/web-process-extension.vala
-@@ -87,10 +87,9 @@ public class GearyWebExtension : Object {
- bool should_load = false;
- WebKit.Frame frame = page.get_main_frame();
- // Explicit cast fixes build on s390x/ppc64. Bug 783882
-- JS.GlobalContext context = (JS.GlobalContext)
-- frame.get_javascript_global_context();
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
- try {
-- JS.Value ret = execute_script(
-+ unowned JS.Value ret = execute_script(
- context, "geary.allowRemoteImages", int.parse("__LINE__")
- );
- should_load = ret.to_boolean(context);
-@@ -106,8 +105,7 @@ public class GearyWebExtension : Object {
- private void remote_image_load_blocked(WebKit.WebPage page) {
- WebKit.Frame frame = page.get_main_frame();
- // Explicit cast fixes build on s390x/ppc64. Bug 783882
-- JS.GlobalContext context = (JS.GlobalContext)
-- frame.get_javascript_global_context();
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
- try {
- execute_script(
- context, "geary.remoteImageLoadBlocked();", int.parse("__LINE__")
-@@ -123,8 +121,7 @@ public class GearyWebExtension : Object {
- private void selection_changed(WebKit.WebPage page) {
- WebKit.Frame frame = page.get_main_frame();
- // Explicit cast fixes build on s390x/ppc64. Bug 783882
-- JS.GlobalContext context = (JS.GlobalContext)
-- frame.get_javascript_global_context();
-+ unowned JS.GlobalContext context = frame.get_javascript_global_context();
- try {
- execute_script(
- context, "geary.selectionChanged();", int.parse("__LINE__")
-@@ -136,20 +133,18 @@ public class GearyWebExtension : Object {
-
- // Return type is nullable as a workaround for Bug 778046, it will
- // never actually be null.
-- private JS.Value? execute_script(JS.Context context, string script, int line)
-+ private unowned JS.Value? execute_script(JS.Context context, string script, int line)
- throws Geary.JS.Error {
- JS.String js_script = new JS.String.create_with_utf8_cstring(script);
- JS.String js_source = new JS.String.create_with_utf8_cstring("__FILE__");
- JS.Value? err = null;
- try {
-- JS.Value ret = context.evaluate_script(
-+ unowned JS.Value ret = context.evaluate_script(
- js_script, null, js_source, line, out err
- );
- Geary.JS.check_exception(context, err);
- return ret;
- } finally {
-- js_script.release();
-- js_source.release();
- }
- }
-
-diff --git a/src/engine/util/util-js.vala b/src/engine/util/util-js.vala
-index 4d22429..a98d798 100644
---- a/src/engine/util/util-js.vala
-+++ b/src/engine/util/util-js.vala
-@@ -10,6 +10,16 @@
- */
- namespace Geary.JS {
-
-+#if !VALA_0_42
-+ // Workaround broken version of this in the vala bindings. See Bug
-+ // 788113.
-+ [CCode (cname = "JSStringGetUTF8CString")]
-+ private extern size_t js_string_get_utf8_cstring(
-+ global::JS.String js,
-+ [CCode (array_length_type = "gsize")] char[] buffer
-+ );
-+#endif
-+
- /**
- * Errors produced by functions in {@link Geary.JS}.
- */
-@@ -72,7 +82,7 @@ namespace Geary.JS {
- global::JS.String js_str = value.to_string_copy(context, out err);
- Geary.JS.check_exception(context, err);
-
-- return Geary.JS.to_string_released(js_str);
-+ return to_native_string(js_str);
- }
-
- /**
-@@ -101,12 +111,15 @@ namespace Geary.JS {
- /**
- * Returns a JSC {@link JS.String} as a Vala {@link string}.
- */
-- public inline string to_string_released(global::JS.String js) {
-- int len = js.get_maximum_utf8_cstring_size();
-- string str = string.nfill(len, 0);
-- js.get_utf8_cstring(str, len);
-- js.release();
-- return str;
-+ public inline string to_native_string(global::JS.String js) {
-+ size_t len = js.get_maximum_utf8_cstring_size();
-+ uint8[] str = new uint8[len];
-+#if VALA_0_42
-+ js.get_utf8_cstring(str);
-+#else
-+ js_string_get_utf8_cstring(js, (char[]) str);
-+#endif
-+ return (string) str;
- }
-
- /**
-@@ -125,11 +138,8 @@ namespace Geary.JS {
- global::JS.String js_name = new global::JS.String.create_with_utf8_cstring(name);
- global::JS.Value? err = null;
- global::JS.Value prop = object.get_property(context, js_name, out err);
-- try {
-- Geary.JS.check_exception(context, err);
-- } finally {
-- js_name.release();
-- }
-+ Geary.JS.check_exception(context, err);
-+
- return prop;
- }
-
-@@ -157,7 +167,7 @@ namespace Geary.JS {
-
- throw new Error.EXCEPTION(
- "JS exception thrown [%s]: %s"
-- .printf(err_type.to_string(), to_string_released(err_str))
-+ .printf(err_type.to_string(), to_native_string(err_str))
- );
- }
- }
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index afcca95..7517b3d 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -56,7 +56,7 @@ set(TEST_PACKAGES
- glib-2.0
- gmime-2.6
- gtk+-3.0
-- javascriptcore-4.0
-+ javascriptcoregtk-4.0
- libsoup-2.4
- webkit2gtk-4.0
- )
diff --git a/mail-client/geary/geary-0.12.4.ebuild b/mail-client/geary/geary-0.12.4.ebuild
deleted file mode 100644
index a19a5f7c62e..00000000000
--- a/mail-client/geary/geary-0.12.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="0.42"
-# Keep cmake-utils at the end
-inherit gnome2 vala cmake-utils
-
-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"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- >=dev-libs/glib-2.42:2
- >=x11-libs/gtk+-3.14.0:3[introspection]
- >=net-libs/webkit-gtk-2.10.0:4=[introspection]
- app-text/iso-codes
- >=dev-db/sqlite-3.12:3
-
- >=net-libs/libsoup-2.48:2.4[introspection]
- >=dev-libs/libgee-0.8.5:0.8=[introspection]
- >=x11-libs/libnotify-0.7.5[introspection]
- >=media-libs/libcanberra-0.28
- >=dev-libs/gmime-2.6.17:2.6
- >=app-crypt/libsecret-0.11[introspection,vala]
- >=dev-libs/libxml2-2.7.8:2
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- >=app-text/enchant-1.6:0
-"
-RDEPEND="${DEPEND}
- gnome-base/dconf
- gnome-base/gsettings-desktop-schemas
-" # org.gnome.desktop.interface clock-format global setting usage
-# gnome-doc-utils for xml2po for TRANSLATE_HELP option
-DEPEND="${DEPEND}
- sys-devel/gettext
- dev-util/intltool
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- virtual/pkgconfig
- $(vala_depend)
-"
-
-src_prepare() {
- eapply "${FILESDIR}"/geary-0.12-libdir.patch
- eapply "${FILESDIR}"/geary-0.12-use-upstream-jsc.patch
- eapply "${FILESDIR}"/${PV}-fix-cancellable.patch
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die
-
- local i
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DICON_UPDATE=OFF
- -DDESKTOP_UPDATE=OFF
- -DDESKTOP_VALIDATE=OFF
- -DTRANSLATE_HELP=ON
-
- -DNO_FATAL_WARNINGS=ON
- -DGSETTINGS_COMPILE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DVAPIGEN="${VAPIGEN}"
- )
-
- cmake-utils_src_configure
-}
diff --git a/mail-client/geary/geary-3.32.0-r1.ebuild b/mail-client/geary/geary-3.32.0-r1.ebuild
deleted file mode 100644
index dd806a26e5b..00000000000
--- a/mail-client/geary/geary-3.32.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala 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="unwind"
-
-KEYWORDS="~amd64"
-
-# for now both enchants work
-# FIXME: add valadoc support
-
-DEPEND="
- >=dev-libs/glib-2.54:2
- >=x11-libs/gtk+-3.22.26:3[introspection]
- >=net-libs/webkit-gtk-2.20:4=[introspection]
- app-text/iso-codes
- >=dev-db/sqlite-3.12:3
-
- >=net-libs/libsoup-2.48:2.4[introspection]
- net-libs/gnome-online-accounts
-
- >=dev-libs/libgee-0.8.5:0.8=[introspection]
- >=x11-libs/libnotify-0.7.5[introspection]
- >=media-libs/libcanberra-0.28
- >=dev-libs/gmime-2.6.17:2.6
- >=app-crypt/libsecret-0.11[introspection,vala]
- >=dev-libs/libxml2-2.7.8:2
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- app-text/enchant
- >=dev-libs/folks-0.11:0
- dev-libs/json-glib
- unwind? ( >=sys-libs/libunwind-1.1:7 )
-"
-RDEPEND="${DEPEND}
- gnome-base/dconf
- gnome-base/gsettings-desktop-schemas
-"
-# org.gnome.desktop.interface clock-format global setting usage
-# gnome-doc-utils for xml2po for TRANSLATE_HELP option
-DEPEND="${DEPEND}
- sys-devel/gettext
- dev-util/desktop-file-utils
- virtual/pkgconfig
- $(vala_depend)
-"
-
-src_prepare() {
- local i
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die
- fi
- done
- fi
-
- vala_src_prepare
- xdg_src_prepare
-}
-
-src_configure() {
- # appstream_util & desktop_file_validate doesn't seem to
- # doing anything useful for an actual release, maybe for 9999?
- local emesonargs=(
- -Dlibunwind_optional=$(usex unwind false true)
- -Dpoodle=true
- )
-
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-29 14:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-13 23:37 [gentoo-commits] repo/gentoo:master commit in: mail-client/geary/files/, mail-client/geary/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2019-12-29 14:45 Mart Raudsepp
2018-02-03 22:35 Mart Raudsepp
2017-02-15 20:38 Mart Raudsepp
2016-12-06 8:53 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox