Control: tags -1 + patch

On Sat, Dec 22, 2018 at 02:53:14AM +0200, Adrian Bunk wrote:
> Root cause:
> 
> $  cat /usr/lib/x86_64-linux-gnu/pkgconfig/polyclipping.pc
> prefix=/usr
> exec_prefix=/usr
> libdir=lib/x86_64-linux-gnu
> sharedlibdir=lib/x86_64-linux-gnu
> includedir=include
> ...
> 
> 
> I would suspect the #915267 change as root cause.

Thanks for spotting. That was not the cause however. The upstream
polycipping.pc.in relies on very weired assignments of standard cmake
variables, those assignments were removed in
debian/patches/1000-fix-multiarch-paths.patch, which was added in the
same upload that fixed #915267.

The attached patch adapts polycipping.pc.in to cope with
1000-fix-multiarch-paths.patch.

Helmut
--- libpolyclipping-6.4.2.orig/cpp/polyclipping.pc.cmakein
+++ libpolyclipping-6.4.2/cpp/polyclipping.pc.cmakein
@@ -1,8 +1,8 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_LIBDIR@
-sharedlibdir=@CMAKE_INSTALL_LIBDIR@
-includedir=@CMAKE_INSTALL_INCLUDEDIR@
+exec_prefix=${prefix}
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+sharedlibdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/polyclipping
 
 Name: polyclipping
 Description: polygon clipping library

Reply via email to