Skip to content

Commit

Permalink
Revert version change of gwenhywfar: Maybe 4.20.0 builds without prob…
Browse files Browse the repository at this point in the history 
…lems on windows.
  • Loading branch information
@cstim
cstim committed Aug 10, 2019
1 parent e9754cc commit d80fbec
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gnucash.modules
View file
Expand Up @@ -146,7 +146,7 @@

<autotools id="gwenhywfar" autogen-sh="configure"
autogenargs="--with-guis='gtk3' --enable-local-install --disable-binreloc --disable-ssl">
<branch module="104/gwenhywfar-4.20.1.tar.gz" version="4.20.1" repo="aqbanking" checkoutdir="gwenhywfar-4.20.1">
<branch module="10/gwenhywfar-4.20.0.tar.gz" version="4.20.0" repo="aqbanking" checkoutdir="gwenhywfar-4.20.0">
</branch>
<dependencies>
<dep package="gcrypt"/>
Expand Down

6 comments on commit d80fbec

@cstim
Copy link
Member Author

@cstim cstim commented on d80fbec Aug 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The newer version of gwenhywfar didn't build because in configure.ac, the newer version will now stop if pkg-config for gtk3 could not be found. aqbanking/gwenhywfar@66b2962 The older version probably suffered from the very same problem, but configure.ac did not yet stop there. And during compilation this somehow wasn't any issue, probably because CFLAGS and LDFLAGS were set up correctly by some other way.
@jralls : Do you happen to know how the PKG_CONFIG_PATH of gtk3 can be set in our windows scripts before gwenhywfar configure is called? Unfortunately I indeed don't have a windows test system at hand, sorry.

@jralls
Copy link
Member

@jralls jralls commented on d80fbec Aug 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cstim It's set in jhbuildrc and pkg-config --modversion gtk+-3.0 returns the currently installed version so it should work. I'll test locally.

@jralls
Copy link
Member

@jralls jralls commented on d80fbec Aug 13, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't failing because of PKG_CONFIG_PATH, it was failing because it couldn't find pkg-config. I'm not sure why, maybe something went wrong during autogen. I've fixed it by setting $PKG_CONFIG in jhbuildrc. BTW, the 4.20.0 tarball doesn't check for gtk3 at all so I'd had jhbuildrc add the gtk3 stuff to CFLAGS and CXXFLAGS.

Gwenhywfar 4.20.1 also has a misconfigured clean target in that it removes the symlink directory gwenhywfar4. That's created by configure so removing it in clean breaks the build. It should be removed in distclean. My commit includes a patch to Makefile.in that just fixes clean.

@cstim
Copy link
Member Author

@cstim cstim commented on d80fbec Aug 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into this further. Seems like the subsequent nightly builds were not yet satisfied with the set $PKG_CONFIG. No idea why, sorry. My suspicion is that this particular tarball has some problems.

Regardless of this particular tarball, I would happily commit a fix on the gwenhywfar side about the clean target. How would I reproduce this error here on my side to see this, too? Do you have a pointer on how I should fix this in the Makefile.am in the first place? Thanks!

@jralls
Copy link
Member

@jralls jralls commented on d80fbec Aug 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cstim to reproduce just configure in a separate build directory, run make clean then make. It will fail for not being able to build the headers in gwenhywfar4.
The change in Makefile.am is

--- Makefile.am~        2019-08-08 15:42:10.000000000 -0700
+++ Makefile.am 2019-08-12 14:47:52.202624700 -0700
@@ -49,7 +49,7 @@
 clean-local: clean-local-check
 .PHONY: clean-local
 clean-local-check:
-       rm -rf apidoc gwenhywfar4
+       rm -rf apidoc

 listdoc.h: $(top_builddir)/admin/mklistdoc
        admin/mklistdoc -v -I $(top_srcdir)/src/base `find "$(top_builddir)/gwenhywfar4/gwenhywfar" -name "*.h" | LC_ALL=C sort` >listdoc.h

@jralls
Copy link
Member

@jralls jralls commented on d80fbec Aug 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As for PKG_CONFIG, I needed to log into the VM and rerun setup-mingw64.ps1 to get the change from jhbuildrc.in to jhbuildrc. Tonight's build should be OK.

Please sign in to comment.