Bug#274248: hitop: FTBFS with gcc-3.4: extra ';' and libpq++.h does not exist

[Andreas Jochens]

Package: hitop
Severity: normal
Tags: patch

When building 'hitop' with gcc-3.4 I get the following error:

dpkg-source: building hitop in hitop_0.36-3.1.diff.gz
dpkg-source: building hitop in hitop_0.36-3.1.dsc
 debian/rules build
test -d debian/patched || install -d debian/patched
dpatch  apply-all  
applying patch 01_makefile to ./ ... ok.
applying patch 02_gcc33 to ./ ... ok.
applying patch 03_remove_pgsql to ./ ... ok.
dpatch  cat-all  >>patch-stampT
mv -f patch-stampT patch-stamp
dh_testdir
# We might strip later if dh_strip thinks that's wise
/usr/bin/make CFLAGS="-Wall -g -pedantic -O3" STRIP=/bin/true
make[1]: Entering directory `/hitop-0.36'
Remaking the file dependancies
/usr/bin/g++ -MM *.cc plugins/*.cc tables/*.cc> Make.dependancies
plugins/pgsql.cc:23:21: libpq++.h: No such file or directory
make[1]: *** [Make.dependancies] Error 1
make[1]: Leaving directory `/hitop-0.36'
make: *** [build-stamp] Error 2

With the attached patch 'hitop' can be compiled using gcc-3.4.

Regards
Andreas Jochens

diff -urN ../tmp-orig/hitop-0.36/hitoplive.cc ./hitoplive.cc
--- ../tmp-orig/hitop-0.36/hitoplive.cc 2002-12-30 20:26:37.000000000 +0100
+++ ./hitoplive.cc      2004-09-30 17:45:46.677486512 +0200
@@ -211,7 +211,7 @@
     begin=end;
   }
   
Main->SetVar(string("COOKIE_")+string(startofname,endofname),string(startofval,endofval),Vars::Global);
-};
+}
 
 static void DoCookies(HTMLStream *Main) {
   char* ccookies = getenv("HTTP_COOKIE");
diff -urN ../tmp-orig/hitop-0.36/navstore.cc ./navstore.cc
--- ../tmp-orig/hitop-0.36/navstore.cc  2001-04-24 09:53:54.000000000 +0200
+++ ./navstore.cc       2004-09-30 17:45:13.624511328 +0200
@@ -145,7 +145,7 @@
 }
 
 
-void NavStore::DefaultOpenPre(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {};
+void NavStore::DefaultOpenPre(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {}
 
 void NavStore::DefaultOpenEntry(HTMLStream& stream,HTMLStream::iterator 
Cur,int level,bool last) {
   string Text;
@@ -158,20 +158,20 @@
   stream.m_stream.insert(Cur,HTML(false,m_title));
   if (!m_open) stream.m_stream.insert(Cur,HTML(true,"/A"));
   stream.m_stream.insert(Cur,HTML(true,"BR"));
-};
+}
 
-void NavStore::DefaultOpenPost(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {};
+void NavStore::DefaultOpenPost(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {}
 
-void NavStore::DefaultFlatPre(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {};
+void NavStore::DefaultFlatPre(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {}
 
 void NavStore::DefaultFlatEntry(HTMLStream& stream,HTMLStream::iterator 
Cur,int level,bool last) {
   if (!m_open) stream.m_stream.insert(Cur,HTML(true,"A HREF=\""+m_url+"\""));
   stream.m_stream.insert(Cur,HTML(false,m_title));
   if (!m_open) stream.m_stream.insert(Cur,HTML(true,"/A"));
   if (!last) stream.m_stream.insert(Cur,HTML(false," | "));
-};
+}
 
 void NavStore::DefaultFlatPost(HTMLStream& stream,HTMLStream::iterator Cur,int 
level) {
   stream.m_stream.insert(Cur,HTML(true,"BR"));
-};
+}
 
diff -urN ../tmp-orig/hitop-0.36/plugins/calendar.cc ./plugins/calendar.cc
--- ../tmp-orig/hitop-0.36/plugins/calendar.cc  2001-04-26 17:25:56.000000000 
+0200
+++ ./plugins/calendar.cc       2004-09-30 17:46:01.761193440 +0200
@@ -22,7 +22,7 @@
 
 dsoCalMod::dsoCalMod() {
   RegisterPlugin("calendar",1);
-};
+}
 
 void dsoCalMod::Init() {
   Plugin::SetNamespace("CALENDAR");
diff -urN ../tmp-orig/hitop-0.36/plugins/notify.cc ./plugins/notify.cc
--- ../tmp-orig/hitop-0.36/plugins/notify.cc    2002-12-30 20:07:36.000000000 
+0100
+++ ./plugins/notify.cc 2004-09-30 17:46:51.648609400 +0200
@@ -36,7 +36,7 @@
 
 dsoNotifyMod::dsoNotifyMod() {
   RegisterPlugin("notify",1);
-};
+}
 
 void dsoNotifyMod::Init() {
   SetNamespace("NOTIFY");
diff -urN ../tmp-orig/hitop-0.36/plugins/pgsql.cc ./plugins/pgsql.cc
--- ../tmp-orig/hitop-0.36/plugins/pgsql.cc     2002-12-02 00:32:21.000000000 
+0100
+++ ./plugins/pgsql.cc  2004-09-30 17:44:16.597180800 +0200
@@ -20,7 +20,6 @@
 #include <string>
 #include <vector>
 #include <algorithm>
-#include <libpq++.h>
 
 class dsoDBpgsqlMod :public Plugin{
 public:
diff -urN ../tmp-orig/hitop-0.36/plugins/scheduler.cc ./plugins/scheduler.cc
--- ../tmp-orig/hitop-0.36/plugins/scheduler.cc 2001-04-26 17:25:56.000000000 
+0200
+++ ./plugins/scheduler.cc      2004-09-30 17:46:38.133663984 +0200
@@ -53,7 +53,7 @@
 
 dsoSchedMod::dsoSchedMod() {
   RegisterPlugin("scheduler",1);
-};
+}
 
 void dsoSchedMod::Init() {
   SetNamespace("SCHEDULER");


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@xxxxxxxxxxxxxxxx
with a subject of "unsubscribe". Trouble? Contact listmaster@xxxxxxxxxxxxxxxx