[gnome-build-meta/abderrahim/update: 7/7] core-deps/accountsservice.bst: add patch to fix version
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/update: 7/7] core-deps/accountsservice.bst: add patch to fix version
- Date: Fri, 11 Feb 2022 17:15:48 +0000 (UTC)
commit b656be3914b8100c7b62255b754a1d4aea3cddb1
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Thu Feb 10 10:43:09 2022 +0100
core-deps/accountsservice.bst: add patch to fix version
Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1519>
elements/core-deps/accountsservice.bst | 7 +++++++
files/accountsservice/version.patch | 29 +++++++++++++++++++++++++++++
2 files changed, 36 insertions(+)
---
diff --git a/elements/core-deps/accountsservice.bst b/elements/core-deps/accountsservice.bst
index 717a9c29c..a219fa6b2 100644
--- a/elements/core-deps/accountsservice.bst
+++ b/elements/core-deps/accountsservice.bst
@@ -1,11 +1,18 @@
kind: meson
+
sources:
- kind: tar
url: freedesktop_software:accountsservice/accountsservice-22.04.62.tar.xz
+# This patch needs to be updated (or hopefully dropped) when updating
+# See https://gitlab.freedesktop.org/accountsservice/accountsservice/-/issues/99
+- kind: patch
+ path: files/accountsservice/version.patch
+
build-depends:
- sdk/gobject-introspection.bst
- sdk/vala.bst
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
depends:
- sdk/glib.bst
- freedesktop-sdk.bst:components/dbus.bst
diff --git a/files/accountsservice/version.patch b/files/accountsservice/version.patch
new file mode 100644
index 000000000..168921a37
--- /dev/null
+++ b/files/accountsservice/version.patch
@@ -0,0 +1,29 @@
+diff --git a/generate-version.sh b/generate-version.sh
+deleted file mode 100755
+index 02c5f80e..00000000
+--- a/generate-version.sh
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#!/bin/sh
+-VERSION_FROM_DIR_NAME=$(dirname $PWD/.. | sed -n 's/^.*-\([^-]*\)$/\1/p')
+-
+-if [ -n "$VERSION_FROM_DIR_NAME" ]; then
+- echo "$VERSION_FROM_DIR_NAME"
+- exit 0
+-fi
+-
+-COMMITS_SINCE_LAST_RELEASE=$(git rev-list $(git describe --abbrev=0)..HEAD --count)
+-date +%y.%V.${COMMITS_SINCE_LAST_RELEASE}
+-
+diff --git a/meson.build b/meson.build
+index 075776fa..b25bf562 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,6 +1,6 @@
+ project(
+ 'accountsservice', 'c',
+- version: run_command(['./generate-version.sh']).stdout().strip(),
++ version: '22.04.62',
+ license: 'GPL3+',
+ default_options: 'buildtype=debugoptimized',
+ meson_version: '>= 0.50.0',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]