From 7d7c5d1dc60cb2bb2b1be0492ded3a44e32b360c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 10 Jun 2012 01:55:05 -0500
Subject: Fix a number of tdebindings build issues This partially resolves Bug
 597 Thanks to Darrell Anderson for the patch! (part of the original commit)
 (cherry picked from commit b2e0df6cf55f8accd86fb0a726724744857714f4)

---
 dcopperl/DCOP.xs        | 10 +++++-----
 dcopperl/Makefile.PL    |  4 ++--
 dcopperl/Makefile.PL.in |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'dcopperl')

diff --git a/dcopperl/DCOP.xs b/dcopperl/DCOP.xs
index 509366af..177b6769 100644
--- a/dcopperl/DCOP.xs
+++ b/dcopperl/DCOP.xs
@@ -26,11 +26,11 @@
 #undef vform
 #endif
 
-#include <qpoint.h>
-#include <qrect.h>
-#include <qregexp.h>
-#include <qsize.h>
-#include <qstringlist.h>
+#include <tqpoint.h>
+#include <tqrect.h>
+#include <tqregexp.h>
+#include <tqsize.h>
+#include <tqstringlist.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/dcopperl/Makefile.PL b/dcopperl/Makefile.PL
index c22ff234..085fc266 100644
--- a/dcopperl/Makefile.PL
+++ b/dcopperl/Makefile.PL
@@ -4,7 +4,7 @@ use Config;
 # the contents of the Makefile that is written.
 
 print "Trying to find some configuration information...\n";
-my $kde_dirs = $ENV{KDEDIRS} || '/usr/local/kde';
+my $kde_dirs = $ENV{KDEDIRS} || '/opt/trinity';
 my $qt_dir = $ENV{QTDIR} || '/usr/lib/qt';
 my $kde_inc = "$kde_dirs/include";
 my $kde_lib = "$kde_dirs/lib";
@@ -26,7 +26,7 @@ chomp $input, $kde_lib = $input if (($input = <>) =~ /\S/);
 WriteMakefile(
     NAME	=> 'DCOP',
     VERSION_FROM => 'DCOP.pm',
-    INC		=> "-I$qt_inc -I$kde_inc",
+    INC		=> "-I$qt_inc -I$kde_inc -I/usr/include/tqt",
     LIBS	=> "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP",
     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
     XSOPT	=> '-C++',
diff --git a/dcopperl/Makefile.PL.in b/dcopperl/Makefile.PL.in
index 2a8e355b..a0a3ac14 100644
--- a/dcopperl/Makefile.PL.in
+++ b/dcopperl/Makefile.PL.in
@@ -8,11 +8,11 @@ my $kde_inc = "@kde_includes@";
 my $kde_lib = "@kde_libraries@";
 my $qt_inc = "@qt_includes@";
 my $qt_lib = "@qt_libraries@";
- 
+
 WriteMakefile(
     NAME	=> 'DCOP',
     VERSION_FROM => '@srcdir@/DCOP.pm',
-    INC		=> "-I$qt_inc -I$kde_inc",
+    INC		=> "-I$qt_inc -I$kde_inc -I/usr/include/tqt",
     LIBS	=> "-L$qt_lib -lqt-mt -L$kde_lib -lkdecore -lDCOP",
     XS		=> {'DCOP.xs' => 'DCOP.cpp'},
     XSOPT	=> '-C++',
-- 
cgit v1.2.1