rpms
/
libindicator
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:epel9
Branches Tags
rpms:i10ce
rpms:i9ce
rpms:i8c
rpms:c8
rpms:c9
rpms:epel9
...
pull from: rpms:c8
Branches Tags
rpms:i10ce
rpms:i9ce
rpms:i8c
rpms:c8
rpms:c9
rpms:epel9

No commits in common. 'epel9' and 'c8' have entirely different histories.
epel9 ... c8

6 changed files with 91 additions and 209 deletions
Show Stats

7
.gitignore vendored
Unescape View File

@ -1,6 +1 @@
/libindicator-0.3.15.tar.gz SOURCES/libindicator-12.10.1.tar.gz
/libindicator-0.3.17.tar.gz
/libindicator-0.3.20.tar.gz
/libindicator-0.3.22.tar.gz
/libindicator-0.4.94.tar.gz
/libindicator-12.10.1.tar.gz

1
.libindicator.metadata
Unescape View File

@ -0,0 +1 @@
25c8a0a150651ee6b2198df3f36fcbb49f0295c2 SOURCES/libindicator-12.10.1.tar.gz

67
SOURCES/covscan.patch
Unescape View File

@ -0,0 +1,67 @@
diff -up libindicator-12.10.1/libindicator/indicator-object.c.covscan libindicator-12.10.1/libindicator/indicator-object.c
--- libindicator-12.10.1/libindicator/indicator-object.c.covscan 2012-09-19 17:38:04.953839560 +0200
+++ libindicator-12.10.1/libindicator/indicator-object.c 2018-10-10 07:17:21.864398587 +0200
@@ -539,6 +539,7 @@ get_all_entries (IndicatorObject * io)
g_return_val_if_fail(INDICATOR_IS_OBJECT(io), NULL);
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_val_if_fail(INDICATOR_IS_OBJECT_CLASS(class), NULL);
if (class->get_entries == NULL)
g_error("No get_entries function on object. It must have been deleted?!?!");
@@ -635,6 +636,7 @@ indicator_object_get_location (Indicator
{
g_return_val_if_fail(INDICATOR_IS_OBJECT(io), 0);
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_val_if_fail(INDICATOR_IS_OBJECT_CLASS(class), 0);
if (class->get_location) {
return class->get_location(io, entry);
@@ -659,6 +661,7 @@ indicator_object_get_show_now (Indicator
{
g_return_val_if_fail(INDICATOR_IS_OBJECT(io), 0);
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_val_if_fail(INDICATOR_IS_OBJECT_CLASS(class), 0);
if (class->get_show_now) {
return class->get_show_now(io, entry);
@@ -688,6 +691,7 @@ indicator_object_entry_activate_window (
{
g_return_if_fail(INDICATOR_IS_OBJECT(io));
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_if_fail(INDICATOR_IS_OBJECT_CLASS(class));
if (class->entry_activate_window != NULL) {
return class->entry_activate_window(io, entry, windowid, timestamp);
@@ -714,6 +718,7 @@ indicator_object_entry_activate (Indicat
{
g_return_if_fail(INDICATOR_IS_OBJECT(io));
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_if_fail(INDICATOR_IS_OBJECT_CLASS(class));
if (class->entry_activate != NULL) {
return class->entry_activate(io, entry, timestamp);
@@ -736,6 +741,7 @@ indicator_object_entry_close (IndicatorO
{
g_return_if_fail(INDICATOR_IS_OBJECT(io));
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_if_fail(INDICATOR_IS_OBJECT_CLASS(class));
if (class->entry_close != NULL) {
return class->entry_close(io, entry, timestamp);
@@ -749,6 +755,7 @@ indicator_object_entry_being_removed (In
{
g_return_if_fail(INDICATOR_IS_OBJECT(io));
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_if_fail(INDICATOR_IS_OBJECT_CLASS(class));
entry_get_private (io, entry)->visibility = ENTRY_INVISIBLE;
@@ -766,6 +773,7 @@ indicator_object_entry_was_added (Indica
{
g_return_if_fail(INDICATOR_IS_OBJECT(io));
IndicatorObjectClass * class = INDICATOR_OBJECT_GET_CLASS(io);
+ g_return_if_fail(INDICATOR_IS_OBJECT_CLASS(class));
entry_get_private (io, entry)->visibility = ENTRY_VISIBLE;

124
libindicator.spec → SPECS/libindicator.spec
Unescape View File

@ -1,13 +1,13 @@
Name: libindicator Name: libindicator
Version: 12.10.1 Version: 12.10.1
Release: 22%{?dist} Release: 14%{?dist}
Summary: Shared functions for Ayatana indicators Summary: Shared functions for Ayatana indicators
License: GPLv3 License: GPLv3
URL: https://launchpad.net/libindicator URL: https://launchpad.net/libindicator
Source0: https://launchpad.net/libindicator/12.10/12.10.1/+download/%{name}-%{version}.tar.gz 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 Patch0: covscan.patch
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: gtk-doc BuildRequires: gtk-doc
@ -15,37 +15,15 @@ BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
BuildRequires: gtk2-devel
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: make
%description %description
A set of symbols and convenience functions that all Ayatana indicators are A set of symbols and convenience functions that all Ayatana indicators are
likely to use. 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 %package gtk3
Summary: GTK+3 build of %{name} Summary: GTK+3 build of %{name}
@ -80,9 +58,7 @@ tools for the GTK+3 build of %{name}.
%prep %prep
%setup -q %setup -q
%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 %patch0 -p1 -b .covscan
%patch1 -p2 -b .orig
%endif
sed -i.addvar configure.ac \ sed -i.addvar configure.ac \
-e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|' -e '\@LIBINDICATOR_LIBS@s|\$LIBM| \$LIBM|'
@ -107,49 +83,16 @@ NOCONFIGURE=1 \
%build %build
%global _configure ../configure
rm -rf build-gtk2 build-gtk3
mkdir build-gtk2 build-gtk3
pushd build-gtk2
export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
%configure --with-gtk=2 --disable-static --disable-silent-rules
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
popd
pushd build-gtk3
export CFLAGS="%{optflags} -Wno-error=deprecated-declarations" export CFLAGS="%{optflags} -Wno-error=deprecated-declarations"
%configure --with-gtk=3 --disable-static --disable-silent-rules %configure --with-gtk=3 --disable-static --disable-silent-rules
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}
popd
%install %install
pushd build-gtk2 %make_install
make install DESTDIR=%{buildroot}
popd
(
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
export PKG_CONFIG_PATH
for var in \
iconsdir \
indicatordir \
%{nil}
do
vardir=$(pkg-config --variable=${var} indicator-0.4)
mkdir -p %{buildroot}${vardir}
done
)
pushd build-gtk3
make install DESTDIR=%{buildroot}
popd
( (
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
@ -164,37 +107,17 @@ popd
) )
# Ubuntu doesn't package the dummy indicator # Ubuntu doesn't package the dummy indicator
rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so rm -f %{buildroot}%{_libdir}/libdummy-indicator*.so
rm -f %{buildroot}%{_datadir}/libindicator/80indicator-debugging
# Remove libtool files # Remove libtool files
find %{buildroot} -type f -name '*.la' -delete find %{buildroot} -type f -name '*.la' -delete
%ldconfig_scriptlets
%ldconfig_scriptlets gtk3 %ldconfig_scriptlets gtk3
%files
%doc AUTHORS COPYING NEWS ChangeLog
%{_libdir}/libindicator.so.*
%dir %{_datadir}/libindicator/
%dir %{_datadir}/libindicator/icons/
%{_libdir}/indicators/
%files devel
%dir %{_includedir}/libindicator-0.4/
%dir %{_includedir}/libindicator-0.4/libindicator/
%{_includedir}/libindicator-0.4/libindicator/*.h
%{_libdir}/libindicator.so
%{_libdir}/pkgconfig/indicator-0.4.pc
%files tools
%{_libexecdir}/indicator-loader
%{_datadir}/libindicator/80indicator-debugging
%files gtk3 %files gtk3
%doc AUTHORS COPYING NEWS ChangeLog %doc AUTHORS COPYING NEWS ChangeLog
%{_libdir}/libindicator3.so.* %{_libdir}/libindicator3.so.*
@ -215,35 +138,12 @@ find %{buildroot} -type f -name '*.la' -delete
%{_libexecdir}/indicator-loader3 %{_libexecdir}/indicator-loader3
%changelog %changelog
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-22 * Tue Oct 09 2018 Tomas Popela <tpopela@redhat.com> - 12.10.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Fix the Coverity scan warnings
- Resolves: rhbz#1637530
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Merlin Mathesius <mmathesi@redhat.com> - 12.10.1-18
- Minor conditional fix for ELN
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Nov 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 12.10.1-16
- F-31+: Adjust GLib 2.62 change
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-13 * Thu Jun 07 2018 Tomas Popela <tpopela@redhat.com> - 12.10.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Drop the gtk2 support
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-12 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 12.10.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

80
libindicator-12.10.1-glib262-g_define_type_with_private.patch
Unescape View File

@ -1,80 +0,0 @@
--- ./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)

1
sources
Unescape View File

@ -1 +0,0 @@
5fd4d6bab339fc9611078b64c44a85a8 libindicator-12.10.1.tar.gz
Write Preview
Loading…
Cancel
Save