imgui_tables.cpp patch

3 files changed, 23 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b127f838a46c..d0d9d3f22dff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = imgui-sfml
 	pkgdesc = Library which allows you to use ImGui with SFML
 	pkgver = 2.1
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/eliasdaler/imgui-sfml/
 	arch = any
 	license = MIT
@@ -10,9 +10,11 @@ pkgbase = imgui-sfml
 	source = https://github.com/eliasdaler/imgui-sfml/archive/v2.1.tar.gz
 	source = https://github.com/ocornut/imgui/archive/v1.81.tar.gz
 	source = package.patch
+	source = imgui_tables.patch
 	md5sums = 6e7fc0bd05372e668c786f7e25591302
 	md5sums = 9b48ac38829b538233f99c0aa8cacf50
 	md5sums = 7e2a85494a0987e44e44ddaf79adb152
+	md5sums = 3a48bd7bacc9e322f03aa69a83c46932
 
 pkgname = imgui-sfml
 
diff --git a/PKGBUILD b/PKGBUILD
index 7aa71ba79a73..591cf5ebc1fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=imgui-sfml
 pkgver=2.1
-pkgrel=5
+pkgrel=6
 _imguiver=1.81
 pkgdesc="Library which allows you to use ImGui with SFML"
 arch=("any")
@@ -10,10 +10,12 @@ url="https://github.com/eliasdaler/imgui-sfml/"
 license=("MIT")
 source=("https://github.com/eliasdaler/${pkgname}/archive/v${pkgver}.tar.gz"
 	"https://github.com/ocornut/imgui/archive/v${_imguiver}.tar.gz"
-	"package.patch")
+	"package.patch"
+	"imgui_tables.patch")
 md5sums=('6e7fc0bd05372e668c786f7e25591302'
          '9b48ac38829b538233f99c0aa8cacf50'
-         '7e2a85494a0987e44e44ddaf79adb152')
+         '7e2a85494a0987e44e44ddaf79adb152'
+         '3a48bd7bacc9e322f03aa69a83c46932')
 depends=("sfml")
 makedepends=("cmake")
 
@@ -21,6 +23,7 @@ makedepends=("cmake")
 prepare() {
 	cd ${srcdir}
 	patch --strip=1 --input=package.patch
+	patch --strip=1 --input=imgui_tables.patch
 }
 
 build() {
diff --git a/imgui_tables.patch b/imgui_tables.patch
new file mode 100644
index 000000000000..0d96d7ffd529
--- /dev/null
+++ b/imgui_tables.patch
@@ -0,0 +1,14 @@
+diff --unified --recursive --text package.orig/imgui-sfml-2.1/cmake/FindImGui.cmake package.new/imgui-sfml-2.1/cmake/FindImGui.cmake
+--- package.orig/imgui-sfml-2.1/cmake/FindImGui.cmake   2021-02-21 19:58:06.780926546 +0100
++++ package.new/imgui-sfml-2.1/cmake/FindImGui.cmake    2021-02-21 19:58:53.121012311 +0100
+@@ -48,6 +48,10 @@
+ # Transform '#define IMGUI_VERSION "X.Y"' into 'X.Y'
+ string(REGEX REPLACE ".*\"(.*)\".*" "\\1" IMGUI_VERSION "${IMGUI_VERSION}")
+ 
++if(${IMGUI_VERSION} VERSION_GREATER_EQUAL "1.80")
++  list(APPEND IMGUI_SOURCES ${IMGUI_INCLUDE_DIR}/imgui_tables.cpp)
++endif()
++
+ # Check required version
+ if(${IMGUI_VERSION} VERSION_LESS ${ImGui_FIND_VERSION})
+   set(IMGUI_FOUND FALSE)