diff mbox series

[whinlatter,06/67] scdoc: Upgrade 1.11.3 -> 1.11.4

Message ID 20251213095931.2571498-6-ankur.tyagi85@gmail.com
State Changes Requested
Delegated to: Steve Sakoman
Headers show
Series [whinlatter,01/67] bluez5: upgrade 5.84 -> 5.85 | expand

Commit Message

Ankur Tyagi Dec. 13, 2025, 9:58 a.m. UTC
From: Alex Kiernan <alex.kiernan@gmail.com>

Drop backport of 3667cce Makefile: drop -static

Changes from 1.11.3:

  Drew DeVault (4):
      Makefile: drop -static
      parse_preamble: remove useless branch
      utf8_size: fix bug with array length
      Update version to 1.11.4

  Jason Lenz (2):
      Fix unclosed indent at EOF
      Fix make check permissions mask

  Kirill Chibisov (1):
      Emit \(ti and \(ha instead of ~ and ^

  Nico Wagner (1):
      Makefile: remove unnecessary path separator

  Sertonix (1):
      gmtime: handle failure

  Viacheslav Kruglov (1):
      Fix logical error in comparison with ULONG_MAX

  elij (1):
      strip indentation after a hard line break `++`

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
(cherry picked from commit d1a04bfb9506f00d658a58ac1671de57dfa487b8)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../scdoc/0001-Makefile-drop-static.patch     | 23 -------------------
 .../{scdoc_1.11.3.bb => scdoc_1.11.4.bb}      |  5 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
 rename meta/recipes-extended/scdoc/{scdoc_1.11.3.bb => scdoc_1.11.4.bb} (82%)

Comments

Ankur Tyagi Dec. 16, 2025, 3:24 p.m. UTC | #1
This patch doesn't bring any critical bug fix, hence can be dropped.

On Sat, Dec 13, 2025 at 3:29 PM <ankur.tyagi85@gmail.com> wrote:
>
> From: Alex Kiernan <alex.kiernan@gmail.com>
>
> Drop backport of 3667cce Makefile: drop -static
>
> Changes from 1.11.3:
>
>   Drew DeVault (4):
>       Makefile: drop -static
>       parse_preamble: remove useless branch
>       utf8_size: fix bug with array length
>       Update version to 1.11.4
>
>   Jason Lenz (2):
>       Fix unclosed indent at EOF
>       Fix make check permissions mask
>
>   Kirill Chibisov (1):
>       Emit \(ti and \(ha instead of ~ and ^
>
>   Nico Wagner (1):
>       Makefile: remove unnecessary path separator
>
>   Sertonix (1):
>       gmtime: handle failure
>
>   Viacheslav Kruglov (1):
>       Fix logical error in comparison with ULONG_MAX
>
>   elij (1):
>       strip indentation after a hard line break `++`
>
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> (cherry picked from commit d1a04bfb9506f00d658a58ac1671de57dfa487b8)
> Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
> ---
>  .../scdoc/0001-Makefile-drop-static.patch     | 23 -------------------
>  .../{scdoc_1.11.3.bb => scdoc_1.11.4.bb}      |  5 ++--
>  2 files changed, 2 insertions(+), 26 deletions(-)
>  delete mode 100644 meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
>  rename meta/recipes-extended/scdoc/{scdoc_1.11.3.bb => scdoc_1.11.4.bb} (82%)
>
> diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
> deleted file mode 100644
> index 631d06375b..0000000000
> --- a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From 3667cced504bc40b176d4570d99a83fe67599f3a Mon Sep 17 00:00:00 2001
> -From: Drew DeVault <sir@cmpwn.com>
> -Date: Wed, 4 Sep 2024 10:07:46 +0200
> -Subject: [PATCH] Makefile: drop -static
> -
> -Upstream-Status: Backport [https://git.sr.ht/~sircmpwn/scdoc/commit/3667cced504bc40b176d4570d99a83fe67599f3a]
> -Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
> ----
> - Makefile | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 96ad48cd04a6..49f076aadd39 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -1,7 +1,6 @@
> - VERSION=1.11.3
> - CFLAGS?=-g
> - MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
> --LDFLAGS+=-static
> - INCLUDE+=-Iinclude
> - PREFIX?=/usr/local
> - BINDIR?=$(PREFIX)/bin
> diff --git a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb b/meta/recipes-extended/scdoc/scdoc_1.11.4.bb
> similarity index 82%
> rename from meta/recipes-extended/scdoc/scdoc_1.11.3.bb
> rename to meta/recipes-extended/scdoc/scdoc_1.11.4.bb
> index 5f571c64dd..059150df46 100644
> --- a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb
> +++ b/meta/recipes-extended/scdoc/scdoc_1.11.4.bb
> @@ -6,9 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
>
>  DEPENDS = "scdoc-native"
>
> -SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
> -           file://0001-Makefile-drop-static.patch "
> -SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59"
> +SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master"
> +SRCREV = "70de0e5e5d3bc40134ee65c35f1631656199f4be"
>
>  do_install() {
>         oe_runmake 'DESTDIR=${D}' install
diff mbox series

Patch

diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
deleted file mode 100644
index 631d06375b..0000000000
--- a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-drop-static.patch
+++ /dev/null
@@ -1,23 +0,0 @@ 
-From 3667cced504bc40b176d4570d99a83fe67599f3a Mon Sep 17 00:00:00 2001
-From: Drew DeVault <sir@cmpwn.com>
-Date: Wed, 4 Sep 2024 10:07:46 +0200
-Subject: [PATCH] Makefile: drop -static
-
-Upstream-Status: Backport [https://git.sr.ht/~sircmpwn/scdoc/commit/3667cced504bc40b176d4570d99a83fe67599f3a]
-Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 96ad48cd04a6..49f076aadd39 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,6 @@
- VERSION=1.11.3
- CFLAGS?=-g
- MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
--LDFLAGS+=-static
- INCLUDE+=-Iinclude
- PREFIX?=/usr/local
- BINDIR?=$(PREFIX)/bin
diff --git a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb b/meta/recipes-extended/scdoc/scdoc_1.11.4.bb
similarity index 82%
rename from meta/recipes-extended/scdoc/scdoc_1.11.3.bb
rename to meta/recipes-extended/scdoc/scdoc_1.11.4.bb
index 5f571c64dd..059150df46 100644
--- a/meta/recipes-extended/scdoc/scdoc_1.11.3.bb
+++ b/meta/recipes-extended/scdoc/scdoc_1.11.4.bb
@@ -6,9 +6,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
 
 DEPENDS = "scdoc-native"
 
-SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
-           file://0001-Makefile-drop-static.patch "
-SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59"
+SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master"
+SRCREV = "70de0e5e5d3bc40134ee65c35f1631656199f4be"
 
 do_install() {
 	oe_runmake 'DESTDIR=${D}' install