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 b2e0df6cf5)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 0ef4434057
commit 7d7c5d1dc6

@ -302,4 +302,4 @@ dnl Check if knewstuff is present, if not don't bother..
KDE_CHECK_KNS
dnl remove when fixed
DO_NOT_COMPILE="$DO_NOT_COMPILE dcopjava qtsharp"
DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"

@ -1,7 +1,3 @@
dnl if test "$GTK_CONFIG" = "no"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE dcopc"
dnl fi
dnl
dnl AC_CHECK_GETHOSTNAME
AC_GTK_2

@ -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>

@ -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++',

@ -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++',

@ -226,7 +226,7 @@ namespace QtCSharp {
{
if (check)
return "\n\n\t\t\tif ((qparent = parent) != null)\n" +
"\t\t\t\parent.AddChild (this);\n";
"\t\t\tparent.AddChild (this);\n";
else
return "";
}

@ -1 +1 @@
DO_NOT_COMPILE="$DO_NOT_COMPILE xparts"
# DO_NOT_COMPILE="$DO_NOT_COMPILE xparts"

Loading…
Cancel
Save