From c8d89d6e5cb019419a9bf3075415248f15c24a39 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@backtick.net>
Date: Thu, 13 Mar 2025 20:05:57 -0600
Subject: [PATCH] Revert "Fix include paths for LZO headers"

LZO headers require LZO's ${includedir} to be in the compiler include
path, since they all #include <lzo/lzoconf.h>.  However, its pkg-config
file only specifies -I${includedir}/lzo, so our previous change (to
trust the LZO pkg-config file) just caused an include failure later on.
Revert it, preparatory to a new fix.

This reverts commit 9735309da66d0d9941cf9445ffca09be4cf80fc0.
---
 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 c45cc5086..7027f6027 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 <lzo2a.h>
+#include <lzo/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 a5eca6ffc..21fba5cc7 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 <lzo2a.h>
+#include <lzo/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 167cd7a1e..a69ae5f5a 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 <lzo2a.h>
+#include <lzo/lzo2a.h>
 #endif
 
 #define DEBUG_SCAN 0