[PR PATCH] antimicrox: update to 3.1.3

[PR PATCH] antimicrox: update to 3.1.3

[ndowens]

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

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

https://github.com/ndowens/void-packages antimicrox
https://github.com/void-linux/void-packages/pull/26818

antimicrox: update to 3.1.3
Removed arm patch as this version includes the patch

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

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

From 25783e1d6c410d524dc34615b4e756eaa18dc9d5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 29 Nov 2020 19:04:12 -0600
Subject: [PATCH] antimicrox: update to 3.1.3

Removed arm patch as this version includes the patch
---
 srcpkgs/antimicrox/patches/arm.patch | 136 ---------------------------
 srcpkgs/antimicrox/template          |   4 +-
 2 files changed, 2 insertions(+), 138 deletions(-)
 delete mode 100644 srcpkgs/antimicrox/patches/arm.patch

diff --git a/srcpkgs/antimicrox/patches/arm.patch b/srcpkgs/antimicrox/patches/arm.patch
deleted file mode 100644
index 6bd0b1b204a..00000000000
--- a/srcpkgs/antimicrox/patches/arm.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 1833a1740c23d15c940f5fdf3c00893b7121d11e Mon Sep 17 00:00:00 2001
-From: Gergely Gombos <gombosg@disroot.org>
-Date: Sun, 8 Nov 2020 18:41:56 +0100
-Subject: [PATCH 1/2] fix: fix linking error on armv7hl
-
----
- CMakeLists.txt                                 | 18 +++++++++---------
- src/gamecontroller/xml/gamecontrollerdpadxml.h |  1 +
- src/xml/joydpadxml.cpp                         |  3 ++-
- src/xml/joydpadxml.h                           |  2 --
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-Backported by fosslinux.
-
-diff --git CMakeLists.txt CMakeLists.txt
-index 90f382c1..cfb7410d 100755
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -232,7 +232,7 @@ set(antimicrox_SOURCES
-     src/xml/joyaxisxml.cpp
-     src/xml/joybuttonslotxml.cpp
-     src/xml/joybuttonxml.cpp
--    #src/xml/joydpadxml.cpp
-+    src/xml/joydpadxml.cpp
-     src/xml/setjoystickxml.cpp
-     src/xmlconfigmigration.cpp
-     src/xmlconfigreader.cpp
-@@ -514,16 +514,16 @@ endif(UNIX)
-             set_target_properties(antilib PROPERTIES
-                 SOVERSION ${ANTILIB_VERSION}
-             )
--            
--            
-+
-+
-             #target_link_libraries (antilib Qt5::Widgets Qt5::Core Qt5::Test Qt5::Gui Qt5::Network Qt5::Concurrent ${SDL_LIBRARY} ${LIBS})
-             target_link_libraries (antilib Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Network Qt5::Concurrent ${SDL_LIBRARY} ${LIBS})
- 
-             if (WITH_X11)
-                 target_link_libraries(antilib Qt5::X11Extras)
-             endif()
--            
--            
-+
-+
-             add_executable(antimicrox ${antimicrox_MAIN})
-             target_link_libraries (antimicrox antilib Qt5::Widgets Qt5::Core Qt5::Gui Qt5::Network Qt5::Concurrent)
- 
-@@ -682,10 +682,10 @@ if(UNIX)
- if(CPACK_GENERATOR STREQUAL "DEB")
-   set(CPACK_DEBIAN_PACKAGE_DEPENDS "qtbase5-dev, libsdl2-2.0-0, libqt5x11extras5, libc6")
-   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "pktiuk <kotiuk@zohomail.eu>")
--  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AntiMicroX is a graphical program used to map gamepad buttons to keyboard, mouse, scripts and macros. 
-+  set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AntiMicroX is a graphical program used to map gamepad buttons to keyboard, mouse, scripts and macros.
- 
- It is a new fork of discontinued AntiMicro.")
--  
-+
-   message("Preparing documentation for DEB package")
-   add_custom_target(package_docummentation ALL)
- 
-@@ -697,10 +697,10 @@ It is a new fork of discontinued AntiMicro.")
-   #Strip binaries from unnecessary notes, comments, etc
-   add_custom_command(TARGET antimicrox POST_BUILD
-   COMMAND strip --strip-unneeded --remove-section=.comment --remove-section=.note "${CMAKE_CURRENT_BINARY_DIR}/bin/antimicrox" VERBATIM)
--  
-+
-   add_custom_command(TARGET antimicrox POST_BUILD
-   COMMAND strip --strip-unneeded --remove-section=.comment --remove-section=.note "${CMAKE_CURRENT_BINARY_DIR}/libantilib.so.1" VERBATIM)
--  
-+
- endif()
- 
- set(CPACK_PACKAGE_EXECUTABLES "antimicrox" "antimicrox")
-diff --git src/gamecontroller/xml/gamecontrollerdpadxml.h src/gamecontroller/xml/gamecontrollerdpadxml.h
-index 25ce7927..4a68ff31 100644
---- src/gamecontroller/xml/gamecontrollerdpadxml.h
-+++ src/gamecontroller/xml/gamecontrollerdpadxml.h
-@@ -19,6 +19,7 @@
- #define GAMECONTROLLERDPADXML_H
- 
- #include "xml/joydpadxml.h"
-+#include "vdpad.h"
- 
- class GameControllerDPad;
- class QXmlStreamReader;
-diff --git src/xml/joydpadxml.cpp src/xml/joydpadxml.cpp
-index 2ce01701..a35e70d0 100644
---- src/xml/joydpadxml.cpp
-+++ src/xml/joydpadxml.cpp
-@@ -1,4 +1,5 @@
- 
-+#include "joydpadxml.h"
- #include "globalvariables.h"
- 
- #include "gamecontroller/gamecontrollerdpad.h"
-@@ -143,3 +143,3 @@
- template class JoyDPadXml<JoyDPad>;
- template class JoyDPadXml<VDPad>;
--//template class JoyDPadXml<GameControllerDPad>;
-+template class JoyDPadXml<GameControllerDPad>;
-diff --git src/xml/joydpadxml.h src/xml/joydpadxml.h
-index b53afb7a..88ed77b1 100644
---- src/xml/joydpadxml.h
-+++ src/xml/joydpadxml.h
-@@ -37,6 +37,4 @@ template <class T> class JoyDPadXml : public QObject
-     T *m_joydpad;
- };
- 
--#include "joydpadxml.cpp"
--
- #endif // JOYDPADXML_H
-
-From 020bb55da5a8e880d8a82032d326941fa40c7875 Mon Sep 17 00:00:00 2001
-From: Gergely Gombos <gombosg@disroot.org>
-Date: Mon, 9 Nov 2020 12:37:42 +0100
-Subject: [PATCH 2/2] chore: linter fix
-
----
- src/gamecontroller/xml/gamecontrollerdpadxml.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/gamecontroller/xml/gamecontrollerdpadxml.h src/gamecontroller/xml/gamecontrollerdpadxml.h
-index 4a68ff31..9ab697df 100644
---- src/gamecontroller/xml/gamecontrollerdpadxml.h
-+++ src/gamecontroller/xml/gamecontrollerdpadxml.h
-@@ -18,8 +18,8 @@
- #ifndef GAMECONTROLLERDPADXML_H
- #define GAMECONTROLLERDPADXML_H
- 
--#include "xml/joydpadxml.h"
- #include "vdpad.h"
-+#include "xml/joydpadxml.h"
- 
- class GameControllerDPad;
- class QXmlStreamReader;
diff --git a/srcpkgs/antimicrox/template b/srcpkgs/antimicrox/template
index c35b34421a3..6a77e8e3a09 100644
--- a/srcpkgs/antimicrox/template
+++ b/srcpkgs/antimicrox/template
@@ -1,6 +1,6 @@
 # Template file for 'antimicrox'
 pkgname=antimicrox
-version=3.1.2
+version=3.1.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config extra-cmake-modules itstool gettext qt5-qmake
@@ -12,7 +12,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/AntiMicroX/antimicrox"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=18539897caed5021003f590cb4baeacf039897c6ff1542697901f573d5a758dc
+checksum=53c6b0e6c8ea8c3a5527b56e1ad052eae983ba36abfc090769c6164bc5f342dd
 
 libantimicrox_package() {
 	short_desc+=" - libraries"

Re: [PR PATCH] [Merged]: antimicrox: update to 3.1.3

[Piraty]

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

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

antimicrox: update to 3.1.3
https://github.com/void-linux/void-packages/pull/26818

Description:
Removed arm patch as this version includes the patch