Re: [Bug-gnubg] Fwd: Bug#665539: gnubg: Including individual glib headers no longer supported

[Michael Petch]

On 24/03/2012 1:09 PM, Russ Allbery wrote:
> Hello folks,
> 
> I got the following bug report from the Debian GTK+ maintainers.  I can
> patch this only in the Debian package, of course, but it seems more like
> something you'll want to fix in the regular GnuBG CVS repository.
> 
> 
I had a chance this afternoon to look at this. I created a
debootstrap'ed environment on my main Debian system using sid as a base.
I added the experimental repository, and then pulled out experimental
gtk+-2.0 (which includes glib 2.32). I installed the build deps for
GNUBG. When building GNUBG from Debian source I got the same error. It
was in multithread.c - we include gthread.h directly. I decided to run
the debian script to find all problems. It only detected one other issue
and that was duplicate inclusion of glib.h in matchequity.c. I am
attaching the patch file that was generated, and this does seem to
resolve those issues. I am including the patch as a reference. I have
committed these changes to GNUBG's CVS repository. Please note that on
March 25th that Philippe Michel already committed the change to
multithread.c .

However, when the above patch was applied I ran into another problem
during the creation of the DEB file. It seems the Debian tarball doesn't
include a copy of mkinstalldirs . Older versions of automake (prior to
1.9) would autogenerate this file for you, however after 1.9 it is no
longer generated when running autogen.sh. Our makefiles do require it
for installation. The GNUBG CVS repository includes a copy for these cases.

After copying in the GNUBG/CVS mkinstalldirs into the
gnubg-0.90+20120127 (my build directory) the Debian package files were
properly created, and installed fine.

If the problem with mkinstalldirs is not fixed, the fellows doing
experimental builds will likely flag it as another build stopper.
Including a copy of mkinstalldirs should rectify that. The error you do
get if not corrected will be similar to the error log attached.

I did note one other thing (not a show stopper) about the builds with
glib-2.32. We are now using some deprecated functions (in glib), and
there were warnings thrown (Mainly with atomic operations with the
multithreaded code). These warnings don't prevent the software from
running properly, but I'll fix that this weekend, in a similar fashion
that I used to keep compatibility with GTK functionality that has been
deprecated over time.


-- 
Michael Petch
CApp::Sysware Consulting Ltd.
OpenPGP FingerPrint=D81C 6A0D 987E 7DA5 3219 6715 466A 2ACE 5CAE 3304

glib-single-include.patch
Description: Text document

mkinstalldirserr.txt
Description: Text document