Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2018-10-17 08:17:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Wed Oct 17 08:17:50 2018 rev:200 rq:638697 version:2.58.1 Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2018-08-22 14:25:16.467050820 +0200 +++ /work/SRC/openSUSE:Factory/.glib2.new/glib2.changes 2018-10-17 08:17:56.858953230 +0200 @@ -1,0 +2,94 @@ +Wed Sep 26 19:03:50 UTC 2018 - [email protected] + +- Update to version 2.58.1: + + Fix to a regression in listing GIcon fallbacks. + + Changes to pkg-config paths to helper programs when building + with autotools: paths are now absolute with reference to the + .pc file’s ${prefix}. + + Fix installation path of glib-gettextize helper on Meson. + + Fix autostarting xdg-desktop-portal. + + Various fixes to the network monitor. + + Various compilation fixes on macOS (generally older versions + and older compilers). + + Bugs fixed: glgo#GNOME/glib!318, glgo#GNOME/glib#1513, + glgo#GNOME/glib#1521, glgo#GNOME/glib!321, + glgo#GNOME/glib#1518, glgo#GNOME/glib#1509, + glgo#GNOME/glib!288, glgo#GNOME/glib!298, glgo#GNOME/glib!295, + glgo#GNOME/glib!294, glgo#GNOME/glib!290, glgo#GNOME/glib#1488, + glgo#GNOME/glib#1506. + + Updated translations. + +------------------------------------------------------------------- +Wed Sep 5 03:19:49 UTC 2018 - [email protected] + +- Update to version 2.58.0: + + Fix cancellation of g_subprocess_communicate_async() calls + (glgo#GNOME/glib!266. + + Expose GSettings schema directory in gio-2.0.pc as `schemasdir` + (glgo#GNOME/glib!274). + + Support v3 of the xdg-desktop-portal network monitor API + (glgo#GNOME/glib!265, glgo#GNOME/glib!279). + + Bugs fixed: glgo#GNOME/glib!266, glgo#GNOME/glib!279, + glgo#GNOME/glib!265, glgo#GNOME/glib!274, glgo#GNOME/glib!239. + + Updated translations. +- Set URL tag to https://wiki.gnome.org/Projects/GLib: Glib's wiki + page. +- Conditionalize meson use while disabling it: use of Meson is + still not recommended by upstream, plus openQA is having failures + where Glib seems to be the one to blame. + +------------------------------------------------------------------- +Sat Aug 25 00:37:54 UTC 2018 - [email protected] + +- Update to 2.57.3: + + No visible changes for the user. +- Add: + + meson BuildRequires and replace configure/make/make_install + with meson/meson_build/meson_install macros to follow upstream + build system port to Meson. + + gtk-doc and m4 BuildRequires while dropping gtk-doc.m4: now + there is no pre-built API documentation so gtk-doc and m4 + packages are build requirements now. +- Drop automake and libtool BuildRequires and autoreconf call: they + are no longer needed after switching to Meson build system. + +------------------------------------------------------------------- +Fri Aug 24 10:26:15 UTC 2018 - [email protected] + +- BuildIgnore shared-mime-info: we don't need this while building + glib2. + +------------------------------------------------------------------- +Mon Aug 21 02:57:02 UTC 2018 - [email protected] + +- Update to version 2.57.2: + + Require pcre 8.31 and meson 0.47.0. + + Bugs fixed: bgo#742456, bgo#795569, bgo#796341, + glgo#GNOME/glib#786, glgo#GNOME/glib#903, glgo#GNOME/glib#927, + glgo#GNOME/glib#976, glgo#GNOME/glib#1013, + glgo#GNOME/glib#1175, glgo#GNOME/glib#1360, + glgo#GNOME/glib#1447, glgo#GNOME/glib#1407, + glgo#GNOME/glib#1455, glgo#GNOME/glib#1459. + + Updated translations. +- Drop glib2-gsettings-overrides-per-session.patch: fixed upstream. + +------------------------------------------------------------------- +Mon Aug 21 02:57:01 UTC 2018 - [email protected] + +- Update to version 2.57.1: + + New API: g_hash_table_steal_extended and G_GNUC_NO_INLINE. + + Bugs fixed: bgo#668132, bgo#736741, bgo#748620, bgo#784995, + bgo#788771, bgo#788773, bgo#789968, bgo#794325, bgo#795152, + bgo#795165, bgo#795180, bgo#795302, bgo#795376, bgo#795544, + bgo#795735, bgo#795802, bgo#795960, bgo#796138, bgo#796139, + bgo#796164, bgo#796186, bgo#796328. + + Updated translations. +- Drop: + + Posttrans section, and sed and coreutils PreReq aimed at + pristine openSUSE releases <= 10.3. + + Conditionalized python BuildRequires aimed at pristine openSUSE + releases <= 1130. +- Enable building of systemtap tracing support to improve Glib + problems diagnosability. + +------------------------------------------------------------------- Old: ---- glib-2.56.2.tar.xz glib2-gsettings-overrides-per-session.patch gtk-doc.m4 New: ---- glib-2.58.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.UlMVX7/_old 2018-10-17 08:17:57.450952965 +0200 +++ /var/tmp/diff_new_pack.UlMVX7/_new 2018-10-17 08:17:57.454952963 +0200 @@ -12,21 +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 with_systemtap 0 -%define _name glib +# Meson is still not recommended by upstream and openQA has having many +# suspicious failures that seems to point to Glib. +%bcond_with meson Name: glib2 -Version: 2.56.2 +Version: 2.58.1 Release: 0 -# FIXME: find out if tapsets should really be in devel package or in main package Summary: General-Purpose Utility Library License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -URL: http://www.gtk.org/ -Source: http://download.gnome.org/sources/glib/2.56/%{_name}-%{version}.tar.xz +URL: https://wiki.gnome.org/Projects/GLib +Source: http://download.gnome.org/sources/glib/2.58/glib-%{version}.tar.xz Source1: glib2.sh Source2: glib2.csh # Not upstream file. Only proposes upstream packages: @@ -34,57 +34,45 @@ # Some documentation for people writing branding packages, shipped in the branding-upstream package Source5: README.Gsettings-overrides Source6: macros.glib2 -# Not depending on gtk-doc shortens bootstrap compilation path. -# Please update this file from the latest gtk-doc package: -Source7: gtk-doc.m4 # zsh completion from https://github.com/jmatsuzawa/zsh-comp-gsettings Source8: gsettings.zsh Source98: glib2-rpmlintrc Source99: baselibs.conf # PATCH-FEATURE-UPSTREAM glib2-bgo569829-gettext-gkeyfile.patch fate300461 bgo569829 [email protected] -- Look for translation of desktop entry strings via gettext, part that we share with Ubuntu and try to push upstream -Patch10: glib2-bgo569829-gettext-gkeyfile.patch +Patch0: glib2-bgo569829-gettext-gkeyfile.patch # PATCH-FEATURE-OPENSUSE glib2-fate300461-gettext-gkeyfile-suse.patch fate300461 [email protected] -- Look for translation of desktop entry strings via gettext, part that deals with the openSUSE specific infrastructure (with desktop_translations) -Patch11: glib2-fate300461-gettext-gkeyfile-suse.patch +Patch1: glib2-fate300461-gettext-gkeyfile-suse.patch # PATCH-FIX-OPENSUSE glib2-suppress-schema-deprecated-path-warning.patch rh#814053 [email protected] -- Suppress the deprecated path warning since it fills up screen unnecessarily during package installations/upgrade. -Patch13: glib2-suppress-schema-deprecated-path-warning.patch +Patch2: glib2-suppress-schema-deprecated-path-warning.patch # PATCH-FIX-OPENSUSE glib2-dbus-socket-path.patch bnc#845287 [email protected] -- Have gio look for the system dbus socket in /run instead of /var/run. -Patch14: glib2-dbus-socket-path.patch +Patch3: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch [email protected] -- Remove version string from files generated by gdbus-codegen -Patch16: glib2-gdbus-codegen-version.patch -# PATCH-FIX-UPSTREAM glib2-gsettings-overrides-per-session.patch bgo#746592 bsc#1070090 [email protected] -- gsettings default value can be overridden depending on session -Patch18: glib2-gsettings-overrides-per-session.patch - -BuildRequires: automake +Patch4: glib2-gdbus-codegen-version.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: gamin-devel BuildRequires: gcc-c++ +BuildRequires: gtk-doc BuildRequires: libselinux-devel -# glib/Makefile.am calls config.status, and thus triggers a bootstrap -BuildRequires: libtool +BuildRequires: m4 BuildRequires: pkgconfig BuildRequires: python3-base -# gdbus-codegen is run during the build, so we need python-xml +# gdbus-codegen is run during the build, so we need python3-xml BuildRequires: python3-xml BuildRequires: translation-update-upstream BuildRequires: xsltproc # Needed for gresource BuildRequires: pkgconfig(libelf) >= 0.8.12 BuildRequires: pkgconfig(libffi) >= 3.0.0 -BuildRequires: pkgconfig(libpcre) >= 8.13 +BuildRequires: pkgconfig(libpcre) >= 8.31 BuildRequires: pkgconfig(mount) >= 2.28 BuildRequires: pkgconfig(zlib) -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: /bin/sed -# For temporary %%posttrans script only. -PreReq: coreutils -%if 0%{?with_systemtap} -BuildRequires: systemtap-sdt-devel -# systemtap-sdt-devel on openSUSE 11.3 was missing a Requires: python. -%if %{?suse_version} <= 1130 -BuildRequires: python -%endif +%if %{with meson} +BuildRequires: meson +%else +BuildRequires: libtool %endif +BuildRequires: systemtap-sdt-devel %description GLib is a general-purpose utility library, which provides many useful @@ -190,12 +178,13 @@ %package -n libgio-2_0-0 Summary: A virtual file system library API # The tools are useful for people having libgio +# bnc#555605: shared-mime-info is required by libgio to properly detect mime types, but not during build +#!BuildIgnore: shared-mime-info Group: System/Libraries Requires: %{name}-tools # bnc#678518: libgio interacts with others by means of dbus-launch Requires: dbus-launch Requires: gio-branding = %{version} -# bnc#555605: shared-mime-info is required by libgio to properly detect mime types. Requires: shared-mime-info # Needed for branding packages Provides: gio = %{version} @@ -250,49 +239,62 @@ %lang_package %prep -%setup -q -n %{_name}-%{version} +%setup -q -n glib-%{version} translation-update-upstream -%patch10 -p1 -%patch11 -p1 -%patch13 -p1 -%patch14 -p1 -%patch16 -p1 -%patch18 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf -if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then - cp -a %{SOURCE7} m4macros/ -fi +%if !%{with meson} +cp %{_datadir}/gtk-doc/data/gtk-doc.make . +%endif # replace /usr/bin/env shebangs -# /usr/bin/env @PYTHON@ -> @PYTHON@ (will be replaced by correct py interpreter by configure -grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|@PYTHON@|g" +# /usr/bin/env @PYTHON@ -> /usr/bin/python3 +grep "%{_bindir}/env @PYTHON@" . -rl | xargs sed -i "s|%{_bindir}/env @PYTHON@|%{_bindir}/python3|g" %build -# glib/Makefile.am always calls config.status, which requires aclocal -# in a matching version. Regenerate it now because we likely won't have -# the version of aclocal that was originally used. +%if %{with meson} +%meson \ + --default-library=both \ + -Dselinux=true \ + -Dman=true \ + -Dgtk_doc=true \ + -Dfam=true \ + -Dsystemtap=true \ + -Ddtrace=true \ + -Dinternal_pcre=false +%meson_build + +%check +%meson_test +%else autoreconf -fi %configure \ --enable-static \ --enable-selinux \ + --enable-gtk-doc \ --enable-man \ --with-python=%{_bindir}/python3 \ -%if 0%{?with_systemtap} --enable-systemtap \ -%endif --with-pcre=system %make_build - -%check -# make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969 -# %%{__make} %%{?_smp_mflags} check +%endif %install +%if %{with meson} +%meson_install +%else %make_install +find %{buildroot} -type f -name "*.la" -delete -print +rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a +%endif %if 0%{?suse_version} <= 1120 rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif -%find_lang %{_name}20 %{?no_lang_C} +%find_lang glib20 %{?no_lang_C} mkdir -p %{buildroot}%{_sysconfdir}/profile.d install -D -m0644 glib2.sh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.sh install -D -m0644 glib2.csh %{buildroot}%{_sysconfdir}/profile.d/zzz-glib2.csh @@ -307,12 +309,10 @@ %if "%{_lib}" == "lib64" mv %{buildroot}%{_bindir}/gio-querymodules %{buildroot}%{_bindir}/gio-querymodules-64 %endif +mkdir -p %{buildroot}%{_libdir}/gio/modules touch %{buildroot}%{_libdir}/gio/modules/giomodule.cache # gsettings magic touch %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled -# remove files we don't care about -find %{buildroot} -type f -name "*.la" -delete -print -rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm cp %{SOURCE6} %{buildroot}%{_sysconfdir}/rpm @@ -321,20 +321,6 @@ cp %{SOURCE8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings %fdupes %{buildroot}/%{_prefix} -%posttrans -# If it is an upgrade and gnome_defaults.conf were edited, -# move it from its old location. (Upgrade from <= 10.2) -if test -f etc/opt/gnome/gnome_defaults.conf.rpmsave ; then - mv etc/gnome_defaults.conf etc/gnome_defaults.conf.rpmnew - sed "s:etc/opt/gnome:etc:g;s:opt/gnome:usr:g" <etc/opt/gnome/gnome_defaults.conf.rpmsave >etc/gnome_defaults.conf -fi -# If it is an upgrade and gnome_defaults.conf were edited, -# revive it from the RPM backup. (Upgrade from == 10.3) -if test -f etc/gnome_defaults.conf.rpmsave ; then - mv etc/gnome_defaults.conf etc/gnome_defaults.conf.rpmnew - mv etc/gnome_defaults.conf.rpmsave etc/gnome_defaults.conf -fi - %filetriggerin -n glib2-tools -- %{_datadir}/glib-2.0/schemas %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas @@ -389,6 +375,7 @@ %{_bindir}/gapplication %{_bindir}/gdbus %{_bindir}/gio +%{_bindir}/gio-launch-desktop %{_bindir}/gio-querymodules* %{_bindir}/glib-compile-schemas %{_bindir}/gresource @@ -397,6 +384,7 @@ %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/gapplication %{_datadir}/bash-completion/completions/gdbus +%{_datadir}/bash-completion/completions/gio %{_datadir}/bash-completion/completions/gresource %{_datadir}/bash-completion/completions/gsettings %dir %{_datadir}/zsh @@ -449,10 +437,8 @@ %files -n libgio-fam %{_libdir}/gio/modules/libgiofam.so -%files lang -f %{_name}20.lang - %files devel -%doc ChangeLog +%doc HACKING README.rationale %{_bindir}/gdbus-codegen %{_bindir}/glib-compile-resources %{_bindir}/glib-genmarshal @@ -468,7 +454,6 @@ %{_mandir}/man?/glib-mkenums*%{ext_man} %{_mandir}/man?/gobject-query*%{ext_man} %{_mandir}/man?/gtester*%{ext_man} -%{_mandir}/man?/gtester-report*%{ext_man} %dir %{_datadir}/aclocal %{_datadir}/aclocal/glib-2.0.m4 %{_datadir}/aclocal/glib-gettext.m4 @@ -491,14 +476,16 @@ %{_datadir}/gtk-doc/html/glib %{_datadir}/gtk-doc/html/gobject %{_datadir}/gdb/auto-load/%{_libdir}/*-gdb.py -%if 0%{?with_systemtap} -%{_datadir}/systemtap/tapset/*.stp -%endif +%dir %{_datadir}/systemtap/tapset/* +%{_datadir}/systemtap/tapset/*/libgio-*.so.*.stp +%{_datadir}/systemtap/tapset/*/libglib-*.so.*.stp +%{_datadir}/systemtap/tapset/*/libgobject-*.so.*.stp %{_sysconfdir}/rpm/macros.glib2 -# Own these directories to not depend on gtk-doc while building: +# Own these directories to not avoid breakages throughout the project %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -# Own these directories to not depend on gdb +# Own these directories to avoid build requirement on gdb +# only for directories ownership %dir %{_datadir}/gdb %dir %{_datadir}/gdb/auto-load %dir %{_datadir}/gdb/auto-load%{_prefix} @@ -507,4 +494,6 @@ %files devel-static %{_libdir}/lib*.a +%files lang -f glib20.lang + %changelog ++++++ glib-2.56.2.tar.xz -> glib-2.58.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/glib2/glib-2.56.2.tar.xz /work/SRC/openSUSE:Factory/.glib2.new/glib-2.58.1.tar.xz differ: char 25, line 1 ++++++ glib2-gdbus-codegen-version.patch ++++++ --- /var/tmp/diff_new_pack.UlMVX7/_old 2018-10-17 08:17:57.538952926 +0200 +++ /var/tmp/diff_new_pack.UlMVX7/_new 2018-10-17 08:17:57.538952926 +0200 @@ -6,25 +6,27 @@ from .utils import print_error LICENSE_STR = '''/* -- * Generated by gdbus-codegen {!s}. DO NOT EDIT. +- * Generated by gdbus-codegen {!s} from {!s}. DO NOT EDIT. + * Generated by gdbus-codegen. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. -@@ -65,7 +65,7 @@ class HeaderCodeGenerator: +@@ -67,8 +67,7 @@ class HeaderCodeGenerator: # ---------------------------------------------------------------------------------------------------- def generate_header_preamble(self): -- self.outfile.write(LICENSE_STR.format(config.VERSION)) +- basenames = ', '.join(self.input_files_basenames) +- self.outfile.write(LICENSE_STR.format(config.VERSION, basenames)) + self.outfile.write(LICENSE_STR) self.outfile.write('\n') if self.use_pragma: -@@ -623,7 +623,7 @@ class CodeGenerator: +@@ -627,8 +626,7 @@ class CodeGenerator: # ---------------------------------------------------------------------------------------------------- def generate_body_preamble(self): -- self.outfile.write(LICENSE_STR.format(config.VERSION)) +- basenames = ', '.join(self.input_files_basenames) +- self.outfile.write(LICENSE_STR.format(config.VERSION, basenames)) + self.outfile.write(LICENSE_STR) self.outfile.write('\n') self.outfile.write('#ifdef HAVE_CONFIG_H\n'
