Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (59347e6753b06686c3ef7464aecded3cf18c8e02)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (59347e6753b06686c3ef7464aecded3cf18c8e02)
  • Date: Tue, 1 Oct 2019 01:25:28 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

x11/conky/HISTORY | 3 +++
x11/conky/PRE_BUILD | 4 ++++
x11/conky/patches/luajit.patch | 13 +++++++++++++
3 files changed, 20 insertions(+)

New commits:
commit 59347e6753b06686c3ef7464aecded3cf18c8e02
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

x11/conky: added a fix for luajit detection

diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index f57978e..24c851e 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,6 @@
+2019-09-30 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, parches/luajit.patch: added a fix for luajit detection
+
2019-08-30 Florian Franzmann <siflfran AT 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 0000000..f80ee7d
--- /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 0000000..5e7f233
--- /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})



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (59347e6753b06686c3ef7464aecded3cf18c8e02), Pavel Vinogradov, 09/30/2019

Archive powered by MHonArc 2.6.24.

Top of Page