DEB compiz-trinity: adapt to latest tqt3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/25/head
Michele Calgaro 3 months ago
parent 485a2b5704
commit bb60884854
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1,3 +1,9 @@
compiz-trinity (0.8.4-3debian13.0.0+12~a) trixie; urgency=low
* Adapt to latest tqt3
-- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 17 Sep 2024 17:15:00 +0900
compiz-trinity (0.8.4-3debian13.0.0+11~a) trixie; urgency=low
* Fix several causes of FTBFS.

@ -0,0 +1,119 @@
--- a/configure.ac
+++ b/configure.ac
@@ -581,7 +581,7 @@
tqt_libdirs="$QTDIR/lib $tqt_libdirs"
fi
- tqt_test_include="ntqstyle.h"
+ tqt_test_include="tqstyle.h"
tqt_test_library="libtqt-mt.so"
dnl Check for TQt headers
--- a/plugins/tdeconfig.cpp
+++ b/plugins/tdeconfig.cpp
@@ -21,7 +21,7 @@
#include <kstandarddirs.h>
#include <tdeapplication.h>
#include <ksimpleconfig.h>
-#include <ntqfile.h>
+#include <tqfile.h>
#include <compiz-core.h>
--- a/tde/window-decorator/decorator.cpp
+++ b/tde/window-decorator/decorator.cpp
@@ -21,7 +21,7 @@
* Author: David Reveman <davidr@novell.com>
*/
-#include <ntqglobal.h>
+#include <tqglobal.h>
#include <dcopclient.h>
#include <tdecmdlineargs.h>
@@ -32,8 +32,8 @@
#include <tdelocale.h>
#include <kcommondecoration.h>
#include <twin.h>
-#include <ntqwidgetlist.h>
-#include <ntqpoint.h>
+#include <tqwidgetlist.h>
+#include <tqpoint.h>
#include <X11/Xlib.h>
#include <X11/extensions/Xcomposite.h>
--- a/tde/window-decorator/decorator.h
+++ b/tde/window-decorator/decorator.h
@@ -30,7 +30,7 @@
#include <X11/Xatom.h>
#include <X11/cursorfont.h>
-#include <ntqtimer.h>
+#include <tqtimer.h>
#include <fixx11h.h>
#include <tdeconfig.h>
--- a/tde/window-decorator/utils.cpp
+++ b/tde/window-decorator/utils.cpp
@@ -23,8 +23,8 @@
#include "utils.h"
-#include <ntqstyle.h>
-#include <ntqt.h>
+#include <tqstyle.h>
+#include <tqt.h>
#include <decoration.h>
#include <X11/Xlib.h>
--- a/tde/window-decorator/utils.h
+++ b/tde/window-decorator/utils.h
@@ -26,7 +26,7 @@
#include <X11/Xlib.h>
#include <fixx11h.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
namespace KWD
{
--- a/tde/window-decorator/window.cpp
+++ b/tde/window-decorator/window.cpp
@@ -45,15 +45,15 @@
#include <kstandarddirs.h>
#include <ntqapplication.h>
-#include <ntqlayout.h>
-#include <ntqevent.h>
-#include <ntqpainter.h>
-#include <ntqobjectlist.h>
-#include <ntqwidget.h>
-#include <ntqstring.h>
-#include <ntqtimer.h>
-#include <ntqcursor.h>
-#include <ntqpopupmenu.h>
+#include <tqlayout.h>
+#include <tqevent.h>
+#include <tqpainter.h>
+#include <tqobjectlist.h>
+#include <tqwidget.h>
+#include <tqstring.h>
+#include <tqtimer.h>
+#include <tqcursor.h>
+#include <tqpopupmenu.h>
int viewportMenuID;
--- a/tde/window-decorator/window.h
+++ b/tde/window-decorator/window.h
@@ -26,8 +26,8 @@
#include <kdecoration_p.h>
-#include <ntqpixmap.h>
-#include <ntqwidget.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
#include <decoration.h>

@ -26,3 +26,4 @@ kubuntu_04_trinity.patch
103-png-1.4-compatibility.diff
104-incompabible-pointer-types.diff
105-malloc-free-implicit-declaration.diff
106-adapt-tqt3.diff

Loading…
Cancel
Save