[PR PATCH] attract: respect cflags

[PR PATCH] attract: respect cflags

[ypsvlq]

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

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

https://github.com/ypsvlq/void-packages master
https://github.com/void-linux/void-packages/pull/48757

attract: respect cflags
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### 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/48757.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-48757.patch --]
[-- Type: text/x-diff, Size: 3368 bytes --]

From 680289b0ac0ec8ae8b3d7e471b2ac3ce880d1714 Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Fri, 16 Feb 2024 10:21:04 +0000
Subject: [PATCH] attract: respect cflags

---
 srcpkgs/attract/patches/Makefile.patch        | 25 +++++++++++++------
 .../attract/patches/fix-missing-include.patch | 18 +++++++++++++
 srcpkgs/attract/patches/string.patch          | 12 ---------
 srcpkgs/attract/template                      |  2 +-
 4 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/attract/patches/fix-missing-include.patch
 delete mode 100644 srcpkgs/attract/patches/string.patch

diff --git a/srcpkgs/attract/patches/Makefile.patch b/srcpkgs/attract/patches/Makefile.patch
index 6310a9fd365269..434c08dea38958 100644
--- a/srcpkgs/attract/patches/Makefile.patch
+++ b/srcpkgs/attract/patches/Makefile.patch
@@ -1,16 +1,16 @@
-diff --git a/Makefile.orig b/Makefile
-index 4f4793a9a69..b1f7cf469f4 100644
---- a/Makefile.orig
+diff --git a/Makefile b/Makefile
+index 4f4793a..82387e0 100644
+--- a/Makefile
 +++ b/Makefile
-@@ -69,15 +69,10 @@
+@@ -69,15 +69,7 @@
  
  FE_VERSION=v2.7.0
  
 -CC=gcc
 -CXX=g++
- CFLAGS=
- CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
- CPPFLAGS=
+-CFLAGS=
+-CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
+-CPPFLAGS=
 -STRIP=strip
 -OBJCOPY=objcopy
  PKG_CONFIG=pkg-config
@@ -18,7 +18,16 @@ index 4f4793a9a69..b1f7cf469f4 100644
  ARFLAGS=rc
  RM=rm -f
  MD=mkdir -p
-@@ -512,7 +507,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
+@@ -308,7 +300,7 @@ ifeq ($(FE_DEBUG),1)
+  FE_FLAGS += -DFE_DEBUG
+  ENABLE_DEBUG_SYMBOLS=1
+ else
+- CPPFLAGS += -O$(OPTIMIZE) -DNDEBUG
++ CPPFLAGS += -DNDEBUG
+ endif
+ 
+ ifeq ($(USE_GLES),1)
+@@ -512,7 +504,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
  
  $(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
  	$(EXE_MSG)
diff --git a/srcpkgs/attract/patches/fix-missing-include.patch b/srcpkgs/attract/patches/fix-missing-include.patch
new file mode 100644
index 00000000000000..4a2ffbb3a686a9
--- /dev/null
+++ b/srcpkgs/attract/patches/fix-missing-include.patch
@@ -0,0 +1,18 @@
+commit 659b66c6dc0e5598546ce987319adaf59cf01a0b
+Author: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
+Date:   Sun Jun 11 06:04:28 2023 -0400
+
+    fix missing include
+
+diff --git a/src/fe_net.hpp b/src/fe_net.hpp
+index c089681..3fe6f66 100644
+--- a/src/fe_net.hpp
++++ b/src/fe_net.hpp
+@@ -27,6 +27,7 @@
+ #include <thread>
+ #include <deque>
+ #include <queue>
++#include <string>
+ 
+ class FeNetWorker;
+ 
diff --git a/srcpkgs/attract/patches/string.patch b/srcpkgs/attract/patches/string.patch
deleted file mode 100644
index 0515d351946192..00000000000000
--- a/srcpkgs/attract/patches/string.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/fe_net.hpp.orig b/src/fe_net.hpp
-index c089681e429..3fe6f6685e2 100644
---- a/src/fe_net.hpp.orig
-+++ b/src/fe_net.hpp
-@@ -27,6 +27,7 @@
- #include <thread>
- #include <deque>
- #include <queue>
-+#include <string>
- 
- class FeNetWorker;
- 
diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template
index e769fb15456217..776cbe4ebd2c93 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,7 +1,7 @@
 # Template file for 'attract'
 pkgname=attract
 version=2.7.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="VERBOSE=1"
 make_use_env=yes

Re: [PR REVIEW] attract: respect cflags

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/48757#discussion_r1498942355

Comment:
Use the old patch.

Re: [PR PATCH] [Updated] attract: respect cflags

[ypsvlq]

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

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

https://github.com/ypsvlq/void-packages master
https://github.com/void-linux/void-packages/pull/48757

attract: respect cflags
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### 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/48757.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-48757.patch --]
[-- Type: text/x-diff, Size: 1921 bytes --]

From afe09b186255663ae9494bf04b5788e22a2fb14b Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Fri, 16 Feb 2024 10:21:04 +0000
Subject: [PATCH] attract: respect cflags

---
 srcpkgs/attract/patches/Makefile.patch | 25 +++++++++++++++++--------
 srcpkgs/attract/template               |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/attract/patches/Makefile.patch b/srcpkgs/attract/patches/Makefile.patch
index 6310a9fd365269..434c08dea38958 100644
--- a/srcpkgs/attract/patches/Makefile.patch
+++ b/srcpkgs/attract/patches/Makefile.patch
@@ -1,16 +1,16 @@
-diff --git a/Makefile.orig b/Makefile
-index 4f4793a9a69..b1f7cf469f4 100644
---- a/Makefile.orig
+diff --git a/Makefile b/Makefile
+index 4f4793a..82387e0 100644
+--- a/Makefile
 +++ b/Makefile
-@@ -69,15 +69,10 @@
+@@ -69,15 +69,7 @@
  
  FE_VERSION=v2.7.0
  
 -CC=gcc
 -CXX=g++
- CFLAGS=
- CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
- CPPFLAGS=
+-CFLAGS=
+-CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
+-CPPFLAGS=
 -STRIP=strip
 -OBJCOPY=objcopy
  PKG_CONFIG=pkg-config
@@ -18,7 +18,16 @@ index 4f4793a9a69..b1f7cf469f4 100644
  ARFLAGS=rc
  RM=rm -f
  MD=mkdir -p
-@@ -512,7 +507,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
+@@ -308,7 +300,7 @@ ifeq ($(FE_DEBUG),1)
+  FE_FLAGS += -DFE_DEBUG
+  ENABLE_DEBUG_SYMBOLS=1
+ else
+- CPPFLAGS += -O$(OPTIMIZE) -DNDEBUG
++ CPPFLAGS += -DNDEBUG
+ endif
+ 
+ ifeq ($(USE_GLES),1)
+@@ -512,7 +504,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
  
  $(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
  	$(EXE_MSG)
diff --git a/srcpkgs/attract/template b/srcpkgs/attract/template
index e769fb15456217..776cbe4ebd2c93 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,7 +1,7 @@
 # Template file for 'attract'
 pkgname=attract
 version=2.7.0
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="VERBOSE=1"
 make_use_env=yes