public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/cairo-dock-plug-ins] nightly: update to the latest git
Date: Thu, 09 Jul 2026 01:29:24 GMT [thread overview]
Message-ID: <178356056400.1.16259356582380833713.rpms-cairo-dock-plug-ins-590e4fc6aeae@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cairo-dock-plug-ins
Branch : nightly
Commit : 590e4fc6aeaee8956bc637d1e01784800e44851b
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date : 2026-07-09T10:29:16+09:00
Stats : +4/-84 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/cairo-dock-plug-ins/c/590e4fc6aeaee8956bc637d1e01784800e44851b?branch=nightly
Log:
update to the latest git
---
diff --git a/cairo-dock-plug-ins-pr132-support-ical-4.patch b/cairo-dock-plug-ins-pr132-support-ical-4.patch
deleted file mode 100644
index c0cfaa5..0000000
--- a/cairo-dock-plug-ins-pr132-support-ical-4.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 077af5fd72b4aa42a77c750cef7e85a9ecf84b13 Mon Sep 17 00:00:00 2001
-From: Daniel Kondor <kondor.dani@gmail.com>
-Date: Sun, 5 Jul 2026 13:23:04 +0200
-Subject: [PATCH] clock: update to support newer ical version
-
----
- clock/src/applet-backend-ical.c | 32 +++++++++++++++++++++++++-------
- 1 file changed, 25 insertions(+), 7 deletions(-)
-
-diff --git a/clock/src/applet-backend-ical.c b/clock/src/applet-backend-ical.c
-index 84c6ea05b..aff124fac 100644
---- a/clock/src/applet-backend-ical.c
-+++ b/clock/src/applet-backend-ical.c
-@@ -26,6 +26,7 @@
- #include "applet-calendar.h"
-
- #ifdef CD_CLOCK_ICAL_SUPPORT
-+#include <libical/ical.h>
- #include <libical/icalfileset.h>
- #include <libical/icalset.h>
- #include <libical/icalcomponent.h>
-@@ -201,10 +202,15 @@ static GList *get_tasks (GldiModuleInstance *myApplet)
- pTask->iFrequency = CD_TASK_DONT_REPEAT;
- // TODO: really do the frequency management. If possible.
- icalproperty *rrule = NULL;
-- struct icalrecurrencetype recur;
- rrule = icalcomponent_get_first_property(piCalComponent,ICAL_RRULE_PROPERTY);
-- recur = icalproperty_get_rrule(rrule);
-+
-+#if ICAL_CHECK_VERSION(4,0,0)
-+ struct icalrecurrencetype *recur = icalproperty_get_rrule(rrule);
-+ switch( recur->freq )
-+#else
-+ struct icalrecurrencetype recur = icalproperty_get_rrule(rrule);
- switch( recur.freq )
-+#endif
- {
- case ICAL_MONTHLY_RECURRENCE:pTask->iFrequency = CD_TASK_EACH_MONTH; break;
- case ICAL_YEARLY_RECURRENCE:pTask->iFrequency = CD_TASK_EACH_YEAR; break;
-@@ -266,19 +272,31 @@ static gboolean create_task (CDClockTask *pTask, GldiModuleInstance *myApplet)
- icalcomponent_set_dtstart(piCalComponent, liCalStartDate);
-
- icalproperty *rrule = NULL;
-- struct icalrecurrencetype recur;
-+ const char *freq_str = NULL;
- switch( pTask->iFrequency )
- {
- case CD_TASK_EACH_MONTH:
-- recur = icalrecurrencetype_from_string("FREQ=MONTHLY");
-- rrule = icalproperty_new_rrule(recur);
-+ freq_str = "FREQ=MONTHLY";
- break;
- case CD_TASK_EACH_YEAR:
-- recur = icalrecurrencetype_from_string("FREQ=YEARLY");
-- rrule = icalproperty_new_rrule(recur);
-+ freq_str = "FREQ=YEARLY";
- break;
- default: break;
- }
-+
-+ if( freq_str )
-+ {
-+#if ICAL_CHECK_VERSION(4,0,0)
-+ struct icalrecurrencetype *recur = icalrecurrencetype_new_from_string(freq_str);
-+#else
-+ struct icalrecurrencetype recur = icalrecurrencetype_from_string(freq_str);
-+#endif
-+ rrule = icalproperty_new_rrule(recur);
-+#if ICAL_CHECK_VERSION(4,0,0)
-+ icalrecurrencetype_unref (recur);
-+#endif
-+ }
-+
- if( bIsModification == TRUE )
- {
- // we should remove the previous RECUR property
diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec
index 59b3a49..2ec8f21 100644
--- a/cairo-dock-plug-ins.spec
+++ b/cairo-dock-plug-ins.spec
@@ -4,13 +4,13 @@
%global core_least_ver 3.6.99
%global use_git 1
-%global gitdate 20260514
-%global githash 77abb5eb6b68d59571a690b11d9cf1609c36d023
+%global gitdate 20260706
+%global githash 6970717ea137b813ebb1d3bb8f1a1052db0e5c43
%global shorthash %(c=%{githash} ; echo ${c:0:7})
%global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
-%global baserelease 7
+%global baserelease 1
%dnl %global alphatag .rc9
%global ruby_vendorlib %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
@@ -42,9 +42,6 @@ URL: http://glx-dock.org/
Source0: cairo-dock-plugins-fedora-%{tarballver}.tar.gz
# Source0 is created from Source1
Source1: cairo-dock-plug-ins-create-fedora-tarball.sh
-# https://github.com/Cairo-Dock/cairo-dock-plug-ins/pull/132/
-# Support ical 4
-Patch0: cairo-dock-plug-ins-pr132-support-ical-4.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -208,7 +205,6 @@ binding for Cairo-Dock.
%prep
%setup -q -n cairo-dock-plugins-%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
-%patch -P0 -p1 -b .ical_4
## permission
# %%_fixperms cannot fix permissions completely here
diff --git a/sources b/sources
index e9f626e..4188989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cairo-dock-plugins-fedora-3.6.99-20260514git77abb5e.tar.gz) = 8fea5039277e299aee99d9d43bba256d62f53972b3db1fd6de2644b9b242236d1f3f1f8030ee0cd41d44dd8654bb262cefb54511b595c7d34a1c6266be3ea088
+SHA512 (cairo-dock-plugins-fedora-3.6.99-20260706git6970717.tar.gz) = 0477b0d3ab4ded7a46b08241dd594353d4e3299d7621a74e2b8b0901092bedb1592eabe7a23c701da7d126494a4c84d41c1f414b55c484a4540f41426c061068
next reply other threads:[~2026-07-09 1:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-09 1:29 Mamoru TASAKA [this message]
2026-07-11 13:44 [rpms/cairo-dock-plug-ins] nightly: update to the latest git Mamoru TASAKA
2026-07-19 13:13 Mamoru TASAKA
2026-07-20 7:34 Mamoru TASAKA
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178356056400.1.16259356582380833713.rpms-cairo-dock-plug-ins-590e4fc6aeae@fedoraproject.org \
--to=mtasaka@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox