pidgin/pidgin

Use source built libpurple.la when building gir files

2017-06-04, Mike Ruprecht
7a7b0bfca940
Parents a071e5f44d71
Children e977b2e549d6
Use source built libpurple.la when building gir files

When running g-ir-scanner to generate Pidgin-3.0.gir, if the
installed libpurple.so didn't match the symbols in the built
version, it could fail. This is because g-ir-scanner was linking
to the installed version instead of the built one.

This patch makes it look at the pkg-config file to find the
right version, which in this case is pointed to by the uninstalled
pc file. I expected the --include-uninstalled flag to be what was
needed for this, but I couldn't get it to work.

Additionally, this patch sets the package name for the
Purple-3.0.gir for completeness.
3 files changed, 7 insertions(+), 3 deletions(-)
  • +4 -1
    finch/Makefile.am
  • +1 -1
    libpurple/Makefile.am
  • +2 -1
    pidgin/Makefile.am
    • --- a/finch/Makefile.am Sun Jun 04 21:03:55 2017 -0500
    +++ b/finch/Makefile.am Sun Jun 04 21:09:20 2017 -0500
    @@ -130,7 +130,9 @@
    --warn-all \
    --add-include-path=$(prefix)/share/gir-1.0 \
    --add-include-path=$(builddir)/libgnt \
    - --add-include-path=$(top_builddir)/libpurple
    + --add-include-path=$(top_builddir)/libpurple \
    + --pkg=purple-$(PURPLE_MAJOR_VERSION) \
    + --pkg-export=finch
    INTROSPECTION_COMPILER_ARGS = \
    --includedir=$(prefix)/share/gir-1.0 \
    @@ -167,6 +169,7 @@
    Finch_3_0_gir_LIBS = $(builddir)/libfinch.la
    Finch_3_0_gir_FILES = $(introspection_sources)
    INTROSPECTION_GIRS += Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
    +INTROSPECTION_SCANNER_ENV = PKG_CONFIG_PATH=$(top_builddir)/libpurple/data/
    girdir = \
    $(prefix)/share/gir-1.0 \
    --- a/libpurple/Makefile.am Sun Jun 04 21:03:55 2017 -0500
    +++ b/libpurple/Makefile.am Sun Jun 04 21:09:20 2017 -0500
    @@ -498,7 +498,7 @@
    -include $(INTROSPECTION_MAKEFILE)
    INTROSPECTION_GIRS =
    -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(prefix)/share/gir-1.0 --warn-all
    +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(prefix)/share/gir-1.0 --warn-all --pkg-export=purple-$(PURPLE_MAJOR_VERSION)
    INTROSPECTION_COMPILER_ARGS = --includedir=$(prefix)/share/gir-1.0
    if HAVE_INTROSPECTION
    --- a/pidgin/Makefile.am Sun Jun 04 21:03:55 2017 -0500
    +++ b/pidgin/Makefile.am Sun Jun 04 21:09:20 2017 -0500
    @@ -264,7 +264,7 @@
    -include $(INTROSPECTION_MAKEFILE)
    INTROSPECTION_GIRS =
    -INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0
    +INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0 --pkg=purple-$(PURPLE_MAJOR_VERSION) --pkg-export=pidgin-$(PURPLE_MAJOR_VERSION)
    INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple --includedir=$(prefix)/share/gir-1.0
    if HAVE_INTROSPECTION
    @@ -299,6 +299,7 @@
    Pidgin_3_0_gir_LIBS = $(builddir)/libpidgin.la
    Pidgin_3_0_gir_FILES = $(introspection_sources)
    INTROSPECTION_GIRS += Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
    +INTROSPECTION_SCANNER_ENV = PKG_CONFIG_PATH=$(top_builddir)/libpurple/data/
    girdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_GIRDIR)
    gir_DATA = $(INTROSPECTION_GIRS)