netpbm-10.66-jasper-hack.patch 924 B

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. https://bugs.gentoo.org/513240
  2. the jasper headers are horribly broken and break things like stdbool.h.
  3. re-order the includes to work around this.
  4. --- a/converter/other/jpeg2000/jpeg2ktopam.c
  5. +++ b/converter/other/jpeg2000/jpeg2ktopam.c
  6. @@ -13,13 +13,14 @@
  7. #define _XOPEN_SOURCE 600
  8. #include <string.h>
  9. +#include <jasper/jasper.h>
  10. +
  11. #include "pm_c_util.h"
  12. #include "pam.h"
  13. #include "shhopt.h"
  14. #include "nstring.h"
  15. #include "mallocvar.h"
  16. -#include <jasper/jasper.h>
  17. #include "libjasper_compat.h"
  18. enum compmode {COMPMODE_INTEGER, COMPMODE_REAL};
  19. --- a/converter/other/jpeg2000/pamtojpeg2k.c
  20. +++ b/converter/other/jpeg2000/pamtojpeg2k.c
  21. @@ -13,13 +13,14 @@
  22. #define _XOPEN_SOURCE 600
  23. #include <string.h>
  24. +#include <jasper/jasper.h>
  25. +
  26. #include "pm_c_util.h"
  27. #include "pam.h"
  28. #include "shhopt.h"
  29. #include "nstring.h"
  30. #include "mallocvar.h"
  31. -#include <jasper/jasper.h>
  32. #include "libjasper_compat.h"