Control: tags -1 + patch upstream

I quickly looked into the gimp/libwmf-config issue and it should
be easy to solve. Attaching a completely untested patch, than simply
copy-pastes a couple of lines from a different conditional-path
a few lines above.

(Previously the pkg-config file would only be used if libwmf-config
exists and expr to evaluate version returned by script being new enough
failed.)

If someone could verify the patch actually works, it would be good if
this patch is also forwarded upstream.

Regards,
Andreas Henriksson
From: Andreas Henriksson <andr...@fatal.se>
Subject: Also attempt pkg-config if libwmf-config doesn't exist at all.

Possibly things should be refactored to *first* try pkg-config and
then fall back on looking for the libwmf-config script, but
this is the minimal change to fix the case when we only have
libwmf.pc without libwmf-config.

See semi-related https://gitlab.gnome.org/GNOME/gimp/-/issues/2454

See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956183
See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956200

--- a/configure.ac
+++ b/configure.ac
@@ -2058,7 +2058,10 @@
                         have_libwmf="no (libwmf not found)")
    fi
   else
-    have_libwmf="no (libwmf not found)"
+    have_libwmf=yes
+    PKG_CHECK_MODULES(WMF, libwmf >= wmf_required_version,
+                      FILE_WMF='file-wmf$(EXEEXT)',
+                      have_libwmf="no (libwmf not found)")
   fi
 fi
 

Reply via email to