DEB compiz-trinity: adjust after dropping tqtinterface

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/35/head
Michele Calgaro 2 months ago
parent 598ec8e8ce
commit 1f3d423094
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1,3 +1,9 @@
compiz-trinity (0.8.4-3debian13.0.0+14~a) trixie; urgency=low
* Adjust after dropping tqtinterface
-- Michele Calgaro <michele.calgaro@yahoo.it> Wed, 23 Oct 2024 19:51:00 +0900
compiz-trinity (0.8.4-3debian13.0.0+13~a) trixie; urgency=low
* Workaround for broken startup-notification api.

@ -0,0 +1,49 @@
--- a/configure.ac
+++ b/configure.ac
@@ -457,8 +457,8 @@
dbus-1 xdamage xcomposite,
[use_kde=yes], [use_kde=no])
- KDE_CFLAGS="$QT_CXXFLAGS -I$kdeincs -I/usr/include/tqt -include tqt.h"
- KDE_LIBS="$QT_LIBS -L$kdelibs -lkdecore -lkdecorations -ldbus-tqt-1 -lDCOP -ltqt -lqt-mt"
+ KDE_CFLAGS="$QT_CXXFLAGS -I$kdeincs"
+ KDE_LIBS="$QT_LIBS -L$kdelibs -lkdecore -lkdecorations -ldbus-tqt-1 -lDCOP -ltqt-mt"
QT_MOC=$QTDIR/bin/moc
DCOPIDL=$kdedir/bin/dcopidl
@@ -625,10 +625,10 @@
dbus-1 xdamage xcomposite,
[use_tde=yes], [use_tde=no])
- TDE_CFLAGS="$TQT_CXXFLAGS -I$tdeincs -I/usr/include/tqt -include tqt.h"
- TDE_LIBS="$TQT_LIBS -L$tdelibs -ltdecore -ltdecorations -ldbus-tqt-1 -lDCOP -ltqt -ltqt-mt"
+ TDE_CFLAGS="$TQT_CXXFLAGS -I$tdeincs"
+ TDE_LIBS="$TQT_LIBS -L$tdelibs -ltdecore -ltdecorations -ldbus-tqt-1 -lDCOP -ltqt-mt"
- TQT_MOC=$QTDIR/bin/tmoc
+ TQT_MOC=$QTDIR/bin/tqmoc
TDCOPIDL=$tdedir/bin/dcopidl
TDCOPIDL2CPP=$tdedir/bin/dcopidl2cpp
else
--- a/tde/window-decorator/utils.cpp
+++ b/tde/window-decorator/utils.cpp
@@ -24,7 +24,7 @@
#include "utils.h"
#include <tqstyle.h>
-#include <tqt.h>
+#include <tqglobal.h>
#include <decoration.h>
#include <X11/Xlib.h>
--- a/tde/window-decorator/window.cpp
+++ b/tde/window-decorator/window.cpp
@@ -44,7 +44,7 @@
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
#include <tqlayout.h>
#include <tqevent.h>
#include <tqpainter.h>

@ -28,3 +28,4 @@ kubuntu_04_trinity.patch
105-malloc-free-implicit-declaration.diff
106-adapt-tqt3.diff
107-sn-api-workaround.diff
108-drop-tqtinterface.diff

Loading…
Cancel
Save