From 69c51d711b7f8f6dcc42bc2bbda346f252bb67a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 14 Jun 2023 01:50:38 +0200 Subject: [PATCH] ArchLinux: Backport patches to solve issue TDE/tde#128. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- arch/tde-core/tde-tdelibs/PKGBUILD | 14 ++++++-- .../tde-tdelibs/bp000-41336d84c9.diff | 34 +++++++++++++++++++ arch/tde-core/tde-tqt3/PKGBUILD | 14 ++++++-- arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff | 28 +++++++++++++++ 4 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff create mode 100644 arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD index f19a52d80..093d0fa4f 100644 --- a/arch/tde-core/tde-tdelibs/PKGBUILD +++ b/arch/tde-core/tde-tdelibs/PKGBUILD @@ -9,7 +9,7 @@ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" pkgver=14.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Trinity Desktop core libraries and applications" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -46,13 +46,21 @@ provides=("${_mod}") conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3") replaces=("trinity-${_kdemod}" "trinity-${_mod}") options=('staticlibs' 'libtool' '!makeflags' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('24990c41b5aaf32844adb3eab1a26818') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-41336d84c9.diff') +md5sums=('24990c41b5aaf32844adb3eab1a26818' + '8344b0545a204e879187b42c983b32e4') install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-41336d84c9.diff +} + build() { msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p ${srcdir}/build diff --git a/arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff b/arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff new file mode 100644 index 000000000..ab9a9513b --- /dev/null +++ b/arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff @@ -0,0 +1,34 @@ +commit 41336d84c91181da148be31a0b9f469037d3669d +Author: Michele Calgaro +Date: Mon Jun 12 22:15:53 2023 +0900 + + Rework and fix commit 4d90cc61 + + Signed-off-by: Michele Calgaro + (cherry picked from commit 54b58986491c48408c720d706e5cbfd1043d3ee6) + +diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp +index 43b0c808..cbe1a81d 100644 +--- a/tdeio/tdeio/job.cpp ++++ b/tdeio/tdeio/job.cpp +@@ -114,9 +114,18 @@ public: + unsigned long m_userTimestamp; + }; + +-static TQObject *__job_root_obj = new TQObject(0, "jobroot"); ++static TQObject *__job_root_obj = nullptr; + +-Job::Job(bool showProgressInfo) : TQObject(__job_root_obj, "job"), m_error(0), m_percent(0) ++static TQObject* __getJobRoot() ++{ ++ if (!__job_root_obj) ++ { ++ __job_root_obj = new TQObject(0, "jobroot"); ++ } ++ return __job_root_obj; ++} ++ ++Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m_percent(0) + , m_progressId(0), m_speedTimer(0), d( new JobPrivate ) + { + // All jobs delete themselves after emiting 'result'. diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index d12cbb46f..60893b1bb 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -10,7 +10,7 @@ _kdemod="${_mod/tde/kde}" pkgbase="tde-${_mod}" pkgname=("$pkgbase" "${pkgbase}-docs") pkgver=14.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -29,11 +29,19 @@ makedepends=('libcups' 'libxft' 'libxmu' 'glu') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('e19fa258ec0cad29a169bc3148fa52db') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-984ea06ed6.diff') +md5sums=('e19fa258ec0cad29a169bc3148fa52db' + '9f8d4b37f315eb12b487b6e4418d8a23') _prefix="/opt/trinity/tqt3" +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${_mod}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-984ea06ed6.diff +} + build() { cd ${srcdir}/${_mod}-trinity-${pkgver} diff --git a/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff b/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff new file mode 100644 index 000000000..c20eb57e0 --- /dev/null +++ b/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff @@ -0,0 +1,28 @@ +commit 984ea06ed6ce702d98fcfe08dc353d58f3f0bcbc +Author: Michele Calgaro +Date: Mon Jun 12 10:46:33 2023 +0900 + + Revert "Add single TQObject root parent for all guarded pointers." + Commit b167d09c was functionally incorrect and is causing issues on + selected distributions. + This reverts commit b167d09c43be6c8b7d30f0d4fb1bf1e86c51b8a7. + This resolves issue TDE/tde#128. + + (cherry picked from commit fb1f3d64451e8cc405b5db572e2c506564a05680) + +diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp +index 3ac27e7a..803e75e1 100644 +--- a/src/kernel/qguardedptr.cpp ++++ b/src/kernel/qguardedptr.cpp +@@ -194,10 +194,9 @@ + + /* Internal classes */ + +-static TQObject *__ptrpriv_root_obj = new TQObject(0, "_ptrpriv_root"); + + TQGuardedPtrPrivate::TQGuardedPtrPrivate( TQObject* o) +- : TQObject(__ptrpriv_root_obj, "_ptrpriv" ), obj( o ) ++ : TQObject(0, "_ptrpriv" ), obj( o ) + { + if ( obj ) + connect( obj, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) );