From 3b32ae7547d742f6e65770361188670710bec186 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 21 Feb 2023 02:22:31 +0000
Subject: gentoo auto-resync : 21:02:2023 - 02:22:31

---
 x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch | 53 ++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 11 deletions(-)

(limited to 'x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch')

diff --git a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
index 23cacdc43a2b..1fab782112d2 100644
--- a/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
+++ b/x11-wm/aewm++/files/aewm++-1.1.5-gcc43.patch
@@ -1,6 +1,16 @@
-diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc
---- aewm++-1.1.5.orig/client.cc	2005-05-23 06:06:01.000000000 +0300
-+++ aewm++-1.1.5/client.cc	2008-05-03 23:50:02.000000000 +0300
+--- a/aewm.hh
++++ b/aewm.hh
+@@ -87,7 +87,7 @@
+ #define BW (has_border ? wm->getOptBW() : 0)
+ 
+ // defined in main.cc
+-void forkExec(char *);
++void forkExec(const char *);
+ int handleXError(Display *, XErrorEvent *);
+ 
+ class Client;
+--- a/client.cc
++++ b/client.cc
 @@ -6,6 +6,8 @@
   */
  #include "aewm.hh"
@@ -10,21 +20,22 @@ diff -ur aewm++-1.1.5.orig/client.cc aewm++-1.1.5/client.cc
  Client::Client(Display *d, Window new_client)
  {
  	initialize(d);
-diff -ur aewm++-1.1.5.orig/main.cc aewm++-1.1.5/main.cc
---- aewm++-1.1.5.orig/main.cc	2005-02-12 05:38:32.000000000 +0200
-+++ aewm++-1.1.5/main.cc	2008-05-03 23:50:02.000000000 +0300
-@@ -6,6 +6,8 @@
+--- a/main.cc
++++ b/main.cc
+@@ -6,8 +6,10 @@
   */
   #include "aewm.hh"
  
 +#include <string.h>
 +
  // Dunno where I ripped this from. Kudos to the author whoever he is!
- void forkExec(char *cmd)
+-void forkExec(char *cmd)
++void forkExec(const char *cmd)
  {
-diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc
---- aewm++-1.1.5.orig/windowmanager.cc	2005-05-17 04:41:42.000000000 +0300
-+++ aewm++-1.1.5/windowmanager.cc	2008-05-03 23:50:02.000000000 +0300
+     if(! (strlen(cmd)>0)) return;
+     
+--- a/windowmanager.cc
++++ b/windowmanager.cc
 @@ -6,6 +6,8 @@
   */
  #include "aewm.hh"
@@ -34,3 +45,23 @@ diff -ur aewm++-1.1.5.orig/windowmanager.cc aewm++-1.1.5/windowmanager.cc
  WindowManager* wm;
  
  #define AEWM_KEY_ALT_COUNT 4
+@@ -1020,7 +1022,7 @@
+ {
+ 	cleanup();
+ 	
+-	execl("/bin/sh", "sh", "-c", command_line.c_str(), 0);
++	execl("/bin/sh", "sh", "-c", command_line.c_str(), (const char*)NULL);
+ }
+ 
+ void WindowManager::quitNicely()
+--- a/windowmanager.hh
++++ b/windowmanager.hh
+@@ -46,7 +46,7 @@
+ 	string 	command_line;
+ 	int 	max_desktops;
+ 	int 	focus_model;	
+-	char 	*opt_display,	
++	const char 	*opt_display,
+ 		*opt_fc, 
+ 		*opt_fg,
+ 		*opt_fm, 
-- 
cgit v1.2.3