From e15eaf42d23c4b09e6cd22c2910a7a232e244dd4a72b5d3e67cf7c93b6dbd7e9 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Sat, 10 Mar 2018 16:45:18 +0000 Subject: [PATCH] Accepting request 585314 from home:dimstar:Factory - Add libappindicator-no-Werror.patch: the libappindicator code is aging and is not keeping up well with the moving world around it. OBS-URL: https://build.opensuse.org/request/show/585314 OBS-URL: https://build.opensuse.org/package/show/X11:Unity/libappindicator?expand=0&rev=14 --- libappindicator-no-Werror.patch | 13 +++++++++++++ libappindicator.changes | 6 ++++++ libappindicator.spec | 34 ++++++++++++++++++++++----------- 3 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 libappindicator-no-Werror.patch diff --git a/libappindicator-no-Werror.patch b/libappindicator-no-Werror.patch new file mode 100644 index 0000000..fd08fd7 --- /dev/null +++ b/libappindicator-no-Werror.patch @@ -0,0 +1,13 @@ +Index: libappindicator-12.10.1+bzr20170215/src/Makefile.am +=================================================================== +--- libappindicator-12.10.1+bzr20170215.orig/src/Makefile.am ++++ libappindicator-12.10.1+bzr20170215/src/Makefile.am +@@ -76,7 +76,7 @@ libappindicator_la_LDFLAGS = \ + libappindicator_la_CFLAGS = \ + $(LIBRARY_CFLAGS) \ + $(COVERAGE_CFLAGS) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN=\"libappindicator\" + + libappindicator_la_LIBADD = \ diff --git a/libappindicator.changes b/libappindicator.changes index 5a91ed3..8533c4c 100644 --- a/libappindicator.changes +++ b/libappindicator.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 10 14:14:54 UTC 2018 - dimstar@opensuse.org + +- Add libappindicator-no-Werror.patch: the libappindicator code is + aging and is not keeping up well with the moving world around it. + ------------------------------------------------------------------- Mon Sep 4 16:06:31 UTC 2017 - dimstar@opensuse.org diff --git a/libappindicator.spec b/libappindicator.spec index d6c88d2..eb52cd5 100644 --- a/libappindicator.spec +++ b/libappindicator.spec @@ -1,7 +1,7 @@ # # spec file for package libappindicator # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,12 +28,14 @@ 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 +URL: https://launchpad.net/libappindicator Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz # PATCH-FIX-UPSTREAM 0001_Fix_mono_dir.patch hrvoje.senjan@gmail.com -- Fix location of .pc files. Patch0: 0001_Fix_mono_dir.patch # PATCH-FIX-OPENSUSE libappindicator-activate-support.patch sor.alexei@meowr.ru -- Open menu on the left-click action. Patch1: libappindicator-activate-support.patch +# PATCH-FIX=UPSTREAM libappindicator-no-Werror.patch dimstar@opensuse.org -- Don't add -Werror on build: the code is aging and does not keep up +Patch2: libappindicator-no-Werror.patch BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: pkgconfig @@ -156,6 +158,7 @@ This package contains the development files for the appindicator-sharp library. %setup -q -c %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build NOCONFIGURE=1 ./autogen.sh @@ -192,7 +195,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n python2-appindicator %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %dir %{python_sitearch}/appindicator/ %{python_sitearch}/appindicator/__init__.py* %{python_sitearch}/appindicator/_appindicator.so @@ -203,17 +207,20 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n libappindicator%{sover} %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %{_libdir}/libappindicator.so.%{sover}* %files -n typelib-1_0-AppIndicator-0_1 %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %{_libdir}/girepository-1.0/AppIndicator-0.1.typelib %files devel %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %dir %{_includedir}/libappindicator-0.1/ %dir %{_includedir}/libappindicator-0.1/libappindicator/ %{_includedir}/libappindicator-0.1/libappindicator/*.h @@ -225,17 +232,20 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n libappindicator3-%{sover} %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %{_libdir}/libappindicator3.so.%{sover}* %files -n typelib-1_0-AppIndicator3-0_1 %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %{_libdir}/girepository-1.0/AppIndicator3-0.1.typelib %files -n libappindicator3-devel %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %dir %{_includedir}/libappindicator3-0.1/ %dir %{_includedir}/libappindicator3-0.1/libappindicator/ %{_includedir}/libappindicator3-0.1/libappindicator/*.h @@ -248,7 +258,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %if %{with mono} %files -n appindicator-sharp %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %dir %{_libdir}/appindicator-sharp-0.1/ %{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll %{_libdir}/appindicator-sharp-0.1/appindicator-sharp.dll.config @@ -270,7 +281,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %files -n appindicator-sharp-devel %defattr(-,root,root) -%doc COPYING COPYING.LGPL.2.1 README +%license COPYING COPYING.LGPL.2.1 +%doc README %{_libdir}/pkgconfig/appindicator-sharp-0.1.pc %endif