Skip to content
Snippets Groups Projects
Unverified Commit ec694630 authored by Willow Barraco's avatar Willow Barraco Committed by Oliver Smith
Browse files

temp/conky: fix build (MR 5877)

[ci:skip-build]: Oliver verified locally that it builds
parent a56982b7
No related branches found
No related tags found
1 merge request!5877temp/conky: fix build
Pipeline #211450 passed
From a42d5de804079c198f41d395ee8a54010f9fe039 Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Thu, 5 Dec 2024 21:38:28 +0100
Subject: [PATCH] Fix: build on upgrade to gcc 14
According to this, we need to add headers that was previously already
included:
https://gcc.gnu.org/gcc-14/porting_to.html
> Header dependency changes
Signed-off-by: Willow Barraco <contact@willowbarraco.fr>
---
src/x11.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/x11.cc b/src/x11.cc
index a9146c68..ae651ce9 100644
--- a/src/x11.cc
+++ b/src/x11.cc
@@ -50,6 +50,8 @@
#include <cstring>
#include <string>
+#include <algorithm>
+
extern "C" {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wvariadic-macros"
--
2.47.1
......@@ -2,7 +2,7 @@
# https://github.com/brndnmtthws/conky/issues/1898
pkgname=conky
pkgver=1.20.1
pkgrel=0
pkgrel=1
pkgdesc="Advanced, highly configurable system monitor for X based on torsmo"
url="https://github.com/brndnmtthws/conky"
arch="all"
......@@ -32,7 +32,10 @@ makedepends="
wireless-tools-dev
"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz"
source="
$pkgname-$pkgver.tar.gz::https://github.com/brndnmtthws/conky/archive/v$pkgver.tar.gz
0001-Fix-build-on-upgrade-to-gcc-14.patch
"
options="!check"
build() {
......@@ -59,4 +62,5 @@ package() {
sha512sums="
60b4da92a42b3ff1a2490c50c7a02eab27a5ce3e91d4e9e0a83d6f0f1089f22c20adec817011afea84bcd99ff19e8f776d852ff4c9249ef47412b58eaa9233da conky-1.20.1.tar.gz
9aa7854b0c2fd259ccd5845db2544a193b96559288bf5f451c63c120bf46bd9a44c5bf0bc3b98f892a6fa4f4bec5a620edfd47ca0ed5a72c6e9c1604a484137d 0001-Fix-build-on-upgrade-to-gcc-14.patch
"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment