[gnome-build-meta/abderrahim/update] core-deps/accountsservice.bst: add patch to fix version



commit 9a51a5e97fc7518b32478f31f563e83d116db27c
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Thu Feb 10 10:43:09 2022 +0100

    core-deps/accountsservice.bst: add patch to fix version

 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..35de9c46d
--- /dev/null
+++ b/files/accountsservice/version.patch
@@ -0,0 +1,29 @@
+diff --git a/acccountsservice.orig/generate-version.sh b/acccountsservice.orig/generate-version.sh
+deleted file mode 100755
+index 02c5f80e..00000000
+--- a/acccountsservice.orig/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/acccountsservice.orig/meson.build b/acccountsservice/meson.build
+index 075776fa..b25bf562 100644
+--- a/acccountsservice.orig/meson.build
++++ b/acccountsservice/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]