Page MenuHomeSolus
Differential D11739 Diff 28497 files/0001-Use-libayatana-indicator-and-libayatana-appindicator.patch

Changeset View

Standalone View

View Options

files/0001-Use-libayatana-indicator-and-libayatana-appindicator.patch

  • This file was added.
From ba728c2c25f4526f96f01c6bd77d5c53a72d7763 Mon Sep 17 00:00:00 2001
From: Fabio Forni <livingsilver94.solus@redaril.me>
Date: Tue, 24 Aug 2021 20:55:45 +0200
Subject: [PATCH] Use libayatana-indicator and libayatana-appindicator
---
configure.ac | 8 ++++----
src/application-service-appstore.c | 6 +++---
src/generate-id.h | 2 +-
src/indicator-application.c | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 836d379..8f064b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,11 @@ LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
PKG_CHECK_MODULES(INDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION
gio-2.0 >= $GIO_REQUIRED_VERSION
gtk+-3.0 >= $GTK_REQUIRED_VERSION
- indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+ ayatana-indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
-PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
+PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
AC_SUBST(SYSTEMD_USERDIR)
@@ -85,8 +85,8 @@ elif test "x$with_gtk" = x2; then
INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
else
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator3-0.4`
+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator3-0.4`
fi
AC_SUBST(INDICATORDIR)
AC_SUBST(INDICATORICONSDIR)
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 864e434..498f06c 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -24,9 +24,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config.h"
#endif
-#include <libindicator/indicator-object.h>
-#include "libappindicator/app-indicator.h"
-#include "libappindicator/app-indicator-enum-types.h"
+#include <libayatana-indicator/indicator-object.h>
+#include "libayatana-appindicator/app-indicator.h"
+#include "libayatana-appindicator/app-indicator-enum-types.h"
#include "application-service-appstore.h"
#include "application-service-marshal.h"
#include "dbus-shared.h"
diff --git a/src/generate-id.h b/src/generate-id.h
index 4c26da2..1d2da21 100644
--- a/src/generate-id.h
+++ b/src/generate-id.h
@@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#define __GENERATE_ID_H__
#include <glib.h>
-#include "libappindicator/app-indicator.h"
+#include "libayatana-appindicator/app-indicator.h"
guint32 generate_id (const AppIndicatorCategory category, const gchar * id);
diff --git a/src/indicator-application.c b/src/indicator-application.c
index e78c69e..57885a4 100644
--- a/src/indicator-application.c
+++ b/src/indicator-application.c
@@ -35,9 +35,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <libdbusmenu-gtk/menu.h>
/* Indicator Stuff */
-#include <libindicator/indicator.h>
-#include <libindicator/indicator-object.h>
-#include <libindicator/indicator-image-helper.h>
+#include <libayatana-indicator/indicator.h>
+#include <libayatana-indicator/indicator-object.h>
+#include <libayatana-indicator/indicator-image-helper.h>
/* Local Stuff */
#include "dbus-shared.h"
--
2.32.0
Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.