[09/13] vala: update 0.48.6 -> 0.48.7

Submitted by Alexander Kanavin on Aug. 1, 2020, 9:23 p.m. | Patch ID: 174984

Details

Message ID 20200801212335.14922-9-alex.kanavin@gmail.com
State Accepted
Commit 3e27b178a1cab60167812ff926e7b15a07af5811
Headers show

Commit Message

Alexander Kanavin Aug. 1, 2020, 9:23 p.m.
Remove patch, as issue fixed upstream.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...don-t-append-dirty-if-we-re-not-in-g.patch | 55 -------------------
 meta/recipes-devtools/vala/vala_0.48.6.bb     |  7 ---
 meta/recipes-devtools/vala/vala_0.48.7.bb     |  5 ++
 3 files changed, 5 insertions(+), 62 deletions(-)
 delete mode 100644 meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
 delete mode 100644 meta/recipes-devtools/vala/vala_0.48.6.bb
 create mode 100644 meta/recipes-devtools/vala/vala_0.48.7.bb

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
deleted file mode 100644
index ac9dc8c83a..0000000000
--- a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
+++ /dev/null
@@ -1,55 +0,0 @@ 
-From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 21 Feb 2012 17:12:50 +0100
-Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
- repo
-
-* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
-Upstream-Status: Inappropriate [OE-Specific]
----
- build-aux/git-version-gen |   25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
-index 0fa6faa..1d1f9d2 100755
---- a/build-aux/git-version-gen
-+++ b/build-aux/git-version-gen
-@@ -126,18 +126,21 @@ fi
- 
- v=`echo "$v" |sed 's/^v//'`
- 
--# Don't declare a version "dirty" merely because a time stamp has changed.
--git status > /dev/null 2>&1
-+if test -d .git
-+then
-+	# Don't declare a version "dirty" merely because a time stamp has changed.
-+	git status > /dev/null 2>&1
- 
--dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
--case "$dirty" in
--    '') ;;
--    *) # Append the suffix only if there isn't one already.
--	case $v in
--	  *-dirty) ;;
--	  *) v="$v-dirty" ;;
--	esac ;;
--esac
-+	dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
-+	case "$dirty" in
-+	    '') ;;
-+	    *) # Append the suffix only if there isn't one already.
-+		case $v in
-+		  *-dirty) ;;
-+		  *) v="$v-dirty" ;;
-+		esac ;;
-+	esac
-+fi
- 
- # Omit the trailing newline, so that m4_esyscmd can use the result directly.
- echo "$v" | tr -d '\012'
--- 
-1.7.8.4
-
diff --git a/meta/recipes-devtools/vala/vala_0.48.6.bb b/meta/recipes-devtools/vala/vala_0.48.6.bb
deleted file mode 100644
index 9dace1348c..0000000000
--- a/meta/recipes-devtools/vala/vala_0.48.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@ 
-require ${BPN}.inc
-
-SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
-           file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
-           "
-
-SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
diff --git a/meta/recipes-devtools/vala/vala_0.48.7.bb b/meta/recipes-devtools/vala/vala_0.48.7.bb
new file mode 100644
index 0000000000..2e61db1052
--- /dev/null
+++ b/meta/recipes-devtools/vala/vala_0.48.7.bb
@@ -0,0 +1,5 @@ 
+require ${BPN}.inc
+
+SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
+
+SRC_URI[sha256sum] = "28de33e28da24500cc1675c3a6ced1301c9a6a5e6dd06193569001f9ce9a5c53"

Comments

Khem Raj Aug. 2, 2020, 2:45 p.m.
On 8/1/20 2:23 PM, Alexander Kanavin wrote:
> Remove patch, as issue fixed upstream.
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>   ...don-t-append-dirty-if-we-re-not-in-g.patch | 55 -------------------
>   meta/recipes-devtools/vala/vala_0.48.6.bb     |  7 ---
>   meta/recipes-devtools/vala/vala_0.48.7.bb     |  5 ++
>   3 files changed, 5 insertions(+), 62 deletions(-)
>   delete mode 100644 meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
>   delete mode 100644 meta/recipes-devtools/vala/vala_0.48.6.bb
>   create mode 100644 meta/recipes-devtools/vala/vala_0.48.7.bb
> 
> diff --git a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch b/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
> deleted file mode 100644
> index ac9dc8c83a..0000000000
> --- a/meta/recipes-devtools/vala/vala/0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -From 2460d7b79f7e90dcfeebde5e9c53d9b6798a1f3c Mon Sep 17 00:00:00 2001
> -From: Martin Jansa <Martin.Jansa@gmail.com>
> -Date: Tue, 21 Feb 2012 17:12:50 +0100
> -Subject: [PATCH] git-version-gen: don't append -dirty if we're not in git
> - repo
> -
> -* for example if we have some dirty directory and we unpack clean vala tarball in it, then it will append -dirty
> -
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> -
> -Upstream-Status: Inappropriate [OE-Specific]
> ----
> - build-aux/git-version-gen |   25 ++++++++++++++-----------
> - 1 files changed, 14 insertions(+), 11 deletions(-)
> -
> -diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
> -index 0fa6faa..1d1f9d2 100755
> ---- a/build-aux/git-version-gen
> -+++ b/build-aux/git-version-gen
> -@@ -126,18 +126,21 @@ fi
> -
> - v=`echo "$v" |sed 's/^v//'`
> -
> --# Don't declare a version "dirty" merely because a time stamp has changed.
> --git status > /dev/null 2>&1
> -+if test -d .git
> -+then
> -+	# Don't declare a version "dirty" merely because a time stamp has changed.
> -+	git status > /dev/null 2>&1
> -
> --dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
> --case "$dirty" in
> --    '') ;;
> --    *) # Append the suffix only if there isn't one already.
> --	case $v in
> --	  *-dirty) ;;
> --	  *) v="$v-dirty" ;;
> --	esac ;;
> --esac
> -+	dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
> -+	case "$dirty" in
> -+	    '') ;;
> -+	    *) # Append the suffix only if there isn't one already.
> -+		case $v in
> -+		  *-dirty) ;;
> -+		  *) v="$v-dirty" ;;
> -+		esac ;;
> -+	esac
> -+fi
> -
> - # Omit the trailing newline, so that m4_esyscmd can use the result directly.
> - echo "$v" | tr -d '\012'
> ---
> -1.7.8.4
> -
> diff --git a/meta/recipes-devtools/vala/vala_0.48.6.bb b/meta/recipes-devtools/vala/vala_0.48.6.bb
> deleted file mode 100644
> index 9dace1348c..0000000000
> --- a/meta/recipes-devtools/vala/vala_0.48.6.bb
> +++ /dev/null
> @@ -1,7 +0,0 @@
> -require ${BPN}.inc
> -
> -SRC_URI += "file://0001-git-version-gen-don-t-append-dirty-if-we-re-not-in-g.patch \
> -           file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch \
> -           "
> -
> -SRC_URI[sha256sum] = "d18d08ed030ce0e0f044f4c15c9df3c25b15beaf8700e45e43b736a6debf9707"
> diff --git a/meta/recipes-devtools/vala/vala_0.48.7.bb b/meta/recipes-devtools/vala/vala_0.48.7.bb
> new file mode 100644
> index 0000000000..2e61db1052
> --- /dev/null
> +++ b/meta/recipes-devtools/vala/vala_0.48.7.bb
> @@ -0,0 +1,5 @@
> +require ${BPN}.inc

I wonder if this .inc file should be merged into .bb while you are here

> +
> +SRC_URI += " file://0001-vapigen.m4-use-PKG_CONFIG_SYSROOT_DIR.patch"
> +
> +SRC_URI[sha256sum] = "28de33e28da24500cc1675c3a6ced1301c9a6a5e6dd06193569001f9ce9a5c53"
> 
> 
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#141150): https://lists.openembedded.org/g/openembedded-core/message/141150
Mute This Topic: https://lists.openembedded.org/mt/75935323/3617530
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-