git: ba49bacd3954 - main - x11/cde*: Fix build under LLVM15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Feb 2023 16:56:01 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ba49bacd39547ace5ec3dc7c4310eb126f9b30f4
commit ba49bacd39547ace5ec3dc7c4310eb126f9b30f4
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-02-15 16:36:00 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-02-15 16:55:04 +0000
x11/cde*: Fix build under LLVM15
Fix many -Wint-conversion error such as the example below, including
an aso atomics.
connect.c:87:12: error: incompatible pointer to integer conversion initializing 'LONG' (aka 'int') with an expression of type 'void *' [-Wint-conversion]
DB_ADDR mdba = NULL; /* db address of current member record */
^ ~~~~
---
x11/cde-25/files/patch-lib_DtHelp_AccessCCDF.c | 11 +++
.../files/patch-lib_DtSearch_raima_connect.c | 13 ++++
...atch-programs_dtappbuilder_src_ab_pal__button.c | 77 +++++++++++++++++++
...atch-programs_dtappbuilder_src_ab_pal__choice.c | 65 ++++++++++++++++
...ch-programs_dtappbuilder_src_ab_pal__combobox.c | 50 +++++++++++++
...atch-programs_dtappbuilder_src_ab_pal__cpanel.c | 35 +++++++++
...tch-programs_dtappbuilder_src_ab_pal__custdlg.c | 53 +++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__drawp.c | 38 ++++++++++
...ch-programs_dtappbuilder_src_ab_pal__fchooser.c | 17 +++++
...patch-programs_dtappbuilder_src_ab_pal__group.c | 86 ++++++++++++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__label.c | 41 +++++++++++
.../patch-programs_dtappbuilder_src_ab_pal__list.c | 68 +++++++++++++++++
...tch-programs_dtappbuilder_src_ab_pal__mainwin.c | 26 +++++++
.../patch-programs_dtappbuilder_src_ab_pal__menu.c | 62 ++++++++++++++++
...tch-programs_dtappbuilder_src_ab_pal__menubar.c | 14 ++++
...patch-programs_dtappbuilder_src_ab_pal__scale.c | 68 +++++++++++++++++
.../patch-programs_dtappbuilder_src_ab_pal__sep.c | 47 ++++++++++++
...tch-programs_dtappbuilder_src_ab_pal__spinbox.c | 59 +++++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__termp.c | 47 ++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__textf.c | 50 +++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__textp.c | 59 +++++++++++++++
...h-programs_dtksh_ksh93_src_lib_libast_aso_aso.c | 11 +++
x11/cde-devel/files/patch-lib_DtHelp_AccessCCDF.c | 11 +++
.../files/patch-lib_DtSearch_raima_connect.c | 13 ++++
...atch-programs_dtappbuilder_src_ab_pal__button.c | 77 +++++++++++++++++++
...atch-programs_dtappbuilder_src_ab_pal__choice.c | 65 ++++++++++++++++
...ch-programs_dtappbuilder_src_ab_pal__combobox.c | 50 +++++++++++++
...atch-programs_dtappbuilder_src_ab_pal__cpanel.c | 35 +++++++++
...tch-programs_dtappbuilder_src_ab_pal__custdlg.c | 53 +++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__drawp.c | 38 ++++++++++
...ch-programs_dtappbuilder_src_ab_pal__fchooser.c | 17 +++++
...patch-programs_dtappbuilder_src_ab_pal__group.c | 86 ++++++++++++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__label.c | 41 +++++++++++
.../patch-programs_dtappbuilder_src_ab_pal__list.c | 68 +++++++++++++++++
...tch-programs_dtappbuilder_src_ab_pal__mainwin.c | 26 +++++++
.../patch-programs_dtappbuilder_src_ab_pal__menu.c | 62 ++++++++++++++++
...tch-programs_dtappbuilder_src_ab_pal__menubar.c | 14 ++++
...patch-programs_dtappbuilder_src_ab_pal__scale.c | 68 +++++++++++++++++
.../patch-programs_dtappbuilder_src_ab_pal__sep.c | 47 ++++++++++++
...tch-programs_dtappbuilder_src_ab_pal__spinbox.c | 59 +++++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__termp.c | 47 ++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__textf.c | 50 +++++++++++++
...patch-programs_dtappbuilder_src_ab_pal__textp.c | 59 +++++++++++++++
...h-programs_dtksh_ksh93_src_lib_libast_aso_aso.c | 11 +++
44 files changed, 1994 insertions(+)
diff --git a/x11/cde-25/files/patch-lib_DtHelp_AccessCCDF.c b/x11/cde-25/files/patch-lib_DtHelp_AccessCCDF.c
new file mode 100644
index 000000000000..f54736aa929e
--- /dev/null
+++ b/x11/cde-25/files/patch-lib_DtHelp_AccessCCDF.c
@@ -0,0 +1,11 @@
+--- lib/DtHelp/AccessCCDF.c.orig 2023-02-14 22:10:39.197575000 -0800
++++ lib/DtHelp/AccessCCDF.c 2023-02-14 22:19:30.922211000 -0800
+@@ -59,6 +59,8 @@
+ extern int errno;
+ #endif
+
++extern char *_DtHelpGetLocale(void);
++
+ /*
+ * Canvas Engine includes
+ */
diff --git a/x11/cde-25/files/patch-lib_DtSearch_raima_connect.c b/x11/cde-25/files/patch-lib_DtSearch_raima_connect.c
new file mode 100644
index 000000000000..4fba8fb41068
--- /dev/null
+++ b/x11/cde-25/files/patch-lib_DtSearch_raima_connect.c
@@ -0,0 +1,13 @@
+--- lib/DtSearch/raima/connect.c.orig 2023-02-14 21:59:59.313528000 -0800
++++ lib/DtSearch/raima/connect.c 2023-02-14 22:08:01.746583000 -0800
+@@ -84,8 +84,8 @@
+ char *orec; /* ptr to current owner record contents in cache */
+ char *mrec; /* ptr to current member record contents in cache */
+ char *nrec; /* ptr to next member record contents in cache */
+- DB_ADDR mdba = NULL; /* db address of current member record */
+- DB_ADDR ndba = NULL; /* db address of next member record */
++ DB_ADDR mdba = 0; /* db address of current member record */
++ DB_ADDR ndba = 0; /* db address of next member record */
+ INT ordering; /* set order control variable */
+ int stat, compare; /* status code & sort comparison result */
+ SET_ENTRY *set_ptr;
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__button.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__button.c
new file mode 100644
index 000000000000..29fb47974f24
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__button.c
@@ -0,0 +1,77 @@
+--- programs/dtappbuilder/src/ab/pal_button.c.orig 2023-02-15 07:51:51.770554000 -0800
++++ programs/dtappbuilder/src/ab/pal_button.c 2023-02-15 07:53:12.113232000 -0800
+@@ -294,11 +294,11 @@
+ /* Button Type */
+ n = 0;
+ item[n] = cgen->buttontype_rbox_items.Push_item;
+- item_ptr[n] = AB_BUT_PUSH; n++;
++ item_ptr[n] = (void *) AB_BUT_PUSH; n++;
+ item[n] = cgen->buttontype_rbox_items.Drawn_item;
+- item_ptr[n] = AB_BUT_DRAWN; n++;
++ item_ptr[n] = (void *) AB_BUT_DRAWN; n++;
+ item[n] = cgen->buttontype_rbox_items.Menu_item;
+- item_ptr[n] = AB_BUT_MENU; n++;
++ item_ptr[n] = (void *) AB_BUT_MENU; n++;
+ prop_radiobox_init(&(pbs->button_type), cgen->buttontype_rbox_label,
+ cgen->buttontype_rbox, n, item, item_ptr,
+ cgen->buttontype_cb);
+@@ -309,11 +309,11 @@
+ /* Label Type */
+ n = 0;
+ item[n] = cgen->labeltype_rbox_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_rbox_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ item[n] = cgen->labeltype_rbox_items.Arrow_item;
+- item_ptr[n] = AB_LABEL_ARROW_DOWN; n++;
++ item_ptr[n] = (void *) AB_LABEL_ARROW_DOWN; n++;
+ prop_options_init(&(pbs->label_type), cgen->labeltype_rbox_label,
+ cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
+ n, item, item_ptr,
+@@ -346,11 +346,11 @@
+ /* Label Align */
+ n = 0;
+ item[n] = cgen->labelalign_opmenu_items.Left_item;
+- item_ptr[n] = AB_ALIGN_LEFT; n++;
++ item_ptr[n] = (void *) AB_ALIGN_LEFT; n++;
+ item[n] = cgen->labelalign_opmenu_items.Centered_item;
+- item_ptr[n] = AB_ALIGN_CENTER; n++;
++ item_ptr[n] = (void *) AB_ALIGN_CENTER; n++;
+ item[n] = cgen->labelalign_opmenu_items.Right_item;
+- item_ptr[n] = AB_ALIGN_RIGHT; n++;
++ item_ptr[n] = (void *) AB_ALIGN_RIGHT; n++;
+ prop_options_init(&(pbs->label_align), cgen->labelalign_opmenu_label,
+ cgen->labelalign_opmenu, cgen->labelalign_opmenu_menu,
+ n, item, item_ptr,
+@@ -359,13 +359,13 @@
+ /* Arrow Direction */
+ n = 0;
+ item[n] = cgen->arrowdir_opmenu_items.Up_item;
+- item_ptr[n] = AB_LABEL_ARROW_UP; n++;
++ item_ptr[n] = (void *) AB_LABEL_ARROW_UP; n++;
+ item[n] = cgen->arrowdir_opmenu_items.Down_item;
+- item_ptr[n] = AB_LABEL_ARROW_DOWN; n++;
++ item_ptr[n] = (void *) AB_LABEL_ARROW_DOWN; n++;
+ item[n] = cgen->arrowdir_opmenu_items.Right_item;
+- item_ptr[n] = AB_LABEL_ARROW_RIGHT; n++;
++ item_ptr[n] = (void *) AB_LABEL_ARROW_RIGHT; n++;
+ item[n] = cgen->arrowdir_opmenu_items.Left_item;
+- item_ptr[n] = AB_LABEL_ARROW_LEFT; n++;
++ item_ptr[n] = (void *) AB_LABEL_ARROW_LEFT; n++;
+ prop_options_init(&(pbs->arrow_dir), cgen->arrowdir_opmenu_label,
+ cgen->arrowdir_opmenu, cgen->arrowdir_opmenu_menu,
+ n, item, item_ptr,
+@@ -380,9 +380,9 @@
+ /* Size Policy */
+ n = 0;
+ item[n] = cgen->sizepolicy_rbox_items.Size_of_Label_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->sizepolicy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pbs->size_policy), cgen->sizepolicy_rbox_label,
+ cgen->sizepolicy_rbox, n, item, item_ptr,
+ cgen->sizepolicy_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__choice.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__choice.c
new file mode 100644
index 000000000000..e8e12bdd8dcb
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__choice.c
@@ -0,0 +1,65 @@
+--- programs/dtappbuilder/src/ab/pal_choice.c.orig 2023-02-15 07:51:51.747764000 -0800
++++ programs/dtappbuilder/src/ab/pal_choice.c 2023-02-15 07:53:12.108230000 -0800
+@@ -343,9 +343,9 @@
+ /* Label, Type, Position */
+ n = 0;
+ item[n] = cgen->labeltype_rbox_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_rbox_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pcs->label_type), cgen->labeltype_rbox_label,
+ cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
+ n, item, item_ptr, cgen->labeltype_cb);
+@@ -357,9 +357,9 @@
+
+ n = 0;
+ item[n] = cgen->labelpos_rbox_items.Above_item;
+- item_ptr[n] = AB_CP_NORTH; n++;
++ item_ptr[n] = (void *) AB_CP_NORTH; n++;
+ item[n] = cgen->labelpos_rbox_items.Left_item;
+- item_ptr[n] = AB_CP_WEST; n++;
++ item_ptr[n] = (void *) AB_CP_WEST; n++;
+ prop_options_init(&(pcs->label_pos), cgen->labelpos_rbox_label,
+ cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
+ n, item, item_ptr, cgen->labeltype_cb);
+@@ -368,11 +368,11 @@
+ /* Choice Type */
+ n = 0;
+ item[n] = cgen->choicetype_rbox_items.Radio_Box_item;
+- item_ptr[n] = AB_CHOICE_EXCLUSIVE; n++;
++ item_ptr[n] = (void *) AB_CHOICE_EXCLUSIVE; n++;
+ item[n] = cgen->choicetype_rbox_items.Check_Box_item;
+- item_ptr[n] = AB_CHOICE_NONEXCLUSIVE; n++;
++ item_ptr[n] = (void *) AB_CHOICE_NONEXCLUSIVE; n++;
+ item[n] = cgen->choicetype_rbox_items.Option_Menu_item;
+- item_ptr[n] = AB_CHOICE_OPTION_MENU; n++;
++ item_ptr[n] = (void *) AB_CHOICE_OPTION_MENU; n++;
+ prop_options_init(&(pcs->choice_type), cgen->choicetype_rbox_label,
+ cgen->choicetype_rbox, cgen->choicetype_rbox_menu,
+ n, item, item_ptr,
+@@ -384,9 +384,9 @@
+ /* Rows/Columns */
+ n = 0;
+ item[n] = cgen->layout_rbox_items.Columns_item;
+- item_ptr[n] = AB_ORIENT_VERTICAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
+ item[n] = cgen->layout_rbox_items.Rows_item;
+- item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
+ prop_radiobox_init(&(pcs->row_col), cgen->layout_rbox_label,
+ cgen->layout_rbox,
+ n, item, item_ptr,
+@@ -428,9 +428,9 @@
+ /* Item Label Type */
+ n = 0;
+ item[n] = cgen->itemlabel_opmenu_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->itemlabel_opmenu_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pcs->item_label_type), cgen->itemlabel_type_label,
+ cgen->itemlabel_opmenu, cgen->itemlabel_opmenu_menu,
+ n, item, item_ptr, cgen->itemlist_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__combobox.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__combobox.c
new file mode 100644
index 000000000000..8429279b3088
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__combobox.c
@@ -0,0 +1,50 @@
+--- programs/dtappbuilder/src/ab/pal_combobox.c.orig 2023-02-15 07:51:51.783082000 -0800
++++ programs/dtappbuilder/src/ab/pal_combobox.c 2023-02-15 07:53:12.117530000 -0800
+@@ -295,9 +295,9 @@
+ /* Label, Type, Position */
+ n = 0;
+ item[n] = cgen->labeltype_rbox_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_rbox_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pcs->label_type), cgen->labeltype_rbox_label,
+ cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
+ n, item, item_ptr,
+@@ -310,9 +310,9 @@
+
+ n = 0;
+ item[n] = cgen->labelpos_rbox_items.Above_item;
+- item_ptr[n] = AB_CP_NORTH; n++;
++ item_ptr[n] = (void *) AB_CP_NORTH; n++;
+ item[n] = cgen->labelpos_rbox_items.Left_item;
+- item_ptr[n] = AB_CP_WEST; n++;
++ item_ptr[n] = (void *) AB_CP_WEST; n++;
+ prop_options_init(&(pcs->label_pos), cgen->labelpos_rbox_label,
+ cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
+ n, item, item_ptr,
+@@ -321,9 +321,9 @@
+ /* Read Only */
+ n = 0;
+ item[n] = cgen->comboboxtype_rbox_items.Static_item;
+- item_ptr[n] = True; n++;
++ item_ptr[n] = (void *) True; n++;
+ item[n] = cgen->comboboxtype_rbox_items.Editable_item;
+- item_ptr[n] = False; n++;
++ item_ptr[n] = (void *) False; n++;
+ prop_radiobox_init(&(pcs->combobox_type), cgen->comboboxtype_rbox_label,
+ cgen->comboboxtype_rbox, n, item, item_ptr,
+ cgen->comboboxtype_cb);
+@@ -339,9 +339,9 @@
+ /* Width */
+ n = 0;
+ item[n] = cgen->wpolicy_rbox_items.Longest_Item_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->wpolicy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pcs->wth_policy), cgen->wpolicy_rbox_label,
+ cgen->wpolicy_rbox, n, item, item_ptr,
+ cgen->wpolicy_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__cpanel.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__cpanel.c
new file mode 100644
index 000000000000..6ccd6f50bdcc
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__cpanel.c
@@ -0,0 +1,35 @@
+--- programs/dtappbuilder/src/ab/pal_cpanel.c.orig 2023-02-15 07:51:51.807704000 -0800
++++ programs/dtappbuilder/src/ab/pal_cpanel.c 2023-02-15 07:53:12.124476000 -0800
+@@ -281,15 +281,15 @@
+ /* Border Frame Setting */
+ n = 0;
+ item[n] = cgen->bframe_opmenu_items.None_item;
+- item_ptr[n] = AB_LINE_NONE; n++;
++ item_ptr[n] = (void *) AB_LINE_NONE; n++;
+ item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
+- item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
+ item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
+- item_ptr[n] = AB_LINE_SHADOW_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
+ item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
+ item[n] = cgen->bframe_opmenu_items.Etched_In_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
+ prop_options_init(&(pcs->frame), cgen->bframe_opmenu_label,
+ cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
+ n, item, item_ptr,
+@@ -309,9 +309,9 @@
+ /* Size Policy */
+ n = 0;
+ item[n] = cgen->size_policy_rbox_items.Fit_Contents_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->size_policy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pcs->size_policy), cgen->size_policy_rbox_label,
+ cgen->size_policy_rbox, n, item, item_ptr,
+ cgen->size_policy_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__custdlg.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__custdlg.c
new file mode 100644
index 000000000000..dadfc8cd78b9
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__custdlg.c
@@ -0,0 +1,53 @@
+--- programs/dtappbuilder/src/ab/pal_custdlg.c.orig 2023-02-15 07:51:51.804684000 -0800
++++ programs/dtappbuilder/src/ab/pal_custdlg.c 2023-02-15 07:53:12.122346000 -0800
+@@ -303,7 +303,7 @@
+ /* Window Parent */
+ n = 0;
+ item[n] = cgen->winparent_opmenu_items.None_item;
+- item_ptr[n] = 0; n++;
++ item_ptr[n] = (void *) 0; n++;
+ prop_obj_options_init(&(pcs->win_parent), cgen->winparent_opmenu_label,
+ cgen->winparent_opmenu, cgen->winparent_opmenu_menu,
+ n, item, item_ptr,
+@@ -317,9 +317,9 @@
+ /* Resize Mode */
+ n = 0;
+ item[n] = cgen->resizemode_rbox_items.Adjustable_item;
+- item_ptr[n] = True; n++;
++ item_ptr[n] = (void *) True; n++;
+ item[n] = cgen->resizemode_rbox_items.Fixed_item;
+- item_ptr[n] = False; n++;
++ item_ptr[n] = (void *) False; n++;
+ prop_radiobox_init(&(pcs->resize_mode), cgen->resizemode_rbox_label,
+ cgen->resizemode_rbox, n, item, item_ptr,
+ cgen->resizemode_cb);
+@@ -338,7 +338,7 @@
+ /* Default Button */
+ n = 0;
+ item[n] = cgen->defaultb_opmenu_items.None_item;
+- item_ptr[n] = 0; n++;
++ item_ptr[n] = (void *) 0; n++;
+ prop_obj_options_init(&(pcs->default_but), cgen->defaultb_opmenu_label,
+ cgen->defaultb_opmenu, cgen->defaultb_opmenu_menu,
+ n, item, item_ptr,
+@@ -348,7 +348,7 @@
+ /* Help Button */
+ n = 0;
+ item[n] = cgen->helpb_opmenu_items.None_item;
+- item_ptr[n] = 0; n++;
++ item_ptr[n] = (void *) 0; n++;
+ prop_obj_options_init(&(pcs->help_but), cgen->helpb_opmenu_label,
+ cgen->helpb_opmenu, cgen->helpb_opmenu_menu,
+ n, item, item_ptr,
+@@ -358,9 +358,9 @@
+ /* Size Policy */
+ n = 0;
+ item[n] = cgen->size_policy_rbox_items.Fit_Contents_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->size_policy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pcs->size_policy), cgen->size_policy_rbox_label,
+ cgen->size_policy_rbox, n, item, item_ptr,
+ cgen->size_policy_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__drawp.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__drawp.c
new file mode 100644
index 000000000000..f255845907fe
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__drawp.c
@@ -0,0 +1,38 @@
+--- programs/dtappbuilder/src/ab/pal_drawp.c.orig 2023-02-15 07:51:51.791478000 -0800
++++ programs/dtappbuilder/src/ab/pal_drawp.c 2023-02-15 07:53:12.120282000 -0800
+@@ -273,11 +273,11 @@
+ /* Scrolling */
+ n = 0;
+ item[n] = cgen->scrolldisp_rbox_items.Never_item;
+- item_ptr[n] = AB_SCROLLBAR_NEVER; n++;
++ item_ptr[n] = (void *) AB_SCROLLBAR_NEVER; n++;
+ item[n] = cgen->scrolldisp_rbox_items.Always_item;
+- item_ptr[n] = AB_SCROLLBAR_ALWAYS; n++;
++ item_ptr[n] = (void *) AB_SCROLLBAR_ALWAYS; n++;
+ item[n] = cgen->scrolldisp_rbox_items.When_Needed_item;
+- item_ptr[n] = AB_SCROLLBAR_WHEN_NEEDED; n++;
++ item_ptr[n] = (void *) AB_SCROLLBAR_WHEN_NEEDED; n++;
+ prop_radiobox_init(&(pds->scrolling), cgen->scrolldisp_rbox_label,
+ cgen->scrolldisp_rbox, n, item, item_ptr,
+ cgen->scroll_cb);
+@@ -289,15 +289,15 @@
+ /* Border Frame */
+ n = 0;
+ item[n] = cgen->bframe_opmenu_items.None_item;
+- item_ptr[n] = AB_LINE_NONE; n++;
++ item_ptr[n] = (void *) AB_LINE_NONE; n++;
+ item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
+- item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
+ item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
+- item_ptr[n] = AB_LINE_SHADOW_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
+ item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
+ item[n] = cgen->bframe_opmenu_items.Etched_In_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
+ prop_options_init(&(pds->frame), cgen->bframe_opmenu_label,
+ cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
+ n, item, item_ptr,
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__fchooser.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__fchooser.c
new file mode 100644
index 000000000000..e508fd0a21a7
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__fchooser.c
@@ -0,0 +1,17 @@
+--- programs/dtappbuilder/src/ab/pal_fchooser.c.orig 2023-02-15 07:51:51.784136000 -0800
++++ programs/dtappbuilder/src/ab/pal_fchooser.c 2023-02-15 07:53:12.118430000 -0800
+@@ -282,11 +282,11 @@
+ /* Search Pattern Type */
+ n = 0;
+ item[n] = cgen->pattern_type_rbox_items.Files_item;
+- item_ptr[n] = AB_FILE_REGULAR; n++;
++ item_ptr[n] = (void *) AB_FILE_REGULAR; n++;
+ item[n] = cgen->pattern_type_rbox_items.Directories_item;
+- item_ptr[n] = AB_FILE_DIRECTORY; n++;
++ item_ptr[n] = (void *) AB_FILE_DIRECTORY; n++;
+ item[n] = cgen->pattern_type_rbox_items.Both_item;
+- item_ptr[n] = AB_FILE_ANY; n++;
++ item_ptr[n] = (void *) AB_FILE_ANY; n++;
+ prop_radiobox_init(&(pcs->pattern_type), cgen->pattern_type_rbox_label,
+ cgen->pattern_type_rbox, n, item, item_ptr,
+ cgen->pattern_type_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__group.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__group.c
new file mode 100644
index 000000000000..9b6a37fedad8
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__group.c
@@ -0,0 +1,86 @@
+--- programs/dtappbuilder/src/ab/pal_group.c.orig 2023-02-15 07:51:51.808648000 -0800
++++ programs/dtappbuilder/src/ab/pal_group.c 2023-02-15 07:53:12.127044000 -0800
+@@ -742,15 +742,15 @@
+ /* Border Frame Setting */
+ n = 0;
+ item[n] = cgen->bframe_opmenu_items.None_item;
+- item_ptr[n] = AB_LINE_NONE; n++;
++ item_ptr[n] = (void *) AB_LINE_NONE; n++;
+ item[n] = cgen->bframe_opmenu_items.Shadow_Out_item;
+- item_ptr[n] = AB_LINE_SHADOW_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_SHADOW_OUT; n++;
+ item[n] = cgen->bframe_opmenu_items.Shadow_In_item;
+- item_ptr[n] = AB_LINE_SHADOW_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_SHADOW_IN; n++;
+ item[n] = cgen->bframe_opmenu_items.Etched_Out_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
+ item[n] = cgen->bframe_opmenu_items.Etched_In_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
+ prop_options_init(&(pgs->frame), cgen->bframe_opmenu_label,
+ cgen->bframe_opmenu, cgen->bframe_opmenu_menu,
+ n, item, item_ptr,
+@@ -759,13 +759,13 @@
+ /* Layout Type */
+ n = 0;
+ item[n] = cgen->layout_rbox_items.bitmaps_ggp_as_is_xbm_item;
+- item_ptr[n] = AB_GROUP_IGNORE; n++;
++ item_ptr[n] = (void *) AB_GROUP_IGNORE; n++;
+ item[n] = cgen->layout_rbox_items.bitmaps_ggp_col_xbm_item;
+- item_ptr[n] = AB_GROUP_COLUMNS; n++;
++ item_ptr[n] = (void *) AB_GROUP_COLUMNS; n++;
+ item[n] = cgen->layout_rbox_items.bitmaps_ggp_row_xbm_item;
+- item_ptr[n] = AB_GROUP_ROWS; n++;
++ item_ptr[n] = (void *) AB_GROUP_ROWS; n++;
+ item[n] = cgen->layout_rbox_items.bitmaps_ggp_rowcol_xbm_item;
+- item_ptr[n] = AB_GROUP_ROWSCOLUMNS; n++;
++ item_ptr[n] = (void *) AB_GROUP_ROWSCOLUMNS; n++;
+ prop_radiobox_init(&(pgs->layout_type), cgen->layout_rbox_label,
+ cgen->layout_rbox, n, item, item_ptr,
+ cgen->layout_cb1);
+@@ -781,9 +781,9 @@
+ /* Grid Row/Columns */
+ n = 0;
+ item[n] = cgen->gridrowcol_rbox_items.Rows_item;
+- item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
+ item[n] = cgen->gridrowcol_rbox_items.Columns_item;
+- item_ptr[n] = AB_ORIENT_VERTICAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
+ prop_radiobox_init(&(pgs->grid_rowcol), NULL,
+ cgen->gridrowcol_rbox, n, item, item_ptr,
+ cgen->gridrowcol_cb);
+@@ -795,13 +795,13 @@
+ /* Vertical Alignment */
+ n = 0;
+ item[n] = cgen->valign_opmenu_items.bitmaps_align_left_xbm_item;
+- item_ptr[n] = AB_ALIGN_LEFT; n++;
++ item_ptr[n] = (void *) AB_ALIGN_LEFT; n++;
+ item[n] = cgen->valign_opmenu_items.bitmaps_align_labels_xbm_item;
+- item_ptr[n] = AB_ALIGN_LABELS; n++;
++ item_ptr[n] = (void *) AB_ALIGN_LABELS; n++;
+ item[n] = cgen->valign_opmenu_items.bitmaps_align_vcenter_xbm_item;
+- item_ptr[n] = AB_ALIGN_VCENTER; n++;
++ item_ptr[n] = (void *) AB_ALIGN_VCENTER; n++;
+ item[n] = cgen->valign_opmenu_items.bitmaps_align_right_xbm_item;
+- item_ptr[n] = AB_ALIGN_RIGHT; n++;
++ item_ptr[n] = (void *) AB_ALIGN_RIGHT; n++;
+ prop_options_init(&(pgs->valign), cgen->valign_opmenu_label,
+ cgen->valign_opmenu, cgen->valign_opmenu_menu,
+ n, item, item_ptr,
+@@ -814,11 +814,11 @@
+ /* Horizontal Alignment */
+ n = 0;
+ item[n] = cgen->halign_opmenu_items.bitmaps_align_top_xbm_item;
+- item_ptr[n] = AB_ALIGN_TOP; n++;
++ item_ptr[n] = (void *) AB_ALIGN_TOP; n++;
+ item[n] = cgen->halign_opmenu_items.bitmaps_align_hcenter_xbm_item;
+- item_ptr[n] = AB_ALIGN_HCENTER; n++;
++ item_ptr[n] = (void *) AB_ALIGN_HCENTER; n++;
+ item[n] = cgen->halign_opmenu_items.bitmaps_align_bottom_xbm_item;
+- item_ptr[n] = AB_ALIGN_BOTTOM; n++;
++ item_ptr[n] = (void *) AB_ALIGN_BOTTOM; n++;
+ prop_options_init(&(pgs->halign), cgen->halign_opmenu_label,
+ cgen->halign_opmenu, cgen->halign_opmenu_menu,
+ n, item, item_ptr,
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__label.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__label.c
new file mode 100644
index 000000000000..dc915a333f62
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__label.c
@@ -0,0 +1,41 @@
+--- programs/dtappbuilder/src/ab/pal_label.c.orig 2023-02-15 07:51:51.746059000 -0800
++++ programs/dtappbuilder/src/ab/pal_label.c 2023-02-15 07:53:12.105899000 -0800
+@@ -257,9 +257,9 @@
+ /* Label Type */
+ n = 0;
+ item[n] = cgen->labeltype_rbox_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_rbox_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pls->label_type), cgen->labeltype_rbox_label,
+ cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
+ n, item, item_ptr,
+@@ -274,11 +274,11 @@
+ /* Label Align */
+ n = 0;
+ item[n] = cgen->labelalign_opmenu_items.Left_item;
+- item_ptr[n] = AB_ALIGN_LEFT; n++;
++ item_ptr[n] = (void *) AB_ALIGN_LEFT; n++;
+ item[n] = cgen->labelalign_opmenu_items.Centered_item;
+- item_ptr[n] = AB_ALIGN_CENTER; n++;
++ item_ptr[n] = (void *) AB_ALIGN_CENTER; n++;
+ item[n] = cgen->labelalign_opmenu_items.Right_item;
+- item_ptr[n] = AB_ALIGN_RIGHT; n++;
++ item_ptr[n] = (void *) AB_ALIGN_RIGHT; n++;
+ prop_options_init(&(pls->label_align), cgen->labelalign_opmenu_label,
+ cgen->labelalign_opmenu, cgen->labelalign_opmenu_menu,
+ n, item, item_ptr,
+@@ -287,9 +287,9 @@
+ /* Size Policy */
+ n = 0;
+ item[n] = cgen->szpolicy_rbox_items.Size_of_Label_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->szpolicy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pls->size_policy), cgen->szpolicy_rbox_label,
+ cgen->szpolicy_rbox, n, item, item_ptr,
+ cgen->szpolicy_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__list.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__list.c
new file mode 100644
index 000000000000..a9ae59ee2f9a
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__list.c
@@ -0,0 +1,68 @@
+--- programs/dtappbuilder/src/ab/pal_list.c.orig 2023-02-15 07:51:51.751859000 -0800
++++ programs/dtappbuilder/src/ab/pal_list.c 2023-02-15 07:53:12.110583000 -0800
+@@ -307,9 +307,9 @@
+ /* Label, Type, Position */
+ n = 0;
+ item[n] = cgen->labeltype_rbox_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_rbox_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pls->label_type), cgen->labeltype_rbox_label,
+ cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
+ n, item, item_ptr,
+@@ -322,9 +322,9 @@
+
+ n = 0;
+ item[n] = cgen->labelpos_rbox_items.Above_item;
+- item_ptr[n] = AB_CP_NORTH; n++;
++ item_ptr[n] = (void *) AB_CP_NORTH; n++;
+ item[n] = cgen->labelpos_rbox_items.Left_item;
+- item_ptr[n] = AB_CP_WEST; n++;
++ item_ptr[n] = (void *) AB_CP_WEST; n++;
+ prop_options_init(&(pls->label_pos), cgen->labelpos_rbox_label,
+ cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
+ n, item, item_ptr,
+@@ -333,13 +333,13 @@
+ /* Selection Mode */
+ n = 0;
+ item[n] = cgen->selmode_rbox_items.Single_Select_item;
+- item_ptr[n] = AB_SELECT_SINGLE; n++;
++ item_ptr[n] = (void *) AB_SELECT_SINGLE; n++;
+ item[n] = cgen->selmode_rbox_items.Browse_Select_item;
+- item_ptr[n] = AB_SELECT_BROWSE; n++;
++ item_ptr[n] = (void *) AB_SELECT_BROWSE; n++;
+ item[n] = cgen->selmode_rbox_items.Multiple_Select_item;
+- item_ptr[n] = AB_SELECT_MULTIPLE; n++;
++ item_ptr[n] = (void *) AB_SELECT_MULTIPLE; n++;
+ item[n] = cgen->selmode_rbox_items.Browse_Multiple_Select_item;
+- item_ptr[n] = AB_SELECT_BROWSE_MULTIPLE; n++;
++ item_ptr[n] = (void *) AB_SELECT_BROWSE_MULTIPLE; n++;
+ prop_options_init(&(pls->sel_mode), cgen->selmode_rbox_label,
+ cgen->selmode_rbox, cgen->selmode_rbox_menu,
+ n, item, item_ptr,
+@@ -355,9 +355,9 @@
+ /* Width */
+ n = 0;
+ item[n] = cgen->wpolicy_rbox_items.Longest_Item_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->wpolicy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pls->wth_policy), cgen->wpolicy_rbox_label,
+ cgen->wpolicy_rbox, n, item, item_ptr,
+ cgen->wpolicy_cb);
+@@ -381,9 +381,9 @@
+
+ n = 0;
+ item[n] = cgen->hgt_opmenu_items.Lines_item;
+- item_ptr[n] = SIZE_IN_CHARS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_IN_CHARS_KEY; n++;
+ item[n] = cgen->hgt_opmenu_items.Pixels_item;
+- item_ptr[n] = SIZE_IN_PIXELS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_IN_PIXELS_KEY; n++;
+ prop_options_init(&(pls->hgt_metric), cgen->hgt_opmenu_label,
+ cgen->hgt_opmenu,
+ cgen->hgt_opmenu_menu,
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__mainwin.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__mainwin.c
new file mode 100644
index 000000000000..a6ebc71c29ac
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__mainwin.c
@@ -0,0 +1,26 @@
+--- programs/dtappbuilder/src/ab/pal_mainwin.c.orig 2023-02-15 07:51:51.772526000 -0800
++++ programs/dtappbuilder/src/ab/pal_mainwin.c 2023-02-15 07:53:12.114270000 -0800
+@@ -275,9 +275,9 @@
+ /* Resize Mode */
+ n = 0;
+ item[n] = cgen->resizemode_rbox_items.Adjustable_item;
+- item_ptr[n] = True; n++;
++ item_ptr[n] = (void *) True; n++;
+ item[n] = cgen->resizemode_rbox_items.Fixed_item;
+- item_ptr[n] = False; n++;
++ item_ptr[n] = (void *) False; n++;
+ prop_radiobox_init(&(pms->resize_mode), cgen->resizemode_rbox_label,
+ cgen->resizemode_rbox, n, item, item_ptr,
+ cgen->resizemode_cb);
+@@ -309,9 +309,9 @@
+ /* Size Policy */
+ n = 0;
+ item[n] = cgen->size_policy_rbox_items.Fit_Contents_item;
+- item_ptr[n] = SIZE_OF_CONTENTS_KEY; n++;
++ item_ptr[n] = (void *) SIZE_OF_CONTENTS_KEY; n++;
+ item[n] = cgen->size_policy_rbox_items.Fixed_item;
+- item_ptr[n] = SIZE_FIXED_KEY; n++;
++ item_ptr[n] = (void *) SIZE_FIXED_KEY; n++;
+ prop_radiobox_init(&(pms->size_policy), cgen->size_policy_rbox_label,
+ cgen->size_policy_rbox, n, item, item_ptr,
+ cgen->size_policy_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__menu.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__menu.c
new file mode 100644
index 000000000000..21aa928e1739
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__menu.c
@@ -0,0 +1,62 @@
+--- programs/dtappbuilder/src/ab/pal_menu.c.orig 2023-02-15 07:51:51.765338000 -0800
++++ programs/dtappbuilder/src/ab/pal_menu.c 2023-02-15 07:53:12.111874000 -0800
+@@ -339,9 +339,9 @@
+ /* Tear-off */
+ n = 0;
+ item[n] = cgen->tearoff_rbox_items.Enabled_item;
+- item_ptr[n] = True; n++;
++ item_ptr[n] = (void *) True; n++;
+ item[n] = cgen->tearoff_rbox_items.Disabled_item;
+- item_ptr[n] = False; n++;
++ item_ptr[n] = (void *) False; n++;
+ prop_radiobox_init(&(pms->tearoff), cgen->tearoff_rbox_label,
+ cgen->tearoff_rbox, n, item, item_ptr,
+ cgen->tearoff_cb);
+@@ -368,11 +368,11 @@
+ cgen->itemlabel_field, cgen->itemlist_cb);
+ n = 0;
+ item[n] = cgen->itemlabeltype_opmenu_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->itemlabeltype_opmenu_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ item[n] = cgen->itemlabeltype_opmenu_items.Separator_item;
+- item_ptr[n] = AB_LABEL_SEPARATOR; n++;
++ item_ptr[n] = (void *) AB_LABEL_SEPARATOR; n++;
+ prop_options_init(&(pms->item_label_type), cgen->itemlabeltype_opmenu_label,
+ cgen->itemlabeltype_opmenu, cgen->itemlabeltype_opmenu_menu,
+ n, item, item_ptr, cgen->itemlist_cb);
+@@ -392,23 +392,23 @@
+ /* Item Line Style */
+ n = 0;
+ item[n] = cgen->linestyle_opmenu_items.None_item;
+- item_ptr[n] = AB_LINE_NONE; n++;
++ item_ptr[n] = (void *) AB_LINE_NONE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_In_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_Out_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_In_Dash_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN_DASH; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN_DASH; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_Out_Dash_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT_DASH; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT_DASH; n++;
+ item[n] = cgen->linestyle_opmenu_items.Single_Line_item;
+- item_ptr[n] = AB_LINE_SINGLE_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_SINGLE_LINE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Double_Line_item;
+- item_ptr[n] = AB_LINE_DOUBLE_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_DOUBLE_LINE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Single_Dashed_Line_item;
+- item_ptr[n] = AB_LINE_SINGLE_DASHED_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_SINGLE_DASHED_LINE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Double_Dashed_Line_item;
+- item_ptr[n] = AB_LINE_DOUBLE_DASHED_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_DOUBLE_DASHED_LINE; n++;
+ prop_options_init(&(pms->item_line_style), cgen->linestyle_opmenu_label,
+ cgen->linestyle_opmenu, cgen->linestyle_opmenu_menu,
+ n, item, item_ptr,
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__menubar.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__menubar.c
new file mode 100644
index 000000000000..83f8a69e1402
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__menubar.c
@@ -0,0 +1,14 @@
+--- programs/dtappbuilder/src/ab/pal_menubar.c.orig 2023-02-15 07:51:51.790341000 -0800
++++ programs/dtappbuilder/src/ab/pal_menubar.c 2023-02-15 07:53:12.119294000 -0800
+@@ -314,9 +314,9 @@
+ cgen->itemlabel_field, cgen->itemlist_cb);
+ n = 0;
+ item[n] = cgen->itemlabel_opmenu_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->itemlabel_opmenu_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pms->item_label_type), cgen->item_labeltype_label,
+ cgen->itemlabel_opmenu, cgen->itemlabel_opmenu_menu,
+ n, item, item_ptr, cgen->itemlist_cb);
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__scale.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__scale.c
new file mode 100644
index 000000000000..f80fec3aaa84
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__scale.c
@@ -0,0 +1,68 @@
+--- programs/dtappbuilder/src/ab/pal_scale.c.orig 2023-02-15 07:51:51.776871000 -0800
++++ programs/dtappbuilder/src/ab/pal_scale.c 2023-02-15 07:53:12.116478000 -0800
+@@ -292,9 +292,9 @@
+ /* Label, Type, Position */
+ n = 0;
+ item[n] = cgen->labeltype_opmenu_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_opmenu_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pss->label_type), cgen->labeltype_opmenu_label,
+ cgen->labeltype_opmenu,
+ cgen->labeltype_opmenu_menu,
+@@ -308,9 +308,9 @@
+
+ n = 0;
+ item[n] = cgen->labelpos_opmenu_items.Left_item;
+- item_ptr[n] = AB_CP_WEST; n++;
++ item_ptr[n] = (void *) AB_CP_WEST; n++;
+ item[n] = cgen->labelpos_opmenu_items.Above_item;
+- item_ptr[n] = AB_CP_NORTH; n++;
++ item_ptr[n] = (void *) AB_CP_NORTH; n++;
+ prop_options_init(&(pss->label_pos), cgen->labelpos_opmenu_label,
+ cgen->labelpos_opmenu,
+ cgen->labelpos_opmenu_menu,
+@@ -320,9 +320,9 @@
+ /* Scale Type */
+ n = 0;
+ item[n] = cgen->scaletype_rbox_items.Scale_item;
+- item_ptr[n] = False; n++;
++ item_ptr[n] = (void *) False; n++;
+ item[n] = cgen->scaletype_rbox_items.Gauge_item;
+- item_ptr[n] = True; n++;
++ item_ptr[n] = (void *) True; n++;
+ prop_radiobox_init(&(pss->scale_type), cgen->scaletype_rbox_label,
+ cgen->scaletype_rbox, n, item, item_ptr,
+ cgen->scaletype_cb);
+@@ -338,9 +338,9 @@
+ /* Orientation */
+ n = 0;
+ item[n] = cgen->orient_rbox_items.Horizontal_item;
+- item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
+ item[n] = cgen->orient_rbox_items.Vertical_item;
+- item_ptr[n] = AB_ORIENT_VERTICAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
+ prop_radiobox_init(&(pss->orient), cgen->orient_rbox_label,
+ cgen->orient_rbox, n, item, item_ptr,
+ cgen->orient_cb);
+@@ -352,13 +352,13 @@
+ /* Direction */
+ n = 0;
+ item[n] = cgen->dir_opmenu_items.Left_to_Right_item;
+- item_ptr[n] = AB_DIR_LEFT_TO_RIGHT; n++;
++ item_ptr[n] = (void *) AB_DIR_LEFT_TO_RIGHT; n++;
+ item[n] = cgen->dir_opmenu_items.Right_to_Left_item;
+- item_ptr[n] = AB_DIR_RIGHT_TO_LEFT; n++;
++ item_ptr[n] = (void *) AB_DIR_RIGHT_TO_LEFT; n++;
+ item[n] = cgen->dir_opmenu_items.Top_to_Bottom_item;
+- item_ptr[n] = AB_DIR_TOP_TO_BOTTOM; n++;
++ item_ptr[n] = (void *) AB_DIR_TOP_TO_BOTTOM; n++;
+ item[n] = cgen->dir_opmenu_items.Bottom_to_Top_item;
+- item_ptr[n] = AB_DIR_BOTTOM_TO_TOP; n++;
++ item_ptr[n] = (void *) AB_DIR_BOTTOM_TO_TOP; n++;
+ prop_options_init(&(pss->dir), cgen->dir_opmenu_label,
+ cgen->dir_opmenu, cgen->dir_opmenu_menu,
+ n, item, item_ptr,
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__sep.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__sep.c
new file mode 100644
index 000000000000..7a3a700e1c48
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__sep.c
@@ -0,0 +1,47 @@
+--- programs/dtappbuilder/src/ab/pal_sep.c.orig 2023-02-15 07:51:51.803847000 -0800
++++ programs/dtappbuilder/src/ab/pal_sep.c 2023-02-15 07:53:12.121235000 -0800
+@@ -255,9 +255,9 @@
+ /* Orientation */
+ n = 0;
+ item[n] = cgen->orient_rbox_items.Horizontal_item;
+- item_ptr[n] = AB_ORIENT_HORIZONTAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_HORIZONTAL; n++;
+ item[n] = cgen->orient_rbox_items.Vertical_item;
+- item_ptr[n] = AB_ORIENT_VERTICAL; n++;
++ item_ptr[n] = (void *) AB_ORIENT_VERTICAL; n++;
+ prop_radiobox_init(&(pss->orient), cgen->orient_rbox_label,
+ cgen->orient_rbox, n, item, item_ptr,
+ cgen->orient_cb);
+@@ -265,23 +265,23 @@
+ /* Line Style */
+ n = 0;
+ item[n] = cgen->linestyle_opmenu_items.None_item;
+- item_ptr[n] = AB_LINE_NONE; n++;
++ item_ptr[n] = (void *) AB_LINE_NONE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_In_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_Out_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_In_Dash_item;
+- item_ptr[n] = AB_LINE_ETCHED_IN_DASH; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_IN_DASH; n++;
+ item[n] = cgen->linestyle_opmenu_items.Etched_Out_Dash_item;
+- item_ptr[n] = AB_LINE_ETCHED_OUT_DASH; n++;
++ item_ptr[n] = (void *) AB_LINE_ETCHED_OUT_DASH; n++;
+ item[n] = cgen->linestyle_opmenu_items.Single_Line_item;
+- item_ptr[n] = AB_LINE_SINGLE_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_SINGLE_LINE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Double_Line_item;
+- item_ptr[n] = AB_LINE_DOUBLE_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_DOUBLE_LINE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Single_Dashed_Line_item;
+- item_ptr[n] = AB_LINE_SINGLE_DASHED_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_SINGLE_DASHED_LINE; n++;
+ item[n] = cgen->linestyle_opmenu_items.Double_Dashed_Line_item;
+- item_ptr[n] = AB_LINE_DOUBLE_DASHED_LINE; n++;
++ item_ptr[n] = (void *) AB_LINE_DOUBLE_DASHED_LINE; n++;
+ prop_options_init(&(pss->line_style), cgen->linestyle_opmenu_label,
+ cgen->linestyle_opmenu, cgen->linestyle_opmenu_menu,
+ n, item, item_ptr,
diff --git a/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__spinbox.c b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__spinbox.c
new file mode 100644
index 000000000000..b8f0d781b2bc
--- /dev/null
+++ b/x11/cde-25/files/patch-programs_dtappbuilder_src_ab_pal__spinbox.c
@@ -0,0 +1,59 @@
+--- programs/dtappbuilder/src/ab/pal_spinbox.c.orig 2023-02-15 07:51:51.805115000 -0800
++++ programs/dtappbuilder/src/ab/pal_spinbox.c 2023-02-15 07:53:12.123556000 -0800
+@@ -293,9 +293,9 @@
+ /* Spinbox Type */
+ n = 0;
+ item[n] = cgen->spinboxtype_rbox_items.Numeric_item;
+- item_ptr[n] = AB_TEXT_NUMERIC; n++;
++ item_ptr[n] = (void *) AB_TEXT_NUMERIC; n++;
+ item[n] = cgen->spinboxtype_rbox_items.String_List_item;
+- item_ptr[n] = AB_TEXT_DEFINED_STRING; n++;
++ item_ptr[n] = (void *) AB_TEXT_DEFINED_STRING; n++;
+ prop_radiobox_init(&(pss->spinbox_type), cgen->spinboxtype_rbox_label,
+ cgen->spinboxtype_rbox, n, item, item_ptr,
+ cgen->spinboxtype_cb);
+@@ -306,9 +306,9 @@
+ /* Label, Type, Position */
+ n = 0;
+ item[n] = cgen->labeltype_rbox_items.String_item;
+- item_ptr[n] = AB_LABEL_STRING; n++;
++ item_ptr[n] = (void *) AB_LABEL_STRING; n++;
+ item[n] = cgen->labeltype_rbox_items.Graphic_item;
+- item_ptr[n] = AB_LABEL_GLYPH; n++;
++ item_ptr[n] = (void *) AB_LABEL_GLYPH; n++;
+ prop_options_init(&(pss->label_type), cgen->labeltype_rbox_label,
+ cgen->labeltype_rbox, cgen->labeltype_rbox_menu,
+ n, item, item_ptr,
+@@ -321,9 +321,9 @@
+
+ n = 0;
+ item[n] = cgen->labelpos_rbox_items.Above_item;
+- item_ptr[n] = AB_CP_NORTH; n++;
++ item_ptr[n] = (void *) AB_CP_NORTH; n++;
+ item[n] = cgen->labelpos_rbox_items.Left_item;
+- item_ptr[n] = AB_CP_WEST; n++;
++ item_ptr[n] = (void *) AB_CP_WEST; n++;
+ prop_options_init(&(pss->label_pos), cgen->labeltype_rbox_label,
+ cgen->labelpos_rbox, cgen->labelpos_rbox_menu,
+ n, item, item_ptr,
+@@ -332,15 +332,15 @@
+ /* Arrow Style */
+ n = 0;
+ item[n] = cgen->arrowstyle_opmenu_items.Flat_Beginning_item;
+- item_ptr[n] = AB_ARROW_FLAT_BEGIN; n++;
*** 1336 LINES SKIPPED ***