diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -6,8 +6,6 @@ libapplication.so:_application_service_marshal_VOID__STRING_STRING libapplication.so:_edata libapplication.so:_end -libapplication.so:_fini -libapplication.so:_init libapplication.so:get_type libapplication.so:get_version libapplication.so:indicator_application_get_type diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,5 +1,6 @@ -UNKNOWN libappindicator3.so.1 +libayatana-appindicator3.so.1 +libayatana-indicator3.so.7 libc.so.6 libdbus-glib-1.so.2 libdbusmenu-gtk3.so.4 @@ -9,4 +10,3 @@ libgtk-3.so.0 libindicator3.so.7 libpango-1.0.so.0 -libpthread.so.0 diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -1,11 +1,12 @@ -UNKNOWN:app_indicator_category_get_type -UNKNOWN:app_indicator_status_get_type -UNKNOWN:dbusmenu_gtkmenu_new -UNKNOWN:indicator_image_helper -UNKNOWN:indicator_image_helper_update -UNKNOWN:indicator_object_get_type +libayatana-appindicator3.so.1:app_indicator_category_get_type +libayatana-appindicator3.so.1:app_indicator_status_get_type +libayatana-indicator3.so.7:indicator_image_helper +libayatana-indicator3.so.7:indicator_image_helper_update +libayatana-indicator3.so.7:indicator_object_get_type libc.so.6:__libc_start_main +libc.so.6:__stack_chk_fail libc.so.6:exit +libc.so.6:memmove libdbus-glib-1.so.2:dbus_g_bus_get libdbus-glib-1.so.2:dbus_g_connection_register_g_object libdbus-glib-1.so.2:dbus_g_method_get_sender @@ -14,6 +15,7 @@ libdbus-glib-1.so.2:dbus_g_proxy_begin_call libdbus-glib-1.so.2:dbus_g_proxy_end_call libdbus-glib-1.so.2:dbus_g_proxy_new_for_name_owner +libdbusmenu-gtk3.so.4:dbusmenu_gtkmenu_new libgio-2.0.so.0:g_bus_get libgio-2.0.so.0:g_bus_get_finish libgio-2.0.so.0:g_bus_own_name diff --git a/files/0001-Use-libayatana-indicator-and-libayatana-appindicator.patch b/files/0001-Use-libayatana-indicator-and-libayatana-appindicator.patch new file mode 100644 --- /dev/null +++ b/files/0001-Use-libayatana-indicator-and-libayatana-appindicator.patch @@ -0,0 +1,91 @@ +From ba728c2c25f4526f96f01c6bd77d5c53a72d7763 Mon Sep 17 00:00:00 2001 +From: Fabio Forni +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 . + #include "config.h" + #endif + +-#include +-#include "libappindicator/app-indicator.h" +-#include "libappindicator/app-indicator-enum-types.h" ++#include ++#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 . + #define __GENERATE_ID_H__ + + #include +-#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 . + #include + + /* Indicator Stuff */ +-#include +-#include +-#include ++#include ++#include ++#include + + /* Local Stuff */ + #include "dbus-shared.h" +-- +2.32.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,22 +1,23 @@ name : indicator-application version : 17.04.20161201 -release : 1 +release : 2 source : - https://launchpad.net/ubuntu/+archive/primary/+files/indicator-application_12.10.1+17.04.20161201.orig.tar.gz : 40728c37a04c09dfa9e23346f1b8ecb4dc4a53b8c171c3347970dcda370285d5 -license : GPL-3.0 +license : GPL-3.0-or-later component : desktop.mate summary : Indicator Application service for MATE description: | - Indicator Application service for MATE + Indicator Application service for MATE. builddeps : - - pkgconfig(appindicator3-0.1) + - pkgconfig(ayatana-appindicator3-0.1) + - pkgconfig(ayatana-indicator3-0.4) - pkgconfig(dbus-glib-1) - pkgconfig(dbusmenu-gtk3-0.4) - pkgconfig(gtk+-3.0) - - pkgconfig(indicator3-0.4) - pkgconfig(json-glib-1.0) - gnome-common setup : | + %patch -p1 < $pkgfiles/0001-Use-libayatana-indicator-and-libayatana-appindicator.patch %autogen build : | %make diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,38 +2,39 @@ indicator-application - Ikey Doherty - ikey@solus-project.com + Fabio Forni + livingsilver94.solus@redaril.me - GPL-3.0 + GPL-3.0-or-later desktop.mate Indicator Application service for MATE - Indicator Application service for MATE + Indicator Application service for MATE. - https://solus-project.com/sources/README.Solus + https://getsol.us/sources/README.Solus indicator-application Indicator Application service for MATE - Indicator Application service for MATE + Indicator Application service for MATE. desktop.mate + /usr/lib/ayatana-indicators3/7/libapplication.a + /usr/lib/ayatana-indicators3/7/libapplication.so /usr/lib/systemd/user/indicator-application.service /usr/lib64/indicator-application/indicator-application/indicator-application-service - /usr/lib64/indicators3/7/libapplication.a - /usr/lib64/indicators3/7/libapplication.so - /usr/share/indicator-application + /usr/share/indicator-application/ordering-override.keyfile + /usr/share/indicator-application/upstart/xdg/autostart/indicator-application.desktop /usr/share/xdg/autostart/indicator-application.desktop - - 2017-04-01 + + 2021-08-24 17.04.20161201 Packaging update - Ikey Doherty - ikey@solus-project.com + Fabio Forni + livingsilver94.solus@redaril.me \ No newline at end of file