diff options
Diffstat (limited to 'arch/tde-core')
-rw-r--r-- | arch/tde-core/tde-arts/PKGBUILD | 11 | ||||
-rw-r--r-- | arch/tde-core/tde-avahi-tqt/PKGBUILD | 6 | ||||
-rw-r--r-- | arch/tde-core/tde-cmake/PKGBUILD (renamed from arch/tde-core/tde-cmake-trinity/PKGBUILD) | 16 | ||||
-rw-r--r-- | arch/tde-core/tde-dbus-1-tqt/PKGBUILD | 6 | ||||
-rw-r--r-- | arch/tde-core/tde-dbus-tqt/PKGBUILD | 6 | ||||
-rw-r--r-- | arch/tde-core/tde-libart-lgpl/PKGBUILD | 6 | ||||
-rw-r--r-- | arch/tde-core/tde-polkit-tqt/PKGBUILD | 6 | ||||
-rw-r--r-- | arch/tde-core/tde-tdebase/PKGBUILD | 25 | ||||
-rw-r--r-- | arch/tde-core/tde-tdelibs/PKGBUILD | 22 | ||||
-rw-r--r-- | arch/tde-core/tde-tqca-tls/PKGBUILD | 12 | ||||
-rw-r--r-- | arch/tde-core/tde-tqca/PKGBUILD | 14 | ||||
-rw-r--r-- | arch/tde-core/tde-tqt3/PKGBUILD | 46 | ||||
-rw-r--r-- | arch/tde-core/tde-tqtinterface/PKGBUILD | 17 |
13 files changed, 104 insertions, 89 deletions
diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD index a546c02dc..dcd844973 100644 --- a/arch/tde-core/tde-arts/PKGBUILD +++ b/arch/tde-core/tde-arts/PKGBUILD @@ -8,22 +8,19 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity aRts Sound System and libraries" -arch=('i686' 'x86_64') +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=('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' @@ -36,7 +33,7 @@ conflicts=("kdemod3-${_mod}" "${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('a48103a0a8ecdc098f6f2f834f0951cb') +md5sums=('620d604dda61d0deaf23475b20569cd5') install="tde-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD index 5be183188..1b1a73e3f 100644 --- a/arch/tde-core/tde-avahi-tqt/PKGBUILD +++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD @@ -6,10 +6,10 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity Avahi-TQt" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') @@ -20,7 +20,7 @@ provides=("${_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=('ad128b35e54f8000a620aaf54023aa5d') +md5sums=('5a8343fb4e4c33e0cfc78c6e6650b6ac') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-cmake-trinity/PKGBUILD b/arch/tde-core/tde-cmake/PKGBUILD index 6164de7f7..487382e7a 100644 --- a/arch/tde-core/tde-cmake-trinity/PKGBUILD +++ b/arch/tde-core/tde-cmake/PKGBUILD @@ -1,15 +1,15 @@ # Contributor: Slávek Banko <slavek.banko@axis.cz> -_mod=cmake-trinity -_cat=common/ +_mod=tde-cmake-trinity +_cat=dependencies/ _kdemod="${_mod/tde/kde}" -pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 pkgrel=1 pkgdesc="TDE CMake modules" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake" +arch=('any') +url="https://scm.trinitydesktop.org/scm/git/tde-cmake" license=('GPL') provides=("${_mod}") groups=('tde-core') @@ -25,10 +25,10 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz") -md5sums=('b41eaff33371172c2a12b9e47f9c1fdf') +md5sums=('f188cc34625c98a32f4c4d6738042419') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { msg "Creating out-of-source build directory: ${srcdir}/build" diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD index 984822105..799e1b154 100644 --- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD @@ -8,10 +8,10 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core' 'tde-base') @@ -22,7 +22,7 @@ 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/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('907b32908215ffb7aa8ba802e29de93f') +md5sums=('2faaaba3f430f16f40b5df816f96573b') install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD index 67264ec18..f4cfa5759 100644 --- a/arch/tde-core/tde-dbus-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD @@ -8,9 +8,9 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') @@ -20,7 +20,7 @@ makedepends=('tde-cmake-trinity') provides=("${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('d57e740bb2437e25b25694188fae1b4c') +md5sums=('631f68c433eb730218c3e9ee8385ea69') install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD index 1f577ab22..fd0f24986 100644 --- a/arch/tde-core/tde-libart-lgpl/PKGBUILD +++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD @@ -6,10 +6,10 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity Desktop LGPL'd Component" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('LGPL') groups=('tde-core') @@ -22,7 +22,7 @@ replaces=() options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('8318cba1b6d3220fd4cf18c29977f67d') +md5sums=('4832489e7ca5db88bc0c7741e9ddb6bd') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD index 34fcd8308..c3168e3a9 100644 --- a/arch/tde-core/tde-polkit-tqt/PKGBUILD +++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD @@ -6,10 +6,10 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity PolicyKit-tqt library" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core' 'tde-base') @@ -20,7 +20,7 @@ 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=('4cfc24c4c4c4adc7e589aa4f2c27be4e') +md5sums=('9d8828526fa2abfa761d952b2ed78ecc') install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD index c03d9add0..1f76515b4 100644 --- a/arch/tde-core/tde-tdebase/PKGBUILD +++ b/arch/tde-core/tde-tdebase/PKGBUILD @@ -6,30 +6,32 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity Desktop Enviroment base components" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') provides=("${_mod}") groups=('tde-core') -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') + 'xorg-xinit') makedepends=('tde-cmake-trinity' 'libxkbfile' - 'smbclient' 'rpcsvc-proto' + 'smbclient' + 'systemd-sysvcompat' 'xorg-bdftopcf' 'xscreensaver') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' @@ -57,7 +59,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/ 'tdm.service' 'xsession.patch') -md5sums=('cea523c3144c4c22966244e9921848d4' +md5sums=('105b7a69e0ed95af0e4ff0f141958205' '18e8d01124b19f7df2937c06e177bf7f' 'c963ef6e37c9051119972a58c67f05fb' 'bb4c25e560fa719e8e8f49ef80bd1c99' @@ -74,8 +76,6 @@ build() { msg "Starting cmake..." - export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig - cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ @@ -100,7 +100,6 @@ build() { -DWITH_ARTS=ON \ -DWITH_I8K=ON \ -DWITH_SENSORS=ON \ - -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DBUILD_ALL=ON \ diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD index bdb3d5e00..c8f67d616 100644 --- a/arch/tde-core/tde-tdelibs/PKGBUILD +++ b/arch/tde-core/tde-tdelibs/PKGBUILD @@ -8,14 +8,16 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity Desktop core libraries and applications" -arch=('i686' 'x86_64') +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' @@ -24,9 +26,11 @@ depends=('aspell' 'libxcomposite' 'libxslt' 'libxtst' - 'openssl-1.0' + 'openssl' 'openexr' + 'opensc' 'pcre' + 'pkcs11-helper' 'tde-arts' 'tde-avahi-tqt' 'tde-dbus-1-tqt' @@ -35,14 +39,15 @@ depends=('aspell' 'xorg-xmessage' 'xorg-xprop' 'xorg-xset' - 'xorg-xsetroot') + '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/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('51ee6897dd364a3d6f42d633fcf53efc') +md5sums=('c0191df81fc351a8a55e7a503cccabe6') install="trinity-${_mod}.install" @@ -73,12 +78,15 @@ build() { -DWITH_OPENEXR=ON \ -DWITH_UTEMPTER=ON \ -DWITH_AVAHI=ON \ - -DWITH_PAM=ON \ -DWITH_PCRE=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 \ diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD index 878c4da6c..7fe1e17b7 100644 --- a/arch/tde-core/tde-tqca-tls/PKGBUILD +++ b/arch/tde-core/tde-tqca-tls/PKGBUILD @@ -8,31 +8,31 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)" -arch=('i686' 'x86_64') +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') +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%-tls}-trinity-${pkgver}.tar.xz") -md5sums=('0ded8a6923a3d77459daf2f8f207905c') +md5sums=('67b1edf8826cf97c281ab70cec5e9b7c') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -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=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \ diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD index 4c04b7be4..54e442603 100644 --- a/arch/tde-core/tde-tqca/PKGBUILD +++ b/arch/tde-core/tde-tqca/PKGBUILD @@ -9,36 +9,36 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') -depends=('tde-tqtinterface' 'openssl-1.0') +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=('0ded8a6923a3d77459daf2f8f207905c') +md5sums=('67b1edf8826cf97c281ab70cec5e9b7c') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -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=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ -GNinja \ - -DCMAKE_INSTALL_PREFIX=$QTDIR \ + -DCMAKE_INSTALL_PREFIX=$TQTDIR \ -DBUILD_ALL=OFF \ -DBUILD_TQCA=ON \ -DWITH_ALL_OPTIONS=ON diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index 33c584b19..ee61e7743 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -9,27 +9,28 @@ _kdemod="${_mod/tde/kde}" pkgbase="tde-${_mod}" pkgname=("$pkgbase" "${pkgbase}-docs") -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" 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/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('a147fb23063a794f3e06dd6aa52ef087') +md5sums=('ea0a0ea6b20a4b0bda9bb4af575cb88e') _prefix="/opt/trinity/tqt3" @@ -55,10 +56,10 @@ build() { sed -i "s|read acceptance|acceptance=yes|" configure msg "Setting enviroment variables..." - export QTDIR="${srcdir}/${_mod}-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}/${_mod}-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" @@ -81,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 \ @@ -97,21 +108,21 @@ build() { -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 @@ -128,6 +139,7 @@ package_tde-tqt3() { 'libpng' 'libxcursor' 'libxft' + 'libxi' 'libxinerama' 'libxmu' 'libxrandr' @@ -144,7 +156,7 @@ package_tde-tqt3() { install='tqt3.install' msg "Packaging - $pkgname-$pkgver" - cd "${QTDIR}" + cd "${TQTDIR}" make INSTALL_ROOT="$pkgdir" install @@ -191,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-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD index 2297b62f4..30e6e470b 100644 --- a/arch/tde-core/tde-tqtinterface/PKGBUILD +++ b/arch/tde-core/tde-tqtinterface/PKGBUILD @@ -8,9 +8,9 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL2') groups=('tde-core') @@ -24,13 +24,13 @@ 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=('fae4701c1b7416fdf32855063642612b') +md5sums=('59025eebafd8cf125e94ca14bc9a4fd7') install="trinity-${_mod}.install" _prefix=/usr [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { cd $srcdir @@ -38,16 +38,15 @@ build() { mkdir -p build cd build - export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + 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 ninja $NUMJOBS } |