[Debichem-devel] Bug#978194: openms: FTBFS: glpk.h:36:16: error: using typedef-name ‘glp_prob’ after ‘struct’

[Logan Rosen]

Package: openms
Version: 2.6.0+cleaned1-1
Followup-For: Bug #978194
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: logan at ubuntu.com
Control: tags -1 patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/fix-glpk-version-check.patch: Fix GLPK version check that doesn't
    account for major version, fixing FTBFS against GLPK 5.

Thanks for considering the patch.

Logan

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

Kernel: Linux 5.8.0-33-generic (SMP w/8 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch
--- openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch	1969-12-31 19:00:00.000000000 -0500
+++ openms-2.6.0+cleaned1/debian/patches/fix-glpk-version-check.patch	2020-12-30 13:01:49.000000000 -0500
@@ -0,0 +1,11 @@
+--- a/src/openms/include/OpenMS/DATASTRUCTURES/LPWrapper.h
++++ b/src/openms/include/OpenMS/DATASTRUCTURES/LPWrapper.h
+@@ -51,7 +51,7 @@
+ #define GLP_PROB_DEFINED
+ // depending on the glpk version
+ // define glp_prob as forward or struct
+-#if OPENMS_GLPK_VERSION_MINOR < 48
++#if OPENMS_GLPK_VERSION_MAJOR == 4 && OPENMS_GLPK_VERSION_MINOR < 48
+ typedef struct
+ {
+   double _opaque_prob[100];
diff -Nru openms-2.6.0+cleaned1/debian/patches/series openms-2.6.0+cleaned1/debian/patches/series
--- openms-2.6.0+cleaned1/debian/patches/series	2020-12-15 08:29:00.000000000 -0500
+++ openms-2.6.0+cleaned1/debian/patches/series	2020-12-30 13:00:56.000000000 -0500
@@ -1,2 +1,3 @@
 sonameAndNameLinkSkipCmakeBuildSystem.patch
 installDirsSettingsCmakeBuildSystem.patch
+fix-glpk-version-check.patch