diff mbox series

[2/4] scdoc: Upgrade 1.11.2 -> 1.11.3

Message ID 20250312-upgrade-kmod-v1-2-4de94f131b64@gmail.com
State New
Headers show
Series Upgrade kmod 33 -> 34.1 | expand

Commit Message

Alex Kiernan March 12, 2025, 1 p.m. UTC 
Drop "dont add -static to LDFLAGS" patch as this is now upstream.

Changes:
	Dimitry Andric (1):
	      Fix clang 15 -Wstrict-prototypes warnings

	Drew DeVault (3):
	      README.md: mention system packages
	      Update version to 1.11.3
	      Makefile: drop -static

	Eli Schwartz (2):
	      remove useless re-declarations of standard functions
	      get rid of some unused includes

	Humm (3):
	      use .PP for paragraph breaks
	      scdoc(1), scdoc(5): follow conventions more closely
	      simplify list output

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

	Max Schillinger (1):
	      fix formatting of escaped backticks

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

	Simon Branch (2):
	      scdoc.5: fix capitalization of subsection headers
	      scdoc.5: fix formatting in the preamble

	Simon Ser (1):
	      man: add section about SOURCE_DATE_EPOCH

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

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

	jturtle (1):
	      Emit '\e' instead of '\\'

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
---
 .../0001-Makefile-dont-add-static-to-LDFLAGS.patch | 27 ----------------------
 .../scdoc/{scdoc_git.bb => scdoc_1.11.3.bb}        | 21 ++++++++---------
 2 files changed, 9 insertions(+), 39 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch b/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch
deleted file mode 100644
index b520e949c0b31c0908118cba4f6c2b6ea26f5a26..0000000000000000000000000000000000000000
--- a/meta/recipes-extended/scdoc/scdoc/0001-Makefile-dont-add-static-to-LDFLAGS.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
-From 2cac433806d9622dbc005fe5738f1ae8c33a98cb Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Thu, 13 Jul 2023 19:26:40 +0200
-Subject: [PATCH] Makefile: dont add -static to LDFLAGS
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
-
-Upstream-Status: Inappropriate [oe-specific]
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 60a80b8..49021fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,6 @@
- VERSION=1.11.2
- CFLAGS?=-g
- MAINFLAGS:=-DVERSION='"$(VERSION)"' -Wall -Wextra -Werror -Wno-unused-parameter
--LDFLAGS+=-static
- INCLUDE+=-Iinclude
- PREFIX?=/usr/local
- BINDIR?=$(PREFIX)/bin
--- 
-2.39.3
-
diff --git a/meta/recipes-extended/scdoc/scdoc_git.bb b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb
similarity index 54%
rename from meta/recipes-extended/scdoc/scdoc_git.bb
rename to meta/recipes-extended/scdoc/scdoc_1.11.3.bb
index 224e5417342e9db820456ec54476a1e3cac0e4e4..330d4e426f6e552e37214fffea244659eb8e4dcf 100644
--- a/meta/recipes-extended/scdoc/scdoc_git.bb
+++ b/meta/recipes-extended/scdoc/scdoc_1.11.3.bb
@@ -5,21 +5,18 @@  SECTION = "base/doc"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=31752b4a8edd3fb9ddba1cb90fada74d"
 
-SRC_URI = " \
-	git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
-	file://0001-Makefile-dont-add-static-to-LDFLAGS.patch \
-"
-
 DEPENDS = "scdoc-native"
 
-S = "${WORKDIR}/git"
-PV = "1.11.2"
-SRCREV = "afeda241f3f9b2c27e461f32d9c2a704ab82ef61"
+PV .= "+git"
 
-EXTRA_OEMAKE:class-native = "PREFIX=${prefix}"
-EXTRA_OEMAKE:class-target = "PREFIX=${prefix} HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
+SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master"
+SRCREV = "29306d8dde650f5ac2bcc067f3c1d3bcfcac7a1d"
+
+S = "${WORKDIR}/git"
 
 inherit autotools-brokensep
-	
-BBCLASSEXTEND = "native"
 
+EXTRA_OEMAKE = "PREFIX=${prefix}"
+EXTRA_OEMAKE:append:class-target = " HOST_SCDOC=${STAGING_BINDIR_NATIVE}/scdoc"
+
+BBCLASSEXTEND = "native"