diff options
5 files changed, 90 insertions, 1 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 f1c7c5fb..3bd328de 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,10 @@ +compiz-trinity (0.8.4-3debian13.0.0+16~a) trixie; urgency=low + + * Adjust after renaming kstandarddirs -> tdestandarddirs and + removing dependency on dbus-tqt-1 + + -- Michele Calgaro <michele.calgaro@yahoo.it> Tue, 22 Apr 2025 12:39:00 +0900 + compiz-trinity (0.8.4-3debian13.0.0+15~a) trixie; urgency=low * Adjust after renaming kprocess -> tdeprocess diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control index 42f9970a..de38e915 100644 --- a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Thierry Reding <thierry@gilfi.de>, David Nusinow <dnusinow@debian.org> -Build-Depends: debhelper (>= 9~), quilt (>= 0.40), automake, libtool, libglib2.0-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev(>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libdbus-glib-1-dev, libwnck-3-dev | libwnck-dev, x11proto-gl-dev (>= 1.4.8), libxinerama-dev, tdebase-trinity-dev, libdbus-tqt-1-dev, libxcursor-dev, libxml2-dev, libxslt1-dev, libxml-parser-perl, libglu1-mesa-dev, xsltproc, libx11-xcb-dev, intltool +Build-Depends: debhelper (>= 9~), quilt (>= 0.40), automake, libtool, libglib2.0-dev, libpng-dev, libxcomposite-dev (>= 1:0.3-2), libxfixes-dev (>= 1:4.0.1), libxdamage-dev (>=1:1.0.3), libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1), libice-dev(>= 1:1.0.1), libsm-dev (>= 1:1.0.1), libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libcairo-dev, librsvg2-dev, libdbus-1-dev, libdbus-glib-1-dev, libwnck-3-dev | libwnck-dev, x11proto-gl-dev (>= 1.4.8), libxinerama-dev, tdebase-trinity-dev, libxcursor-dev, libxml2-dev, libxslt1-dev, libxml-parser-perl, libglu1-mesa-dev, xsltproc, libx11-xcb-dev, intltool Standards-Version: 3.8.4 Package: compiz-trinity diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/110-rename-kstandarddirs.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/110-rename-kstandarddirs.diff new file mode 100644 index 00000000..5d46d465 --- /dev/null +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/110-rename-kstandarddirs.diff @@ -0,0 +1,22 @@ +--- a/plugins/tdeconfig.cpp ++++ b/plugins/tdeconfig.cpp +@@ -18,7 +18,7 @@ + */ + + #include <tdeglobal.h> +-#include <kstandarddirs.h> ++#include <tdestandarddirs.h> + #include <tdeapplication.h> + #include <ksimpleconfig.h> + #include <tqfile.h> +--- a/tde/window-decorator/window.cpp ++++ b/tde/window-decorator/window.cpp +@@ -42,7 +42,7 @@ + #include <twinmodule.h> + #include <tdelocale.h> + #include <tdeprocess.h> +-#include <kstandarddirs.h> ++#include <tdestandarddirs.h> + + #include <tqapplication.h> + #include <tqlayout.h> diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/111-remove-dbus-tqt-1-dependency.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/111-remove-dbus-tqt-1-dependency.diff new file mode 100644 index 00000000..2eaa87b9 --- /dev/null +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/111-remove-dbus-tqt-1-dependency.diff @@ -0,0 +1,58 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -458,7 +458,7 @@ + [use_kde=yes], [use_kde=no]) + + KDE_CFLAGS="$QT_CXXFLAGS -I$kdeincs" +- KDE_LIBS="$QT_LIBS -L$kdelibs -lkdecore -lkdecorations -ldbus-tqt-1 -lDCOP -ltqt-mt" ++ KDE_LIBS="$QT_LIBS -L$kdelibs -lkdecore -lkdecorations -ldbus-1 -lDCOP -ltqt-mt" + + QT_MOC=$QTDIR/bin/moc + DCOPIDL=$kdedir/bin/dcopidl +@@ -626,7 +626,7 @@ + [use_tde=yes], [use_tde=no]) + + TDE_CFLAGS="$TQT_CXXFLAGS -I$tdeincs" +- TDE_LIBS="$TQT_LIBS -L$tdelibs -ltdecore -ltdecorations -ldbus-tqt-1 -lDCOP -ltqt-mt" ++ TDE_LIBS="$TQT_LIBS -L$tdelibs -ltdecore -ltdecorations -ldbus-1 -lDCOP -ltqt-mt" + + TQT_MOC=$QTDIR/bin/tqmoc + TDCOPIDL=$tdedir/bin/dcopidl +--- a/tde/window-decorator/decorator.cpp ++++ b/tde/window-decorator/decorator.cpp +@@ -192,7 +192,6 @@ + TDEApplication (), + mConfig (0), + mKWinModule (new KWinModule (this, KWinModule::INFO_ALL)), +- mDBusQtConnection (this), + mCompositeWindow (0) + { + XSetWindowAttributes attr; +@@ -294,8 +293,6 @@ + dbusHandleMessage, + this, NULL); + +- mDBusQtConnection.dbus_connection_setup_with_qt_main (mDBusConnection); +- + updateAllShadowOptions (); + } + +--- a/tde/window-decorator/decorator.h ++++ b/tde/window-decorator/decorator.h +@@ -41,7 +41,7 @@ + #include <decoration.h> + + #define DBUS_API_SUBJECT_TO_CHANGE +-#include <dbus/connection.h> ++#include "dbus/dbus.h" + + #include "window.h" + #include "KWinInterface.h" +@@ -175,7 +175,6 @@ + TQTimer mIdleTimer; + KWinModule *mKWinModule; + DBusConnection *mDBusConnection; +- DBusQt::Connection mDBusQtConnection; + WId mCompositeWindow; + }; + } 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 abc61b66..477e3709 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 @@ -30,3 +30,5 @@ kubuntu_04_trinity.patch 107-sn-api-workaround.diff 108-drop-tqtinterface.diff 109-rename-kprocess.diff +110-rename-kstandarddirs.diff +111-remove-dbus-tqt-1-dependency.diff |