Re: [packages/gobject-introspection] - updated to 1.80.0; added bootstrap bcond for glib 2.78->2.80 transition

2024-03-10 Thread Jakub Bogusz
On Sun, Mar 10, 2024 at 10:56:22AM +0100, Jan Palus wrote:
> Shouldn't it be the other way around -- "bootstrap" bcond in glib2 for
> building without introspection? Currently while gobject-introspection
> does not build-time depend on glib2-devel >= 2.80, it does runtime
> depend on glib2 >= 2.80 (both in rpm deps and linked dynamic library)
> which cannot be satisfied to build glib2 2.80.

Oh, I wasn't aware of g-ir-scanner dependency to build introspection
files in glib2 (I had gobject-introspection-devel 1.78 installed).
So now I added "introspection" bcond to glib2.spec to allow bootstrapping
from scratch.

Previously I added "bootstrap" bcond in gobject-introspection as a way to
cleanly build+upgrade on existing system (it's not possible to cleanly
upgrade glib2 built with introspection without removing or upgrading to
1.80 existing gobject-introspection 1.78 package due to files conflict).
So I could build whole glib2 2.80 and gobject-introspection 1.80 and
upgrade them both simultaneously.


-- 
Jakub Boguszhttp://qboosh.pl/
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en


Re: [packages/gobject-introspection] - updated to 1.80.0; added bootstrap bcond for glib 2.78->2.80 transition

2024-03-10 Thread Jan Palus
On 09.03.2024 22:33, qboosh wrote:
> commit a0c12f9cf03d0222dbb6357f6da0f70e72260664
> Author: Jakub Bogusz 
> Date:   Sat Mar 9 22:31:00 2024 +0100
> 
> - updated to 1.80.0; added bootstrap bcond for glib 2.78->2.80 transition
> 
>  gobject-introspection.spec | 55 
> +-
>  1 file changed, 35 insertions(+), 20 deletions(-)
> ---
> diff --git a/gobject-introspection.spec b/gobject-introspection.spec
> index 0055356..4719aa3 100644
> --- a/gobject-introspection.spec
> +++ b/gobject-introspection.spec
> @@ -2,27 +2,30 @@
>  # Conditional build:
>  %bcond_without   cairo   # cairo support
>  %bcond_without   apidocs # API documentation
> +%bcond_with  bootstrap   # bootstrap from glib < 2.80
>  
>  Summary: Introspection for GObject libraries
>  Summary(pl.UTF-8):   Obserwacja bibliotek GObject
>  Name:gobject-introspection
> -Version: 1.78.1
> +Version: 1.80.0
>  Release: 1
> -License: LGPL v2+ (giscanner) and GPL v2+ (tools)
> +License: LGPL v2+ (libraries, giscanner) and GPL v2+ (tools)
>  Group:   Libraries
> -Source0: 
> https://download.gnome.org/sources/gobject-introspection/1.78/%{name}-%{version}.tar.xz
> -# Source0-md5:   da2677e6b9c91b33c036d2233a96cec3
> +Source0: 
> https://download.gnome.org/sources/gobject-introspection/1.80/%{name}-%{version}.tar.xz
> +# Source0-md5:   003cc22c45be5edf91911050bbcfbde6
> +Source1: https://download.gnome.org/sources/glib/2.80/glib-2.80.0.tar.xz
> +# Source1-md5:   3a51e2803ecd22c2dadcd07d9475ebe3
>  URL: https://wiki.gnome.org/Projects/GObjectIntrospection
>  BuildRequires:   automake
>  BuildRequires:   bison
>  %{?with_cairo:BuildRequires: cairo-gobject-devel}
>  BuildRequires:   flex
>  BuildRequires:   gcc >= 5:3.2
> -BuildRequires:   glib2-devel >= 1:2.78.0
> +%{!?with_bootstrap:BuildRequires:glib2-devel >= 1:2.80.0}
>  BuildRequires:   glibc-misc
>  %{?with_apidocs:BuildRequires:   gtk-doc >= 1.19}
> -BuildRequires:   libffi-devel >= 3.0.0
> -BuildRequires:   meson >= 0.60.0
> +BuildRequires:   libffi-devel >= 7:3.4
> +BuildRequires:   meson >= 1.2.0
>  BuildRequires:   ninja >= 1.5
>  BuildRequires:   pkgconfig
>  BuildRequires:   python3 >= 1:3.6
> @@ -36,7 +39,8 @@ BuildRequires:  rpmbuild(macros) >= 1.752
>  BuildRequires:   tar >= 1:1.22
>  BuildRequires:   xz
>  BuildRequires:   zlib-devel
> -Requires:glib2 >= 1:2.78.0
> +Requires:glib2 >= 1:2.80.0

Shouldn't it be the other way around -- "bootstrap" bcond in glib2 for
building without introspection? Currently while gobject-introspection
does not build-time depend on glib2-devel >= 2.80, it does runtime
depend on glib2 >= 2.80 (both in rpm deps and linked dynamic library)
which cannot be satisfied to build glib2 2.80.
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en