* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/
@ 2017-07-18 2:20 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2017-07-18 2:20 UTC (permalink / raw
To: gentoo-commits
commit: b5b6d9c8a928a6c2fa64c6fbbe788739f6beb3f2
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 05:16:43 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 02:01:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b6d9c8
gnome-extra/gnome-calendar: bump to 3.24.3 plus a week grid fixes patch from stable branch
Package-Manager: Portage-2.3.6, Repoman-2.3.2
| 1 +
.../files/3.24.3-week-grid-fixes.patch | 112 +++++++++++++++++++++
.../gnome-calendar/gnome-calendar-3.24.3.ebuild | 41 ++++++++
3 files changed, 154 insertions(+)
--git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index d2a04364169..8669eda22d5 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,2 +1,3 @@
DIST gnome-calendar-3.22.5.tar.xz 2376792 SHA256 5c933189b842f1e836bb366f2fb9e5323961440bcc16b62dc9ac6f6eb4f5314d SHA512 113a77c64fce8317f12d1704bf4076b48abb0f42e4d6e474a7912bc948295bf71e8b9ea00e50301464fa9726cdbfe453af92a24acd3c9ac76a6f40e92062e335 WHIRLPOOL 186efae0a9059b0fa3b4728bd5026f02ac39ccf74120bb9dc1e7d174513e19ceb6e0289204af440ca74b48b3f0a156a1a4d762f80e45e096205fb75b3c920202
DIST gnome-calendar-3.24.0.tar.xz 2400324 SHA256 8a21f51e10ce491e4a492e21c47de29a9ba1b568f4e2fd6f4e33616609d413d0 SHA512 4ed4198557e148da841554b77263e0fa44de31093ca641ae5a3f521787fe2712ab4dc0409d6459da83e105688d97e4c0e097ea2471ab21698b2bc08ab60f686e WHIRLPOOL df5a5320a08535561aecfe64bc39308bc8f54405debf65ec794db55f75d8ef02b19bed05c94cb47803592a278e16104582198ee06dac59c6fe88666583b1aec5
+DIST gnome-calendar-3.24.3.tar.xz 2425292 SHA256 3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67 WHIRLPOOL 8a807675061ecfef862d535460845fd9feae86744f18667cf54ce4721f53ed100677a66ab9bb1a8f118ab9f41504e7a3c444e65c8d88652fe96e2b954bf6110c
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
new file mode 100644
index 00000000000..e382029ceeb
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
@@ -0,0 +1,112 @@
+From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
+From: Abdullahi Usman
+Date: Mon, 10 Jul 2017 11:43:36 +0100
+Subject: week-grid : seperate week's events overlaps.
+
+The week view can display mutilple events that can partly or fully span
+same time ranges.
+
+But week view fails to make correct assumption about the width of events when
+two or more events span some time ranges in which these events also span some
+time ranges with other events, and whereby the number of these other events
+that they span time ranges with does not coincide with the number of the events
+that the other event also span. Week view ended up calculating cells that
+appears horizontally jointed up. Also int16_compare() does not dereference the
+pointer from g_ptr_array_sort() correctly and that makes it sort events
+incorrectly and hence making events appears vertically jointed up.
+
+If an event have other events in which they span some time, we calcuate its width
+by taking into consideration of all the events that the other event may span
+time with. The event that has the higher number of time spans is considered.
+We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
+respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777416
+---
+ src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
+ 1 file changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
+index 20ddb48..ab125b0 100644
+--- a/src/views/gcal-week-grid.c
++++ b/src/views/gcal-week-grid.c
+@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
+ }
+
+ static inline gint
+-int16_compare (gconstpointer a,
+- gconstpointer b)
++uint16_compare (gconstpointer a,
++ gconstpointer b)
+ {
+- return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
++ return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
+ }
+
+ static inline guint
+@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
+ if (!array)
+ return 0;
+
+- g_ptr_array_sort (array, int16_compare);
++ g_ptr_array_sort (array, uint16_compare);
+
+ for (i = 0; array && i < array->len; i++)
+ {
+@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
+
+ n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
+
++ if (n_events == 0)
++ break;
++
++ counter = MAX (counter, n_events);
++ }
++
++ return counter;
++}
++
++static guint
++count_overlaps_of_event (GcalRangeTree *self,
++ guint16 day_start,
++ guint16 day_end,
++ guint16 event_start,
++ guint16 event_end)
++{
++ guint64 i, counter;
++
++ counter = count_overlaps_at_range (self, event_start, day_end);
++
++ for (i = event_start; i > day_start; i--)
++ {
++ guint n_events;
++
++ n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
++
++ if (n_events == 0)
++ break;
++
+ counter = MAX (counter, n_events);
+ }
+
+@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
+ context = gtk_widget_get_style_context (event_widget);
+
+ /* The total number of events available in this range */
+- events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
++ events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
+
+ /* The real horizontal position of this event */
+ widget_index = get_event_index (overlaps, data->start, data->end);
+@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
+ gcal_range_tree_add_range (overlaps,
+ data->start,
+ data->end,
+- GINT_TO_POINTER (widget_index));
++ GUINT_TO_POINTER (widget_index));
+ }
+
+ g_clear_pointer (&widgets_data, g_ptr_array_unref);
+--
+cgit v0.12
+
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
new file mode 100644
index 00000000000..75c1537a99c
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+ >=dev-libs/glib-2.43.4:2
+ >=x11-libs/gtk+-3.21.6:3
+ >=gnome-extra/evolution-data-server-3.17.1:=
+ >=dev-libs/libical-1.0.1:0=
+ net-libs/libsoup:2.4
+ >=net-libs/gnome-online-accounts-3.2.0:=
+ >=gnome-base/gsettings-desktop-schemas-3.21.2
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
+)
+
+src_configure() {
+ # Explicit --enable-debug=minimum forces no -O and -g touching in development (odd minor) versions
+ gnome2_src_configure \
+ --enable-debug=minimum
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/
@ 2018-01-08 14:56 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2018-01-08 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 12625187c65c810e122282e5aec49748109708c3
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 14:55:10 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 14:56:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12625187
gnome-extra/gnome-calendar: fix compatibility with dev-libs/libical:0/3
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../files/3.24.3-libical3-compat.patch | 49 ++++++++++++++++++++++
.../gnome-calendar/gnome-calendar-3.24.3.ebuild | 3 +-
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
new file mode 100644
index 00000000000..5d0160e9773
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
@@ -0,0 +1,49 @@
+From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
+From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
+Date: Wed, 15 Nov 2017 13:09:54 -0800
+Subject: [PATCH] utils: simplify gcal_dup_icaltime
+
+Instead of copying member by member, copy the entire struct contents.
+It works as before, but doesn't depend on the member names.
+
+This fixes compiling gnome-calendar with libical 3.0.0, since the
+struct icaltimetype had one of the members removed (is_utc).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=790072
+---
+ src/gcal-utils.c | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/src/gcal-utils.c b/src/gcal-utils.c
+index c80ba53a..4558f540 100644
+--- a/src/gcal-utils.c
++++ b/src/gcal-utils.c
+@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt)
+ icaltimetype*
+ gcal_dup_icaltime (const icaltimetype *date)
+ {
+- icaltimetype *new_date;
+-
+- if (date == NULL)
+- return NULL;
+-
+- new_date= g_new (icaltimetype, 1);
+- new_date->year = date->year;
+- new_date->month = date->month;
+- new_date->day = date->day;
+- new_date->hour = date->hour;
+- new_date->minute = date->minute;
+- new_date->second = date->second;
+- new_date->is_utc = date->is_utc;
+- new_date->is_date = date->is_date;
+- new_date->is_daylight = date->is_daylight;
+- new_date->zone = date->zone;
+-
+- return new_date;
++ return g_memdup (date, sizeof (icaltimetype));
+ }
+
+ /**
+--
+2.15.1
+
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
index 75c1537a99c..96803962df4 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.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
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
+ "${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/
@ 2019-05-18 21:24 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-05-18 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 9518de0d7729e96f95361dabe05a53bd6dc87f9d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 20:48:38 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat May 18 21:23:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9518de0d
gnome-extra/gnome-calendar: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 -
.../files/3.24.3-libical3-compat.patch | 49 ---------
.../files/3.24.3-week-grid-fixes.patch | 112 ---------------------
.../gnome-calendar/gnome-calendar-3.24.3.ebuild | 43 --------
4 files changed, 205 deletions(-)
--git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 1cd1496b408..2d06a1153da 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1,2 +1 @@
-DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
DIST gnome-calendar-3.30.1.tar.xz 2443936 BLAKE2B 1826488ee03742a9350e589954723264318450d50fa7175955deee8fb3b3bbf2a29fbc6106644bccc062dd45bd9a16e7f40e2928c488bc333ba35d00f2411f25 SHA512 acb428f123fe716b41c4e828213b1106296731b5aa99607838219b8e6c802b22d3481eaa91429cfb34bc3d098344f406ea86c5e2f794f26414ba05bf0189fe29
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
deleted file mode 100644
index 5d0160e9773..00000000000
--- a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
-From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
-Date: Wed, 15 Nov 2017 13:09:54 -0800
-Subject: [PATCH] utils: simplify gcal_dup_icaltime
-
-Instead of copying member by member, copy the entire struct contents.
-It works as before, but doesn't depend on the member names.
-
-This fixes compiling gnome-calendar with libical 3.0.0, since the
-struct icaltimetype had one of the members removed (is_utc).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=790072
----
- src/gcal-utils.c | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/src/gcal-utils.c b/src/gcal-utils.c
-index c80ba53a..4558f540 100644
---- a/src/gcal-utils.c
-+++ b/src/gcal-utils.c
-@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt)
- icaltimetype*
- gcal_dup_icaltime (const icaltimetype *date)
- {
-- icaltimetype *new_date;
--
-- if (date == NULL)
-- return NULL;
--
-- new_date= g_new (icaltimetype, 1);
-- new_date->year = date->year;
-- new_date->month = date->month;
-- new_date->day = date->day;
-- new_date->hour = date->hour;
-- new_date->minute = date->minute;
-- new_date->second = date->second;
-- new_date->is_utc = date->is_utc;
-- new_date->is_date = date->is_date;
-- new_date->is_daylight = date->is_daylight;
-- new_date->zone = date->zone;
--
-- return new_date;
-+ return g_memdup (date, sizeof (icaltimetype));
- }
-
- /**
---
-2.15.1
-
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
deleted file mode 100644
index e382029ceeb..00000000000
--- a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
-From: Abdullahi Usman
-Date: Mon, 10 Jul 2017 11:43:36 +0100
-Subject: week-grid : seperate week's events overlaps.
-
-The week view can display mutilple events that can partly or fully span
-same time ranges.
-
-But week view fails to make correct assumption about the width of events when
-two or more events span some time ranges in which these events also span some
-time ranges with other events, and whereby the number of these other events
-that they span time ranges with does not coincide with the number of the events
-that the other event also span. Week view ended up calculating cells that
-appears horizontally jointed up. Also int16_compare() does not dereference the
-pointer from g_ptr_array_sort() correctly and that makes it sort events
-incorrectly and hence making events appears vertically jointed up.
-
-If an event have other events in which they span some time, we calcuate its width
-by taking into consideration of all the events that the other event may span
-time with. The event that has the higher number of time spans is considered.
-We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
-respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=777416
----
- src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
- 1 file changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
-index 20ddb48..ab125b0 100644
---- a/src/views/gcal-week-grid.c
-+++ b/src/views/gcal-week-grid.c
-@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
- }
-
- static inline gint
--int16_compare (gconstpointer a,
-- gconstpointer b)
-+uint16_compare (gconstpointer a,
-+ gconstpointer b)
- {
-- return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
-+ return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
- }
-
- static inline guint
-@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
- if (!array)
- return 0;
-
-- g_ptr_array_sort (array, int16_compare);
-+ g_ptr_array_sort (array, uint16_compare);
-
- for (i = 0; array && i < array->len; i++)
- {
-@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
-
- n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
-
-+ if (n_events == 0)
-+ break;
-+
-+ counter = MAX (counter, n_events);
-+ }
-+
-+ return counter;
-+}
-+
-+static guint
-+count_overlaps_of_event (GcalRangeTree *self,
-+ guint16 day_start,
-+ guint16 day_end,
-+ guint16 event_start,
-+ guint16 event_end)
-+{
-+ guint64 i, counter;
-+
-+ counter = count_overlaps_at_range (self, event_start, day_end);
-+
-+ for (i = event_start; i > day_start; i--)
-+ {
-+ guint n_events;
-+
-+ n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
-+
-+ if (n_events == 0)
-+ break;
-+
- counter = MAX (counter, n_events);
- }
-
-@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
- context = gtk_widget_get_style_context (event_widget);
-
- /* The total number of events available in this range */
-- events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
-+ events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
-
- /* The real horizontal position of this event */
- widget_index = get_event_index (overlaps, data->start, data->end);
-@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
- gcal_range_tree_add_range (overlaps,
- data->start,
- data->end,
-- GINT_TO_POINTER (widget_index));
-+ GUINT_TO_POINTER (widget_index));
- }
-
- g_clear_pointer (&widgets_data, g_ptr_array_unref);
---
-cgit v0.12
-
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
deleted file mode 100644
index 76a86de0f19..00000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-RDEPEND="
- >=dev-libs/glib-2.43.4:2
- >=x11-libs/gtk+-3.21.6:3
- >=gnome-extra/evolution-data-server-3.17.1:=
- >=dev-libs/libical-1.0.1:0=
- net-libs/libsoup:2.4
- >=net-libs/gnome-online-accounts-3.2.0:=
- >=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/intltool-0.40.6
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
- "${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072
-)
-
-src_configure() {
- # Explicit --enable-debug=minimum forces no -O and -g touching in development (odd minor) versions
- gnome2_src_configure \
- --enable-debug=minimum
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/
@ 2022-01-25 1:53 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-01-25 1:53 UTC (permalink / raw
To: gentoo-commits
commit: 746282fdc63409415bfdf87c308a801cd601cc75
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 01:53:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 01:53:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746282fd
gnome-extra/gnome-calendar: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831926
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gnome-calendar-40.2-meson-0.61.patch | 20 ++++++++++++++++++++
.../gnome-calendar/gnome-calendar-40.2.ebuild | 6 +++++-
.../gnome-calendar/gnome-calendar-41.2.ebuild | 6 +++++-
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
new file mode 100644
index 000000000000..ec5dc0fc6fca
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch
@@ -0,0 +1,20 @@
+https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198.patch
+https://bugs.gentoo.org/831926
+
+From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 21:18:39 +0100
+Subject: [PATCH] meson.build: fix meson 0.61 builds
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+- 'appdata',
+ input: configure_file(
+ input: files('org.gnome.Calendar.appdata.xml.in.in'),
+ output: 'org.gnome.Calendar.appdata.xml.in',
+GitLab
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
index e0432410aee0..b011342f854b 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -36,6 +36,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-40.2-meson-0.61.patch
+)
+
src_test() {
virtx meson_src_test
}
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
index 4ccb6627d062..7045bd688f26 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -36,6 +36,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-40.2-meson-0.61.patch
+)
+
src_test() {
virtx meson_src_test
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/
@ 2024-03-17 3:16 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-03-17 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 82d0f1038dba761dcebeb6ca98fe4d4069afe0ed
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 03:13:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 03:13:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d0f103
gnome-extra/gnome-calendar: fix modern C issue
Closes: https://bugs.gentoo.org/926638
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gnome-calendar-45.1-c99.patch | 23 ++++++++++
.../gnome-calendar/gnome-calendar-45.1-r1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-45.1-c99.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-45.1-c99.patch
new file mode 100644
index 000000000000..1a3411d335fa
--- /dev/null
+++ b/gnome-extra/gnome-calendar/files/gnome-calendar-45.1-c99.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/926638
+https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/2c33d98d82386b0d5e9057c8ba532efc6e202818
+
+From 2c33d98d82386b0d5e9057c8ba532efc6e202818 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Mon, 26 Feb 2024 11:55:29 +0000
+Subject: [PATCH] weather-service: Fix incompatible pointer types
+
+--- a/src/weather/gcal-weather-service.c
++++ b/src/weather/gcal-weather-service.c
+@@ -486,8 +486,8 @@ preprocess_gweather_reports (GcalWeatherService *self,
+ GSList *iter = NULL; /* unowned */
+ GDate cur_gdate;
+ glong first_tomorrow_dtime = -1;
+- glong today_unix;
+- glong unix_now;
++ gint64 today_unix;
++ gint64 unix_now;
+ guint i;
+
+ /*
+--
+GitLab
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
new file mode 100644
index 000000000000..474e4f90fad4
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-45.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+DEPEND="
+ >=dev-libs/libical-1.0.1:0=
+ >=gnome-base/gsettings-desktop-schemas-3.21.2
+ >=gnome-extra/evolution-data-server-3.45.1:=[gtk]
+ net-libs/libsoup:3.0
+ >=gui-libs/libadwaita-1.4_alpha:1
+ >=dev-libs/glib-2.67.5:2
+ >=gui-libs/gtk-4.11.2:4
+ >=dev-libs/libgweather-4.2.0:4=
+ >=app-misc/geoclue-2.4:2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/gnome-calendar-45.1-c99.patch
+)
+
+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] 5+ messages in thread
end of thread, other threads:[~2024-03-17 3:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-18 2:20 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-calendar/files/, gnome-extra/gnome-calendar/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2018-01-08 14:56 Mart Raudsepp
2019-05-18 21:24 Mart Raudsepp
2022-01-25 1:53 Sam James
2024-03-17 3:16 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox