From ce180c6736a444cfb1b954c08c5ef04926260bcf Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sun, 31 Aug 2008 06:54:38 +0000 Subject: [PATCH] fixes for compile issues on freebsd --- build_num | 2 +- doc/ChangeLog | 6 +++--- qmake.inc | 34 +++++++++++++++++----------------- src/gui/PrefsDialog.cpp | 1 + src/gui/newFirewallDialog.cpp | 2 ++ src/gui/newHostDialog.cpp | 2 ++ 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/build_num b/build_num index 92331e8ee..635c61f2b 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 503 +#define BUILD_NUM 505 diff --git a/doc/ChangeLog b/doc/ChangeLog index af8a5a610..dab5af2c3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,12 +1,12 @@ -2008-08-30 vadim +2008-08-30 Vadim Kurland + + * PrefsDialog.cpp: more fixes for compile problems on FreeBSD * instDialog.cpp (instDialog::fillCompileSelectList): fixed a bug: firewall table in the compile/install dialog did not show "last compiled", "last modified", "last installed" time stamps on windows and mac. -2008-08-30 Vadim Kurland - * RuleSetDialog.cpp: fixing compile problems on FreeBSD 7.0 * instDialog.cpp (instDialog::fillCompileSelectList): resize rows diff --git a/qmake.inc b/qmake.inc index 0962327fe..a6121cd74 100644 --- a/qmake.inc +++ b/qmake.inc @@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui -MANDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 +MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ +DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ + ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a FWBPARSER_LIB = ../parsers/libfwbparser.a } @@ -30,38 +30,38 @@ unix { MOC_DIR = .moc OBJECTS_DIR = .obj - PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root + PREFIX = /home/vadim/src/fwb3-branch-v3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = - ICONSDIR = + ICONSDIR = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/ - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 + INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 - LIBS_FWCOMPILER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp - LIBS_FWBUILDER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap + LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 - datadir.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/ + doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 + datadir.path = /home/vadim/src/fwb3-branch-v3/install_root/share/ # win32:target.path = $$PREFIX/ # unix:target.path = $$PREFIX/share/fwbuilder/ # macx:target.path = $$PREFIX/ - res.path = ../Resources - res_os.path = ../Resources/os/ - res_platform.path = ../Resources/platform/ - res_help.path = ../Resources/help/ - res_desktop.path = /Users/vadim/src/fwb3-branch-v3/install_root/share//applications/ + res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0 + res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/ + res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/ + res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/ + res_desktop.path = /home/vadim/src/fwb3-branch-v3/install_root/share//applications/ INSTALLS += res INSTALLS += res_os INSTALLS += res_platform # INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll + LIBS += $$LIBS_FWBUILDER -lutil PKGLOCALEDIR = $$res.path/locale diff --git a/src/gui/PrefsDialog.cpp b/src/gui/PrefsDialog.cpp index 4997d1797..ed3c7401f 100644 --- a/src/gui/PrefsDialog.cpp +++ b/src/gui/PrefsDialog.cpp @@ -52,6 +52,7 @@ #include #include #include +#include /* diff --git a/src/gui/newFirewallDialog.cpp b/src/gui/newFirewallDialog.cpp index 8b3cbca43..d12a34fc6 100644 --- a/src/gui/newFirewallDialog.cpp +++ b/src/gui/newFirewallDialog.cpp @@ -55,6 +55,8 @@ #include #include #include +#include +#include #include diff --git a/src/gui/newHostDialog.cpp b/src/gui/newHostDialog.cpp index cc93995ff..03f40d982 100644 --- a/src/gui/newHostDialog.cpp +++ b/src/gui/newHostDialog.cpp @@ -56,6 +56,8 @@ #include #include #include +#include +#include #include