Skip to content

Commit

Permalink
[glib2] Update to 2.56.1. Contributes to JB#41420
Browse files Browse the repository at this point in the history
- drop syslog patch, glib supports structured logging now
- mtab patch could have been applied, but the rationale for inclusion
in the first place is not available with this git repo. Just omitted in
hope of getting rid of it. Upstream by default already moved to libmount,
but that seems to have problems  with Tracker. Enabling commit
(496cd8aac6402) does state that it returns slightly different results,
namely with bind mounts.
  • Loading branch information
pvuorela committed May 11, 2018
1 parent b2859db commit 748f954
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 238 deletions.
@@ -1,5 +1,5 @@
diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
index 981f703..48ea9fd 100644
index b54d1fd6e..9cc2c1ad8 100644
--- a/gio/gunixvolume.c
+++ b/gio/gunixvolume.c
@@ -110,7 +110,8 @@ _g_unix_volume_new (GVolumeMonitor *volume_monitor,
Expand Down
4 changes: 2 additions & 2 deletions rpm/glib-replace-some-criticals-with-warnings.patch
@@ -1,8 +1,8 @@
diff --git a/glib/gmain.c b/glib/gmain.c
index 29ccee0..79e4fa6 100644
index 227168a0f..850638735 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2281,7 +2281,7 @@ g_source_remove (guint tag)
@@ -2349,7 +2349,7 @@ g_source_remove (guint tag)
if (source)
g_source_destroy (source);
else
Expand Down
194 changes: 0 additions & 194 deletions rpm/glib-syslog-message-handler.patch

This file was deleted.

35 changes: 8 additions & 27 deletions rpm/glib2.spec
Expand Up @@ -3,7 +3,7 @@ Name: glib2
%define keepstatic 1

Summary: A library of handy utility functions
Version: 2.48.0
Version: 2.56.1
Release: 1
Group: System/Libraries
License: LGPLv2+
Expand All @@ -12,10 +12,8 @@ Source0: %{name}-%{version}.tar.xz
Source2: glib2.sh
Source3: glib2.csh
Source4: %{name}-rpmlintrc
Patch1: glib-syslog-message-handler.patch
Patch2: 0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch
Patch3: use-mtab-instead-of-fstab.patch
Patch4: glib-replace-some-criticals-with-warnings.patch
Patch1: 0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch
Patch2: glib-replace-some-criticals-with-warnings.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
BuildRequires: pkgconfig(libpcre)
Expand Down Expand Up @@ -61,29 +59,23 @@ version 2 of the GLib library.
%prep
%setup -q -n %{name}-%{version}/upstream

# glib-syslog-message-handler.patch
%patch1 -p1
# 0001-Add-dev-mmcblk-to-the-list-of-devices-to-be-detected.patch
%patch2 -p1
# use-mtab-instead-of-fstab.patch
%patch3 -p1
%patch1 -p1
# glib-replace-some-criticals-with-warnings.patch
%patch4 -p1
%patch2 -p1

%build
# >> build pre
#
# First, build glib enabled for generating the Profile Guided Optimization
# metadata
#
# << build pre
%autogen \
--enable-static \
--with-pcre=system
--with-pcre=system \
--disable-libmount

make %{?_smp_mflags}

# >> build post
cd tests/gobject

#
Expand All @@ -98,15 +90,11 @@ rm `find -name "*.o"`
# And now compile again, using the generated profile data
#
make %{?_smp_mflags} CFLAGS="$CFLAGS -fprofile-use"
# << build post

%install
rm -rf %{buildroot}
# >> install pre
# << install pre
%make_install

# >> install post
## glib2.sh and glib2.csh
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
Expand All @@ -126,15 +114,13 @@ mv glib20.lang glib2.lang
%docs_package

%lang_package
# << install post

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
# >> files
%doc COPYING
%{_libdir}/libglib-2.0.so.*
%{_libdir}/libgthread-2.0.so.*
Expand All @@ -151,19 +137,16 @@ mv glib20.lang glib2.lang
%{_bindir}/glib-compile-resources
%{_bindir}/gresource
%{_bindir}/gapplication
%{_bindir}/gio
%{_datarootdir}/gettext/its
# << files

%files static
%defattr(-,root,root,-)
# >> files static
%defattr(-, root, root, -)
%{_libdir}/lib*.a
# << files static

%files devel
%defattr(-,root,root,-)
# >> files devel
%defattr(-, root, root, -)
%{_libdir}/lib*.so
%{_libdir}/glib-2.0
Expand All @@ -178,6 +161,4 @@ mv glib20.lang glib2.lang
%{_bindir}/gobject-query
%{_bindir}/gtester
%{_bindir}/gdbus-codegen
%{_datadir}/glib-2.0/codegen
%attr (0755, root, root) %{_bindir}/gtester-report
# << files devel
13 changes: 0 additions & 13 deletions rpm/use-mtab-instead-of-fstab.patch

This file was deleted.

2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from f384d2 to d0364b

0 comments on commit 748f954

Please sign in to comment.