diff options
Diffstat (limited to 'arch/tde-core')
19 files changed, 650 insertions, 244 deletions
diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD index e58281542..2f311bcd8 100644 --- a/arch/tde-core/tde-arts/PKGBUILD +++ b/arch/tde-core/tde-arts/PKGBUILD @@ -3,57 +3,60 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-arts -pkgver=14.0.10 +_mod=arts +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 -pkgdesc="Trinity ARTS Sound System and libraries" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/arts' +pkgdesc="Trinity aRts Sound System and libraries" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') -depends=('alsa-plugins' - 'alsa-tools' - 'alsa-utils' +depends=('alsa-lib' 'audiofile' 'glib2' 'libmad' 'libogg' 'libvorbis' - 'pulseaudio-alsa' 'tde-tqtinterface') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma' 'lame: A high quality MPEG Audio Layer III (MP3) encoder' 'libmp3splt: Library for splitting mp3 and ogg files without decoding' 'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files' 'vorbis-tools: Extra tools for Ogg-Vorbis') -provides=('arts') -conflicts=('kdemod3-arts' 'arts') -replaces=('trinity-arts') -options=('staticlibs' 'libtool' '!emptydirs') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz") -md5sums=('d9d719e824acd5397dda709ed5352feb') -install='tde-arts.install' +provides=("${_mod}") +conflicts=("kdemod3-${_mod}" "${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!emptydirs' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('ff0c1de2afa4b5dd12826768b52b3a93') +install="tde-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON \ + -DWITH_ESOUND=OFF \ + -DWITH_JACK=OFF msg "Building $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD index 2df40dd16..b46ef08ee 100644 --- a/arch/tde-core/tde-avahi-tqt/PKGBUILD +++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD @@ -1,42 +1,46 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-avahi-tqt -pkgver=14.0.10 +_mod=avahi-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 pkgdesc="Trinity Avahi-TQt" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/avahi-tqt' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') depends=('tde-tqtinterface' 'avahi' 'nss-mdns') # nss-mdns should probably move to tdelibs depends -makedepends=('pkgconfig' 'cmake') -provides=('avahi-tqt') -replaces=('trinity-avahi-tqt') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz") -md5sums=('6cce8423a3030505bb56a8c73f6235d6') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('8fb0e6c388efa1a0d4269ba8a46e82c8') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd ${srcdir} msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-core/tde-cmake/PKGBUILD b/arch/tde-core/tde-cmake/PKGBUILD new file mode 100644 index 000000000..7e471b88c --- /dev/null +++ b/arch/tde-core/tde-cmake/PKGBUILD @@ -0,0 +1,51 @@ +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=tde-cmake-trinity +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.5 +pkgrel=1 +pkgdesc="TDE CMake modules" +arch=('any') +url="https://scm.trinitydesktop.org/scm/git/tde-cmake" +license=('GPL') +provides=("${_mod}") +groups=('tde-core') +depends=( + 'cmake' + 'perl' + 'ninja' + 'pkgconfig' +) +makedepends=() +optdepends=() +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz") +md5sums=('a6b6ae99833b002bc90de453ec6d9349') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD index 907060c9f..ee71aefd1 100644 --- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD @@ -3,43 +3,47 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-dbus-1-tqt -pkgver=14.0.10 +_mod=dbus-1-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core' 'tde-base') depends=('tde-tqtinterface' 'dbus') -makedepends=('pkgconfig' 'cmake') -provides=('dbus-1-tqt') -conflicts=('trinity-dbus-1-tqt') -replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3') options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz") -md5sums=('4954efb83544c72272ba803eb44b72ec') -install='trinity-dbus-1-tqt.install' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('0e7df2fe1010054b7a8395f795d569f1') +install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD index 7e1c73d32..cff33cfd1 100644 --- a/arch/tde-core/tde-dbus-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD @@ -3,41 +3,44 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-dbus-tqt -pkgver=14.0.10 +_mod=dbus-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/dbus-tqt' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') pkgdesc="Trinity TQt DBus wrapper" depends=('tde-tqtinterface' 'dbus') -makedepends=('pkgconfig' 'cmake') -provides=('dbus-tqt') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz") -md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951') -install='trinity-dbus-tqt.install' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('cad1ec8170298aa7943fc8f811c23b84') +install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ - -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_GCC_VISIBILITY=ON + -GNinja \ + -DCMAKE_INSTALL_PREFIX=$TDEDIR msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD index c6f03a951..5d6ff9935 100644 --- a/arch/tde-core/tde-libart-lgpl/PKGBUILD +++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD @@ -1,24 +1,28 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-libart-lgpl -pkgver=14.0.10 +_mod=libart-lgpl +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 pkgdesc="Trinity Desktop LGPL'd Component" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/libart-lgpl" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('LGPL') groups=('tde-core') #depends=('') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') optdepends=() -provides=('libart-lgpl') +provides=("${_mod}") conflicts=() replaces=() options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz") -md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('6a50c472c8bc820a7a60f32840fe9064') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -30,15 +34,16 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DWITH_GCC_VISIBILITY=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD new file mode 100644 index 000000000..796fe632e --- /dev/null +++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=polkit-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 +pkgrel=1 +pkgdesc="Trinity PolicyKit-tqt library" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-core' 'tde-base') +depends=('tde-tqtinterface' 'tde-dbus-1-tqt' 'polkit') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('f5333be2fc7a713b2a462e57b5fa67dd') +install="trinity-${_mod}.install" + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + +build() { + msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install +} diff --git a/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD index 85f569247..85a6db207 100644 --- a/arch/tde-core/tde-tdebase/PKGBUILD +++ b/arch/tde-core/tde-tdebase/PKGBUILD @@ -1,37 +1,39 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname='tde-tdebase' -pkgver=14.0.10 +_mod=tdebase +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=2 pkgdesc="Trinity Desktop Enviroment base components" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdebase' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') -provides=('tdebase') +provides=("${_mod}") groups=('tde-core') -# depends=('hal' -depends=('libraw1394' - 'libxtst' +depends=('htdig' + 'libraw1394' + 'libssh' 'libxss' + 'libxtst' 'lm_sensors' - 'tde-tdelibs' + 'openssl' 'tde-dbus-1-tqt' + 'tde-tdelibs' 'ttf-dejavu' 'ttf-freefont' 'xorg-server' - 'xorg-xinit' - 'htdig' - 'openssl-1.0') -makedepends=('autoconf' - 'cmake' - 'imake' - 'pkgconfig' - 'libxkbfile' - 'smbclient' - 'rpcsvc-proto' - 'xorg-bdftopcf' - 'xscreensaver') + 'xorg-xinit') +makedepends=('tde-cmake-trinity' + 'libxkbfile' + 'rpcsvc-proto' + 'smbclient' + 'systemd-sysvcompat' + 'xorg-bdftopcf' + 'xscreensaver') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' 'pciutils: PCI bus configuration space access library and tools' 'samba: file sharing over SMB' @@ -44,12 +46,13 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop 'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)' 'xorg-fonts-75dpi: X.org 75dpi fonts collection' 'xscreensaver: Screen saver and locker for the X Window System') -confilicts=('trinity-kdebase ''kdemod3-kdebase') -replaces=('trinity-tdebase') +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -install='trinity-tdebase.install' +install="trinity-${_mod}.install" -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz" +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-fix-tiling-of-maximized-windows.diff' 'agent-shutdown.sh' 'agent-startup.sh' 'tdm-trinity' @@ -57,7 +60,8 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/ 'tdm.service' 'xsession.patch') -md5sums=('bca895dfc2b88c4b74e307d5690108bf' +md5sums=('d411d22bbce474ece21cf838e7491f41' + '235431ac1f009c0db8a34ddd22b034f8' '18e8d01124b19f7df2937c06e177bf7f' 'c963ef6e37c9051119972a58c67f05fb' 'bb4c25e560fa719e8e8f49ef80bd1c99' @@ -67,17 +71,21 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-fix-tiling-of-maximized-windows.diff +} + build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." - export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig - cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DWITH_SASL=ON \ @@ -89,8 +97,6 @@ build() { -DWITH_XFIXES=ON \ -DWITH_XRANDR=ON \ -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_XEXT=ON \ -DWITH_XTEST=ON \ -DWITH_OPENGL=ON \ -DWITH_XSCREENSAVER=ON \ @@ -102,7 +108,6 @@ build() { -DWITH_ARTS=ON \ -DWITH_I8K=ON \ -DWITH_SENSORS=ON \ - -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DBUILD_ALL=ON \ @@ -111,13 +116,13 @@ build() { -DTDM_PAM_SERVICE=tde \ -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd $srcdir/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions) install -d -m755 ${pkgdir}/usr/share/xsessions diff --git a/arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff b/arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff new file mode 100644 index 000000000..a4fe63d49 --- /dev/null +++ b/arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff @@ -0,0 +1,28 @@ +commit 23b75093d5599baeb816bbf0163ade78d2201818 +Author: Michele Calgaro <michele.calgaro@yahoo.it> +Date: Sat Nov 22 20:39:15 2025 +0900 + + twin: fix tiling of maximized windows. This resolves issue #675 + + Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> + (cherry picked from commit d2b2363d9345e74035e0585344d7150c4a62ef1c) + +diff --git a/twin/geometry.cpp b/twin/geometry.cpp +index 88d0ba8cd..bdef2356c 100644 +--- a/twin/geometry.cpp ++++ b/twin/geometry.cpp +@@ -1915,12 +1915,12 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) + TQRect clientArea = workspace()->clientArea( MaximizeArea, this ); + + // save sizes for restoring, if maximalizing +- if( !activeTiled && !adjust && !( y() == clientArea.top() && height() == clientArea.height())) ++ if( !adjust && !( y() == clientArea.top() && height() == clientArea.height())) + { + geom_restore.setTop( y()); + geom_restore.setHeight( height()); + } +- if( !activeTiled && !adjust && !( x() == clientArea.left() && width() == clientArea.width())) ++ if( !adjust && !( x() == clientArea.left() && width() == clientArea.width())) + { + geom_restore.setLeft( x()); + geom_restore.setWidth( width()); diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD index 759b18d6a..34950fafc 100644 --- a/arch/tde-core/tde-tdelibs/PKGBUILD +++ b/arch/tde-core/tde-tdelibs/PKGBUILD @@ -3,26 +3,36 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdelibs -pkgver=14.0.10 +_mod=tdelibs +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=2 pkgdesc="Trinity Desktop core libraries and applications" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdelibs' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') -depends=('aspell' +depends=( + 'aspell' + 'cryptsetup' 'hspell' 'jasper' 'libcups' 'libidn' + 'libnm' 'libutempter' + 'libwebp' 'libxcomposite' 'libxslt' 'libxtst' - 'openssl-1.0' + 'openssl' 'openexr' - 'pcre' + 'opensc' + 'pcre2' + 'pkcs11-helper' 'tde-arts' 'tde-avahi-tqt' 'tde-dbus-1-tqt' @@ -31,30 +41,38 @@ depends=('aspell' 'xorg-xmessage' 'xorg-xprop' 'xorg-xset' - 'xorg-xsetroot') -makedepends=('pkgconfig' 'cmake') -provides=('tdelibs') -conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3') -replaces=('trinity-kdelibs' 'trinity-tdelibs') + 'xorg-xsetroot' +) +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3") +replaces=("trinity-${_kdemod}" "trinity-${_mod}") options=('staticlibs' 'libtool' '!makeflags' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz") - -md5sums=('cbb77407a886b588b4749524ae8e5edd') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-reentrant-parseSingleConfigFile.diff') +md5sums=('7c30955801381ec855f3b75ed5d7f527' + 'e2ac1ade412c4a321f4ed013be0f3f13') -install='trinity-tdelibs.install' +install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-reentrant-parseSingleConfigFile.diff +} + build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -66,16 +84,20 @@ build() { -DWITH_CUPS=ON \ -DWITH_LUA=OFF \ -DWITH_TIFF=ON \ + -DWITH_WEBP=ON \ -DWITH_JASPER=ON \ -DWITH_OPENEXR=ON \ -DWITH_UTEMPTER=ON \ -DWITH_AVAHI=ON \ - -DWITH_PAM=ON \ - -DWITH_PCRE=ON \ + -DWITH_PCRE2=ON \ -DWITH_GCC_VISIBILITY=ON \ -DWITH_TDEHWLIB_DAEMONS=ON \ -DWITH_UPOWER=ON \ -DWITH_UDISKS2=ON \ + -DWITH_UDEVIL=ON \ + -DWITH_PCSC=ON \ + -DWITH_PKCS=ON \ + -DWITH_CRYPTSETUP=ON \ -DWITH_NETWORK_MANAGER_BACKEND=ON \ -DWITH_LZMA=ON \ -DWITH_XRANDR=ON \ @@ -84,13 +106,13 @@ build() { -DWITH_HSPELL=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install msg "Removing conflicting images" rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop } diff --git a/arch/tde-core/tde-tdelibs/bp000-reentrant-parseSingleConfigFile.diff b/arch/tde-core/tde-tdelibs/bp000-reentrant-parseSingleConfigFile.diff new file mode 100644 index 000000000..85b93c741 --- /dev/null +++ b/arch/tde-core/tde-tdelibs/bp000-reentrant-parseSingleConfigFile.diff @@ -0,0 +1,126 @@ +commit 884aff988556c5271eb829768b17d27052a08763 +Author: Michele Calgaro <michele.calgaro@yahoo.it> +Date: Tue Nov 18 23:03:25 2025 +0900 + + Make 'TDEConfigINIBackEnd::parseSingleConfigFile' reentrant. + + If a second call to 'TDEConfigINIBackEnd::parseSingleConfigFile' was called from + another thread while the first wasn't finished, it would have resulted + in a SEGV fault. Config files are usually small and mmap-ing files + does not provide meaningful benefits while instead introducing the + possibility of a SIGBUS fault, although extremely unlukely in real + life. + + This resolves issue #379. + + Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> + +diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp +index 707f4fe69..c7944ed12 100644 +--- a/tdecore/tdeconfigbackend.cpp ++++ b/tdecore/tdeconfigbackend.cpp +@@ -431,80 +431,23 @@ bool TDEConfigINIBackEnd::parseConfigFiles() + return true; + } + +-#ifdef HAVE_MMAP +-#ifdef SIGBUS +-static sigjmp_buf mmap_jmpbuf; +-struct sigaction mmap_old_sigact; +- +-extern "C" { +- static void mmap_sigbus_handler(int) +- { +- siglongjmp (mmap_jmpbuf, 1); +- } +-} +-#endif +-#endif +- + extern bool kde_kiosk_exception; + + void TDEConfigINIBackEnd::parseSingleConfigFile(TQFile &rFile, + KEntryMap *pWriteBackMap, + bool bGlobal, bool bDefault) + { +- const char *s; // May get clobbered by sigsetjump, but we don't use them afterwards. +- const char *eof; // May get clobbered by sigsetjump, but we don't use them afterwards. +- TQByteArray data; +- + if (!rFile.isOpen()) // come back, if you have real work for us ;-> + return; + +- //using kdDebug() here leads to an infinite loop +- //remove this for the release, aleXXX +- //tqWarning("Parsing %s, global = %s default = %s", +- // rFile.name().latin1(), bGlobal ? "true" : "false", bDefault ? "true" : "false"); +- + TQCString aCurrentGroup("<default>"); + + unsigned int ll = localeString.length(); + +-#ifdef HAVE_MMAP +- static volatile const char *map; +- map = ( const char* ) mmap(0, rFile.size(), PROT_READ, MAP_PRIVATE, +- rFile.handle(), 0); +- +- if ( map != MAP_FAILED ) +- { +- s = (const char*) map; +- eof = s + rFile.size(); +- +-#ifdef SIGBUS +- struct sigaction act; +- act.sa_handler = mmap_sigbus_handler; +- sigemptyset( &act.sa_mask ); +-#ifdef SA_ONESHOT +- act.sa_flags = SA_ONESHOT; +-#else +- act.sa_flags = SA_RESETHAND; +-#endif +- sigaction( SIGBUS, &act, &mmap_old_sigact ); +- +- if (sigsetjmp (mmap_jmpbuf, 1)) +- { +-tqWarning("SIGBUS while reading %s", rFile.name().latin1()); +- munmap(( char* )map, rFile.size()); +- sigaction (SIGBUS, &mmap_old_sigact, 0); +- return; +- } +-#endif +- } +- else +-#endif +- { +- rFile.at(0); +- data = rFile.readAll(); +- s = data.data(); +- eof = s + data.size(); +- } ++ rFile.at(0); ++ TQByteArray data = rFile.readAll(); ++ const char *s = data.data(); ++ const char *eof = s + data.size(); + + bool fileOptionImmutable = false; + bool groupOptionImmutable = false; +@@ -757,19 +700,8 @@ tqWarning("SIGBUS while reading %s", rFile.name().latin1()); + } + } + +- + if (fileOptionImmutable) + bFileImmutable = true; +- +-#ifdef HAVE_MMAP +- if (map) +- { +- munmap(( char* )map, rFile.size()); +-#ifdef SIGBUS +- sigaction (SIGBUS, &mmap_old_sigact, 0); +-#endif +- } +-#endif + } + + void TDEConfigINIBackEnd::translateKey(TDELocale& locale, TQCString currentGroup, TQCString key) { diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD index 52b19c726..d62671e25 100644 --- a/arch/tde-core/tde-tqca-tls/PKGBUILD +++ b/arch/tde-core/tde-tqca-tls/PKGBUILD @@ -3,45 +3,51 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tqca-tls -pkgver=14.0.10 +_mod=tqca-tls +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tqca-tls' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}" license=('GPL') groups=('tde-core') -depends=('tde-tqtinterface' 'openssl-1.0') -makedepends=('pkgconfig' 'cmake') -provides=('tqca-tls') -conflicts=('trinity-tqca-tls') -replaces=('trinity-tqca-tls') +depends=('tde-tqtinterface' 'openssl') +makedepends=('tde-cmake-trinity') +provides=(${_mod}) +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz") -md5sums=('6347f50dd8b44cc1f7a35329bd578ba1') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz") +md5sums=('2381646976c60449c6fc9c7cdef0ffb8') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build - export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." - cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_GCC_VISIBILITY=ON + -DBUILD_ALL=OFF \ + -DBUILD_TQCA_TLS=ON \ + -DWITH_ALL_OPTIONS=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD new file mode 100644 index 000000000..35b2913c5 --- /dev/null +++ b/arch/tde-core/tde-tqca/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=tqca +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 +pkgrel=1 +pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-core') +depends=('tde-tqtinterface' 'openssl') +makedepends=('tde-cmake-trinity') +provides=(${_mod}) +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('2381646976c60449c6fc9c7cdef0ffb8') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=$TQTDIR \ + -DBUILD_ALL=OFF \ + -DBUILD_TQCA=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install +} diff --git a/arch/tde-core/tde-tqscintilla/PKGBUILD b/arch/tde-core/tde-tqscintilla/PKGBUILD new file mode 100644 index 000000000..b9bbfdb92 --- /dev/null +++ b/arch/tde-core/tde-tqscintilla/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tqscintilla +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 +pkgrel=1 +pkgdesc="TQt source code editing component based on Scintilla" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-core') +depends=('tde-tqtinterface') +makedepends=('tde-cmake-trinity') +provides=(${_mod}) +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('7bbb917c49dc42df12f266b961d070e3') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=$TQTDIR \ + -DBUILD_ALL=OFF \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install +} diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index 0f56bd687..65aeac2ff 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -3,38 +3,40 @@ # Contributor: Calvin Morrison <MutantTurkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgbase=tde-tqt3 +_mod=tqt3 +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgbase="tde-${_mod}" pkgname=("$pkgbase" "${pkgbase}-docs") -pkgver=14.0.10 +pkgver=14.1.5 pkgrel=1 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/tqt3" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/tqt" license=('GPL') groups=('tde-core') options=('staticlibs' 'libtool' '!emptydirs' '!strip') makedepends=('libcups' - 'libiodbc' 'libxi' 'postgresql' 'mariadb' 'unixodbc' 'libmng' 'xorg-xrandr' + 'libxcursor' + 'libxinerama' 'libxft' + 'libxmu' 'glu') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz" - 'bp000-fix-build-key.diff') -md5sums=('47d8495fcf444c5db2cf56843be3f746' - '950e3885135fd9844de856c770f19767') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}tqt-trinity-${pkgver}.tar.xz") +md5sums=('4d41547cfa524e019e1b5f1113a772d9') _prefix="/opt/trinity/tqt3" build() { - cd ${srcdir}/tqt3-trinity-${pkgver} - - patch -p1 < ${srcdir}/bp000-fix-build-key.diff + cd ${srcdir}/tqt-trinity-${pkgver} # These are probably arch-specific. They were present in old qt3 # PKGBULD, they were present in kdemod3 PKGBUILD, they are present @@ -54,10 +56,10 @@ build() { sed -i "s|read acceptance|acceptance=yes|" configure msg "Setting enviroment variables..." - export QTDIR="${srcdir}/tqt3-trinity-${pkgver}" - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + export TQTDIR="${srcdir}/tqt-trinity-${pkgver}" + export PATH=${TQTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${TQTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$TQTDIR/mkspecs/linux-g++ if [ "$CARCH" = "x86_64" ]; then export ARCH="-64" @@ -80,6 +82,16 @@ build() { -lmysqlclient \ -L/usr/lib/mysql \ -qt-gif \ + -ipv6 \ + -sm \ + -xshape \ + -xinerama \ + -xcursor \ + -xrandr \ + -xrender \ + -xft\ + -tablet \ + -xkb \ -system-zlib \ -system-libpng \ -system-libjpeg \ @@ -94,22 +106,23 @@ build() { -platform linux-g++${ARCH} \ -no-exceptions \ -thread \ + -enable-opengl \ -dlopen-opengl \ - -no-ipv6 + -glibmainloop # 64bit fixes pulled from extras/qt3 PKGBUILD # this is Arch-specific # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/designer/uilib/Makefile msg "--- \$CARCH is $CARCH ---" msg "Building - $pkgbase..." - cd "${QTDIR}" + cd "${TQTDIR}" # build rest, but without tutorials and examples # of you want them, remove sub-tools @@ -126,6 +139,7 @@ package_tde-tqt3() { 'libpng' 'libxcursor' 'libxft' + 'libxi' 'libxinerama' 'libxmu' 'libxrandr' @@ -142,12 +156,12 @@ package_tde-tqt3() { install='tqt3.install' msg "Packaging - $pkgname-$pkgver" - cd "${QTDIR}" + cd "${TQTDIR}" make INSTALL_ROOT="$pkgdir" install - ## remove doc as it is now in a split package tde-tqt3-doc - rm -r "${pkgdir}${_prefix}/doc" + ## remove doc as it is now in a split package tde-tqt3-doc + rm -r "${pkgdir}${_prefix}/doc" # install link the apps provided by qt3 so we don't collide with # qt4 and can run them. @@ -189,5 +203,5 @@ package_tde-tqt3-docs() { ## install doc pages which are missed by make install ## convenient for a split package install -d -m755 "${pkgdir}${_prefix}/doc/" - cp -r "${QTDIR}/doc" "${pkgdir}${_prefix}" + cp -r "${TQTDIR}/doc" "${pkgdir}${_prefix}" } diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff deleted file mode 100644 index a0a0aa42e..000000000 --- a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff +++ /dev/null @@ -1,21 +0,0 @@ -commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a -Author: Slávek Banko <slavek.banko@axis.cz> -Date: Wed Sep 22 15:00:08 2021 +0200 - - Fix buildkey for GCC >= 7 if the version is listed including minor numbers. - - Signed-off-by: Slávek Banko <slavek.banko@axis.cz> - -diff --git a/configure b/configure -index 92cec273..f021f563 100755 ---- a/configure -+++ b/configure -@@ -2828,7 +2828,7 @@ g++*) - 3.*) - COMPILER_VERSION="3.*" - ;; -- [1-9][0-9]|[7-9]|[4-6].*) -+ [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*) - COMPILER_VERSION="4.*" - ;; - *) diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD index 43774f594..3f8506286 100644 --- a/arch/tde-core/tde-tqtinterface/PKGBUILD +++ b/arch/tde-core/tde-tqtinterface/PKGBUILD @@ -3,34 +3,34 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tqtinterface -pkgver=14.0.10 +_mod=tqtinterface +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.5 pkgrel=1 -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/tqtinterface" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL2') groups=('tde-core') pkgdesc="TQt interface for the TDE desktop" depends=('tde-tqt3' 'glu') -makedepends=('pkgconfig' 'cmake') -provides=('tqtinterface') -conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface') -replaces=('trinity-tqtinterface') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") # makeopts=('libtool' '!emptydirs' '!strip') options=('staticlibs' 'libtool' '!emptydirs' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz" - 'tqtpc-location.patch') - -md5sums=('76b04fce54a40edf46a7421a5f3e176f' - 'c15745c944d98cb7c4cb553f0ca421d4') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('e971775205076bf61d542a21b19df5f0') -install='trinity-tqtinterface.install' +install="trinity-${_mod}.install" _prefix=/usr -_tdedir=/opt/trinity - -[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3 +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { cd $srcdir @@ -38,24 +38,26 @@ build() { mkdir -p build cd build + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DQT_PREFIX_DIR=${QTDIR} \ - -DQT_INCLUDE_DIR=${QTDIR}/include \ - -DMOC_EXECUTABLE=${QTDIR}/bin/moc \ - -DQT_VERSION=3 + -DQT_PREFIX_DIR=${TQTDIR} \ + -DTQT_INCLUDE_DIR=${TQTDIR}/include \ + -DMOC_EXECUTABLE=${TQTDIR}/bin/moc - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install # Create and install ld.so.conf.d file install -d -m755 $pkgdir/etc/ld.so.conf.d/ - echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf - echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf + echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf + echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf } diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch deleted file mode 100644 index f256e925c..000000000 --- a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dependencies/tqtinterface/CMakeLists.txt 2011-03-28 00:12:24.000000000 +0200 -+++ dependencies/tqtinterface/CMakeLists.txt.new 2012-01-29 12:15:16.000000000 +0100 -@@ -35,7 +35,7 @@ - tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" ) - tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) - tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/tqt" ) --tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" ) -+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" ) - - - ##### tqtinterface sources ###################### |