diff --git a/gi-find-deps.sh b/gi-find-deps.sh index 47ad341..21c5a4d 100644 --- a/gi-find-deps.sh +++ b/gi-find-deps.sh @@ -9,7 +9,7 @@ function split_name_version { base=$1 tsymbol=${base%-*} -# Sometimes we get a Requires on Gdk.Settings.foo, bebause you can directly use imports.gi.Gdk.Settings.Foo in Javascript. +# Sometimes we get a Requires on Gdk.Settings.foo, because you can directly use imports.gi.Gdk.Settings.Foo in Javascript. # We know that the symbol in this case is called Gdk, so we cut everything after the . away. symbol=$(echo $tsymbol | awk -F. '{print $1}') version=${base#*-} diff --git a/gobject-introspection-1.56.1.tar.xz b/gobject-introspection-1.56.1.tar.xz deleted file mode 100644 index 51234d9..0000000 --- a/gobject-introspection-1.56.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b -size 1397812 diff --git a/gobject-introspection-1.58.0.tar.xz b/gobject-introspection-1.58.0.tar.xz new file mode 100644 index 0000000..cdda6e2 --- /dev/null +++ b/gobject-introspection-1.58.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec +size 1370824 diff --git a/gobject-introspection-3.30.0-install-warnlib.patch b/gobject-introspection-3.30.0-install-warnlib.patch new file mode 100644 index 0000000..da0e785 --- /dev/null +++ b/gobject-introspection-3.30.0-install-warnlib.patch @@ -0,0 +1,29 @@ +From a68cfd769904c621fb2ebc0c4f24f2659fa283de Mon Sep 17 00:00:00 2001 +From: Jan Tojnar +Date: Fri, 7 Sep 2018 16:12:59 +0200 +Subject: [PATCH] meson: Install warnlib + +For some reason, meson build system did not install warnlib. +Let's do it. + +Patch from Arch Linux +--- + tests/meson.build | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/meson.build b/tests/meson.build +index 71cd97fe..18cc0807 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -8,6 +8,8 @@ test_regress_incdirs = include_directories(['.', 'scanner']) + installed_sources = [ + 'scanner/regress.c', + 'scanner/regress.h', ++ 'scanner/warnlib.c', ++ 'scanner/warnlib.h', + 'gimarshallingtests.c', + 'gimarshallingtests.h', + 'gitestmacros.h', +-- +2.18.0 + diff --git a/gobject-introspection.changes b/gobject-introspection.changes index 2677b8e..dcaffb1 100644 --- a/gobject-introspection.changes +++ b/gobject-introspection.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Wed Sep 19 18:38:47 UTC 2018 - antoine.belvire@opensuse.org + +- Add gobject-introspection-3.30.0-install-warnlib.patch: Install + missing files, notably required by gjs (picked from upstream). + +------------------------------------------------------------------- +Tue Sep 11 03:05:57 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 1.58.0: + + Changes: + - Add a --version argument to the Python-based tools + - Allow selecting the output format for g-ir-doc-tool + - Support all _Float* C types from ISO/IEC TS 18661-3:2015 + - g-ir-doc-tool: Add DevDocs formatting for GJS + (--format=devdocs). + + Issues resolved: + - Default element-type not set for GByteArray object properties + (glgo#GNOME/gobject-introspection#184). + - c:type missing pointer/array information in GIR for C array + parameters (glgo#GNOME/gobject-introspection#189). + - Allow multiple output formats + (glgo#GNOME/gobject-introspection#134). + - gtk2 hits unreachable code after enable -Wswitch-default + (glgo#GNOME/gobject-introspection#218). + - Memory leaks in GI regress and marshalling tests property + setter (glgo#GNOME/gobject-introspection#113). +- Add python3-Sphinx BuildRequires: New dependency. +- Add meson BuildRequires and replace configure/make/make_install + with meson/meson_build/meson_install/meson_test macros to reflect + upstream's build system port to Meson. +- Enable tests run to increase QA of package. + +------------------------------------------------------------------- +Sat Aug 18 15:27:19 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 1.57.3: + + The autotools build now uses autoconf-archive. + + g-ir-doc-tool: Add DevDocs formatting for GJS + (--format=devdocs). This adds a dependency on the Python + markdown package. +- Add python3-Markdown BuildRequires: New dependency. + +------------------------------------------------------------------- +Fri Aug 10 04:43:30 UTC 2018 - luc14n0@linuxmail.org + +- Update to version 1.57.2: + + Add a --version argument to the Python-based tools. + + Allow selecting the output format for g-ir-doc-tool. + + Support all _Float* C types from ISO/IEC TS 18661-3:2015. + + Issues resolved: glgo#GNOME/gobject-introspection#184, + glgo#GNOME/gobject-introspection#189, + glgo#GNOME/gobject-introspection#134, + glgo#GNOME/gobject-introspection#218, + glgo#GNOME/gobject-introspection#113. + ------------------------------------------------------------------- Mon Apr 9 09:50:12 UTC 2018 - bjorn.lie@gmail.com diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 5152cf9..bebae0d 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -12,38 +12,45 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gobject-introspection -Version: 1.56.1 +Version: 1.58.0 Release: 0 # FIXME: Find a way to identify if we need python3-gobject or python-gobject from gi-find-deps.sh. Summary: GObject Introspection Tools License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Development/Libraries/GNOME URL: https://wiki.gnome.org/Projects/GObjectIntrospection -Source0: http://download.gnome.org/sources/gobject-introspection/1.56/%{name}-%{version}.tar.xz + +Source0: http://download.gnome.org/sources/gobject-introspection/1.58/%{name}-%{version}.tar.xz # gi-find-deps.sh is a rpm helper for Provides and Requires. Script creates typelib()-style Provides/Requires. Source1: gi-find-deps.sh Source2: gobjectintrospection.attr Source3: gobject-introspection-typelib.template Source98: baselibs.conf Source99: %{name}-rpmlintrc +#PATCH-FIX-UPSTREAM gobject-introspection-3.30.0-install-warnlib.patch -- install missing file (picked from upstream) +Patch0: gobject-introspection-3.30.0-install-warnlib.patch + BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: python3-Mako +BuildRequires: python3-Markdown +BuildRequires: python3-Sphinx BuildRequires: python3-devel BuildRequires: python3-xml BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.56.1 +BuildRequires: pkgconfig(glib-2.0) >= 2.58.0 BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(libffi) >= 3.0.0 @@ -95,18 +102,19 @@ a uniform, machine readable format. %prep %setup -q +%patch0 -p1 %build -export PYTHON="python3" -%configure \ - --enable-gtk-doc \ - --disable-static \ - --enable-doctool -make %{?_smp_mflags} V=1 +%meson \ + -Dgtk-doc=true \ + -Dpython='%{_bindir}/python3' +%meson_build + +%check +%meson_test %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%meson_install install -D %{SOURCE1} %{buildroot}%{_rpmconfigdir}/gi-find-deps.sh install -D %{SOURCE2} -m 0644 %{buildroot}%{_rpmconfigdir}/fileattrs/gobjectintrospection.attr # comparing, if we provide all the symbols expected. @@ -114,15 +122,12 @@ ls %{buildroot}%{_libdir}/girepository-1.0/*.typelib | sh %{SOURCE1} -P > gobjec diff -s %{SOURCE3} gobject-introspection-typelib.installed %fdupes %{buildroot} -%check -make %{?_smp_mflags} check - %post -n libgirepository-1_0-1 -p /sbin/ldconfig %postun -n libgirepository-1_0-1 -p /sbin/ldconfig %files %license COPYING COPYING.GPL -%doc AUTHORS CONTRIBUTORS NEWS README TODO +%doc NEWS README.rst TODO %{_bindir}/g-ir-annotation-tool %{_bindir}/g-ir-compiler %{_bindir}/g-ir-doc-tool