[PR PATCH] attract: update to 2.7.0.

[PR PATCH] attract: update to 2.7.0.

[ypsvlq]

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

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

https://github.com/ypsvlq/void-packages attract
https://github.com/void-linux/void-packages/pull/48478

attract: update to 2.7.0.
<!-- 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/48478.patch is attached

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

From ebcf782918aa0a2ffcc7f8fee16ff60276a2df16 Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Thu, 1 Feb 2024 14:35:23 +0000
Subject: [PATCH] attract: update to 2.7.0.

---
 srcpkgs/attract/patches/Makefile.patch | 36 ++++++++++++--------------
 srcpkgs/attract/patches/string.patch   | 12 +++++++++
 srcpkgs/attract/template               | 11 ++++----
 3 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 srcpkgs/attract/patches/string.patch

diff --git a/srcpkgs/attract/patches/Makefile.patch b/srcpkgs/attract/patches/Makefile.patch
index 77ae06268e2ac..6310a9fd36526 100644
--- a/srcpkgs/attract/patches/Makefile.patch
+++ b/srcpkgs/attract/patches/Makefile.patch
@@ -1,33 +1,29 @@
---- a/Makefile	2016-12-06 21:40:22.715155552 +0100
-+++ b/Makefile	2016-12-06 21:41:39.523155740 +0100
-@@ -50,12 +50,8 @@
+diff --git a/Makefile.orig b/Makefile
+index 4f4793a9a69..b1f7cf469f4 100644
+--- a/Makefile.orig
++++ b/Makefile
+@@ -69,15 +69,10 @@
  
- FE_VERSION=v2.2.0
+ FE_VERSION=v2.7.0
  
 -CC=gcc
 -CXX=g++
- CFLAGS=$(EXTRA_CFLAGS)
+ CFLAGS=
+ CXXFLAGS=-std=c++11 $(EXTRA_CXXFLAGS)
+ CPPFLAGS=
 -STRIP=strip
+-OBJCOPY=objcopy
  PKG_CONFIG=pkg-config
 -AR=ar
  ARFLAGS=rc
  RM=rm -f
  MD=mkdir -p
-@@ -84,7 +84,7 @@
- override WINDRES := $(TOOLCHAIN)-$(WINDRES)
- endif
- 
--prefix=/usr/local
-+prefix=/usr
- datarootdir=$(prefix)/share
- datadir=$(datarootdir)
- exec_prefix=$(prefix)
-@@ -414,7 +414,7 @@
+@@ -512,7 +507,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.mm $(DEP) | $(OBJ_DIR)
  
  $(EXE): $(OBJ) $(EXPAT) $(SQUIRREL) $(AUDIO)
  	$(EXE_MSG)
--	$(SILENT)$(CXX) -o $@ $^ $(CFLAGS) $(FE_FLAGS) $(LIBS)
-+	$(SILENT)$(CXX) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(FE_FLAGS) $(LIBS)
- ifneq ($(FE_DEBUG),1)
- 	$(SILENT)$(STRIP) $@
- endif
+-	$(CXX) -o $@ $^ $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
++	$(CXX) -o $@ $^ $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(FE_FLAGS) $(LIBS)
+ ifeq ($(ENABLE_DEBUG_SYMBOLS),1)
+ 	$(DEBUG_MSG)
+ 	$(SILENT)$(OBJCOPY) --only-keep-debug $@ $@.debug
diff --git a/srcpkgs/attract/patches/string.patch b/srcpkgs/attract/patches/string.patch
new file mode 100644
index 0000000000000..0515d35194619
--- /dev/null
+++ b/srcpkgs/attract/patches/string.patch
@@ -0,0 +1,12 @@
+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 24017d2bacc24..e769fb1545621 100644
--- a/srcpkgs/attract/template
+++ b/srcpkgs/attract/template
@@ -1,17 +1,16 @@
 # Template file for 'attract'
 pkgname=attract
-version=2.6.2
-revision=2
+version=2.7.0
+revision=1
 build_style=gnu-makefile
 make_build_args="VERBOSE=1"
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="SFML-devel ffmpeg-devel fontconfig-devel glu-devel libarchive-devel
- libcurl-devel libjpeg-turbo-devel xine-lib rapidjson libXrandr-devel"
-depends="git"
+ libcurl-devel libjpeg-turbo-devel libXinerama-devel libXrandr-devel"
 short_desc="Attract-Mode is a graphical frontend for emulators"
 maintainer="Pedro Narciso García Revington <p.revington@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://attractmode.org/"
+homepage="https://attractmode.org/"
 distfiles="https://github.com/mickelson/attract/archive/v${version}.tar.gz"
-checksum=0412722c9ff186b5f7081027eb04751ee38f89c318d159f2559d0c4ac3246376
+checksum=497bc9d4d5846cb0eee71eaed2352d2350f789df3a913f423a3d6eed9ba428e8

Re: [PR PATCH] [Merged]: attract: update to 2.7.0.

[cinerea0]

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

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

attract: update to 2.7.0.
https://github.com/void-linux/void-packages/pull/48478

Description:
<!-- 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
-->