Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb48719' into 'master'
Update to latest version, move to python3, drop cairo.

See merge request mer-core/gobject-introspection!4
  • Loading branch information
Matti Kosola committed Jan 31, 2020
2 parents b7a7e6e + 576afda commit 0ef4cda
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "gobject-introspection"]
path = gobject-introspection
url = https://gitlab.gnome.org/GNOME/gobject-introspection.git
url = https://git.sailfishos.org/mirror/gobject-introspection
2 changes: 1 addition & 1 deletion gobject-introspection
Submodule gobject-introspection updated from 14ff69 to 7f12b3
35 changes: 9 additions & 26 deletions rpm/gobject-introspection.spec
Expand Up @@ -2,7 +2,6 @@ Name: gobject-introspection
Summary: Introspection system for GObject-based libraries
Version: 1.56.1
Release: 1
Group: Development/Libraries
License: GPLv2+, LGPLv2+, MIT
URL: http://live.gnome.org/GObjectIntrospection
Source0: %{name}-%{version}.tar.gz
Expand All @@ -12,15 +11,13 @@ BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(glib-2.0) >= 2.56.1
BuildRequires: pkgconfig(cairo)
BuildRequires: python-devel >= 2.5
BuildRequires: pkgconfig(glib-2.0) >= 2.58.0
BuildRequires: python3-devel
BuildRequires: gettext
BuildRequires: intltool
BuildRequires: flex
BuildRequires: bison
BuildRequires: chrpath
BuildRequires: libtool
BuildRequires: meson

%description
GObject Introspection can scan C header and source files in order to
Expand All @@ -30,7 +27,6 @@ things.

%package -n python-giscanner
Summary: Python package for handling GObject introspection data
Group: Development/Languages
Requires: %{name} = %{version}-%{release}

%description -n python-giscanner
Expand All @@ -39,50 +35,37 @@ data from Python.

%package devel
Summary: Libraries and headers for gobject-introspection
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: python-giscanner

%description devel
Libraries and headers for gobject-introspection.

%prep
%setup -q -n %{name}-%{version}/%{name}
%autosetup -n %{name}-%{version}/%{name}

%build
%autogen --disable-static
make %{?jobs:-j%jobs}
%meson -Dcairo=disabled -Ddoctool=disabled -Dgtk_doc=false -Dpython=%{__python3}
%meson_build

%install
rm -rf %{buildroot}
%make_install

# Die libtool, die.
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-{compiler,generate}
# Mistake in upstream automake
rm -f $RPM_BUILD_ROOT/%{_bindir}/barapp

# Move the python modules to the correct location
mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}
mv $RPM_BUILD_ROOT/%{_libdir}/gobject-introspection/giscanner $RPM_BUILD_ROOT/%{python_sitearch}/

# Trash html documentation
rm -rf $RPM_BUILD_ROOT/%{_datarootdir}/gtk-doc/html
%meson_install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING
%license COPYING
%{_libdir}/lib*.so.*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/*.typelib

%files -n python-giscanner
%defattr(-,root,root,-)
%{python_sitearch}/giscanner
%{_libdir}/gobject-introspection/giscanner

%files devel
%defattr(-,root,root,-)
Expand Down

0 comments on commit 0ef4cda

Please sign in to comment.