diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-12-14 22:55:35 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-12-14 17:55:06 +0000 |
| commit | 3839f7662121f57628a33c1a08b7eb8ed38dfcce (patch) | |
| tree | 9733cd3653cbc098d43ea2dd054e99010eb47e23 /recipes/gobject-introspection.recipe | |
| parent | 61c67c07038fd3546c3bad509bbcdfe142cc6f29 (diff) | |
gobject-introspection.recipe: Update to match glib version
Also backport patch from upstream to not link to system libraries.
Fixes failures on Jenkins CI on macOS, Debian, Fedora.
Fixes https://gitlab.freedesktop.org/gstreamer/cerbero/issues/86
Diffstat (limited to 'recipes/gobject-introspection.recipe')
| -rw-r--r-- | recipes/gobject-introspection.recipe | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/recipes/gobject-introspection.recipe b/recipes/gobject-introspection.recipe index 11758bfa..19e77cfa 100644 --- a/recipes/gobject-introspection.recipe +++ b/recipes/gobject-introspection.recipe @@ -4,16 +4,20 @@ import sys class Recipe(recipe.Recipe): name = 'gobject-introspection' - version = '1.54.1' + version = '1.56.1' stype = SourceType.TARBALL url = 'gnome://' - tarball_checksum = 'b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e' + tarball_checksum = '5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b' licenses = [License.GPLv2Plus] - autoreconf = True - autoreconf_sh = 'gtkdocize && autoreconf -vfi' configure_options = '--with-python=python3' deps = ['glib'] - patches = [name + '/0001-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch'] + patches = [ + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 + name + '/0001-giscanner-Fix-shared-library-name-with-Meson-on-macO.patch', + # Taken from upstream, remove on bump + # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/73 + name + '/0002-Fix-non-libtool-build.patch', + ] files_bins = ['g-ir-annotation-tool', 'g-ir-compiler', 'g-ir-doc-tool', 'g-ir-generate', 'g-ir-scanner'] files_libs = ['libgirepository-1.0'] @@ -86,8 +90,8 @@ class Recipe(recipe.Recipe): arch = 'i386' else: arch = self.config.target_arch - makefileam = os.path.join (self.build_dir, 'Makefile-gir.am') + makefilein = os.path.join (self.build_dir, 'Makefile.in') replacements = {'glib-2.0/include/glibconfig.h': 'glib-2.0/include/%s/glibconfig.h' % arch} - shell.replace(makefileam, replacements) + shell.replace(makefilein, replacements) super(Recipe, self).configure() |