planify: update to 4.5.12.
This commit is contained in:
oreo639
oreo639
parent
cf863d4bfd
commit
06f02994e0
|
|
@ -0,0 +1,31 @@
|
|||
diff -rup a/meson.build b/meson.build
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -28,7 +28,11 @@ libical_dep = dependency('libical-glib')
|
||||
libportal_dep = [ dependency('libportal'), dependency('libportal-gtk4') ]
|
||||
libgxml_dep = dependency('gxml-0.20')
|
||||
libsecret_dep = dependency('libsecret-1')
|
||||
-m_dep = meson.get_compiler('c').find_library('m', required : false)
|
||||
+cc = meson.get_compiler('c')
|
||||
+m_dep = cc.find_library('m', required : false)
|
||||
+if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
|
||||
+ add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
|
||||
+endif
|
||||
|
||||
|
||||
############
|
||||
diff -rup a/src/Services/CalendarEvents/CalendarEvents.vala b/src/Services/CalendarEvents/CalendarEvents.vala
|
||||
--- a/src/Services/CalendarEvents/CalendarEvents.vala
|
||||
+++ b/src/Services/CalendarEvents/CalendarEvents.vala
|
||||
@@ -65,7 +65,11 @@
|
||||
source_components = new HashTable<E.Source, Gee.TreeMultiMap<string, ECal.Component> > (CalendarEventsUtil.source_hash_func, CalendarEventsUtil.source_equal_func);
|
||||
source_view = new HashTable<string, ECal.ClientView> (str_hash, str_equal);
|
||||
|
||||
+#if HAVE_NL_TIME_FIRST_WEEKDAY
|
||||
int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
|
||||
+#else
|
||||
+ int week_start = 0;
|
||||
+#endif
|
||||
if (week_start >= 1 && week_start <= 7) {
|
||||
week_starts_on = (GLib.DateWeekday) (week_start - 1);
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
For some reason libgee's collection.to_array() returns an array containing the wrong values on musl.
|
||||
This causes segfaults.
|
||||
Use map_iterator() to avoid this.
|
||||
|
||||
--- a/src/Services/ActionManager.vala
|
||||
+++ b/src/Services/ActionManager.vala
|
||||
@@ -103,8 +103,9 @@ public class Services.ActionManager : Ob
|
||||
actions.add_action_entries (ACTION_ENTRIES, this);
|
||||
window.insert_action_group ("win", actions);
|
||||
|
||||
- foreach (var action in action_accelerators.get_keys ()) {
|
||||
- app.set_accels_for_action (ACTION_PREFIX + action, action_accelerators[action].to_array ());
|
||||
+ var iter = action_accelerators.map_iterator ();
|
||||
+ while (iter.next ()) {
|
||||
+ app.set_accels_for_action (ACTION_PREFIX + iter.get_key (), { iter.get_value () });
|
||||
}
|
||||
|
||||
enable_typing_accels ();
|
||||
@@ -115,15 +116,17 @@ public class Services.ActionManager : Ob
|
||||
|
||||
// Temporarily disable all the accelerators that might interfere with input fields.
|
||||
private void disable_typing_accels () {
|
||||
- foreach (var action in typing_accelerators.get_keys ()) {
|
||||
- app.set_accels_for_action (ACTION_PREFIX + action, {});
|
||||
+ var iter = typing_accelerators.map_iterator ();
|
||||
+ while (iter.next ()) {
|
||||
+ app.set_accels_for_action (ACTION_PREFIX + iter.get_key (), {});
|
||||
}
|
||||
}
|
||||
|
||||
// Enable all the accelerators that might interfere with input fields.
|
||||
private void enable_typing_accels () {
|
||||
- foreach (var action in typing_accelerators.get_keys ()) {
|
||||
- app.set_accels_for_action (ACTION_PREFIX + action, typing_accelerators[action].to_array ());
|
||||
+ var iter = typing_accelerators.map_iterator ();
|
||||
+ while (iter.next ()) {
|
||||
+ app.set_accels_for_action (ACTION_PREFIX + iter.get_key (), { iter.get_value () });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
# Template file for 'planify'
|
||||
pkgname=planify
|
||||
version=4.5.12
|
||||
revision=1
|
||||
build_style=meson
|
||||
build_helper="gir"
|
||||
hostmakedepends="gettext pkg-config vala glib-devel curl gtk4-update-icon-cache
|
||||
desktop-file-utils"
|
||||
makedepends="libgee-devel granite7-devel libwebkitgtk60-devel libsoup3-devel
|
||||
libadwaita-devel gtksourceview5-devel json-glib-devel evolution-data-server-devel
|
||||
libportal-gtk4-devel gxml-devel"
|
||||
depends="io.elementary.icons io.elementary.stylesheet curl"
|
||||
short_desc="Task manager with Todoist support designed for GNU/Linux"
|
||||
maintainer="linarcx <linarcx@riseup.net>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://github.com/alainm23/planify"
|
||||
distfiles="https://github.com/alainm23/planify/archive/${version}.tar.gz"
|
||||
checksum=5ee974db43723bd0b90b0c432167ac1d804644ad97cd716e77495020f9528091
|
||||
|
||||
planner_package() {
|
||||
build_style=meta
|
||||
short_desc+=" - transitional dummy package"
|
||||
depends="${sourcepkg}>=${version}_${revision}"
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
planify
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Mon, 14 Mar 2022 23:36:21 +0800
|
||||
Subject: [PATCH] Fix build with vala 0.56
|
||||
|
||||
Otherwise build fails with
|
||||
|
||||
../src/Application.vala:45.50-55.5: error: value is less accessible than constant `Planner.PLANNER_OPTIONS'
|
||||
---
|
||||
src/Application.vala | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Application.vala b/src/Application.vala
|
||||
index 8c1c9ddb..ebd8f726 100644
|
||||
--- a/src/Application.vala
|
||||
+++ b/src/Application.vala
|
||||
@@ -42,7 +42,7 @@ public class Planner : Gtk.Application {
|
||||
private static bool clear_database = false;
|
||||
private static string lang = "";
|
||||
|
||||
- public const OptionEntry[] PLANNER_OPTIONS = {
|
||||
+ private const OptionEntry[] PLANNER_OPTIONS = {
|
||||
{ "version", 'v', 0, OptionArg.NONE, ref version,
|
||||
"Display version number", null },
|
||||
{ "reset", 'r', 0, OptionArg.NONE, ref clear_database,
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# Template file for 'planner'
|
||||
pkgname=planner
|
||||
version=3.0.6
|
||||
revision=1
|
||||
build_style=meson
|
||||
build_helper="gir"
|
||||
hostmakedepends="gettext pkg-config vala glib-devel curl"
|
||||
makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel
|
||||
libhandy1-devel json-glib-devel"
|
||||
depends="io.elementary.icons io.elementary.stylesheet curl"
|
||||
short_desc="Task manager with Todoist support designed for GNU/Linux"
|
||||
maintainer="linarcx <linarcx@riseup.net>"
|
||||
license="GPL-3.0-or-later"
|
||||
homepage="https://github.com/alainm23/planner"
|
||||
distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
|
||||
checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
|
||||
|
||||
post_install() {
|
||||
vinstall data/com.github.alainm23.planner.desktop.in 644 \
|
||||
usr/share/applications com.github.alainm23.planner.desktop
|
||||
}
|
||||
Loading…
Reference in New Issue