diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2023-10-27 02:40:08 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2023-10-27 15:02:39 +0200 |
| commit | 9f8441ef267c9ebe0ad1c41aae089a5f2e0c9783 (patch) | |
| tree | 9e95141ff3714803fdaef7acbe54ddc2d8d038c3 /arch/tde-core/tde-tqt3 | |
| parent | 7b3048f7ec62f92fb25af64ecfcfb0426261ca13 (diff) | |
| download | tde-packaging-9f8441ef267c9ebe0ad1c41aae089a5f2e0c9783.tar.gz tde-packaging-9f8441ef267c9ebe0ad1c41aae089a5f2e0c9783.zip | |
ArchLinux: Update for final R14.1.1.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7b8802144fc2958d82304d74f3f6b89779aceb3f)
Diffstat (limited to 'arch/tde-core/tde-tqt3')
| -rw-r--r-- | arch/tde-core/tde-tqt3/PKGBUILD | 16 | ||||
| -rw-r--r-- | arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff | 28 |
2 files changed, 4 insertions, 40 deletions
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index 60893b1bb..ee61e7743 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -9,8 +9,8 @@ _kdemod="${_mod/tde/kde}" pkgbase="tde-${_mod}" pkgname=("$pkgbase" "${pkgbase}-docs") -pkgver=14.1.0 -pkgrel=2 +pkgver=14.1.1 +pkgrel=1 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -29,19 +29,11 @@ makedepends=('libcups' 'libxft' 'libxmu' 'glu') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" - 'bp000-984ea06ed6.diff') -md5sums=('e19fa258ec0cad29a169bc3148fa52db' - '9f8d4b37f315eb12b487b6e4418d8a23') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('ea0a0ea6b20a4b0bda9bb4af575cb88e') _prefix="/opt/trinity/tqt3" -prepare() { - msg "Apply backported patches" - cd ${srcdir}/${_mod}-trinity-${pkgver} || exit 1 - patch -p1 < ${srcdir}/bp000-984ea06ed6.diff -} - build() { cd ${srcdir}/${_mod}-trinity-${pkgver} diff --git a/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff b/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff deleted file mode 100644 index c20eb57e0..000000000 --- a/arch/tde-core/tde-tqt3/bp000-984ea06ed6.diff +++ /dev/null @@ -1,28 +0,0 @@ -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() ) ); |