Avoid C++11 UDL

6 files changed, 71 insertions, 1 deletions

diff --git a/x11/ede/distinfo b/x11/ede/distinfo
index 72053731652..69485cfee49 100644
--- a/x11/ede/distinfo
+++ b/x11/ede/distinfo
@@ -1,11 +1,16 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 03:28:28 agc Exp $
+$NetBSD: distinfo,v 1.6 2020/04/17 13:31:46 joerg Exp $
 
 SHA1 (ede-1.0.4.tar.bz2) = 22dfcb972ceef00fa4c79b971708b317095c612c
 RMD160 (ede-1.0.4.tar.bz2) = 1165f448a4ee0d385cc0372c9b18d0f18ec669fe
 SHA512 (ede-1.0.4.tar.bz2) = ec777d42b2ed80b0a1edb9d8087790ec3db6c6a69563464eb261d12056f3ea2d952063cca63dca348681bb2620fcd093a262d4de0239b39b7057b44ea1196d87
 Size (ede-1.0.4.tar.bz2) = 1372589 bytes
 SHA1 (patch-aa) = 53580cfa4d25730fb7cc8cd417c293978e130c95
+SHA1 (patch-common_aboutdialog.cpp) = 3ea276232880527f17fa2e261e6df5f28c145480
+SHA1 (patch-edewm_Desktop.cpp) = 651394fa0120deafee102238b5d731ed35e92c08
 SHA1 (patch-esvrconf_escreensaver_cpp) = 7f63df9d0e8f5a0997704e00df7058950233262e
+SHA1 (patch-etip_etip.cpp) = f173fd1cbd785c4d00dab00d58a2ab775a4c1775
+SHA1 (patch-eworkpanel_aboutdialog.cpp) = 47e34835e7a5327541ecb83e57041a9c5e8bacae
+SHA1 (patch-eworkpanel_menu.h) = a37d9178a120fb690bc2f8b06235c2141878d240
 SHA1 (patch-eworkpanel_workpanel_cpp) = 1c918020ed748398f6e3b41792f560bee40df271
 SHA1 (patch-fl_time_cpp) = c4189968a471c0a861af2d2b77eb0ec3a7bbf0b2
 SHA1 (patch-makeinclude.in) = 88dd36a2aee3069a99245fd77a2fcf87f816c6b1
diff --git a/x11/ede/patches/patch-common_aboutdialog.cpp b/x11/ede/patches/patch-common_aboutdialog.cpp
new file mode 100644
index 00000000000..a0ec2c683fb
--- /dev/null
+++ b/x11/ede/patches/patch-common_aboutdialog.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-common_aboutdialog.cpp,v 1.1 2020/04/17 13:31:46 joerg Exp $
+
+--- common/aboutdialog.cpp.orig	2020-04-17 12:09:09.329472450 +0000
++++ common/aboutdialog.cpp
+@@ -38,7 +38,7 @@ AboutDialog::AboutDialog(const char *pro
+ 		}
+ 		 {Fl_Box* o = new Fl_Box(5, 49, 265, 20, _("Part of Equinox Desktop Environment"));
+ 			o->align(FL_ALIGN_INSIDE|FL_ALIGN_WRAP);
+-			o->label(o->label() + Fl_String(" "PACKAGE_VERSION));
++			o->label(o->label() + Fl_String(" " PACKAGE_VERSION));
+ 		}
+ 		 {Fl_Box* o = new Fl_Box(5, 74, 265, 20, _("Copyright (c) 2000-2005 EDE Authors"));
+ 			o->align(FL_ALIGN_INSIDE|FL_ALIGN_WRAP);
diff --git a/x11/ede/patches/patch-edewm_Desktop.cpp b/x11/ede/patches/patch-edewm_Desktop.cpp
new file mode 100644
index 00000000000..218df5bea06
--- /dev/null
+++ b/x11/ede/patches/patch-edewm_Desktop.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-edewm_Desktop.cpp,v 1.1 2020/04/17 13:31:46 joerg Exp $
+
+--- edewm/Desktop.cpp.orig	2020-04-17 12:33:44.077015717 +0000
++++ edewm/Desktop.cpp
+@@ -152,7 +152,7 @@ void Desktop::update_desktop_viewport()
+ 
+ void Desktop::update_desktop_geometry()
+ {
+-    CARD32 val[2] = { Fl::w(), Fl::h() };
++    CARD32 val[2] = { CARD32(Fl::w()), CARD32(Fl::h()) };
+     XChangeProperty(fl_display, root_win, _XA_NET_DESKTOP_GEOMETRY, XA_CARDINAL, 32,
+                     PropModeReplace, (unsigned char *)&val, 2);
+ 
diff --git a/x11/ede/patches/patch-etip_etip.cpp b/x11/ede/patches/patch-etip_etip.cpp
new file mode 100644
index 00000000000..8e5a4db59fa
--- /dev/null
+++ b/x11/ede/patches/patch-etip_etip.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-etip_etip.cpp,v 1.1 2020/04/17 13:31:46 joerg Exp $
+
+--- etip/etip.cpp.orig	2020-04-17 12:19:01.541960966 +0000
++++ etip/etip.cpp
+@@ -837,7 +837,7 @@ int main (int argc, char **argv) {
+         o->label(tips[activeTip]);
+         o->window()->redraw();
+       }
+-       {Fl_Box* o = new Fl_Box(0, 0, 310, 45, _("Welcome to Equinox Desktop Environment version "PACKAGE_VERSION));
++       {Fl_Box* o = new Fl_Box(0, 0, 310, 45, _("Welcome to Equinox Desktop Environment version " PACKAGE_VERSION));
+         o->box(FL_FLAT_BOX);
+         o->color((Fl_Color)0x8ef400); 
+         o->label_color((Fl_Color)32);
diff --git a/x11/ede/patches/patch-eworkpanel_aboutdialog.cpp b/x11/ede/patches/patch-eworkpanel_aboutdialog.cpp
new file mode 100644
index 00000000000..51ef7db7641
--- /dev/null
+++ b/x11/ede/patches/patch-eworkpanel_aboutdialog.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-eworkpanel_aboutdialog.cpp,v 1.1 2020/04/17 13:31:46 joerg Exp $
+
+--- eworkpanel/aboutdialog.cpp.orig	2020-04-17 12:31:57.407732601 +0000
++++ eworkpanel/aboutdialog.cpp
+@@ -14,7 +14,7 @@ void AboutDialog(Fl_Widget*, void*) {
+    {Fl_Window* o = mAboutDialogWindow = new Fl_Window(355, 305, _("About Equinox Desktop Environment"));
+     w = o;
+     o->shortcut(0xff1b);
+-     {Fl_Box* o = new Fl_Box(5, 25, 345, 35, _("Equinox Desktop Environment "PACKAGE_VERSION));
++     {Fl_Box* o = new Fl_Box(5, 25, 345, 35, _("Equinox Desktop Environment " PACKAGE_VERSION));
+       o->label_font(fl_fonts+1);
+       o->color((Fl_Color)56);
+       o->label_color((Fl_Color)32);
diff --git a/x11/ede/patches/patch-eworkpanel_menu.h b/x11/ede/patches/patch-eworkpanel_menu.h
new file mode 100644
index 00000000000..3b2565c2627
--- /dev/null
+++ b/x11/ede/patches/patch-eworkpanel_menu.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-eworkpanel_menu.h,v 1.1 2020/04/17 13:31:46 joerg Exp $
+
+--- eworkpanel/menu.h.orig	2020-04-17 12:32:43.238786865 +0000
++++ eworkpanel/menu.h
+@@ -22,7 +22,7 @@ static const char default_menu[] =
+   <Item Type=\"Exec\" Icon=\"efinder.png\" Exec=\"efinder\">\n\
+     <Name>Find</Name>\n\
+   </Item>\n\
+-  <Item Type=\"Exec\" Icon=\"ehelpbook.png\" Exec=\"file:"PREFIX"/share/ede/doc/index.html\">\n\
++  <Item Type=\"Exec\" Icon=\"ehelpbook.png\" Exec=\"file:" PREFIX "/share/ede/doc/index.html\">\n\
+     <Name>Help</Name>\n\
+   </Item>\n\
+   <Item Type=\"Exec\" Icon=\"about.png\" Exec=\"$ABOUT\">\n\