1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
freebsd-ports/x11-wm/wmanager/files/patch-ab
Peter Pentchev f2cd05db50 Add two patches for stricter C++ compliance taken from the Debian package
of wmanager.
Add an optional (on by default) dependency on the wmanager-addons port
containing two helper scripts and some manual pages.
Fix the path to the docs in pkg-message and add a reference to
the sample files' directory.  This still leaves a portlint warning about
absolute paths which will be fixed after the repo-copy in PR 123864.
Add a Makefile patch that I also added to the Debian package to make
wmanager build in the same way on all OS's.
2008-05-24 16:15:52 +00:00

43 lines
1.4 KiB
Plaintext

diff -urN -urN -x .svn ../vendor/wmanager/src/WManager.cc ./src/WManager.cc
--- ../vendor/wmanager/src/WManager.cc 2007-12-11 12:42:04.000000000 +0200
+++ ./src/WManager.cc 2007-12-17 16:09:16.000000000 +0200
@@ -24,8 +24,12 @@
// SYSTEM INCLUDES /////////////////////////////////
#include <string> // standard string class
#include <fstream> // file streams
+#include <cstdlib> // 'exit'
#include <cstring> // only for 'strtok'
+#include <iostream>
#include <pwd.h> // for home directory
+#include <unistd.h>
+#include <sys/types.h>
// PROJECT INCLUDES ////////////////////////////////
@@ -36,6 +40,7 @@
// LOCAL INCLUDES //////////////////////////////////
#include <FL/fl_message.H> // message window
+using namespace std;
// constructor
WManager::WManager()
@@ -302,7 +307,7 @@
} else {
fl_alert("Error near %s while parsing configuration file %s!"
"Try to read on...",
- name->c_str(), _ConfigurationFilename);
+ name->c_str(), _ConfigurationFilename->c_str());
} // end if
} // end if
}
@@ -310,7 +315,7 @@
// cut rest from the beginning of str
char*
-WManager::_CutString(char* str, char* rest)
+WManager::_CutString(const char* str, const char* rest)
{
int i = 0;
int n = 0;