Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
ad3b4d0348
!9 Upgrade to version 12.10.1
From: @wk333 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2023-09-07 02:47:24 +00:00
lyn1001
917e9d3f09 Upgrade to version 12.10.1 2023-09-07 10:18:23 +08:00
openeuler-ci-bot
ade5d9152f !8 Modify license information
From: @wang--ge
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2021-01-20 16:17:12 +08:00
wang--ge
9c970b41ec modify license information 2021-01-20 15:58:12 +08:00
openeuler-ci-bot
c200fe5782 !7 remove python2 subpackage
From: @caodongxia
Reviewed-by: @small_leek
Signed-off-by: @small_leek
2020-10-30 16:22:21 +08:00
caodongxia
6cf5e004fb Remove subpackage python2-antlr 2020-10-30 14:39:21 +08:00
openeuler-ci-bot
1b18ee119c !5 modify spec and rename patch
Merge pull request !5 from 严志华/master
2020-02-07 09:59:21 +08:00
daidai_is_here
89eede378e modify spec and rename patch 2020-02-07 09:54:04 +08:00
openeuler-ci-bot
bb1346033f !4 fix selfbuild error
Merge pull request !4 from t.feng/master
2020-01-16 00:18:29 +08:00
t_feng
562afff41b fix selfbuild error 2020-01-15 23:56:50 +08:00
6 changed files with 43 additions and 56 deletions

View File

@ -5,7 +5,7 @@ diff -Nru libappindicator-0.4.92.orig/bindings/mono/appindicator-sharp-0.1.pc.in
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
-assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
+assemblies_dir=${libdir}/appindicator-sharp-0.1
Name: appindicator-sharp

View File

@ -1,12 +0,0 @@
diff -up libappindicator-12.10.0/src/app-indicator.c.build_fix libappindicator-12.10.0/src/app-indicator.c
--- libappindicator-12.10.0/src/app-indicator.c.build_fix 2018-04-10 14:43:57.134400594 +0200
+++ libappindicator-12.10.0/src/app-indicator.c 2018-04-10 14:45:34.655448722 +0200
@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
g_return_if_fail (GTK_IS_WIDGET (menuitem));
- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
+ priv->sec_activate_target = g_object_ref(menuitem);
priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
}

Binary file not shown.

View File

@ -1,30 +1,20 @@
Name: libappindicator
Version: 12.10.0
Release: 23
Version: 12.10.1
Release: 1
Summary: The library of application indicators
License: LGPLv2 and LGPLv3
License: LGPL-3.0 and LGPL-2.1+ and GPL-3.0+
URL: https://launchpad.net/libappindicator
Source0: https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/%{name}/%{version}+20.10.20200706.1-0ubuntu1/%{name}_%{version}+20.10.20200706.1.orig.tar.gz
Patch0001: 0001_Fix_mono_dir.patch
Patch0002: incompatible_pointer_build_fix.patch
Patch0003: no-Werror-deprecated.patch
BuildRequires: autoconf automake gtk-doc vala-tools dbus-glib-devel libdbusmenu-devel
BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel
BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel
BuildRequires: python2-devel pygtk2-devel
%description
The libappindicator allows applications to export a menu into the Unity Menu bar.
It bases on KSNI and works in KDE and will fallback to generic Systray support if
none of those are available.
%package -n python2-appindicator
%{?python_provide:%python_provide python2-appindicator}
Summary: Python 2 bindings for libappindicator
Requires: libappindicator = 12.10.0-21
%description -n python2-appindicator
This package contains the Python 2 bindings for the appindicator library.
%package devel
Summary: Development package for libappindicator
Requires: %{name} = %{version}-%{release}
@ -52,8 +42,10 @@ This package contains the documentation for the appindicator and
appindicator-gtk3 libraries.
%prep
%autosetup -p1
sed -i "s#gmcs#mcs#g" configure.ac
%setup -q -c
%patch00001 -p1
sed -i "s#mono-csc#mcs#g" configure.ac
sed -i 's/--nogtkinit//' docs/reference/Makefile.am
gtkdocize --copy
cp -f gtk-doc.make gtk-doc.local.make
@ -63,7 +55,7 @@ autoreconf -vif
%global _configure ../configure
mkdir build-gtk2 build-gtk3
pushd build-gtk2
export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations"
export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations -Wno-error"
%configure --with-gtk=2 --enable-gtk-doc --disable-static
make -j1 V=1
popd
@ -81,30 +73,28 @@ pushd build-gtk3
make install DESTDIR=%{buildroot}
popd
find %{buildroot} -type f -name '*.la' -delete
%ldconfig_scriptlets
%ldconfig_scriptlets gtk3
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%post gtk3
/sbin/ldconfig
%postun gtk3
/sbin/ldconfig
%files
%doc AUTHORS README COPYING COPYING.LGPL.2.1
%{_libdir}/libappindicator.so.*
%{_libdir}/girepository-1.0/AppIndicator-0.1.typelib
%files -n python2-appindicator
%dir %{python_sitearch}/appindicator/
%{python_sitearch}/appindicator/__init__.py*
%{python_sitearch}/appindicator/_appindicator.so
%dir %{_datadir}/pygtk/
%dir %{_datadir}/pygtk/2.0/
%dir %{_datadir}/pygtk/2.0/defs/
%{_datadir}/pygtk/2.0/defs/appindicator.defs
%files devel
%dir %{_includedir}/libappindicator-0.1/
%dir %{_includedir}/libappindicator-0.1/libappindicator/
%{_includedir}/libappindicator-0.1/libappindicator/*.h
%{_libdir}/libappindicator.so
%{_libdir}/pkgconfig/appindicator-0.1.pc
%{_datadir}/gir-1.0/AppIndicator-0.1.gir
%{_datadir}/vala/vapi/appindicator-0.1.vapi
%{_datadir}/vala/vapi/appindicator-0.1.deps
%files gtk3
%doc AUTHORS README COPYING COPYING.LGPL.2.1
%{_libdir}/libappindicator3.so.*
@ -122,6 +112,27 @@ find %{buildroot} -type f -name '*.la' -delete
%doc %{_datadir}/gtk-doc/html/libappindicator/
%changelog
* Wed Sep 6 2023 liyanan <thistleslyn@163.com> - 12.10.1-1
- Upgrade to version 12.10.1
* Wed Jan 20 2021 Ge Wang <wangge20@huawei.com> - 12.10.0-27
- Modify license information.
* Wed Oct 21 2020 chengzihan <chengzihan2@huawei.com> - 12.10.0-26
- Remove Subpackage python2-appindicator
* Fri Feb 07 2020 yanzhihua <yanzhihua4@huawei.com> - 12.10.0-25
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:ldconfig_scriptlets does not exist so modify the use of ldconfig, and rename the patch
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-24
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:optimization the spec
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-23
- Type:enhancement
- Id:NA

Binary file not shown.

View File

@ -1,12 +0,0 @@
diff -aurN libappindicator-12.10.0/src/Makefile.am libappindicator-12.10.0-mod/src/Makefile.am
--- libappindicator-12.10.0/src/Makefile.am 2012-07-11 19:28:34.415113869 +0200
+++ libappindicator-12.10.0-mod/src/Makefile.am 2019-12-24 13:38:57.015051155 +0100
@@ -76,7 +76,7 @@
libappindicator_la_CFLAGS = \
$(LIBRARY_CFLAGS) \
$(COVERAGE_CFLAGS) \
- -Wall -Werror \
+ -Wall -Wno-deprecated-declarations \
-DG_LOG_DOMAIN=\"libappindicator\"
libappindicator_la_LIBADD = \