From 9735309da66d0d9941cf9445ffca09be4cf80fc0 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@backtick.net>
Date: Wed, 4 Sep 2024 22:25:07 -0700
Subject: [PATCH] Fix include paths for LZO headers

lzo2's pkg-config file has always specified "Cflags: -I${includedir}/lzo".
Including <lzo/lzo2a.h> happens to work if ${includedir} is already on the
header search path, e.g. it's /usr/include.  However, if lzo2 is in an
unusual location and we're depending on pkg-config to tell us where it is,
we'll end up looking for ${includedir}/lzo/lzo/lzo2a.h and failing the
build:

    util/cairo-script/cairo-script-file.c:45:10: fatal error: 'lzo/lzo2a.h' file not found

Fix the include paths.
---
 util/cairo-script/cairo-script-file.c      | 2 +-
 util/cairo-script/cairo-script-operators.c | 2 +-
 util/cairo-script/cairo-script-scanner.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/cairo-script/cairo-script-file.c b/util/cairo-script/cairo-script-file.c
index 7027f6027..c45cc5086 100644
--- a/util/cairo-script/cairo-script-file.c
+++ b/util/cairo-script/cairo-script-file.c
@@ -42,7 +42,7 @@
 #include <zlib.h>
 
 #if HAVE_LZO
-#include <lzo/lzo2a.h>
+#include <lzo2a.h>
 #endif
 
 #define CHUNK_SIZE 32768
diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c
index 21fba5cc7..a5eca6ffc 100644
--- a/util/cairo-script/cairo-script-operators.c
+++ b/util/cairo-script/cairo-script-operators.c
@@ -60,7 +60,7 @@
 #endif
 
 #if HAVE_LZO
-#include <lzo/lzo2a.h>
+#include <lzo2a.h>
 #endif
 
 #ifdef HAVE_MMAP
diff --git a/util/cairo-script/cairo-script-scanner.c b/util/cairo-script/cairo-script-scanner.c
index a69ae5f5a..167cd7a1e 100644
--- a/util/cairo-script/cairo-script-scanner.c
+++ b/util/cairo-script/cairo-script-scanner.c
@@ -46,7 +46,7 @@
 #include <zlib.h>
 
 #if HAVE_LZO
-#include <lzo/lzo2a.h>
+#include <lzo2a.h>
 #endif
 
 #define DEBUG_SCAN 0