diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-10-23 19:51:58 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-10-23 19:51:58 +0900 |
| commit | 1f3d42309437da394164fc085a87f1fd48dc893e (patch) | |
| tree | e4a9c831cefdca00e74f3d7935f1ebca7ad1bb52 | |
| parent | 598ec8e8cee87f8ca92d372117444d9d6cc2bfb8 (diff) | |
| download | extra-dependencies-1f3d42309437da394164fc085a87f1fd48dc893e.tar.gz extra-dependencies-1f3d42309437da394164fc085a87f1fd48dc893e.zip | |
DEB compiz-trinity: adjust after dropping tqtinterface
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
3 files changed, 56 insertions, 0 deletions
diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog index cd219f4b..368ace2b 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/changelog @@ -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. diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/108-drop-tqtinterface.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/108-drop-tqtinterface.diff new file mode 100644 index 00000000..9d7cd4c9 --- /dev/null +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/108-drop-tqtinterface.diff @@ -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> diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series index bb443646..eb136d5e 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/series @@ -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 |