From 06aeda1081592c9ad7207756c4d9f4a6c8334572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 14 Jun 2023 02:35:12 +0200 Subject: FreeBSD: 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 --- freebsd/core/tdelibs/Makefile | 2 +- .../core/tdelibs/files/patch-bp000-41336d84c9.diff | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 freebsd/core/tdelibs/files/patch-bp000-41336d84c9.diff (limited to 'freebsd/core') diff --git a/freebsd/core/tdelibs/Makefile b/freebsd/core/tdelibs/Makefile index 97bcf41a0..a89e401f3 100644 --- a/freebsd/core/tdelibs/Makefile +++ b/freebsd/core/tdelibs/Makefile @@ -11,7 +11,7 @@ PORTNAME= tdelibs-trinity COMMENT= Core libraries and binaries for all TDE applications TDE_PREVERSION= MASTER_SITE_SUBDIR= t/${PORTNAME} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 DIST_SUBDIR= TDE/core diff --git a/freebsd/core/tdelibs/files/patch-bp000-41336d84c9.diff b/freebsd/core/tdelibs/files/patch-bp000-41336d84c9.diff new file mode 100644 index 000000000..ab9a9513b --- /dev/null +++ b/freebsd/core/tdelibs/files/patch-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'. -- cgit v1.2.1