diff --git a/glib-2.52.3.tar.xz b/glib-2.52.3.tar.xz deleted file mode 100644 index e5acff4..0000000 --- a/glib-2.52.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25ee7635a7c0fcd4ec91cbc3ae07c7f8f5ce621d8183511f414ded09e7e4e128 -size 7679972 diff --git a/glib-2.53.6.tar.xz b/glib-2.53.6.tar.xz new file mode 100644 index 0000000..bbe4cc5 --- /dev/null +++ b/glib-2.53.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e01296a9119c09d2dccb37ad09f5eaa1e0c5570a473d8fed04fc759ace6fb6cc +size 7805744 diff --git a/glib2-suppress-schema-deprecated-path-warning.patch b/glib2-suppress-schema-deprecated-path-warning.patch index 334ba03..fca3c95 100644 --- a/glib2-suppress-schema-deprecated-path-warning.patch +++ b/glib2-suppress-schema-deprecated-path-warning.patch @@ -1,20 +1,20 @@ -Index: glib-2.32.3/gio/glib-compile-schemas.c +Index: glib-2.53.5/gio/glib-compile-schemas.c =================================================================== ---- glib-2.32.3.orig/gio/glib-compile-schemas.c -+++ glib-2.32.3/gio/glib-compile-schemas.c -@@ -1204,12 +1204,14 @@ parse_state_start_schema (ParseState *s +--- glib-2.53.5.orig/gio/glib-compile-schemas.c ++++ glib-2.53.5/gio/glib-compile-schemas.c +@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState *s return; } -+/* ++/* if (path && (g_str_has_prefix (path, "/apps/") || g_str_has_prefix (path, "/desktop/") || g_str_has_prefix (path, "/system/"))) - g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " - "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); -- +@@ -1231,6 +1232,7 @@ parse_state_start_schema (ParseState *s + g_printerr ("%s\n", message); + g_free (message); + } +*/ -+ + state->schema_state = schema_state_new (path, gettext_domain, extends, extends_name, list_of); - diff --git a/glib2.changes b/glib2.changes index 35b065f..e7e2c2d 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,110 @@ +------------------------------------------------------------------- +Wed Aug 30 08:31:30 UTC 2017 - dimstar@opensuse.org + +- Ignore errors in postun of gio-fam: when uninstalling the entire + glib stack, we can end up with the -tools package no longer being + functional. As nothing will read the cache, we can accept that. + +------------------------------------------------------------------- +Sat Aug 19 17:04:05 UTC 2017 - zaitor@opensuse.org + +- Update to version 2.53.6: + + Bugs fixed: bgo#766358, bgo#783270, bgo#785955, bgo#786060, + bgo#786360, bgo#786452, bgo#786460, bgo#786462, bgo#786463. + + Updated translations. + +------------------------------------------------------------------- +Mon Aug 7 19:38:25 UTC 2017 - zaitor@opensuse.org + +- Update to version 2.53.5: + + Bugs fixed: bgo#695573, bgo#725950, bgo#731703, bgo#769135, + bgo#779332, bgo#779607, bgo#784000, bgo#784815, bgo#784965, + bgo#784995, bgo#785113, bgo#785130, bgo#785438, bgo#785468, + bgo#785520, bgo#785577. + + Updated translations. +- Rebase glib2-suppress-schema-deprecated-path-warning.patch. + +------------------------------------------------------------------- +Tue Jul 18 08:36:20 UTC 2017 - zaitor@opensuse.org + +- Update to version 2.53.4: + + Unicode support has been updated to Unicode 10.0.0. + + glib-genmarshal and glib-mkenums have been rewritten in python. + Every effort has been made to keep compatibility. Please report + problems related to these tools. + + GLib can now be built with meson. Autotools are still + supported. + + Bugs fixed: bgo#722047, bgo#733821, bgo#773842, bgo#779332, + bgo#780095, bgo#780634, bgo#783841, bgo#784000, bgo#784020, + bgo#784037, bgo#784433, bgo#784456, bgo#784528, bgo#784579, + bgo#784581, bgo#784739, bgo#784792. + + Updated translations. + +------------------------------------------------------------------- +Wed Jun 28 08:36:16 UTC 2017 - dimstar@opensuse.org + +- Update to version 2.53.3: + + Bugs fixed: bgo#658446, bgo#661926, bgo#674885, bgo#775593, + bgo#776169, bgo#776333, bgo#776504, bgo#777307, bgo#778422, + bgo#781301, bgo#782336, bgo#782996, bgo#783061, bgo#783130, + bgo#783193, bgo#783201, bgo#783340, bgo#783350, bgo#783392, + bgo#783593. + + Updated translations. + +------------------------------------------------------------------- +Wed Jun 28 02:53:03 UTC 2017 - zaitor@opensuse.org + +- Update to version 2.53.2: + + A few new number parsing functions have been added. These have + better error handling than the existing ones. + + glib-mkenums now supports /*< private >*/ and /*< public >*/. + + GSettings now consider XDG_DATA_HOME in addition to + XDG_DATA_DIRS. + + Bugs fixed: bgo#674885, bgo#698064, bgo#732000, bgo#734946, + bgo#741335, bgo#748263, bgo#776876, bgo#777030, bgo#780300, + bgo#780309, bgo#781755, bgo#781826, bgo#781830, bgo#781847, + bgo#781867, bgo#782068, bgo#782075, bgo#782089, bgo#782162, + bgo#782237, bgo#782311, bgo#782628. + + Updated translations. + +------------------------------------------------------------------- +Wed Jun 28 02:53:02 UTC 2017 - dimstar@opensuse.org + +- Add file triggers to libgio-2_0-0: whenever a package installs a + schema file to /usr/share/glib-2.0/schemas, the trigger will + automaticlaly fire, making it no longer a problem for packagers + to forget doing it. +- Require glib2-tools by libgio-2_0-0: it contains the tools for + the file trigger. Historically, every package installing schemas + already had to require the -tools package in order to be + functional. +- Change the macros %glib2_gsettings_schema_{requires,post,postun} + to be no-op fuctions. The macros are no longer needed with the + file trigger. Removing the macro would break a big number of + packages though. + +------------------------------------------------------------------- +Wed Jun 28 02:53:01 UTC 2017 - zaitor@opensuse.org + +- Update to version 2.53.1: + + The gdbus tool gained a wait command. + + g_unix_signal_source_new support SIGWINCH now. + + There are now g_enum_to_string and g_flags_to_string functions. + + A new function to instantiate objects: + g_objet_new_with_properties. + + Parameter and related APIs have been deprecated. + + Bugs fixed: bgo#447907, bgo#668962, bgo#669355, bgo#674885, + bgo#698064, bgo#709865, bgo#725894, bgo#734946, bgo#741229, + bgo#745971, bgo#755046, bgo#761102, bgo#761889, bgo#766660, + bgo#769534, bgo#772221, bgo#775879, bgo#776169, bgo#777961, + bgo#778049, bgo#778207, bgo#780066, bgo#780095, bgo#780306, + bgo#780310, bgo#780384, bgo#780441, bgo#780634, bgo#780908, + bgo#780924. + + Updated translations. +- Drop + glib2-gmain-only-signal-GWakeup-right-before-or-during-a-b.patch: + fixed upstream. + ------------------------------------------------------------------- Thu Jun 22 23:41:17 UTC 2017 - zaitor@opensuse.org diff --git a/glib2.spec b/glib2.spec index 458cdc4..d1cc2ee 100644 --- a/glib2.spec +++ b/glib2.spec @@ -17,17 +17,16 @@ %define with_systemtap 0 - -Name: glib2 %define _name glib -Version: 2.52.3 +Name: glib2 +Version: 2.53.6 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+ Group: System/Libraries Url: http://www.gtk.org/ -Source: http://download.gnome.org/sources/glib/2.52/%{_name}-%{version}.tar.xz +Source: https://download.gnome.org/sources/glib/2.53/%{_name}-%{version}.tar.xz Source1: glib2.sh Source2: glib2.csh # Not upstream file. Only proposes upstream packages: @@ -61,30 +60,29 @@ BuildRequires: libmount-devel BuildRequires: libselinux-devel # glib/Makefile.am calls config.status, and thus triggers a bootstrap BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: python-base # gdbus-codegen is run during the build, so we need python-xml BuildRequires: python-xml -%if 0%{?with_systemtap} -# systemtap-sdt-devel on openSUSE 11.3 was missing a Requires: python. -%if %{?suse_version} <= 1130 -BuildRequires: python -%endif -BuildRequires: systemtap-sdt-devel -%endif -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif BuildRequires: xsltproc # Needed for gresource BuildRequires: pkgconfig(libelf) >= 0.8.12 BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(libpcre) >= 8.13 BuildRequires: pkgconfig(zlib) +PreReq: /bin/sed # For temporary %%posttrans script only. PreReq: coreutils -PreReq: /bin/sed -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%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 +%endif +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description GLib is a general-purpose utility library, which provides many useful @@ -104,11 +102,11 @@ a main loop abstraction, and so on. Summary: Upstream definitions of default settings and applications Group: System/Libraries Requires: libgio-2_0-0 = %{version} +Supplements: packageand(libgio-2_0-0:branding-upstream) +Conflicts: otherproviders(gio-branding) Provides: %{name}-branding-upstream = %{version} Obsoletes: %{name}-branding-upstream < %{version} Provides: gio-branding = %{version} -Conflicts: otherproviders(gio-branding) -Supplements: packageand(libgio-2_0-0:branding-upstream) BuildArch: noarch #BRAND: The /etc/gnome_defaults.conf allows to define arbitrary #BRAND: applications as preferred defaults. @@ -126,22 +124,22 @@ This package provides upstream defaults for settings stored with GSettings and applications used by the MIME system. %package devel -Requires: glibc-devel -Requires: pkg-config +Summary: General-Purpose Utility Library -- Development Files # Now require the subpackages too +Group: Development/Libraries/C and C++ Requires: glib2-tools = %{version} +Requires: glibc-devel Requires: libgio-2_0-0 = %{version} Requires: libglib-2_0-0 = %{version} Requires: libgmodule-2_0-0 = %{version} Requires: libgobject-2_0-0 = %{version} Requires: libgthread-2_0-0 = %{version} +Requires: pkgconfig # Required by gdbus-codegen Requires: python-xml Provides: glib2-doc = 2.19.6 Obsoletes: glib2-doc < 2.19.6 -Summary: General-Purpose Utility Library -- Development Files # bug437293 -Group: Development/Libraries/C and C++ %ifarch ppc64 Obsoletes: glib2-devel-64bit %endif @@ -155,9 +153,9 @@ a main loop abstraction, and so on. This package contains the development files for GLib. %package devel-static -Requires: %{name}-devel = %{version} Summary: General-Purpose Utility Library -- Static Libraries Group: Development/Libraries/C and C++ +Requires: %{name}-devel = %{version} %description devel-static GLib is a general-purpose utility library, which provides many useful @@ -197,14 +195,14 @@ object files (commonly known as 'plug-ins'). %package -n libgio-2_0-0 Summary: General-Purpose Utility Library -- Library for VFS +# The tools are useful for people having libgio 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 -# bnc#678518: libgio interacts with others by means of dbus-launch -Requires: dbus-launch -# The tools are useful for people having libgio -Recommends: %{name}-tools # Needed for branding packages Provides: gio = %{version} # Temporarily disable this, pending further discussion @@ -256,6 +254,7 @@ a main loop abstraction, and so on. The GObject library provides an object-oriented framework for C. %lang_package + %prep %setup -q -n %{_name}-%{version} %if !0%{?is_opensuse} @@ -266,10 +265,10 @@ translation-update-upstream %patch13 -p1 %patch14 -p1 %patch16 -p1 -cp -a %{S:1} %{S:2} %{S:5} . -cp -a %{S:4} gnome_defaults.conf +cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . +cp -a %{SOURCE4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then - cp -a %{S:7} m4macros/ + cp -a %{SOURCE7} m4macros/ fi %build @@ -286,7 +285,7 @@ autoreconf -fi %endif --with-pcre=system -%{__make} %{?_smp_mflags} V=1 +make %{?_smp_mflags} V=1 %check # make check does not work on x86_64. See http://bugzilla.gnome.org/show_bug.cgi?id=554969 @@ -295,7 +294,7 @@ autoreconf -fi %install %makeinstall %if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* +rm %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* %endif %find_lang %{_name}20 %{?no_lang_C} mkdir -p %{buildroot}%{_sysconfdir}/profile.d @@ -320,10 +319,10 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print rm %{buildroot}%{_libdir}/gio/modules/libgiofam.a # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{S:6} %{buildroot}%{_sysconfdir}/rpm +cp %{SOURCE6} %{buildroot}%{_sysconfdir}/rpm # Install zsh completion for gsettings mkdir -p %{buildroot}%{_datadir}/zsh/site-functions/ -cp %{S:8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings +cp %{SOURCE8} %{buildroot}%{_datadir}/zsh/site-functions/_gsettings %fdupes %{buildroot} %posttrans @@ -340,6 +339,12 @@ if test -f etc/gnome_defaults.conf.rpmsave ; then 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 + +%filetriggerpostun -n glib2-tools -- %{_datadir}/glib-2.0/schemas +%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas + %post -n libglib-2_0-0 -p /sbin/ldconfig %post -n libgobject-2_0-0 -p /sbin/ldconfig @@ -379,9 +384,9 @@ fi ############################################################################### %endif %if "%{_lib}" == "lib64" - %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules + [ -x %{_bindir}/gio-querymodules-64 ] && %{_bindir}/gio-querymodules-64 %{_libdir}/gio/modules || : %else - %{_bindir}/gio-querymodules %{_libdir}/gio/modules + [ -x %{_bindir}/gio-querymodules ] && %{_bindir}/gio-querymodules %{_libdir}/gio/modules || : %endif %files tools @@ -468,14 +473,14 @@ fi %{_bindir}/gobject-query %{_bindir}/gtester %{_bindir}/gtester-report -%doc %{_mandir}/man?/gdbus-codegen.* -%doc %{_mandir}/man?/glib-compile-resources.* -%doc %{_mandir}/man?/glib-genmarshal.* -%doc %{_mandir}/man?/glib-gettextize.* -%doc %{_mandir}/man?/glib-mkenums.* -%doc %{_mandir}/man?/gobject-query.* -%doc %{_mandir}/man?/gtester.* -%doc %{_mandir}/man?/gtester-report.* +%{_mandir}/man?/gdbus-codegen.* +%{_mandir}/man?/glib-compile-resources.* +%{_mandir}/man?/glib-genmarshal.* +%{_mandir}/man?/glib-gettextize.* +%{_mandir}/man?/glib-mkenums.* +%{_mandir}/man?/gobject-query.* +%{_mandir}/man?/gtester.* +%{_mandir}/man?/gtester-report.* %dir %{_datadir}/aclocal %{_datadir}/aclocal/glib-2.0.m4 %{_datadir}/aclocal/glib-gettext.m4 diff --git a/macros.glib2 b/macros.glib2 index 6bde5f4..8462a44 100644 --- a/macros.glib2 +++ b/macros.glib2 @@ -27,17 +27,13 @@ ### %glib2_gsettings_schema_requires \ -Requires(post): glib2-tools \ -Requires(postun): glib2-tools +%nil %glib2_gsettings_schema_post \ -%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas +%nil -# Note: we ignore upgrades (already handled in %post of the new package). %glib2_gsettings_schema_postun \ -if [ $1 -eq 0 ]; then \ - %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas \ -fi +%nil %glib2_gio_module_requires \ Requires(post): glib2-tools \