Control: tags 760086 + patch Control: tags 760086 + pending On 2014-08-31 Andreas Metzler <[email protected]> wrote: > x11vnc currently FTBFS with the following error: [...] > This is triggered by its usage of libvncserver-config to locate the > respective libraries. Switching to pkg-config fixes the issue.
Find attached a patch that implements this. I have uploaded this as NMU to delayed/5. Please feel free to tell me if I should delay it longer. cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff -Nru x11vnc-0.9.13/debian/changelog x11vnc-0.9.13/debian/changelog --- x11vnc-0.9.13/debian/changelog 2013-05-22 19:14:11.000000000 +0200 +++ x11vnc-0.9.13/debian/changelog 2014-08-31 18:37:16.000000000 +0200 @@ -1,3 +1,13 @@ +x11vnc (0.9.13-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * 10_usepkgconfig.diff: Use pkg-config instead of libvncserver-config to + locate libvncserver/client. This prevents unnecessary linkage and fixes a + FTBFS caused by trying to link against libgcrypt (which is not a + build-dependency). Closes: #760086 + + -- Andreas Metzler <[email protected]> Sun, 31 Aug 2014 18:16:32 +0200 + x11vnc (0.9.13-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru x11vnc-0.9.13/debian/patches/10_usepkgconfig.diff x11vnc-0.9.13/debian/patches/10_usepkgconfig.diff --- x11vnc-0.9.13/debian/patches/10_usepkgconfig.diff 1970-01-01 01:00:00.000000000 +0100 +++ x11vnc-0.9.13/debian/patches/10_usepkgconfig.diff 2014-08-31 18:13:15.000000000 +0200 @@ -0,0 +1,18 @@ +Description: Locate libvncserver/client with pkg-config instead of + libvncserver-config. - The latter causes unnecessary linkage. +Author: Andreas Metzler <[email protected]> +Last-Update: 2014-08-31 + +--- a/configure.ac ++++ b/configure.ac +@@ -505,8 +505,8 @@ new enough. + ========================================================================== + ]) + else +- SYSTEM_LIBVNCSERVER_CFLAGS=`libvncserver-config --cflags` +- SYSTEM_LIBVNCSERVER_LIBS="$rflag"`libvncserver-config --libs` ++ SYSTEM_LIBVNCSERVER_CFLAGS=`pkg-config --cflags libvncserver libvncclient` ++ SYSTEM_LIBVNCSERVER_LIBS="$rflag"`pkg-config --libs libvncserver libvncclient` + with_system_libvncserver=yes + echo yes + fi diff -Nru x11vnc-0.9.13/debian/patches/series x11vnc-0.9.13/debian/patches/series --- x11vnc-0.9.13/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ x11vnc-0.9.13/debian/patches/series 2014-08-31 18:02:57.000000000 +0200 @@ -0,0 +1 @@ +10_usepkgconfig.diff
signature.asc
Description: Digital signature
