From 33a86abe90c06ca8ac20f47735c05a319301e49c Mon Sep 17 00:00:00 2001
From: Willow Barraco <contact@willowbarraco.fr>
Date: Thu, 2 Jan 2025 08:14:15 +0100
Subject: [PATCH] temp/conky: remove (MR 5967)

[ci:skip-build]: already built successfully in CI
---
 .../0001-Fix-build-on-upgrade-to-gcc-14.patch | 33 ----------
 temp/conky/APKBUILD                           | 66 -------------------
 2 files changed, 99 deletions(-)
 delete mode 100644 temp/conky/0001-Fix-build-on-upgrade-to-gcc-14.patch
 delete mode 100644 temp/conky/APKBUILD

diff --git a/temp/conky/0001-Fix-build-on-upgrade-to-gcc-14.patch b/temp/conky/0001-Fix-build-on-upgrade-to-gcc-14.patch
deleted file mode 100644
index 0536bd26c..000000000
--- a/temp/conky/0001-Fix-build-on-upgrade-to-gcc-14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
diff --git a/temp/conky/APKBUILD b/temp/conky/APKBUILD
deleted file mode 100644
index 7f8c5b5f2..000000000
--- a/temp/conky/APKBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# Old conky version forked from Alpine for Sxmo until this is fixed:
-# https://github.com/brndnmtthws/conky/issues/1898
-pkgname=conky
-pkgver=1.20.1
-pkgrel=1
-pkgdesc="Advanced, highly configurable system monitor for X based on torsmo"
-url="https://github.com/brndnmtthws/conky"
-arch="all"
-license="GPL-3.0-or-later"
-makedepends="
-	alsa-lib-dev
-	cairo-dev
-	cmake
-	curl-dev
-	gawk
-	glib-dev
-	imlib2-dev
-	libxdamage-dev
-	libxext-dev
-	libxft-dev
-	libxinerama-dev
-	libxml2-dev
-	linux-headers
-	lua5.4-dev
-	ncurses-dev
-	pango-dev
-	samurai
-	tolua++
-	wayland-dev
-	libxi-dev
-	wayland-protocols
-	wireless-tools-dev
-	"
-subpackages="$pkgname-doc"
-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() {
-	cmake -B build -G Ninja \
-		-DRELEASE=ON \
-		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_CURL=ON \
-		-DBUILD_XDBE=ON \
-		-DBUILD_IMLIB2=ON \
-		-DBUILD_RSS=ON \
-		-DBUILD_WLAN=ON \
-		-DBUILD_I18N=OFF \
-		-DBUILD_LUA_CAIRO=ON \
-		-DBUILD_WAYLAND=ON \
-		-DLUA_LIBRARIES="/usr/lib/lua5.4/liblua.so"
-	cmake --build build
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-	install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-sha512sums="
-60b4da92a42b3ff1a2490c50c7a02eab27a5ce3e91d4e9e0a83d6f0f1089f22c20adec817011afea84bcd99ff19e8f776d852ff4c9249ef47412b58eaa9233da  conky-1.20.1.tar.gz
-9aa7854b0c2fd259ccd5845db2544a193b96559288bf5f451c63c120bf46bd9a44c5bf0bc3b98f892a6fa4f4bec5a620edfd47ca0ed5a72c6e9c1604a484137d  0001-Fix-build-on-upgrade-to-gcc-14.patch
-"