Bug#790859: avogadro: Patch for FTBFS against updated cmake

[Niels Thykier]

On Tue, 11 Aug 2015 12:19:46 +0100 Andy Whitcroft  wrote:
> Package: avogadro
> Version: 1.1.0-4
> Followup-For: Bug #790859
> User: ubuntu-de...@lists.ubuntu.com
> Usertags: origin-ubuntu wily ubuntu-patch
> 
> Dear Maintainer,
> 
> While fixing gcc-5 related fallout the following patch was needed for
> avogadro to handle a semantic change in newer cmake.  cmake QT search et al
> no longer automatically loads X11 detection we have to probe it explicitly.
> 
> Thanks for considering the patch.
> 
> -apw
> 
> [...]

Hi,

The avogadro package is currently blocking a couple of GCC-5 related
transitions (openbabel among others) and I am therefore very interested
in seeing this fixed.
  Are there any ETA a fix for this bug landing in unstable?  If you are
busy and would like us to just NMU it, do not hesitate to let us know.

Thanks,
~Niels




signature.asc
Description: OpenPGP digital signature

Bug#790859: avogadro: Patch for FTBFS against updated cmake

[Michael Banck]

Hi Niels,

On Thu, Sep 17, 2015 at 08:01:52AM +0200, Niels Thykier wrote:
> On Tue, 11 Aug 2015 12:19:46 +0100 Andy Whitcroft  wrote:
> > Package: avogadro
> > Version: 1.1.0-4
> > Followup-For: Bug #790859
> > User: ubuntu-de...@lists.ubuntu.com
> > Usertags: origin-ubuntu wily ubuntu-patch
> > 
> > Dear Maintainer,
> > 
> > While fixing gcc-5 related fallout the following patch was needed for
> > avogadro to handle a semantic change in newer cmake.  cmake QT search et al
> > no longer automatically loads X11 detection we have to probe it explicitly.
> > 
> > Thanks for considering the patch.
> > 
> > -apw
> > 
> > [...]
> 
> Hi,
> 
> The avogadro package is currently blocking a couple of GCC-5 related
> transitions (openbabel among others) and I am therefore very interested
> in seeing this fixed.
>   Are there any ETA a fix for this bug landing in unstable?  If you are
> busy and would like us to just NMU it, do not hesitate to let us know.

Ok, will look into this now.


Michael

Bug#790859: avogadro: Patch for FTBFS against updated cmake

[Niels Thykier]

On 2015-09-17 11:12, Michael Banck wrote:
> Hi Niels,
> 
> [...]
>> Hi,
>>
>> The avogadro package is currently blocking a couple of GCC-5 related
>> transitions (openbabel among others) and I am therefore very interested
>> in seeing this fixed.
>>   Are there any ETA a fix for this bug landing in unstable?  If you are
>> busy and would like us to just NMU it, do not hesitate to let us know.
> 
> Ok, will look into this now.
> 
> 
> Michael
> 

Thanks :)

~Niels

Bug#790859: [Debichem-devel] Bug#790859: avogadro: Patch for FTBFS against updated cmake

[Michael Banck]

tags 790859 -pending
thanks

On Thu, Sep 17, 2015 at 11:12:37AM +0200, Michael Banck wrote:
> Hi Niels,
> 
> On Thu, Sep 17, 2015 at 08:01:52AM +0200, Niels Thykier wrote:
> > On Tue, 11 Aug 2015 12:19:46 +0100 Andy Whitcroft  
> > wrote:
> > > Package: avogadro
> > > Version: 1.1.0-4
> > > Followup-For: Bug #790859
> > > User: ubuntu-de...@lists.ubuntu.com
> > > Usertags: origin-ubuntu wily ubuntu-patch
> > > 
> > > Dear Maintainer,
> > > 
> > > While fixing gcc-5 related fallout the following patch was needed for
> > > avogadro to handle a semantic change in newer cmake.  cmake QT search et 
> > > al
> > > no longer automatically loads X11 detection we have to probe it 
> > > explicitly.
> > > 
> > > Thanks for considering the patch.
> > > 
> > > -apw
> > > 
> > > [...]
> > 
> > Hi,
> > 
> > The avogadro package is currently blocking a couple of GCC-5 related
> > transitions (openbabel among others) and I am therefore very interested
> > in seeing this fixed.
> >   Are there any ETA a fix for this bug landing in unstable?  If you are
> > busy and would like us to just NMU it, do not hesitate to let us know.
> 
> Ok, will look into this now.

Unfortunately, the Ubuntu patch (for 1.1.1) does not apply to the 1.0
branch in Debian unstable, and it is not just a trivial fix as upstream
did a major overhaul of the CMake build system between the two versions.

I'm looking further into it.


Michael

Processed: Re: [Debichem-devel] Bug#790859: avogadro: Patch for FTBFS against updated cmake

[Debian Bug Tracking System]

Processing commands for cont...@bugs.debian.org:

> tags 790859 -pending
Bug #790859 [avogadro] FTBFS: error adding symbols: DSO missing from command 
line
Removed tag(s) pending.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
790859: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790859
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#790859: avogadro: Patch for FTBFS against updated cmake

[Andy Whitcroft]

Package: avogadro
Version: 1.1.0-4
Followup-For: Bug #790859
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu wily ubuntu-patch

Dear Maintainer,

While fixing gcc-5 related fallout the following patch was needed for
avogadro to handle a semantic change in newer cmake.  cmake QT search et al
no longer automatically loads X11 detection we have to probe it explicitly.

Thanks for considering the patch.

-apw

-- System Information:
Debian Release: jessie/sid
  APT prefers wily-updates
  APT policy: (500, 'wily-updates'), (500, 'wily-security'), (500, 'wily'), 
(100, 'wily-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.1.0-3-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch
--- avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch	1970-01-01 01:00:00.0 +0100
+++ avogadro-1.1.1/debian/patches/probe-X11-paths-with-find_package.patch	2015-08-10 20:56:07.0 +0100
@@ -0,0 +1,17 @@
+Description: probe X11 paths with find_package(X11)
+ cmake no longer automatically probes for X11 when probling for QT et al.
+ We now need to manually load X11 when needed.
+Author: Andy Whitcroft a...@ubuntu.com
+
+Index: avogadro-1.1.1/avogadro/src/CMakeLists.txt
+===
+--- avogadro-1.1.1.orig/avogadro/src/CMakeLists.txt
 avogadro-1.1.1/avogadro/src/CMakeLists.txt
+@@ -107,6 +107,7 @@ if(QtTesting)
+   target_link_libraries(avogadro-app QtTesting)
+ endif()
+ if(Q_WS_X11)
++  find_package(X11 REQUIRED)
+   target_link_libraries(avogadro-app ${X11_X11_LIB})
+ endif()
+ 
diff -Nru avogadro-1.1.1/debian/patches/series avogadro-1.1.1/debian/patches/series
--- avogadro-1.1.1/debian/patches/series	2014-02-12 11:09:50.0 +
+++ avogadro-1.1.1/debian/patches/series	2015-08-10 20:57:49.0 +0100
@@ -1,2 +1,3 @@
 link_to_libgl2ps.patch
 boost148.patch
+probe-X11-paths-with-find_package.patch