Add patch fixing build with clang

5 files changed, 66 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4283810cc97c..0d19d637116a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = imhex
 	pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM
 	pkgver = 1.16.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/WerWolv/ImHex
 	arch = x86_64
 	license = GPL2
@@ -30,30 +30,34 @@ pkgbase = imhex
 	source = capstone::git+https://github.com/capstone-engine/capstone#branch=next
 	source = 0001-makepkg-Remove-external-stuff.patch
 	source = 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
+	source = libromfs-0001-Fix-code-generation-for-clang.patch
 	source = imhex.desktop
 	cksums = SKIP
 	cksums = SKIP
 	cksums = SKIP
 	cksums = SKIP
 	cksums = SKIP
-	cksums = 3198617
-	cksums = 40505814
+	cksums = 948907946
+	cksums = 345460920
+	cksums = 2244423799
 	cksums = 4178124713
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 1106d46e20e014d0d82b0474ed6401bec523e0aee5570b9b1d8b82ca27537ed7
-	sha256sums = 5a5e21bc9ca471ea9596706048892fee7fcf6cd7d4baf9ae65872be7280d9ae6
+	sha256sums = 9135ba8227955249554983f680f0bbf3b5a615182f8913af1c5b0f8890a6c9dd
+	sha256sums = daf80fbf00f91a2dafa972c644fc5ab7fc43438e1a3d86515f7b1fa0e2ff1d13
+	sha256sums = 5df68c1ee84ef55b07860b3b37120a21f488bbf9bff9466eb45fe81e537cd611
 	sha256sums = 72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = b9cb8943d29cc074e76e42238da46071322d66d926b050f7078e3506dea4403b2ea7e5709cbdefea543ee2cf93c878f732a5237ad112030b9122b5bb00826b92
-	b2sums = 729d11c80a2fd74b9ee8f4a5e59d2eb469f2c1c9b3acfb883d43d7998b2b63f86bfbc895e429d766f9741d35893e790cfe84618ca5e20843244aaba36983d8b1
+	b2sums = fe7d4248ab3cb04d7b78bd9b179a1fb06239c093c9960de30573e56bdddc0da993481e51fac5fad629510d0d75cac0b367ef1c8d23d58406fc5a1c4400920271
+	b2sums = f694d8af5d577a5d3566efa70b391518d858ecb1743450e4c75a509ba9a5ee13a0de4b4bff260b569202d77a49d35bba4f04a25b105616b591775d93f29d6b4e
+	b2sums = faa552370acc478ab155125fc029049edab8d105496201ec3763dfa5af3dc71ab334bd53545231e172643d51a4470db1a3d3573de007590bd88efe5ebef2fb44
 	b2sums = 7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc
 
 pkgname = imhex
diff --git a/0001-makepkg-Remove-external-stuff.patch b/0001-makepkg-Remove-external-stuff.patch
index 796a7b2ef725..ae247bcd73c9 100644
--- a/0001-makepkg-Remove-external-stuff.patch
+++ b/0001-makepkg-Remove-external-stuff.patch
@@ -1,13 +1,12 @@
-From ba44b71dc719fe01c93d299759bad822261ce008 Mon Sep 17 00:00:00 2001
+From 7181352cecb42eb22db278e63acdfa4899e6ca01 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
-Date: Mon, 10 Jan 2022 15:47:10 +0100
+Date: Thu, 3 Mar 2022 19:58:41 +0100
 Subject: [PATCH 1/2] makepkg: Remove external stuff
 
 ---
  CMakeLists.txt            |  4 ----
  cmake/build_helpers.cmake | 28 ----------------------------
- lib/external/libromfs     |  2 +-
- 3 files changed, 1 insertion(+), 33 deletions(-)
+ 2 files changed, 32 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index cb17250b..dfbbf5ca 100644
@@ -66,13 +65,6 @@ index 8fda5791..873525fb 100644
 -
 -endfunction()
 \ No newline at end of file
-diff --git a/lib/external/libromfs b/lib/external/libromfs
-index 0842d22d..5d327344 160000
---- a/lib/external/libromfs
-+++ b/lib/external/libromfs
-@@ -1 +1 @@
--Subproject commit 0842d22deb13e036eb1fb15df368b6cad552abfe
-+Subproject commit 5d3273443a47f4a2f295cc476b5266a84e836206
 -- 
 2.35.1
 
diff --git a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
index e47ca8c757c7..a117051b67fb 100644
--- a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
+++ b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
@@ -1,4 +1,4 @@
-From ab118b1b4236e0c35c9edbb68e167465e48e49f6 Mon Sep 17 00:00:00 2001
+From 561b0358d5832416b0bbb1d81ba7e7f6bd04ffa1 Mon Sep 17 00:00:00 2001
 From: KokaKiwi <kokakiwi+git@kokakiwi.net>
 Date: Mon, 31 Jan 2022 20:20:40 +0100
 Subject: [PATCH 2/2] archlinux-compat: Remove unused mbedTLS code from libcurl
diff --git a/PKGBUILD b/PKGBUILD
index d553067d8a21..b7ba3e71482c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=ImHex
 pkgname=${_pkgname,,}
 pkgver=1.16.2
-pkgrel=1
+pkgrel=2
 pkgdesc='A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM'
 url='https://github.com/WerWolv/ImHex'
 license=('GPL2')
@@ -21,30 +21,34 @@ source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver"
         "capstone::git+https://github.com/capstone-engine/capstone#branch=next"
         0001-makepkg-Remove-external-stuff.patch
         0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch
+        libromfs-0001-Fix-code-generation-for-clang.patch
         imhex.desktop)
 cksums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        '3198617'
-        '40505814'
+        '948907946'
+        '345460920'
+        '2244423799'
         '4178124713')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '1106d46e20e014d0d82b0474ed6401bec523e0aee5570b9b1d8b82ca27537ed7'
-            '5a5e21bc9ca471ea9596706048892fee7fcf6cd7d4baf9ae65872be7280d9ae6'
+            '9135ba8227955249554983f680f0bbf3b5a615182f8913af1c5b0f8890a6c9dd'
+            'daf80fbf00f91a2dafa972c644fc5ab7fc43438e1a3d86515f7b1fa0e2ff1d13'
+            '5df68c1ee84ef55b07860b3b37120a21f488bbf9bff9466eb45fe81e537cd611'
             '72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6')
 b2sums=('SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
         'SKIP'
-        'b9cb8943d29cc074e76e42238da46071322d66d926b050f7078e3506dea4403b2ea7e5709cbdefea543ee2cf93c878f732a5237ad112030b9122b5bb00826b92'
-        '729d11c80a2fd74b9ee8f4a5e59d2eb469f2c1c9b3acfb883d43d7998b2b63f86bfbc895e429d766f9741d35893e790cfe84618ca5e20843244aaba36983d8b1'
+        'fe7d4248ab3cb04d7b78bd9b179a1fb06239c093c9960de30573e56bdddc0da993481e51fac5fad629510d0d75cac0b367ef1c8d23d58406fc5a1c4400920271'
+        'f694d8af5d577a5d3566efa70b391518d858ecb1743450e4c75a509ba9a5ee13a0de4b4bff260b569202d77a49d35bba4f04a25b105616b591775d93f29d6b4e'
+        'faa552370acc478ab155125fc029049edab8d105496201ec3763dfa5af3dc71ab334bd53545231e172643d51a4470db1a3d3573de007590bd88efe5ebef2fb44'
         '7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc')
 
 prepare() {
@@ -62,6 +66,11 @@ prepare() {
   git apply \
     "$srcdir/0001-makepkg-Remove-external-stuff.patch" \
     "$srcdir/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch"
+
+  git -C lib/external/libromfs apply \
+    "$srcdir/libromfs-0001-Fix-code-generation-for-clang.patch" || \
+    git -C lib/external/libromfs apply -R --check \
+    "$srcdir/libromfs-0001-Fix-code-generation-for-clang.patch"
 }
 
 build() {
@@ -72,8 +81,6 @@ build() {
     -D CMAKE_BUILD_TYPE=RelWithDebInfo \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_SKIP_RPATH=ON \
-    -D CMAKE_C_COMPILER="gcc" \
-    -D CMAKE_CXX_COMPILER="g++" \
     -D USE_SYSTEM_LLVM=ON \
     -D USE_SYSTEM_YARA=ON \
     -D USE_SYSTEM_FMT=ON \
diff --git a/libromfs-0001-Fix-code-generation-for-clang.patch b/libromfs-0001-Fix-code-generation-for-clang.patch
new file mode 100644
index 000000000000..94b1fbd50948
--- /dev/null
+++ b/libromfs-0001-Fix-code-generation-for-clang.patch
@@ -0,0 +1,35 @@
+From a66bc647a335f175e817e60bc7eb0f310854c695 Mon Sep 17 00:00:00 2001
+From: KokaKiwi <kokakiwi+git@kokakiwi.net>
+Date: Wed, 12 Jan 2022 14:11:50 +0100
+Subject: [PATCH] Fix code generation for clang
+
+---
+ generator/include/embedder.hpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/generator/include/embedder.hpp b/generator/include/embedder.hpp
+index 3b5ee69..460a9dc 100644
+--- a/generator/include/embedder.hpp
++++ b/generator/include/embedder.hpp
+@@ -5,13 +5,13 @@ R"embedder(
+ 
+     #define RESOURCE(name, path)                        \
+     __asm__ (                                           \
+-        ".global _" #name "\n"                          \
+-        ".global _" #name "_size\n"                     \
+-        "_" #name ":\n"                                 \
++        ".global " #name "\n"                          \
++        ".global " #name "_size\n"                     \
++        #name ":\n"                                 \
+             ".incbin \"" path "\"\n"                    \
+             ".align 8\n"                                \
+-        "_" #name "_size:\n"                            \
+-            ".int _" #name "_size - _" #name " - 1\n"   \
++        #name "_size:\n"                            \
++            ".int " #name "_size - " #name " - 1\n"   \
+             ".align 8\n"                                \
+     )
+ 
+-- 
+2.35.1
+