From 81ede64e3e69aca75676fec6a312ac1df5fada47 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 3 Apr 2024 19:38:47 +0900 Subject: [PATCH] compiz-trinity: update to ensure rebuild against latest tqt3 version Signed-off-by: Michele Calgaro --- .../compiz-trinity-0.8.4/debian/changelog | 6 ++ .../compiz-trinity-0.8.4/debian/control | 2 +- .../patches/102-update-tqt-202404.patch | 99 +++++++++++++++++++ .../debian/patches/series | 1 + 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/102-update-tqt-202404.patch 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 05aec035..214b8ddd 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+10~a) trixie; urgency=low + + * updates-2024/04: ensure compliance with r14.1.x branch. + + -- Michele Calgaro Tue, 03 Apr 2024 19:36:00 +0900 + compiz-trinity (0.8.4-3debian13.0.0+9~a) trixie; urgency=low * Build without support for gconf. 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 02b9822e..42f9970a 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 XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Thierry Reding , David Nusinow -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-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-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 Standards-Version: 3.8.4 Package: compiz-trinity diff --git a/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/102-update-tqt-202404.patch b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/102-update-tqt-202404.patch new file mode 100644 index 00000000..f4adf704 --- /dev/null +++ b/debian/compiz-trinity/compiz-trinity-0.8.4/debian/patches/102-update-tqt-202404.patch @@ -0,0 +1,99 @@ +--- a/tde/window-decorator/decorator.cpp ++++ b/tde/window-decorator/decorator.cpp +@@ -308,17 +308,17 @@ + mDecorActive = new KWD::Window (mCompositeWindow, tqt_xrootwin (), + 0, Window::DefaultActive); + +- connect (mKWinModule, SIGNAL (windowAdded (WId)), +- SLOT (handleWindowAdded (WId))); +- connect (mKWinModule, SIGNAL (windowRemoved (WId)), +- SLOT (handleWindowRemoved (WId))); +- connect (mKWinModule, SIGNAL (activeWindowChanged (WId)), +- SLOT (handleActiveWindowChanged (WId))); ++ connect (mKWinModule, TQ_SIGNAL (windowAdded (WId)), ++ TQ_SLOT (handleWindowAdded (WId))); ++ connect (mKWinModule, TQ_SIGNAL (windowRemoved (WId)), ++ TQ_SLOT (handleWindowRemoved (WId))); ++ connect (mKWinModule, TQ_SIGNAL (activeWindowChanged (WId)), ++ TQ_SLOT (handleActiveWindowChanged (WId))); + connect (mKWinModule, +- SIGNAL (windowChanged (WId, const unsigned long *)), +- SLOT (handleWindowChanged (WId, const unsigned long *))); ++ TQ_SIGNAL (windowChanged (WId, const unsigned long *)), ++ TQ_SLOT (handleWindowChanged (WId, const unsigned long *))); + +- connect (&mIdleTimer, SIGNAL (timeout ()), SLOT (processDamage ())); ++ connect (&mIdleTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (processDamage ())); + + mActiveId = mKWinModule->activeWindow (); + +@@ -326,7 +326,7 @@ + for (; it != mKWinModule->windows ().end (); it++) + handleWindowAdded ((*it)); + +- connect (this, SIGNAL (appearanceChanged ()), SLOT (reconfigure ())); ++ connect (this, TQ_SIGNAL (appearanceChanged ()), TQ_SLOT (reconfigure ())); + + (void) TQApplication::desktop (); // trigger creation of desktop widget + +--- a/tde/window-decorator/window.cpp ++++ b/tde/window-decorator/window.cpp +@@ -345,8 +345,8 @@ + mAdvancedMenu->setCheckable (true); + mAdvancedMenu->setFont (TDEGlobalSettings::menuFont ()); + +- connect (mAdvancedMenu, SIGNAL (activated (int)), +- SLOT (handlePopupActivated (int))); ++ connect (mAdvancedMenu, TQ_SIGNAL (activated (int)), ++ TQ_SLOT (handlePopupActivated (int))); + + mAdvancedMenu->insertItem (SmallIconSet ("up"), + i18n ("Keep &Above Others"), +@@ -364,8 +364,8 @@ + mDesktopMenu->setCheckable (true); + mDesktopMenu->setFont (TDEGlobalSettings::menuFont ()); + +- connect (mDesktopMenu, SIGNAL (activated (int)), +- SLOT (handleDesktopPopupActivated (int))); ++ connect (mDesktopMenu, TQ_SIGNAL (activated (int)), ++ TQ_SLOT (handleDesktopPopupActivated (int))); + + mPopup->insertItem (i18n ("To &Desktop"), mDesktopMenu, Options::NoOp); + +@@ -373,8 +373,8 @@ + mViewportMenu->setCheckable (true); + mViewportMenu->setFont (TDEGlobalSettings::menuFont ()); + +- connect (mViewportMenu, SIGNAL (activated (int)), +- SLOT (handleViewportPopupActivated (int))); ++ connect (mViewportMenu, TQ_SIGNAL (activated (int)), ++ TQ_SLOT (handleViewportPopupActivated (int))); + + viewportMenuID = mPopup->insertItem (i18n ("To &Viewport"), mViewportMenu); + +@@ -391,10 +391,10 @@ + mPopup->insertItem (SmallIconSet ("fileclose"), i18n ("&Close"), + Options::CloseOp); + +- connect (mPopup, SIGNAL (aboutToShow ()), +- SLOT (handlePopupAboutToShow ())); +- connect (mPopup, SIGNAL (activated (int)), +- SLOT (handlePopupActivated (int))); ++ connect (mPopup, TQ_SIGNAL (aboutToShow ()), ++ TQ_SLOT (handlePopupAboutToShow ())); ++ connect (mPopup, TQ_SIGNAL (activated (int)), ++ TQ_SLOT (handlePopupActivated (int))); + } + + mPopup->exec (pos); +@@ -2148,8 +2148,8 @@ + "--wid" << TQCString ().setNum (mClientId) << + "--timestamp" << TQCString ().setNum (timestamp); + +- connect (mProcessKiller, SIGNAL (processExited (TDEProcess *)), +- SLOT (handleProcessKillerExited ())); ++ connect (mProcessKiller, TQ_SIGNAL (processExited (TDEProcess *)), ++ TQ_SLOT (handleProcessKillerExited ())); + + if (!mProcessKiller->start (TDEProcess::NotifyOnExit)) + { 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 aa3a9cdb..e45755d8 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 @@ -22,3 +22,4 @@ kubuntu_04_trinity.patch 099-fix-dso-link.patch 100-tde-r14.patch 101-build-without-gconf.patch +102-update-tqt-202404.patch