[packages/glib2] - updated to 2.80.0; now contains gi files moved from gobject-introspection, so conflicts with g-i <
qboosh
qboosh at pld-linux.org
Sat Mar 9 22:37:00 CET 2024
commit 14cd5c6ac5629090e390d624a6872615d5a14516
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Mar 9 22:34:26 2024 +0100
- updated to 2.80.0; now contains gi files moved from gobject-introspection, so conflicts with g-i < 1.79
glib2-python_shebang.patch | 10 +++----
glib2.spec | 69 +++++++++++++++++++++++++++++++---------------
gtk-doc-build.patch | 33 ----------------------
3 files changed, 52 insertions(+), 60 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index d11077d..c7060e6 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -2,7 +2,7 @@
# - use -Dmultiarch for arch-dependent binaries? (like gio-querymodules or gio-launch-desktop)
#
# Conditional build:
-%bcond_without apidocs # gtk-doc based API documentation
+%bcond_without apidocs # gi-docgen based API documentation
%bcond_without static_libs # static library
%bcond_without selinux # SELinux support in gio
%bcond_with sysprof # sysprof tracing support
@@ -21,15 +21,14 @@ Summary(pt_BR.UTF-8): Conjunto de funções gráficas utilitárias
Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı
Summary(zh_CN.UTF-8): 实用工具函数库
Name: glib2
-Version: 2.78.4
+Version: 2.80.0
Release: 1
Epoch: 1
License: LGPL v2+
Group: Libraries
-Source0: https://download.gnome.org/sources/glib/2.78/glib-%{version}.tar.xz
-# Source0-md5: 0781e889cab64f1f7dbb6e8357c6a95f
+Source0: https://download.gnome.org/sources/glib/2.80/glib-%{version}.tar.xz
+# Source0-md5: 3a51e2803ecd22c2dadcd07d9475ebe3
Patch0: %{name}-python_shebang.patch
-Patch1: gtk-doc-build.patch
URL: https://www.gtk.org/
BuildRequires: automake
BuildRequires: docbook-dtd412-xml
@@ -45,7 +44,7 @@ BuildRequires: libmount-devel >= 2.28
%{?with_selinux:BuildRequires: libselinux-devel >= 2.2}
BuildRequires: libstdc++-devel
BuildRequires: libxslt-progs
-BuildRequires: meson >= 0.60.0
+BuildRequires: meson >= 1.2.0
BuildRequires: ninja >= 1.5
BuildRequires: pcre2-8-devel >= 10.32
BuildRequires: perl-base
@@ -53,12 +52,13 @@ BuildRequires: pkgconfig >= 1:0.16
# in case of separate libelf (elfutils don't provide .pc file)
#BuildRequires: pkgconfig(libelf) >= 0.8.12
BuildRequires: pkgconfig(libffi) >= 3.0.0
-BuildRequires: python3 >= 1:3.5
-BuildRequires: python3-modules >= 1:3.5
+BuildRequires: python3 >= 1:3.7
+BuildRequires: python3-modules >= 1:3.7
+BuildRequires: python3-packaging
BuildRequires: rpm-build >= 4.6
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.752
+BuildRequires: rpmbuild(macros) >= 2.029
BuildRequires: sed >= 4.0
%{?with_sysprof:BuildRequires: sysprof-devel >= 3.38.0}
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
@@ -67,7 +67,7 @@ BuildRequires: xz
BuildRequires: zlib-devel
%if %{with apidocs}
BuildRequires: docutils >= 0.13.1
-BuildRequires: gtk-doc >= 1.32.1
+BuildRequires: gi-docgen >= 2023.1
%endif
Requires: iconv
Requires: libmount >= 2.28
@@ -76,6 +76,7 @@ Requires: pcre2-8 >= 10.32
Suggests: gvfs
Provides: glib2-libs
Obsoletes: glib2-libs < 1:2.12.11-3
+Conflicts: gobject-introspection < 1.79
# see https://bugzilla.xfce.org/show_bug.cgi?id=9709
Conflicts: xfce4-session < 4.10.0-5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -137,10 +138,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: libffi-devel >= 3.0.0
Requires: libmount-devel >= 2.28
Requires: pcre2-8-devel >= 10.32
-Requires: python3-modules >= 1:3.5
+Requires: python3-modules >= 1:3.7
# gio only
%{?with_selinux:Requires: libselinux-devel >= 2.2}
Requires: zlib-devel
+Conflicts: gobject-introspection-devel < 1.79
%description devel
Header files for the support library for the GIMP's X libraries, which
@@ -186,7 +188,6 @@ Bibliotecas estáticas para desenvolvimento com GLib.
Summary: GLib API documetation
Summary(pl.UTF-8): Dokumentacja API GLib
Group: Documentation
-Requires: gtk-doc-common
BuildArch: noarch
%description apidocs
@@ -241,7 +242,6 @@ Sondy systemtap/dtrace dla GLib 2.
%prep
%setup -q -n glib-%{version}
%patch0 -p1
-%patch1 -p1
%build
%meson build \
@@ -251,10 +251,10 @@ Sondy systemtap/dtrace dla GLib 2.
%ifarch %{ix86}
%{?with_systemtap:-Dtapset_install_dir=%{_datadir}/systemtap/tapset/i386} \
%endif
- -Dgtk_doc=%{__true_false apidocs} \
+ -Ddocumentation=%{__true_false apidocs} \
-Dselinux=%{?with_selinux:enabled}%{!?with_selinux:disabled} \
%{?with_sysprof:-Dsysprof=enabled} \
- -Dman=true
+ -Dman-pages=enabled
%ninja_build -C build
@@ -266,8 +266,8 @@ install -d $RPM_BUILD_ROOT%{_libdir}/gio/modules
%ninja_install -C build
%if %{with apidocs}
-# gvariant documentation (generated by rst2html5)
-%{__mv} $RPM_BUILD_ROOT%{_docdir}/glib-2.0 $RPM_BUILD_ROOT%{_gtkdocdir}
+install -d $RPM_BUILD_ROOT%{_gidocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/glib-2.0 $RPM_BUILD_ROOT%{_gidocdir}
%endif
> $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
@@ -307,6 +307,8 @@ umask 022
%attr(755,root,root) %{_libexecdir}/gio-launch-desktop
%attr(755,root,root) %{_libdir}/libgio-2.0.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgio-2.0.so.0
+%attr(755,root,root) %{_libdir}/libgirepository-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgirepository-2.0.so.0
%attr(755,root,root) %{_libdir}/libglib-2.0.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libglib-2.0.so.0
%attr(755,root,root) %{_libdir}/libgmodule-2.0.so.*.*.*
@@ -318,6 +320,14 @@ umask 022
%dir %{_libdir}/gio
%dir %{_libdir}/gio/modules
%ghost %{_libdir}/gio/modules/giomodule.cache
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Gio-2.0.typelib
+%{_libdir}/girepository-1.0/GioUnix-2.0.typelib
+%{_libdir}/girepository-1.0/GIRepository-3.0.typelib
+%{_libdir}/girepository-1.0/GLib-2.0.typelib
+%{_libdir}/girepository-1.0/GLibUnix-2.0.typelib
+%{_libdir}/girepository-1.0/GModule-2.0.typelib
+%{_libdir}/girepository-1.0/GObject-2.0.typelib
%dir %{_datadir}/glib-2.0
%dir %{_datadir}/glib-2.0/schemas
%ghost %{_datadir}/glib-2.0/schemas/gschemas.compiled
@@ -331,6 +341,9 @@ umask 022
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gdbus-codegen
+%attr(755,root,root) %{_bindir}/gi-compile-repository
+%attr(755,root,root) %{_bindir}/gi-decompile-typelib
+%attr(755,root,root) %{_bindir}/gi-inspect-typelib
%attr(755,root,root) %{_bindir}/glib-compile-resources
%attr(755,root,root) %{_bindir}/glib-genmarshal
%attr(755,root,root) %{_bindir}/glib-gettextize
@@ -340,13 +353,23 @@ umask 022
%attr(755,root,root) %{_bindir}/gtester
%attr(755,root,root) %{_bindir}/gtester-report
%attr(755,root,root) %{_libdir}/libgio-2.0.so
+%attr(755,root,root) %{_libdir}/libgirepository-2.0.so
%attr(755,root,root) %{_libdir}/libglib-2.0.so
%attr(755,root,root) %{_libdir}/libgmodule-2.0.so
%attr(755,root,root) %{_libdir}/libgobject-2.0.so
%attr(755,root,root) %{_libdir}/libgthread-2.0.so
-%{_libdir}/glib-2.0
+%dir %{_libdir}/glib-2.0
+%{_libdir}/glib-2.0/include
%{_includedir}/gio-unix-2.0
%{_includedir}/glib-2.0
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/Gio-2.0.gir
+%{_datadir}/gir-1.0/GioUnix-2.0.gir
+%{_datadir}/gir-1.0/GIRepository-3.0.gir
+%{_datadir}/gir-1.0/GLib-2.0.gir
+%{_datadir}/gir-1.0/GLibUnix-2.0.gir
+%{_datadir}/gir-1.0/GModule-2.0.gir
+%{_datadir}/gir-1.0/GObject-2.0.gir
%dir %{_datadir}/glib-2.0/codegen
%{_datadir}/glib-2.0/codegen/*.py*
%{_datadir}/glib-2.0/dtds
@@ -358,6 +381,7 @@ umask 022
%{_datadir}/gettext/its/gschema.loc
%{_pkgconfigdir}/gio-2.0.pc
%{_pkgconfigdir}/gio-unix-2.0.pc
+%{_pkgconfigdir}/girepository-2.0.pc
%{_pkgconfigdir}/glib-2.0.pc
%{_pkgconfigdir}/gmodule-2.0.pc
%{_pkgconfigdir}/gmodule-export-2.0.pc
@@ -368,6 +392,9 @@ umask 022
%{_aclocaldir}/glib-gettext.m4
%{_aclocaldir}/gsettings.m4
%{_mandir}/man1/gdbus-codegen.1*
+%{_mandir}/man1/gi-compile-repository.1*
+%{_mandir}/man1/gi-decompile-typelib.1*
+%{_mandir}/man1/gi-inspect-typelib.1*
%{_mandir}/man1/glib-compile-resources.1*
%{_mandir}/man1/glib-genmarshal.1*
%{_mandir}/man1/glib-gettextize.1*
@@ -381,6 +408,7 @@ umask 022
%files static
%defattr(644,root,root,755)
%{_libdir}/libgio-2.0.a
+%{_libdir}/libgirepository-2.0.a
%{_libdir}/libglib-2.0.a
%{_libdir}/libgmodule-2.0.a
%{_libdir}/libgobject-2.0.a
@@ -390,10 +418,7 @@ umask 022
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/gio
-%{_gtkdocdir}/glib
-%{_gtkdocdir}/glib-2.0
-%{_gtkdocdir}/gobject
+%{_gidocdir}/glib-2.0
%endif
%files gdb
diff --git a/glib2-python_shebang.patch b/glib2-python_shebang.patch
index 50d2710..26897d0 100644
--- a/glib2-python_shebang.patch
+++ b/glib2-python_shebang.patch
@@ -1,14 +1,14 @@
---- glib-2.62.4/meson.build.orig 2019-12-19 17:33:15.000000000 +0100
-+++ glib-2.62.4/meson.build 2019-12-20 18:37:03.307665835 +0100
-@@ -1988,7 +1988,7 @@
+--- glib-2.80.0/meson.build.orig 2024-03-09 18:31:13.808268422 +0100
++++ glib-2.80.0/meson.build 2024-03-09 18:34:02.170689658 +0100
+@@ -2421,7 +2421,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE',
- python = import('python').find_installation()
+ python = import('python').find_installation(modules: ['packaging'])
# used for '#!/usr/bin/env <name>'
-python_name = 'python3'
+python_name = python.path()
python_version = python.language_version()
- python_version_req = '>=3.5'
+ python_version_req = '>=3.7'
--- glib-2.62.4/gio/gdbus-2.0/codegen/gdbus-codegen.in.orig 2019-12-19 17:33:15.000000000 +0100
+++ glib-2.62.4/gio/gdbus-2.0/codegen/gdbus-codegen.in 2019-12-20 18:38:55.327058974 +0100
@@ -1,4 +1,4 @@
diff --git a/gtk-doc-build.patch b/gtk-doc-build.patch
deleted file mode 100644
index 67389a1..0000000
--- a/gtk-doc-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- glib-2.69.1/docs/reference/gio/meson.build~ 2021-08-04 17:34:39.000000000 +0200
-+++ glib-2.69.1/docs/reference/gio/meson.build 2021-08-16 22:21:04.114468585 +0200
-@@ -223,7 +223,7 @@
- '--extra-dir=' + join_paths('gio', '..', 'gobject', 'html'),
- ],
- install: true,
-- check: true,
-+ check: false,
- )
- endif
-
---- glib-2.69.1/docs/reference/glib/meson.build~ 2021-08-04 17:34:39.000000000 +0200
-+++ glib-2.69.1/docs/reference/glib/meson.build 2021-08-16 22:21:41.744649339 +0200
-@@ -88,7 +88,7 @@
- '--html-dir=' + docpath,
- ],
- install: true,
-- check: true)
-+ check: false)
- endif
-
- if get_option('man')
---- glib-2.69.1/docs/reference/gobject/meson.build~ 2021-08-04 17:34:39.000000000 +0200
-+++ glib-2.69.1/docs/reference/gobject/meson.build 2021-08-16 22:22:00.861422040 +0200
-@@ -51,7 +51,7 @@
- '--extra-dir=' + join_paths('gobject', '..', 'glib', 'html'),
- ],
- install: true,
-- check: true,
-+ check: false,
- )
- endif
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glib2.git/commitdiff/14cd5c6ac5629090e390d624a6872615d5a14516
More information about the pld-cvs-commit
mailing list