summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorPavel Vinogradov2019-09-30 21:23:48 -0400
committerPavel Vinogradov2019-09-30 21:23:48 -0400
commit59347e6753b06686c3ef7464aecded3cf18c8e02 (patch)
treea8f0a33fedb010455c62403d9546ecc6185c9d8e /x11
parentbf97786a441a392bdf6ca08d919c6a911c0383b1 (diff)
x11/conky: added a fix for luajit detection
Diffstat (limited to 'x11')
-rw-r--r--x11/conky/HISTORY3
-rwxr-xr-xx11/conky/PRE_BUILD4
-rw-r--r--x11/conky/patches/luajit.patch13
3 files changed, 20 insertions, 0 deletions
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index f57978ed61..24c851eb8e 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,6 @@
+2019-09-30 Pavel Vinogradov <public@sourcemage.org>
+ * PRE_BUILD, parches/luajit.patch: added a fix for luajit detection
+
2019-08-30 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DETAILS: version 1.11.5
diff --git a/x11/conky/PRE_BUILD b/x11/conky/PRE_BUILD
new file mode 100755
index 0000000000..f80ee7decc
--- /dev/null
+++ b/x11/conky/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+apply_patch_dir patches
diff --git a/x11/conky/patches/luajit.patch b/x11/conky/patches/luajit.patch
new file mode 100644
index 0000000000..5e7f233c2f
--- /dev/null
+++ b/x11/conky/patches/luajit.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
+--- a/cmake/ConkyPlatformChecks.cmake
++++ b/cmake/ConkyPlatformChecks.cmake
+@@ -377,7 +377,8 @@
+ lua53
+ lua5.2
+ lua-5.2
+- lua52)
++ lua52
++ luajit)
+ set(conky_libs ${conky_libs} ${LUA_LIBRARIES})
+ set(conky_includes ${conky_includes} ${LUA_INCLUDE_DIRS})
+ link_directories(${LUA_LIBRARY_DIRS})