diff options
Diffstat (limited to 'arch/tde-extra')
34 files changed, 592 insertions, 721 deletions
diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD index c8961c7d7..67e4b762e 100644 --- a/arch/tde-extra/tde-abakus/PKGBUILD +++ b/arch/tde-extra/tde-abakus/PKGBUILD @@ -2,10 +2,11 @@ # Contributor: David C. Rankin <drankinatty at gmail dot com> _mod=abakus -_cat=applications/ +_cat=applications/utilities/ _kdemod="${_mod/tde/kde}" + pkgname="tde-${_mod}" -pkgver=14.0.10 +pkgver=14.0.11 pkgrel=1 pkgdesc="Calculator for TDE" arch=('i686' 'x86_64') @@ -17,17 +18,16 @@ depends=( 'tde-tdelibs' ) makedepends=( - 'cmake' - 'pkgconfig' + 'tde-cmake-trinity' ) optdepends=() -confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('90fa9e728b8b48ad5e51c95eb5d05dc7') +md5sums=('5f8e3779d9d4f7ddad3c436cb5bbfd03') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 @@ -39,6 +39,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ @@ -46,11 +47,11 @@ build() { -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-extra/tde-akode/PKGBUILD b/arch/tde-extra/tde-akode/PKGBUILD new file mode 100644 index 000000000..062c1e1a1 --- /dev/null +++ b/arch/tde-extra/tde-akode/PKGBUILD @@ -0,0 +1,54 @@ +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=akode +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 +pkgrel=1 +pkgdesc="akode plugin for aRts" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-extra') +depends=('alsa-plugins' + 'alsa-tools' + 'alsa-utils' + 'audiofile' + 'libmad' + 'libogg' + 'libvorbis' + 'pulseaudio-alsa') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +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=('64f003d3a2098535d07a6dc9a210f148') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + +build() { + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_JACK_SINK=OFF + + msg "Building $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-akode/tde-akode.install b/arch/tde-extra/tde-akode/tde-akode.install new file mode 100644 index 000000000..30e6e407f --- /dev/null +++ b/arch/tde-extra/tde-akode/tde-akode.install @@ -0,0 +1,11 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD index b87b39775..7068c8547 100644 --- a/arch/tde-extra/tde-amarok/PKGBUILD +++ b/arch/tde-extra/tde-amarok/PKGBUILD @@ -1,47 +1,60 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-amarok -pkgver=14.0.10 +_mod=amarok +_cat=applications/multimedia/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE Amarok" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/amarok' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdebase' 'taglib' 'xine-lib') -makedepends=('pkgconfig' 'cmake') -#provides=('tde-amarok') -#conflicts=('tde-amarok') -#replaces=('tde-amarok') +makedepends=('tde-cmake-trinity' 'tde-akode' 'ruby' 'libmtp' 'libvisual' 'sdl') +provides=("${_mod}") +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/amarok-trinity-${pkgver}.tar.xz") -md5sums=('fab4ed783d4027711e4aaca098bb04b1') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('4542cc22dc8104f46e6dd1640ea54cb7') +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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_YAUAP=OFF \ + -DWITH_NJB=OFF \ + -DWITH_IFP=OFF \ + -DWITH_IPOD=OFF \ + -DWITH_MP4V2=OFF \ -DWITH_EMBEDDED_SQLITE=ON \ - -DWITH_OPENGL=ON + -DWITH_SYSTEM_SQLITE=OFF \ + -DWITH_MYSQL=OFF \ + -DWITH_POSTGRESQL=OFF \ + -DWITH_AMAZON=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-extra/tde-basket/PKGBUILD b/arch/tde-extra/tde-basket/PKGBUILD index 3e9a7a007..b36019020 100644 --- a/arch/tde-extra/tde-basket/PKGBUILD +++ b/arch/tde-extra/tde-basket/PKGBUILD @@ -2,10 +2,11 @@ # Contributor: David C. Rankin <drankinatty at gmail dot com> _mod=basket -_cat=applications/ +_cat=applications/office/ _kdemod="${_mod/tde/kde}" + pkgname="tde-${_mod}" -pkgver=14.0.10 +pkgver=14.0.11 pkgrel=1 pkgdesc="A multi-purpose note-taking application for KDE" arch=('i686' 'x86_64') @@ -17,22 +18,28 @@ depends=( 'tde-tdelibs' ) makedepends=( - 'cmake' - 'pkgconfig' + 'tde-cmake-trinity' 'tde-tdepim' ) optdepends=() -confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('6a70768661d810eeeba5281075215803') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-fix-crash-on-export-basket-archive.diff') +md5sums=('1b078e8c8d67c2ce110080fa687bd5cb' + '402c273bb65646cf377ff9d1be762f07') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +prepare() { + cd ${srcdir}/${_mod}-trinity-${pkgver} + patch -p1 <${srcdir}/bp000-fix-crash-on-export-basket-archive.diff +} + build() { msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p "$srcdir/build" @@ -42,6 +49,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ @@ -49,11 +57,11 @@ build() { -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-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff b/arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff new file mode 100644 index 000000000..172333cf3 --- /dev/null +++ b/arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff @@ -0,0 +1,60 @@ +commit 6ccb5528ecff0cf0db5fe2f81b26a79959e87902 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Fri Oct 29 03:47:53 2021 +0200 + + Prevent null pointer deference in methods for selection. + This resolves the crash when exporting the Basket archive. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + (cherry picked from commit a08c6ac9e3c8ac162ce08b730fd6108e2f71213c) + +diff --git a/src/archive.cpp b/src/archive.cpp +index 3f3377c..aec789f 100644 +--- a/src/archive.cpp ++++ b/src/archive.cpp +@@ -228,7 +228,8 @@ void Archive::saveBasketToArchive(Basket *basket, bool recursive, KTar *tar, TQS + + // Recursively save child baskets: + BasketListViewItem *item = Global::bnpView->listViewItemForBasket(basket); +- if (recursive && item->firstChild()) { ++ if (recursive && item && item->firstChild()) ++ { + for (BasketListViewItem *child = (BasketListViewItem*) item->firstChild(); child; child = (BasketListViewItem*) child->nextSibling()) { + saveBasketToArchive(child->basket(), recursive, tar, backgrounds, tempFolder, progress); + } +diff --git a/src/basket.cpp b/src/basket.cpp +index a4edb31..67107d2 100644 +--- a/src/basket.cpp ++++ b/src/basket.cpp +@@ -4469,12 +4469,20 @@ void Basket::noteUngroup() + + void Basket::unplugSelection(NoteSelection *selection) + { ++ if (!selection) ++ { ++ return; ++ } + for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) + unplugNote(toUnplug->note); + } + + void Basket::insertSelection(NoteSelection *selection, Note *after) + { ++ if (!selection) ++ { ++ return; ++ } + for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { + if (toUnplug->note->isGroup()) { + Note *group = new Note(this); +@@ -4496,6 +4504,10 @@ void Basket::insertSelection(NoteSelection *selection, Note *after) + + void Basket::selectSelection(NoteSelection *selection) + { ++ if (!selection) ++ { ++ return; ++ } + for (NoteSelection *toUnplug = selection->firstStacked(); toUnplug; toUnplug = toUnplug->nextStacked()) { + if (toUnplug->note->isGroup()) + selectSelection(toUnplug); diff --git a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD index e72405c2f..6a1657746 100644 --- a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD +++ b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD @@ -1,46 +1,50 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-gtk-qt-engine -pkgver=14.0.10 +_mod=gtk-qt-engine +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="gtk qt engine" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs' 'gtk2') -makedepends=('pkgconfig' 'cmake') -#provides=('gtk-qt-engine') -#conflicts=('gtk-qt-engine') -#replaces=('gtk-qt-engine') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk-qt-engine-trinity-${pkgver}.tar.xz") -md5sums=('419342ad15dca93e5e4424eb7b0a2e59') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('60aa938573a877aa4589e49ee312253e') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p "$srcdir/build" - cd "$srcdir/build" + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DBUILD_ALL=ON \ -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-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD index f0f244d99..ad7e7015c 100644 --- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD +++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD @@ -1,25 +1,27 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-gtk3-tqt-engine -pkgver=14.0.10 +_mod=gtk3-tqt-engine +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="gtk3 tqt engine" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs' 'gtk3') -makedepends=('pkgconfig' 'cmake') -#provides=('tdemultimedia') -#conflicts=('gtk3-tqt-engine') -#replaces=('gtk3-tqt-engine') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/gtk3-tqt-engine-trinity-${pkgver}.tar.xz" - 'bp000-0e2c727907.diff') -md5sums=('1f94fd009a3c062e042f914c21d49984' - '280b56843ebeb41b9ee74120b0ef28b6') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('00a83443141c5c588f41e72ef74ceaf7') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 @@ -28,8 +30,6 @@ build() { ## Generate config files and update with autoreconf cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - patch -p1 < ${srcdir}/bp000-0e2c727907.diff - msg "Copying system libtool files...." cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff b/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff deleted file mode 100644 index fd8dd3872..000000000 --- a/arch/tde-extra/tde-gtk3-tqt-engine/bp000-0e2c727907.diff +++ /dev/null @@ -1,32 +0,0 @@ -commit b1327f977ffaa5b1789fd5987f621fa9b35a2a08 -Author: Slávek Banko <slavek.banko@axis.cz> -Date: Fri Sep 24 14:54:59 2021 +0200 - - Fix FTBFS in case TQt3 is not installed in the system directory. - - Signed-off-by: Slávek Banko <slavek.banko@axis.cz> - (cherry picked from commit 0e2c72790799d6043225910bd437bd54f5cc6989) - -diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am -index 54a5db3..f1886dc 100644 ---- a/tdegtk/Makefile.am -+++ b/tdegtk/Makefile.am -@@ -44,9 +44,8 @@ libtdegtk_la_SOURCES = $(source_h) $(source_c) - libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - --libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -- --libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) -+libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -+libtdegtk_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) - - lib_LTLIBRARIES = libtqtcairo.la - -@@ -56,5 +55,4 @@ libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - - libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_QT) $(LIB_TDEUI) -- --libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) -+libtqtcairo_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD index b7d17b979..70029df30 100644 --- a/arch/tde-extra/tde-kmplayer/PKGBUILD +++ b/arch/tde-extra/tde-kmplayer/PKGBUILD @@ -1,48 +1,53 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-kmplayer -pkgver=14.0.10 +_mod=kmplayer +_cat=applications/multimedia/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE KMPlayer" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdebase' 'tde-dbus-tqt' 'dbus-glib') -makedepends=('pkgconfig' 'cmake' 'mplayer' 'xine-lib' 'nspr' 'gtk2') -#provides=('kmplayer') -#conflicts=('kmplayer') -#replaces=('kmplayer') +makedepends=('tde-cmake-trinity' 'mplayer' 'xine-lib' 'nspr' 'gtk2') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/kmplayer-trinity-${pkgver}.tar.xz") -md5sums=('e817acc32c3f87cc475be8d8c7a1b4a7') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('bafbf516d47a05cfe2e943f27a93408c') +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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DBUILD_ALL=ON \ -DBUILD_KOFFICE_PLUGIN=OFF \ - -DBUILD_KGSTPLAYER=OFF + -DBUILD_KGSTPLAYER=OFF \ + -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-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD index 2688b1bec..e53722835 100644 --- a/arch/tde-extra/tde-krusader/PKGBUILD +++ b/arch/tde-extra/tde-krusader/PKGBUILD @@ -1,22 +1,26 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-krusader -pkgver=14.0.10 +_mod=krusader +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE Krusader" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/krusader' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdebase') makedepends=('pkgconfig' 'automake') -#provides=('krusader') -#conflicts=('krusader') -#replaces=('krusader') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/krusader-trinity-${pkgver}.tar.xz") -md5sums=('1491538ca6e616ec5bdfaa9c9f86c9b2') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('2040364b94ba52f8c8c8961b50e7296f') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD index 4735a9653..55931d492 100644 --- a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD +++ b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD @@ -1,46 +1,50 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-ksplash-engine-moodin -pkgver=14.0.10 +_mod=ksplash-engine-moodin +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE KSplash Engine Moodin" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdebase') -makedepends=('pkgconfig' 'cmake') -#provides=('ksplash-engine-moodin') -#conflicts=('ksplash-engine-moodin') -#replaces=('ksplash-engine-moodin') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/ksplash-engine-moodin-trinity-${pkgver}.tar.xz") -md5sums=('3a10d2089ed4e165ff74994e9efbf262') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('dcb22daf00d9604f284d1315b2870f5e') +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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DBUILD_ALL=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-extra/tde-style-qtcurve/PKGBUILD b/arch/tde-extra/tde-style-qtcurve/PKGBUILD index 47d8524bc..9f3003db6 100644 --- a/arch/tde-extra/tde-style-qtcurve/PKGBUILD +++ b/arch/tde-extra/tde-style-qtcurve/PKGBUILD @@ -1,22 +1,26 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-style-qtcurve -pkgver=14.0.10 +_mod=tde-style-qtcurve +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE Style QTCurve" arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/applications/tde-style-qtcurve' +url="http://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -#provides=('tde-style-qtcurve') -#conflicts=('tde-style-qtcurve') -#replaces=('tde-style-qtcurve') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-style-qtcurve-trinity-${pkgver}.tar.xz") -md5sums=('b5bff2af06e5891d9b4bbeb5b3c83835') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('145c6de3ab7c8910feff4d3b2e2e0dc4') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -27,17 +31,18 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DBUILD_ALL=ON \ -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-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD index b92314db6..faaa47b1c 100644 --- a/arch/tde-extra/tde-systemsettings/PKGBUILD +++ b/arch/tde-extra/tde-systemsettings/PKGBUILD @@ -1,22 +1,26 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-systemsettings -pkgver=14.0.10 +_mod=tde-systemsettings +_cat=applications/settings/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE System Settings" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -#provides=('tde-systemsettings') -#conflicts=('tde-systemsettings') -#replaces=('tde-systemsettings') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tde-systemsettings-trinity-${pkgver}.tar.xz") -md5sums=('aa7b76706221850c5ef5519360247e7b') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('17d6a2c9a6135680162a10de6ca0f4ae') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -27,17 +31,18 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DBUILD_ALL=ON \ -DBUILD_KNETWORKCONF=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-extra/tde-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD index f0e578c38..98e554999 100644 --- a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD +++ b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD @@ -1,46 +1,50 @@ # Maintainer: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdeaccessibility -pkgver=14.0.10 +_mod=tdeaccessibility +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="Accessibility utilities for the TDE Desktop" arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake' 'tde-tdemultimedia') +makedepends=('tde-cmake-trinity' 'tde-tdemultimedia') optdepends=() -provides=("${pkgname#*-}") -conflicts=("trinity-${pkgname#*-}") -replaces=("trinity-${pkgname#*-}") +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') -# install='pkgname.install' -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaccessibility-trinity-${pkgver}.tar.xz") -md5sums=('0fb53257ee9b5dbd464a6ca8f30ef5b6') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('f364bf5a1a460c2278f78b99ded4d646') [ -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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DBUILD_ALL=ON + -DBUILD_ALL=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-extra/tde-tdeaddons/PKGBUILD b/arch/tde-extra/tde-tdeaddons/PKGBUILD index b3acc8363..2fe6f8d5c 100644 --- a/arch/tde-extra/tde-tdeaddons/PKGBUILD +++ b/arch/tde-extra/tde-tdeaddons/PKGBUILD @@ -1,46 +1,50 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdeaddons -pkgver=14.0.10 +_mod=tdeaddons +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdeaddons' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') pkgdesc="Trinity Desktop Addons" depends=('tde-tdebase') -makedepends=('pkgconfig' 'cmake' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim') -provides=('tdeaddons') -conflicts=('trinity-tdeaddons' 'trinity-kdeaddons') -replaces=('trinity-tdeaddons') +makedepends=('tde-cmake-trinity' 'tde-tdegames' 'tde-tdemultimedia' 'tde-tdepim' 'sdl') +provides=("${_mod}") +conflicts=("trinity-${_mod}" "trinity-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeaddons-trinity-${pkgver}.tar.xz") -md5sums=('27557921bf86569042c72d597b87c877') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('70b3c7131761a0c405942614ea8f5243') [ -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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_ARTS=ON \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_XMMS=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-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD index 05899c6f3..c5988fc4e 100644 --- a/arch/tde-extra/tde-tdeedu/PKGBUILD +++ b/arch/tde-extra/tde-tdeedu/PKGBUILD @@ -1,51 +1,52 @@ # Maintainer: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdeedu -pkgver=14.0.10 +_mod=tdeedu +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="Educational utilities for the TDE Desktop" arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin') +makedepends=('tde-cmake-trinity' 'boost' 'boost-libs' 'doxygen' 'python' 'texlive-bin') optdepends=() -provides=("${pkgname#*-}") -conflicts=("trinity-${pkgname#*-}") -replaces=("trinity-${pkgname#*-}") +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') -# install='pkgname.install' -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeedu-trinity-${pkgver}.tar.xz" - 'bp000-0cb84fb9.diff') -md5sums=('3859da24d70f0d787c0cc7f41540772d' - '5ae3959dc2dc62f1f7421620b198d175') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('10d3f00e8539e7bb74ecb02c6a91c507') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - patch -p1 < ${srcdir}/bp000-0cb84fb9.diff - - 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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_OCAML_SOLVER=OFF \ + -DWITH_LIBUSB=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-extra/tde-tdeedu/bp000-0cb84fb9.diff b/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff deleted file mode 100644 index 5dbe6e492..000000000 --- a/arch/tde-extra/tde-tdeedu/bp000-0cb84fb9.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 0cb84fb9036ce7bc7c757a3971fdb0c619d0c011 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr> -Date: Tue, 11 May 2021 09:15:26 +0200 -Subject: Fix FTBFS on Fedora 34 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: static assertion failed: comparison object must be invocable as const - -Signed-off-by: François Andriot <francois.andriot@free.fr> ---- - kiten/learn.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kiten/learn.cpp b/kiten/learn.cpp -index 94e77b9a..a1b685d4 100644 ---- a/kiten/learn.cpp -+++ b/kiten/learn.cpp -@@ -762,7 +762,7 @@ void Learn::qupdate() - - struct Learn::scoreCompare - { -- bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) -+ bool operator()(const TQListViewItem* v1, const TQListViewItem* v2) const - { - return v1->text(4).toInt() < v2->text(4).toInt(); - } --- -cgit v1.2.1 - diff --git a/arch/tde-extra/tde-tdegames/PKGBUILD b/arch/tde-extra/tde-tdegames/PKGBUILD index 887916a87..5c12f1e0a 100644 --- a/arch/tde-extra/tde-tdegames/PKGBUILD +++ b/arch/tde-extra/tde-tdegames/PKGBUILD @@ -1,46 +1,49 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdegames -pkgver=14.0.10 +_mod=tdegames +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdegames' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') pkgdesc="Trinity Desktop Games" depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -provides=('tdegames') -conflicts=('trinity-tdegames' 'trinity-kdegames') -replaces=('trinity-tdegames') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}" "trinity-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegames-trinity-${pkgver}.tar.xz") -md5sums=('870352e848a991f1ff0045ef5590bc47') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('ef150b0d95ed82704e6d622da077dd60') [ -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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_ARTS=ON \ - -DBUILD_ALL=ON + -DBUILD_ALL=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-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD index 092c6cd70..89c71dcbd 100644 --- a/arch/tde-extra/tde-tdemultimedia/PKGBUILD +++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD @@ -1,49 +1,52 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdemultimedia -pkgver=14.0.10 +_mod=tdemultimedia +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="Trinity Desktop MultiMedia Components" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdemultimedia' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') -depends=('tde-tdelibs' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib') -makedepends=('pkgconfig' 'cmake') -provides=('tdemultimedia') -conflicts=('trinity-tdemultimedia' 'trinity-kdemultimedia') -replaces=('trinity-tdemultimedia') +depends=('tde-tdelibs' 'tde-akode' 'cdparanoia' 'lame' 'libtheora' 'taglib' 'xine-lib') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}" "trinity-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdemultimedia-trinity-${pkgver}.tar.xz") -md5sums=('f1f40920c9eed566eaa98a81b838b7b8') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('dc18c8aa1cdd7f4cbbb6628378ad0e82') # 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 export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_ALL_OPTIONS=ON \ - -DWITH_ARTS_AKODE=OFF \ -DBUILD_ALL=ON \ - -DBUILD_JUK=OFF + -DWITH_ALL_OPTIONS=ON \ + -DWITH_GSTREAMER=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-extra/tde-tdenetwork/PKGBUILD b/arch/tde-extra/tde-tdenetwork/PKGBUILD index 17c098fdb..6d405c578 100644 --- a/arch/tde-extra/tde-tdenetwork/PKGBUILD +++ b/arch/tde-extra/tde-tdenetwork/PKGBUILD @@ -1,48 +1,60 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdenetwork -pkgver=14.0.10 +_mod=tdenetwork +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdenetwork' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') pkgdesc="Trinity Desktop Network Components" -depends=('tde-tdelibs' 'speex' 'wireless_tools' 'wpa_supplicant') -makedepends=('pkgconfig' 'cmake') -provides=('tdenetwork') -conflicts=('trinity-tdenetwork' 'trinity-kdenetwork') -replaces=('trinity-tdenetwork') +depends=('tde-tdelibs' 'tde-tqca' 'libgadu' 'wireless_tools' 'wpa_supplicant') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}" "trinity-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdenetwork-trinity-${pkgver}.tar.xz") -md5sums=('c3d26523623fbcc65993a044bd83d0f6') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('c5ec9a45b636c8da74d71194ed384b81') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$QTDIR" ] || QTDIR=${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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_SPEEX=ON \ - -DWITH_ARTS=ON \ - -DBUILD_ALL=ON + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_JINGLE=OFF \ + -DWITH_SPEEX=OFF \ + -DWITH_XMMS=OFF \ + -DWITH_SLP=OFF \ + -DBUILD_KOPETE_PROTOCOL_ALL=ON \ + -DBUILD_KOPETE_PROTOCOL_SMS=OFF \ + -DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF \ + -DBUILD_KOPETE_PLUGIN_ALL=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-extra/tde-tdenetworkmanager/PKGBUILD b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD index ce1489353..f6ca86d33 100644 --- a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD +++ b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD @@ -1,55 +1,48 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdenetworkmanager -pkgver=14.0.10 +_mod=tdenetworkmanager +_cat=applications/settings/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.0.11 pkgrel=1 pkgdesc="gtk qt engine" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -#provides=('tdenetworkmanager') -#conflicts=('tdenetworkmanager') -#replaces=('tdenetworkmanager') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=( - "https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdenetworkmanager-trinity-${pkgver}.tar.xz" - 'bp000-ea2b20ed7a.diff' - 'bp001-e4e7853030.diff' -) -md5sums=( - '2edab1bc48066a52f0b53a19457495a2' - '40f95a5c7c02471e629e109aeca86ce3' - 'd292626fb10780eb68bbc1a60c1e7ed7' -) -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('9e36a8f2697081bdb92589ea914980f0') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - patch -p1 < ${srcdir}/bp000-ea2b20ed7a.diff - patch -p1 < ${srcdir}/bp001-e4e7853030.diff - msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p "${srcdir}/build" cd "${srcdir}/build" msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DBUILD_ALL=ON \ -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-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff b/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff deleted file mode 100644 index 22abf310b..000000000 --- a/arch/tde-extra/tde-tdenetworkmanager/bp000-ea2b20ed7a.diff +++ /dev/null @@ -1,78 +0,0 @@ -commit ea2b20ed7ab3e83b8585e20d2febdbb5f2d356c1 -Author: Michele Calgaro <michele.calgaro@yahoo.it> -Date: Mon Aug 2 11:24:50 2021 +0900 - - Removed unused hardwareEvent code. - - Initialization of TDEHardwareDevices() always happens before the signal - was connected. The constructor of TDEHardwareDevices() is the only place - that was triggering the signal emission, so the code was non functional. - - Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> - -diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp -index 5f1f26e..085435c 100644 ---- a/tdenetworkmanager/src/devicetraycomponent.cpp -+++ b/tdenetworkmanager/src/devicetraycomponent.cpp -@@ -74,8 +74,6 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent, - - TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices(); - -- // Listen for hardware change events -- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString))); - // Trigger an initial hardware information update - tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); - -diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp -index 9427679..173464f 100644 ---- a/tdenetworkmanager/src/tdenetman-tray.cpp -+++ b/tdenetworkmanager/src/tdenetman-tray.cpp -@@ -963,14 +963,6 @@ void Tray::slotGenericDeviceRemoved(TDEGenericDevice *dev) - } - } - --void Tray::slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent event, TQString) --{ -- if (event == TDEHardwareEvent::HardwareListModified) { -- updateDeviceTrays(); -- connectTrayDeviceManager(); -- } --} -- - void Tray::slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message) - { - if (event == TDENetworkVPNEventType::LoginBanner) { -@@ -1094,7 +1086,6 @@ Tray::Tray() : KSystemTray() - // get notified about new/removed devices - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceAdded(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(slotGenericDeviceRemoved(TDEGenericDevice*))); -- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString))); - - // Notifications - connect(TDEGlobal::networkManager(), TQT_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQT_SLOT(slotStateChangedNotify(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); -diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h -index d086902..6f4fdea 100644 ---- a/tdenetworkmanager/src/tdenetman-tray.h -+++ b/tdenetworkmanager/src/tdenetman-tray.h -@@ -115,7 +115,6 @@ class Tray : public KSystemTray - private slots: - void slotGenericDeviceAdded(TDEGenericDevice*); - void slotGenericDeviceRemoved(TDEGenericDevice*); -- void slotGenericHardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString); - void slotVPNEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType event, TQString message); - - private: -diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp -index 2d4eccb..9b855ec 100644 ---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp -+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp -@@ -487,9 +487,6 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons - setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless"); - setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50"); - -- // Listen for hardware change events -- connect(hwdevices, TQT_SIGNAL(hardwareEvent(TDEHardwareEvent::TDEHardwareEvent, TQString)), this, TQT_SLOT(tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString))); -- - // Trigger an initial hardware information update - tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); - } diff --git a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff b/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff deleted file mode 100644 index 887c989f1..000000000 --- a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff +++ /dev/null @@ -1,121 +0,0 @@ -commit e4e7853030d8efbf14e5ad6631c4cfb6b3601269 -Author: Michele Calgaro <michele.calgaro@yahoo.it> -Date: Mon Aug 2 23:19:04 2021 +0900 - - Removed unused hardwareEvent code - part 2. - - Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> - -diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp -index 085435c..2ea4e35 100644 ---- a/tdenetworkmanager/src/devicetraycomponent.cpp -+++ b/tdenetworkmanager/src/devicetraycomponent.cpp -@@ -75,7 +75,11 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent, - TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices(); - - // Trigger an initial hardware information update -- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); -+ TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); -+ TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); -+ -+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); -+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString))); - - m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection"; - m_pixmaps[TDENetworkConnectionStatus::UnManaged] = "nm_no_connection"; -@@ -110,18 +114,6 @@ TQString DeviceTrayComponent::device() const - return m_device; - } - --void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) --{ -- if (event == TDEHardwareEvent::HardwareListModified) { -- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices(); -- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); -- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); -- -- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); -- connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString))); -- } --} -- - void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) { - kdDebug() << "DeviceTrayComponent::deviceEventHandler" << endl; - -diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h -index af0ccea..c3c40e1 100644 ---- a/tdenetworkmanager/src/devicetraycomponent.h -+++ b/tdenetworkmanager/src/devicetraycomponent.h -@@ -59,7 +59,6 @@ class DeviceTrayComponent : public TrayComponent - void deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString); - - private slots: -- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString); - void deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message); - - protected: -diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp -index 9b855ec..8811650 100644 ---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp -+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp -@@ -428,25 +428,6 @@ void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress) - KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") ); - } - --void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) --{ -- if (event == TDEHardwareEvent::HardwareListModified) { -- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); -- TDENetworkConnectionManager* deviceConnMan = (dev)?dev->connectionManager():NULL; -- -- // get notified when the device state changes -- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); -- -- // get notified of all AP changes -- connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType))); -- -- // force status update to ensure correct icon is shown on startup -- if ((dev) && (deviceConnMan)) { -- slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode()); -- } -- } --} -- - void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) { - TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); - TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); -@@ -487,8 +468,20 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons - setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless"); - setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50"); - -- // Trigger an initial hardware information update -- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); -+ // initial hardware information update -+ TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); -+ TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL; -+ -+ // get notified when the device state changes -+ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); -+ -+ // get notified of all AP changes -+ connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType))); -+ -+ // force status update to ensure correct icon is shown on startup -+ if ((netdev) && (deviceConnMan)) { -+ slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, netdev->deviceNode()); -+ } - } - - WirelessDeviceTray::~WirelessDeviceTray () -diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h -index 59a24a1..eb429b9 100644 ---- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h -+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h -@@ -66,7 +66,6 @@ class WirelessDeviceTray : public DeviceTrayComponent - void slotAccessPointRemoved(TDEMACAddress); - - private slots: -- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString); - void tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType); - void sendUpdateUI(); - diff --git a/arch/tde-extra/tde-tdepim/PKGBUILD b/arch/tde-extra/tde-tdepim/PKGBUILD index 9d00f1810..706aed242 100644 --- a/arch/tde-extra/tde-tdepim/PKGBUILD +++ b/arch/tde-extra/tde-tdepim/PKGBUILD @@ -1,33 +1,36 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdepim -pkgver=14.0.10 +_mod=tdepim +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="Trinity Desktop PIM Components" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdepim' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('boost' 'boost-libs' 'gnokii' 'libxss' 'xscreensaver' 'tde-tdelibs' 'tde-libcaldav' 'tde-libcarddav') -makedepends=('pkgconfig' 'cmake' ) -provides=('tdepim') -replaces=('trinity-tdepim') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdepim-trinity-${pkgver}.tar.xz") -md5sums=('894562acd7c895da37d8af30b4f1fc61') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('55519a87ac6c16da15c4b1364e2c33f3') [ -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_C_FLAGS="-fpermissive" \ -DCMAKE_CXX_FLAGS="-fpermissive" \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -36,13 +39,13 @@ build() { -DBUILD_ALL=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 # Removing /opt/trinity/share/icons/default.tde to prevent a conflict rm -rf ${pkgdir}/opt/trinity/share/icons/default.tde } diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD index a9c5d20c5..968037a4b 100644 --- a/arch/tde-extra/tde-tdepowersave/PKGBUILD +++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD @@ -2,34 +2,32 @@ # Contributor: David C. Rankin <drankinatty at gmail dot com> _mod=tdepowersave -_cat=applications/ +_cat=applications/system/ _kdemod="${_mod/tde/kde}" -pkgname="tde-$_mod" -pkgver=14.0.10 + +pkgname="tde-${_mod/tde-}" +pkgver=14.0.11 pkgrel=1 -pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +pkgdesc="Trinity Desktop Enviroment - ${_mod}" arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/$_mod" +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') -#provides=("$_mod") +provides=("${_mod}") groups=('tde-extra') depends=( 'tde-tdelibs' 'tde-dbus-1-tqt' 'libxss' ) -makedepends=( - 'cmake' - 'pkgconfig' -) +makedepends=('tde-cmake-trinity') optdepends=() -confilicts=("trinity-$_kdemod" "kdemod3-$_kdemod") -#replaces=("trinity-$_mod") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R$pkgver/main/$_cat$_mod-trinity-$pkgver.tar.xz") -md5sums=('64daecf2c9061f3797b2cab8f0ad347b') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('68686e75e26795c31d051cf84e0fd06a') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -42,17 +40,18 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DBUILD_ALL=ON \ -DWITH_GCC_VISIBILITY=ON msg "Building - ${pkgname#*-}..." - make VERBOSE=1 $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-extra/tde-tdesudo/PKGBUILD b/arch/tde-extra/tde-tdesudo/PKGBUILD index 07b0ff58b..6c62c34c9 100644 --- a/arch/tde-extra/tde-tdesudo/PKGBUILD +++ b/arch/tde-extra/tde-tdesudo/PKGBUILD @@ -1,31 +1,30 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdesudo -pkgver=14.0.10 +_mod=tdesudo +_cat=applications/settings/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE Sudo" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -#provides=('tdesudo') -#conflicts=('tdesudo') -#replaces=('tdesudo') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdesudo-trinity-${pkgver}.tar.xz" - 'bp000-1136b8150f.diff') -md5sums=('ff1b28acd12998c216e4256ca94f795b' - '6ba546544bfab644bbbba972f31a137b') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('5943e82101e4a19499fcfd8cc21388e4') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - patch -p1 < $srcdir/bp000-1136b8150f.diff - msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p $srcdir/build cd $srcdir/build @@ -34,16 +33,18 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DBUILD_ALL=ON + -DBUILD_ALL=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-extra/tde-tdesudo/bp000-1136b8150f.diff b/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff deleted file mode 100644 index 60bd6082c..000000000 --- a/arch/tde-extra/tde-tdesudo/bp000-1136b8150f.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 1136b8150f58e909eaa094d991dcefa81b8f6a60 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr> -Date: Tue, 11 May 2021 19:45:01 +0200 -Subject: Fix ftbfs on Fedora 34 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: ordered comparison of pointer with integer zero ('char*' and 'int') - -Signed-off-by: François Andriot <francois.andriot@free.fr> ---- - tdesudo/tdesudo.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tdesudo/tdesudo.cpp b/tdesudo/tdesudo.cpp -index c255d0f..83158ab 100644 ---- a/tdesudo/tdesudo.cpp -+++ b/tdesudo/tdesudo.cpp -@@ -205,7 +205,7 @@ TdeSudo::TdeSudo(TQWidget *parent, const char *name,const TQString& icon, const - chmod(m_tmpname.ascii(),0644); - - QCStringList output; -- while (fgets(buf, 1024, f) > 0) -+ while (fgets(buf, 1024, f) != NULL) - output += buf; - if (pclose(f) < 0) { - kdError() << k_lineinfo << "Could not run xauth.\n"; --- -cgit v1.2.1 - diff --git a/arch/tde-extra/tde-tdetoys/PKGBUILD b/arch/tde-extra/tde-tdetoys/PKGBUILD index 9b2bbde2e..445bb144a 100644 --- a/arch/tde-extra/tde-tdetoys/PKGBUILD +++ b/arch/tde-extra/tde-tdetoys/PKGBUILD @@ -1,43 +1,46 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdetoys -pkgver=14.0.10 +_mod=tdetoys +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdetoys' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') pkgdesc="Trinity Desktop Toys" depends=('tde-tdebase') -makedepends=('pkgconfig' 'cmake') -provides=('tdetoys') -conflicts=('trinity-tdetoys' 'trinity-kdetoys') -replaces=('trinity-tdetoys') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}" "trinity-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdetoys-trinity-${pkgver}.tar.xz") -md5sums=('f91d22efed453b5053e2110782d85d93') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('2bb8f5d47d4e094e459597b5069b7a3d') [ -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_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DBUILD_ALL=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-extra/tde-tdmtheme/PKGBUILD b/arch/tde-extra/tde-tdmtheme/PKGBUILD index c6c368ab2..8d931d10e 100644 --- a/arch/tde-extra/tde-tdmtheme/PKGBUILD +++ b/arch/tde-extra/tde-tdmtheme/PKGBUILD @@ -1,22 +1,26 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdmtheme -pkgver=14.0.10 +_mod=tdmtheme +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDM Theme" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -#provides=('tdmtheme') -#conflicts=('tdmtheme') -#replaces=('tdmtheme') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/tdmtheme-trinity-${pkgver}.tar.xz") -md5sums=('b085fa2792024415fb2174633875adbe') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('6428e97a82389819dd02e1608cd43b8b') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -27,16 +31,18 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DBUILD_ALL=ON + -DBUILD_ALL=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-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD index e5660beb6..ff7dbd53b 100644 --- a/arch/tde-extra/tde-tork/PKGBUILD +++ b/arch/tde-extra/tde-tork/PKGBUILD @@ -2,10 +2,11 @@ # Contributor: David C. Rankin <drankinatty at gmail dot com> _mod=tork -_cat=applications/ +_cat=applications/internet/ _kdemod="${_mod/tde/kde}" + pkgname="tde-${_mod}" -pkgver=14.0.10 +pkgver=14.0.11 pkgrel=1 pkgdesc="Anonymity manager for TDE" arch=('i686' 'x86_64') @@ -18,34 +19,27 @@ depends=( 'geoip' 'torsocks' ) -makedepends=( - 'cmake' - 'pkgconfig' -) +makedepends=('tde-cmake-trinity') optdepends=() -confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" - 'bp000-7576a4bf.diff') -md5sums=('1f17070b8891a8fdd883b45cea74c72d' - '132b051287bfbfd41e2c50110027525b') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('5833c06b815dc333f921dfdc6d7d844b') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 build() { - cd ${srcdir}/${_mod}-trinity-${pkgver} - patch -p1 < ${srcdir}/bp000-7576a4bf.diff - msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p "$srcdir/build" cd "$srcdir/build" msg "Starting cmake..." cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ @@ -53,11 +47,11 @@ build() { -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-extra/tde-tork/bp000-7576a4bf.diff b/arch/tde-extra/tde-tork/bp000-7576a4bf.diff deleted file mode 100644 index 64db42995..000000000 --- a/arch/tde-extra/tde-tork/bp000-7576a4bf.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 7576a4bfe86835552ede116488e70baae64df9e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr> -Date: Tue, 11 May 2021 20:34:45 +0200 -Subject: Fix ftbfs on Fedora 34 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: ordered comparison of pointer with integer zero (‘TQListViewItem*’ and ‘int’) - -Signed-off-by: François Andriot <francois.andriot@free.fr> ---- - src/torkview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/torkview.cpp b/src/torkview.cpp -index 1dd8b5d..ce32aea 100644 ---- a/src/torkview.cpp -+++ b/src/torkview.cpp -@@ -1312,7 +1312,7 @@ void torkView::activeServersUpdated( const TQStringList &servers) - { - if ((*it).isEmpty()) - continue; -- if ( (tm = serverList->findItem((*it),1)) > 0){ -+ if ( (tm = serverList->findItem((*it),1)) != NULL){ - tm->setPixmap(0,TQPixmap(SmallIcon("tork_green"))); - }else{ - tm = new TQListViewItem(serverList, (*it)); --- -cgit v1.2.1 - diff --git a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD index b23465403..cbe5cf1d2 100644 --- a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD +++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD @@ -1,54 +1,50 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-twin-style-crystal -pkgver=14.0.10 +_mod=twin-style-crystal +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.11 pkgrel=1 pkgdesc="TDE TWin Style Crystal" arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal' +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') depends=('tde-tdebase') -makedepends=('pkgconfig' 'cmake') -#provides=('twin-style-crystal') -#conflicts=('twin-style-crystal') -#replaces=('twin-style-crystal') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_kdemod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/applications/twin-style-crystal-trinity-${pkgver}.tar.xz") -md5sums=('b87b5ad84ba492e6e56c583c05ba4d40') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('b435ddeae50565fd440dc3705f503218') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 build() { - ## Generate config files and update with autoreconf - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - - msg "Copying system libtool files...." - cp /usr/share/aclocal/libtool.m4 ./admin/libtool.m4.in - cp /usr/share/libtool/build-aux/ltmain.sh ./admin/ltmain.sh - - msg "Running make -f admin/Makefile.common ...." - make -f admin/Makefile.common - - ## configure - msg "Configuring - ${pkgname#*-}..." - ./configure \ - --prefix=${TDEDIR} \ - --with-qt-dir=${QTDIR} \ - --with-qt-includes=${QTDIR}/include \ - --with-qt-libraries=${QTDIR}/lib \ - --sysconfdir=${TDEDIR}/etc \ - --localstatedir=/var \ - --enable-closure - - msg "Building - ${pkgname#*-}..." - make $NUMJOBS + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS } package() { - msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - make -j1 DESTDIR="${pkgdir}" install + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD index 81977b50f..6ae669d96 100644 --- a/arch/tde-extra/tde-yakuake/PKGBUILD +++ b/arch/tde-extra/tde-yakuake/PKGBUILD @@ -2,10 +2,11 @@ # Contributor: David C. Rankin <drankinatty at gmail dot com> _mod=yakuake -_cat=applications/ +_cat=applications/system/ _kdemod="${_mod/tde/kde}" + pkgname="tde-${_mod}" -pkgver=14.0.10 +pkgver=14.0.11 pkgrel=1 pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology" arch=('i686' 'x86_64') @@ -16,18 +17,15 @@ groups=('tde-complete') depends=( 'tde-tdelibs' ) -makedepends=( - 'cmake' - 'pkgconfig' -) +makedepends=('tde-cmake-trinity') optdepends=() -confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('87c4355c77e561d36d35ea46b66f6375') +md5sums=('77fb98c6bfd0d5e91b38417ae39083e4') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 @@ -39,6 +37,7 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ @@ -46,11 +45,11 @@ build() { -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 } |