[PR PATCH] lua54-lualdap: fix build for lua 5.4

[PR PATCH] lua54-lualdap: fix build for lua 5.4

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages lua54-lualdap-fix-build
https://github.com/void-linux/void-packages/pull/40217

lua54-lualdap: fix build for lua 5.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
@jprjr 
#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40217.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua54-lualdap-fix-build-40217.patch --]
[-- Type: text/x-diff, Size: 1806 bytes --]

From 7fefa11a1489ebb7b8d9f98454a2ea144d8a85f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 29 Oct 2022 18:51:33 +0700
Subject: [PATCH] lua54-lualdap: fix build for lua 5.4

---
 srcpkgs/lua54-lualdap/patches/lua54.patch |  4 ++--
 srcpkgs/lua54-lualdap/template            | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/lua54-lualdap/patches/lua54.patch b/srcpkgs/lua54-lualdap/patches/lua54.patch
index 134ac849931c..0cfd0d6bbdb6 100644
--- a/srcpkgs/lua54-lualdap/patches/lua54.patch
+++ b/srcpkgs/lua54-lualdap/patches/lua54.patch
@@ -1,5 +1,5 @@
---- a/src/compat-5.3.h
-+++ b/src/compat-5.3.h
+--- a/lua54/src/compat-5.3.h
++++ b/lua54/src/compat-5.3.h
 @@ -399,11 +399,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname,
  
  
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 386222ce0c6d..30e4c95496ce 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -2,7 +2,7 @@
 pkgname=lua54-lualdap
 version=1.2.5
 revision=3
-wrksrc="lualdap-${version}"
+create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel libldap-devel"
@@ -14,13 +14,12 @@ homepage="https://github.com/lualdap/lualdap"
 distfiles="https://github.com/lualdap/lualdap/archive/v${version}.tar.gz"
 checksum=3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc
 
-post_patch() {
-	cd ${wrksrc}
-	mkdir -p lua51
-	mv * lua51 || true
-	cp -a lua51 lua52
-	cp -a lua51 lua53
-	cp -a lua51 lua54
+post_extract() {
+	mv lualdap-${version} lua
+	cp -a lua lua51
+	cp -a lua lua52
+	cp -a lua lua53
+	cp -a lua lua54
 }
 
 do_build() {

Re: [PR PATCH] [Updated] lua54-lualdap: fix build for lua 5.4

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1267 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages lua54-lualdap-fix-build
https://github.com/void-linux/void-packages/pull/40217

lua54-lualdap: fix build for lua 5.4
<!-- Uncomment relevant sections and delete options which are not applicable -->
@jprjr 
#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40217.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lua54-lualdap-fix-build-40217.patch --]
[-- Type: text/x-diff, Size: 2942 bytes --]

From 9d7d540c0117d4bad09c8584a4edc8821a0d927c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 29 Oct 2022 18:51:33 +0700
Subject: [PATCH] lua54-lualdap: fix build for lua 5.4

---
 srcpkgs/lua54-lualdap/patches/c89-is-broken.patch | 15 +++++++++++++++
 srcpkgs/lua54-lualdap/patches/lua54.patch         |  4 ++--
 srcpkgs/lua54-lualdap/template                    | 15 +++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/lua54-lualdap/patches/c89-is-broken.patch

diff --git a/srcpkgs/lua54-lualdap/patches/c89-is-broken.patch b/srcpkgs/lua54-lualdap/patches/c89-is-broken.patch
new file mode 100644
index 000000000000..3a5d1059a89a
--- /dev/null
+++ b/srcpkgs/lua54-lualdap/patches/c89-is-broken.patch
@@ -0,0 +1,15 @@
+Index: lua54-lualdap-1.2.5/lua54/Makefile
+===================================================================
+--- lua54-lualdap-1.2.5.orig/lua54/Makefile
++++ lua54-lualdap-1.2.5/lua54/Makefile
+@@ -15,8 +15,8 @@ endif
+ 
+ CFLAGS_WARN := -pedantic -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
+ 
+-override CPPFLAGS := -DPACKAGE_STRING="\"$(PACKAGE_STRING)\"" -DLUA_C89_NUMBERS $(CPPFLAGS)
+-override CFLAGS := -O2 -fPIC -std=c89 $(CFLAGS_WARN) $(CFLAGS)
++override CPPFLAGS := -DPACKAGE_STRING="\"$(PACKAGE_STRING)\"" $(CPPFLAGS)
++override CFLAGS := -O2 -fPIC $(CFLAGS_WARN) $(CFLAGS)
+ 
+ ifdef BUILD_VARIANT
+ REPORT_DIR := test-reports/$(BUILD_VARIANT)
diff --git a/srcpkgs/lua54-lualdap/patches/lua54.patch b/srcpkgs/lua54-lualdap/patches/lua54.patch
index 134ac849931c..0cfd0d6bbdb6 100644
--- a/srcpkgs/lua54-lualdap/patches/lua54.patch
+++ b/srcpkgs/lua54-lualdap/patches/lua54.patch
@@ -1,5 +1,5 @@
---- a/src/compat-5.3.h
-+++ b/src/compat-5.3.h
+--- a/lua54/src/compat-5.3.h
++++ b/lua54/src/compat-5.3.h
 @@ -399,11 +399,11 @@ COMPAT53_API void luaL_requiref (lua_State *L, const char *modname,
  
  
diff --git a/srcpkgs/lua54-lualdap/template b/srcpkgs/lua54-lualdap/template
index 386222ce0c6d..30e4c95496ce 100644
--- a/srcpkgs/lua54-lualdap/template
+++ b/srcpkgs/lua54-lualdap/template
@@ -2,7 +2,7 @@
 pkgname=lua54-lualdap
 version=1.2.5
 revision=3
-wrksrc="lualdap-${version}"
+create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
 makedepends="lua51-devel lua52-devel lua53-devel lua54-devel libldap-devel"
@@ -14,13 +14,12 @@ homepage="https://github.com/lualdap/lualdap"
 distfiles="https://github.com/lualdap/lualdap/archive/v${version}.tar.gz"
 checksum=3e028faa6a5798cf2f3d50b9853b9b3fb6eb562b62010747bd5b6f50b57bb1cc
 
-post_patch() {
-	cd ${wrksrc}
-	mkdir -p lua51
-	mv * lua51 || true
-	cp -a lua51 lua52
-	cp -a lua51 lua53
-	cp -a lua51 lua54
+post_extract() {
+	mv lualdap-${version} lua
+	cp -a lua lua51
+	cp -a lua lua52
+	cp -a lua lua53
+	cp -a lua lua54
 }
 
 do_build() {

Re: [PR PATCH] [Merged]: lua54-lualdap: fix build for lua 5.4

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]

There's a merged pull request on the void-packages repository

lua54-lualdap: fix build for lua 5.4
https://github.com/void-linux/void-packages/pull/40217

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
@jprjr 
#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->