diff --git a/print/hplip/patches/patch-scan_sane_hpaio_c b/print/hplip/patches/patch-scan_sane_hpaio_c
index e08258b9e18..6c820ef10ad 100644
--- a/print/hplip/patches/patch-scan_sane_hpaio_c
+++ b/print/hplip/patches/patch-scan_sane_hpaio_c
@@ -1,9 +1,20 @@
+Fix build with llvm 22.
+
 scan/sane/hpaio.c:555:8: error: void function 'sane_hpaio_cancel' should not return a value [-Wreturn-type]
        return orblite_cancel(handle)
 
 Index: scan/sane/hpaio.c
 --- scan/sane/hpaio.c.orig
 +++ scan/sane/hpaio.c
+@@ -378,7 +378,7 @@ extern SANE_Status sane_hpaio_get_devices(const SANE_D
+    ResetDeviceList(&DeviceList);
+    DevDiscovery(localOnly);
+    *deviceList = (const SANE_Device **)DeviceList;
+-   SANE_Device*** devList;
++   const SANE_Device*** devList;
+    orblite_get_devices(devList, localOnly);
+ 
+    return SANE_STATUS_GOOD;
 @@ -427,7 +427,7 @@ extern void sane_hpaio_close(SANE_Handle handle)
      if (strcmp(*((char **)handle), "ESCL") == 0)
         return escl_close(handle);
diff --git a/print/hplip/patches/patch-scan_sane_ledmi_h b/print/hplip/patches/patch-scan_sane_ledmi_h
new file mode 100644
index 00000000000..f6075593142
--- /dev/null
+++ b/print/hplip/patches/patch-scan_sane_ledmi_h
@@ -0,0 +1,14 @@
+Fix build with llvm 22.
+
+Index: scan/sane/ledmi.h
+--- scan/sane/ledmi.h.orig
++++ scan/sane/ledmi.h
+@@ -162,7 +162,7 @@ struct ledm_session
+ int bb_open(struct ledm_session*);
+ int bb_close(struct ledm_session*);
+ int bb_get_parameters(struct ledm_session*, SANE_Parameters*, int);
+-int bb_is_paper_in_adf();         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
++int bb_is_paper_in_adf(struct ledm_session*);         /* 0 = no paper in adf, 1 = paper in adf, -1 = error */
+ SANE_Status bb_start_scan(struct ledm_session*);
+ int bb_get_image_data(struct ledm_session*, int); 
+ int bb_end_page(struct ledm_session*, int);
diff --git a/print/hplip/patches/patch-scan_sane_orblite_c b/print/hplip/patches/patch-scan_sane_orblite_c
index 2e06e0cebd8..38ad3f4b124 100644
--- a/print/hplip/patches/patch-scan_sane_orblite_c
+++ b/print/hplip/patches/patch-scan_sane_orblite_c
@@ -1,3 +1,5 @@
+Fix build with llvm 22.
+
 Index: scan/sane/orblite.c
 --- scan/sane/orblite.c.orig
 +++ scan/sane/orblite.c
@@ -10,3 +12,100 @@ Index: scan/sane/orblite.c
  #include "sane.h"           /* SANE API */
  #define DEBUG_NOT_STATIC
  #undef NDEBUG
+@@ -63,28 +65,28 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
+ 		SANE_NAME_SCAN_TL_X, SANE_TITLE_SCAN_TL_X, SANE_DESC_SCAN_TL_X,  // name, title, desc
+ 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeLeft  // constraint_type, constraint
++		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeLeft  // constraint_type, constraint
+ 	},
+ 
+ 	{
+ 		SANE_NAME_SCAN_TL_Y, SANE_TITLE_SCAN_TL_Y, SANE_DESC_SCAN_TL_Y,  // name, title, desc
+ 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeTop  // constraint_type, constraint
++		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeTop  // constraint_type, constraint
+ 	},
+   
+ 	{
+ 		SANE_NAME_SCAN_BR_X, SANE_TITLE_SCAN_BR_X, SANE_DESC_SCAN_BR_X,  // name, title, desc
+ 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeRight  // constraint_type, constraint
++		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeRight  // constraint_type, constraint
+ 	},
+ 
+ 	{
+ 		SANE_NAME_SCAN_BR_Y, SANE_TITLE_SCAN_BR_Y, SANE_DESC_SCAN_BR_Y,  // name, title, desc
+ 		SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeBottom  // constraint_type, constraint
++		SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeBottom  // constraint_type, constraint
+ 	},
+    
+ 	// optResolution,                                       // resolution group  
+@@ -92,7 +94,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
+ 		SANE_NAME_SCAN_RESOLUTION, SANE_TITLE_SCAN_RESOLUTION, SANE_DESC_SCAN_RESOLUTION, // name, title, desc
+ 		SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word),  // type, unit, size,
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
++		SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
+ 	},
+ 
+ 	// optMode,                                            // color/depth group
+@@ -100,7 +102,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
+ 		SANE_NAME_SCAN_MODE, SANE_TITLE_SCAN_MODE, SANE_DESC_SCAN_MODE, // name, title, desc
+ 		SANE_TYPE_STRING, SANE_UNIT_NONE, 256,  // type, unit, size,
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_modes   // constraint type, constraint
++		SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_modes   // constraint type, constraint
+ 	},
+  
+ 	// optSource, 
+@@ -108,7 +110,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
+ 		SANE_NAME_SCAN_SOURCE, SANE_TITLE_SCAN_SOURCE, SANE_DESC_SCAN_SOURCE, // name, title, desc
+ 		SANE_TYPE_STRING, SANE_UNIT_NONE, 256,  // type, unit, size,
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_sources   // constraint type, constraint
++		SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_sources   // constraint type, constraint
+ 	},
+  
+ 	// optPaperSize, 
+@@ -116,7 +118,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
+ 		SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
+ 		SANE_TYPE_STRING, SANE_UNIT_NONE, 256,  // type, unit, size,
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_paper_sizes   // constraint type, constraint
++		SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_paper_sizes   // constraint type, constraint
+ 	},
+  
+ 	// optPaperSize, 
+@@ -124,7 +126,7 @@ SANE_Option_Descriptor	DefaultOrbOptions[] = {
+ 		SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
+ 		SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word),  // type, unit, size,
+ 		SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT,      // cap(ability)
+-		SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
++		SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
+ 	},
+ #ifdef NOTDEF
+ // default template
+@@ -273,6 +275,7 @@ orblite_open (SANE_String_Const devicename, SANE_Handl
+ 	SANE_Auth_Callback authorize;
+ 	const SANE_Device *** device_list;
+ 	SANE_Bool local_only;
++	void * temp_handle;
+ 	
+ 	
+ 	// Allocate handle, set all handle values to zero
+@@ -304,7 +307,9 @@ orblite_open (SANE_String_Const devicename, SANE_Handl
+ 	if (stat != SANE_STATUS_GOOD)
+ 		return stat;
+ 
+-	stat = g_handle->bb_orblite_open(devicename, &g_handle);
++	temp_handle = g_handle;
++	stat = g_handle->bb_orblite_open(devicename, &temp_handle);
++	g_handle = temp_handle;
+ 	if (stat == SANE_STATUS_GOOD)
+ 		*handle = g_handle;
+