psensor: replace libappindicator with libayatana-appindicator

This commit is contained in:
tibequadorian 2022-11-30 10:53:42 +01:00 committed by Michal Vasilek
parent 9f6e89897b
commit c0eeffb423
2 changed files with 60 additions and 4 deletions

View file

@ -0,0 +1,53 @@
From d84498639263d6a8f8d4b4adddf3dab66631876b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 22 Jan 2022 00:15:13 +0100
Subject: [PATCH] Use ayatana appindicator
---
configure.ac | 2 +-
src/ui.h | 2 +-
src/ui_appindicator.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 48b10eb..2ff857d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
# Checks AppIndicator
APPINDICATOR_LIBS=
-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
+PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1,
[AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
[AC_MSG_WARN(AppIndicator 3-0.1 not present")])
AM_CONDITIONAL(APPINDICATOR, test -n "$APPINDICATOR_LIBS")
diff --git a/src/ui.h b/src/ui.h
index 426f29c..43ae4be 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -27,7 +27,7 @@
#include <gtk/gtk.h>
#if defined(HAVE_APPINDICATOR)
-#include <libappindicator/app-indicator.h>
+#include <libayatana-appindicator/app-indicator.h>
#endif
#include "psensor.h"
diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index ed4cc64..b3179c0 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <libappindicator/app-indicator.h>
+#include <libayatana-appindicator/app-indicator.h>
#include <cfg.h>
#include <psensor.h>
--
2.34.1

View file

@ -1,12 +1,12 @@
# Template file for 'psensor'
pkgname=psensor
version=1.2.1
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config glib-devel"
hostmakedepends="pkg-config glib-devel automake gettext-devel-tools"
makedepends="gtk+3-devel udisks2-devel libgtop-devel json-c-devel
libsensors-devel libatasmart-devel libcurl-devel libnotify-devel
libappindicator-devel libmicrohttpd-devel"
libayatana-appindicator-devel libmicrohttpd-devel"
depends="lm_sensors"
short_desc="Graphical hardware temperature monitor for Linux"
maintainer="Foxlet <foxlet@furcode.co>"
@ -23,5 +23,8 @@ fi
post_extract() {
vsed -e 's/-Werror//g' -i tests/Makefile.in src/lib/Makefile.in src/server/Makefile.in
}
pre_configure() {
autoreconf -fi
}