Skip to content
Permalink
Browse files

gobject_introspection: update to version 1.58.0, dependencies

Update/remove outdated patches.
  • Loading branch information
dbevans committed Oct 2, 2018
1 parent 5a4dc9f commit dc8a19f4b510cc8231121a3a5636a31177ce3152
@@ -4,8 +4,7 @@ PortSystem 1.0
PortGroup active_variants 1.1

name gobject-introspection
version 1.56.1
revision 1
version 1.58.0
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome
platforms darwin
@@ -20,25 +19,22 @@ homepage https://wiki.gnome.org/Projects/GObjectIntrospection
master_sites gnome:sources/${name}/${branch}/
use_xz yes

checksums rmd160 55938f879f3211390063b56298604cb766142c60 \
sha256 5b2875ccff99ff7baab63a34b67f8c920def240e178ff50add809e267d9ea24b \
size 1397812
checksums rmd160 292e869f3b5d18812f510a1f0167f7f8885c8aef \
sha256 27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513e401ec \
size 1370824

depends_build port:pkgconfig

depends_lib path:lib/pkgconfig/cairo.pc:cairo \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:libffi \
port:py27-mako
port:py27-mako \
port:py27-markdown

depends_run bin:glibtool:libtool

patchfiles no-env-shebang.patch

# see https://trac.macports.org/ticket/56301
# see https://gitlab.gnome.org/GNOME/gobject-introspection/issues/205
patchfiles-append patch-dyld-library-path.diff

post-patch {
reinplace "s|libcairo-gobject.2.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/configure
}

This file was deleted.

@@ -1,8 +1,11 @@
--- tools/g-ir-tool-template.in.orig 2015-07-18 06:27:49.000000000 -0700
+++ tools/g-ir-tool-template.in 2016-03-12 01:29:38.000000000 -0800
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
# -*- Mode: Python -*-
# GObject-Introspection - a framework for introspecting GObject libraries
# Copyright (C) 2008 Johan Dahlin
--- Makefile-tools.am.orig 2018-09-29 11:39:49.000000000 -0700
+++ Makefile-tools.am 2018-09-29 11:40:20.000000000 -0700

This comment has been minimized.

Copy link
@ryandesign

ryandesign Oct 2, 2018

Contributor

This now fails to build on the buildbot because you're now modifying automake files which need to be regenerated but you're not declaring a dependency on automake.

@@ -9,7 +9,7 @@
tools/g-ir-tool-template.in \
tools/meson.build

-TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,\/usr\/bin\/env\ $(PYTHON),
+TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON_CMD\@,$(PYTHON),

g-ir-scanner: tools/g-ir-tool-template.in _giscanner.la Makefile
$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,scannermain, -e s,@TOOL_FUNCTION\@,scanner_main, $< > $@.tmp && mv $@.tmp $@

This file was deleted.

1 comment on commit dc8a19f

@dbevans

This comment has been minimized.

Copy link
Contributor Author

@dbevans dbevans commented on dc8a19f Oct 2, 2018

@ryandesign Yeah. But just adding automake wasn't enough. Using autoreconf solves the problem.

bf729a2

Please sign in to comment.
You can’t perform that action at this time.