Thread: Re: [Fwbuilder-discussion] OpenBSD-related patches
Brought to you by:
mikehorn
From: Vadim J. <per...@gm...> - 2010-05-23 22:43:14
|
(Hm-m-m, looks like previous mail didn't get in; maybe because I didn't subscribe to the list?.. Anyway, sending updated mail now) Sunday 23 May 2010 18:52:42 Vadim Jukov wrote: > Hello all. > > I'm a maintainer of FWBuilder OpenBSD port. Since SourceForge tracker > isn't open to everybody as stated on the program page, I'm writing > here. > > Here are two patches that make {lib,}fwbuilder compile and run on > OpenBSD. They should not break anything out more, AFAIK. > > There is one more patch but I'm still investigating it's correctness. ... And now all patches were tested (and slightly tweaked). Hope they'll go in 4.0.2 release. -- Best wishes, Vadim Zhukov | | According to POSIX, <utmpx.h> defines only struct utmpx. This struct | is not being referenced in src/gui at all. And OpenBSD does not have | this header either. | --- src/gui/ssh_wrappers.cpp.orig Sun May 23 18:23:27 2010 +++ src/gui/ssh_wrappers.cpp Sun May 23 18:23:35 2010 @@ -39,7 +39,6 @@ #include <termios.h> #include <time.h> #include <sys/select.h> -#include <utmpx.h> #ifdef HAVE_SIGNAL_H #include <signal.h> | | This makes "FWObject.h" included after config.h, which in turn | sets up some defines. Also, when building fwbuilder project, it | obviously should refer to libfwbuilder headers as system (<abc.h>), | not local ("abc.h") ones. | --- src/gui/FWBSettings.h.orig Sun Mar 7 09:28:49 2010 +++ src/gui/FWBSettings.h Sun May 23 18:46:26 2010 @@ -26,9 +26,7 @@ #ifndef __FWBSETTINGS_H_ #define __FWBSETTINGS_H_ -#include "fwbuilder/FWObject.h" - #include <qsettings.h> #include <qrect.h> #include <qprinter.h> @@ -37,6 +35,8 @@ #include <set> #define SETTINGS_PATH_PREFIX "/4.0" + +#include <fwbuilder/FWObject.h> class QWidget; | | <unistd.h> presence (is there any *nix without it?!) check is done | by configure but not used. This patch fixes it. Other patches below | utilizes HAVE_UNISTD_H definition. | --- config.h.in.orig Sun May 23 22:45:41 2010 +++ config.h.in Sun May 23 22:46:14 2010 @@ -61,6 +61,7 @@ #undef HAVE_PTY_H #undef HAVE_LIBUTIL_H #undef HAVE_UTIL_H +#undef HAVE_UNISTD_H #ifdef HAVE_GETOPT_H # define HAVE_DECL_GETOPT HAVE_GETOPT_H | | getuid() is defined in <unistd.h> | --- src/fwtransfer/TransferDevice.cpp.orig Sun May 23 16:37:18 2010 +++ src/fwtransfer/TransferDevice.cpp Sun May 23 16:37:40 2010 @@ -19,6 +19,9 @@ #include <string> #include <sys/types.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #include <QDebug> #include <QString> | | chdir() is defined in <unistd.h>. Also, move inclusion of configuration | headers at the top so the configuration is actually used. | --- src/transfer_agents/secuwall/transfer_secuwall.cpp.orig Sun May 23 22:39:06 2010 +++ src/transfer_agents/secuwall/transfer_secuwall.cpp Sun May 23 22:42:17 2010 @@ -14,10 +14,17 @@ * o The terms of NetCitadel End User License Agreement */ +#include "../../../config.h" +#include "../../../build_num" + #include <iostream> #include <fstream> #include <sys/stat.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #ifdef _WIN32 #include <windows.h> #include <direct.h> @@ -34,9 +41,6 @@ #include <stdlib.h> #endif #endif - -#include "../../../config.h" -#include "../../../build_num" #include "fwbuilder/FWException.h" |
From: Vadim K. <va...@vk...> - 2010-05-24 00:31:06
|
no need to wait till 4.0.2, I applied patch in 4.0.1 Thanks! --vk On Sun, May 23, 2010 at 3:43 PM, Vadim Jukov <per...@gm...> wrote: > (Hm-m-m, looks like previous mail didn't get in; maybe because I didn't subscribe to the list?.. Anyway, sending > updated mail now) > > Sunday 23 May 2010 18:52:42 Vadim Jukov wrote: >> Hello all. >> >> I'm a maintainer of FWBuilder OpenBSD port. Since SourceForge tracker >> isn't open to everybody as stated on the program page, I'm writing >> here. >> >> Here are two patches that make {lib,}fwbuilder compile and run on >> OpenBSD. They should not break anything out more, AFAIK. >> >> There is one more patch but I'm still investigating it's correctness. > > ... And now all patches were tested (and slightly tweaked). Hope they'll > go in 4.0.2 release. > > -- > Best wishes, > Vadim Zhukov > > > | > | According to POSIX, <utmpx.h> defines only struct utmpx. This struct > | is not being referenced in src/gui at all. And OpenBSD does not have > | this header either. > | > --- src/gui/ssh_wrappers.cpp.orig Sun May 23 18:23:27 2010 > +++ src/gui/ssh_wrappers.cpp Sun May 23 18:23:35 2010 > @@ -39,7 +39,6 @@ > #include <termios.h> > #include <time.h> > #include <sys/select.h> > -#include <utmpx.h> > > #ifdef HAVE_SIGNAL_H > #include <signal.h> > | > | This makes "FWObject.h" included after config.h, which in turn > | sets up some defines. Also, when building fwbuilder project, it > | obviously should refer to libfwbuilder headers as system (<abc.h>), > | not local ("abc.h") ones. > | > --- src/gui/FWBSettings.h.orig Sun Mar 7 09:28:49 2010 > +++ src/gui/FWBSettings.h Sun May 23 18:46:26 2010 > @@ -26,9 +26,7 @@ > #ifndef __FWBSETTINGS_H_ > #define __FWBSETTINGS_H_ > > -#include "fwbuilder/FWObject.h" > > - > #include <qsettings.h> > #include <qrect.h> > #include <qprinter.h> > @@ -37,6 +35,8 @@ > #include <set> > > #define SETTINGS_PATH_PREFIX "/4.0" > + > +#include <fwbuilder/FWObject.h> > > class QWidget; > > | > | <unistd.h> presence (is there any *nix without it?!) check is done > | by configure but not used. This patch fixes it. Other patches below > | utilizes HAVE_UNISTD_H definition. > | > --- config.h.in.orig Sun May 23 22:45:41 2010 > +++ config.h.in Sun May 23 22:46:14 2010 > @@ -61,6 +61,7 @@ > #undef HAVE_PTY_H > #undef HAVE_LIBUTIL_H > #undef HAVE_UTIL_H > +#undef HAVE_UNISTD_H > > #ifdef HAVE_GETOPT_H > # define HAVE_DECL_GETOPT HAVE_GETOPT_H > | > | getuid() is defined in <unistd.h> > | > --- src/fwtransfer/TransferDevice.cpp.orig Sun May 23 16:37:18 2010 > +++ src/fwtransfer/TransferDevice.cpp Sun May 23 16:37:40 2010 > @@ -19,6 +19,9 @@ > #include <string> > > #include <sys/types.h> > +#ifdef HAVE_UNISTD_H > +#include <unistd.h> > +#endif > > #include <QDebug> > #include <QString> > | > | chdir() is defined in <unistd.h>. Also, move inclusion of configuration > | headers at the top so the configuration is actually used. > | > --- src/transfer_agents/secuwall/transfer_secuwall.cpp.orig Sun May 23 22:39:06 2010 > +++ src/transfer_agents/secuwall/transfer_secuwall.cpp Sun May 23 22:42:17 2010 > @@ -14,10 +14,17 @@ > * o The terms of NetCitadel End User License Agreement > */ > > +#include "../../../config.h" > +#include "../../../build_num" > + > #include <iostream> > #include <fstream> > #include <sys/stat.h> > > +#ifdef HAVE_UNISTD_H > +#include <unistd.h> > +#endif > + > #ifdef _WIN32 > #include <windows.h> > #include <direct.h> > @@ -34,9 +41,6 @@ > #include <stdlib.h> > #endif > #endif > - > -#include "../../../config.h" > -#include "../../../build_num" > > #include "fwbuilder/FWException.h" > > > ------------------------------------------------------------------------------ > > _______________________________________________ > Fwbuilder-discussion mailing list > Fwb...@li... > https://lists.sourceforge.net/lists/listinfo/fwbuilder-discussion > |