From 4548b402abdead7c102876d4bd76bac64c1eed70 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 9 Apr 2024 13:29:28 -0700 Subject: [PATCH] planify: update to 4.5.12. --- srcpkgs/planify/patches/00-musl.patch | 31 +++++++++++++++++++++++++ srcpkgs/planify/template | 23 ++++++++++++++++++ srcpkgs/{planner => planify}/update | 0 srcpkgs/planner | 1 + srcpkgs/planner/patches/vala-0.56.patch | 25 -------------------- srcpkgs/planner/template | 21 ----------------- 6 files changed, 55 insertions(+), 46 deletions(-) create mode 100644 srcpkgs/planify/patches/00-musl.patch create mode 100644 srcpkgs/planify/template rename srcpkgs/{planner => planify}/update (100%) create mode 120000 srcpkgs/planner delete mode 100644 srcpkgs/planner/patches/vala-0.56.patch delete mode 100644 srcpkgs/planner/template diff --git a/srcpkgs/planify/patches/00-musl.patch b/srcpkgs/planify/patches/00-musl.patch new file mode 100644 index 00000000000000..259a3fe65087ae --- /dev/null +++ b/srcpkgs/planify/patches/00-musl.patch @@ -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 > (CalendarEventsUtil.source_hash_func, CalendarEventsUtil.source_equal_func); + source_view = new HashTable (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); + } diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template new file mode 100644 index 00000000000000..5768600e937b51 --- /dev/null +++ b/srcpkgs/planify/template @@ -0,0 +1,23 @@ +# 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" +makedepends="libgee08-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 " +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}" +} diff --git a/srcpkgs/planner/update b/srcpkgs/planify/update similarity index 100% rename from srcpkgs/planner/update rename to srcpkgs/planify/update diff --git a/srcpkgs/planner b/srcpkgs/planner new file mode 120000 index 00000000000000..726065a7f6bad5 --- /dev/null +++ b/srcpkgs/planner @@ -0,0 +1 @@ +planify \ No newline at end of file diff --git a/srcpkgs/planner/patches/vala-0.56.patch b/srcpkgs/planner/patches/vala-0.56.patch deleted file mode 100644 index bff39d43cc1bd2..00000000000000 --- a/srcpkgs/planner/patches/vala-0.56.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -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, diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template deleted file mode 100644 index b55a40f9306f38..00000000000000 --- a/srcpkgs/planner/template +++ /dev/null @@ -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 " -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 -}