Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] planify: update to 4.5.12.
@ 2024-04-09 22:32 oreo639
  2024-04-09 22:35 ` [PR PATCH] [Updated] " oreo639
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: oreo639 @ 2024-04-09 22:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

There is a new pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 6229 bytes --]

From f6fb40d1bf16e30125072da54baf4f256a85c53c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 9 Apr 2024 13:29:28 -0700
Subject: [PATCH] planify: update to 4.5.12.

---
 srcpkgs/planify/patches/00-musl.patch   | 32 +++++++++++++++++++++++++
 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, 56 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..92bac5c33d59c2
--- /dev/null
+++ b/srcpkgs/planify/patches/00-musl.patch
@@ -0,0 +1,32 @@
+
+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);
+         }
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 <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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
@ 2024-04-09 22:35 ` oreo639
  2024-04-09 22:48 ` oreo639
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-09 22:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 6229 bytes --]

From 4548b402abdead7c102876d4bd76bac64c1eed70 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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<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);
+         }
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 <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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
  2024-04-09 22:35 ` [PR PATCH] [Updated] " oreo639
@ 2024-04-09 22:48 ` oreo639
  2024-04-09 22:55 ` oreo639
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-09 22:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 6251 bytes --]

From 71fdad7c79e8cf5c20947dd5ac371dc31994b8b7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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<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);
+         }
diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template
new file mode 100644
index 00000000000000..5dc92327391ad6
--- /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 gtk-update-icon-cache"
+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 <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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
  2024-04-09 22:35 ` [PR PATCH] [Updated] " oreo639
  2024-04-09 22:48 ` oreo639
@ 2024-04-09 22:55 ` oreo639
  2024-04-09 23:12 ` oreo639
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-09 22:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 6273 bytes --]

From d71bfe7bc89c5826d0f6eebf2b86e67b1c24ca87 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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                | 24 +++++++++++++++++++
 srcpkgs/{planner => planify}/update     |  0
 srcpkgs/planner                         |  1 +
 srcpkgs/planner/patches/vala-0.56.patch | 25 --------------------
 srcpkgs/planner/template                | 21 -----------------
 6 files changed, 56 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<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);
+         }
diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template
new file mode 100644
index 00000000000000..b238a78962e08d
--- /dev/null
+++ b/srcpkgs/planify/template
@@ -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 gtk-update-icon-cache
+ desktop-file-utils"
+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 <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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
                   ` (2 preceding siblings ...)
  2024-04-09 22:55 ` oreo639
@ 2024-04-09 23:12 ` oreo639
  2024-04-10  3:04 ` oreo639
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-09 23:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 6274 bytes --]

From 6a0b06c9a8ed0550d60689cd25b41d6ad681fc79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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                | 24 +++++++++++++++++++
 srcpkgs/{planner => planify}/update     |  0
 srcpkgs/planner                         |  1 +
 srcpkgs/planner/patches/vala-0.56.patch | 25 --------------------
 srcpkgs/planner/template                | 21 -----------------
 6 files changed, 56 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<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);
+         }
diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template
new file mode 100644
index 00000000000000..3a922ad60f4a44
--- /dev/null
+++ b/srcpkgs/planify/template
@@ -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="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 <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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
                   ` (3 preceding siblings ...)
  2024-04-09 23:12 ` oreo639
@ 2024-04-10  3:04 ` oreo639
  2024-04-10  3:05 ` oreo639
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-10  3:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 8490 bytes --]

From 4e33d78fc12e7df35009401d5881224897c6c450 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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/patches/libgee-musl.patch | 40 +++++++++++++++++++++++
 srcpkgs/planify/template                  | 24 ++++++++++++++
 srcpkgs/{planner => planify}/update       |  0
 srcpkgs/planner                           |  1 +
 srcpkgs/planner/patches/vala-0.56.patch   | 25 --------------
 srcpkgs/planner/template                  | 21 ------------
 7 files changed, 96 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/planify/patches/00-musl.patch
 create mode 100644 srcpkgs/planify/patches/libgee-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<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);
+         }
diff --git a/srcpkgs/planify/patches/libgee-musl.patch b/srcpkgs/planify/patches/libgee-musl.patch
new file mode 100644
index 00000000000000..773d65efa0fce0
--- /dev/null
+++ b/srcpkgs/planify/patches/libgee-musl.patch
@@ -0,0 +1,40 @@
+For some reason libgee's collection.to_array() returns and 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 () });
+         }
+     }
+ 
diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template
new file mode 100644
index 00000000000000..379692419d4774
--- /dev/null
+++ b/srcpkgs/planify/template
@@ -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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
                   ` (4 preceding siblings ...)
  2024-04-10  3:04 ` oreo639
@ 2024-04-10  3:05 ` oreo639
  2024-04-10  3:06 ` oreo639
  2024-04-10  3:22 ` [PR PATCH] [Merged]: " oreo639
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-10  3:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 8489 bytes --]

From 332bcba24f029696acef7b084e302684480e5949 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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/patches/libgee-musl.patch | 40 +++++++++++++++++++++++
 srcpkgs/planify/template                  | 24 ++++++++++++++
 srcpkgs/{planner => planify}/update       |  0
 srcpkgs/planner                           |  1 +
 srcpkgs/planner/patches/vala-0.56.patch   | 25 --------------
 srcpkgs/planner/template                  | 21 ------------
 7 files changed, 96 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/planify/patches/00-musl.patch
 create mode 100644 srcpkgs/planify/patches/libgee-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<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);
+         }
diff --git a/srcpkgs/planify/patches/libgee-musl.patch b/srcpkgs/planify/patches/libgee-musl.patch
new file mode 100644
index 00000000000000..384b172e8c2183
--- /dev/null
+++ b/srcpkgs/planify/patches/libgee-musl.patch
@@ -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 () });
+         }
+     }
+ 
diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template
new file mode 100644
index 00000000000000..379692419d4774
--- /dev/null
+++ b/srcpkgs/planify/template
@@ -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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
                   ` (5 preceding siblings ...)
  2024-04-10  3:05 ` oreo639
@ 2024-04-10  3:06 ` oreo639
  2024-04-10  3:22 ` [PR PATCH] [Merged]: " oreo639
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-10  3:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages planify
https://github.com/void-linux/void-packages/pull/49777

planify: update to 4.5.12.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/49777.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-planify-49777.patch --]
[-- Type: text/x-diff, Size: 8510 bytes --]

From f583f45ca2900ec6afc99834164f0df65d1ca3eb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
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/patches/libgee-musl.patch | 40 +++++++++++++++++++++++
 srcpkgs/planify/template                  | 24 ++++++++++++++
 srcpkgs/{planner => planify}/update       |  0
 srcpkgs/planner                           |  1 +
 srcpkgs/planner/patches/vala-0.56.patch   | 25 --------------
 srcpkgs/planner/template                  | 21 ------------
 7 files changed, 96 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/planify/patches/00-musl.patch
 create mode 100644 srcpkgs/planify/patches/libgee-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<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);
+         }
diff --git a/srcpkgs/planify/patches/libgee-musl.patch b/srcpkgs/planify/patches/libgee-musl.patch
new file mode 100644
index 00000000000000..749240abbd64a3
--- /dev/null
+++ b/srcpkgs/planify/patches/libgee-musl.patch
@@ -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 () });
+         }
+     }
+ 
diff --git a/srcpkgs/planify/template b/srcpkgs/planify/template
new file mode 100644
index 00000000000000..379692419d4774
--- /dev/null
+++ b/srcpkgs/planify/template
@@ -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}"
+}
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 <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,
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 <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
-}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: planify: update to 4.5.12.
  2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
                   ` (6 preceding siblings ...)
  2024-04-10  3:06 ` oreo639
@ 2024-04-10  3:22 ` oreo639
  7 siblings, 0 replies; 9+ messages in thread
From: oreo639 @ 2024-04-10  3:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1091 bytes --]

There's a merged pull request on the void-packages repository

planify: update to 4.5.12.
https://github.com/void-linux/void-packages/pull/49777

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-04-10  3:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-09 22:32 [PR PATCH] planify: update to 4.5.12 oreo639
2024-04-09 22:35 ` [PR PATCH] [Updated] " oreo639
2024-04-09 22:48 ` oreo639
2024-04-09 22:55 ` oreo639
2024-04-09 23:12 ` oreo639
2024-04-10  3:04 ` oreo639
2024-04-10  3:05 ` oreo639
2024-04-10  3:06 ` oreo639
2024-04-10  3:22 ` [PR PATCH] [Merged]: " oreo639

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).