Add d/patches/0010-Change-pkg-config-from-indicator3-0.4-to-ayatana-ind.patch
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>
Nobuhiro Iwamatsu
3 years ago
| 0 | From 8e9b69c228433d224c8d601d6e4e77934944d7a3 Mon Sep 17 00:00:00 2001 | |
| 1 | From: Nobuhiro Iwamatsu <iwamatsu@debian.org> | |
| 2 | Date: Sun, 3 Jan 2021 01:22:12 +0900 | |
| 3 | Subject: [PATCH] Change pkg-config from indicator3-0.4 to | |
| 4 | ayatana-indicator3-0.4 | |
| 5 | ||
| 6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org> | |
| 7 | --- | |
| 8 | CMakeLists.txt | 6 +++--- | |
| 9 | Indicator-applet/indicator-applet.h | 4 ++-- | |
| 10 | Indicator-applet3/indicator-applet3-utils.h | 2 +- | |
| 11 | Indicator-applet3/indicator-applet3.h | 2 +- | |
| 12 | 4 files changed, 7 insertions(+), 7 deletions(-) | |
| 13 | ||
| 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
| 15 | index 5f5db1b..55ee45b 100644 | |
| 16 | --- a/CMakeLists.txt | |
| 17 | +++ b/CMakeLists.txt | |
| 18 | @@ -197,7 +197,7 @@ endif() | |
| 19 | ## Indicator | |
| 20 | enable_if_not_defined (enable-indicator-support) | |
| 21 | if (enable-indicator-support) | |
| 22 | - set (INDICATOR_APPLET_MODULE indicator3-0.4) | |
| 23 | + set (INDICATOR_APPLET_MODULE ayatana-indicator3-0.4) | |
| 24 | pkg_check_modules (INDICATOR_APPLET ${INDICATOR_APPLET_MODULE}) | |
| 25 | if (INDICATOR_APPLET_FOUND) | |
| 26 | set (INDICATOR_NEW_VERSION TRUE) # oneiric and newer | |
| 27 | @@ -264,10 +264,10 @@ if (INDICATOR_APPLET_FOUND) | |
| 28 | ||
| 29 | if (INDICATOR_NEW_VERSION) # oneiric and newer | |
| 30 | execute_process( | |
| 31 | - COMMAND pkg-config --variable=iconsdir indicator3-0.4 | |
| 32 | + COMMAND pkg-config --variable=iconsdir ayatana-indicator3-0.4 | |
| 33 | OUTPUT_VARIABLE INDICATORICONSDIR) | |
| 34 | execute_process( | |
| 35 | - COMMAND pkg-config --variable=indicatordir indicator3-0.4 | |
| 36 | + COMMAND pkg-config --variable=indicatordir ayatana-indicator3-0.4 | |
| 37 | OUTPUT_VARIABLE INDICATORDIR) | |
| 38 | STRING (REGEX REPLACE "\n" "" INDICATORDIR ${INDICATORDIR}) | |
| 39 | set (with_indicator3 yes) | |
| 40 | diff --git a/Indicator-applet/indicator-applet.h b/Indicator-applet/indicator-applet.h | |
| 41 | index 52a3d4e..deebaec 100755 | |
| 42 | --- a/Indicator-applet/indicator-applet.h | |
| 43 | +++ b/Indicator-applet/indicator-applet.h | |
| 44 | @@ -23,9 +23,9 @@ | |
| 45 | ||
| 46 | #include <cairo-dock.h> | |
| 47 | ||
| 48 | -#include <libindicator/indicator.h> | |
| 49 | +#include <libayatana-indicator/indicator.h> | |
| 50 | ///#include <libindicator/indicator-object.h> | |
| 51 | -#include <libindicator/indicator-service-manager.h> | |
| 52 | +#include <libayatana-indicator/indicator-service-manager.h> | |
| 53 | ||
| 54 | #include <libdbusmenu-gtk/menuitem.h> | |
| 55 | #include <libdbusmenu-gtk/menu.h> | |
| 56 | diff --git a/Indicator-applet3/indicator-applet3-utils.h b/Indicator-applet3/indicator-applet3-utils.h | |
| 57 | index 81bc89b..07e803a 100644 | |
| 58 | --- a/Indicator-applet3/indicator-applet3-utils.h | |
| 59 | +++ b/Indicator-applet3/indicator-applet3-utils.h | |
| 60 | @@ -22,7 +22,7 @@ | |
| 61 | ||
| 62 | #include <gtk/gtk.h> | |
| 63 | #include <cairo-dock.h> | |
| 64 | -#include <libindicator/indicator-object.h> | |
| 65 | +#include <libayatana-indicator/indicator-object.h> | |
| 66 | ||
| 67 | /** | |
| 68 | * Use the image of a GtkImage to draw a Cairo-Dock Icon | |
| 69 | diff --git a/Indicator-applet3/indicator-applet3.h b/Indicator-applet3/indicator-applet3.h | |
| 70 | index 3157370..af29b75 100644 | |
| 71 | --- a/Indicator-applet3/indicator-applet3.h | |
| 72 | +++ b/Indicator-applet3/indicator-applet3.h | |
| 73 | @@ -22,7 +22,7 @@ | |
| 74 | ||
| 75 | #include <glib.h> | |
| 76 | #include <gtk/gtk.h> | |
| 77 | -#include <libindicator/indicator-object.h> | |
| 78 | +#include <libayatana-indicator/indicator-object.h> | |
| 79 | ||
| 80 | #define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators" | |
| 81 | ||
| 82 | -- | |
| 83 | 2.30.0.rc2 | |
| 84 |