diff --git a/libappindicator-activate-support.patch b/libappindicator-activate-support.patch index 3611e20..24cba63 100644 --- a/libappindicator-activate-support.patch +++ b/libappindicator-activate-support.patch @@ -1,6 +1,5 @@ -diff -urN libappindicator.orig/bindings/mono/libappindicator-api.metadata libappindicator/bindings/mono/libappindicator-api.metadata ---- libappindicator.orig/bindings/mono/libappindicator-api.metadata 2017-02-15 15:15:21.000000000 +0100 -+++ libappindicator/bindings/mono/libappindicator-api.metadata 2019-01-13 16:46:20.254218208 +0100 +--- a/bindings/mono/libappindicator-api.metadata ++++ b/bindings/mono/libappindicator-api.metadata @@ -13,6 +13,8 @@ connection-changed ScrollEvent @@ -10,10 +9,9 @@ diff -urN libappindicator.orig/bindings/mono/libappindicator-api.metadata libapp NewIcon new-icon NewIconThemePath -diff -urN libappindicator.orig/src/app-indicator.c libappindicator/src/app-indicator.c ---- libappindicator.orig/src/app-indicator.c 2017-02-15 15:15:36.000000000 +0100 -+++ libappindicator/src/app-indicator.c 2019-01-13 17:01:18.940800769 +0100 -@@ -115,6 +115,7 @@ +--- a/src/app-indicator.c ++++ b/src/app-indicator.c +@@ -115,6 +115,7 @@ enum { CONNECTION_CHANGED, NEW_ICON_THEME_PATH, SCROLL_EVENT, @@ -21,7 +19,7 @@ diff -urN libappindicator.orig/src/app-indicator.c libappindicator/src/app-indic LAST_SIGNAL }; -@@ -603,6 +604,20 @@ +@@ -603,6 +604,20 @@ app_indicator_class_init (AppIndicatorCl _application_service_marshal_VOID__INT_UINT, G_TYPE_NONE, 2, G_TYPE_INT, GDK_TYPE_SCROLL_DIRECTION); @@ -42,7 +40,7 @@ diff -urN libappindicator.orig/src/app-indicator.c libappindicator/src/app-indic /* DBus interfaces */ if (item_node_info == NULL) { GError * error = NULL; -@@ -1188,6 +1203,8 @@ +@@ -1188,6 +1203,8 @@ bus_method_call (GDBusConnection * conne { gtk_widget_activate (menuitem); } @@ -51,7 +49,7 @@ diff -urN libappindicator.orig/src/app-indicator.c libappindicator/src/app-indic } else { g_warning("Calling method '%s' on the app-indicator and it's unknown", method); } -@@ -1224,6 +1241,13 @@ +@@ -1224,6 +1241,13 @@ bus_get_prop (GDBusConnection * connecti return g_variant_new_string(priv->absolute_attention_icon_name); } return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : ""); @@ -65,7 +63,7 @@ diff -urN libappindicator.orig/src/app-indicator.c libappindicator/src/app-indic } else if (g_strcmp0(property, "Title") == 0) { const gchar * output = NULL; if (priv->title == NULL) { -@@ -1676,19 +1700,7 @@ +@@ -1676,19 +1700,7 @@ status_icon_changes (AppIndicator * self static void status_icon_activate (GtkStatusIcon * icon, gpointer data) { @@ -86,10 +84,9 @@ diff -urN libappindicator.orig/src/app-indicator.c libappindicator/src/app-indic } /* Handles the right-click action by the status icon by showing -diff -urN libappindicator.orig/src/app-indicator.h libappindicator/src/app-indicator.h ---- libappindicator.orig/src/app-indicator.h 2017-02-15 15:15:21.000000000 +0100 -+++ libappindicator/src/app-indicator.h 2019-01-13 16:46:52.027991740 +0100 -@@ -119,6 +119,7 @@ +--- a/src/app-indicator.h ++++ b/src/app-indicator.h +@@ -119,6 +119,7 @@ G_BEGIN_DECLS #define APP_INDICATOR_SIGNAL_CONNECTION_CHANGED "connection-changed" #define APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH "new-icon-theme-path" #define APP_INDICATOR_SIGNAL_SCROLL_EVENT "scroll-event" @@ -97,7 +94,7 @@ diff -urN libappindicator.orig/src/app-indicator.h libappindicator/src/app-indic /** * AppIndicatorCategory: -@@ -228,7 +229,7 @@ +@@ -228,7 +229,7 @@ struct _AppIndicatorClass { void (*app_indicator_reserved_3)(void); void (*app_indicator_reserved_4)(void); void (*app_indicator_reserved_5)(void); @@ -106,9 +103,8 @@ diff -urN libappindicator.orig/src/app-indicator.h libappindicator/src/app-indic }; /** -diff -urN libappindicator.orig/src/notification-item.xml libappindicator/src/notification-item.xml ---- libappindicator.orig/src/notification-item.xml 2017-02-15 15:15:21.000000000 +0100 -+++ libappindicator/src/notification-item.xml 2019-01-13 17:03:04.238047406 +0100 +--- a/src/notification-item.xml ++++ b/src/notification-item.xml @@ -9,6 +9,7 @@ diff --git a/libappindicator.spec b/libappindicator.spec index 350c30b..e5822df 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -32,7 +32,7 @@ URL: https://launchpad.net/libappindicator Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz # PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch hrvoje.senjan@gmail.com -- Fix location of .pc files. Patch0: 0001_Fix_mono_dir.patch -# PATCH-FIX-OPENSUSE libappindicator-activate-support.patch Yichao Yu -- Send "activate-event" signal on the left-click action. +# PATCH-FIX-OPENSUSE libappindicator-activate-support.patch yyc1992@gmail.com -- Send "activate-event" signal on the left-click action. Patch1: libappindicator-activate-support.patch # PATCH-FIX=UPSTREAM libappindicator-no-Werror.patch dimstar@opensuse.org -- Don't add -Werror on build: the code is aging and does not keep up Patch2: libappindicator-no-Werror.patch @@ -194,7 +194,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %postun -n libappindicator3-%{sover} -p /sbin/ldconfig %files -n python2-appindicator -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %dir %{python_sitearch}/appindicator/ @@ -206,19 +205,16 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/pygtk/2.0/defs/appindicator.defs %files -n libappindicator%{sover} -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %{_libdir}/libappindicator.so.%{sover}* %files -n typelib-1_0-AppIndicator-0_1 -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %{_libdir}/girepository-1.0/AppIndicator-0.1.typelib %files devel -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %dir %{_includedir}/libappindicator-0.1/ @@ -231,19 +227,16 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_datadir}/vala/vapi/appindicator-0.1.deps %files -n libappindicator3-%{sover} -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %{_libdir}/libappindicator3.so.%{sover}* %files -n typelib-1_0-AppIndicator3-0_1 -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %{_libdir}/girepository-1.0/AppIndicator3-0.1.typelib %files -n libappindicator3-devel -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %dir %{_includedir}/libappindicator3-0.1/ @@ -257,7 +250,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %if %{with mono} %files -n appindicator-sharp -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %dir %{_libdir}/appindicator-sharp-0.1/ @@ -280,7 +272,6 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libexecdir}/mono/gac/policy.0.0.appindicator-sharp/*/policy.0.0.appindicator-sharp.dll %files -n appindicator-sharp-devel -%defattr(-,root,root) %license COPYING COPYING.LGPL.2.1 %doc README %{_libdir}/pkgconfig/appindicator-sharp-0.1.pc