diff --git a/0001-libdbusmenu-add-patch-to-modify-build-err.patch b/0001-libdbusmenu-add-patch-to-modify-build-err.patch new file mode 100644 index 0000000..52ab8b7 --- /dev/null +++ b/0001-libdbusmenu-add-patch-to-modify-build-err.patch @@ -0,0 +1,68 @@ +From 1785c226570993a6f0cf9fa25f7903ba962cfe52 Mon Sep 17 00:00:00 2001 +From: Buildteam +Date: Tue, 14 Jan 2020 09:48:28 +0800 +Subject: [PATCH] libdbusmenu: add patch to modify build err + +Signed-off-by: Buildteam +--- + libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am | 2 +- + libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am | 2 +- + libdbusmenu-16.04.0/tests/Makefile.am | 2 +- + libdbusmenu-16.04.0/tools/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am b/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am +index 2dea5f6..01832ce 100644 +--- a/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am ++++ b/libdbusmenu-16.04.0/libdbusmenu-glib/Makefile.am +@@ -66,7 +66,7 @@ libdbusmenu_glib_la_LDFLAGS = \ + libdbusmenu_glib_la_CFLAGS = \ + $(DBUSMENUGLIB_CFLAGS) \ + $(COVERAGE_CFLAGS) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\"" + + libdbusmenu_glib_la_LIBADD = \ +diff --git a/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am b/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am +index 9a7a2b0..a9a2b49 100644 +--- a/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am ++++ b/libdbusmenu-16.04.0/libdbusmenu-gtk/Makefile.am +@@ -66,7 +66,7 @@ libdbusmenu_gtk_la_CFLAGS = \ + $(DBUSMENUGTK_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -I$(top_srcdir) \ +- -Wall -Werror -Wno-error=deprecated-declarations \ ++ -Wall -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" + + libdbusmenu_gtk_la_LIBADD = \ +diff --git a/libdbusmenu-16.04.0/tests/Makefile.am b/libdbusmenu-16.04.0/tests/Makefile.am +index 64e3e75..699c2c9 100644 +--- a/libdbusmenu-16.04.0/tests/Makefile.am ++++ b/libdbusmenu-16.04.0/tests/Makefile.am +@@ -103,7 +103,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b + ############################################ + + DBUSMENU_GLIB_TEST_CFLAGS = \ +- -Wall -Werror \ ++ -Wall \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + $(DBUSMENUTESTS_CFLAGS) \ +diff --git a/libdbusmenu-16.04.0/tools/Makefile.am b/libdbusmenu-16.04.0/tools/Makefile.am +index 029b73e..2258cca 100644 +--- a/libdbusmenu-16.04.0/tools/Makefile.am ++++ b/libdbusmenu-16.04.0/tools/Makefile.am +@@ -16,7 +16,7 @@ dbusmenu_dumper_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGLIB_CFLAGS) \ + $(DBUSMENUDUMPER_CFLAGS) \ +- -Wall -Werror ++ -Wall + + dbusmenu_dumper_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ +-- +1.8.3.1 + diff --git a/libdbusmenu.spec b/libdbusmenu.spec index fae3e19..3132d17 100644 --- a/libdbusmenu.spec +++ b/libdbusmenu.spec @@ -1,11 +1,13 @@ Name: libdbusmenu Version: 16.04.0 -Release: 9 +Release: 10 Summary: Pass a menu structure across DBus License: LGPLv3 or LGPLv2 and GPLv3 URL: https://launchpad.net/libdbusmenu Source0: https://launchpad.net/libdbusmenu/%{ubuntu_release}/%{version}/+download/%{name}-%{version}.tar.gz +Patch0: 0001-libdbusmenu-add-patch-to-modify-build-err.patch + BuildRequires: atk-devel autoconf automake gettext glibc-devel gnome-common intltool libtool libxslt BuildRequires: pkgconfig pkgconfig(atk) pkgconfig(gio-2.0) >= 2.35.4 pkgconfig(gio-unix-2.0) >= 2.24 BuildRequires: pkgconfig(glib-2.0) >= 2.35.4 pkgconfig(gobject-introspection-1.0) >= 0.10 @@ -197,6 +199,12 @@ cd - %{_datadir}/gtk-doc/* %changelog +* Tue Jan 14 2020 openEuler Buildteam - 16.04.0-10 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add patch to modify build err + * Sat Dec 21 2019 wangyiru - 16.04.0-9 - Package init