[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#915558: marked as done (idesk FTCBFS: uses the wrong pkg-config)

Your message dated Sat, 31 Dec 2022 14:40:41 +0000
with message-id <E1pBd2P-00FyqC-79@fasolo.debian.org>
and subject line Bug#915558: fixed in idesk 0.7.5-7
has caused the Debian Bug report #915558,
regarding idesk FTCBFS: uses the wrong pkg-config
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
915558: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=915558
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: idesk
Version: 0.7.5-6
Tags: patch upstream
User: helmutg@debian.org
Usertags: rebootstrap

idesk fails to cross build from source, because it uses the build
architecture pkg-config. The cause is using AC_PATH_PROG for finding
pkg-config. It is much better to simply use PKG_CHECK_MODULES.
Unfortunately, that macro doesn't work, because it is wrongly used in
configure.in inside an if rather than AS_IF. The attached patch fixes
that and makes idesk cross buildable. Please consider applying it.

Helmut

--- idesk-0.7.5.orig/acinclude.m4
+++ idesk-0.7.5/acinclude.m4
@@ -181,16 +181,7 @@
       PKG_CONFIG=$xft_prefix/bin/pkg-config	  
    fi
 fi
-
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno" ; then
-	ifelse([$2], , :, [$2])
-else 
-	XFT_CFLAGS=`$PKG_CONFIG $xftconf_args --cflags xft`
-	XFT_LIBS=`$PKG_CONFIG $xftconf_args --libs xft`
-	ifelse([$1], , :, [$1])
-fi
-
+PKG_CHECK_MODULES([XFT],[xft],[$1],[$2])
 ])
 
 # AM_PATH_XFT(default-value, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--- idesk-0.7.5.orig/configure.in
+++ idesk-0.7.5/configure.in
@@ -116,13 +116,13 @@
 AC_ARG_ENABLE(
   libsn, [  --enable-libsn        include code for LIBSN [default=no]])
 
-if test -n "$enable_libsn"; then
+AS_IF([test -n "$enable_libsn"],[
                     PKG_CHECK_MODULES(LIBSN, libstartup-notification-1.0 >= 0.5)
       		    AC_MSG_RESULT([yes])
                     STARTUP="-DHAVE_STARTUP_NOTIFICATION -DSN_API_NOT_YET_FROZEN=1",
-else
+],[
   AC_MSG_RESULT([no])
-fi
+])
 
 AM_CONDITIONAL(HAVE_STARTUP_NOTIFICATION, test x$LIBSN = xtrue)
 AC_SUBST(STARTUP)

--- End Message ---
--- Begin Message --- 
Source: idesk
Source-Version: 0.7.5-7
Done: Andreas Metzler <ametzler@debian.org>

We believe that the bug you reported is fixed in the latest version of
idesk, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 915558@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andreas Metzler <ametzler@debian.org> (supplier of updated idesk package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sat, 31 Dec 2022 15:24:08 +0100
Source: idesk
Architecture: source
Version: 0.7.5-7
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Andreas Metzler <ametzler@debian.org>
Closes: 915558 1018029
Changes:
 idesk (0.7.5-7) unstable; urgency=medium
 .
   * QA upload.
   * Fix FTBFS against newer imlib2, use pkg-config. Closes: #1018029
   * Lintian:
     Clean up trailing whitespace in control file.
     Set Rules-Requires-Root: no.
     Use https URIs.
     Update watchfile.
     Use dh v13 compat.
   * Run wrap-and-sort -ast.
   * 40_cross.patch by Helmut Grohne: Fixes FTCBFS related to incorrect
     pkg-config usage. Closes: #915558
Checksums-Sha1: 
 2d246f4356dc5c5b5d0bd7bc0333eced2b100f6f 1759 idesk_0.7.5-7.dsc
 8b6f9164bb2218bda75c07b6809b0d098ac1cc6f 7400 idesk_0.7.5-7.debian.tar.xz
Checksums-Sha256: 
 97a7c960c005ea817069876750640996b5c2ec2570e5197ba74a9bc9af699f58 1759 idesk_0.7.5-7.dsc
 f0ef237c1f38b117b26c8c0625c2ecec2975f27948e0857b5e5605e606356f3d 7400 idesk_0.7.5-7.debian.tar.xz
Files: 
 02832aa88ca4fc1a41550ba2294256ad 1759 x11 optional idesk_0.7.5-7.dsc
 cae4afda902bbefca0d590b3659156e4 7400 x11 optional idesk_0.7.5-7.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE0uCSA5741Jbt9PpepU8BhUOCFIQFAmOwRosACgkQpU8BhUOC
FIR53Q/8DT52USKs1RRwlMrMC/OGkAFSRsfS35MsRUdmOiMS0s9/y8hhR7fFZrgN
b5OwWVGqIOJjrAJ3RibbKNrcNbZcoUelB2k5+ks1hMNa0Nn6VWfkC8MWKMqV8EY4
Q2RncQafM/ATrsxyl0beIVJLoDsMTS5LajygA6cl/dia1IVxSIpfAKVvykuZ1fKC
4jgjvIdOHAFYZ8VCY2yhZpQmOJEZu+hyi98bmXz58nuFESiN+0vZLLLN61Rqrbc6
YPrIAgS1wa4DazIYCL0ffJFcAnj/R9smdWao0u1xx0MlPnNsO+SG2cKjHKjCEBIy
SW6hMCjwORRzq+iJoGekVJQf8KFPDhwpH2IUoUaPCUzfw9F42OBs0lBKEHh5hIkk
ZFqyCoEpkPXKsgs54Na/NOeMn/iIcRWqWoeDBYRt7+B2KrNKnWPOIyOrRytMacN/
p9hOnXiqAl/ldpPyvmHk8HmSdIgoAjh25elo8StU0JxJSEcLMez5eQ12gFIm6VD/
x4ODPoqSXdYuH6WnVOmF40QocNvKwB2qVuVrcve2EhDcOVH2UtYPH7DFQS2mWGPW
avKOFjF95ABE13aHr5WpJljkkZAOYRlhBOsZ5CiQ0yI0lx/X3kMUjuPddDe2/Zb1
2vDipJ/j2G6hRO4pIDsqm9+xhoCxGYkH2uAV9naS64mmhN9XRXs=
=HwIo
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: