summaryrefslogtreecommitdiffstats
path: root/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2023-06-14 02:35:12 +0200
committerSlávek Banko <slavek.banko@axis.cz>2023-06-14 02:35:12 +0200
commit06aeda1081592c9ad7207756c4d9f4a6c8334572 (patch)
tree4836241d9e703ba5f5ed6f4eda0705b950b3d1cf /freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
parent69c51d711b7f8f6dcc42bc2bbda346f252bb67a5 (diff)
downloadtde-packaging-06aeda1081592c9ad7207756c4d9f4a6c8334572.tar.gz
tde-packaging-06aeda1081592c9ad7207756c4d9f4a6c8334572.zip
FreeBSD: Backport patches to solve issue TDE/tde#128.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
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, 28 insertions, 0 deletions
diff --git a/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff b/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
new file mode 100644
index 000000000..c20eb57e0
--- /dev/null
+++ b/freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff
@@ -0,0 +1,28 @@
+commit 984ea06ed6ce702d98fcfe08dc353d58f3f0bcbc
+Author: Michele Calgaro <michele.calgaro@yahoo.it>
+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() ) );