summaryrefslogtreecommitdiffstats
path: root/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2023-10-25 22:25:10 +0200
committerSlávek Banko <[email protected]>2023-10-27 15:04:01 +0200
commit5651b5dee293d932d11d4da73673ba01fd017099 (patch)
tree54a4e86299d74832135dbab07ed96f94a2966c0a /freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
parent9f8441ef267c9ebe0ad1c41aae089a5f2e0c9783 (diff)
downloadtde-packaging-5651b5dee293d932d11d4da73673ba01fd017099.tar.gz
tde-packaging-5651b5dee293d932d11d4da73673ba01fd017099.zip
FreeBSD: Update for final R14.1.1.
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 62ab26da67dd966405c5bc27614f728b3a686ea0)
Diffstat (limited to 'freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff')
-rw-r--r--freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff28
1 files changed, 0 insertions, 28 deletions
diff --git a/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff b/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
deleted file mode 100644
index c20eb57e0..000000000
--- a/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 984ea06ed6ce702d98fcfe08dc353d58f3f0bcbc
-Author: Michele Calgaro <[email protected]>
-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() ) );