added patch for glib 2.70 [release 12.10.1-3mamba;Mon Nov 22 2021]

libindicator-12.10.1-glib-2.46.patch

@@ -1,11 +0,0 @@
---- libindicator-12.10.1/libindicator/indicator-image-helper.c.orig	2016-03-15 18:38:25.689252331 +0100
-+++ libindicator-12.10.1/libindicator/indicator-image-helper.c	2016-03-15 18:38:38.865241612 +0100
-@@ -69,7 +69,7 @@
- 	GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error);
- 
- 	if (icon_info != NULL) {
--		gtk_icon_info_free(icon_info);
-+		g_object_unref(icon_info);
- 	}
- 
- 	if (pixbuf == NULL) {

libindicator-12.10.1-glib-2.70.1.patch

@@ -0,0 +1,80 @@
+--- ./libindicator-12.10.1/libindicator/indicator-desktop-shortcuts.c.orig	2012-09-20 00:38:05.081903564 +0900
++++ ./libindicator-12.10.1/libindicator/indicator-desktop-shortcuts.c	2019-11-11 20:16:21.088761001 +0900
+@@ -61,7 +61,7 @@
+ };
+ 
+ #define INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(o) \
+-		(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_TYPE_DESKTOP_SHORTCUTS, IndicatorDesktopShortcutsPrivate))
++		(indicator_desktop_shortcuts_get_instance_private((IndicatorDesktopShortcuts *)o))
+ 
+ static void indicator_desktop_shortcuts_class_init (IndicatorDesktopShortcutsClass *klass);
+ static void indicator_desktop_shortcuts_init       (IndicatorDesktopShortcuts *self);
+@@ -72,7 +72,7 @@
+ static void parse_keyfile (IndicatorDesktopShortcuts * ids);
+ static gboolean should_show (GKeyFile * keyfile, const gchar * group, const gchar * identity, gboolean should_have_target);
+ 
+-G_DEFINE_TYPE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT);
++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorDesktopShortcuts, indicator_desktop_shortcuts, G_TYPE_OBJECT);
+ 
+ /* Build up the class */
+ static void
+--- ./libindicator-12.10.1/libindicator/indicator-object.c.orig	2012-09-20 00:38:04.953839560 +0900
++++ ./libindicator-12.10.1/libindicator/indicator-object.c	2019-11-11 20:15:09.145806133 +0900
+@@ -117,7 +117,7 @@
+ static void indicator_object_entry_was_added     (IndicatorObject*, IndicatorObjectEntry*);
+ static IndicatorObjectEntryPrivate * entry_get_private (IndicatorObject*, IndicatorObjectEntry*);
+ 
+-G_DEFINE_TYPE (IndicatorObject, indicator_object, G_TYPE_OBJECT);
++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorObject, indicator_object, G_TYPE_OBJECT);
+ 
+ /* Setup the class and put the functions into the
+    class structure */
+@@ -302,7 +302,7 @@
+ static void
+ indicator_object_init (IndicatorObject *self)
+ {
+-	IndicatorObjectPrivate * priv = G_TYPE_INSTANCE_GET_PRIVATE (self, INDICATOR_OBJECT_TYPE, IndicatorObjectPrivate);
++	IndicatorObjectPrivate * priv = indicator_object_get_instance_private(self);
+ 
+ 	priv->module = NULL;
+ 
+--- ./libindicator-12.10.1/libindicator/indicator-service-manager.c.orig	2012-09-20 00:38:05.057891563 +0900
++++ ./libindicator-12.10.1/libindicator/indicator-service-manager.c	2019-11-11 20:15:09.145806133 +0900
+@@ -89,7 +89,7 @@
+ 
+ /* GObject Stuff */
+ #define INDICATOR_SERVICE_MANAGER_GET_PRIVATE(o) \
+-(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SERVICE_MANAGER_TYPE, IndicatorServiceManagerPrivate))
++(indicator_service_manager_get_instance_private((IndicatorServiceManager *)o))
+ 
+ static void indicator_service_manager_class_init (IndicatorServiceManagerClass *klass);
+ static void indicator_service_manager_init       (IndicatorServiceManager *self);
+@@ -105,7 +105,7 @@
+ static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data);
+ static void service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_name, const gchar * object_path, const gchar * interface_name, const gchar * signal_name, GVariant * parameters, gpointer user_data);
+ 
+-G_DEFINE_TYPE (IndicatorServiceManager, indicator_service_manager, G_TYPE_OBJECT);
++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorServiceManager, indicator_service_manager, G_TYPE_OBJECT);
+ 
+ /* Build all of our signals and proxies and tie everything
+    all together.  Lovely. */
+--- ./libindicator-12.10.1/libindicator/indicator-service.c.orig	2012-09-20 00:38:05.009867562 +0900
++++ ./libindicator-12.10.1/libindicator/indicator-service.c	2019-11-11 20:15:09.145806133 +0900
+@@ -83,7 +83,7 @@
+ 
+ /* GObject Stuff */
+ #define INDICATOR_SERVICE_GET_PRIVATE(o) \
+-			(G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SERVICE_TYPE, IndicatorServicePrivate))
++			(indicator_service_get_instance_private((IndicatorService *)o))
+ 
+ static void indicator_service_class_init (IndicatorServiceClass *klass);
+ static void indicator_service_init       (IndicatorService *self);
+@@ -106,7 +106,7 @@
+ };
+ 
+ /* THE define */
+-G_DEFINE_TYPE (IndicatorService, indicator_service, G_TYPE_OBJECT);
++G_DEFINE_TYPE_WITH_PRIVATE (IndicatorService, indicator_service, G_TYPE_OBJECT);
+ 
+ static void
+ indicator_service_class_init (IndicatorServiceClass *klass)

libindicator.spec

@@ -1,6 +1,6 @@
 Name:          libindicator
 Version:       12.10.1
-Release:       2mamba
+Release:       3mamba
 Summary:       A set of symbols and convience functions that all indicators would like to use
 Group:         System/Libraries
 Vendor:        openmamba
@@ -9,7 +9,7 @@ Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://launchpad.net/libindicator
 Source:        https://launchpad.net/libindicator/%{version}/+download/libindicator-%{version}.tar.gz
 Patch0:        libindicator-12.10.1-configure.patch
-Patch1:        libindicator-12.10.1-glib-2.46.patch
+Patch1:        libindicator-12.10.1-glib-2.70.1.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -19,11 +19,11 @@ BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
 BuildRequires: libgdk-pixbuf-devel
 BuildRequires: libglib-devel
-BuildRequires: libgtk-devel
 BuildRequires: libgtk2-devel
+BuildRequires: libgtk3-devel
+BuildRequires: libharfbuzz-devel
 BuildRequires: libpango-devel
 ## AUTOBUILDREQ-END
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 A set of symbols and convience functions that all indicators would like to use. Not of real use outside of the Ayatana indicators project.
@@ -63,7 +63,7 @@ tar xf %{SOURCE0}
 mv %{name}-%{version} build-gtk2
 cd build-gtk2
 %patch0 -p1
-%patch1 -p1
+%patch1 -p2
 cd ..
 
 cp -a build-gtk2 build-gtk3
@@ -135,6 +135,9 @@ cd ..
 %doc build-gtk3/ChangeLog build-gtk3/NEWS
 
 %changelog
+* Mon Nov 22 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 12.10.1-3mamba
+- added patch for glib 2.70
+
 * Sat Jul 20 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 12.10.1-2mamba
 - rebuilt with gtk3 subpackages