Github messages for voidlinux
 help / color / mirror / Atom feed
From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Endeavour: update to 43.0.
Date: Tue, 22 Nov 2022 01:29:48 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40676@inbox.vuxu.org> (raw)

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

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

https://github.com/oreo639/void-packages endeavour
https://github.com/void-linux/void-packages/pull/40676

Endeavour: update to 43.0.
<!-- 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/40676.patch is attached

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

From 0422f82a9ff09de6aa10c99b2152e587e0833f38 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 21 Nov 2022 16:24:29 -0800
Subject: [PATCH] Endeavour: update to 43.0.

---
 .../patches/fix-build-race-condition.patch    | 84 -------------------
 srcpkgs/Endeavour/template                    |  8 +-
 2 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 srcpkgs/Endeavour/patches/fix-build-race-condition.patch

diff --git a/srcpkgs/Endeavour/patches/fix-build-race-condition.patch b/srcpkgs/Endeavour/patches/fix-build-race-condition.patch
deleted file mode 100644
index 42bfb99b5e48..000000000000
--- a/srcpkgs/Endeavour/patches/fix-build-race-condition.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-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/Endeavour/template b/srcpkgs/Endeavour/template
index 9d3d139c8d78..b250b36c7745 100644
--- a/srcpkgs/Endeavour/template
+++ b/srcpkgs/Endeavour/template
@@ -1,6 +1,6 @@
 # Template file for 'Endeavour'
 pkgname=Endeavour
-version=42.0
+version=43.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,13 +8,13 @@ configure_args="-Dintrospection=$(vopt_if gir true false)"
 hostmakedepends="pkg-config glib-devel gettext itstool
  $(vopt_if gir 'gobject-introspection')"
 makedepends="gtk4-devel libadwaita-devel gnome-online-accounts-devel
- libpeas-devel libportal-gtk4-devel evolution-data-server-devel"
+ libpeas-devel evolution-data-server-devel"
 short_desc="Task manager designed to perfectly fit the GNOME desktop"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Todo"
-distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/v${version}/Endeavour-v${version}.tar.gz"
-checksum=6ad8d5f06b86715e6bd43f1bcbd1d4cf2dd9d5b7ee1876b7ffce88bcc5a4bbd8
+distfiles="https://gitlab.gnome.org/World/Endeavour/-/archive/${version}/Endeavour-${version}.tar.gz"
+checksum=f5f442611f03b2471a522e976bfb156de36824b1ecf8c13a9b35a996f50670a3
 
 build_options="gir"
 build_options_default="gir"

             reply	other threads:[~2022-11-22  0:29 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-22  0:29 oreo639 [this message]
2022-11-22  0:36 ` [PR PATCH] [Updated] " oreo639
2022-11-22 12:26 ` JamiKettunen
2022-11-22 14:01 ` JamiKettunen
2022-11-23  0:44 ` [PR PATCH] [Updated] " oreo639
2022-11-23 20:03 ` [PR PATCH] [Merged]: " paper42

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40676@inbox.vuxu.org \
    --to=oreo639@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).