update to glib-2.62.5
This commit is contained in:
parent
6f0ea7a6c2
commit
c7ae384539
31
fix-accidentally-delete-temp-file-within-dtrace.patch
Normal file
31
fix-accidentally-delete-temp-file-within-dtrace.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From c89133504b600c653d56e56648764e49f5f127cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: hexiujun <hexiujun1@huawei.com>
|
||||||
|
Date: Mon, 2 Mar 2020 10:49:04 +0800
|
||||||
|
Subject: [PATCH] fix accidentally delete temp file within dtrace
|
||||||
|
|
||||||
|
---
|
||||||
|
meson.build | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/meson.build b/meson.build
|
||||||
|
index d1551bd..4e56f06 100644
|
||||||
|
--- a/meson.build
|
||||||
|
+++ b/meson.build
|
||||||
|
@@ -2066,12 +2066,12 @@ if want_dtrace
|
||||||
|
# FIXME: autotools build also passes -fPIC -DPIC but is it needed in this case?
|
||||||
|
dtrace_obj_gen = generator(dtrace,
|
||||||
|
output : '@BASENAME@.o',
|
||||||
|
- arguments : ['-G', '-s', '@INPUT@', '-o', '@OUTPUT@'])
|
||||||
|
+ arguments : ['-G', '-k', '-s', '@INPUT@', '-o', '@OUTPUT@'])
|
||||||
|
# FIXME: $(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES,"
|
||||||
|
# -e "s,define _SDT_HAS_SEMAPHORES 1,undef _SDT_HAS_SEMAPHORES,"
|
||||||
|
dtrace_hdr_gen = generator(dtrace,
|
||||||
|
output : '@BASENAME@.h',
|
||||||
|
- arguments : ['-h', '-s', '@INPUT@', '-o', '@OUTPUT@'])
|
||||||
|
+ arguments : ['-h', '-k', '-s', '@INPUT@', '-o', '@OUTPUT@'])
|
||||||
|
glib_conf.set('HAVE_DTRACE', 1)
|
||||||
|
enable_dtrace = true
|
||||||
|
endif
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
Binary file not shown.
BIN
glib-2.62.5.tar.xz
Normal file
BIN
glib-2.62.5.tar.xz
Normal file
Binary file not shown.
30
glib2.spec
30
glib2.spec
@ -1,11 +1,13 @@
|
|||||||
Name: glib2
|
Name: glib2
|
||||||
Version: 2.62.1
|
Version: 2.62.5
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: The core library that forms the basis for projects such as GTK+ and GNOME
|
Summary: The core library that forms the basis for projects such as GTK+ and GNOME
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
Source0: http://download.gnome.org/sources/glib/2.62/glib-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/glib/2.62/glib-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch9001: fix-accidentally-delete-temp-file-within-dtrace.patch
|
||||||
|
|
||||||
BuildRequires: chrpath gcc gcc-c++ gettext gtk-doc perl-interpreter
|
BuildRequires: chrpath gcc gcc-c++ gettext gtk-doc perl-interpreter
|
||||||
BUildRequires: glibc-devel libattr-devel libselinux-devel meson
|
BUildRequires: glibc-devel libattr-devel libselinux-devel meson
|
||||||
BuildRequires: systemtap-sdt-devel pkgconfig(libelf) pkgconfig(libffi)
|
BuildRequires: systemtap-sdt-devel pkgconfig(libelf) pkgconfig(libffi)
|
||||||
@ -56,6 +58,8 @@ rm glib/pcre/*.[ch]
|
|||||||
|
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
|
find . -name *.dtrace-temp.c -exec rm -f {} \;
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%meson_install
|
%meson_install
|
||||||
touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py
|
touch -r gio/gdbus-2.0/codegen/config.py.in %{buildroot}%{_datadir}/glib-2.0/codegen/*.py
|
||||||
@ -111,6 +115,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
|||||||
%{_libdir}/*.a
|
%{_libdir}/*.a
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
%{_libexecdir}/installed-tests
|
%{_libexecdir}/installed-tests
|
||||||
|
%exclude %{_libexecdir}/installed-tests/glib/cert-tests
|
||||||
|
%exclude %{_libexecdir}/installed-tests/glib/tls-certificate
|
||||||
|
|
||||||
%{_datadir}/aclocal/*
|
%{_datadir}/aclocal/*
|
||||||
%{_datadir}/glib-2.0/*
|
%{_datadir}/glib-2.0/*
|
||||||
@ -119,6 +125,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
|||||||
%{_datadir}/gettext/
|
%{_datadir}/gettext/
|
||||||
%{_datadir}/systemtap/
|
%{_datadir}/systemtap/
|
||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
%exclude %{_datadir}/installed-tests/glib/tls-certificate.test
|
||||||
|
|
||||||
%{_bindir}/glib-genmarshal
|
%{_bindir}/glib-genmarshal
|
||||||
%{_bindir}/glib-gettextize
|
%{_bindir}/glib-gettextize
|
||||||
@ -136,6 +143,27 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
|||||||
%doc %{_datadir}/gtk-doc/html/*
|
%doc %{_datadir}/gtk-doc/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 21 2020 hanhui<hanhui15@huawei.com> - 2.62.5-1
|
||||||
|
- Update to 2.62.5
|
||||||
|
|
||||||
|
* Mon Mar 2 2020 hexiujun<hexiujun1@huawei.com> - 2.62.1-4
|
||||||
|
- Type:bugfix
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix accidentally delete temp file within dtrace
|
||||||
|
|
||||||
|
* Fri Feb 28 2020 zhangrui <zhangrui182@huawei.com> - 2.62.1-3
|
||||||
|
- Type:bugfix
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:remove dist in spec
|
||||||
|
|
||||||
|
* Mon Feb 24 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.62.1-2
|
||||||
|
- Type:bugfix
|
||||||
|
- Id:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:exclude some unnecessary files
|
||||||
|
|
||||||
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.62.1-1
|
* Thu Jan 9 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.62.1-1
|
||||||
- update to 2.62.1
|
- update to 2.62.1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user