summaryrefslogtreecommitdiffstats
path: root/freebsd/dependencies/tqt3
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2023-06-14 02:35:12 +0200
committerSlávek Banko <[email protected]>2023-06-14 02:35:31 +0200
commitb050ce816222723356dcbaa3d5f6acbc73771197 (patch)
treede827f4778acceead16d7fa961dbd54db0e85c15 /freebsd/dependencies/tqt3
parentea254eaa39fe73d5d9493fb15d8a3c081371a6be (diff)
downloadtde-packaging-b050ce816222723356dcbaa3d5f6acbc73771197.tar.gz
tde-packaging-b050ce816222723356dcbaa3d5f6acbc73771197.zip
FreeBSD: Backport patches to solve issue TDE/tde#128.
Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 06aeda1081592c9ad7207756c4d9f4a6c8334572)
Diffstat (limited to 'freebsd/dependencies/tqt3')
-rw-r--r--freebsd/dependencies/tqt3/Makefile2
-rw-r--r--freebsd/dependencies/tqt3/files/patch-bp000-984ea06ed6.diff28
2 files changed, 29 insertions, 1 deletions
diff --git a/freebsd/dependencies/tqt3/Makefile b/freebsd/dependencies/tqt3/Makefile
index adecda691..891f96eaa 100644
--- a/freebsd/dependencies/tqt3/Makefile
+++ b/freebsd/dependencies/tqt3/Makefile
@@ -13,7 +13,7 @@ TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/tqt-x11-free
DISTNAME= tqt-x11-free_${TDE_VERSION}${TDE_PREVERSION:C/(~(pre|r|s)[0-9]*).*/\1/1}
DISTSRC= ${PORTNAME}-trinity-${TDE_VERSION}${TDE_PREVERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11-toolkits
DIST_SUBDIR= TDE/dependencies
PREFIX= ${LOCALBASE}
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 <[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() ) );