From 6ec591e69ecf9d25b44ec70491059a34b929f61b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 May 2019 06:38:56 -0400 Subject: [PATCH] import libdbusmenu-16.04.0-12.el8 --- .gitignore | 1 + .libdbusmenu.metadata | 1 + SOURCES/covscan.patch | 11 ++ SOURCES/dbusmenu-bench-python3.patch | 90 +++++++++ SPECS/libdbusmenu.spec | 283 +++++++++++++++++++++++++++ 5 files changed, 386 insertions(+) create mode 100644 .gitignore create mode 100644 .libdbusmenu.metadata create mode 100644 SOURCES/covscan.patch create mode 100644 SOURCES/dbusmenu-bench-python3.patch create mode 100644 SPECS/libdbusmenu.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f5ae2ea --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libdbusmenu-16.04.0.tar.gz diff --git a/.libdbusmenu.metadata b/.libdbusmenu.metadata new file mode 100644 index 0000000..9ba1ad0 --- /dev/null +++ b/.libdbusmenu.metadata @@ -0,0 +1 @@ +f88fc666609ed486a968fd6c8b739dff07d50bdd SOURCES/libdbusmenu-16.04.0.tar.gz diff --git a/SOURCES/covscan.patch b/SOURCES/covscan.patch new file mode 100644 index 0000000..7906433 --- /dev/null +++ b/SOURCES/covscan.patch @@ -0,0 +1,11 @@ +diff -up libdbusmenu-16.04.0/libdbusmenu-16.04.0/libdbusmenu-glib/menuitem.c.covscan libdbusmenu-16.04.0/libdbusmenu-16.04.0/libdbusmenu-glib/menuitem.c +--- libdbusmenu-16.04.0/libdbusmenu-16.04.0/libdbusmenu-glib/menuitem.c.covscan 2016-02-27 19:58:43.000000000 +0100 ++++ libdbusmenu-16.04.0/libdbusmenu-16.04.0/libdbusmenu-glib/menuitem.c 2018-10-09 12:56:22.308956723 +0200 +@@ -1753,6 +1753,7 @@ dbusmenu_menuitem_handle_event (Dbusmenu + g_debug("Menuitem %d (%s) is getting event '%s'", ID(mi), LABEL(mi), name); + #endif + DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi); ++ g_return_if_fail(DBUSMENU_IS_MENUITEM_CLASS(class)); + + gboolean handled = FALSE; + if (variant == NULL) { diff --git a/SOURCES/dbusmenu-bench-python3.patch b/SOURCES/dbusmenu-bench-python3.patch new file mode 100644 index 0000000..205ea68 --- /dev/null +++ b/SOURCES/dbusmenu-bench-python3.patch @@ -0,0 +1,90 @@ +diff -up libdbusmenu-16.04.0/libdbusmenu-16.04.0/tools/dbusmenu-bench.python3 libdbusmenu-16.04.0/libdbusmenu-16.04.0/tools/dbusmenu-bench +--- libdbusmenu-16.04.0/libdbusmenu-16.04.0/tools/dbusmenu-bench.python3 2016-02-27 19:58:43.000000000 +0100 ++++ libdbusmenu-16.04.0/libdbusmenu-16.04.0/tools/dbusmenu-bench 2018-06-15 13:15:10.966380083 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # encoding: utf-8 + """ + A library to communicate a menu object set accross DBus and +@@ -60,8 +60,8 @@ class Chrono(object): + + + def dump_properties(properties, prepend=""): +- for key, value in properties.items(): +- print "%s- %s: %s" % (prepend, key, value) ++ for key, value in list(properties.items()): ++ print("%s- %s: %s" % (prepend, key, value)) + + + def run_test_sequence(menu, dump=False): +@@ -74,9 +74,9 @@ def run_test_sequence(menu, dump=False): + revision, layout = menu.GetLayout(dbus.Int32(0)) + times["GetLayout"] = chrono.elapsed() + if dump: +- print "revision:", revision +- print "layout:" +- print layout ++ print("revision:", revision) ++ print("layout:") ++ print(layout) + + # Get ids + tree = ET.fromstring(layout) +@@ -89,27 +89,27 @@ def run_test_sequence(menu, dump=False): + children = menu.GetChildren(dbus.Int32(root_id), property_names) + times["GetChildren"] = chrono.elapsed() + if dump: +- print "children:" ++ print("children:") + for child in children: + id, properties = child +- print "- %d:" % id ++ print("- %d:" % id) + dump_properties(properties, prepend=" ") + + chrono.restart() + properties = menu.GetProperties(dbus.Int32(child_id), property_names) + times["GetProperties"] = chrono.elapsed() + if dump: +- print "properties:" ++ print("properties:") + dump_properties(properties) + + return times + + def create_timing_dict(): +- return dict(zip(PROBES, itertools.repeat(0))) ++ return dict(list(zip(PROBES, itertools.repeat(0)))) + + def print_probe(prefix, name, value, timestamp): + value = int(value * 1000000) +- print "%(prefix)s.%(name)s:%(value)d@%(timestamp)d" % locals() ++ print("%(prefix)s.%(name)s:%(value)d@%(timestamp)d" % locals()) + + def main(): + parser = OptionParser(usage = "%prog [options]") +@@ -134,7 +134,7 @@ def main(): + max_timings = create_timing_dict() + for x in range(options.count): + timings = run_test_sequence(menu) +- for name, timing in timings.items(): ++ for name, timing in list(timings.items()): + cumulated_timings[name] += timing + if min_timings[name] == 0 or min_timings[name] > timing: + min_timings[name] = timing +@@ -142,11 +142,11 @@ def main(): + max_timings[name] = timing + + timestamp = int(time.time()) +- for name, timing in cumulated_timings.items(): ++ for name, timing in list(cumulated_timings.items()): + print_probe("average", name, timing / options.count, timestamp) +- for name, timing in min_timings.items(): ++ for name, timing in list(min_timings.items()): + print_probe("min", name, timing, timestamp) +- for name, timing in max_timings.items(): ++ for name, timing in list(max_timings.items()): + print_probe("max", name, timing, timestamp) + + return 0 diff --git a/SPECS/libdbusmenu.spec b/SPECS/libdbusmenu.spec new file mode 100644 index 0000000..e05d74c --- /dev/null +++ b/SPECS/libdbusmenu.spec @@ -0,0 +1,283 @@ +# Todo: build docs +# BuildRequires: gtk-doc >= 1.14 +# configure --enable-gtk-doc --enable-gtk-doc-html --enable-gtk-doc-pdf + +%global ubuntu_release 16.04 + +# Set to 1 to run testsuite +%global with_tests 0 + +Name: libdbusmenu +Version: %{ubuntu_release}.0 +Release: 12%{?dist} +Summary: Library for passing menus over DBus + +# All files installed in final rpms use C sources with dual licensing headers. +# Tests compiled in the build process are licensed GPLv3 + +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: dbusmenu-bench-python3.patch +Patch1: covscan.patch + +BuildRequires: atk-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext +BuildRequires: glibc-devel +BuildRequires: gnome-common +BuildRequires: intltool +BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: pkgconfig +BuildRequires: pkgconfig(atk) +BuildRequires: pkgconfig(gio-2.0) >= 2.35.4 +BuildRequires: pkgconfig(gio-unix-2.0) >= 2.24 +BuildRequires: pkgconfig(glib-2.0) >= 2.35.4 +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.10 +BuildRequires: pkgconfig(gtk+-3.0) >= 2.91 +BuildRequires: pkgconfig(json-glib-1.0) >= 0.13.4 +BuildRequires: pkgconfig(x11) >= 1.3 +BuildRequires: vala-devel +BuildRequires: vala-tools + +# pkgconfig file is checked for valgrind, but is actually only used for tests +# https://bugzilla.redhat.com/show_bug.cgi?id=1262274 +# BuildRequires: pkgconfig(valgrind) +%if 0%{?with_tests} +BuildRequires: dbus-test-runner +BuildRequires: valgrind +%endif + +%description +This is a small library designed to make sharing and displaying of menu +structures over DBus simple and easy to use. It works for both QT and GTK+ and +makes building menus simple. + +%package devel +Summary: %{summary} - Development files +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: dbus-glib-devel + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%package gtk3 +Summary: %{summary} - GTK+3 version +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description gtk3 +Shared libraries for the %{name}-gtk3 library. + +%package gtk3-devel +Summary: Development files for %{name}-gtk3 +Requires: %{name}-gtk3%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: gtk3-devel +Requires: dbus-glib-devel + +%description gtk3-devel +The %{name}-gtk3-devel package contains libraries and header files for +developing applications that use %{name}-gtk3. + +%package jsonloader +Summary: Test lib development files +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: libdbusmenu = %{version}-%{release} + +%description jsonloader +Test library for %{name}. + +%package jsonloader-devel +Summary: Test lib development files for %{name} +Requires: %{name}-jsonloader%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description jsonloader-devel +The %{name}-jsonloader-devel package contains libraries and header files for +developing applications that use %{name}-jsonloader. + +%package doc +Summary: Document files for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documents for developing applications that +use %{name}. + +%package tools +Summary: Development tools for the dbusmenu libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tools +The %{name}-tools package contains helper tools for developing applications +that use %{name}. + + +%prep +%setup -q -n %{name}-%{version} -c +%patch0 -p1 -b .python3 +%patch1 -p1 -b .covscan +cp -a %{name}-%{version}/{README,COPYING,COPYING.2.1,COPYING-GPL3,AUTHORS,ChangeLog} . + + +%build +build(){ +autoreconf -vif +%configure --disable-static --disable-dumper $* +%make_build +} + +pushd %{name}-%{version} +build --with-gtk=3 +popd + + +%install +pushd %{name}-%{version} +%make_install +find %{buildroot} -name '*.la' -delete +popd + +# Let rpmbuild pick the documents in the files section +rm -fr %{buildroot}%{_docdir}/%{name} + +%if 0%{?with_tests} +%check +pushd %{name}-%{version} + make check V=1 +popd +%endif + +%ldconfig_scriptlets +%ldconfig_scriptlets gtk3 +%ldconfig_scriptlets jsonloader + +%files +%license COPYING COPYING.2.1 COPYING-GPL3 +%doc README AUTHORS ChangeLog +%{_libdir}/libdbusmenu-glib.so.* +%{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib + +%files devel +%doc %{name}-%{version}/tests/glib-server-nomenu.c +%dir %{_includedir}/libdbusmenu-glib-0.4/ +%dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/ +%{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/*.h +%{_libdir}/libdbusmenu-glib.so +%{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc +%{_datadir}/gir-1.0/Dbusmenu-0.4.gir +%{_datadir}/vala/vapi/Dbusmenu-0.4.vapi + +%files jsonloader +%{_libdir}/libdbusmenu-jsonloader.so.* + +%files jsonloader-devel +%dir %{_includedir}/libdbusmenu-glib-0.4/ +%dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ +%{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/*.h +%{_libdir}/libdbusmenu-jsonloader.so +%{_libdir}/pkgconfig/dbusmenu-jsonloader-0.4.pc + +%files gtk3 +%{_libdir}/libdbusmenu-gtk3.so.* +%{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib + +%files gtk3-devel +%dir %{_includedir}/libdbusmenu-gtk3-0.4 +%dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk +%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/*.h +%{_libdir}/libdbusmenu-gtk3.so +%{_libdir}/pkgconfig/dbusmenu-gtk3-0.4.pc +%{_datadir}/gir-1.0/DbusmenuGtk3-0.4.gir +%{_datadir}/vala/vapi/DbusmenuGtk3-0.4.vapi + +%files doc +%dir %{_datadir}/gtk-doc/ +%{_datadir}/gtk-doc/* + +%files tools +%doc %{name}-%{version}/tools/README.dbusmenu-bench +%{_libexecdir}/dbusmenu-bench +%{_libexecdir}/dbusmenu-testapp +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/json/ +%{_datadir}/%{name}/json/test-gtk-label.json + +%changelog +* Tue Oct 09 2018 Tomas Popela - 16.04.0-12 +- Fix Coverity scan issues +- Resolves: rhbz#1637532 + +* Mon Jul 02 2018 Charalampos Stratakis - 16.04.0-11 +- Remove gnome-doc-utils build dependency + +* Fri Jun 15 2018 Tomas Popela - 16.04.0-10 +- Port dbusmenu-bench to python3 +- Resolves: rhbz#1591714 + +* Thu Jun 07 2018 Tomas Popela - 16.04.0-9 +- Remove gtk2 support + +* Fri May 25 2018 Tomas Popela - 16.04.0-8 +- Move to ldcondif_scriptlets + +* Fri May 25 2018 Tomas Popela - 16.04.0-7 +- Fix jsonloader subpackage requires (backport from RHEL 7) + +* Fri May 25 2018 Tomas Popela - 16.04.0-6 +- Require python2 as a BR + +* Wed Feb 07 2018 Fedora Release Engineering - 16.04.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 16.04.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 16.04.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Apr 17 2017 Simone Caronni - 16.04.0-2 +- Add tests, remove valgrind-devel build requirements (#1262274). +- Disable tests until dbus-test-runner is available. + +* Sun Apr 16 2017 Simone Caronni - 16.04.0-1 +- Update to 16.04.0. + +* Fri Feb 10 2017 Fedora Release Engineering - 12.10.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 12.10.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 12.10.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 12.10.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 12.10.2-7 +- Rebuilt for gobject-introspection 1.41.4 + +* Sat Jun 07 2014 Fedora Release Engineering - 12.10.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Aug 26 2013 Eduardo Echeverria - 12.10.2-5 +- switch to unversioned documentation directory + +* Sat Aug 03 2013 Fedora Release Engineering - 12.10.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jun 02 2013 Dan Horák - 12.10.2-3 +- valgrind exists only on selected arches + +* Mon May 27 2013 Eduardo Echeverria - 12.10.2-2 +- Fix issues with macros-in-comment +- Fix cosmetics errors +- Workaround for the docs files +- Fix a issue with the ownership of the some directories + +* Sun Feb 17 2013 Eduardo Echeverria - 12.10.2-1 +- initial packaging