[PR PATCH] Endeavour: update to 42.0, rename from gnome-todo

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] Endeavour: update to 42.0, rename from gnome-todo
@ 2022-09-19 23:00 paper42
  2022-09-19 23:11 ` [PR PATCH] [Updated] " paper42
  2022-09-26 16:47 ` [PR PATCH] [Merged]: " paper42
  0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2022-09-19 23:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages endeavour
https://github.com/void-linux/void-packages/pull/39380

Endeavour: update to 42.0, rename from gnome-todo
<!-- 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/39380.patch is attached

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

From 9bfb27cc9d107add6427cb02ae518d83a3d79b3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:41:00 +0200
Subject: [PATCH 1/2] Endeavour: update to 42.0, rename from gnome-todo

---
 .../patches/fix-build-race-condition.patch    | 84 +++++++++++++++++++
 srcpkgs/{gnome-todo => Endeavour}/template    | 21 +++--
 srcpkgs/gnome-todo                            |  1 +
 .../patches/fix-build-race-condition.patch    | 65 --------------
 srcpkgs/gnome-todo/patches/libadwaita1.patch  | 11 ---
 srcpkgs/gnome-todo/patches/libportal5.patch   | 54 ------------
 6 files changed, 99 insertions(+), 137 deletions(-)
 create mode 100644 srcpkgs/Endeavour/patches/fix-build-race-condition.patch
 rename srcpkgs/{gnome-todo => Endeavour}/template (56%)
 create mode 120000 srcpkgs/gnome-todo
 delete mode 100644 srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
 delete mode 100644 srcpkgs/gnome-todo/patches/libadwaita1.patch
 delete mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/Endeavour/patches/fix-build-race-condition.patch b/srcpkgs/Endeavour/patches/fix-build-race-condition.patch
new file mode 100644
index 000000000000..42bfb99b5e48
--- /dev/null
+++ b/srcpkgs/Endeavour/patches/fix-build-race-condition.patch
@@ -0,0 +1,84 @@
+From b492285e2a4fafad887df2c4fd2a5bdb53ce39fb Mon Sep 17 00:00:00 2001
+From: Jamie Murphy <hello@itsjamie.dev>
+Date: Fri, 5 Aug 2022 18:52:20 -0700
+Subject: [PATCH] build: Generate enum headers first
+
+Fixes #380, #398, !120, !110
+---
+ src/meson.build         | 38 +++++++++++++++++++-------------------
+ src/plugins/meson.build |  3 ++-
+ 2 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index deb410a2..8f621e78 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
+ 
+ endeavour_deps += vcs_identifier_h
+ 
++#########
++# Enums #
++#########
++
++enum_headers = files(
++  join_paths('animation', 'gtd-animation-enums.h'),
++)
++
++enum_types = 'gtd-enum-types'
++
++gtd_enum_types = gnome.mkenums(
++  enum_types,
++     sources: enum_headers,
++  c_template: enum_types + '.c.template',
++  h_template: enum_types + '.h.template'
++)
++
++sources += gtd_enum_types
++
+ ###########
+ # Plugins #
+ ###########
+@@ -42,25 +61,6 @@ gtd_deps = endeavour_deps + [
+   plugins_dep,
+ ]
+ 
+-
+-#########
+-# Enums #
+-#########
+-
+-enum_headers = files(
+-  join_paths('animation', 'gtd-animation-enums.h'),
+-)
+-
+-enum_types = 'gtd-enum-types'
+-
+-sources += gnome.mkenums(
+-  enum_types,
+-     sources: enum_headers,
+-  c_template: enum_types + '.c.template',
+-  h_template: enum_types + '.h.template'
+-)
+-
+-
+ ################
+ # Header files #
+ ################
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 3d7ac4e4..2a13aff5 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -3,7 +3,8 @@ plugins_incs = [
+   include_directories('..'),
+ ]
+ 
+-plugins_sources = []
++# Ensure enum types header is generated before building plugins
++plugins_sources = [ gtd_enum_types[1] ]
+ plugins_deps = [ endeavour_deps ]
+ plugins_ldflags = []
+ plugins_libs = []
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/Endeavour/template
similarity index 56%
rename from srcpkgs/gnome-todo/template
rename to srcpkgs/Endeavour/template
index dc3031156c79..be67334d8c77 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/Endeavour/template
@@ -1,8 +1,9 @@
-# Template file for 'gnome-todo'
-pkgname=gnome-todo
-version=41.0
-revision=2
+# Template file for 'Endeavour'
+pkgname=Endeavour
+version=42.0
+revision=1
 build_style=meson
+wrksrc="${pkgname}-v${version}"
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config glib-devel gettext itstool
@@ -10,11 +11,11 @@ hostmakedepends="pkg-config glib-devel gettext itstool
 makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
  libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
 short_desc="Task manager designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Todo"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a657c978f451f61fb773f0b14f3121b9236fc504b41eb20940b4ed2004224e5
+distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/v${version}/Endeavour-v${version}.tar.gz"
+checksum=6ad8d5f06b86715e6bd43f1bcbd1d4cf2dd9d5b7ee1876b7ffce88bcc5a4bbd8
 
 build_options="gir"
 build_options_default="gir"
@@ -23,3 +24,9 @@ do_check() {
 	glib-compile-schemas data
 	GSETTINGS_SCHEMA_DIR=$wrksrc/data ninja -C build test
 }
+
+gnome-todo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/gnome-todo b/srcpkgs/gnome-todo
new file mode 120000
index 000000000000..3d43d8077118
--- /dev/null
+++ b/srcpkgs/gnome-todo
@@ -0,0 +1 @@
+Endeavour
\ No newline at end of file
diff --git a/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch b/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
deleted file mode 100644
index cffd79bd7dc9..000000000000
--- a/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From a27a2128ce8f67d74895a721322768c2032400fe Mon Sep 17 00:00:00 2001
-From: Neel Chauhan <neel@neelc.org>
-Date: Wed, 29 Sep 2021 14:16:20 -0700
-Subject: [PATCH] Fix race condition on enums when we bulid with a single core
-
----
- src/meson.build | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index ebafc5fd..a671e682 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -16,6 +16,23 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
- 
- gnome_todo_deps += vcs_identifier_h
- 
-+#########
-+# Enums #
-+#########
-+
-+enum_headers = files(
-+  join_paths('animation', 'gtd-animation-enums.h'),
-+)
-+
-+enum_types = 'gtd-enum-types'
-+
-+sources += gnome.mkenums(
-+  enum_types,
-+     sources: enum_headers,
-+  c_template: enum_types + '.c.template',
-+  h_template: enum_types + '.h.template'
-+)
-+
- ###########
- # Plugins #
- ###########
-@@ -43,24 +60,6 @@ gtd_deps = gnome_todo_deps + [
- ]
- 
- 
--#########
--# Enums #
--#########
--
--enum_headers = files(
--  join_paths('animation', 'gtd-animation-enums.h'),
--)
--
--enum_types = 'gtd-enum-types'
--
--sources += gnome.mkenums(
--  enum_types,
--     sources: enum_headers,
--  c_template: enum_types + '.c.template',
--  h_template: enum_types + '.h.template'
--)
--
--
- ################
- # Header files #
- ################
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-todo/patches/libadwaita1.patch b/srcpkgs/gnome-todo/patches/libadwaita1.patch
deleted file mode 100644
index 691cf990ec4b..000000000000
--- a/srcpkgs/gnome-todo/patches/libadwaita1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/gtd-window.ui
-+++ b/src/gui/gtd-window.ui
-@@ -20,7 +20,7 @@
-     <!-- Main leaflet -->
-       <child>
-         <object class="AdwLeaflet" id="content_box">
--          <property name="can-swipe-back">true</property>
-+          <property name="can-navigate-forward">true</property>
-           <property name="width-request">360</property>
- 
-           <child>
diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
deleted file mode 100644
index 380c6285922e..000000000000
--- a/srcpkgs/gnome-todo/patches/libportal5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-Date: Thu, 18 Nov 2021 19:46:13 -0300
-Subject: [PATCH] flatpak: Adjust to libportal changes
-
----
- build-aux/flatpak/org.gnome.Todo.json          | 3 +++
- src/plugins/background/gtd-plugin-background.c | 2 +-
- src/plugins/background/meson.build             | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
-index 034e200c..44b83d66 100644
---- a/build-aux/flatpak/org.gnome.Todo.json
-+++ b/build-aux/flatpak/org.gnome.Todo.json
-@@ -143,6 +143,9 @@
-         {
-             "name" : "libportal",
-             "buildsystem" : "meson",
-+            "config-opts" : [
-+                "-Dbackends=gtk4"
-+            ],
-             "sources" : [
-                 {
-                     "type" : "git",
-diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
-index cf48786c..f64d07aa 100644
---- a/src/plugins/background/gtd-plugin-background.c
-+++ b/src/plugins/background/gtd-plugin-background.c
-@@ -28,7 +28,7 @@
- #include <gtk/gtk.h>
- 
- #include <libportal/portal.h>
--#include <libportal/portal-gtk4.h>
-+#include <libportal-gtk4/portal-gtk4.h>
- 
- #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
- #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
-diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
-index a671a4f3..59d3635f 100644
---- a/src/plugins/background/meson.build
-+++ b/src/plugins/background/meson.build
-@@ -1,7 +1,7 @@
- plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
- 
- plugins_deps += [
--  dependency('libportal'),
-+  dependency('libportal-gtk4'),
- ]
- 
- plugins_sources += files(
--- 
-GitLab
-

From d475c8667e1e5bce0526cb943c05a46ee10293a2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:58:19 +0200
Subject: [PATCH 2/2] gnome: rename gnome-todo to Endeavour

---
 srcpkgs/gnome/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 31535e9971c6..85bb43724dd9 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=42.0
-revision=3
+revision=4
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
@@ -39,6 +39,7 @@ depends="
  totem>=${version}"
 
 _apps_depends="
+ Endeavour>=${version}
  bijiben>=40.1
  dconf-editor>=3.38.3
  devhelp>=41.2
@@ -66,7 +67,6 @@ _apps_depends="
  gnome-system-monitor>=${version}
  gnome-terminal>=3.${version}
  gnome-text-editor>=${version}
- gnome-todo>=41.0
  gnote>=${version}
  polari>=3.38.0
  rygel>=0.40.2

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

* Re: [PR PATCH] [Updated] Endeavour: update to 42.0, rename from gnome-todo
  2022-09-19 23:00 [PR PATCH] Endeavour: update to 42.0, rename from gnome-todo paper42
@ 2022-09-19 23:11 ` paper42
  2022-09-26 16:47 ` [PR PATCH] [Merged]: " paper42
  1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-19 23:11 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages endeavour
https://github.com/void-linux/void-packages/pull/39380

Endeavour: update to 42.0, rename from gnome-todo
<!-- 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/39380.patch is attached

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

From 65fb738aea651f3fdbd18ccb359fe0b3822a90a8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:41:00 +0200
Subject: [PATCH 1/2] Endeavour: update to 42.0, rename from gnome-todo

---
 .../patches/fix-build-race-condition.patch    | 84 +++++++++++++++++++
 srcpkgs/{gnome-todo => Endeavour}/template    | 21 +++--
 srcpkgs/gnome-todo                            |  1 +
 .../patches/fix-build-race-condition.patch    | 65 --------------
 srcpkgs/gnome-todo/patches/libadwaita1.patch  | 11 ---
 srcpkgs/gnome-todo/patches/libportal5.patch   | 54 ------------
 6 files changed, 99 insertions(+), 137 deletions(-)
 create mode 100644 srcpkgs/Endeavour/patches/fix-build-race-condition.patch
 rename srcpkgs/{gnome-todo => Endeavour}/template (56%)
 create mode 120000 srcpkgs/gnome-todo
 delete mode 100644 srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
 delete mode 100644 srcpkgs/gnome-todo/patches/libadwaita1.patch
 delete mode 100644 srcpkgs/gnome-todo/patches/libportal5.patch

diff --git a/srcpkgs/Endeavour/patches/fix-build-race-condition.patch b/srcpkgs/Endeavour/patches/fix-build-race-condition.patch
new file mode 100644
index 000000000000..42bfb99b5e48
--- /dev/null
+++ b/srcpkgs/Endeavour/patches/fix-build-race-condition.patch
@@ -0,0 +1,84 @@
+From b492285e2a4fafad887df2c4fd2a5bdb53ce39fb Mon Sep 17 00:00:00 2001
+From: Jamie Murphy <hello@itsjamie.dev>
+Date: Fri, 5 Aug 2022 18:52:20 -0700
+Subject: [PATCH] build: Generate enum headers first
+
+Fixes #380, #398, !120, !110
+---
+ src/meson.build         | 38 +++++++++++++++++++-------------------
+ src/plugins/meson.build |  3 ++-
+ 2 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index deb410a2..8f621e78 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -16,6 +16,25 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
+ 
+ endeavour_deps += vcs_identifier_h
+ 
++#########
++# Enums #
++#########
++
++enum_headers = files(
++  join_paths('animation', 'gtd-animation-enums.h'),
++)
++
++enum_types = 'gtd-enum-types'
++
++gtd_enum_types = gnome.mkenums(
++  enum_types,
++     sources: enum_headers,
++  c_template: enum_types + '.c.template',
++  h_template: enum_types + '.h.template'
++)
++
++sources += gtd_enum_types
++
+ ###########
+ # Plugins #
+ ###########
+@@ -42,25 +61,6 @@ gtd_deps = endeavour_deps + [
+   plugins_dep,
+ ]
+ 
+-
+-#########
+-# Enums #
+-#########
+-
+-enum_headers = files(
+-  join_paths('animation', 'gtd-animation-enums.h'),
+-)
+-
+-enum_types = 'gtd-enum-types'
+-
+-sources += gnome.mkenums(
+-  enum_types,
+-     sources: enum_headers,
+-  c_template: enum_types + '.c.template',
+-  h_template: enum_types + '.h.template'
+-)
+-
+-
+ ################
+ # Header files #
+ ################
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 3d7ac4e4..2a13aff5 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -3,7 +3,8 @@ plugins_incs = [
+   include_directories('..'),
+ ]
+ 
+-plugins_sources = []
++# Ensure enum types header is generated before building plugins
++plugins_sources = [ gtd_enum_types[1] ]
+ plugins_deps = [ endeavour_deps ]
+ plugins_ldflags = []
+ plugins_libs = []
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-todo/template b/srcpkgs/Endeavour/template
similarity index 56%
rename from srcpkgs/gnome-todo/template
rename to srcpkgs/Endeavour/template
index dc3031156c79..6b179308cbe7 100644
--- a/srcpkgs/gnome-todo/template
+++ b/srcpkgs/Endeavour/template
@@ -1,7 +1,8 @@
-# Template file for 'gnome-todo'
-pkgname=gnome-todo
-version=41.0
-revision=2
+# Template file for 'Endeavour'
+pkgname=Endeavour
+version=42.0
+revision=1
+wrksrc="${pkgname}-v${version}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir true false)"
@@ -10,11 +11,11 @@ hostmakedepends="pkg-config glib-devel gettext itstool
 makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
  libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
 short_desc="Task manager designed to perfectly fit the GNOME desktop"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Todo"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5a657c978f451f61fb773f0b14f3121b9236fc504b41eb20940b4ed2004224e5
+distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/v${version}/Endeavour-v${version}.tar.gz"
+checksum=6ad8d5f06b86715e6bd43f1bcbd1d4cf2dd9d5b7ee1876b7ffce88bcc5a4bbd8
 
 build_options="gir"
 build_options_default="gir"
@@ -23,3 +24,9 @@ do_check() {
 	glib-compile-schemas data
 	GSETTINGS_SCHEMA_DIR=$wrksrc/data ninja -C build test
 }
+
+gnome-todo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/gnome-todo b/srcpkgs/gnome-todo
new file mode 120000
index 000000000000..3d43d8077118
--- /dev/null
+++ b/srcpkgs/gnome-todo
@@ -0,0 +1 @@
+Endeavour
\ No newline at end of file
diff --git a/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch b/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
deleted file mode 100644
index cffd79bd7dc9..000000000000
--- a/srcpkgs/gnome-todo/patches/fix-build-race-condition.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From a27a2128ce8f67d74895a721322768c2032400fe Mon Sep 17 00:00:00 2001
-From: Neel Chauhan <neel@neelc.org>
-Date: Wed, 29 Sep 2021 14:16:20 -0700
-Subject: [PATCH] Fix race condition on enums when we bulid with a single core
-
----
- src/meson.build | 35 +++++++++++++++++------------------
- 1 file changed, 17 insertions(+), 18 deletions(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index ebafc5fd..a671e682 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -16,6 +16,23 @@ vcs_identifier_h = declare_dependency(sources: vcs_tag)
- 
- gnome_todo_deps += vcs_identifier_h
- 
-+#########
-+# Enums #
-+#########
-+
-+enum_headers = files(
-+  join_paths('animation', 'gtd-animation-enums.h'),
-+)
-+
-+enum_types = 'gtd-enum-types'
-+
-+sources += gnome.mkenums(
-+  enum_types,
-+     sources: enum_headers,
-+  c_template: enum_types + '.c.template',
-+  h_template: enum_types + '.h.template'
-+)
-+
- ###########
- # Plugins #
- ###########
-@@ -43,24 +60,6 @@ gtd_deps = gnome_todo_deps + [
- ]
- 
- 
--#########
--# Enums #
--#########
--
--enum_headers = files(
--  join_paths('animation', 'gtd-animation-enums.h'),
--)
--
--enum_types = 'gtd-enum-types'
--
--sources += gnome.mkenums(
--  enum_types,
--     sources: enum_headers,
--  c_template: enum_types + '.c.template',
--  h_template: enum_types + '.h.template'
--)
--
--
- ################
- # Header files #
- ################
--- 
-GitLab
-
diff --git a/srcpkgs/gnome-todo/patches/libadwaita1.patch b/srcpkgs/gnome-todo/patches/libadwaita1.patch
deleted file mode 100644
index 691cf990ec4b..000000000000
--- a/srcpkgs/gnome-todo/patches/libadwaita1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui/gtd-window.ui
-+++ b/src/gui/gtd-window.ui
-@@ -20,7 +20,7 @@
-     <!-- Main leaflet -->
-       <child>
-         <object class="AdwLeaflet" id="content_box">
--          <property name="can-swipe-back">true</property>
-+          <property name="can-navigate-forward">true</property>
-           <property name="width-request">360</property>
- 
-           <child>
diff --git a/srcpkgs/gnome-todo/patches/libportal5.patch b/srcpkgs/gnome-todo/patches/libportal5.patch
deleted file mode 100644
index 380c6285922e..000000000000
--- a/srcpkgs/gnome-todo/patches/libportal5.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 3e1f4da8c0e536c09ffaf3b43fe2eb5dc17cc23e Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-Date: Thu, 18 Nov 2021 19:46:13 -0300
-Subject: [PATCH] flatpak: Adjust to libportal changes
-
----
- build-aux/flatpak/org.gnome.Todo.json          | 3 +++
- src/plugins/background/gtd-plugin-background.c | 2 +-
- src/plugins/background/meson.build             | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/build-aux/flatpak/org.gnome.Todo.json b/build-aux/flatpak/org.gnome.Todo.json
-index 034e200c..44b83d66 100644
---- a/build-aux/flatpak/org.gnome.Todo.json
-+++ b/build-aux/flatpak/org.gnome.Todo.json
-@@ -143,6 +143,9 @@
-         {
-             "name" : "libportal",
-             "buildsystem" : "meson",
-+            "config-opts" : [
-+                "-Dbackends=gtk4"
-+            ],
-             "sources" : [
-                 {
-                     "type" : "git",
-diff --git a/src/plugins/background/gtd-plugin-background.c b/src/plugins/background/gtd-plugin-background.c
-index cf48786c..f64d07aa 100644
---- a/src/plugins/background/gtd-plugin-background.c
-+++ b/src/plugins/background/gtd-plugin-background.c
-@@ -28,7 +28,7 @@
- #include <gtk/gtk.h>
- 
- #include <libportal/portal.h>
--#include <libportal/portal-gtk4.h>
-+#include <libportal-gtk4/portal-gtk4.h>
- 
- #define AUTOSTART_NOTIFICATION_ID      "Gtd::BackgroundPlugin::autostart_notification"
- #define AUTOSTART_NOTIFICATION_TIMEOUT 3  /* seconds */
-diff --git a/src/plugins/background/meson.build b/src/plugins/background/meson.build
-index a671a4f3..59d3635f 100644
---- a/src/plugins/background/meson.build
-+++ b/src/plugins/background/meson.build
-@@ -1,7 +1,7 @@
- plugins_ldflags += ['-Wl,--undefined=gtd_plugin_background_register_types']
- 
- plugins_deps += [
--  dependency('libportal'),
-+  dependency('libportal-gtk4'),
- ]
- 
- plugins_sources += files(
--- 
-GitLab
-

From ab8558e6c903d05b7120956a55727d3349057fe9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 00:58:19 +0200
Subject: [PATCH 2/2] gnome: rename gnome-todo to Endeavour

---
 srcpkgs/gnome/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 31535e9971c6..85bb43724dd9 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,10 +1,10 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=42.0
-revision=3
+revision=4
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://www.gnome.org"
 
@@ -39,6 +39,7 @@ depends="
  totem>=${version}"
 
 _apps_depends="
+ Endeavour>=${version}
  bijiben>=40.1
  dconf-editor>=3.38.3
  devhelp>=41.2
@@ -66,7 +67,6 @@ _apps_depends="
  gnome-system-monitor>=${version}
  gnome-terminal>=3.${version}
  gnome-text-editor>=${version}
- gnome-todo>=41.0
  gnote>=${version}
  polari>=3.38.0
  rygel>=0.40.2

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

* Re: [PR PATCH] [Merged]: Endeavour: update to 42.0, rename from gnome-todo
  2022-09-19 23:00 [PR PATCH] Endeavour: update to 42.0, rename from gnome-todo paper42
  2022-09-19 23:11 ` [PR PATCH] [Updated] " paper42
@ 2022-09-26 16:47 ` paper42
  1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-26 16:47 UTC (permalink / raw)
  To: ml

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

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

Endeavour: update to 42.0, rename from gnome-todo
https://github.com/void-linux/void-packages/pull/39380

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] 3+ messages in thread

end of thread, other threads:[~2022-09-26 16:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-19 23:00 [PR PATCH] Endeavour: update to 42.0, rename from gnome-todo paper42
2022-09-19 23:11 ` [PR PATCH] [Updated] " paper42
2022-09-26 16:47 ` [PR PATCH] [Merged]: " paper42

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).