January 2020 - openSUSE Commits - openSUSE Mailing Lists

commit libdbusmenu for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libdbusmenu for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libdbusmenu (Old) and /work/SRC/openSUSE:Leap:15.2/.libdbusmenu.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdbusmenu" Thu Jan 30 14:49:05 2020 rev:17 rq:753229 version:16.04.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libdbusmenu/libdbusmenu.changes 2020-01-15 15:19:37.646382618 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libdbusmenu.new.26092/libdbusmenu.changes 2020-01-30 14:49:42.930880607 +0100 @@ -1,0 +2,31 @@ +Tue Nov 19 19:26:35 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> + +- Work around OBS idiosyncrasies regarding packages name. + +------------------------------------------------------------------- +Mon Nov 18 18:08:15 UTC 2019 - Stefan Brüns <stefan.bruens(a)rwth-aachen.de> + +- Drop dependency on deprecated gnome-common, just run autoreconf +- Do not include unused tree_index.sgml, fix build with gtk-doc >= 1.32, + see https://gitlab.gnome.org/GNOME/gtk-doc/issues/103 + * add 0001-Fix-build-with-gtk-doc-1.32-due-to-non-existing-tree.patch +- Fix missing accelerators, add + 0002-genericmenuitem-Make-accelerator-text-appear-again.patch +- Split Gtk2 and Gtk3 build - glib, tools and doc subpackage are created + from the Gtk2 flavor. + * Fix building with disabled tests, add 0003-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch + +------------------------------------------------------------------- +Wed Oct 16 08:34:16 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Inject -Wno-error into CFLAGS. It's kinda ridiculous for code + that is not maintained upstream to pass -Werror by default and + then not catching up. So for now we accept warnings. + +------------------------------------------------------------------- +Tue Aug 13 11:26:39 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Drop superfluous hard pkgconfig(gtk+-2.0) Requires from + libdebusmenu-glib-devel sub-package. + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-gtk-doc-1.32-due-to-non-existing-tree.patch 0002-genericmenuitem-Make-accelerator-text-appear-again.patch 0003-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu.spec ++++++ --- /var/tmp/diff_new_pack.a5W1rd/_old 2020-01-30 14:49:43.202880752 +0100 +++ /var/tmp/diff_new_pack.a5W1rd/_new 2020-01-30 14:49:43.206880753 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,66 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%global flavor @BUILD_FLAVOR@%{nil} +%global sname libappindicator +%if "%{flavor}" == "" +ExclusiveArch: do-not-build +%endif + +%define sname libdbusmenu %define soname_glib 4 %define soname_gtk2 4 %define soname_gtk3 4 %define soname_jsonloader 4 -Name: libdbusmenu + +%if "%{flavor}" == "gtk2" +%global gtkver 2 +%global soname_gtk %{soname_gtk2} +%global libname_gtk libdbusmenu-gtk%{soname_gtk} +%global psuffix -gtk%{gtkver} +# dumper is GTK2 only +%bcond_without testtools +# Docs are the same for GTK2/3, dito for glib +%bcond_without docs +%global package_glib 1 +%endif + +%if "%{flavor}" == "gtk3" +%global gtksuffix 3 +%global gtkver 3 +%global soname_gtk %{soname_gtk3} +%global libname_gtk libdbusmenu-gtk3-%{soname_gtk} +%global psuffix -gtk%{gtkver} +%bcond_with testtools +%bcond_with docs +%endif + +%global libname_glib libdbusmenu-glib%{soname_glib} + +Name: libdbusmenu%{?psuffix} Version: 16.04.0 Release: 0 Summary: Small library that passes a menu structure across DBus License: GPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) Group: System/Libraries URL: https://launchpad.net/dbusmenu -Source: https://launchpad.net/libdbusmenu/16.04/%{version}/+download/%{name}-%{vers… +Source: https://launchpad.net/libdbusmenu/16.04/%{version}/+download/%{sname}-%{ver… +# PATCH-FIX-OPENSUSE +Patch0: 0001-Fix-build-with-gtk-doc-1.32-due-to-non-existing-tree.patch +# PATCH-FIX-UPSTREAM +Patch1: 0002-genericmenuitem-Make-accelerator-text-appear-again.patch +# PATCH-FIX-OPENSUSE +Patch2: 0003-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: gnome-common +%if %{with docs} BuildRequires: gtk-doc +BuildRequires: pkgconfig(gnome-doc-utils) +%endif BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig @@ -39,13 +79,17 @@ BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdk-pixbuf-2.0) -BuildRequires: pkgconfig(gnome-doc-utils) BuildRequires: pkgconfig(gobject-introspection-1.0) +%if "%flavor" == "gtk2" BuildRequires: pkgconfig(gtk+-2.0) +%else BuildRequires: pkgconfig(gtk+-3.0) +%endif +%if %{with testtools} BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(x11) +%endif %description A small little library that was created by pulling out some common @@ -53,188 +97,186 @@ across D-Bus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. -%package tools +%package -n libdbusmenu-tools Summary: Development tools for the dbusmenu libraries Group: Development/Tools/Other -Requires: %{name}-glib%{soname_glib} = %{version} +Requires: %{libname_glib} = %{version} -%description tools +%description -n libdbusmenu-tools This packages contains the development tools for the dbusmenu libraries. -%package glib%{soname_glib} +%package -n %{libname_glib} Summary: Small library that passes a menu structure across D-Bus Group: System/Libraries -%description glib%{soname_glib} -This package contains the shared libraries for the dbusmenu-glib library. +%description -n %{libname_glib} +This package contains the shared library for the dbusmenu-glib. %package -n typelib-1_0-Dbusmenu-0_4 -Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings +Summary: Introspection bindings for %{libname_glib} Group: System/Libraries %description -n typelib-1_0-Dbusmenu-0_4 This package contains the GObject Introspection bindings for the dbusmenu library. -%package glib-devel +%package -n libdbusmenu-glib-devel Summary: Development files for libdbusmenu-glib Group: Development/Libraries/C and C++ -Requires: %{name}-glib%{soname_glib} = %{version} +Requires: %{libname_glib} = %{version} Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(gtk+-2.0) -%description glib-devel +%description -n libdbusmenu-glib-devel This package contains the development files for the dbusmenu-glib library. -%package glib-doc +%package -n libdbusmenu-glib-doc Summary: Documentation for libdbusmenu-glib%{soname_glib} Group: Documentation/HTML BuildArch: noarch -%description glib-doc +%description -n libdbusmenu-glib-doc This package includes the documentation for the dbusmenu-glib library. -%package gtk%{soname_gtk2} -Summary: Small library that passes a menu structure across D-Bus -- GTK+ 2 version +%package -n %{libname_gtk} +Summary: GTK+ %{gtkver} version of libdbusmenu Group: System/Libraries +%if "%{flavor}" == "gtk2" Requires: gtk2 +%endif -%description gtk%{soname_gtk2} -This package contains the shared libraries for the dbusmenu-gtk2 library. - -%package -n typelib-1_0-DbusmenuGtk-0_4 -Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings -Group: System/Libraries - -%description -n typelib-1_0-DbusmenuGtk-0_4 -This package contains the GObject Introspection bindings for the GTK+ 2 version -of the dbusmenu-gtk library. - -%package gtk-devel -Summary: Development files for libdbusmenu-gtk%{soname_gtk2} -Group: Development/Libraries/C and C++ -Requires: %{name}-glib-devel = %{version} -Requires: %{name}-gtk%{soname_gtk2} = %{version} -Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(gtk+-2.0) - -%description gtk-devel -This package contains the development files for the dbusmenu-gtk2 library. - -%package gtk3-%{soname_gtk3} -Summary: Small library that passes a menu structure across DBus -- GTK+ 3 version -Group: System/Libraries - -%description gtk3-%{soname_gtk3} -This package contains the shared libraries for the dbusmenu-gtk3 library. +%description -n %{libname_gtk} +This package contains GTK %{gtkver} dbusmenu shared library. -%package -n typelib-1_0-DbusmenuGtk3-0_4 -Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings +%package -n typelib-1_0-DbusmenuGtk%{?gtksuffix}-0_4 +Summary: Introspection bindings for %{libname_gtk} Group: System/Libraries -%description -n typelib-1_0-DbusmenuGtk3-0_4 -This package contains the GObject Introspection bindings for the GTK+ 3 version +%description -n typelib-1_0-DbusmenuGtk%{?gtksuffix}-0_4 +This package contains the GObject Introspection bindings for the GTK+ %{gtkver} version of the dbusmenu-gtk library. -%package gtk3-devel -Summary: Development files for libdbusmenu-gtk3-%{soname_gtk3} +%package devel +Summary: Development files for %{libname_gtk} Group: Development/Libraries/C and C++ -Requires: %{name}-glib-devel = %{version} -Requires: %{name}-gtk3-%{soname_gtk3} = %{version} +Requires: %{libname_gtk} = %{version} Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(gtk+-3.0) +Requires: pkgconfig(dbusmenu-glib-0.4) = %{version} -%description gtk3-devel -This package contains the development files for the dbusmenu-gtk3 library. +%description devel +This package contains the development files for the dbusmenu-gtk%{gtkver} library. -%package gtk-doc -Summary: Documentation for libdbusmenu-gtk%{soname_gtk2} and libdbusmenu-gtk3-%{soname_gtk3} +%package doc +Summary: Documentation for libdbusmenu - GTK 2 and GTK 3 Group: Documentation/HTML BuildArch: noarch -%description gtk-doc +%description doc This package contains the documentation for the dbusmenu-gtk2 and dbusmenu-gtk3 libraries. -%package jsonloader%{soname_jsonloader} +%package -n libdbusmenu-jsonloader%{soname_jsonloader} Summary: Small library that passes a menu structure across DBus -- Test library Group: System/Libraries -%description jsonloader%{soname_jsonloader} +%description -n libdbusmenu-jsonloader%{soname_jsonloader} This package contains the shared libraries for dbusmenu-jsonloader, a library meant for test suites. -%package jsonloader-devel +%package -n libdbusmenu-jsonloader-devel Summary: Development files for libdbusmenu-jsonloader%{soname_jsonloader} Group: Development/Libraries/C and C++ -Requires: %{name}-glib-devel = %{version} -Requires: %{name}-jsonloader%{soname_jsonloader} = %{version} +Requires: libdbusmenu-jsonloader%{soname_jsonloader} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(dbusmenu-glib-0.4) = %{version} Requires: pkgconfig(json-glib-1.0) -%description jsonloader-devel +%description -n libdbusmenu-jsonloader-devel This package contains the development files for the dbusmenu-jsonloader library. %prep -%setup -q +%setup -q -n %{sname}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build -%global _configure ../configure -NOCONFIGURE=1 gnome-autogen.sh --enable-gtk-doc -for ver in 2 3; do - mkdir build-gtk$ver - pushd build-gtk$ver - %configure \ +export CFLAGS="%{optflags} -Wno-error" +autoreconf -vfi + +%configure \ --disable-static \ - --disable-scrollkeeper \ - --enable-gtk-doc \ +%if 0%{without testtools} + --disable-dumper \ + --disable-tests \ +%endif --enable-introspection \ - --with-gtk=$ver - make %{?_smp_mflags} - popd -done + --with-gtk=%{gtkver} + +make %{?_smp_mflags} %install -for ver in 2 3; do - pushd build-gtk$ver - %make_install - popd -done +%make_install find %{buildroot} -type f -name "*.la" -delete -print +%if %{with testtools} # Put documentation in correct directory. -mkdir -p %{buildroot}%{_docdir}/%{name}-tools/ -mv -f %{buildroot}%{_datadir}/doc/%{name}/README.dbusmenu-bench \ - %{buildroot}%{_docdir}/%{name}-tools/ +mkdir -p %{buildroot}%{_docdir}/%{sname}-tools/ +mv -f %{buildroot}%{_datadir}/doc/%{sname}/README.dbusmenu-bench \ + %{buildroot}%{_docdir}/%{sname}-tools/ + +%else +# Cleanup unwanted files +rm -Rf %{buildroot}%{_datadir}/doc/%{sname}/README.dbusmenu-bench \ +rm -Rf %{buildroot}%{_datadir}/%{sname} +rm -Rf %{buildroot}%{_libexecdir}/dbusmenu-{bench,dumper,testapp} +%endif + +# Remove glib version (only package once) +%if 0%{?package_glib} # Put examples in correct documentation directory. -mkdir -p %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ -mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ - %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ - -%post glib%{soname_glib} -p /sbin/ldconfig -%postun glib%{soname_glib} -p /sbin/ldconfig -%post gtk%{soname_gtk2} -p /sbin/ldconfig -%postun gtk%{soname_gtk2} -p /sbin/ldconfig -%post gtk3-%{soname_gtk3} -p /sbin/ldconfig -%postun gtk3-%{soname_gtk3} -p /sbin/ldconfig -%post jsonloader%{soname_jsonloader} -p /sbin/ldconfig -%postun jsonloader%{soname_jsonloader} -p /sbin/ldconfig +mkdir -p %{buildroot}%{_docdir}/%{sname}-glib-devel/examples/ +mv %{buildroot}%{_datadir}/doc/%{sname}/examples/glib-server-nomenu.c \ + %{buildroot}%{_docdir}/%{sname}-glib-devel/examples/ + +%else +rm -Rf %{buildroot}%{_includedir}/libdbusmenu-glib-0.4/ +rm -Rf %{buildroot}%{_libdir}/libdbusmenu-glib.so* +rm -Rf %{buildroot}%{_libdir}/pkgconfig/dbusmenu-glib-0.4.pc +rm -Rf %{buildroot}%{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib +rm -Rf %{buildroot}%{_datadir}/gir-1.0/Dbusmenu-0.4.gir +rm -Rf %{buildroot}%{_datadir}/vala/vapi/Dbusmenu-0.4.vapi +%endif + +%if %{without docs} +# (Bundled) docs are installed even with --disable-gtk-doc +rm -Rf %{buildroot}%{_datadir}/gtk-doc +%endif + +%post -n %{libname_glib} -p /sbin/ldconfig +%postun -n %{libname_glib} -p /sbin/ldconfig +%post -n %{libname_gtk} -p /sbin/ldconfig +%postun -n %{libname_gtk} -p /sbin/ldconfig +%post -n libdbusmenu-jsonloader%{soname_jsonloader} -p /sbin/ldconfig +%postun -n libdbusmenu-jsonloader%{soname_jsonloader} -p /sbin/ldconfig -%files tools +%if %{with testtools} +%files -n libdbusmenu-tools %license COPYING* %doc NEWS %{_libexecdir}/dbusmenu-bench %{_libexecdir}/dbusmenu-dumper %{_libexecdir}/dbusmenu-testapp -%dir %{_datadir}/%{name}/ -%dir %{_datadir}/%{name}/json/ -%{_datadir}/%{name}/json/test-gtk-label.json -%doc %dir %{_docdir}/%{name}-tools/ -%doc %{_docdir}/%{name}-tools/README.dbusmenu-bench +%dir %{_datadir}/%{sname}/ +%dir %{_datadir}/%{sname}/json/ +%{_datadir}/%{sname}/json/test-gtk-label.json +%doc %dir %{_docdir}/%{sname}-tools/ +%doc %{_docdir}/%{sname}-tools/README.dbusmenu-bench +%endif -%files glib%{soname_glib} +%if 0%{?package_glib} +%files -n %{libname_glib} %license COPYING* %doc NEWS %{_libdir}/libdbusmenu-glib.so.%{soname_glib}* @@ -244,7 +286,7 @@ %doc NEWS %{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib -%files glib-devel +%files -n libdbusmenu-glib-devel %license COPYING* %doc NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ @@ -261,78 +303,55 @@ %{_datadir}/gir-1.0/Dbusmenu-0.4.gir %dir %{_datadir}/vala/vapi/ %{_datadir}/vala/vapi/Dbusmenu-0.4.vapi -%doc %dir %{_docdir}/%{name}-glib-devel/ -%doc %dir %{_docdir}/%{name}-glib-devel/examples/ -%doc %{_docdir}/%{name}-glib-devel/examples/glib-server-nomenu.c +%doc %dir %{_docdir}/%{sname}-glib-devel/examples/ +%doc %{_docdir}/%{sname}-glib-devel/examples/glib-server-nomenu.c -%files glib-doc +%files -n libdbusmenu-glib-doc %license COPYING* %doc NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-glib/ +%endif -%files gtk%{soname_gtk2} -%license COPYING* -%doc NEWS -%{_libdir}/libdbusmenu-gtk.so.%{soname_gtk2}* - -%files -n typelib-1_0-DbusmenuGtk-0_4 -%license COPYING* -%doc NEWS -%{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib - -%files gtk-devel -%license COPYING* -%doc NEWS -%dir %{_includedir}/libdbusmenu-gtk-0.4/ -%dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/ -%{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/client.h -%{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/dbusmenu-gtk.h -%{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/menu.h -%{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/menuitem.h -%{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/parser.h -%{_libdir}/pkgconfig/dbusmenu-gtk-0.4.pc -%{_libdir}/libdbusmenu-gtk.so -%{_datadir}/gir-1.0/DbusmenuGtk-0.4.gir -%dir %{_datadir}/vala/vapi/ -%{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi - -%files gtk3-%{soname_gtk3} +%files -n %{libname_gtk} %license COPYING* %doc NEWS -%{_libdir}/libdbusmenu-gtk3.so.%{soname_gtk3}* +%{_libdir}/libdbusmenu-gtk*.so.%{soname_gtk}* -%files -n typelib-1_0-DbusmenuGtk3-0_4 +%files -n typelib-1_0-DbusmenuGtk%{?gtksuffix}-0_4 %license COPYING* %doc NEWS -%{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib +%{_libdir}/girepository-1.0/DbusmenuGtk*-0.4.typelib -%files gtk3-devel +%files devel %license COPYING* %doc NEWS -%dir %{_includedir}/libdbusmenu-gtk3-0.4/ -%dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/ -%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/client.h -%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/dbusmenu-gtk.h -%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/menu.h -%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/menuitem.h -%{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/parser.h -%{_libdir}/pkgconfig/dbusmenu-gtk3-0.4.pc -%{_libdir}/libdbusmenu-gtk3.so -%{_datadir}/gir-1.0/DbusmenuGtk3-0.4.gir +%dir %{_includedir}/libdbusmenu-gtk*-0.4/ +%dir %{_includedir}/libdbusmenu-gtk*-0.4/libdbusmenu-gtk/ +%{_includedir}/libdbusmenu-gtk*-0.4/libdbusmenu-gtk/client.h +%{_includedir}/libdbusmenu-gtk*-0.4/libdbusmenu-gtk/dbusmenu-gtk.h +%{_includedir}/libdbusmenu-gtk*-0.4/libdbusmenu-gtk/menu.h +%{_includedir}/libdbusmenu-gtk*-0.4/libdbusmenu-gtk/menuitem.h +%{_includedir}/libdbusmenu-gtk*-0.4/libdbusmenu-gtk/parser.h +%{_libdir}/pkgconfig/dbusmenu-gtk*-0.4.pc +%{_libdir}/libdbusmenu-gtk*.so +%{_datadir}/gir-1.0/DbusmenuGtk*-0.4.gir %dir %{_datadir}/vala/vapi/ -%{_datadir}/vala/vapi/DbusmenuGtk3-0.4.vapi +%{_datadir}/vala/vapi/DbusmenuGtk*-0.4.vapi -%files gtk-doc +%if %{with docs} +%files doc %license COPYING* %doc NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-gtk/ +%endif -%files jsonloader%{soname_jsonloader} +%if %{with testtools} +%files -n libdbusmenu-jsonloader%{soname_jsonloader} %license COPYING* %doc NEWS %{_libdir}/libdbusmenu-jsonloader.so.%{soname_jsonloader}* -%files jsonloader-devel +%files -n libdbusmenu-jsonloader-devel %license COPYING* %doc NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ @@ -340,5 +359,6 @@ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/json-loader.h %{_libdir}/pkgconfig/dbusmenu-jsonloader-0.4.pc %{_libdir}/libdbusmenu-jsonloader.so +%endif %changelog ++++++ 0001-Fix-build-with-gtk-doc-1.32-due-to-non-existing-tree.patch ++++++ >From 903dd37fa53cb166f12c97a077e15b1e2fde4251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens(a)rwth-aachen.de> Date: Mon, 18 Nov 2019 19:07:46 +0100 Subject: [PATCH 1/3] Fix build with gtk-doc >= 1.32 due to non-existing tree_index.sgml The tree_index.sgml is no longer generated when the library does not provide any GObjects. See https://gitlab.gnome.org/GNOME/gtk-doc/issues/103 --- docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml | 4 ---- docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml index 76258e5..3909024 100644 --- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml +++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-docs.sgml @@ -18,10 +18,6 @@ <xi:include href="xml/types.xml"/> </chapter> - <chapter id="object-tree"> - <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> <index id="api-index-full"> <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> diff --git a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml index e2e3c9f..9219ea5 100644 --- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml +++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml @@ -17,10 +17,6 @@ <xi:include href="xml/parser.xml"/> </chapter> - <chapter id="object-tree"> - <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> <index id="api-index-full"> <title>API Index</title> <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include> -- 2.24.0 ++++++ 0002-genericmenuitem-Make-accelerator-text-appear-again.patch ++++++ >From 1c427472046418934192d484778839b90358876f Mon Sep 17 00:00:00 2001 From: Albert Astals Cid <aacid(a)kde.org> Date: Mon, 18 Nov 2019 19:57:06 +0100 Subject: [PATCH 2/3] genericmenuitem: Make accelerator text appear again The deprecation porting from gtk_misc_set_alignment was not done correctly in r479 (LP: #1628196) --- libdbusmenu-gtk/genericmenuitem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index fbd0416..3a362d1 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -335,8 +335,8 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label) labelw = GTK_LABEL(gtk_accel_label_new(local_label)); gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_set_halign(GTK_WIDGET(labelw), GTK_ALIGN_START); - gtk_widget_set_valign(GTK_WIDGET(labelw), GTK_ALIGN_CENTER); + gtk_label_set_xalign (labelw, 0); + gtk_label_set_yalign (labelw, 0.5); #else gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5); #endif -- 2.24.0 ++++++ 0003-Fix-HAVE_VALGRIND-AM_CONDITIONAL.patch ++++++ >From e63121874a8bc1cba73707e9a5ba5992efdd9eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens(a)rwth-aachen.de> Date: Mon, 18 Nov 2019 19:58:53 +0100 Subject: [PATCH 3/3] Fix HAVE_VALGRIND AM_CONDITIONAL The AM_CONDITIONAL should also be run with --disable-tests, otherwise HAVE_VALGRIND is undefined. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ace54d1..cbd38a6 100644 --- a/configure.ac +++ b/configure.ac @@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION [have_tests=yes] ) PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) -AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) ]) +AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) AC_SUBST(DBUSMENUTESTS_CFLAGS) AC_SUBST(DBUSMENUTESTS_LIBS) -- 2.24.0 ++++++ _multibuild ++++++ <multibuild> <package>gtk2</package> <package>gtk3</package> </multibuild>

1 0

commit libindicator for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libindicator for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libindicator (Old) and /work/SRC/openSUSE:Leap:15.2/.libindicator.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libindicator" Thu Jan 30 14:49:07 2020 rev:17 rq:753230 version:16.10.0+bzr20171205 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libindicator/libindicator.changes 2020-01-15 15:21:28.634444461 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libindicator.new.26092/libindicator.changes 2020-01-30 14:49:43.330880820 +0100 @@ -1,0 +2,7 @@ +Wed Oct 16 08:35:28 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Inject -Wno-error into CFLAGS. It's kinda ridiculous for code + that is not maintained upstream to pass -Werror by default and + then not catching up. So for now we accept warnings. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindicator.spec ++++++ --- /var/tmp/diff_new_pack.2XKoYC/_old 2020-01-30 14:49:43.650880990 +0100 +++ /var/tmp/diff_new_pack.2XKoYC/_new 2020-01-30 14:49:43.662880996 +0100 @@ -1,7 +1,7 @@ # # spec file for package libindicator # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -82,7 +82,7 @@ %patch0 -p1 %build - +export CFLAGS="%{optflags} -Wno-error" %global _configure ../configure NOCONFIGURE=1 gnome-autogen.sh for ver in 2 3; do

1 0

commit libaccounts-glib for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libaccounts-glib for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libaccounts-glib (Old) and /work/SRC/openSUSE:Leap:15.2/.libaccounts-glib.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libaccounts-glib" Thu Jan 30 14:49:04 2020 rev:17 rq:753228 version:1.24 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libaccounts-glib/libaccounts-glib.changes 2020-01-15 15:18:50.706356462 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libaccounts-glib.new.26092/libaccounts-glib.changes 2020-01-30 14:49:42.166880200 +0100 @@ -1,0 +2,18 @@ +Fri Oct 11 09:12:52 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 1.24: + * ag-tool: fix typos. + * Remove Nokia backup conf files. + * Now using the meson build system. + * Bump soname. +- Switch to source service checkout, use explicit released tag. +- Add meson BuildRequires and macros following upstreams port. +- Add pkgconfig(vapigen) BuildRequires: New dependency. +- Drop python-libaccounts subpackage, no longer built. +- Drop autoconf, automake, libtool and pkgconfig(python2) + BuildRequires: No longer needed. +- Drop _version define, not needed as we are now using source + service. +- Modernize spec, drop no longer needed tweaks and workarounds. + +------------------------------------------------------------------- Old: ---- libaccounts-glib-VERSION_1.23-8d14b10652b2fe6c25d8ad8334e2d5023d254313.tar.gz New: ---- _service libaccounts-glib-1.24.obscpio libaccounts-glib.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libaccounts-glib.spec ++++++ --- /var/tmp/diff_new_pack.DtTUR0/_old 2020-01-30 14:49:42.634880449 +0100 +++ /var/tmp/diff_new_pack.DtTUR0/_new 2020-01-30 14:49:42.634880449 +0100 @@ -1,7 +1,7 @@ # # spec file for package libaccounts-glib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,26 +12,25 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define typelib typelib-1_0-Accounts-1_0 -%define sover 0 -%define _version VERSION_1.23-8d14b10652b2fe6c25d8ad8334e2d5023d254313 +%define sover 1 + Name: libaccounts-glib -Version: 1.23 +Version: 1.24 Release: 0 Summary: Account management library for GLib Applications -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/Libraries Url: https://gitlab.com/accounts-sso/libaccounts-glib -Source: https://gitlab.com/accounts-sso/%{name}/repository/VERSION_%{version}/archi… +Source: %{name}-%{version}.tar.xz Source1: baselibs.conf -BuildRequires: autoconf >= 2.64 -BuildRequires: automake + BuildRequires: gtk-doc -BuildRequires: libtool +BuildRequires: meson BuildRequires: pkg-config BuildRequires: python3-gobject BuildRequires: pkgconfig(check) >= 0.9.4 @@ -42,9 +41,9 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.30.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pygobject-3.0) -BuildRequires: pkgconfig(python2) BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(sqlite3) >= 3.7.0 +BuildRequires: pkgconfig(vapigen) %description This package contains the shared libraries for use by applications. @@ -56,14 +55,6 @@ %description -n %{name}%{sover} This package contains the shared libraries for use by applications. -%package -n python-libaccounts -Summary: Python bindings for the Account management library -Group: Development/Languages/Python - -%description -n python-libaccounts -This package contains the python bindings for the account -management library. - %package -n python3-libaccounts Summary: Python bindings for the Account management library Group: Development/Languages/Python @@ -85,7 +76,6 @@ Group: Development/Libraries/C and C++ Requires: %{name}%{sover} = %{version} Requires: %{typelib} = %{version} -Requires: python-libaccounts = %{version} Requires: python3-libaccounts = %{version} %description devel @@ -110,57 +100,32 @@ This package contains the tools for the accounts-glib library. %prep -%setup -q -n %{name}-%{_version} +%autosetup -p1 %build -gtkdocize --copy --flavour no-tmpl -autoreconf -fi -%global _configure ../configure -for python in python2 python3; do - mkdir -p build-$python - pushd build-$python - export PYTHON=$python - %configure \ - --disable-static \ - --enable-gtk-doc - make %{?_smp_mflags} - popd -done +%meson +%meson_build %install -%make_install -C build-python2 -%make_install -C build-python3/pygobject -find %{buildroot} -type f -name "*.la" -delete -print - -# Remove a Mer specific file. -rm -f %{buildroot}%{_datadir}/backup-framework/applications/accounts.conf +%meson_install %post -n %{name}%{sover} -p /sbin/ldconfig - %postun -n %{name}%{sover} -p /sbin/ldconfig %files -n %{name}%{sover} -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS +%license COPYING +%doc NEWS README.md %{_libdir}/%{name}.so.%{sover}* %files -n %{typelib} -%defattr(-,root,root) %{_libdir}/girepository-1.0/Accounts-1.0.typelib -%files -n python-libaccounts -%defattr(-,root,root) -%{python_sitearch}/gi/overrides/ - %files -n python3-libaccounts -%defattr(-,root,root) %{python3_sitearch}/gi/overrides/ %files devel -%defattr(-,root,root) %{_includedir}/%{name}/ -%{_libdir}/%{name}/ -%{_datadir}/%{name}/ +%{_datadir}/gettext/ %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/gir-1.0/Accounts-1.0.gir @@ -169,15 +134,11 @@ %{_datadir}/vala/vapi/%{name}.* %files docs -%defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/%{name}/ %files tools -%defattr(-,root,root) %{_bindir}/ag-backup %{_bindir}/ag-tool -%{_mandir}/man1/ag-backup.1%{?ext_man} -%{_mandir}/man1/ag-tool.1%{?ext_man} %dir %{_datadir}/dbus-1/ %dir %{_datadir}/dbus-1/interfaces/ %{_datadir}/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://gitlab.com/accounts-sso/libaccounts-glib.git</param> <param name="scm">git</param> <param name="revision">refs/tags/VERSION_1.24</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">VERSION_(.*)</param> </service> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.DtTUR0/_old 2020-01-30 14:49:42.670880469 +0100 +++ /var/tmp/diff_new_pack.DtTUR0/_new 2020-01-30 14:49:42.674880471 +0100 @@ -1 +1 @@ -libaccounts-glib0 +libaccounts-glib1 ++++++ libaccounts-glib.obsinfo ++++++ name: libaccounts-glib version: 1.24 mtime: 1541155723 commit: 8948717702424ce15f4e23e5db2c8ce0799ec120

1 0

commit libsignon-glib for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libsignon-glib for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libsignon-glib (Old) and /work/SRC/openSUSE:Leap:15.2/.libsignon-glib.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsignon-glib" Thu Jan 30 14:49:03 2020 rev:17 rq:753201 version:2.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libsignon-glib/libsignon-glib.changes 2020-01-15 15:25:09.574567773 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libsignon-glib.new.26092/libsignon-glib.changes 2020-01-30 14:49:41.262879720 +0100 @@ -1,0 +2,33 @@ +Fri Oct 11 17:46:31 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to version 2.1: + * Rename `debug` option to `debugging` + * Fix racing build when using the enum header + * Add option to specify path to pygobject override directory +- Changes from version 2.0: + * Support new signond 8.60 + * New SignonSecurityContext with system and application contexts + * Add signon_list_available_mechanisms() method + * Remove a couple of obsolete methods + * Use the GTask API + * Build: switch to Meson build system + * Tests: increase code coverage +- Changes from version 1.15: + * Do not build-depend on signond + * Update to the new signond D-Bus api with application context + * Create the Vala file at build time + * Handle the case where signond objects have been unregistered + * Respect thread affinity in callbacks + * Fix a memory leak + * Tests: make tests more robust +- Switch to git checkout via source service, explict released tag. +- Add meson BuildRequires and macros following upstreams port. +- Bump sover following upstreams bumps. +- Add explicit python3-gobject-devel and pkgconfig(vapigen) + BuildRequires, new dependencies. +- Drop libtool, python-devel pkgconfig(check) and + pkgconfig(signond) BuildRequries, no longer needed. +- Modernize spec. +- Add new sub-package python3-libsignon-glib. + +------------------------------------------------------------------- Old: ---- libsignon-glib-VERSION_1.14-e90302e342bfd27bc8c9132ab9d0ea3d8723fd03.tar.bz2 New: ---- _service libsignon-glib-2.1.obscpio libsignon-glib.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsignon-glib.spec ++++++ --- /var/tmp/diff_new_pack.Y7Hn2W/_old 2020-01-30 14:49:41.622879911 +0100 +++ /var/tmp/diff_new_pack.Y7Hn2W/_new 2020-01-30 14:49:41.622879911 +0100 @@ -1,7 +1,7 @@ # # spec file for package libsignon-glib # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,41 +12,41 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define _version VERSION_1.14-e90302e342bfd27bc8c9132ab9d0ea3d8723fd03 +%define sover 2 Name: libsignon-glib -Version: 1.14 +Version: 2.1 Release: 0 Summary: Library for signond -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/Libraries -Url: https://gitlab.com/accounts-sso/libsignon-glib -Source: https://gitlab.com/accounts-sso/%{name}/repository/VERSION_%{version}/archi… +URL: https://gitlab.com/accounts-sso/libsignon-glib +Source: %{name}-%{version}.tar.xz + BuildRequires: gtk-doc -BuildRequires: libtool >= 2.2 -BuildRequires: python-devel -BuildRequires: pkgconfig(check) >= 0.9.4 +BuildRequires: meson +BuildRequires: pkgconfig +BuildRequires: python3-gobject-devel BuildRequires: pkgconfig(gio-2.0) >= 2.36 BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(gobject-2.0) >= 2.35.1 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(signond) >= 8.40 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(vapigen) %description GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service -%package -n libsignon-glib1 +%package -n libsignon-glib%{sover} Summary: Library for signond Group: System/Libraries -%description -n libsignon-glib1 +%description -n libsignon-glib%{sover} GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service @@ -55,7 +55,7 @@ %package devel Summary: Development headers for libsignon-glib Group: Development/Libraries/C and C++ -Requires: libsignon-glib1 = %{version} +Requires: libsignon-glib%{sover} = %{version} %description devel GLib-based client library for applications handling account @@ -63,11 +63,19 @@ This package provides development headers for libsignon-glib. -%package -n typelib-1_0-Signon-1_0 +%package -n python3-libsignon-glib +Summary: Python bindings for the libsignon-glib library +Group: Development/Languages/Python + +%description -n python3-libsignon-glib +This package contains the python bindings for the libsignon-glib +management library. + +%package -n typelib-1_0-Signon-2_0 Summary: Library for signond -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-Signon-1_0 +%description -n typelib-1_0-Signon-2_0 GLib-based client library for applications handling account authentication through the Online Accounts Single Sign-On service @@ -75,39 +83,40 @@ libsignon-glib library. %prep -%setup -q -n %{name}-%{_version} -NOCONFIGURE=1 ./autogen.sh +%autosetup -p1 %build -%configure -make -j1 +%meson \ + -Dtests=false \ + %{nil} +%meson_build %install -make install DESTDIR=%{buildroot} %{?_smp_mflags} -find %{buildroot}%{_libdir} -name "*.la" -delete +%meson_install -%post -n libsignon-glib1 -p /sbin/ldconfig +%post -n libsignon-glib%{sover} -p /sbin/ldconfig +%postun -n libsignon-glib%{sover} -p /sbin/ldconfig -%postun -n libsignon-glib1 -p /sbin/ldconfig - -%files -n libsignon-glib1 -%defattr(-,root,root) -%doc AUTHORS README.md NEWS COPYING -%{_libdir}/libsignon-glib.so.1 -%{_libdir}/libsignon-glib.so.1.0.0 +%files -n libsignon-glib%{sover} +%license COPYING +%doc AUTHORS README.md NEWS +%{_libdir}/libsignon-glib.so.* %files devel -%defattr(-,root,root) +%doc %{_datadir}/gtk-doc/html/ %{_includedir}/libsignon-glib %{_libdir}/libsignon-glib.so %{_libdir}/pkgconfig/libsignon-glib.pc -%{_datadir}/gir-1.0/Signon-1.0.gir +%{_datadir}/gir-1.0/Signon-2.0.gir %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/signon.vapi +%{_datadir}/vala/vapi/libsignon-glib.deps +%{_datadir}/vala/vapi/libsignon-glib.vapi + +%files -n python3-libsignon-glib +%{python3_sitearch}/gi/overrides/ -%files -n typelib-1_0-Signon-1_0 -%defattr(-,root,root) -%{_libdir}/girepository-1.0/Signon-1.0.typelib +%files -n typelib-1_0-Signon-2_0 +%{_libdir}/girepository-1.0/Signon-2.0.typelib %changelog ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://gitlab.com/accounts-sso/libsignon-glib.git</param> <param name="scm">git</param> <param name="revision">refs/tags/VERSION_2.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">VERSION_(.*)</param> </service> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ libsignon-glib.obsinfo ++++++ name: libsignon-glib version: 2.1 mtime: 1541156074 commit: 7f9f10a2e7533b74eaf027b26de48818326a1dcf

1 0

commit libdmapsharing for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libdmapsharing for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libdmapsharing (Old) and /work/SRC/openSUSE:Leap:15.2/.libdmapsharing.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdmapsharing" Thu Jan 30 14:49:00 2020 rev:12 rq:753198 version:3.9.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libdmapsharing/libdmapsharing.changes 2020-01-15 15:19:43.266385749 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libdmapsharing.new.26092/libdmapsharing.changes 2020-01-30 14:49:39.734878907 +0100 @@ -1,0 +2,30 @@ +Thu Sep 26 19:09:10 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Update to 3.9.7: + + No upstream changes/changelog/NEWS provided, please see git-log + at https://gitlab.gnome.org/GNOME/libdmapsharing +- Drop new_vala_build.patch: Fixed upstream. +- Disable build of tests, via passing --disable-tests to configure + as they currently fails to build, and it allows us to drop + pkgconfig(gtk+-2.0) BuildRequires. +- Add majorver, soname and sover defines and set them to current + values, ease future version updates that include so* changes. +- Align with what configure checks for: Add pkgconfig(glib-2.0) + and pkgconfig(gthread-2.0) BuildRequires, and drop + pkgconfig(gio-2.0) BuildRequires. +- Run spec-cleaner, modernize spec. + +------------------------------------------------------------------- +Tue Sep 10 18:48:36 UTC 2019 - Bjørn Lie <bjorn.lie(a)gmail.com> + +- Add missing pkgconfig(avahi-client) and pkgconfig(gtk+-2.0) + BuildRequires previously pulled in by avahi. + +------------------------------------------------------------------- +Fri Apr 19 06:48:39 UTC 2019 - Max Lin <mlin(a)suse.com> + +- Fix build with vala >= 0.43 + * Add new_vala_build.patch carry from + https://gitlab.gnome.org/GNOME/libdmapsharing/issues/7 + +------------------------------------------------------------------- Old: ---- libdmapsharing-2.9.38.tar.gz New: ---- libdmapsharing-3.9.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdmapsharing.spec ++++++ --- /var/tmp/diff_new_pack.Z9dyQT/_old 2020-01-30 14:49:40.146879126 +0100 +++ /var/tmp/diff_new_pack.Z9dyQT/_new 2020-01-30 14:49:40.150879128 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdmapsharing # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -13,27 +13,35 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# NOTE: When bumping these, remember to bump in baselibs too +%define majorver 4.0 +%define soname 4_0 +%define sover 3 + Name: libdmapsharing -Version: 2.9.38 +Version: 3.9.7 Release: 0 Summary: Library implementing the Digital Media Access Protocol family -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Multimedia/Other -Url: http://www.flyn.org/projects/libdmapsharing/ -Source0: http://flyn.org/projects/libdmapsharing/%{name}-%{version}.tar.gz +URL: https://www.flyn.org/projects/libdmapsharing/ +Source0: %{url}/%{name}-%{version}.tar.gz Source1: baselibs.conf -BuildRequires: pkg-config + +BuildRequires: pkgconfig BuildRequires: vala -BuildRequires: pkgconfig(avahi-glib) +BuildRequires: pkgconfig(avahi-client) >= 0.6 +BuildRequires: pkgconfig(avahi-glib) >= 0.6 BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(gio-2.0) >= 2.36 +BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(libsoup-2.4) >= 2.48.0 %description @@ -45,11 +53,11 @@ such as Apple iTunes, Apple iPhoto, and the Roku SoundBridge family to share media such as music and photos. -%package -n libdmapsharing-3_0-2 +%package -n libdmapsharing-%{soname}-%{sover} Summary: Library implementing the Digital Media Access Protocol family Group: System/Libraries -%description -n libdmapsharing-3_0-2 +%description -n libdmapsharing-%{soname}-%{sover} Libdmapsharing is a library you may use to access, share and control the playback of media content using DMAP (DAAP, DPAP & DACP). Libdmapsharing also detects audio AirPlay services; coupled with the AirPlay support @@ -61,7 +69,7 @@ %package devel Summary: Library implementing the DMAP family of protocols - Development Files Group: Development/Languages/C and C++ -Requires: libdmapsharing-3_0-2 = %{version} +Requires: libdmapsharing-%{soname}-%{sover} = %{version} %description devel Libdmapsharing is a library you may use to access, share and control the @@ -75,31 +83,31 @@ This package contains development files for libdmapsharing. %prep -%setup -q +%autosetup -p1 %build -%configure -make %{?_smp_mflags} V=1 +%configure \ + --disable-tests \ + %{nil} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print -%post -n libdmapsharing-3_0-2 -p /sbin/ldconfig - -%postun -n libdmapsharing-3_0-2 -p /sbin/ldconfig +%post -n libdmapsharing-%{soname}-%{sover} -p /sbin/ldconfig +%postun -n libdmapsharing-%{soname}-%{sover} -p /sbin/ldconfig -%files -n libdmapsharing-3_0-2 -%defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING README -%{_libdir}/libdmapsharing-3.0.so.2* +%files -n libdmapsharing-%{soname}-%{sover} +%license COPYING +%doc AUTHORS ChangeLog README +%{_libdir}/libdmapsharing-%{majorver}.so.%{sover}* %files devel -%defattr(-, root, root) -%{_datadir}/gtk-doc/html/libdmapsharing-3.0/ -%{_datadir}/vala/vapi/libdmapsharing-3.0.vapi -%{_includedir}/libdmapsharing-3.0/ -%{_libdir}/libdmapsharing-3.0.so -%{_libdir}/pkgconfig/libdmapsharing-3.0.pc +%{_datadir}/gtk-doc/html/libdmapsharing-%{majorver}/ +%{_datadir}/vala/vapi/libdmapsharing-%{majorver}.vapi +%{_includedir}/libdmapsharing-%{majorver}/ +%{_libdir}/libdmapsharing-%{majorver}.so +%{_libdir}/pkgconfig/libdmapsharing-%{majorver}.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Z9dyQT/_old 2020-01-30 14:49:40.170879139 +0100 +++ /var/tmp/diff_new_pack.Z9dyQT/_new 2020-01-30 14:49:40.170879139 +0100 @@ -1,2 +1,2 @@ -libdmapsharing-3_0-2 +libdmapsharing-4_0-3 ++++++ libdmapsharing-2.9.38.tar.gz -> libdmapsharing-3.9.7.tar.gz ++++++ ++++ 63770 lines of diff (skipped)

1 0

commit qimageblitz for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package qimageblitz for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/qimageblitz (Old) and /work/SRC/openSUSE:Leap:15.2/.qimageblitz.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qimageblitz" Thu Jan 30 14:49:01 2020 rev:12 rq:753199 version:0.0.6+svn1515099 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/qimageblitz/qimageblitz.changes 2020-01-15 15:55:06.879655381 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.qimageblitz.new.26092/qimageblitz.changes 2020-01-30 14:49:40.482879305 +0100 @@ -1,0 +2,22 @@ +Mon Oct 14 12:36:18 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Stop packaging qimageblitz4 for Tumbleweed. + +------------------------------------------------------------------- +Wed Jul 31 15:17:29 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Add patch to fix build with newer CMake: + * remove-ansi-option.patch + +------------------------------------------------------------------- +Fri May 18 09:12:01 UTC 2018 - sor.alexei(a)meowr.ru + +- Update to version 0.0.6+svn1515099 (changes since + 0.0.6+svn1368047): + * Allow building with Qt 5.11. + qt5_use_modules is no longer present in Qt 5.11. Fix build by + moving to target_link_libraries + This also adds a dependency on Qt5 Widgets (used by the test). +- Rebase qimageblitz-qt5-fix-soname.patch. + +------------------------------------------------------------------- Old: ---- qimageblitz-0.0.6+svn1368047.tar.xz New: ---- qimageblitz-0.0.6+svn1515099.tar.xz remove-ansi-option.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qimageblitz.spec ++++++ --- /var/tmp/diff_new_pack.QGpa1l/_old 2020-01-30 14:49:40.886879520 +0100 +++ /var/tmp/diff_new_pack.QGpa1l/_new 2020-01-30 14:49:40.894879524 +0100 @@ -1,7 +1,7 @@ # # spec file for package qimageblitz # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,16 +12,21 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define soname_qt4 libqimageblitz %define soname_qt5 libqimageblitz5 -%define sover_qt4 4 %define sover_qt5 1 +%if 0%{?suse_version} <= 1500 +%bcond_without qt4 +%define soname_qt4 libqimageblitz +%define sover_qt4 4 +%else +%bcond_with qt4 +%endif Name: qimageblitz -Version: 0.0.6+svn1368047 +Version: 0.0.6+svn1515099 Release: 0 Summary: Graphical effect and filter library for Qt License: BSD-2-Clause @@ -30,19 +35,24 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE qimageblitz-qt5-fix-soname.patch sor.alexei(a)meowr.ru -- Change the soname for Qt5 to fix a conflict with Qt4. Patch0: qimageblitz-qt5-fix-soname.patch +# PATCH-FIX-UPSTREAM +Patch1: remove-ansi-option.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) +%if %{with qt4} BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtGui) +%endif %description qimageblitz is a graphical effect and filter library for Qt that contains many improvements over KDE 3.x's kdefx library including bugfixes, memory and speed improvements, and MMX/SSE support. +%if %{with qt4} %package -n %{soname_qt4}%{sover_qt4} Summary: Graphical effect and filter library for Qt4 Group: System/Libraries @@ -52,6 +62,7 @@ that contains many improvements over KDE 3.x's kdefx library including bugfixes, memory and speed improvements, and MMX/SSE support. +%endif %package -n %{soname_qt5}-%{sover_qt5} Summary: Graphical effect and filter library for Qt5 @@ -63,6 +74,7 @@ including bugfixes, memory and speed improvements, and MMX/SSE support. +%if %{with qt4} %package -n %{soname_qt4}-devel Summary: Development files for libqimageblitz4 Group: Development/Libraries/C and C++ @@ -70,6 +82,7 @@ %description -n %{soname_qt4}-devel This package contains development files for libqimageblitz. +%endif %package -n %{soname_qt5}-devel Summary: Development files for libqimageblitz5 @@ -80,48 +93,69 @@ This package contains development files for libqimageblitz5. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build WORKDIR="$PWD" %define __builddir build-qt5 %cmake -DQT4_BUILD=OFF make %{?_smp_mflags} V=1 + +%if %{with qt4} cd "$WORKDIR" %define __builddir build-qt4 %cmake -DQT4_BUILD=ON make %{?_smp_mflags} V=1 +%endif %install WORKDIR="$PWD" %define __builddir build-qt5 %cmake_install + +%if %{with qt4} cd "$WORKDIR" %define __builddir build-qt4 %cmake_install +%endif +%if %{with qt4} %post -n %{soname_qt4}%{sover_qt4} -p /sbin/ldconfig %postun -n %{soname_qt4}%{sover_qt4} -p /sbin/ldconfig +%endif %post -n %{soname_qt5}-%{sover_qt5} -p /sbin/ldconfig %postun -n %{soname_qt5}-%{sover_qt5} -p /sbin/ldconfig +%if %{with qt4} %files -n %{soname_qt4}%{sover_qt4} -%doc COPYING Changelog README.* +%if 0%{?suse_version} == 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc Changelog README.* %{_libdir}/%{soname_qt4}.so.%{sover_qt4}* +%endif %files -n %{soname_qt5}-%{sover_qt5} -%doc COPYING Changelog README.* +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc Changelog README.* %{_libdir}/%{soname_qt5}.so.%{sover_qt5}* +%if %{with qt4} %files -n %{soname_qt4}-devel %{_includedir}/qimageblitz/ %{_bindir}/blitztest %{_libdir}/%{soname_qt4}.so %{_libdir}/pkgconfig/qimageblitz.pc +%endif %files -n %{soname_qt5}-devel %{_includedir}/qimageblitz5/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QGpa1l/_old 2020-01-30 14:49:40.918879536 +0100 +++ /var/tmp/diff_new_pack.QGpa1l/_new 2020-01-30 14:49:40.918879536 +0100 @@ -4,7 +4,7 @@ <param name="url">svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz</param> <param name="filename">qimageblitz</param> <param name="versionformat">0.0.6+svn%r</param> - <param name="revision">1368047</param> + <param name="revision">1515099</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ qimageblitz-0.0.6+svn1368047.tar.xz -> qimageblitz-0.0.6+svn1515099.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimageblitz-0.0.6+svn1368047/CMakeLists.txt new/qimageblitz-0.0.6+svn1515099/CMakeLists.txt --- old/qimageblitz-0.0.6+svn1368047/CMakeLists.txt 2013-10-30 00:39:56.000000000 +0100 +++ new/qimageblitz-0.0.6+svn1515099/CMakeLists.txt 2018-05-05 09:32:08.000000000 +0200 @@ -14,6 +14,7 @@ set(CMAKE_AUTOMOC ON) find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) + find_package(Qt5Widgets REQUIRED) else() find_package(Qt4 REQUIRED) # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...) @@ -43,7 +44,7 @@ # By default cmake builds the targets with full RPATH to everything in the build directory, # but then removes the RPATH when installing. # These two options below make it set the RPATH of the installed targets to all -# RPATH directories outside the current CMAKE_BINARY_DIR and also the library +# RPATH directories outside the current CMAKE_BINARY_DIR and also the library # install directory. Alex set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimageblitz-0.0.6+svn1368047/blitz/CMakeLists.txt new/qimageblitz-0.0.6+svn1515099/blitz/CMakeLists.txt --- old/qimageblitz-0.0.6+svn1368047/blitz/CMakeLists.txt 2013-10-30 00:39:56.000000000 +0100 +++ new/qimageblitz-0.0.6+svn1515099/blitz/CMakeLists.txt 2018-05-05 09:32:08.000000000 +0200 @@ -1,12 +1,12 @@ -project(blitz_lib) +project(blitz_lib) include(CheckCXXSourceCompiles) include(CheckIncludeFile) include_directories( - ${CMAKE_SOURCE_DIR} - ${blitz_lib_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${blitz_lib_BINARY_DIR} ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ) @@ -48,12 +48,12 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +endif(COMMAND cmake_policy) add_library(qimageblitz SHARED ${blitz_LIB_SRCS} ${blitz_LIB_EXTRA_SRCS}) if (Qt5Core_FOUND) - qt5_use_modules(qimageblitz Core Gui) + target_link_libraries(qimageblitz Qt5::Core Qt5::Gui) endif() target_link_libraries(qimageblitz ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) @@ -66,20 +66,20 @@ SOVERSION ${BLITZ_LIB_MAJOR_VERSION} DEFINE_SYMBOL MAKE_QIMAGEBLITZ_LIB ) -install( TARGETS qimageblitz - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} +install( TARGETS qimageblitz + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) install( FILES qimageblitz.h qimageblitz_export.h blitzcpu.h DESTINATION include/qimageblitz COMPONENT Devel ) if(NOT WIN32) configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc" - @ONLY) + @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION + ${LIB_INSTALL_DIR}/pkgconfig) endif(NOT WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimageblitz-0.0.6+svn1368047/test/CMakeLists.txt new/qimageblitz-0.0.6+svn1515099/test/CMakeLists.txt --- old/qimageblitz-0.0.6+svn1368047/test/CMakeLists.txt 2013-10-30 00:39:56.000000000 +0100 +++ new/qimageblitz-0.0.6+svn1515099/test/CMakeLists.txt 2018-05-05 09:32:08.000000000 +0200 @@ -21,12 +21,12 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +endif(COMMAND cmake_policy) add_executable(blitztest ${blitztest_SRCS}) if (Qt5Core_FOUND) - qt5_use_modules(blitztest Core Gui Widgets) + target_link_libraries(blitztest Qt5::Core Qt5::Gui Qt5::Widgets) endif() target_link_libraries(blitztest ${QT_QTCORE_LIBRARY} ++++++ qimageblitz-qt5-fix-soname.patch ++++++ --- /var/tmp/diff_new_pack.QGpa1l/_old 2020-01-30 14:49:40.970879564 +0100 +++ /var/tmp/diff_new_pack.QGpa1l/_new 2020-01-30 14:49:40.974879567 +0100 @@ -9,16 +9,16 @@ else() SET(BLITZ_LIB_MAJOR_VERSION "4") endif() -@@ -50,35 +50,36 @@ if(COMMAND cmake_policy) +@@ -50,35 +50,37 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) + endif(COMMAND cmake_policy) -add_library(qimageblitz SHARED ${blitz_LIB_SRCS} ${blitz_LIB_EXTRA_SRCS}) +add_library(qimageblitz${BLITZ_QT_SUFFIX} SHARED ${blitz_LIB_SRCS} ${blitz_LIB_EXTRA_SRCS}) if (Qt5Core_FOUND) -- qt5_use_modules(qimageblitz Core Gui) -+ qt5_use_modules(qimageblitz${BLITZ_QT_SUFFIX} Core Gui) +- target_link_libraries(qimageblitz Qt5::Core Qt5::Gui) ++ target_link_libraries(qimageblitz${BLITZ_QT_SUFFIX} Qt5::Core Qt5::Gui) endif() -target_link_libraries(qimageblitz ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) @@ -34,11 +34,11 @@ SOVERSION ${BLITZ_LIB_MAJOR_VERSION} DEFINE_SYMBOL MAKE_QIMAGEBLITZ_LIB ) --install( TARGETS qimageblitz +-install( TARGETS qimageblitz +install( TARGETS qimageblitz${BLITZ_QT_SUFFIX} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) -install( FILES qimageblitz.h qimageblitz_export.h blitzcpu.h DESTINATION include/qimageblitz COMPONENT Devel ) @@ -47,12 +47,13 @@ if(NOT WIN32) - configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc" -+ configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${BLITZ_QT_SUFFIX}.pc" - @ONLY) ++ configure_file("qimageblitz.pc.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${BLITZ_QT_SUFFIX}.pc" + @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${BLITZ_QT_SUFFIX}.pc DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig) + ${LIB_INSTALL_DIR}/pkgconfig) endif(NOT WIN32) --- a/blitz/qimageblitz.pc.cmake @@ -68,10 +69,10 @@ Cflags: -I${includedir} --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -14,10 +14,12 @@ if (Qt5Core_FOUND) - set(CMAKE_AUTOMOC ON) +@@ -15,10 +15,12 @@ if (Qt5Core_FOUND) find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) + find_package(Qt5Widgets REQUIRED) + SET(BLITZ_QT_SUFFIX "5") else() find_package(Qt4 REQUIRED) @@ -83,16 +84,17 @@ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -23,14 +23,14 @@ if(COMMAND cmake_policy) +@@ -23,14 +23,15 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) + endif(COMMAND cmake_policy) -add_executable(blitztest ${blitztest_SRCS}) +add_executable(blitztest${BLITZ_QT_SUFFIX} ${blitztest_SRCS}) if (Qt5Core_FOUND) -- qt5_use_modules(blitztest Core Gui Widgets) -+ qt5_use_modules(blitztest${BLITZ_QT_SUFFIX} Core Gui Widgets) +- target_link_libraries(blitztest Qt5::Core Qt5::Gui Qt5::Widgets) ++ target_link_libraries(blitztest${BLITZ_QT_SUFFIX} Qt5::Core Qt5::Gui ++ Qt5::Widgets qimageblitz${BLITZ_QT_SUFFIX}) endif() -target_link_libraries(blitztest ${QT_QTCORE_LIBRARY} ++++++ remove-ansi-option.patch ++++++ From: Luca Beltrame <lbeltrame(a)kde.org> Subject: Remove -ansi option It is equivalent to "-std=c++98", which breaks building as Qt relies on C++11. --- Index: qimageblitz-0.0.6+svn1515099/CMakeLists.txt =================================================================== --- qimageblitz-0.0.6+svn1515099.orig/CMakeLists.txt +++ qimageblitz-0.0.6+svn1515099/CMakeLists.txt @@ -32,7 +32,7 @@ set(LIB_INSTALL_DIR "${EXEC_INS if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common") add_definitions(-DQT_NO_EXCEPTIONS) endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) endif (CMAKE_COMPILER_IS_GNUCXX)

1 0

commit grantlee5 for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package grantlee5 for openSUSE:Leap:15.2 checked in at 2020-01-30 14:48:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/grantlee5 (Old) and /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grantlee5" Thu Jan 30 14:48:59 2020 rev:12 rq:753182 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/grantlee5/grantlee5.changes 2020-01-15 15:08:49.782018887 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.grantlee5.new.26092/grantlee5.changes 2020-01-30 14:49:39.130878586 +0100 @@ -1,0 +2,12 @@ +Wed Jul 31 14:55:56 UTC 2019 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Add patch to fix build with newer CMake: + * 0001-Remove-vestigial-ansi-flag.patch + +------------------------------------------------------------------- +Wed Apr 10 17:42:44 UTC 2019 - Christophe Giboudeaux <christophe(a)krop.fr> + +- Add fix-build-with-Qt-5.13.patch +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- 0001-Remove-vestigial-ansi-flag.patch fix-build-with-Qt-5.13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantlee5.spec ++++++ --- /var/tmp/diff_new_pack.EuO3Z1/_old 2020-01-30 14:49:39.518878792 +0100 +++ /var/tmp/diff_new_pack.EuO3Z1/_new 2020-01-30 14:49:39.518878792 +0100 @@ -1,7 +1,7 @@ # # spec file for package grantlee5 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,19 +20,23 @@ Version: 5.1.0 Release: 0 Summary: Qt string template library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries -Url: http://grantlee.org/ +URL: http://grantlee.org/ Source: http://downloads.grantlee.org/grantlee-%{version}.tar.gz Source2: baselibs.conf # PATCH-FIX-UPSTREAM includes.diff -- since upstream doesn't provide a way to install to custom directory, we cheat! Patch0: includes.diff +# PATCH-FIX-UPSTREAM fix-build-with-Qt-5.13.patch +Patch1: fix-build-with-Qt-5.13.patch +# PATCH-FIX-UPSTREAM +Patch2: 0001-Remove-vestigial-ansi-flag.patch BuildRequires: cmake >= 3.1 BuildRequires: doxygen +BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) >= 5.3 BuildRequires: pkgconfig(Qt5Gui) >= 5.3 BuildRequires: pkgconfig(Qt5Script) >= 5.3 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Grantlee is a string template engine based on the Django template system and @@ -51,49 +55,33 @@ grantlee. %prep -%setup -q -n grantlee-%{version} -%patch0 -p1 +%autosetup -p1 -n grantlee-%{version} %build -%if "%{?_lib}" == "lib64" -SUFFIX="64" -%else -SUFFIX="" -%endif -mkdir -p build -pushd build -cmake .. \ - cmake -DCMAKE_BUILD_TYPE=None \\\ - -DCMAKE_C_FLAGS="%{optflags} -DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS="%{optflags} -DNDEBUG" \\\ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \\\ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-Bsymbolic-functions" \\\ - -DCMAKE_VERBOSE_MAKEFILE=ON \\\ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\ - -DBUILD_TESTS=OFF \\\ - -DLIB_SUFFIX=$SUFFIX .. - - make %{?_smp_mflags} VERBOSE=1 -popd +%cmake \ + -DCMAKE_BUILD_TYPE=None \ + -DBUILD_TESTS=OFF + +# Still not available on all leap flavors +# %%cmake_build +%make_jobs %install -%makeinstall -C build +%cmake_install %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) -%doc AUTHORS CHANGELOG COPYING* README* +%license COPYING* +%doc AUTHORS CHANGELOG README* %{_libdir}/libGrantlee_TextDocument.so.* %{_libdir}/libGrantlee_Templates.so.* %{_libdir}/grantlee/ %files devel -%defattr(-,root,root,-) -%doc AUTHORS CHANGELOG COPYING* README* +%license COPYING* +%doc AUTHORS CHANGELOG README* %{_includedir}/grantlee5/ %{_libdir}/libGrantlee_TextDocument.so %{_libdir}/libGrantlee_Templates.so ++++++ 0001-Remove-vestigial-ansi-flag.patch ++++++ >From 9c70e731d1498a366172da7b497ea76252ad8267 Mon Sep 17 00:00:00 2001 From: Stephen Kelly <steveire(a)gmail.com> Date: Sun, 21 Jul 2019 16:00:41 +0100 Subject: [PATCH] Remove vestigial -ansi flag This causes the compiler to not operate in C++11 mode, meaning that headers such as <type_traits> issue errors. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1324566..049fa4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ endif() if (CMAKE_COMPILER_IS_GNUCXX) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-check-new -fno-common ") if (CMAKE_BUILD_TYPE MATCHES TestCocoon) # Needed on 64 bit -- 2.22.0 ++++++ fix-build-with-Qt-5.13.patch ++++++ >From 0cee029ee03ab4906c6d19b57458b5036852b0f8 Mon Sep 17 00:00:00 2001 From: Michael Pyne <mpyne(a)kde.org> Date: Tue, 18 Dec 2018 17:47:21 -0500 Subject: [PATCH] Fix build with Qt 5.13 / GCC 8.2. At this point Grantlee doesn't build for me because QList is an incomplete type. I think the compiler is right to complain, so I fix by including the appropriate header. Fixes issue #47. --- templates/lib/lexer_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/lib/lexer_p.h b/templates/lib/lexer_p.h index 275aeea..1ae451a 100644 --- a/templates/lib/lexer_p.h +++ b/templates/lib/lexer_p.h @@ -24,7 +24,7 @@ #include "textprocessingmachine_p.h" #include "token.h" -template <typename T> class QList; +#include <QList> namespace Grantlee {

1 0

commit folks for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package folks for openSUSE:Leap:15.2 checked in at 2020-01-30 14:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/folks (Old) and /work/SRC/openSUSE:Leap:15.2/.folks.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "folks" Thu Jan 30 14:48:57 2020 rev:14 rq:753148 version:0.13.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/folks/folks.changes 2020-01-15 14:55:24.201587795 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.folks.new.26092/folks.changes 2020-01-30 14:49:36.722877305 +0100 @@ -1,0 +2,46 @@ +Fri Sep 6 02:05:31 UTC 2019 - luke(a)ljones.dev + +- Disable lto in build due to lto causing segfault in Geary. + +------------------------------------------------------------------- +Wed Sep 4 10:20:18 CDT 2019 - mgorse(a)suse.com + +- Update to version 0.13.1: + + Remove libsocialweb backend. +- Changes in version 0.12.1: + + Disabled tests that were failing to be able to build a tarball. +- Changes in version 0.12.0: + + Dropped depedency on libvaladoc (we now use the binary + directly). + + Bumped minimal GLib version to 2.44. + + Folks is now being built using meson. + + The autotools build definition was dropped. + + Dropped support for building without vala. + + Migrated to the GNOME GitLab and now use a CI-backed workflow. + + Moved from intltool to gettext. + + Various fixes for warnings. + + Lots of translation updates. + + Bugs fixed: + - Bug 784544 - Fatal error building git master. + - Bug 739997 - Crash when selecting contact. + - Bug 792238 - PotentialMatch: don't rely on null-terminated + string. + - Bug 792567 - Individual.display_name: don't fallback on + persona's display_id if it equals the IID. +- Switch to meson. +- Drop intltool dependency. Depend on gettext.. +- Drop folks-tracker.2.0.patch: fixed upstream. +- Module_version is now 45. + +------------------------------------------------------------------- +Fri Jan 4 00:30:47 UTC 2019 - bjorn.lie(a)gmail.com + +- Drop post(un) handling of glib2_gsettings_schema_post(un) for + libfolks-data subpackage, no longer needed. + +------------------------------------------------------------------- +Wed Feb 28 16:25:32 UTC 2018 - dimstar(a)opensuse.org + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- Old: ---- folks-0.11.4.tar.xz folks-tracker.2.0.patch New: ---- folks-0.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ folks.spec ++++++ --- /var/tmp/diff_new_pack.fRQX77/_old 2020-01-30 14:49:37.534877737 +0100 +++ /var/tmp/diff_new_pack.fRQX77/_new 2020-01-30 14:49:37.534877737 +0100 @@ -1,7 +1,7 @@ # # spec file for package folks # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,34 +12,33 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define soversion 25 -%define module_version 43 +%define module_version 45 %define with_zeitgeist 0 Name: folks -Version: 0.11.4 +Version: 0.13.1 Release: 0 Summary: Library to create metacontacts from multiple sources -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://telepathy.freedesktop.org/wiki/Folks -Source: http://download.gnome.org/sources/folks/0.11/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM folks-tracker.2.0.patch dimstar(a)opensuse.org -- Switch to tracker version 2.0, patch not upstream-ready -Patch0: folks-tracker.2.0.patch +URL: http://telepathy.freedesktop.org/wiki/Folks +Source: https://download.gnome.org/sources/folks/0.13/%{name}-%{version}.tar.xz +BuildRequires: gettext BuildRequires: gobject-introspection-devel -BuildRequires: intltool >= 0.50.0 +BuildRequires: meson >= 0.49 BuildRequires: pkgconfig BuildRequires: readline-devel BuildRequires: vala >= 0.22.0.28 BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gee-0.8) >= 0.8.6 -BuildRequires: pkgconfig(gobject-2.0) >= 2.40.0 +BuildRequires: pkgconfig(gobject-2.0) >= 2.44.0 BuildRequires: pkgconfig(libebook-1.2) >= 3.13.90 BuildRequires: pkgconfig(libebook-contacts-1.2) >= 3.7.90 -BuildRequires: pkgconfig(libedataserver-1.2) >= 3.13.90 +BuildRequires: pkgconfig(libedataserver-1.2) >= 3.33.2 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(telepathy-glib) >= 0.19.9 BuildRequires: pkgconfig(tracker-sparql-2.0) @@ -173,48 +172,38 @@ %lang_package %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build -%configure \ - --disable-static \ - --enable-eds-backend \ - --enable-tracker-backend \ - --disable-libsocialweb-backend \ - --disable-fatal-warnings -make %{?_smp_mflags} V=1 +%define _lto_cflags %{nil} +%meson \ + -Dtracker_backend=true \ +%if %{with_zeitgeist} + -Dzeitgeist=true \ +%endif + %{nil} +%meson_build %install -%makeinstall -find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +%meson_install +find %{buildroot} -type f -name "*.la" -delete -print %find_lang folks %{?no_lang_C} %post -n libfolks%{soversion} -p /sbin/ldconfig - %postun -n libfolks%{soversion} -p /sbin/ldconfig -%post -n libfolks-data -%glib2_gsettings_schema_post - -%postun -n libfolks-data -%glib2_gsettings_schema_postun - %post -n libfolks-eds%{soversion} -p /sbin/ldconfig - %postun -n libfolks-eds%{soversion} -p /sbin/ldconfig %post -n libfolks-tracker%{soversion} -p /sbin/ldconfig - %postun -n libfolks-tracker%{soversion} -p /sbin/ldconfig %post -n libfolks-telepathy%{soversion} -p /sbin/ldconfig - %postun -n libfolks-telepathy%{soversion} -p /sbin/ldconfig %files -n libfolks%{soversion} -%defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING NEWS README +%license COPYING +%doc AUTHORS NEWS README.md %{_libdir}/libfolks.so.%{soversion}* %{_libdir}/libfolks-dummy.so.%{soversion}* %dir %{_libdir}/folks @@ -226,52 +215,41 @@ %{_libdir}/folks/%{module_version}/backends/ofono/ %files -n libfolks-data -%defattr(-,root,root) -%{_datadir}/GConf/gsettings/folks.convert %{_datadir}/glib-2.0/schemas/org.freedesktop.folks.gschema.xml %files -n typelib-1_0-Folks-0_6 -%defattr(-, root, root) %{_libdir}/girepository-1.0/Folks-0.6.typelib %{_libdir}/girepository-1.0/FolksDummy-0.6.typelib %files -n typelib-1_0-FolksEds-0_6 -%defattr(-, root, root) %{_libdir}/girepository-1.0/FolksEds-0.6.typelib %files -n typelib-1_0-FolksTracker-0_6 -%defattr(-, root, root) %{_libdir}/girepository-1.0/FolksTracker-0.6.typelib %files -n typelib-1_0-FolksTelepathy-0_6 -%defattr(-, root, root) %{_libdir}/girepository-1.0/FolksTelepathy-0.6.typelib %files -n libfolks-eds%{soversion} -%defattr(-, root, root) %{_libdir}/libfolks-eds.so.%{soversion}* %dir %{_libdir}/folks/%{module_version}/backends/eds %{_libdir}/folks/%{module_version}/backends/eds/eds.so %files -n libfolks-telepathy%{soversion} -%defattr(-, root, root) %{_libdir}/libfolks-telepathy.so.%{soversion}* %dir %{_libdir}/folks/%{module_version}/backends/telepathy %{_libdir}/folks/%{module_version}/backends/telepathy/telepathy.so %files -n libfolks-tracker%{soversion} -%defattr(-, root, root) %{_libdir}/libfolks-tracker.so.%{soversion}* %dir %{_libdir}/folks/%{module_version}/backends/tracker %{_libdir}/folks/%{module_version}/backends/tracker/tracker.so %files tools -%defattr(-, root, root) %{_bindir}/folks-import %{_bindir}/folks-inspect %files devel -%defattr(-, root, root) %{_includedir}/folks/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc ++++++ folks-0.11.4.tar.xz -> folks-0.13.1.tar.xz ++++++ ++++ 526057 lines of diff (skipped)

1 0

commit libLASi for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package libLASi for openSUSE:Leap:15.2 checked in at 2020-01-30 14:48:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/libLASi (Old) and /work/SRC/openSUSE:Leap:15.2/.libLASi.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libLASi" Thu Jan 30 14:48:58 2020 rev:17 rq:753169 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/libLASi/libLASi.changes 2020-01-15 15:18:40.206350612 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.libLASi.new.26092/libLASi.changes 2020-01-30 14:49:38.394878194 +0100 @@ -1,0 +2,10 @@ +Wed Jun 5 12:03:33 UTC 2019 - Luigi Baldoni <aloisio(a)gmx.com> + +- Update to version 1.1.3 + * See README.release for a changelog +- Added libLASi-link_gobject2.patch to fix Factory build + (boo#1158168) +- Added libLASi-do_not_build_examples.patch +- Spec cleanup + +------------------------------------------------------------------- Old: ---- libLASi-1.1.2.tar.gz New: ---- libLASi-1.1.3.tar.gz libLASi-do_not_build_examples.patch libLASi-link_gobject2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libLASi.spec ++++++ --- /var/tmp/diff_new_pack.UTcgl7/_old 2020-01-30 14:49:38.826878424 +0100 +++ /var/tmp/diff_new_pack.UTcgl7/_new 2020-01-30 14:49:38.826878424 +0100 @@ -1,7 +1,7 @@ # # spec file for package libLASi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,29 +12,33 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define sover 2 Name: libLASi -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: Library to write UTF-8 strings to Postscript stream -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Url: http://unifont.org/lasi/ +URL: http://unifont.org/lasi/ Source: http://download.sourceforge.net/lasi/%{name}-%{version}.tar.gz -BuildRequires: cmake >= 2.4.5 +# PATCH-FIX-UPSTREAM libLASi-link_gobject2.patch aloisio(a)gmx.com -- self-explanatory +Patch0: libLASi-link_gobject2.patch +# PATCH-FEATURE-OPENSUSE libLASi-do_not_build_examples.patch +Patch1: libLASi-do_not_build_examples.patch +BuildRequires: cmake >= 3.13.2 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(pango) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libLASi is a library written by Larry Siden that provides a C++ stream @@ -55,11 +59,11 @@ which require the ability to produce Postscript independent of any one application framework. -%package -n %{name}1 +%package -n %{name}%{sover} Summary: Library to write UTF-8 strings to Postscript stream Group: Development/Libraries/C and C++ -%description -n %{name}1 +%description -n %{name}%{sover} libLASi is a library written that provides a C++ stream output interface for creating Postscript documents that can contain characters from any of the scripts and symbol blocks supported in @@ -73,7 +77,7 @@ %package devel Summary: Library to write UTF-8 strings to Postscript stream Group: Development/Libraries/C and C++ -Requires: %{name}1 = %{version} +Requires: %{name}%{sover} = %{version} %description devel libLASi is a library written by Larry Siden that provides a C++ stream @@ -99,35 +103,36 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %cmake \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -Ddocdir=%{_defaultdocdir}/%{name}-%{version} make %{?_smp_mflags} %install %cmake_install - -mkdir -p %{buildroot}%{_docdir} -mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_docdir}/ - %fdupes %{buildroot}%{_docdir}/%{name}-%{version}/ -%post -n %{name}1 -p /sbin/ldconfig - -%postun -n %{name}1 -p /sbin/ldconfig +%post -n %{name}%{sover} -p /sbin/ldconfig +%postun -n %{name}%{sover} -p /sbin/ldconfig -%files -n %{name}1 -%defattr(-,root,root) -%doc AUTHORS ChangeLog.* COPYING NEWS README README.release -%{_libdir}/%{name}.so.1* +%files -n %{name}%{sover} +%if 0%{?suse_version} > 1315 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS ChangeLog.* NEWS README README.release +%{_libdir}/%{name}.so.%{sover}* %files devel -%defattr(-,root,root) %{_libdir}/%{name}.so %{_libdir}/pkgconfig/lasi.pc %{_includedir}/LASi.h %{_datadir}/lasi%{version}/ -%{_docdir}/%{name}-%{version}/ +%{_defaultdocdir}/%{name}-%{version}/ %changelog ++++++ libLASi-1.1.2.tar.gz -> libLASi-1.1.3.tar.gz ++++++ ++++ 26160 lines of diff (skipped) ++++++ libLASi-do_not_build_examples.patch ++++++ Index: libLASi-1.1.3/examples/CMakeLists.txt =================================================================== --- libLASi-1.1.3.orig/examples/CMakeLists.txt +++ libLASi-1.1.3/examples/CMakeLists.txt @@ -43,13 +43,6 @@ foreach(SRC_ROOT_NAME ${SRC_ROOT_NAME_LI list(APPEND INSTALL_LIST ${SRC_ROOT_NAME}.cpp) - add_executable(${SRC_ROOT_NAME} ${SRC_ROOT_NAME}.cpp) - target_link_libraries(${SRC_ROOT_NAME} LASi) - - add_test(${SRC_ROOT_NAME} - ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME} ${CTEST_EXAMPLES_OUTPUT_DIR}/${SRC_ROOT_NAME}.eps - ) - if(INKSCAPE_EXECUTABLE) add_custom_command( OUTPUT @@ -68,18 +61,6 @@ foreach(SRC_ROOT_NAME ${SRC_ROOT_NAME_LI ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME}.png ) else(INKSCAPE_EXECUTABLE) - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME}.eps - COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME}.eps - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME} > ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME}.eps - DEPENDS ${SRC_ROOT_NAME} - VERBATIM - ) - add_custom_target(test_${SRC_ROOT_NAME} ALL - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/${SRC_ROOT_NAME}.eps - ) endif(INKSCAPE_EXECUTABLE) endforeach(SRC_ROOT_NAME ${SRC_ROOT_NAME_LIST}) ++++++ libLASi-link_gobject2.patch ++++++ Index: libLASi-1.1.3/src/CMakeLists.txt =================================================================== --- libLASi-1.1.3.orig/src/CMakeLists.txt +++ libLASi-1.1.3/src/CMakeLists.txt @@ -36,15 +36,19 @@ stringDimensions.h util.h ) +include(FindPkgConfig) +pkg_search_module(GOBJECT2 REQUIRED gobject-2.0) + include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR} ${PANGOFT2_includedir} +${GOBJECT2_INCLUDE_DIRS} ) add_library(LASi ${LASi_LIB_SRCS} ${LASi_LIB_HDRS}) -set(libLASi_LINK_LIBRARIES ${PANGOFT2_libraries}) +set(libLASi_LINK_LIBRARIES ${PANGOFT2_libraries} ${GOBJECT2_LIBRARIES}) if(MATH_LIB) list(APPEND libLASi_LINK_LIBRARIES ${MATH_LIB})

1 0

commit poppler-data for openSUSE:Leap:15.2
by root 30 Jan '20

30 Jan '20

Hello community, here is the log from the commit of package poppler-data for openSUSE:Leap:15.2 checked in at 2020-01-30 14:48:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/poppler-data (Old) and /work/SRC/openSUSE:Leap:15.2/.poppler-data.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler-data" Thu Jan 30 14:48:57 2020 rev:12 rq:753140 version:0.4.9 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/poppler-data/poppler-data.changes 2020-01-15 15:44:38.663296107 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.poppler-data.new.26092/poppler-data.changes 2020-01-30 14:49:35.378876590 +0100 @@ -1,0 +2,12 @@ +Mon Jul 9 23:39:51 UTC 2018 - luc14n0(a)linuxmail.org + +- Fall back to use `make %{?_smp_mflags}` instead of %make_build to + fix build for Leap 42.3. + +------------------------------------------------------------------- +Thu Jul 5 13:44:52 UTC 2018 - ecsos(a)opensuse.org + +- Update to version 0.4.9: + + Update cmap and mapping resources from Adobe. + +------------------------------------------------------------------- Old: ---- poppler-data-0.4.8.tar.gz New: ---- poppler-data-0.4.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-data.spec ++++++ --- /var/tmp/diff_new_pack.6LbuDH/_old 2020-01-30 14:49:35.666876743 +0100 +++ /var/tmp/diff_new_pack.6LbuDH/_new 2020-01-30 14:49:35.670876746 +0100 @@ -1,7 +1,7 @@ # # spec file for package poppler-data # -# 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 @@ -17,10 +17,10 @@ Name: poppler-data -Version: 0.4.8 +Version: 0.4.9 Release: 0 Summary: Encoding Files for use with libpoppler -License: BSD-3-Clause AND GPL-2.0 +License: BSD-3-Clause AND GPL-2.0-only Group: System/Libraries Url: https://poppler.freedesktop.org/ Source: https://poppler.freedesktop.org/%{name}-%{version}.tar.gz @@ -37,7 +37,7 @@ %setup -q %build -%make_build prefix=%{_prefix} +make %{?_smp_mflags} prefix=%{_prefix} %install %make_install prefix=%{_prefix} ++++++ poppler-data-0.4.8.tar.gz -> poppler-data-0.4.9.tar.gz ++++++ ++++ 12857 lines of diff (skipped)

1 0