From 614310c464d74d40dcc00ecb7d7fa66fabfe0aac Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 16 Oct 2026 17:54:11 +0900 Subject: DEB compiz-trinity: update to TWinModule Signed-off-by: Michele Calgaro --- .../compiz-trinity-0.8.4/debian/changelog | 6 ++ .../debian/patches/114-rename-kwinmodule.diff | 96 ++++++++++++++++++++++ .../compiz-trinity-0.8.4/debian/patches/series | 1 + 3 files changed, 103 insertions(+) create mode 100644 debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/114-rename-kwinmodule.diff 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 57483e74..45543e2b 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-3debian14.0.0+21) forky; urgency=low + + * Updated to TWinModule. + + -- Michele Calgaro Fri, 16 Oct 2026 16:58:00 +0900 + compiz-trinity (0.8.4-3debian14.0.0+20) trixie; urgency=low * Install lintian overrides using dh_lintian. diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/114-rename-kwinmodule.diff b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/114-rename-kwinmodule.diff new file mode 100644 index 00000000..bdb83246 --- /dev/null +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/114-rename-kwinmodule.diff @@ -0,0 +1,96 @@ +--- a/tde/window-decorator/decorator.cpp ++++ b/tde/window-decorator/decorator.cpp +@@ -191,7 +191,7 @@ + KWD::Decorator::Decorator (void) : DCOPObject ("KWinInterface"), + TDEApplication (), + mConfig (0), +- mKWinModule (new KWinModule (this, KWinModule::INFO_ALL)), ++ mTWinModule (new TWinModule (this, TWinModule::INFO_ALL)), + mCompositeWindow (0) + { + XSetWindowAttributes attr; +@@ -265,7 +265,7 @@ + delete mOptions; + delete mPlugins; + delete mConfig; +- delete mKWinModule; ++ delete mTWinModule; + delete mRootInfo; + } + +@@ -305,22 +305,22 @@ + mDecorActive = new KWD::Window (mCompositeWindow, tqt_xrootwin (), + 0, Window::DefaultActive); + +- connect (mKWinModule, TQ_SIGNAL (windowAdded (WId)), ++ connect (mTWinModule, TQ_SIGNAL (windowAdded (WId)), + TQ_SLOT (handleWindowAdded (WId))); +- connect (mKWinModule, TQ_SIGNAL (windowRemoved (WId)), ++ connect (mTWinModule, TQ_SIGNAL (windowRemoved (WId)), + TQ_SLOT (handleWindowRemoved (WId))); +- connect (mKWinModule, TQ_SIGNAL (activeWindowChanged (WId)), ++ connect (mTWinModule, TQ_SIGNAL (activeWindowChanged (WId)), + TQ_SLOT (handleActiveWindowChanged (WId))); +- connect (mKWinModule, ++ connect (mTWinModule, + TQ_SIGNAL (windowChanged (WId, const unsigned long *)), + TQ_SLOT (handleWindowChanged (WId, const unsigned long *))); + + connect (&mIdleTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (processDamage ())); + +- mActiveId = mKWinModule->activeWindow (); ++ mActiveId = mTWinModule->activeWindow (); + +- it = mKWinModule->windows ().begin (); +- for (; it != mKWinModule->windows ().end (); it++) ++ it = mTWinModule->windows ().begin (); ++ for (; it != mTWinModule->windows ().end (); it++) + handleWindowAdded ((*it)); + + connect (this, TQ_SIGNAL (appearanceChanged ()), TQ_SLOT (reconfigure ())); +--- a/tde/window-decorator/decorator.h ++++ b/tde/window-decorator/decorator.h +@@ -70,7 +70,7 @@ + extern int blurType; + + class TDEConfig; +-class KWinModule; ++class TWinModule; + + namespace KWD + { +@@ -173,7 +173,7 @@ + Time mDmSnTimestamp; + int mDamageEvent; + TQTimer mIdleTimer; +- KWinModule *mKWinModule; ++ TWinModule *mTWinModule; + DBusConnection *mDBusConnection; + WId mCompositeWindow; + }; +--- a/tde/window-decorator/window.cpp ++++ b/tde/window-decorator/window.cpp +@@ -1620,9 +1620,9 @@ + void + KWD::Window::handleViewportPopupActivated (int id) + { +- KWinModule *m_twin; ++ TWinModule *m_twin; + int m_curDesk; +- m_twin = new KWinModule(this); ++ m_twin = new TWinModule(this); + m_curDesk = m_twin->currentDesktop(); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); + TQPoint p(m_twin->currentViewport(m_twin->currentDesktop())); +@@ -1679,9 +1679,9 @@ + mPopup->setItemVisible (Options::NoOp, false); + } + +- KWinModule *m_twin; ++ TWinModule *m_twin; + int m_curDesk; +- m_twin = new KWinModule(this); ++ m_twin = new TWinModule(this); + m_curDesk = m_twin->currentDesktop(); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); + numberOfViewports = s.width() * s.height(); 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 f42df2ce..d5803375 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 @@ -34,3 +34,4 @@ kubuntu_04_trinity.patch 111-remove-dbus-tqt-1-dependency.diff 112-rename-ksimpleconfig.diff 113-tqt-rename-true-false.diff +114-rename-kwinmodule.diff -- cgit v1.2.3