Compare commits

..

No commits in common. "ad3b4d03486a045fb27ee53d3e6bb9be10c1174c" and "8cc03072f088e94ff731bb427097e8034afa1c59" have entirely different histories.

6 changed files with 56 additions and 43 deletions

View File

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

View File

@ -0,0 +1,12 @@
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,20 +1,30 @@
Name: libappindicator Name: libappindicator
Version: 12.10.1 Version: 12.10.0
Release: 1 Release: 23
Summary: The library of application indicators Summary: The library of application indicators
License: LGPL-3.0 and LGPL-2.1+ and GPL-3.0+ License: LGPLv2 and LGPLv3
URL: https://launchpad.net/libappindicator URL: https://launchpad.net/libappindicator
Source0: https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/%{name}/%{version}+20.10.20200706.1-0ubuntu1/%{name}_%{version}+20.10.20200706.1.orig.tar.gz Source0: https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
Patch0001: 0001_Fix_mono_dir.patch 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: autoconf automake gtk-doc vala-tools dbus-glib-devel libdbusmenu-devel
BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel BuildRequires: libdbusmenu-gtk2-devel libdbusmenu-gtk3-devel gobject-introspection-devel
BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel BuildRequires: gtk2-devel gtk3-devel libindicator-devel libindicator-gtk3-devel
BuildRequires: python2-devel pygtk2-devel
%description %description
The libappindicator allows applications to export a menu into the Unity Menu bar. 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 It bases on KSNI and works in KDE and will fallback to generic Systray support if
none of those are available. 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 %package devel
Summary: Development package for libappindicator Summary: Development package for libappindicator
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -42,10 +52,8 @@ This package contains the documentation for the appindicator and
appindicator-gtk3 libraries. appindicator-gtk3 libraries.
%prep %prep
%setup -q -c %autosetup -p1
%patch00001 -p1 sed -i "s#gmcs#mcs#g" configure.ac
sed -i "s#mono-csc#mcs#g" configure.ac
sed -i 's/--nogtkinit//' docs/reference/Makefile.am sed -i 's/--nogtkinit//' docs/reference/Makefile.am
gtkdocize --copy gtkdocize --copy
cp -f gtk-doc.make gtk-doc.local.make cp -f gtk-doc.make gtk-doc.local.make
@ -55,7 +63,7 @@ autoreconf -vif
%global _configure ../configure %global _configure ../configure
mkdir build-gtk2 build-gtk3 mkdir build-gtk2 build-gtk3
pushd build-gtk2 pushd build-gtk2
export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations -Wno-error" export CFLAGS="%{optflags} $CFLAGS -Wno-deprecated-declarations"
%configure --with-gtk=2 --enable-gtk-doc --disable-static %configure --with-gtk=2 --enable-gtk-doc --disable-static
make -j1 V=1 make -j1 V=1
popd popd
@ -73,28 +81,30 @@ pushd build-gtk3
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
popd popd
find %{buildroot} -type f -name '*.la' -delete find %{buildroot} -type f -name '*.la' -delete
%ldconfig_scriptlets
%post %ldconfig_scriptlets gtk3
/sbin/ldconfig
%postun
/sbin/ldconfig
%post gtk3
/sbin/ldconfig
%postun gtk3
/sbin/ldconfig
%files %files
%doc AUTHORS README COPYING COPYING.LGPL.2.1 %doc AUTHORS README COPYING COPYING.LGPL.2.1
%{_libdir}/libappindicator.so.* %{_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 %files devel
%dir %{_includedir}/libappindicator-0.1/ %dir %{_includedir}/libappindicator-0.1/
%dir %{_includedir}/libappindicator-0.1/libappindicator/ %dir %{_includedir}/libappindicator-0.1/libappindicator/
%{_includedir}/libappindicator-0.1/libappindicator/*.h %{_includedir}/libappindicator-0.1/libappindicator/*.h
%{_libdir}/libappindicator.so %{_libdir}/libappindicator.so
%{_libdir}/pkgconfig/appindicator-0.1.pc %{_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 %files gtk3
%doc AUTHORS README COPYING COPYING.LGPL.2.1 %doc AUTHORS README COPYING COPYING.LGPL.2.1
%{_libdir}/libappindicator3.so.* %{_libdir}/libappindicator3.so.*
@ -112,27 +122,6 @@ find %{buildroot} -type f -name '*.la' -delete
%doc %{_datadir}/gtk-doc/html/libappindicator/ %doc %{_datadir}/gtk-doc/html/libappindicator/
%changelog %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 * Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 12.10.0-23
- Type:enhancement - Type:enhancement
- Id:NA - Id:NA

View File

@ -0,0 +1,12 @@
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 = \