commit 6e80edcf01fd12a2004ba46c4303d27ea153277b607f25829c314e690af909ea Author: Stephan Kulow Date: Sat Mar 22 13:45:20 2014 +0000 Accepting request 226968 from X11:MATE:Factory Lib for MATE KDE; add patches to changes file OBS-URL: https://build.opensuse.org/request/show/226968 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libappindicator?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/0001_Fix_mono_dir.patch b/0001_Fix_mono_dir.patch new file mode 100644 index 0000000..b0f316d --- /dev/null +++ b/0001_Fix_mono_dir.patch @@ -0,0 +1,27 @@ +Index: libappindicator-14.04.bzr20131219/bindings/mono/appindicator-sharp-0.1.pc.in +=================================================================== +--- libappindicator-14.04.bzr20131219.orig/bindings/mono/appindicator-sharp-0.1.pc.in ++++ libappindicator-14.04.bzr20131219/bindings/mono/appindicator-sharp-0.1.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1 ++assemblies_dir=${libdir}/appindicator-sharp-0.1 + + Name: appindicator-sharp + Description: application indicators for .NET +Index: libappindicator-14.04.bzr20131219/bindings/mono/Makefile.am +=================================================================== +--- libappindicator-14.04.bzr20131219.orig/bindings/mono/Makefile.am ++++ libappindicator-14.04.bzr20131219/bindings/mono/Makefile.am +@@ -31,7 +31,7 @@ TARGET = \ + $(DLLPOLICY1) \ + $(POLICY1).config + +-assemblydir = $(libdir)/cli/appindicator-sharp-0.1 ++assemblydir = $(libdir)/appindicator-sharp-0.1 + assembly_DATA = $(TARGET) + + CLEANFILES = \ + diff --git a/dont-build-examples.patch b/dont-build-examples.patch new file mode 100644 index 0000000..8ae9e27 --- /dev/null +++ b/dont-build-examples.patch @@ -0,0 +1,15 @@ +--- libappindicator-12.10.1+13.10.20130920.orig/Makefile.am ++++ libappindicator-12.10.1+13.10.20130920/Makefile.am +@@ -3,9 +3,11 @@ + SUBDIRS = \ + src \ + bindings \ +- example \ + docs + ++# FIXME: Disabled, vala error ++# example ++ + if WANT_TESTS + SUBDIRS += tests + endif diff --git a/libappindicator.changes b/libappindicator.changes new file mode 100644 index 0000000..afd5cea --- /dev/null +++ b/libappindicator.changes @@ -0,0 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 11 10:41:46 UTC 2014 - p.drouand@gmail.com + +- Fix appindicator-sharp require in appindicator-sharp-devel + +------------------------------------------------------------------- +Mon Mar 10 15:15:37 UTC 2014 - p.drouand@gmail.com + +- Fix license; src/generate-id.c is released and distributed under + GPL-3.0 license + +------------------------------------------------------------------- +Fri Mar 7 20:18:46 UTC 2014 - hrvoje.senjan@gmail.com + +- Init libappindicator package +- Add 0001_Fix_mono_dir.patch; fix location of .pc files +- Add dont-build-examples.patch; don't build examples +- Add no-deprecated.patch; don't fail on deprecated declarations + diff --git a/libappindicator.spec b/libappindicator.spec new file mode 100644 index 0000000..35f5ea8 --- /dev/null +++ b/libappindicator.spec @@ -0,0 +1,283 @@ +# +# spec file for package libappindicator +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define _soname 1 +Name: libappindicator +Version: 12.10.1+13.10.20130920 +Release: 0 +Summary: Application indicators library +License: LGPL-2.0 and LGPL-3.0 and GPL-3.0 +Group: System/Libraries +Url: https://launchpad.net/libappindicator +Source: %{name}_%{version}.orig.tar.gz +# PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch -- fix location of .pc files +Patch0: 0001_Fix_mono_dir.patch +# PATCH-FIX-UPSTREAM dont-build-examples.patch -- don't build examples +Patch1: dont-build-examples.patch +# PATCH-FIX-UPSTREAM no-deprecated.patch -- don't fail on deprecated declarations +Patch2: no-deprecated.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: fdupes +BuildRequires: gnome-common +BuildRequires: gtk-doc +BuildRequires: libtool +BuildRequires: vala +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(dbusmenu-glib-0.4) +BuildRequires: pkgconfig(dbusmenu-gtk-0.4) +BuildRequires: pkgconfig(dbusmenu-gtk3-0.4) +BuildRequires: pkgconfig(gapi-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk-sharp-2.0) +BuildRequires: pkgconfig(indicator-0.4) +BuildRequires: pkgconfig(indicator3-0.4) +BuildRequires: pkgconfig(mono) +BuildRequires: pkgconfig(mono-nunit) +BuildRequires: pkgconfig(pygtk-2.0) + +%description +A library to allow applications to export a menu into the Unity Menu bar. Based +on KSNI it also works in KDE and will fallback to generic Systray support if +none of those are available. + +%package -n python-appindicator +Summary: Python 2 bindings for libappindicator +Group: System/Libraries +Requires: %{name}%{_soname} = %{version} + +%description -n python-appindicator +This package contains the Python 2 bindings for the appindicator library. + +%package -n libappindicator%{_soname} +Summary: Application indicators library +Group: System/Libraries + +%description -n libappindicator%{_soname} +A library to allow applications to export a menu into the Unity Menu bar. Based +on KSNI it also works in KDE and will fallback to generic Systray support if +none of those are available. + +%package -n typelib-1_0-AppIndicator-0_1 +Summary: Application indicators library +Group: System/Libraries + +%description -n typelib-1_0-AppIndicator-0_1 +This package contains the GObject Introspection bindings for the appindicator +library. + +%package devel +Summary: Development files for libappindicator +Group: Development/Libraries/C and C++ +Requires: libappindicator%{_soname} = %{version} +Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(dbusmenu-glib-0.4) + +%description devel +This package contains the development files for the appindicator library. + +%package -n libappindicator3-%{_soname} +Summary: Application indicators library - GTK 3 +Group: System/Libraries + +%description -n libappindicator3-%{_soname} +A library to allow applications to export a menu into the Unity Menu bar. Based +on KSNI it also works in KDE and will fallback to generic Systray support if +none of those are available. + +This package contains the GTK 3 version of this library. + +%package -n typelib-1_0-AppIndicator3-0_1 +Summary: Application indicators library +Group: System/Libraries + +%description -n typelib-1_0-AppIndicator3-0_1 +This package contains the GObject Introspection bindings for the appindicator +library. + +%package -n libappindicator3-devel +Summary: Development files for libappindicator3-%{_soname} +Group: Development/Libraries/C and C++ +Requires: libappindicator3-%{_soname} = %{version} +Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(dbusmenu-glib-0.4) + +%description -n libappindicator3-devel +This package contains the development files for the appindicator3 library. + +%package doc +Summary: Documentation for libappindicator and libappindicator3 +Group: Documentation/HTML +BuildArch: noarch + +%description doc +This package contains the documentation for the appindicator and appindicator3 +libraries. + +%package -n appindicator-sharp +Summary: Application indicators library - C# assembly CLI +Group: System/Libraries + +%description -n appindicator-sharp +This package provides the appindicator-sharp assembly that allows CLI (.NET) +programs to take menus from applications and place them in the panel. + +This package provides assemblies to be used by applications + +%package -n appindicator-sharp-devel +Summary: Development files for libappindicator-sharp +Group: Development/Libraries/Other +Requires: appindicator-sharp = %{version} + +%description -n appindicator-sharp-devel +This package contains the development files for the appindicator-sharp library. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +%global _configure ../configure +NOCONFIGURE=1 sh autogen.sh +export V=1 +mkdir build-gtk2 build-gtk3 + +pushd build-gtk2 +%configure --with-gtk=2 --enable-gtk-doc --disable-static --disable-mono-test +make -j1 +popd + +pushd build-gtk3 +%configure --with-gtk=3 --enable-gtk-doc --disable-static --disable-mono-test +make -j1 +popd + +%install +pushd build-gtk2 +%make_install +popd + +pushd build-gtk3 +%make_install +popd + +# Remove libtool archives +find %{buildroot} -type f -name "*.la" -delete -print + +%fdupes %{buildroot}%{python_sitearch}/appindicator/ + +%post -n libappindicator%{_soname} -p /sbin/ldconfig + +%postun -n libappindicator%{_soname} -p /sbin/ldconfig + +%post -n libappindicator3-%{_soname} -p /sbin/ldconfig + +%postun -n libappindicator3-%{_soname} -p /sbin/ldconfig + +%files -n python-appindicator +%defattr(-,root,root) +%doc COPYING* +%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 -n libappindicator%{_soname} +%defattr(-,root,root) +%doc COPYING* +%{_libdir}/libappindicator.so.%{_soname}* + +%files -n typelib-1_0-AppIndicator-0_1 +%defattr(-,root,root) +%doc COPYING* +%{_libdir}/girepository-1.0/AppIndicator-0.1.typelib + +%files devel +%defattr(-,root,root) +%doc COPYING* +%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 -n libappindicator3-%{_soname} +%defattr(-,root,root) +%doc COPYING* +%{_libdir}/libappindicator3.so.%{_soname}* + +%files -n typelib-1_0-AppIndicator3-0_1 +%defattr(-,root,root) +%doc COPYING* +%{_libdir}/girepository-1.0/AppIndicator3-0.1.typelib + +%files -n libappindicator3-devel +%defattr(-,root,root) +%doc COPYING* +%dir %{_includedir}/libappindicator3-0.1/ +%dir %{_includedir}/libappindicator3-0.1/libappindicator/ +%{_includedir}/libappindicator3-0.1/libappindicator/*.h +%{_libdir}/libappindicator3.so +%{_libdir}/pkgconfig/appindicator3-0.1.pc +%{_datadir}/gir-1.0/AppIndicator3-0.1.gir +%{_datadir}/vala/vapi/appindicator3-0.1.vapi +%{_datadir}/vala/vapi/appindicator3-0.1.deps + +%files doc +%defattr(-,root,root) +%doc COPYING* +%doc %{_datadir}/gtk-doc/html/libappindicator/ + +%files -n appindicator-sharp +%defattr(-,root,root) +%doc COPYING* +%dir %{_libdir}/appindicator-sharp-0.1/ +%{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll +%{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll.config +%{_libdir}/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.config +%{_libdir}/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll +%{_libdir}/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.config +%{_libdir}/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll +%dir %{_libexecdir}/mono/appindicator-sharp/ +%{_libexecdir}/mono/appindicator-sharp/appindicator-sharp.dll +%{_libexecdir}/mono/appindicator-sharp/policy.0.0.appindicator-sharp.dll +%dir %{_libexecdir}/mono/gac/appindicator-sharp/ +%dir %{_libexecdir}/mono/gac/appindicator-sharp/*/ +%{_libexecdir}/mono/gac/appindicator-sharp/*/appindicator-sharp.dll +%{_libexecdir}/mono/gac/appindicator-sharp/*/appindicator-sharp.dll.config +%dir %{_libexecdir}/mono/gac/policy.0.0.appindicator-sharp/ +%dir %{_libexecdir}/mono/gac/policy.0.0.appindicator-sharp/*/ +%{_libexecdir}/mono/gac/policy.0.0.appindicator-sharp/*/policy.0.0.appindicator-sharp.config +%{_libexecdir}/mono/gac/policy.0.0.appindicator-sharp/*/policy.0.0.appindicator-sharp.dll + +%files -n appindicator-sharp-devel +%defattr(-,root,root) +%doc COPYING* +%{_libdir}/pkgconfig/appindicator-sharp-0.1.pc + +%changelog diff --git a/libappindicator_12.10.1+13.10.20130920.orig.tar.gz b/libappindicator_12.10.1+13.10.20130920.orig.tar.gz new file mode 100644 index 0000000..2a8cf9e --- /dev/null +++ b/libappindicator_12.10.1+13.10.20130920.orig.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b93526101c07cce65a3d8dc3d43e77e06780ce023ab82605e32c8babc139a2c +size 70392 diff --git a/no-deprecated.patch b/no-deprecated.patch new file mode 100644 index 0000000..85119df --- /dev/null +++ b/no-deprecated.patch @@ -0,0 +1,85 @@ +--- libappindicator-12.10.1+13.10.20130920.orig/src/Makefile.am ++++ libappindicator-12.10.1+13.10.20130920/src/Makefile.am +@@ -76,7 +76,7 @@ + libappindicator_la_CFLAGS = \ + $(LIBRARY_CFLAGS) \ + $(COVERAGE_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN=\"libappindicator\" + + libappindicator_la_LIBADD = \ +--- libappindicator-12.10.1+13.10.20130920.orig/tests/Makefile.am ++++ libappindicator-12.10.1+13.10.20130920/tests/Makefile.am +@@ -32,7 +32,7 @@ + test_libappindicator_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ + -DSRCDIR="\"$(srcdir)\"" \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_LDADD = \ +@@ -49,7 +49,7 @@ + + test_libappindicator_dbus_client_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_dbus_client_LDADD = \ +@@ -66,7 +66,7 @@ + + test_libappindicator_dbus_server_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_dbus_server_LDADD = \ +@@ -83,7 +83,7 @@ + + test_libappindicator_status_client_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_status_client_LDADD = \ +@@ -100,7 +100,7 @@ + + test_libappindicator_status_server_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_status_server_LDADD = \ +@@ -116,7 +116,7 @@ + + test_libappindicator_fallback_watcher_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_fallback_watcher_LDADD = \ +@@ -128,7 +128,7 @@ + + test_libappindicator_fallback_item_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_libappindicator_fallback_item_LDADD = \ +@@ -198,7 +198,7 @@ + + test_simple_app_CFLAGS = \ + $(TESTDEPS_CFLAGS) $(LIBRARY_CFLAGS) \ +- -Wall -Werror \ ++ -Wall -Werror -Wno-error=deprecated-declarations \ + -I$(top_srcdir)/src + + test_simple_app_LDADD = \