Hello community, here is the log from the commit of package libgudev for openSUSE:Factory checked in at 2019-08-23 11:03:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgudev (Old) and /work/SRC/openSUSE:Factory/.libgudev.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgudev" Fri Aug 23 11:03:27 2019 rev:7 rq:724029 version:233 Changes: -------- --- /work/SRC/openSUSE:Factory/libgudev/libgudev.changes 2018-03-07 10:28:49.199156009 +0100 +++ /work/SRC/openSUSE:Factory/.libgudev.new.7948/libgudev.changes 2019-08-23 11:03:32.538513958 +0200 @@ -1,0 +2,9 @@ +Sat Aug 3 18:38:01 UTC 2019 - Bjørn Lie <[email protected]> + +- Update to version 233: + + Require glib 2.38. + + Small documentation updates. + + Remove gnome-common build dependency. +- Use modern macros. + +------------------------------------------------------------------- Old: ---- libgudev-232.tar.xz New: ---- libgudev-233.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgudev.spec ++++++ --- /var/tmp/diff_new_pack.V11KKt/_old 2019-08-23 11:03:34.174513693 +0200 +++ /var/tmp/diff_new_pack.V11KKt/_new 2019-08-23 11:03:34.174513693 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgudev # -# 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,12 +12,12 @@ # 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/ # Name: libgudev -Version: 232 +Version: 233 Release: 0 Summary: Library that provides GObject bindings for libudev License: LGPL-2.0-or-later @@ -25,10 +25,11 @@ URL: https://wiki.gnome.org/Projects/libgudev Source0: https://download.gnome.org/sources/libgudev/%{version}/%{name}-%{version}.tar.xz Source99: baselibs.conf + BuildRequires: pkgconfig BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.30.0 -BuildRequires: pkgconfig(gobject-2.0) >= 2.30.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.38.0 +BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk-doc) >= 1.18 BuildRequires: pkgconfig(libudev) >= 199 @@ -66,14 +67,15 @@ provides GObject access to udev device information. %prep -%setup -q +%autosetup -p1 %build %configure \ --disable-static \ --disable-umockdev \ - --enable-gtk-doc -make %{?_smp_mflags} V=1 + --enable-gtk-doc \ + %{nil} +%make_build %install %make_install @@ -84,7 +86,6 @@ %files -n libgudev-1_0-0 %license COPYING - %{_libdir}/libgudev-1.0.so.* %files -n typelib-1_0-GUdev-1_0 ++++++ libgudev-232.tar.xz -> libgudev-233.tar.xz ++++++ ++++ 7771 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/NEWS new/libgudev-233/NEWS --- old/libgudev-232/NEWS 2017-09-01 01:56:08.178923471 +0200 +++ new/libgudev-233/NEWS 2019-08-03 19:03:04.418642465 +0200 @@ -1,5 +1,10 @@ libgudev - GObject bindings for libudev +CHANGES WITH 233: + * Require glib 2.38 + * Small documentation updates + * Remove gnome-common build dependency + CHANGES WITH 232: * Fix crash on plenty of architectures in the test suite * Add g_autoptr automatic clean up for libgudev objects diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/build-aux/compile new/libgudev-233/build-aux/compile --- old/libgudev-232/build-aux/compile 2017-08-31 18:01:00.568995138 +0200 +++ new/libgudev-233/build-aux/compile 2019-08-03 19:09:11.473309860 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/build-aux/missing new/libgudev-233/build-aux/missing --- old/libgudev-232/build-aux/missing 2017-08-31 18:01:00.581995156 +0200 +++ new/libgudev-233/build-aux/missing 2019-08-03 19:09:11.481309809 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/configure.ac new/libgudev-233/configure.ac --- old/libgudev-232/configure.ac 2017-08-31 18:00:16.502932574 +0200 +++ new/libgudev-233/configure.ac 2019-08-03 19:03:04.418642465 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([libgudev], - [232], + [233], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgudev], [libgudev], [http://wiki.gnome.org/Projects/libgudev]) @@ -39,7 +39,7 @@ enable_introspection=no]) PKG_CHECK_MODULES([LIBUDEV], [libudev >= 199]) -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.30.0 gobject-2.0 >= 2.30.0 gio-2.0]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.38 gobject-2.0 gio-2.0]) AC_ARG_ENABLE([umockdev], AS_HELP_STRING([--disable-umockdev], [disable umockdev tests (default: enabled)]),, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/GUdevClient.html new/libgudev-233/docs/html/GUdevClient.html --- old/libgudev-232/docs/html/GUdevClient.html 2017-09-01 01:56:35.991961398 +0200 +++ new/libgudev-233/docs/html/GUdevClient.html 2019-08-03 19:10:11.951925519 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="ref-API.html" title="API Reference"> <link rel="prev" href="ref-API.html" title="API Reference"> <link rel="next" href="GUdevDevice.html" title="GUdevDevice"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -152,7 +152,7 @@ </div> <div class="refsect1"> <a name="GUdevClient.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> <a href="https://developer.gnome.org/gobject/unstable/gobject-Enumeration-and-Flag-Types.html";>GEnum</a> +<pre class="screen"> <a href="/home/hadess/Projects/gnome-install/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">╰──</span> GUdevDeviceType <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct";>GObject</a> <span class="lineart">╰──</span> GUdevClient @@ -199,7 +199,7 @@ </colgroup> <tbody><tr> <td class="parameter_name"><p>subsystems</p></td> -<td class="parameter_description"><p> A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of subsystems to listen for uevents on, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> to not listen on uevents at all, or an empty array to listen to uevents on all subsystems. See the documentation for the <a class="link" href="GUdevClient.html#GUdevClient--subsystems" title="The “subsystems” property"><span class="type">“subsystems”</span></a> property for details on this parameter. </p></td> +<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of subsystems to listen for uevents on, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> to not listen on uevents at all, or an empty array to listen to uevents on all subsystems. See the documentation for the <a class="link" href="GUdevClient.html#GUdevClient--subsystems" title="The “subsystems” property"><span class="type">“subsystems”</span></a> property for details on this parameter. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr></tbody> </table></div> @@ -233,7 +233,7 @@ </tr> <tr> <td class="parameter_name"><p>subsystem</p></td> -<td class="parameter_description"><p> The subsystem to get devices for or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> to get all devices. </p></td> +<td class="parameter_description"><p>The subsystem to get devices for or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> to get all devices. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> </tbody> @@ -241,7 +241,7 @@ </div> <div class="refsect3"> <a name="g-udev-client-query-by-subsystem.returns"></a><h4>Returns</h4> -<p> A +<p>A list of <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> objects. The caller should free the result by using <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a> on each element in the list and then <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free";><code class="function">g_list_free()</code></a> on the list. </p> @@ -285,7 +285,7 @@ </div> <div class="refsect3"> <a name="g-udev-client-query-by-device-number.returns"></a><h4>Returns</h4> -<p> A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> +<p>A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if the device was not found. Free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -321,7 +321,7 @@ </div> <div class="refsect3"> <a name="g-udev-client-query-by-device-file.returns"></a><h4>Returns</h4> -<p> A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> +<p>A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if the device was not found. Free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -357,7 +357,7 @@ </div> <div class="refsect3"> <a name="g-udev-client-query-by-sysfs-path.returns"></a><h4>Returns</h4> -<p> A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> +<p>A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if the device was not found. Free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -400,7 +400,7 @@ </div> <div class="refsect3"> <a name="g-udev-client-query-by-subsystem-and-name.returns"></a><h4>Returns</h4> -<p> A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> +<p>A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> object or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if the device was not found. Free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> @@ -516,6 +516,11 @@ <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer";><span class="type">gpointer</span></a> user_data)</pre> <p>Emitted when <em class="parameter"><code>client</code></em> receives an uevent.</p> +<p>Note that while you'll have access to all the device's properties and attributes +for the majority of actions, only the sysfs path will be available when the device +is removed.</p> +<p>Also note that the action is an arbitrary string, controlled by device drivers. Other +values than those listed is possible, but unlikely.</p> <p>This signal is emitted in the</p> <a href="https://developer.gnome.org/glib/unstable/glib-The-Main-Event-Loop.html#g-main-context-push-thread-default";>thread-default main loop</a><p>of the thread that <em class="parameter"><code>client</code></em> was created in.</p> @@ -535,7 +540,8 @@ </tr> <tr> <td class="parameter_name"><p>action</p></td> -<td class="parameter_description"><p>The action for the uevent e.g. "add", "remove", "change", "move", etc.</p></td> +<td class="parameter_description"><p>The action for the uevent e.g. "add", "remove", "change", "move", +"online" or "offline"</p></td> <td class="parameter_annotations"> </td> </tr> <tr> @@ -556,6 +562,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/GUdevDevice.html new/libgudev-233/docs/html/GUdevDevice.html --- old/libgudev-232/docs/html/GUdevDevice.html 2017-09-01 01:56:35.992961399 +0200 +++ new/libgudev-233/docs/html/GUdevDevice.html 2019-08-03 19:10:11.953925506 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="ref-API.html" title="API Reference"> <link rel="prev" href="GUdevClient.html" title="GUdevClient"> <link rel="next" href="GUdevEnumerator.html" title="GUdevEnumerator"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -524,7 +524,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-driver.returns"></a><h4>Returns</h4> -<p> The name of the driver for <em class="parameter"><code>device</code></em> +<p>The name of the driver for <em class="parameter"><code>device</code></em> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if unknown. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p> @@ -664,7 +664,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-device-file.returns"></a><h4>Returns</h4> -<p> The device file for <em class="parameter"><code>device</code></em> +<p>The device file for <em class="parameter"><code>device</code></em> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if no device file exists. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></p> @@ -696,7 +696,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-device-file-symlinks.returns"></a><h4>Returns</h4> -<p> A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of symlinks. This array is owned by <em class="parameter"><code>device</code></em> +<p>A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of symlinks. This array is owned by <em class="parameter"><code>device</code></em> and should not be freed by the caller. </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p> </div> @@ -725,7 +725,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-parent.returns"></a><h4>Returns</h4> -<p> A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if +<p>A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if <em class="parameter"><code>device</code></em> has no parent. Free with <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a>. </p> <p><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> @@ -765,7 +765,7 @@ </tr> <tr> <td class="parameter_name"><p>devtype</p></td> -<td class="parameter_description"><p> The devtype of the parent to get or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a>. </p></td> +<td class="parameter_description"><p>The devtype of the parent to get or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a>. </p></td> <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td> </tr> </tbody> @@ -773,7 +773,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-parent-with-subsystem.returns"></a><h4>Returns</h4> -<p> A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if +<p>A <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if <em class="parameter"><code>device</code></em> has no parent with <em class="parameter"><code>subsystem</code></em> and <em class="parameter"><code>devtype</code></em> @@ -806,7 +806,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-tags.returns"></a><h4>Returns</h4> -<p> A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of tags. This array is owned by <em class="parameter"><code>device</code></em> +<p>A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of tags. This array is owned by <em class="parameter"><code>device</code></em> and should not be freed by the caller. </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p> </div> @@ -897,7 +897,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-property-keys.returns"></a><h4>Returns</h4> -<p> A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of property keys. This array is owned by <em class="parameter"><code>device</code></em> +<p>A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of property keys. This array is owned by <em class="parameter"><code>device</code></em> and should not be freed by the caller. </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p> </div> @@ -970,7 +970,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-property.returns"></a><h4>Returns</h4> -<p> The value for <em class="parameter"><code>key</code></em> +<p>The value for <em class="parameter"><code>key</code></em> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if <em class="parameter"><code>key</code></em> doesn't exist on <em class="parameter"><code>device</code></em> @@ -1210,7 +1210,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-sysfs-attr-keys.returns"></a><h4>Returns</h4> -<p> A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of sysfs attribute keys. This array is owned by <em class="parameter"><code>device</code></em> +<p>A <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> terminated string array of sysfs attribute keys. This array is owned by <em class="parameter"><code>device</code></em> and should not be freed by the caller. </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> utf8]</span></p> </div> @@ -1283,7 +1283,7 @@ </div> <div class="refsect3"> <a name="g-udev-device-get-sysfs-attr.returns"></a><h4>Returns</h4> -<p> The value of the sysfs attribute or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if +<p>The value of the sysfs attribute or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS";><code class="literal">NULL</code></a> if there is no such attribute. Do not free this string, it is owned by <em class="parameter"><code>device</code></em> . </p> @@ -1521,6 +1521,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/GUdevEnumerator.html new/libgudev-233/docs/html/GUdevEnumerator.html --- old/libgudev-232/docs/html/GUdevEnumerator.html 2017-09-01 01:56:35.990961397 +0200 +++ new/libgudev-233/docs/html/GUdevEnumerator.html 2019-08-03 19:10:11.954925500 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="ref-API.html" title="API Reference"> <link rel="prev" href="GUdevDevice.html" title="GUdevDevice"> <link rel="next" href="gudev-hierarchy.html" title="Object Hierarchy"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -240,7 +240,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-match-subsystem.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -279,7 +279,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-nomatch-subsystem.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -325,7 +325,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-match-sysfs-attr.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -371,7 +371,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-nomatch-sysfs-attr.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -416,7 +416,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-match-property.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -454,7 +454,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-match-name.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -492,7 +492,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-match-tag.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -522,7 +522,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-match-is-initialized.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -559,7 +559,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-add-sysfs-path.returns"></a><h4>Returns</h4> -<p> The passed in <em class="parameter"><code>enumerator</code></em> +<p>The passed in <em class="parameter"><code>enumerator</code></em> . </p> <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p> </div> @@ -589,7 +589,7 @@ </div> <div class="refsect3"> <a name="g-udev-enumerator-execute.returns"></a><h4>Returns</h4> -<p> A list of <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> objects. The caller should free the result by using <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a> on each element in the list and then <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free";><code class="function">g_list_free()</code></a> on the list. </p> +<p>A list of <a class="link" href="GUdevDevice.html" title="GUdevDevice"><span class="type">GUdevDevice</span></a> objects. The caller should free the result by using <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref";><code class="function">g_object_unref()</code></a> on each element in the list and then <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free";><code class="function">g_list_free()</code></a> on the list. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GUdevDevice][<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p> </div> <p class="since">Since: <a class="link" href="ix02.html#api-index-165">165</a></p> @@ -637,6 +637,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/annotation-glossary.html new/libgudev-233/docs/html/annotation-glossary.html --- old/libgudev-232/docs/html/annotation-glossary.html 2017-09-01 01:56:35.990961397 +0200 +++ new/libgudev-233/docs/html/annotation-glossary.html 2019-08-03 19:10:11.954925500 +0200 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="GUdev Reference Manual"> <link rel="up" href="index.html" title="GUdev Reference Manual"> <link rel="prev" href="api-index-deprecated.html" title="Index of deprecated API"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -45,6 +45,6 @@ <dd class="glossdef"><p>Don't free data after the code is done.</p></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/api-index-full.html new/libgudev-233/docs/html/api-index-full.html --- old/libgudev-232/docs/html/api-index-full.html 2017-09-01 01:56:35.993961401 +0200 +++ new/libgudev-233/docs/html/api-index-full.html 2019-08-03 19:10:11.955925494 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GUdev Reference Manual"> <link rel="prev" href="gudev-hierarchy.html" title="Object Hierarchy"> <link rel="next" href="ix02.html" title="Index of new symbols in 165"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -278,6 +278,6 @@ <dd></dd> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/gudev-hierarchy.html new/libgudev-233/docs/html/gudev-hierarchy.html --- old/libgudev-232/docs/html/gudev-hierarchy.html 2017-09-01 01:56:35.993961401 +0200 +++ new/libgudev-233/docs/html/gudev-hierarchy.html 2019-08-03 19:10:11.955925494 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GUdev Reference Manual"> <link rel="prev" href="GUdevEnumerator.html" title="GUdevEnumerator"> <link rel="next" href="api-index-full.html" title="API Index"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -27,11 +27,11 @@ <span class="lineart">├──</span> <a class="link" href="GUdevDevice.html" title="GUdevDevice">GUdevDevice</a> <span class="lineart">├──</span> <a class="link" href="GUdevClient.html" title="GUdevClient">GUdevClient</a> <span class="lineart">╰──</span> <a class="link" href="GUdevEnumerator.html" title="GUdevEnumerator">GUdevEnumerator</a> - <a href="https://developer.gnome.org/gobject/unstable/gobject-Enumeration-and-Flag-Types.html";>GEnum</a> + <a href="/home/hadess/Projects/gnome-install/share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html">GEnum</a> <span class="lineart">╰──</span> <a class="link" href="GUdevClient.html#GUdevDeviceType" title="enum GUdevDeviceType">GUdevDeviceType</a> </pre> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/index.html new/libgudev-233/docs/html/index.html --- old/libgudev-232/docs/html/index.html 2017-09-01 01:56:35.991961398 +0200 +++ new/libgudev-233/docs/html/index.html 2019-08-03 19:10:11.955925494 +0200 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="GUdev Reference Manual"> <link rel="next" href="ref-API.html" title="API Reference"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GUdev Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - For version 232 + For version 233 — the latest version of this documentation can be found at <a class="ulink" href="https://developer.gnome.org/libgudev"; target="_top"> @@ -45,6 +45,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/ref-API.html new/libgudev-233/docs/html/ref-API.html --- old/libgudev-232/docs/html/ref-API.html 2017-09-01 01:56:35.993961401 +0200 +++ new/libgudev-233/docs/html/ref-API.html 2019-08-03 19:10:11.956925487 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="GUdev Reference Manual"> <link rel="prev" href="index.html" title="GUdev Reference Manual"> <link rel="next" href="GUdevClient.html" title="GUdevClient"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -35,6 +35,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/html/style.css new/libgudev-233/docs/html/style.css --- old/libgudev-232/docs/html/style.css 2017-09-01 01:56:35.953961346 +0200 +++ new/libgudev-233/docs/html/style.css 2019-08-03 19:10:11.891925900 +0200 @@ -30,6 +30,10 @@ vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/docs/version.xml new/libgudev-233/docs/version.xml --- old/libgudev-232/docs/version.xml 2017-08-31 18:01:04.632000907 +0200 +++ new/libgudev-233/docs/version.xml 2019-08-03 19:09:14.422291120 +0200 @@ -1 +1 @@ -232 +233 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/gtk-doc.make new/libgudev-233/gtk-doc.make --- old/libgudev-232/gtk-doc.make 2017-08-31 18:00:49.717979732 +0200 +++ new/libgudev-233/gtk-doc.make 2019-08-03 19:09:01.367374084 +0200 @@ -1,4 +1,22 @@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. #################################### # Everything below here is generic # @@ -81,55 +99,54 @@ #### setup #### -GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file`; \ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp - #### scan #### -GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -138,14 +155,14 @@ #### xml #### -GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) -GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@) GTK_DOC_V_XML_0=@echo " DOC Building XML"; sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -153,6 +170,9 @@ sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo "<!ENTITY package \"$(PACKAGE)\">"; \ @@ -166,12 +186,12 @@ #### html #### -GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@) GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; -GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @@ -190,20 +210,17 @@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + test -f $$file && cp $$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp #### pdf #### -GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/gudev/gudevclient.c new/libgudev-233/gudev/gudevclient.c --- old/libgudev-232/gudev/gudevclient.c 2016-11-02 18:32:22.112355003 +0100 +++ new/libgudev-233/gudev/gudevclient.c 2019-08-03 18:50:04.131610546 +0200 @@ -79,7 +79,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GUdevClient, g_udev_client, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_CODE (GUdevClient, g_udev_client, G_TYPE_OBJECT, G_ADD_PRIVATE(GUdevClient)) /* ---------------------------------------------------------------------------------------------------- */ @@ -281,11 +281,19 @@ /** * GUdevClient::uevent: * @client: The #GUdevClient receiving the event. - * @action: The action for the uevent e.g. "add", "remove", "change", "move", etc. + * @action: The action for the uevent e.g. "add", "remove", "change", "move", + * "online" or "offline" * @device: Details about the #GUdevDevice the event is for. * * Emitted when @client receives an uevent. * + * Note that while you'll have access to all the device's properties and attributes + * for the majority of actions, only the sysfs path will be available when the device + * is removed. + * + * Also note that the action is an arbitrary string, controlled by device drivers. Other + * values than those listed is possible, but unlikely. + * * This signal is emitted in the * <link linkend="g-main-context-push-thread-default">thread-default main loop</link> * of the thread that @client was created in. @@ -301,16 +309,12 @@ 2, G_TYPE_STRING, G_UDEV_TYPE_DEVICE); - - g_type_class_add_private (klass, sizeof (GUdevClientPrivate)); } static void g_udev_client_init (GUdevClient *client) { - client->priv = G_TYPE_INSTANCE_GET_PRIVATE (client, - G_UDEV_TYPE_CLIENT, - GUdevClientPrivate); + client->priv = g_udev_client_get_instance_private (client); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/gudev/gudevdevice.c new/libgudev-233/gudev/gudevdevice.c --- old/libgudev-232/gudev/gudevdevice.c 2015-06-02 12:43:38.234724875 +0200 +++ new/libgudev-233/gudev/gudevdevice.c 2019-08-03 18:50:04.131610546 +0200 @@ -93,7 +93,7 @@ GHashTable *sysfs_attr_strvs; }; -G_DEFINE_TYPE (GUdevDevice, g_udev_device, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_CODE (GUdevDevice, g_udev_device, G_TYPE_OBJECT, G_ADD_PRIVATE(GUdevDevice)) static void g_udev_device_finalize (GObject *object) @@ -124,16 +124,12 @@ GObjectClass *gobject_class = (GObjectClass *) klass; gobject_class->finalize = g_udev_device_finalize; - - g_type_class_add_private (klass, sizeof (GUdevDevicePrivate)); } static void g_udev_device_init (GUdevDevice *device) { - device->priv = G_TYPE_INSTANCE_GET_PRIVATE (device, - G_UDEV_TYPE_DEVICE, - GUdevDevicePrivate); + device->priv = g_udev_device_get_instance_private (device); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/gudev/gudevenumerator.c new/libgudev-233/gudev/gudevenumerator.c --- old/libgudev-232/gudev/gudevenumerator.c 2016-11-02 18:32:22.112355003 +0100 +++ new/libgudev-233/gudev/gudevenumerator.c 2019-08-03 18:50:04.132610539 +0200 @@ -50,7 +50,7 @@ PROP_CLIENT, }; -G_DEFINE_TYPE (GUdevEnumerator, g_udev_enumerator, G_TYPE_OBJECT) +G_DEFINE_TYPE_WITH_CODE (GUdevEnumerator, g_udev_enumerator, G_TYPE_OBJECT, G_ADD_PRIVATE(GUdevEnumerator)) /* ---------------------------------------------------------------------------------------------------- */ @@ -155,16 +155,12 @@ G_UDEV_TYPE_CLIENT, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); - - g_type_class_add_private (klass, sizeof (GUdevEnumeratorPrivate)); } static void g_udev_enumerator_init (GUdevEnumerator *enumerator) { - enumerator->priv = G_TYPE_INSTANCE_GET_PRIVATE (enumerator, - G_UDEV_TYPE_ENUMERATOR, - GUdevEnumeratorPrivate); + enumerator->priv = g_udev_enumerator_get_instance_private (enumerator); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/gudev/gudevenumtypes.h new/libgudev-233/gudev/gudevenumtypes.h --- old/libgudev-232/gudev/gudevenumtypes.h 2017-08-31 17:25:58.355108968 +0200 +++ new/libgudev-233/gudev/gudevenumtypes.h 2019-08-03 19:09:14.626289824 +0200 @@ -1,5 +1,5 @@ -/* Generated data (by glib-mkenums) */ +/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */ #ifndef __GUDEV_ENUM_TYPES_H__ #define __GUDEV_ENUM_TYPES_H__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/m4/gtk-doc.m4 new/libgudev-233/m4/gtk-doc.m4 --- old/libgudev-232/m4/gtk-doc.m4 2017-08-31 18:00:49.714979728 +0200 +++ new/libgudev-233/m4/gtk-doc.m4 2019-08-03 19:09:01.364374103 +0200 @@ -1,4 +1,29 @@ -dnl -*- mode: autoconf -*- +# -*- mode: autoconf -*- +# +# gtk-doc.m4 - configure macro to check for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the above copyright owner gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf when processing the Macro. You need not +# follow the terms of the GNU General Public License when using or +# distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. # serial 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/m4/introspection.m4 new/libgudev-233/m4/introspection.m4 --- old/libgudev-232/m4/introspection.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/libgudev-233/m4/introspection.m4 2019-08-03 19:05:37.501669633 +0200 @@ -0,0 +1,96 @@ +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/m4/pkg.m4 new/libgudev-233/m4/pkg.m4 --- old/libgudev-232/m4/pkg.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/libgudev-233/m4/pkg.m4 2019-08-03 19:05:37.496669664 +0200 @@ -0,0 +1,343 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 11 (pkg-config-0.29.1) + +dnl Copyright © 2004 Scott James Remnant <[email protected]>. +dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.1]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + +dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------ +dnl +dnl Prepare a "--with-" configure option using the lowercase +dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and +dnl PKG_CHECK_MODULES in a single macro. +AC_DEFUN([PKG_WITH_MODULES], +[ +m4_pushdef([with_arg], m4_tolower([$1])) + +m4_pushdef([description], + [m4_default([$5], [build with ]with_arg[ support])]) + +m4_pushdef([def_arg], [m4_default([$6], [auto])]) +m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) +m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) + +m4_case(def_arg, + [yes],[m4_pushdef([with_without], [--without-]with_arg)], + [m4_pushdef([with_without],[--with-]with_arg)]) + +AC_ARG_WITH(with_arg, + AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, + [AS_TR_SH([with_]with_arg)=def_arg]) + +AS_CASE([$AS_TR_SH([with_]with_arg)], + [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], + [auto],[PKG_CHECK_MODULES([$1],[$2], + [m4_n([def_action_if_found]) $3], + [m4_n([def_action_if_not_found]) $4])]) + +m4_popdef([with_arg]) +m4_popdef([description]) +m4_popdef([def_arg]) + +])dnl PKG_WITH_MODULES + +dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ----------------------------------------------- +dnl +dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES +dnl check._[VARIABLE-PREFIX] is exported as make variable. +AC_DEFUN([PKG_HAVE_WITH_MODULES], +[ +PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) + +AM_CONDITIONAL([HAVE_][$1], + [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) +])dnl PKG_HAVE_WITH_MODULES + +dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, +dnl [DESCRIPTION], [DEFAULT]) +dnl ------------------------------------------------------ +dnl +dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after +dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make +dnl and preprocessor variable. +AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], +[ +PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) + +AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], + [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) +])dnl PKG_HAVE_DEFINE_WITH_MODULES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libgudev-232/tests/test-enumerator-filter.c new/libgudev-233/tests/test-enumerator-filter.c --- old/libgudev-232/tests/test-enumerator-filter.c 2017-02-20 16:17:45.107705986 +0100 +++ new/libgudev-233/tests/test-enumerator-filter.c 2019-08-03 18:50:04.132610539 +0200 @@ -37,6 +37,9 @@ /* create test bed */ UMockdevTestbed *testbed = umockdev_testbed_new (); + /* Relies on a test bed having been set up */ + g_assert (umockdev_in_mock_environment ()); + /* Add 2 devices in the USB subsystem, and one in the DRM subsystem */ umockdev_testbed_add_device (testbed, "usb", "dev1", NULL, "idVendor", "0815", "idProduct", "AFFE", NULL, @@ -74,8 +77,6 @@ setlocale (LC_ALL, NULL); g_test_init (&argc, &argv, NULL); - g_assert (umockdev_in_mock_environment ()); - g_test_add_func ("/gudev/enumerator_filter", test_enumerator_filter); return g_test_run ();
