public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-todo/, gnome-extra/gnome-todo/files/
@ 2016-11-13 12:07 Gilles Dartiguelongue
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2016-11-13 12:07 UTC (permalink / raw
  To: gentoo-commits

commit:     cb29ed1737f7296471e036136c80160c1ff9f666
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 12:03:57 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 12:03:57 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cb29ed17

gnome-extra/gnome-todo: 3.18.1 → {3.20.2,3.22.0}

Package-Manager: portage-2.3.2
Manifest-Sign-Key: C6085806

 .../files/gnome-todo-3.22.0-link-failure.patch     | 30 ++++++++++++++++++++++
 gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild    |  4 +--
 ...todo-3.20.2.ebuild => gnome-todo-3.22.0.ebuild} | 18 +++++++++----
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/gnome-extra/gnome-todo/files/gnome-todo-3.22.0-link-failure.patch b/gnome-extra/gnome-todo/files/gnome-todo-3.22.0-link-failure.patch
new file mode 100644
index 0000000..03c44ab
--- /dev/null
+++ b/gnome-extra/gnome-todo/files/gnome-todo-3.22.0-link-failure.patch
@@ -0,0 +1,30 @@
+From 4aa960186c90f1cf60c42cb4756da09cba96fc74 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 13 Nov 2016 13:02:42 +0100
+Subject: [PATCH] Fix link failure with missing e_source_get_displayname symbol
+
+---
+ src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 094d463..f6d1194 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -104,11 +104,11 @@ gnome_todo_LDFLAGS = \
+ 	$(GNOME_TODO_WARN_LDFLAGS)
+ 
+ gnome_todo_LDADD = \
+-	$(GNOME_TODO_LIBS) \
+ 	$(top_builddir)/plugins/eds/libeds.la \
+ 	$(top_builddir)/plugins/dark-theme/libdarktheme.la \
+ 	$(top_builddir)/plugins/scheduled-panel/libscheduledpanel.la \
+-	$(top_builddir)/plugins/today-panel/libtodaypanel.la
++	$(top_builddir)/plugins/today-panel/libtodaypanel.la \
++	$(GNOME_TODO_LIBS)
+ 
+ gnome_todo_DEPENDENCIES = \
+ 	$(top_builddir)/plugins/eds/libeds.la \
+-- 
+2.10.2
+

diff --git a/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild b/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
index a8938ec..52e6e18 100644
--- a/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
+++ b/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Todo"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="+introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/gobject-introspection-1.42:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 	>=dev-libs/libical-0.43
 	>=dev-libs/libpeas-1.17
 	>=gnome-extra/evolution-data-server-3.17.1[gtk]

diff --git a/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild b/gnome-extra/gnome-todo/gnome-todo-3.22.0.ebuild
similarity index 64%
copy from gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
copy to gnome-extra/gnome-todo/gnome-todo-3.22.0.ebuild
index a8938ec..508e486 100644
--- a/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
+++ b/gnome-extra/gnome-todo/gnome-todo-3.22.0.ebuild
@@ -12,20 +12,21 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Todo"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="+introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/gobject-introspection-1.42:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 	>=dev-libs/libical-0.43
 	>=dev-libs/libpeas-1.17
 	>=gnome-extra/evolution-data-server-3.17.1[gtk]
 	>=net-libs/gnome-online-accounts-3.2
-	>=x11-libs/gtk+-3.19.5:3
+	>=x11-libs/gtk+-3.22.0:3
 "
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.6
 	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.6
 	sys-devel/gettext
 	virtual/pkgconfig
 "
@@ -38,5 +39,12 @@ src_prepare() {
 }
 
 src_configure() {
-	gnome2_src_configure --enable-eds-plugin
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		--enable-eds-plugin \
+		--enable-dark-theme-plugin \
+		--enable-scheduled-panel-plugin \
+		--enable-score-plugin \
+		--enable-today-panel-plugin \
+		--enable-unscheduled-panel-plugin
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-todo/, gnome-extra/gnome-todo/files/
@ 2017-09-03 22:12 Gilles Dartiguelongue
  0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-03 22:12 UTC (permalink / raw
  To: gentoo-commits

commit:     49152f97b21ebd0ff5b7f73c614bad21dc8fdc5e
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 21:51:08 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 21:51:08 2017 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=49152f97

gnome-extra/gnome-todo: clean up old revisions

Package-Manager: Portage-2.3.8, Repoman-2.3.3
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 .../files/gnome-todo-3.20.2-link-failure.patch     | 27 --------------
 gnome-extra/gnome-todo/gnome-todo-3.18.1.ebuild    | 30 ----------------
 gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild    | 42 ----------------------
 3 files changed, 99 deletions(-)

diff --git a/gnome-extra/gnome-todo/files/gnome-todo-3.20.2-link-failure.patch b/gnome-extra/gnome-todo/files/gnome-todo-3.20.2-link-failure.patch
deleted file mode 100644
index c65b8bca..00000000
--- a/gnome-extra/gnome-todo/files/gnome-todo-3.20.2-link-failure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5862bb70240b1f311e0ace880e3fcf0af1c8c5f8 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 7 Sep 2016 01:31:15 +0200
-Subject: [PATCH] Fix link failure with missing e_source_get_displayname symbol
-
----
- src/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 428226d..1032d29 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -98,8 +98,8 @@ gnome_todo_LDFLAGS = \
- 	$(GNOME_TODO_WARN_LDFLAGS)
- 
- gnome_todo_LDADD = \
--	$(GNOME_TODO_LIBS) \
--	$(top_builddir)/plugins/eds/libeds.a
-+	$(top_builddir)/plugins/eds/libeds.a \
-+	$(GNOME_TODO_LIBS)
- 
- gnome_todo_DEPENDENCIES = \
- 	$(top_builddir)/plugins/eds/libeds.a
--- 
-2.9.3
-

diff --git a/gnome-extra/gnome-todo/gnome-todo-3.18.1.ebuild b/gnome-extra/gnome-todo/gnome-todo-3.18.1.ebuild
deleted file mode 100644
index 28d4c7e9..00000000
--- a/gnome-extra/gnome-todo/gnome-todo-3.18.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Personal task manager"
-HOMEPAGE="https://wiki.gnome.org/Apps/Todo"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/libical-0.43
-	>=gnome-extra/evolution-data-server-3.17.1:=[gtk]
-	>=net-libs/gnome-online-accounts-3.2
-	>=x11-libs/gtk+-3.16:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.6
-	dev-libs/appstream-glib
-	sys-devel/gettext
-	virtual/pkgconfig
-"

diff --git a/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild b/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
deleted file mode 100644
index 55ac2da0..00000000
--- a/gnome-extra/gnome-todo/gnome-todo-3.20.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools gnome2
-
-DESCRIPTION="Personal task manager"
-HOMEPAGE="https://wiki.gnome.org/Apps/Todo"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=dev-libs/libical-0.43
-	>=dev-libs/libpeas-1.17
-	>=gnome-extra/evolution-data-server-3.17.1:=[gtk]
-	>=net-libs/gnome-online-accounts-3.2
-	>=x11-libs/gtk+-3.19.5:3
-	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.6
-	dev-libs/appstream-glib
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-link-failure.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --enable-eds-plugin
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-todo/, gnome-extra/gnome-todo/files/
@ 2018-01-08 14:37 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-01-08 14:37 UTC (permalink / raw
  To: gentoo-commits

commit:     0e92130ec4df66f973c2afbf22de9e18dd1100a7
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 14:26:16 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 14:32:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0e92130e

gnome-extra/gnome-todo: fix compatibility with dev-libs/libical:0/3

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../gnome-todo/files/3.24.2-libical3-compat.patch  | 29 ++++++++++++++++++++++
 gnome-extra/gnome-todo/gnome-todo-3.24.2.ebuild    |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/gnome-extra/gnome-todo/files/3.24.2-libical3-compat.patch b/gnome-extra/gnome-todo/files/3.24.2-libical3-compat.patch
new file mode 100644
index 00000000..f7265da3
--- /dev/null
+++ b/gnome-extra/gnome-todo/files/3.24.2-libical3-compat.patch
@@ -0,0 +1,29 @@
+From a2f3afb3c8a4f8b0a2a361e37b36b10e1e98380c Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Sat, 11 Nov 2017 03:31:47 -0200
+Subject: [PATCH] eds: Build with libical 3.0
+
+Fixes #123
+
+(cherry picked and ported from commit 6de8adc351b758c1d608ae0ea8acf6d35ed502ea)
+---
+ src/gtd-task.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/gtd-task.c b/src/gtd-task.c
+index 1143dad..125e2f3 100644
+--- a/src/gtd-task.c
++++ b/src/gtd-task.c
+@@ -777,8 +777,7 @@ gtd_task_set_complete (GtdTask  *task,
+           dt->hour = g_date_time_get_hour (now);
+           dt->minute = g_date_time_get_minute (now);
+           dt->second = g_date_time_get_seconds (now);
+-          dt->is_date = 0;
+-          dt->is_utc = 1;
++          dt->zone = icaltimezone_get_utc_timezone ();
+ 
+           /* convert timezone
+            *
+-- 
+2.15.1
+

diff --git a/gnome-extra/gnome-todo/gnome-todo-3.24.2.ebuild b/gnome-extra/gnome-todo/gnome-todo-3.24.2.ebuild
index 7bc408d7..7512ec18 100644
--- a/gnome-extra/gnome-todo/gnome-todo-3.24.2.ebuild
+++ b/gnome-extra/gnome-todo/gnome-todo-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,6 +29,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable introspection) \


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-todo/, gnome-extra/gnome-todo/files/
@ 2018-01-17 13:47 Mart Raudsepp
  0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2018-01-17 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     367cde0860c452acf895c312e5d5f4f80a953bde
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 13:45:18 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 13:46:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=367cde08

gnome-extra/gnome-todo: bump to 3.26.2, always build introspection

gnome-todo introspection support is used by its own plugins, so if we
enable score and unscheduled plugin, introspection should be enabled as well.
Because libpeas already always pulls in gobject-introspection, we have no
extra dependency cost here anyways, so just always enable it.
Conversion to use meson, thus adding USE=doc for gtk-doc as they aren't shipped
pregenerated in tarball with meson (USE flag name still to be discussed globally).
Backport libical3 compat patch - file to patch seems to have moved for 3.26
compared to 3.24, and then again on master where it was backported from.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../gnome-todo/files/3.26.2-libical3-compat.patch  | 27 ++++++++++++
 gnome-extra/gnome-todo/gnome-todo-3.26.2.ebuild    | 51 ++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/gnome-extra/gnome-todo/files/3.26.2-libical3-compat.patch b/gnome-extra/gnome-todo/files/3.26.2-libical3-compat.patch
new file mode 100644
index 00000000..efad2e6d
--- /dev/null
+++ b/gnome-extra/gnome-todo/files/3.26.2-libical3-compat.patch
@@ -0,0 +1,27 @@
+From 7362e5becc32cec8eebea5d41d95db8d9ad816bc Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 17 Jan 2018 14:29:38 +0200
+Subject: [PATCH] eds: Build with libical 3.0
+
+Backport of 6de8adc351b758c1d608ae0ea8acf6d35ed502ea
+---
+ src/gtd-task.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/gtd-task.c b/src/gtd-task.c
+index 389f5ad..219ab44 100644
+--- a/src/gtd-task.c
++++ b/src/gtd-task.c
+@@ -777,8 +777,7 @@ gtd_task_set_complete (GtdTask  *task,
+           dt->hour = g_date_time_get_hour (now);
+           dt->minute = g_date_time_get_minute (now);
+           dt->second = g_date_time_get_seconds (now);
+-          dt->is_date = 0;
+-          dt->is_utc = 1;
++          dt->zone = icaltimezone_get_utc_timezone ();
+ 
+           /* convert timezone
+            *
+-- 
+2.10.2
+

diff --git a/gnome-extra/gnome-todo/gnome-todo-3.26.2.ebuild b/gnome-extra/gnome-todo/gnome-todo-3.26.2.ebuild
new file mode 100644
index 00000000..2e056593
--- /dev/null
+++ b/gnome-extra/gnome-todo/gnome-todo-3.26.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome-meson
+
+DESCRIPTION="Personal task manager"
+HOMEPAGE="https://wiki.gnome.org/Apps/Todo"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+# TODO: Todoist plugin seems to require 3.26 GOA for being able to add a Todoist account
+RDEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=net-libs/gnome-online-accounts-3.2.0
+	>=gnome-extra/evolution-data-server-3.17.1:=[gtk]
+	>=dev-libs/libical-0.43
+	>=dev-libs/libpeas-1.17
+	>=dev-libs/gobject-introspection-1.42:=
+"
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.40.0
+	doc? ( dev-util/gtk-doc )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-libical3-compat.patch
+)
+
+src_configure() {
+	# TODO: There aren't any consumers of the introspection outside gnome-todo's own plugins, so maybe we
+	# TODO: should just always build introspection support as an application that needs it for full functionality?
+	gnome-meson_src_configure \
+		-Denable-background-plugin=true \
+		-Denable-dark-theme-plugin=true \
+		-Denable-scheduled-panel-plugin=true \
+		-Denable-score-plugin=true \
+		-Denable-today-panel-plugin=true \
+		-Denable-unscheduled-panel-plugin=true \
+		-Denable-todo-txt-plugin=true \
+		-Denable-todoist-plugin=true \
+		$(meson_use doc enable-gtk-doc) \
+		-Denable-introspection=true
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2018-01-17 13:49 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-13 12:07 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-todo/, gnome-extra/gnome-todo/files/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2017-09-03 22:12 Gilles Dartiguelongue
2018-01-08 14:37 Mart Raudsepp
2018-01-17 13:47 Mart Raudsepp

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