Compare commits
26 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
46c0cf7ae9 | ||
|
|
be4bcd0d9e | ||
|
|
ecf354c0b6 | ||
|
|
535d70749e | ||
|
|
f6696f7717 |
||
|
|
221402d1d7 | ||
|
|
614064ad01 |
||
|
|
e4adc6ae32 | ||
|
|
21daca92e4 |
||
|
|
2e252cb6f0 | ||
|
|
3fa8cfa1ae | ||
|
|
8f32f8e8a4 | ||
|
|
e989a7f1bf |
||
|
|
bfc53ff337 |
||
|
|
08e176fabf | ||
|
|
f780e02ebd |
||
|
|
16f6a3e695 |
||
|
|
bd9e7f9990 |
||
|
|
d9b13e90e4 |
||
|
|
0116286a08 | ||
|
|
bbedba23a8 | ||
|
|
4be1e19a59 |
||
|
|
5ace5740ea |
||
|
|
4e63d83138 |
||
|
|
e58bcc96db |
||
|
|
2b902f4889 |
6 changed files with 1 additions and 315 deletions
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -1,11 +0,0 @@
|
|||
/results_*
|
||||
/*.src.rpm
|
||||
|
||||
/wingpanel-indicator-datetime-2.0.1.tar.xz
|
||||
/wingpanel-indicator-datetime-2.0.2.tar.gz
|
||||
/wingpanel-indicator-datetime-2.1.0.tar.gz
|
||||
/wingpanel-indicator-datetime-2.1.1.tar.gz
|
||||
/wingpanel-indicator-datetime-2.1.2.tar.gz
|
||||
/wingpanel-indicator-datetime-2.1.3.tar.gz
|
||||
/wingpanel-indicator-datetime-2.2.0.tar.gz
|
||||
/wingpanel-indicator-datetime-2.2.1.tar.gz
|
||||
146
3ccd05d.patch
146
3ccd05d.patch
|
|
@ -1,146 +0,0 @@
|
|||
From 3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
|
||||
Date: Fri, 6 Dec 2019 19:41:32 +0100
|
||||
Subject: [PATCH] Add support for libecal-2.0 (#202)
|
||||
|
||||
---
|
||||
meson.build | 16 ++++++++++++--
|
||||
src/Widgets/calendar/CalendarModel.vala | 28 ++++++++++++++++++-------
|
||||
src/Widgets/calendar/Util.vala | 12 +++++++++--
|
||||
3 files changed, 45 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 71c80a1..a1b9b46 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -24,6 +24,18 @@ gresource = gnome.compile_resources(
|
||||
wingpanel_dep = dependency('wingpanel-2.0')
|
||||
wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
|
||||
|
||||
+
|
||||
+libecal_dep = dependency('libecal-2.0', required: false)
|
||||
+if libecal_dep.found()
|
||||
+ libical_dep = dependency('libical-glib')
|
||||
+ add_project_arguments('--define=E_CAL_2_0', language: 'vala')
|
||||
+ add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c')
|
||||
+else
|
||||
+ libecal_dep = dependency('libecal-1.2', version: '>=3.8.0')
|
||||
+ libical_dep = dependency('libical')
|
||||
+ add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala')
|
||||
+endif
|
||||
+
|
||||
shared_module(
|
||||
meson.project_name(),
|
||||
gresource,
|
||||
@@ -43,9 +55,9 @@ shared_module(
|
||||
dependency('gobject-2.0'),
|
||||
dependency('granite'),
|
||||
dependency('gtk+-3.0'),
|
||||
- dependency('libecal-1.2'),
|
||||
+ libecal_dep,
|
||||
dependency('libedataserver-1.2'),
|
||||
- dependency('libical'),
|
||||
+ libical_dep,
|
||||
wingpanel_dep,
|
||||
],
|
||||
install: true,
|
||||
diff --git a/src/Widgets/calendar/CalendarModel.vala b/src/Widgets/calendar/CalendarModel.vala
|
||||
index c30401e..7602303 100644
|
||||
--- a/src/Widgets/calendar/CalendarModel.vala
|
||||
+++ b/src/Widgets/calendar/CalendarModel.vala
|
||||
@@ -260,25 +260,35 @@ namespace DateTime.Widgets {
|
||||
return view;
|
||||
}
|
||||
|
||||
- private void on_objects_added (E.Source source, ECal.Client client, SList<unowned ICal.Component> objects) {
|
||||
+#if E_CAL_2_0
|
||||
+ private void on_objects_added (E.Source source, ECal.Client client, SList<ICal.Component> objects) {
|
||||
+#else
|
||||
+ private void on_objects_added (E.Source source, ECal.Client client, SList<weak ICal.Component> objects) {
|
||||
+#endif
|
||||
debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ());
|
||||
var events = source_events.get (source);
|
||||
var added_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func);
|
||||
-
|
||||
objects.foreach ((comp) => {
|
||||
unowned string uid = comp.get_uid ();
|
||||
+#if E_CAL_2_0
|
||||
+ client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), null, (comp, start, end) => {
|
||||
+ var event = new ECal.Component.from_icalcomponent (comp);
|
||||
+#else
|
||||
client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), (event, start, end) => {
|
||||
+#endif
|
||||
debug_event (source, event);
|
||||
events.set (uid, event);
|
||||
added_events.add (event);
|
||||
return true;
|
||||
});
|
||||
});
|
||||
-
|
||||
- events_added (source, added_events.read_only_view);
|
||||
}
|
||||
|
||||
- private void on_objects_modified (E.Source source, ECal.Client client, SList<unowned ICal.Component> objects) {
|
||||
+#if E_CAL_2_0
|
||||
+ private void on_objects_modified (E.Source source, ECal.Client client, SList<ICal.Component> objects) {
|
||||
+#else
|
||||
+ private void on_objects_modified (E.Source source, ECal.Client client, SList<weak ICal.Component> objects) {
|
||||
+#endif
|
||||
debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ());
|
||||
var updated_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func);
|
||||
|
||||
@@ -294,7 +304,11 @@ namespace DateTime.Widgets {
|
||||
events_updated (source, updated_events.read_only_view);
|
||||
}
|
||||
|
||||
- private void on_objects_removed (E.Source source, ECal.Client client, SList<unowned ECal.ComponentId?> cids) {
|
||||
+#if E_CAL_2_0
|
||||
+ private void on_objects_removed (E.Source source, ECal.Client client, SList<ECal.ComponentId?> cids) {
|
||||
+#else
|
||||
+ private void on_objects_removed (E.Source source, ECal.Client client, SList<weak ECal.ComponentId?> cids) {
|
||||
+#endif
|
||||
debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ());
|
||||
var events = source_events.get (source);
|
||||
var removed_events = new Gee.ArrayList<ECal.Component> ((Gee.EqualDataFunc<ECal.Component>?) Util.calcomponent_equal_func);
|
||||
@@ -304,7 +318,7 @@ namespace DateTime.Widgets {
|
||||
return;
|
||||
}
|
||||
|
||||
- var comps = events.get (cid.uid);
|
||||
+ var comps = events.get (cid.get_uid ());
|
||||
foreach (ECal.Component event in comps) {
|
||||
removed_events.add (event);
|
||||
debug_event (source, event);
|
||||
diff --git a/src/Widgets/calendar/Util.vala b/src/Widgets/calendar/Util.vala
|
||||
index ff9164b..e51f784 100644
|
||||
--- a/src/Widgets/calendar/Util.vala
|
||||
+++ b/src/Widgets/calendar/Util.vala
|
||||
@@ -93,8 +93,16 @@ namespace Util {
|
||||
* XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function…
|
||||
*/
|
||||
public GLib.DateTime ical_to_date_time (ICal.Time date) {
|
||||
+#if E_CAL_2_0
|
||||
+ int year, month, day, hour, minute, second;
|
||||
+ date.get_date (out year, out month, out day);
|
||||
+ date.get_time (out hour, out minute, out second);
|
||||
+ return new GLib.DateTime (timezone_from_ical (date), year, month,
|
||||
+ day, hour, minute, second);
|
||||
+#else
|
||||
return new GLib.DateTime (timezone_from_ical (date), date.year, date.month,
|
||||
date.day, date.hour, date.minute, date.second);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -162,9 +170,9 @@ namespace Util {
|
||||
|
||||
var a_id = a.get_id ();
|
||||
var b_id = b.get_id ();
|
||||
- int res = GLib.strcmp (a_id.uid, b_id.uid);
|
||||
+ int res = GLib.strcmp (a_id.get_uid (), b_id.get_uid ());
|
||||
if (res == 0) {
|
||||
- return GLib.strcmp (a_id.rid, b_id.rid);
|
||||
+ return GLib.strcmp (a_id.get_rid (), b_id.get_rid ());
|
||||
}
|
||||
|
||||
return res;
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Orphaned for 6+ weeks
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
SHA512 (wingpanel-indicator-datetime-2.2.1.tar.gz) = 963416c510f718a5abd4bed92e0036fc4991cbc700b4f4a2120615be69a3c7e5851464ab82f1beed79933f202156a3ebba1b87a01eaebbf37ce67845dbeb3e36
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# false positives
|
||||
addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
|
||||
addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
|
||||
|
|
@ -1,154 +0,0 @@
|
|||
%global __provides_exclude_from ^%{_libdir}/wingpanel/.*\\.so$
|
||||
|
||||
%global appname io.elementary.wingpanel.datetime
|
||||
|
||||
Name: wingpanel-indicator-datetime
|
||||
Summary: Datetime Indicator for wingpanel
|
||||
Version: 2.2.1
|
||||
Release: 2%{?dist}
|
||||
License: GPLv3+
|
||||
|
||||
URL: https://github.com/elementary/wingpanel-indicator-datetime
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# include upstream patch for libecal-2.0 support
|
||||
Patch0: %{url}/commit/3ccd05d.patch
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: meson
|
||||
BuildRequires: vala >= 0.22.0
|
||||
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.32
|
||||
BuildRequires: pkgconfig(granite)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libecal-2.0)
|
||||
BuildRequires: pkgconfig(libical-glib)
|
||||
BuildRequires: pkgconfig(wingpanel-2.0)
|
||||
|
||||
Requires: wingpanel%{?_isa}
|
||||
Supplements: wingpanel%{?_isa}
|
||||
|
||||
|
||||
%description
|
||||
A datetime indicator for wingpanel.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
|
||||
%build
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%find_lang datetime-indicator
|
||||
|
||||
|
||||
%check
|
||||
appstream-util validate-relax --nonet \
|
||||
%{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%files -f datetime-indicator.lang
|
||||
%doc README.md
|
||||
%license COPYING
|
||||
|
||||
%{_libdir}/wingpanel/libdatetime.so
|
||||
|
||||
%{_datadir}/glib-2.0/schemas/io.elementary.desktop.wingpanel.datetime.gschema.xml
|
||||
%{_datadir}/metainfo/%{appname}.appdata.xml
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Dec 07 2019 Fabio Valentini <decathorpe@gmail.com> - 2.2.1-2
|
||||
- Include upstream patch for libecal-2.0 support.
|
||||
|
||||
* Wed Nov 27 2019 Fabio Valentini <decathorpe@gmail.com> - 2.2.1-1
|
||||
- Update to version 2.2.1.
|
||||
|
||||
* Fri Nov 01 2019 Fabio Valentini <decathorpe@gmail.com> - 2.2.0-1
|
||||
- Update to version 2.2.0.
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Jul 08 2019 Fabio Valentini <decathorpe@gmail.com> - 2.1.3-4
|
||||
- Drop unnecessary granite/datetime patch.
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Dec 18 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.3-2
|
||||
- Add patch to move some gsettings to granite itself.
|
||||
|
||||
* Wed Dec 12 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.3-1
|
||||
- Update to version 2.1.3.
|
||||
|
||||
* Wed Nov 14 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-2
|
||||
- Rebuild for libedataserver soname bump.
|
||||
|
||||
* Sat Oct 20 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.2-1
|
||||
- Update to version 2.1.2.
|
||||
|
||||
* Tue Oct 02 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.1-1
|
||||
- Update to version 2.1.1.
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.0-2
|
||||
- Add missing BR: gcc, gcc-c++.
|
||||
|
||||
* Wed Jul 04 2018 Fabio Valentini <decathorpe@gmail.com> - 2.1.0-1
|
||||
- Update to version 2.1.0.
|
||||
|
||||
* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-8
|
||||
- Rebuild for granite5 soname bump.
|
||||
|
||||
* Wed Feb 07 2018 Kalev Lember <klember@redhat.com> - 2.0.2-7
|
||||
- Rebuilt for evolution-data-server soname bump
|
||||
|
||||
* Wed Jan 24 2018 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-6
|
||||
- Add patch to fix undefined symbols.
|
||||
|
||||
* Wed Nov 08 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-5
|
||||
- Rebuild for libical soname bump.
|
||||
|
||||
* Sat Nov 04 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-4
|
||||
- Rebuild for granite soname bump.
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sat Jul 01 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.2-1
|
||||
- Update to version 2.0.2.
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 24 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-3
|
||||
- Remove explicit BR: pkgconfig.
|
||||
|
||||
* Tue Jan 17 2017 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-2
|
||||
- Clean up spec file.
|
||||
|
||||
* Mon Oct 31 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0.1-1
|
||||
- Update to version 2.0.1.
|
||||
|
||||
* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0-3
|
||||
- Mass rebuild.
|
||||
|
||||
* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0-2
|
||||
- Spec file cleanups.
|
||||
|
||||
* Sun Aug 21 2016 Fabio Valentini <decathorpe@gmail.com> - 2.0-1
|
||||
- Update to version 2.0.
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue