From d32446ee84629a52075adf0059cc5963de6f2de1 Mon Sep 17 00:00:00 2001 From: Sergey Cherevko Date: Mon, 19 Jun 2023 12:21:53 +0300 Subject: [PATCH] import libindicator-12.10.1-22.el9 --- .gitignore | 1 + .libindicator.metadata | 1 + ...1-glib262-g_define_type_with_private.patch | 80 +++++ SPECS/libindicator.spec | 328 ++++++++++++++++++ 4 files changed, 410 insertions(+) create mode 100644 .gitignore create mode 100644 .libindicator.metadata create mode 100644 SOURCES/libindicator-12.10.1-glib262-g_define_type_with_private.patch create mode 100644 SPECS/libindicator.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f565447 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libindicator-12.10.1.tar.gz diff --git a/.libindicator.metadata b/.libindicator.metadata new file mode 100644 index 0000000..4816dac --- /dev/null +++ b/.libindicator.metadata @@ -0,0 +1 @@ +25c8a0a150651ee6b2198df3f36fcbb49f0295c2 SOURCES/libindicator-12.10.1.tar.gz diff --git a/SOURCES/libindicator-12.10.1-glib262-g_define_type_with_private.patch b/SOURCES/libindicator-12.10.1-glib262-g_define_type_with_private.patch new file mode 100644 index 0000000..af1e66b --- /dev/null +++ b/SOURCES/libindicator-12.10.1-glib262-g_define_type_with_private.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) diff --git a/SPECS/libindicator.spec b/SPECS/libindicator.spec new file mode 100644 index 0000000..51fef19 --- /dev/null +++ b/SPECS/libindicator.spec @@ -0,0 +1,328 @@ +Name: libindicator +Version: 12.10.1 +Release: 22%{?dist} +Summary: Shared functions for Ayatana indicators + +License: GPLv3 +URL: https://launchpad.net/libindicator +Source0: https://launchpad.net/libindicator/12.10/12.10.1/+download/%{name}-%{version}.tar.gz +# From GLib 2.62 +Patch1: libindicator-12.10.1-glib262-g_define_type_with_private.patch + +BuildRequires: chrpath +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: pkgconfig + +BuildRequires: dbus-glib-devel +BuildRequires: gtk2-devel +BuildRequires: gtk3-devel + +BuildRequires: gnome-common +BuildRequires: make + +%description +A set of symbols and convenience functions that all Ayatana indicators are +likely to use. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%package tools +Summary: Shared functions for Ayatana indicators - Tools +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description tools +This package contains tools used by the %{name} package, the +Ayatana indicators system. + + +%package gtk3 +Summary: GTK+3 build of %{name} + +%description gtk3 +A set of symbols and convenience functions that all Ayatana indicators +are likely to use. This is the GTK+ 3 build of %{name}, for use +by GTK+ 3 apps. + + +%package gtk3-devel +Summary: Development files for %{name}-gtk3 + +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description gtk3-devel +The %{name}-gtk3-devel package contains libraries and header files for +developing applications that use %{name}-gtk3. + + +%package gtk3-tools +Summary: Shared functions for Ayatana indicators - GTK3 Tools + +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +Requires: pkgconfig + +%description gtk3-tools +This package contains tools used by the %{name}-gtk3 package, the +Ayatana indicators system. This package contains the builds of the +tools for the GTK+3 build of %{name}. + + +%prep +%setup -q +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +%patch1 -p2 -b .orig +%endif + +sed -i.addvar configure.ac \ + -e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|' + +# http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/trunk.12.10/view/head:/autogen.sh +cat > autogen.sh < - 12.10.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 12.10.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 12.10.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 12.10.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Merlin Mathesius - 12.10.1-18 +- Minor conditional fix for ELN + +* Wed Jan 29 2020 Fedora Release Engineering - 12.10.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 11 2019 Mamoru TASAKA - 12.10.1-16 +- F-31+: Adjust GLib 2.62 change + +* Thu Jul 25 2019 Fedora Release Engineering - 12.10.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 12.10.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 12.10.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 12.10.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 12.10.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 12.10.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 12.10.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Nov 15 2016 Mamoru TASAKA - 12.10.1-8 +- Create and own indicatordir, iconsdir (bug 1392864) + +* Thu Feb 4 2016 Mamoru TASAKA - 12.10.1-7 +- F-24: fix FTBFS (variable expansion: perhaps due to bash behavior change) + +* Thu Feb 04 2016 Fedora Release Engineering - 12.10.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 12.10.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 12.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 12.10.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 12.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu May 30 2013 Eduardo Echeverria - 12.10.1-1 +- Update to 12.10.1 +- Add GTK2 support + +* Thu Feb 14 2013 Fedora Release Engineering - 0.4.94-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Mar 31 2012 Tom Callaway - 0.4.94-2 +- fix typo causing dep issues + +* Sat Mar 31 2012 Tom Callaway - 0.4.94-1 +- Update to 0.4.94 + +* Fri Jan 13 2012 Fedora Release Engineering - 0.3.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 0.3.22-2 +- Rebuild for new libpng + +* Wed Mar 23 2011 Adam Williamson - 0.3.22-1 +- new release 0.3.22 + +* Mon Mar 07 2011 Adam Williamson - 0.3.20-1 +- new release 0.3.20 + +* Thu Feb 10 2011 Matthias Clasen - 0.3.17-4 + Rebuild against newer gtk3 + +* Tue Feb 08 2011 Fedora Release Engineering - 0.3.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 2 2011 Matthias Clasen - 0.3.17-2 + Rebuild against newer gtk3 + +* Sun Jan 23 2011 Adam Williamson - 0.3.17-1 +- new version 0.3.17 +- drop both patches (upstream) +- no need for autoreconf any more + +* Mon Jan 10 2011 Matthias Clasen - 0.3.15-2 +- Rebuild against newer gtk3 + +* Fri Dec 03 2010 Adam Williamson - 0.3.15-1 +- initial package +