Skip to Content.
Sympa Menu

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

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 (dcc49f064767bc6448272f2b277de435c164e883)
  • Date: Thu, 22 Feb 2024 04:00:19 +0000

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

x11/conky/DETAILS | 4 ++--
x11/conky/HISTORY | 4 ++++
x11/conky/PRE_BUILD | 4 ++++
x11/conky/patches/display-x11.patch | 19 +++++++++++++++++++
4 files changed, 29 insertions(+), 2 deletions(-)

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

x11/conky: version 1.19.7

diff --git a/x11/conky/DETAILS b/x11/conky/DETAILS
index 8e41b29..89321f0 100755
--- a/x11/conky/DETAILS
+++ b/x11/conky/DETAILS
@@ -1,7 +1,7 @@
source "${GRIMOIRE}/CMAKE_FUNCTIONS"
SPELL=conky
- VERSION=1.19.6
-
SOURCE_HASH=sha512:9f1900f495125c668835334239b69fc098c30fe450a384786d873eb3d3e955ff0f06ca70c3a94f47a4b38a42d4510be77efd13873411f11ff84d8bfdc2869fde
+ VERSION=1.19.7
+
SOURCE_HASH=sha512:54041cfa5c1d135d751fe8852523e7ad55815ecc9d9af87251e26edd38801e1e36be2f67b390376015090052f21f6c28992edd551c0dab8ae3c22f8facd3542e
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=https://github.com/brndnmtthws/conky/archive/v${VERSION}.tar.gz
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index f8cac4b..6318fcd 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,7 @@
+2024-02-21 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.19.7
+ * PRE_BUILD, patches/display-x11.patch: added to fix building with no
X
+
2023-12-06 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.19.6

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/display-x11.patch
b/x11/conky/patches/display-x11.patch
new file mode 100644
index 0000000..dea9699
--- /dev/null
+++ b/x11/conky/patches/display-x11.patch
@@ -0,0 +1,19 @@
+diff --git a/src/display-x11.cc b/src/display-x11.cc
+--- a/src/display-x11.cc
++++ b/src/display-x11.cc
+@@ -24,7 +24,6 @@
+ *
+ */
+
+-#include <X11/extensions/XI2.h>
+ #include <config.h>
+
+ #ifdef BUILD_X11
+@@ -47,6 +46,7 @@
+ #include "mouse-events.h"
+ #ifdef BUILD_XINPUT
+ #include <X11/extensions/XInput2.h>
++#include <X11/extensions/XI2.h>
+ #endif /* BUILD_XINPUT */
+ #endif /* BUILD_MOUSE_EVENTS */
+ #endif /* BUILD_X11 */


  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (dcc49f064767bc6448272f2b277de435c164e883), Pavel Vinogradov, 02/21/2024

Archive powered by MHonArc 2.6.24.

Top of Page