4 files changed, 39 insertions, 1 deletions

diff --git a/devel/gammaray/Makefile b/devel/gammaray/Makefile
index c4cb1263c3f0..a249b34f8a95 100644
--- a/devel/gammaray/Makefile
+++ b/devel/gammaray/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gammaray
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -20,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	KDAB
 GH_PROJECT=	GammaRay
 
-PLIST_SUB+=	ARCH=${ARCH} \
+PLIST_SUB+=	ARCH=${ARCH:S/amd64/x86_64/} \
 		PORTMAJMIN=${PORTVERSION:C/(.*)\..*/\1/} \
 		PORTVERSION=${PORTVERSION} \
 		QTVER=${QT5_VERSION:C/\./_/:C/\..*//}
diff --git a/devel/gammaray/files/patch-3rdparty_backward-cpp_BackwardMacros.cmake b/devel/gammaray/files/patch-3rdparty_backward-cpp_BackwardMacros.cmake
new file mode 100644
index 000000000000..e8c399ef297f
--- /dev/null
+++ b/devel/gammaray/files/patch-3rdparty_backward-cpp_BackwardMacros.cmake
@@ -0,0 +1,14 @@
+This seems to be a mistake, the comment says "static" but check is for dynamic!
+Results in libiberty not being found
+
+--- 3rdparty/backward-cpp/BackwardMacros.cmake.orig	2021-03-22 12:20:48 UTC
++++ 3rdparty/backward-cpp/BackwardMacros.cmake
+@@ -79,7 +79,7 @@ if (${STACK_DETAILS_AUTO_DETECT})
+ 
+ 		# If we attempt to link against static bfd, make sure to link its dependencies, too
+ 		get_filename_component(bfd_lib_ext "${LIBBFD_LIBRARIES}" EXT)
+-		if (bfd_lib_ext STREQUAL ".so")
++		if (bfd_lib_ext STREQUAL ".a")
+ 			list(APPEND BACKWARD_LIBRARIES iberty z)
+ 		endif()
+ 
diff --git a/devel/gammaray/files/patch-CMakeLists.txt b/devel/gammaray/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..10446b3b67e0
--- /dev/null
+++ b/devel/gammaray/files/patch-CMakeLists.txt
@@ -0,0 +1,12 @@
+Weird CMake macro error coming from that
+
+--- CMakeLists.txt.orig	2021-03-22 12:21:36 UTC
++++ CMakeLists.txt
+@@ -405,7 +405,6 @@ find_package(Qt5 NO_MODULE QUIET OPTIONAL_COMPONENTS
+   Test
+   WebEngineWidgets
+   Widgets
+-  WaylandCompositor
+ )
+ 
+ set(MACOS_DISABLE_UNSUPPORTED_TESTS FALSE)
diff --git a/devel/gammaray/files/patch-cmake_GammaRayProbeABI.cmake b/devel/gammaray/files/patch-cmake_GammaRayProbeABI.cmake
new file mode 100644
index 000000000000..08ed052dfe97
--- /dev/null
+++ b/devel/gammaray/files/patch-cmake_GammaRayProbeABI.cmake
@@ -0,0 +1,11 @@
+--- cmake/GammaRayProbeABI.cmake.orig	2021-03-22 12:26:15 UTC
++++ cmake/GammaRayProbeABI.cmake
+@@ -110,7 +110,7 @@ else()
+       set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-arm")
+     endif()
+   else()
+-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "corei")
++    if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86" OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "corei")
+       if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+         set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-x86_64")
+       else()