diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2023-06-14 01:50:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2023-06-14 01:51:04 +0200 |
| commit | ea254eaa39fe73d5d9493fb15d8a3c081371a6be (patch) | |
| tree | 3a1e82e68c3f31ba2d7783afebd70a2a1b3ae7eb /arch/tde-core/tde-tdelibs | |
| parent | 90e7827c9903700bae2d0c35569017a1f88eb402 (diff) | |
| download | tde-packaging-ea254eaa39fe73d5d9493fb15d8a3c081371a6be.tar.gz tde-packaging-ea254eaa39fe73d5d9493fb15d8a3c081371a6be.zip | |
ArchLinux: Backport patches to solve issue TDE/tde#128.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 69c51d711b7f8f6dcc42bc2bbda346f252bb67a5)
Diffstat (limited to 'arch/tde-core/tde-tdelibs')
| -rw-r--r-- | arch/tde-core/tde-tdelibs/PKGBUILD | 14 | ||||
| -rw-r--r-- | arch/tde-core/tde-tdelibs/bp000-41336d84c9.diff | 34 |
2 files changed, 45 insertions, 3 deletions
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 <michele.calgaro@yahoo.it> +Date: Mon Jun 12 22:15:53 2023 +0900 + + Rework and fix commit 4d90cc61 + + Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> + (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'. |