diff options
Diffstat (limited to 'arch')
159 files changed, 6512 insertions, 3094 deletions
diff --git a/arch/PKGBUILD.template b/arch/PKGBUILD.template index 8b1d87d1c..81e37aa86 100644 --- a/arch/PKGBUILD.template +++ b/arch/PKGBUILD.template @@ -4,11 +4,12 @@ _mod=tdepowersave _cat=applications/ _kdemod="${_mod/tde/kde}" -pkgname="tde-${_mod}" -pkgver=14.0.10 + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.0 pkgrel=1 pkgdesc="Trinity Desktop Enviroment $_cat$_mod" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') provides=("${_mod}") @@ -17,12 +18,12 @@ depends=( 'tde-tdelibs' ) makedepends=( + 'tde-cmake-trinity' 'autoconf' - 'cmake' 'pkgconfig' ) optdepends=() -confilicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= @@ -31,7 +32,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/ md5sums=() [ -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" @@ -40,18 +41,19 @@ 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_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON msg "Building - ${pkgname}..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - ${pkgname}-${pkgver}" cd "$srcdir/build" - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/build.sh b/arch/build.sh index cdce2c1a8..06c55c6f5 100755 --- a/arch/build.sh +++ b/arch/build.sh @@ -1,7 +1,8 @@ #!/bin/bash set -e tdesrc=$PWD -rm -rf $tdesrc/out +tdearch=$(uname -m) +rm -rf $tdesrc/out/${tdearch} . $tdesrc/environment @@ -17,20 +18,20 @@ compile_directory() { } ### Build Packages -compile_directory tde-core "tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca-tls libart-lgpl avahi-tqt tdelibs tdebase" -compile_directory tde-libs "libcaldav libcarddav libkdcraw libkexiv2" -compile_directory tde-base "tdeartwork tdebindings tdegraphics tdeutils tdeadmin" -compile_directory tde-extra "tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket kmplayer krusader ksplash-engine-moodin style-qtcurve tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal yakuake" -compile_directory tde-devel "tdesdk tdevelop tdewebdev" +compile_directory tde-core "cmake-trinity tqt3 tqtinterface arts dbus-tqt dbus-1-tqt tqca tqca-tls libart-lgpl avahi-tqt tdelibs tdebase" +compile_directory tde-libs "libcaldav libcarddav libkdcraw libkexiv2 libkipi" +compile_directory tde-base "i18n tdeartwork tdebindings tdegraphics tdeutils tdeadmin" +compile_directory tde-extra "akode tdepim tdemultimedia tdenetwork tdeedu tdegames tdetoys tdeaccessibility tdeaddons gtk-qt-engine gtk3-tqt-engine systemsettings abakus amarok basket filelight kbiff kchmviewer kcpuload kile kmplayer kmymoney konversation kooldock krename krusader kshutdown ksplash-engine-moodin kvkbd style-baghira style-domino style-lipstik style-qtcurve tdeio-appinfo tdeio-ftps tdeio-locate tdenetworkmanager tdepowersave tdesudo tdmtheme tork twin-style-crystal twin-style-dekorator yakuake" +compile_directory tde-devel "tdesdk tdevelop tdewebdev kdbg kdiff3 kscope kxmleditor" -### Copy completed packages to out folder and download dependencies to out folder +### Copy completed packages to out/${tdearch} folder and download dependencies to out/${tdearch} folder cd $tdesrc -mkdir -p $tdesrc/out -cp $(find $tdesrc -name *.pkg.tar.zst) $tdesrc/out -wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/htdig-3.2.0b6-11-x86_64.pkg.tar.xz -O $tdesrc/out/htdig-3.2.0b6-11-x86_64.pkg.tar.xz -wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/lcms-1.19-7-x86_64.pkg.tar.xz -wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/pod2man-5.30.2-1-x86_64.pkg.tar.zst -wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/python2-lcms-1.19-7-x86_64.pkg.tar.xz -O $tdesrc/out/python2-lcms-1.19-7-x86_64.pkg.tar.xz +mkdir -p $tdesrc/out/${tdearch} +cp $(find $tdesrc -name *.pkg.tar.zst) $tdesrc/out/${tdearch} +wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/gnokii-0.6.31-19.1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/gnokii-0.6.31-19.1-${tdearch}.pkg.tar.zst +wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/htdig-3.2.0b6-11.1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/htdig-3.2.0b6-11.1-${tdearch}.pkg.tar.zst +wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/lcms-1.19-7.1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/lcms-1.19-7.1-${tdearch}.pkg.tar.zst +wget https://mirror.ppa.trinitydesktop.org/trinity/archlinux/${tdearch}/pod2man-5.30.2-1-${tdearch}.pkg.tar.zst -O $tdesrc/out/${tdearch}/pod2man-5.30.2-1-${tdearch}.pkg.tar.zst ### Create trinity pacman repo -repo-add $tdesrc/out/trinity.db.tar.gz $tdesrc/out/*.pkg.tar.{xz,zst} +repo-add $tdesrc/out/${tdearch}/trinity.db.tar.gz $tdesrc/out/${tdearch}/*.pkg.tar.{xz,zst} diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD new file mode 100644 index 000000000..0a55bc102 --- /dev/null +++ b/arch/tde-base/tde-i18n/PKGBUILD @@ -0,0 +1,148 @@ +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=tde-i18n +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgbase="tde-${_mod/tde-}" +pkgname=("$pkgbase") +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Internationalized (i18n) files for TDE" +arch=('any') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-base') +makedepends=('tde-cmake-trinity') +depends=('tde-tdelibs') +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('0f9abfd94810fbee11474a025d05280a') +install='' + +_languages=( + 'af "Afrikaans"' + 'ar "Arabic"' + 'az "Azerbaijani"' + 'be "Belarusian"' + 'bg "Bulgarian"' + 'bn "Bengali"' + 'br "Breton"' + 'bs "Bosnian"' + 'ca "Catalan"' + 'cs "Czech"' + 'csb "Kashubian"' + 'cy "Welsh"' + 'da "Danish"' + 'de "German"' + 'el "Greek"' + 'en_GB "English (British)"' + 'eo "Esperanto"' + 'es "Spanish"' + 'es_AR "Spanish (Argentina)"' + 'et "Estonian"' + 'eu "Basque"' + 'fa "Persian"' + 'fi "Finnish"' + 'fr "French"' + 'fy "Frisian"' + 'ga "Irish"' + 'gl "Galician"' + 'he "Hebrew"' + 'hi "Hindi"' + 'hr "Croatian"' + 'hu "Hungarian"' + 'is "Icelandic"' + 'it "Italian"' + 'ja "Japanese"' + 'kk "Kazakh"' + 'km "Khmer"' + 'ko "Korean"' + 'lt "Lithuanian"' + 'lv "Latvian"' + 'mk "Macedonian"' + 'mn "Mongolian"' + 'ms "Malay"' + 'nb "Norwegian Bokmål"' + 'nds "Low Saxon"' + 'nl "Dutch"' + 'nn "Norwegian Nynorsk"' + 'pa "Punjabi"' + 'pl "Polish"' + 'pt "Portuguese"' + 'pt_BR "Portuguese (Brazil)"' + 'ro "Romanian"' + 'ru "Russian"' + 'rw "Kinyarwanda"' + 'se "Northern Sami"' + 'sk "Slovak"' + 'sl "Slovenian"' + 'sr "Serbian"' + 'sr@Latn "Serbian Latin"' + 'ss "Swati"' + 'sv "Swedish"' + 'ta "Tamil"' + 'te "Telugu"' + 'tg "Tajik"' + 'th "Thai"' + 'tr "Turkish"' + 'uk "Ukrainian"' + 'uz "Uzbek"' + 'uz@cyrillic "Uzbek (Cyrillic)"' + 'vi "Vietnamese"' + 'wa "Walloon"' + 'zh_CN "Chinese (Simplified)"' + 'zh_TW "Chinese (Traditional)"' +) + +_pkglangs=() +for _lang in "${_languages[@]}"; do + _locale=${_lang%% *} + _pkglang=$(echo ${_locale,,} | tr '[:upper:]' '[:lower:]' | \ + sed "s|@latn|latin|" | \ + tr -d "_" | tr -d "@") + _pkgname=${pkgbase}-${_pkglang} + + pkgname+=($_pkgname) + _pkglangs+=($_pkgname) + eval "package_$_pkgname() { + _package $_pkglang $_lang + }" +done + +_package() { + pkgdesc="$3 ($2) internationalized (i18n) files for TDE" + provides=("${_mod}-${1}") + conflicts=("trinity-${_kdemod}-${1}" "kdemod3-${_kdemod}-${1}") + replaces=("trinity-${_mod}-${1}") + + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install-${2/@/_} +} + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + +build() { + 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_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DBUILD_ALL=ON + + msg "Building - ${pkgname#*-}..." + ninja $NUMJOBS +} + +package_tde-i18n() { + pkgdesc="All languages (all) internationalized (i18n) files for TDE" + provides=("${_mod}") + conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") + replaces=("trinity-${_mod}") + depends+=(${_pkglangs[@]}) +} diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD new file mode 100644 index 000000000..227dc5085 --- /dev/null +++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=polkit-agent-tde +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="TDE dialogs for PolicyKit" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-base') +depends=( + 'tde-tdelibs' + 'tde-polkit-tqt' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('252d275eeaaa227b99f9a94a70e80907') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD index 7dcd22bcf..21e7a78cd 100644 --- a/arch/tde-base/tde-tdeadmin/PKGBUILD +++ b/arch/tde-base/tde-tdeadmin/PKGBUILD @@ -1,48 +1,52 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdeadmin -pkgver=14.0.10 +_mod=tdeadmin +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="The TDE system administration utilities" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-base') depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') optdepends=() -provides=("${pkgname#*-}") -conflicts=("trinity-${pkgname#*-}") -replaces=("${pkgname#*-}") +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("${_mod}") options=('staticlibs' 'libtool' '!emptydirs') -# install='pkgname.install' -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdeadmin-trinity-${pkgver}.tar.xz") -md5sums=('401907e03f80ad2433614761af6978b1') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('97efc3f81b67d8c9fc72c025cfdc3ae7') [ -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_KNETWORKCONF=OFF + -DBUILD_KNETWORKCONF=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-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD index d5a66134c..5ff03a3da 100644 --- a/arch/tde-base/tde-tdeartwork/PKGBUILD +++ b/arch/tde-base/tde-tdeartwork/PKGBUILD @@ -1,48 +1,51 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdeartwork -pkgver=14.0.10 +_mod=tdeartwork +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdeartwork' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-base') pkgdesc="Trinity Desktop Development Ingegration Components - TDE upstream GIT" depends=('tde-tdebase' 'xscreensaver' 'libxss') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') optdepends=() -provides=('tdeartwork') -conflicts=('trinity-tdeartwork' 'trinity-kdeartwork') -replaces=('trinity-tdeartwork') +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/tdeartwork-trinity-${pkgver}.tar.xz") -md5sums=('71830a98f9d130a37ba1b3c6107fdd66') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('88b930bb0f2275703e45db99c1a25370') [ -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-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD index ecdbc822b..d2bc21307 100644 --- a/arch/tde-base/tde-tdebindings/PKGBUILD +++ b/arch/tde-base/tde-tdebindings/PKGBUILD @@ -3,60 +3,57 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdebindings -pkgver=14.0.10 +_mod=tdebindings +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https//scm.trinitydesktop.org/scm/git/tdebindings' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https//scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-base') pkgdesc="Trinity Desktop bindings" depends=('tde-tdelibs') -makedepends=('pkgconfig' 'autoconf' 'imake' 'python2' 'ruby' 'jdk-openjdk' 'gtk2') +makedepends=('pkgconfig' 'autoconf' 'python3' 'ruby' 'jdk-openjdk') options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebindings-trinity-${pkgver}.tar.xz" - 'bp000-817f960e.diff' - 'bp001-8301a3c8.diff' - 'bp002-33697c89.diff') -md5sums=('47294367d80fa79fefa80d755a6bf93d' - '79e6de2ddfec059b7601fac3f3a1adc5' - '8267435e92a265b83efbf07db5e36c01' - 'feb8afbd1b3467c3e36f1dffb8c5ca53') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('383ec0f223b7fb638398b9c4eefd54b1') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { ## Generate config files and update with autoreconf cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - msg "Apply backported patches..." - patch -p1 < ${srcdir}/bp000-817f960e.diff - patch -p1 < ${srcdir}/bp001-8301a3c8.diff - patch -p1 < ${srcdir}/bp002-33697c89.diff - msg "Copying system libtool files...." + cp -a /usr/share/libtool/build-aux/config.guess ./admin/ + cp -a /usr/share/libtool/build-aux/config.sub ./admin/ 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 + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + ## configure msg "Configuring - ${pkgname}..." - PYTHON=/usr/bin/python2 \ + PYTHON=/usr/bin/python3 \ ./configure \ --prefix=${TDEDIR} \ - --with-qt-dir=${QTDIR} \ - --with-qt-includes=${QTDIR}/include \ - --with-qt-libraries=${QTDIR}/lib \ - --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \ + --with-tqt-dir=${TQTDIR} \ + --with-tqt-includes=${TQTDIR}/include \ + --with-tqt-libraries=${TQTDIR}/lib \ + --with-extra-includes="/usr/include/tqt" \ --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \ --with-java=/usr/lib/jvm/default \ --sysconfdir=${TDEDIR}/etc \ --localstatedir=/var \ - --enable-closure + --enable-closure \ + DO_NOT_COMPILE='dcopc dcopperl kalyptus qtsharp xparts' msg "Building - ${pkgname}..." make $NUMJOBS diff --git a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff b/arch/tde-base/tde-tdebindings/bp000-817f960e.diff deleted file mode 100644 index e8d31b474..000000000 --- a/arch/tde-base/tde-tdebindings/bp000-817f960e.diff +++ /dev/null @@ -1,31 +0,0 @@ -From 817f960e8ecca5074171cfc8267dcebbb1a7f514 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr> -Date: Mon, 10 May 2021 20:45:41 +0200 -Subject: Fix FTBFS on Fedora 34 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Qt.cpp:2643:17: error: ordered comparison of pointer with integer zero ('void*' and 'int') - -Signed-off-by: François Andriot <francois.andriot@free.fr> ---- - qtruby/rubylib/qtruby/Qt.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp -index 834cc3b2..abb44588 100644 ---- a/qtruby/rubylib/qtruby/Qt.cpp -+++ b/qtruby/rubylib/qtruby/Qt.cpp -@@ -2640,7 +2640,7 @@ isObject(VALUE /*self*/, VALUE obj) - { - void * ptr = 0; - ptr = value_to_ptr(obj); -- return (ptr > 0 ? Qtrue : Qfalse); -+ return (ptr != 0 ? Qtrue : Qfalse); - } - - static VALUE --- -cgit v1.2.1 - diff --git a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff b/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff deleted file mode 100644 index b64ad2535..000000000 --- a/arch/tde-base/tde-tdebindings/bp001-8301a3c8.diff +++ /dev/null @@ -1,401 +0,0 @@ -From 8301a3c8e542675e9b5f310d79ad24b9a12baaf8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz> -Date: Wed, 22 Sep 2021 20:38:45 +0200 -Subject: Add check whether Ruby requires explicit specification of C++ - standard. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Slávek Banko <slavek.banko@axis.cz> ---- - korundum/bin/Makefile.am | 2 + - korundum/configure.in.in | 90 +++++++++++++++++++++++++++++++ - korundum/rubylib/korundum/Makefile.am | 2 + - korundum/rubylib/korundum/configure.in.in | 59 -------------------- - qtruby/bin/Makefile.am | 2 + - qtruby/configure.in.in | 90 +++++++++++++++++++++++++++++++ - qtruby/rubylib/designer/uilib/Makefile.am | 2 + - qtruby/rubylib/qtruby/Makefile.am | 2 + - qtruby/rubylib/qtruby/configure.in.in | 59 -------------------- - 9 files changed, 190 insertions(+), 118 deletions(-) - create mode 100644 korundum/configure.in.in - delete mode 100644 korundum/rubylib/korundum/configure.in.in - create mode 100644 qtruby/configure.in.in - delete mode 100644 qtruby/rubylib/qtruby/configure.in.in - -diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am -index 508f7731..47a8bb02 100644 ---- a/korundum/bin/Makefile.am -+++ b/korundum/bin/Makefile.am -@@ -1,3 +1,5 @@ -+CXXFLAGS += $(RUBY_CXXFLAGS) -+ - INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - - bin_PROGRAMS = krubyinit -diff --git a/korundum/configure.in.in b/korundum/configure.in.in -new file mode 100644 -index 00000000..c420adc9 ---- /dev/null -+++ b/korundum/configure.in.in -@@ -0,0 +1,90 @@ -+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) -+ -+if test -z "RUBY_EXECUTABLE"; then -+ DO_NOT_COMPILE="$DO_NOT_COMPILE korundum" -+else -+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` -+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` -+ -+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"` -+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"` -+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"` -+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"` -+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"` -+ -+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR" -+ if test "$RUBY_SERIES" -ge "19"; then -+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) -+ fi -+ -+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then -+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"` -+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then -+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"` -+ else -+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"` -+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH} -+ fi -+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}" -+ else -+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" -+ fi -+ -+ # check if Ruby requires explicit specification of C++ standard -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ SAVED_CXXFLAGS="$CXXFLAGS" -+ for CXX_STD_TEST in "" 11 14 17; do -+ CXXFLAGS="$SAVED_CXXFLAGS" -+ if test "x$CXX_STD_TEST" = "x"; then -+ AC_MSG_CHECKING([Ruby build with default C++ standard]) -+ RUBY_CXXFLAGS="" -+ else -+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST]) -+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST" -+ fi -+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS" -+ AC_TRY_COMPILE([ -+ #include <ruby.h> -+ ],[ ], -+ ruby_cxx_std=yes, -+ ruby_cxx_std=no -+ ) -+ if test "x$ruby_cxx_std" = "xyes"; then -+ AC_SUBST(RUBY_CXXFLAGS) -+ AC_MSG_RESULT(yes) -+ break -+ else -+ AC_MSG_RESULT(no) -+ fi -+ done -+ CXXFLAGS="$SAVED_CXXFLAGS" -+ AC_LANG_RESTORE -+ -+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool. -+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/} -+ RUBY_SITEDIR=${RUBY_SITEDIR%/} -+ RUBY_LIBDIR=${RUBY_LIBDIR%/} -+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/} -+ -+ AC_MSG_RESULT([\ -+ archdir $RUBY_ARCHDIR, -+ sitearchdir $RUBY_SITEARCHDIR, -+ sitedir $RUBY_SITEDIR, -+ rubylibdir $RUBY_RUBYLIBDIR, -+ libdir $RUBY_LIBDIR, -+ includedir $RUBY_INCLUDEDIR, -+ librubyarg $RUBY_LIBRUBYARG, -+ cflags $RUBY_CFLAGS, -+ cxxflags $RUBY_CXXFLAGS]) -+ AC_SUBST(RUBY_ARCHDIR) -+ AC_SUBST(RUBY_SITEARCHDIR) -+ AC_SUBST(RUBY_SITEDIR) -+ AC_SUBST(RUBY_RUBYLIBDIR) -+ AC_SUBST(RUBY_LIBDIR) -+ AC_SUBST(RUBY_INCLUDEDIR) -+ AC_SUBST(RUBY_LIBRUBYARG) -+ AC_SUBST(RUBY_CFLAGS) -+fi -diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am -index 840b6ab6..74995c3d 100644 ---- a/korundum/rubylib/korundum/Makefile.am -+++ b/korundum/rubylib/korundum/Makefile.am -@@ -1,3 +1,5 @@ -+CXXFLAGS += $(RUBY_CXXFLAGS) -+ - INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - - rubylibdir = $(RUBY_ARCHDIR) -diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in -deleted file mode 100644 -index 0a987639..00000000 ---- a/korundum/rubylib/korundum/configure.in.in -+++ /dev/null -@@ -1,59 +0,0 @@ --AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) -- --if test -z "RUBY_EXECUTABLE"; then -- DO_NOT_COMPILE="$DO_NOT_COMPILE korundum" --else -- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` -- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` -- -- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"` -- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"` -- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"` -- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"` -- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"` -- -- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR" -- if test "$RUBY_SERIES" -ge "19"; then -- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) -- fi -- -- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then -- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"` -- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then -- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"` -- else -- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"` -- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH} -- fi -- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}" -- else -- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" -- fi -- -- # Removes trailing slashes, if any, to avoid fail to install with recent libtool. -- RUBY_ARCHDIR=${RUBY_ARCHDIR%/} -- RUBY_SITEDIR=${RUBY_SITEDIR%/} -- RUBY_LIBDIR=${RUBY_LIBDIR%/} -- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/} -- -- AC_MSG_RESULT([\ -- archdir $RUBY_ARCHDIR, -- sitearchdir $RUBY_SITEARCHDIR, -- sitedir $RUBY_SITEDIR, -- rubylibdir $RUBY_RUBYLIBDIR, -- libdir $RUBY_LIBDIR, -- includedir $RUBY_INCLUDEDIR, -- librubyarg $RUBY_LIBRUBYARG, -- cflags $RUBY_CFLAGS]) -- AC_SUBST(RUBY_ARCHDIR) -- AC_SUBST(RUBY_SITEARCHDIR) -- AC_SUBST(RUBY_SITEDIR) -- AC_SUBST(RUBY_RUBYLIBDIR) -- AC_SUBST(RUBY_LIBDIR) -- AC_SUBST(RUBY_INCLUDEDIR) -- AC_SUBST(RUBY_LIBRUBYARG) -- AC_SUBST(RUBY_CFLAGS) --fi -- -diff --git a/qtruby/bin/Makefile.am b/qtruby/bin/Makefile.am -index a1005f0b..988ba3d4 100644 ---- a/qtruby/bin/Makefile.am -+++ b/qtruby/bin/Makefile.am -@@ -1,3 +1,5 @@ -+CXXFLAGS += $(RUBY_CXXFLAGS) -+ - INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - - bin_PROGRAMS = qtrubyinit -diff --git a/qtruby/configure.in.in b/qtruby/configure.in.in -new file mode 100644 -index 00000000..84ad88ec ---- /dev/null -+++ b/qtruby/configure.in.in -@@ -0,0 +1,90 @@ -+AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) -+ -+if test -z "RUBY_EXECUTABLE"; then -+ DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" -+else -+ RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` -+ RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` -+ -+ RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -+ RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"` -+ RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"` -+ RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"` -+ RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"` -+ RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"` -+ -+ RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR" -+ if test "$RUBY_SERIES" -ge "19"; then -+ AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) -+ fi -+ -+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then -+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"` -+ if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then -+ RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"` -+ else -+ RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"` -+ RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH} -+ fi -+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}" -+ else -+ RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -+ RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" -+ fi -+ -+ # check if Ruby requires explicit specification of C++ standard -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ SAVED_CXXFLAGS="$CXXFLAGS" -+ for CXX_STD_TEST in "" 11 14 17; do -+ CXXFLAGS="$SAVED_CXXFLAGS" -+ if test "x$CXX_STD_TEST" = "x"; then -+ AC_MSG_CHECKING([Ruby build with default C++ standard]) -+ RUBY_CXXFLAGS="" -+ else -+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST]) -+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST" -+ fi -+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS" -+ AC_TRY_COMPILE([ -+ #include <ruby.h> -+ ],[ ], -+ ruby_cxx_std=yes, -+ ruby_cxx_std=no -+ ) -+ if test "x$ruby_cxx_std" = "xyes"; then -+ AC_SUBST(RUBY_CXXFLAGS) -+ AC_MSG_RESULT(yes) -+ break -+ else -+ AC_MSG_RESULT(no) -+ fi -+ done -+ CXXFLAGS="$SAVED_CXXFLAGS" -+ AC_LANG_RESTORE -+ -+ # Removes trailing slashes, if any, to avoid fail to install with recent libtool. -+ RUBY_ARCHDIR=${RUBY_ARCHDIR%/} -+ RUBY_SITEDIR=${RUBY_SITEDIR%/} -+ RUBY_LIBDIR=${RUBY_LIBDIR%/} -+ RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/} -+ -+ AC_MSG_RESULT([\ -+ archdir $RUBY_ARCHDIR, -+ sitearchdir $RUBY_SITEARCHDIR, -+ sitedir $RUBY_SITEDIR, -+ rubylibdir $RUBY_RUBYLIBDIR, -+ libdir $RUBY_LIBDIR, -+ includedir $RUBY_INCLUDEDIR, -+ librubyarg $RUBY_LIBRUBYARG, -+ cflags $RUBY_CFLAGS, -+ cxxflags $RUBY_CXXFLAGS]) -+ AC_SUBST(RUBY_ARCHDIR) -+ AC_SUBST(RUBY_SITEARCHDIR) -+ AC_SUBST(RUBY_SITEDIR) -+ AC_SUBST(RUBY_RUBYLIBDIR) -+ AC_SUBST(RUBY_LIBDIR) -+ AC_SUBST(RUBY_INCLUDEDIR) -+ AC_SUBST(RUBY_LIBRUBYARG) -+ AC_SUBST(RUBY_CFLAGS) -+fi -diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am -index 45876ed6..80363009 100644 ---- a/qtruby/rubylib/designer/uilib/Makefile.am -+++ b/qtruby/rubylib/designer/uilib/Makefile.am -@@ -1,3 +1,5 @@ -+CXXFLAGS += $(RUBY_CXXFLAGS) -+ - INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - - rubylibdir = $(RUBY_ARCHDIR) -diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am -index 7083719c..c273c599 100644 ---- a/qtruby/rubylib/qtruby/Makefile.am -+++ b/qtruby/rubylib/qtruby/Makefile.am -@@ -1,3 +1,5 @@ -+CXXFLAGS += $(RUBY_CXXFLAGS) -+ - INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) - - noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb -diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in -deleted file mode 100644 -index db0594a3..00000000 ---- a/qtruby/rubylib/qtruby/configure.in.in -+++ /dev/null -@@ -1,59 +0,0 @@ --AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby) -- --if test -z "RUBY_EXECUTABLE"; then -- DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" --else -- RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"` -- RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"` -- -- RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -- RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"` -- RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"` -- RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"` -- RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"` -- RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"` -- -- RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR" -- if test "$RUBY_SERIES" -ge "19"; then -- AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) -- fi -- -- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then -- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"` -- if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then -- RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"` -- else -- RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"` -- RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH} -- fi -- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}" -- else -- RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"` -- RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}" -- fi -- -- # Removes trailing slashes, if any, to avoid fail to install with recent libtool. -- RUBY_ARCHDIR=${RUBY_ARCHDIR%/} -- RUBY_SITEDIR=${RUBY_SITEDIR%/} -- RUBY_LIBDIR=${RUBY_LIBDIR%/} -- RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/} -- -- AC_MSG_RESULT([\ -- archdir $RUBY_ARCHDIR, -- sitearchdir $RUBY_SITEARCHDIR, -- sitedir $RUBY_SITEDIR, -- rubylibdir $RUBY_RUBYLIBDIR, -- libdir $RUBY_LIBDIR, -- includedir $RUBY_INCLUDEDIR, -- librubyarg $RUBY_LIBRUBYARG, -- cflags $RUBY_CFLAGS]) -- AC_SUBST(RUBY_ARCHDIR) -- AC_SUBST(RUBY_SITEARCHDIR) -- AC_SUBST(RUBY_SITEDIR) -- AC_SUBST(RUBY_RUBYLIBDIR) -- AC_SUBST(RUBY_LIBDIR) -- AC_SUBST(RUBY_INCLUDEDIR) -- AC_SUBST(RUBY_LIBRUBYARG) -- AC_SUBST(RUBY_CFLAGS) --fi -- --- -cgit v1.2.1 - diff --git a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff b/arch/tde-base/tde-tdebindings/bp002-33697c89.diff deleted file mode 100644 index a559fec2a..000000000 --- a/arch/tde-base/tde-tdebindings/bp002-33697c89.diff +++ /dev/null @@ -1,24 +0,0 @@ -commit 5092f046c4f6b678a728bb1156123e0f0e45380f -Author: Slávek Banko <slavek.banko@axis.cz> -Date: Fri Sep 24 15:02:20 2021 +0200 - - Fix FTBFS in dcopjava in case TQt3 is not installed in the system directory. - - Signed-off-by: Slávek Banko <slavek.banko@axis.cz> - (cherry picked from commit 33697c89a362c187fbf375c2d05b0a8d6beb9429) - -diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am -index be90dd10..2fe8e5d5 100644 ---- a/dcopjava/binding/Makefile.am -+++ b/dcopjava/binding/Makefile.am -@@ -1,8 +1,8 @@ - lib_LTLIBRARIES = libjavadcop.la - - libjavadcop_la_SOURCES = client.cpp --libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx --libjavadcop_la_LIBADD = $(LIB_TDECORE) -+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN) -+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx - - INCLUDES = $(jni_includes) $(all_includes) - diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD index 29618eb11..8d9de6b91 100644 --- a/arch/tde-base/tde-tdegraphics/PKGBUILD +++ b/arch/tde-base/tde-tdegraphics/PKGBUILD @@ -1,54 +1,60 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: e1z0 <marcinkeviciusjustinas at gmail dot com> -pkgname=tde-tdegraphics -pkgver=14.0.10 -pkgrel=1 +_mod=tdegraphics +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=2 pkgdesc="Trinity Desktop Graphics Components" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdegraphics' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-base') -depends=('tde-tdelibs' 'libgphoto2' 'fribidi' 'sane') -makedepends=('pkgconfig' 'cmake' 'imlib') -provides=('tdegraphics') -conflicts=('trinity-tdegraphics' 'trinity-kdegraphics') -replaces=('trinity-tdegraphics') +depends=('tde-tdelibs' 'fribidi' 'imlib' 'libgphoto2' 'libpaper' 'poppler' 'sane') +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/tdegraphics-trinity-${pkgver}.tar.xz" - 'bp000-d19460fd6e.diff' - 'bp001-866f96c1f4.diff') -md5sums=('0b069eb140a9f8b8bbe4556f1bd313d9' - 'c5ccbf331b4b0b6a0af61687cc3308a5' - 'bd4a586fb17963697afceef79adc35a5') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('d9b0fee85f77d9dda913414176609f84') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -build() { - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - patch -p1 < ${srcdir}/bp000-d19460fd6e.diff - patch -p1 < ${srcdir}/bp001-866f96c1f4.diff +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 +# patch -p1 < ${srcdir}/bp000-?.diff +} - cd $srcdir +build() { 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_PAPER=ON \ + -DWITH_TIFF=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_PDF=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-base/tde-tdegraphics/bp000-d19460fd6e.diff b/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff deleted file mode 100644 index 1565ee3f2..000000000 --- a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff +++ /dev/null @@ -1,33 +0,0 @@ -From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001 -From: Mavridis Philippe <mavridisf@gmail.com> -Date: Thu, 8 Jul 2021 23:14:10 +0300 -Subject: Corrected boolean usage to conform with C++17 standard. - -This resolves a FTBFS on some systems. - -Signed-off-by: Mavridis Philippe <mavridisf@gmail.com> ---- - kfaxview/libkfaximage/faxinit.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kfaxview/libkfaximage/faxinit.cpp b/kfaxview/libkfaximage/faxinit.cpp -index aa6166aa..fa4517d2 100644 ---- a/kfaxview/libkfaximage/faxinit.cpp -+++ b/kfaxview/libkfaximage/faxinit.cpp -@@ -319,11 +319,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State) - void - fax_init_tables(void) - { -- static bool already_initialized = 0; -+ static bool already_initialized = false; - if (already_initialized) - return; - -- ++already_initialized; -+ already_initialized = true; - - FillTable(MainTable, 7, Pass, S_Pass); - FillTable(MainTable, 7, Horiz, S_Horiz); --- -cgit v1.2.1 - diff --git a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff deleted file mode 100644 index 3508d7437..000000000 --- a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff +++ /dev/null @@ -1,63 +0,0 @@ -From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz> -Date: Thu, 8 Jul 2021 19:46:45 +0200 -Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves - FTBFS on FreeBSD 13. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Slávek Banko <slavek.banko@axis.cz> ---- - kpovmodeler/CMakeLists.txt | 4 ++-- - kpovmodeler/ConfigureChecks.cmake | 9 +++++---- - 2 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt -index 6ec98ae4..b589117f 100644 ---- a/kpovmodeler/CMakeLists.txt -+++ b/kpovmodeler/CMakeLists.txt -@@ -19,7 +19,7 @@ include_directories( - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -- ${GLU_INCLUDE_DIRS} -+ ${OPENGL_INCLUDE_DIRS} - ${FREETYPE_INCLUDE_DIRS} - ) - -@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC - pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp - pmpartiface.skel - VERSION 0.0.0 -- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES} -+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES} - DESTINATION ${LIB_INSTALL_DIR} - ) - -diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake -index f4fdd1c0..a55045d4 100644 ---- a/kpovmodeler/ConfigureChecks.cmake -+++ b/kpovmodeler/ConfigureChecks.cmake -@@ -10,13 +10,14 @@ - ################################################# - - # glu --pkg_search_module( GLU glu ) --if( NOT GLU_FOUND ) -+set( OpenGL_GL_PREFERENCE LEGACY ) -+find_package( OpenGL ) -+if( NOT OPENGL_FOUND ) - check_include_file ( GL/glu.h HAVE_GLU ) - if( NOT HAVE_GLU ) -- tde_message_fatal( "glu is required, but was not found on your system" ) -+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" ) - endif ( ) -- set( GLU_LIBRARIES "-lGL -lGLU" ) -+ set( OPENGL_LIBRARIES "-lGL -lGLU" ) - endif( ) - - --- -cgit v1.2.1 - diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD index 46126989c..8de0b60c6 100644 --- a/arch/tde-base/tde-tdeutils/PKGBUILD +++ b/arch/tde-base/tde-tdeutils/PKGBUILD @@ -1,46 +1,50 @@ # Maintainer: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdeutils -pkgver=14.0.10 +_mod=tdeutils +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="The TDE something - with Trinity upstream" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-base') -depends=('tde-tdebase' 'xmms2') -makedepends=('pkgconfig' 'cmake' 'python2') +depends=('tde-tdebase') +makedepends=('tde-cmake-trinity' 'python3') 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/tdeutils-trinity-${pkgver}.tar.xz") -md5sums=('95e778a8775b416739fd7e836e4ecdcd') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('1a6ac0568ee0b2d5ed6da48f63fcb42b') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd ${srcdir} msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build ## cmake call msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DBUILD_ALL=ON \ -DWITH_DPMS=ON \ - -DBUILD_ALL=ON + -DWITH_XSCREENSAVER=ON msg "Building - ${pkgname#*-}..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD index e58281542..dcd844973 100644 --- a/arch/tde-core/tde-arts/PKGBUILD +++ b/arch/tde-core/tde-arts/PKGBUILD @@ -3,57 +3,60 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-arts -pkgver=14.0.10 +_mod=arts +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -pkgdesc="Trinity ARTS Sound System and libraries" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/arts' +pkgdesc="Trinity aRts Sound System and libraries" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') -depends=('alsa-plugins' - 'alsa-tools' - 'alsa-utils' +depends=('alsa-lib' 'audiofile' 'glib2' 'libmad' 'libogg' 'libvorbis' - 'pulseaudio-alsa' 'tde-tqtinterface') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma' 'lame: A high quality MPEG Audio Layer III (MP3) encoder' 'libmp3splt: Library for splitting mp3 and ogg files without decoding' 'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files' 'vorbis-tools: Extra tools for Ogg-Vorbis') -provides=('arts') -conflicts=('kdemod3-arts' 'arts') -replaces=('trinity-arts') +provides=("${_mod}") +conflicts=("kdemod3-${_mod}" "${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz") -md5sums=('d9d719e824acd5397dda709ed5352feb') -install='tde-arts.install' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('620d604dda61d0deaf23475b20569cd5') +install="tde-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON \ + -DWITH_ESOUND=OFF \ + -DWITH_JACK=OFF msg "Building $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD index 2df40dd16..1b1a73e3f 100644 --- a/arch/tde-core/tde-avahi-tqt/PKGBUILD +++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD @@ -1,42 +1,46 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-avahi-tqt -pkgver=14.0.10 +_mod=avahi-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity Avahi-TQt" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/avahi-tqt' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') depends=('tde-tqtinterface' 'avahi' 'nss-mdns') # nss-mdns should probably move to tdelibs depends -makedepends=('pkgconfig' 'cmake') -provides=('avahi-tqt') -replaces=('trinity-avahi-tqt') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz") -md5sums=('6cce8423a3030505bb56a8c73f6235d6') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('5a8343fb4e4c33e0cfc78c6e6650b6ac') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd ${srcdir} msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-core/tde-cmake/PKGBUILD b/arch/tde-core/tde-cmake/PKGBUILD new file mode 100644 index 000000000..487382e7a --- /dev/null +++ b/arch/tde-core/tde-cmake/PKGBUILD @@ -0,0 +1,51 @@ +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=tde-cmake-trinity +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="TDE CMake modules" +arch=('any') +url="https://scm.trinitydesktop.org/scm/git/tde-cmake" +license=('GPL') +provides=("${_mod}") +groups=('tde-core') +depends=( + 'cmake' + 'perl' + 'ninja' + 'pkgconfig' +) +makedepends=() +optdepends=() +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz") +md5sums=('f188cc34625c98a32f4c4d6738042419') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD index 907060c9f..799e1b154 100644 --- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD @@ -3,43 +3,47 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-dbus-1-tqt -pkgver=14.0.10 +_mod=dbus-1-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core' 'tde-base') depends=('tde-tqtinterface' 'dbus') -makedepends=('pkgconfig' 'cmake') -provides=('dbus-1-tqt') -conflicts=('trinity-dbus-1-tqt') -replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3') options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz") -md5sums=('4954efb83544c72272ba803eb44b72ec') -install='trinity-dbus-1-tqt.install' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('2faaaba3f430f16f40b5df816f96573b') +install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD index 7e1c73d32..f4cfa5759 100644 --- a/arch/tde-core/tde-dbus-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD @@ -3,41 +3,44 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-dbus-tqt -pkgver=14.0.10 +_mod=dbus-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/dbus-tqt' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') pkgdesc="Trinity TQt DBus wrapper" depends=('tde-tqtinterface' 'dbus') -makedepends=('pkgconfig' 'cmake') -provides=('dbus-tqt') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz") -md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951') -install='trinity-dbus-tqt.install' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('631f68c433eb730218c3e9ee8385ea69') +install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ - -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_GCC_VISIBILITY=ON + -GNinja \ + -DCMAKE_INSTALL_PREFIX=$TDEDIR msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD index c6f03a951..fd0f24986 100644 --- a/arch/tde-core/tde-libart-lgpl/PKGBUILD +++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD @@ -1,24 +1,28 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-libart-lgpl -pkgver=14.0.10 +_mod=libart-lgpl +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity Desktop LGPL'd Component" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/libart-lgpl" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('LGPL') groups=('tde-core') #depends=('') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') optdepends=() -provides=('libart-lgpl') +provides=("${_mod}") conflicts=() replaces=() options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz") -md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('4832489e7ca5db88bc0c7741e9ddb6bd') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -30,15 +34,16 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ -DWITH_GCC_VISIBILITY=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD new file mode 100644 index 000000000..c3168e3a9 --- /dev/null +++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=polkit-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity PolicyKit-tqt library" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-core' 'tde-base') +depends=('tde-tqtinterface' 'tde-dbus-1-tqt' 'polkit') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('9d8828526fa2abfa761d952b2ed78ecc') +install="trinity-${_mod}.install" + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + +build() { + msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install +} diff --git a/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD index 85f569247..1f76515b4 100644 --- a/arch/tde-core/tde-tdebase/PKGBUILD +++ b/arch/tde-core/tde-tdebase/PKGBUILD @@ -1,37 +1,39 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname='tde-tdebase' -pkgver=14.0.10 -pkgrel=2 +_mod=tdebase +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 pkgdesc="Trinity Desktop Enviroment base components" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdebase' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') -provides=('tdebase') +provides=("${_mod}") groups=('tde-core') -# depends=('hal' -depends=('libraw1394' - 'libxtst' +depends=('htdig' + 'libraw1394' + 'libssh' 'libxss' + 'libxtst' 'lm_sensors' - 'tde-tdelibs' + 'openssl' 'tde-dbus-1-tqt' + 'tde-tdelibs' 'ttf-dejavu' 'ttf-freefont' 'xorg-server' - 'xorg-xinit' - 'htdig' - 'openssl-1.0') -makedepends=('autoconf' - 'cmake' - 'imake' - 'pkgconfig' - 'libxkbfile' - 'smbclient' - 'rpcsvc-proto' - 'xorg-bdftopcf' - 'xscreensaver') + 'xorg-xinit') +makedepends=('tde-cmake-trinity' + 'libxkbfile' + 'rpcsvc-proto' + 'smbclient' + 'systemd-sysvcompat' + 'xorg-bdftopcf' + 'xscreensaver') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' 'pciutils: PCI bus configuration space access library and tools' 'samba: file sharing over SMB' @@ -44,12 +46,12 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop 'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)' 'xorg-fonts-75dpi: X.org 75dpi fonts collection' 'xscreensaver: Screen saver and locker for the X Window System') -confilicts=('trinity-kdebase ''kdemod3-kdebase') -replaces=('trinity-tdebase') +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -install='trinity-tdebase.install' +install="trinity-${_mod}.install" -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz" +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" 'agent-shutdown.sh' 'agent-startup.sh' 'tdm-trinity' @@ -57,7 +59,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/ 'tdm.service' 'xsession.patch') -md5sums=('bca895dfc2b88c4b74e307d5690108bf' +md5sums=('105b7a69e0ed95af0e4ff0f141958205' '18e8d01124b19f7df2937c06e177bf7f' 'c963ef6e37c9051119972a58c67f05fb' 'bb4c25e560fa719e8e8f49ef80bd1c99' @@ -68,16 +70,14 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf' [ -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..." - export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig - cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DWITH_SASL=ON \ @@ -89,8 +89,6 @@ build() { -DWITH_XFIXES=ON \ -DWITH_XRANDR=ON \ -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_XEXT=ON \ -DWITH_XTEST=ON \ -DWITH_OPENGL=ON \ -DWITH_XSCREENSAVER=ON \ @@ -102,7 +100,6 @@ build() { -DWITH_ARTS=ON \ -DWITH_I8K=ON \ -DWITH_SENSORS=ON \ - -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DBUILD_ALL=ON \ @@ -111,13 +108,13 @@ build() { -DTDM_PAM_SERVICE=tde \ -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd $srcdir/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions) install -d -m755 ${pkgdir}/usr/share/xsessions diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD index 759b18d6a..c8f67d616 100644 --- a/arch/tde-core/tde-tdelibs/PKGBUILD +++ b/arch/tde-core/tde-tdelibs/PKGBUILD @@ -3,15 +3,21 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdelibs -pkgver=14.0.10 -pkgrel=2 +_mod=tdelibs +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 pkgdesc="Trinity Desktop core libraries and applications" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdelibs' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-core') -depends=('aspell' +depends=( + 'aspell' + 'cryptsetup' 'hspell' 'jasper' 'libcups' @@ -20,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' @@ -31,30 +39,30 @@ depends=('aspell' 'xorg-xmessage' 'xorg-xprop' 'xorg-xset' - 'xorg-xsetroot') -makedepends=('pkgconfig' 'cmake') -provides=('tdelibs') -conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3') -replaces=('trinity-kdelibs' 'trinity-tdelibs') + 'xorg-xsetroot' +) +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3") +replaces=("trinity-${_kdemod}" "trinity-${_mod}") options=('staticlibs' 'libtool' '!makeflags' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz") - -md5sums=('cbb77407a886b588b4749524ae8e5edd') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('c0191df81fc351a8a55e7a503cccabe6') -install='trinity-tdelibs.install' +install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -70,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 \ @@ -84,13 +95,13 @@ build() { -DWITH_HSPELL=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install msg "Removing conflicting images" rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop } diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD index 52b19c726..7fe1e17b7 100644 --- a/arch/tde-core/tde-tqca-tls/PKGBUILD +++ b/arch/tde-core/tde-tqca-tls/PKGBUILD @@ -3,45 +3,51 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tqca-tls -pkgver=14.0.10 +_mod=tqca-tls +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tqca-tls' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}" license=('GPL') groups=('tde-core') -depends=('tde-tqtinterface' 'openssl-1.0') -makedepends=('pkgconfig' 'cmake') -provides=('tqca-tls') -conflicts=('trinity-tqca-tls') -replaces=('trinity-tqca-tls') +depends=('tde-tqtinterface' 'openssl') +makedepends=('tde-cmake-trinity') +provides=(${_mod}) +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz") -md5sums=('6347f50dd8b44cc1f7a35329bd578ba1') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz") +md5sums=('67b1edf8826cf97c281ab70cec5e9b7c') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build - export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} msg "Starting cmake..." - cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ - -DWITH_GCC_VISIBILITY=ON + -DBUILD_ALL=OFF \ + -DBUILD_TQCA_TLS=ON \ + -DWITH_ALL_OPTIONS=ON msg "Building - $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install } diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD new file mode 100644 index 000000000..54e442603 --- /dev/null +++ b/arch/tde-core/tde-tqca/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=tqca +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-core') +depends=('tde-tqtinterface' 'openssl') +makedepends=('tde-cmake-trinity') +provides=(${_mod}) +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('67b1edf8826cf97c281ab70cec5e9b7c') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + export PKG_CONFIG_PATH=${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=$TQTDIR \ + -DBUILD_ALL=OFF \ + -DBUILD_TQCA=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install +} diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index 0f56bd687..ee61e7743 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -3,38 +3,40 @@ # Contributor: Calvin Morrison <MutantTurkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgbase=tde-tqt3 +_mod=tqt3 +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgbase="tde-${_mod}" pkgname=("$pkgbase" "${pkgbase}-docs") -pkgver=14.0.10 +pkgver=14.1.1 pkgrel=1 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/tqt3" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_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/dependencies/tqt3-trinity-${pkgver}.tar.xz" - 'bp000-fix-build-key.diff') -md5sums=('47d8495fcf444c5db2cf56843be3f746' - '950e3885135fd9844de856c770f19767') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('ea0a0ea6b20a4b0bda9bb4af575cb88e') _prefix="/opt/trinity/tqt3" build() { - cd ${srcdir}/tqt3-trinity-${pkgver} - - patch -p1 < ${srcdir}/bp000-fix-build-key.diff + cd ${srcdir}/${_mod}-trinity-${pkgver} # These are probably arch-specific. They were present in old qt3 # PKGBULD, they were present in kdemod3 PKGBUILD, they are present @@ -54,10 +56,10 @@ build() { sed -i "s|read acceptance|acceptance=yes|" configure msg "Setting enviroment variables..." - export QTDIR="${srcdir}/tqt3-trinity-${pkgver}" - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + export TQTDIR="${srcdir}/${_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" @@ -80,6 +82,16 @@ build() { -lmysqlclient \ -L/usr/lib/mysql \ -qt-gif \ + -ipv6 \ + -sm \ + -xshape \ + -xinerama \ + -xcursor \ + -xrandr \ + -xrender \ + -xft\ + -tablet \ + -xkb \ -system-zlib \ -system-libpng \ -system-libjpeg \ @@ -94,22 +106,23 @@ build() { -platform linux-g++${ARCH} \ -no-exceptions \ -thread \ + -enable-opengl \ -dlopen-opengl \ - -no-ipv6 + -glibmainloop # 64bit fixes pulled from extras/qt3 PKGBUILD # this is Arch-specific # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${TQTDIR}/tools/designer/uilib/Makefile msg "--- \$CARCH is $CARCH ---" msg "Building - $pkgbase..." - cd "${QTDIR}" + cd "${TQTDIR}" # build rest, but without tutorials and examples # of you want them, remove sub-tools @@ -126,6 +139,7 @@ package_tde-tqt3() { 'libpng' 'libxcursor' 'libxft' + 'libxi' 'libxinerama' 'libxmu' 'libxrandr' @@ -142,12 +156,12 @@ package_tde-tqt3() { install='tqt3.install' msg "Packaging - $pkgname-$pkgver" - cd "${QTDIR}" + cd "${TQTDIR}" make INSTALL_ROOT="$pkgdir" install - ## remove doc as it is now in a split package tde-tqt3-doc - rm -r "${pkgdir}${_prefix}/doc" + ## remove doc as it is now in a split package tde-tqt3-doc + rm -r "${pkgdir}${_prefix}/doc" # install link the apps provided by qt3 so we don't collide with # qt4 and can run them. @@ -189,5 +203,5 @@ package_tde-tqt3-docs() { ## install doc pages which are missed by make install ## convenient for a split package install -d -m755 "${pkgdir}${_prefix}/doc/" - cp -r "${QTDIR}/doc" "${pkgdir}${_prefix}" + cp -r "${TQTDIR}/doc" "${pkgdir}${_prefix}" } diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff deleted file mode 100644 index a0a0aa42e..000000000 --- a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff +++ /dev/null @@ -1,21 +0,0 @@ -commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a -Author: Slávek Banko <slavek.banko@axis.cz> -Date: Wed Sep 22 15:00:08 2021 +0200 - - Fix buildkey for GCC >= 7 if the version is listed including minor numbers. - - Signed-off-by: Slávek Banko <slavek.banko@axis.cz> - -diff --git a/configure b/configure -index 92cec273..f021f563 100755 ---- a/configure -+++ b/configure -@@ -2828,7 +2828,7 @@ g++*) - 3.*) - COMPILER_VERSION="3.*" - ;; -- [1-9][0-9]|[7-9]|[4-6].*) -+ [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*) - COMPILER_VERSION="4.*" - ;; - *) diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD index 43774f594..30e6e470b 100644 --- a/arch/tde-core/tde-tqtinterface/PKGBUILD +++ b/arch/tde-core/tde-tqtinterface/PKGBUILD @@ -3,34 +3,34 @@ # Contributor: Calvin Morrison <mutantturkey@gmail.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tqtinterface -pkgver=14.0.10 +_mod=tqtinterface +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/tqtinterface" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL2') groups=('tde-core') pkgdesc="TQt interface for the TDE desktop" depends=('tde-tqt3' 'glu') -makedepends=('pkgconfig' 'cmake') -provides=('tqtinterface') -conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface') -replaces=('trinity-tqtinterface') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") # makeopts=('libtool' '!emptydirs' '!strip') options=('staticlibs' 'libtool' '!emptydirs' '!strip') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz" - 'tqtpc-location.patch') - -md5sums=('76b04fce54a40edf46a7421a5f3e176f' - 'c15745c944d98cb7c4cb553f0ca421d4') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('59025eebafd8cf125e94ca14bc9a4fd7') -install='trinity-tqtinterface.install' +install="trinity-${_mod}.install" _prefix=/usr -_tdedir=/opt/trinity - -[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3 +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { cd $srcdir @@ -38,24 +38,26 @@ build() { mkdir -p build cd build + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DQT_PREFIX_DIR=${QTDIR} \ - -DQT_INCLUDE_DIR=${QTDIR}/include \ - -DMOC_EXECUTABLE=${QTDIR}/bin/moc \ - -DQT_VERSION=3 + -DQT_PREFIX_DIR=${TQTDIR} \ + -DTQT_INCLUDE_DIR=${TQTDIR}/include \ + -DMOC_EXECUTABLE=${TQTDIR}/bin/moc - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" ninja -j1 install # Create and install ld.so.conf.d file install -d -m755 $pkgdir/etc/ld.so.conf.d/ - echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf - echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf + echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf + echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf } diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch deleted file mode 100644 index f256e925c..000000000 --- a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dependencies/tqtinterface/CMakeLists.txt 2011-03-28 00:12:24.000000000 +0200 -+++ dependencies/tqtinterface/CMakeLists.txt.new 2012-01-29 12:15:16.000000000 +0100 -@@ -35,7 +35,7 @@ - tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" ) - tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" ) - tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/tqt" ) --tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" ) -+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" ) - - - ##### tqtinterface sources ###################### diff --git a/arch/tde-deps/exempi/PKGBUILD b/arch/tde-deps/exempi/PKGBUILD new file mode 100644 index 000000000..024495fa7 --- /dev/null +++ b/arch/tde-deps/exempi/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: André Klitzing <aklitzing@online.de> + +pkgname=exempi +pkgver=2.6.3 +pkgrel=1 +pkgdesc="A library to parse XMP metadata" +url="https://libopenraw.freedesktop.org/wiki/Exempi" +arch=('powerpc64le') +license=(custom:BSD) +depends=(gcc-libs expat zlib) +makedepends=(boost) +source=(https://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2{,.asc}) +sha256sums=('b0749db18a9e78cf771737954a838cdcdb1d5415888bac1ba9caf8cba77c656c' + 'SKIP') +validpgpkeys=('6C44DB3E0BF3EAF5B433239A5FEE05E6A56E15A3') # Hubert Figuiere + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr # --disable-static + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/arch/tde-deps/exempi/keys/pgp/6C44DB3E0BF3EAF5B433239A5FEE05E6A56E15A3.asc b/arch/tde-deps/exempi/keys/pgp/6C44DB3E0BF3EAF5B433239A5FEE05E6A56E15A3.asc new file mode 100644 index 000000000..1047c5f60 --- /dev/null +++ b/arch/tde-deps/exempi/keys/pgp/6C44DB3E0BF3EAF5B433239A5FEE05E6A56E15A3.asc @@ -0,0 +1,57 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBDxX1cwRBACiWIxtbJpfhLT7kr6vNqO1+wleNmfIv3U1WB3NyezdQCUTGA9Y +k5+vzNqVt+ljpgdk+i1wtvrPg4EC94KH8HErOci9eYGjYI37FjQ2LXC9SIOex/7e +6swnHE3225WVya6k7kPVlG2P8zssAntOtl+k/HWdMYpnGsCQkkUkbW4dYwCg7eoX +R24Y4P6Nns9+91kxjynhgqMEAI39E2qAYhYR/B9yS7fuSjwcxaG2M49wtB/S196G +gnnRCEd9OofJNtprJqggG9DntjpstCvEgOjc5xqy0GWE/dt7BJOpYK7SgX6GhR31 +Hdw7q3OL+QWAu6rcLVVgvJoLVYQupmwRdw+JN7UTauE9tQOBbq1M750b+Awx34gk +32d1A/447Eadc07Vx6gr6Jd2+jwqRLlPuYkJJgy7+MqKu5p+ZE1eXvNINX6NCuwP +p9HmxsAj7S89nDzsElmwc3tJ+rDH06UlSRV4zfmA9B9/b/6iNyXH3Mq4dwyB+FA6 +4pUCiMBxB7KD0w+BxdjBt1jxv+v2HYDaxuHngYPHA8qdMyZimLQcSHViZXJ0IEZp +Z3VpZXJlIDxodWJAbml0LmNhPohdBDARAgAdBQJDZWtnFh0gbm8gbG9uZ2VyIHdv +cmsgdGhlcmUACgkQX+4F5qVuFaN/2gCg13PZNNkc31hUGtp74+nZLzmJRmoAoLrc +MyS1A776BQQ9zr3wIKWe4JOYtCFIdWJlcnQgRmlndWllcmUgPGh1YkBtb3ppbGxh +LmNvbT6ISQQwEQIACQUCVyQHTwIdAAAKCRBf7gXmpW4Voz7GAJ4q0P26aIzQ9tim +xYnV183N503glACfXYzEuA9UE3U3Vx7eBev+eMNDUIq0Ikh1YmVydCBGaWd1aWVy +ZSA8aHViQGZpZ3VpZXJlLm5ldD6IYQQTEQIAIQIbAwYLCQgHAwIDFQIDAxYCAQIe +AQIXgAUCQ2RUHwIZAQAKCRBf7gXmpW4VoxLBAJ9HlmDe+IYWvtWnamfCWWDDLNTm +5ACfeiTUKw0oqVtz1M/RyJRlmKNR+jC0I0h1YmVydCBGaWd1aWVyZSA8aHViQGFi +aXNvdXJjZS5jb20+iFwEExECABwFAj1GRV4CGwMECwcDAgMVAgMDFgIBAh4BAheA +AAoJEF/uBealbhWjPtMAnjKhBx2VAv92QS3R/qyT1/2UNydqAKDLRdgmly0gScjP +XWr0Hb5sG0JgELQlSHViZXJ0IEZpZ3VpZXJlIDxoZmlndWllcmVAdGVhc2VyLmZy +PohXBBMRAgAXBQsHCgMEAxUDAgMWAgECF4AFAkNkVB0ACgkQX+4F5qVuFaPLmgCg +4DiauGlk8Zh8JQjXmtpzUQdeqlcAnRTURi/256Sp2kEH0bGMvbt+QqEbtCZIdWJl +cnQgRmlndWllcmUgPGhmaWd1aWVyZUBub3ZlbGwuY29tPohJBDARAgAJBQJJkxa+ +Ah0AAAoJEF/uBealbhWjx2EAoMBI/QIBYIGbFy0rgy9x9jide7cJAKCiVRrv3k2x +dpphC2pBZPJlC6/rIrQvSHViZXJ0IEZpZ3VpZXJlIChYYW5kcm9zKSA8aHViZXJ0 +ZkB4YW5kcm9zLmNvbT6IWAQwEQIAGAUCRdopPREdIG5vIGxvbmdlciB0aGVyZQAK +CRBf7gXmpW4Vo9mYAJ4i2gZJRGLprEAHYFtt/SRrvfluUQCg0p589AlRSn0IjDdo +pt4iZevEdpO5Ag0EPFfWVhAIAIgTH5pVq+L6k1S0askR+Xvh7D66GGXGnzkg+ZVu +Qo8xxQn/VoRe2imHn2R6bRQtzGKj6GfVKikzTnGNectYZsIhxrwJa2iw9daf8PoW +iyZfJ6dHRO8C82brQVXCWm4BF7T06wKUcrbyRJqvphBAXA8jYphLX+aMCTQAXaFl +CPotnSmF6WeJzH7GHvrENcWio9/MTD1dyMeB0XhCRtL5gqlPQlgAWD8J/W6uyz3U +B+83q9Ud5cbDh9oF/Fga5ct0XbtkBrQ0GLdgkLKKB99V3Ktj3m8CzBYcdhiuBBNL +U0GzSoGFJDSLmrpR7o5SpAp3OPhN4o5dfkK/K1L7ok2HAAsAAwUH/iKGQqMdTAWb ++k4pyh3118gG198oC2Uxkqb+PS8Q3/uIYUSfw67EmPuKD/gQllyfIDwd72xxjkca +LpR7aWY9WRfZP8K0rterqo9udf2H4dVpBUft9eTiR7yCwUNXqqmQUc1cPQ8H0t2e +n2rDTggTNlnCAUhNOLY/4f/MgddmKYtHat33hf25cQs+cXUvA8ET+oiJorVuipOO +8qZfjJ00hcG4RLS6ZtLvA2dhYgki1tRS+kp8sXhODBHfQ7hL6NbynK+YHpAXHPa3 +QTXdRCXEL5AJwaf4PJDtXBbgW0B8o09hnOabYmc/lqBDJDx5D4RJYIoSmk9U7912 +b2GX+pfbXWOIRgQYEQIABgUCPFfWVgAKCRBf7gXmpW4Voy4DAJ9q0gfW1TLZy5Cz +NWEwYzwDkP77kgCfYkkkT82tlt1Fb8Hx4yog30pgtQa5Ag0EQzDo+RAIAJMjbbIn +YPrxe9SAtVPGFTfp6Gwtq2qh1/DljXTnEYwtsRAscSaudNZ1l1v/OaH8ytsY5CyR +VgdkdtZFGB/fU5Ny5N0BaKyCZJfHzM37S9bTWJ5/X8U4Q7AF/6LuYnmcFK2pZ/xT +nFzwwQ7BRss7oucSVlEulxcvK2OspPW86otIpmxwiP7EUjql+F2nw6bRYcqeb74K +FFV13sK4JT/MlqUlIvd9EpUiCEO0u5WIJX22yRpo7CA42fIAnAhE5bY9Qp1Yq0Wj +jSYNepYEaSnLLi29lyOpN3t1X/Iu/r6BlB/XJMfPyOESp2+0zUGItbtYDVqIzdic +PCXH3mlQTmjkl9cABA0H/Rn97LK9h3rieL33h1Fwkyqo9+RoQdWuadc2qLoF4GNC +oGFMv884AyLqj1QowZFCtNBHMyS43UrKzNXyVod2W4HvZF7f9z5FoTmDq5Q4V2Kf +r2ikhEeWl2cKhZWXQbZqUlbtFHT42TBMAy/sV11hhdsDPUV0A37LC0L9Dzf7hu1Q +j5jsaDKV0szqp9iKX4euVutsP1DJjSR5NIzHPwZjSzv1QiCLTuPj8N3J8t5NgaiQ +NyjbPUwqZR37CgJI0jTAt+5rkpxI5oiWZxt9yA2hzG0XyZPsMkBeZbW9g2j8iPaI +MiDZZ305uZuCF399OXZtDTH5Um4RWZXdQU2OXhzt16eISQQYEQIACQUCQzDo+QIb +DAAKCRBf7gXmpW4Vo3T4AJ0RI/Q8oljgVs4/X8vaWpgO/fzsTACfZnN2yido4De5 +jrl6dHnS+kzEsSI= +=S3zp +-----END PGP PUBLIC KEY BLOCK----- diff --git a/arch/tde-deps/gdk-pixbuf-xlib/PKGBUILD b/arch/tde-deps/gdk-pixbuf-xlib/PKGBUILD new file mode 100644 index 000000000..f429c1492 --- /dev/null +++ b/arch/tde-deps/gdk-pixbuf-xlib/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> + +pkgname=gdk-pixbuf-xlib +pkgver=2.40.2 +pkgrel=2 +pkgdesc="Deprecated Xlib integration for GdkPixbuf" +arch=('powerpc64le') +url="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib" +license=(LGPL2.1) +depends=(gdk-pixbuf2 libx11) +makedepends=(gtk-doc git meson) +options=(debug) +_commit=c142b818801e0affceea4a2139cf5630a283e54e # tags/2.40.2^0 +source=("git+$url.git#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g' +} + +prepare() { + cd $pkgname +} + +build() { + arch-meson $pkgname build -D gtk_doc=true + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +package() { + depends+=(libgdk_pixbuf-2.0.so) + provides+=(libgdk_pixbuf_xlib-2.0.so) + + meson install -C build --destdir "$pkgdir" +} + +# vim:set sw=2 sts=-1 et: diff --git a/arch/tde-deps/gnokii/.SRCINFO b/arch/tde-deps/gnokii/.SRCINFO new file mode 100644 index 000000000..a3ba54279 --- /dev/null +++ b/arch/tde-deps/gnokii/.SRCINFO @@ -0,0 +1,36 @@ +pkgbase = gnokii + pkgdesc = Tools and user space driver for use with mobile phones + pkgver = 0.6.31 + pkgrel = 19 + url = https://www.gnokii.org/ + install = gnokii.install + arch = x86_64 + license = GPL + makedepends = gtk2 + makedepends = mariadb-libs + makedepends = postgresql-libs + makedepends = intltool + depends = libusb-compat + depends = libxpm + depends = bluez-libs + depends = libical + depends = sqlite + depends = systemd + optdepends = dialog: sendsms tool + optdepends = gtk2: xgnokii GUI + optdepends = mariadb-libs: smsd mysql backend + optdepends = postgresql-libs: smsd postgresql backend + backup = etc/gnokiirc + source = https://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.bz2 + source = gnokii-config.patch + source = gnokii-lock.patch + source = gnokii-gcc5.patch + source = gnokii-gcc7.patch + sha256sums = 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501 + sha256sums = 4c795f0b80b3703a2813adb32399b42080a01670619c1db63ab094494cb6f329 + sha256sums = e0584a44268e9055b43f1673d7db828f45294c5108635ebd5f664e12703f108b + sha256sums = eafe67990e383e92636a88de27f003674374db81d986ddbb397ab18d82b6556d + sha256sums = a5db8684216904bd2a2cd8a557dcc16484831b9bc2ec91a0b102b14c3bfe9245 + +pkgname = gnokii + diff --git a/arch/tde-deps/gnokii/PKGBUILD b/arch/tde-deps/gnokii/PKGBUILD new file mode 100644 index 000000000..76bb50958 --- /dev/null +++ b/arch/tde-deps/gnokii/PKGBUILD @@ -0,0 +1,79 @@ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: Aurelien Foret <orelien@chez.com> + +pkgname=gnokii +pkgver=0.6.31 +pkgrel=19.1 +pkgdesc='Tools and user space driver for use with mobile phones' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url='https://www.gnokii.org/' +license=('GPL') +depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite' 'systemd') +makedepends=('gtk2' 'mariadb-libs' 'postgresql-libs' 'intltool') +optdepends=('dialog: sendsms tool' + 'gtk2: xgnokii GUI' + 'mariadb-libs: smsd mysql backend' + 'postgresql-libs: smsd postgresql backend') +backup=('etc/gnokiirc') +install=$pkgname.install +source=("https://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2" + 'gnokii-config.patch' + 'gnokii-lock.patch' + 'gnokii-gcc5.patch' + 'gnokii-gcc7.patch') +sha256sums=('8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501' + '4c795f0b80b3703a2813adb32399b42080a01670619c1db63ab094494cb6f329' + 'e0584a44268e9055b43f1673d7db828f45294c5108635ebd5f664e12703f108b' + 'eafe67990e383e92636a88de27f003674374db81d986ddbb397ab18d82b6556d' + 'a5db8684216904bd2a2cd8a557dcc16484831b9bc2ec91a0b102b14c3bfe9245') + +prepare() { + cd $pkgname-$pkgver + + # Set bindir location + patch -Np1 -i ../gnokii-config.patch + + # Set lock path + patch -Np1 -i ../gnokii-lock.patch + + # Fix build with GCC 5 (Fedora patch) + patch -Np1 -i ../gnokii-gcc5.patch + + # Fix build with GCC 7 + patch -Np1 -i ../gnokii-gcc7.patch + + # Update automake build system + cp -a /usr/share/libtool/build-aux/config.guess . + cp -a /usr/share/libtool/build-aux/config.sub . +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \ + --enable-security + make + pushd xgnokii + make + popd +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + pushd xgnokii + make DESTDIR="$pkgdir" install + popd + + # Install initial config file + install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc" + + # Fix file permission + chmod 755 "$pkgdir/usr/bin/sendsms" + + # Setup lock directory + install -dm755 "$pkgdir"/usr/lib/tmpfiles.d + echo 'd /run/lock/lockdev 0775 root lock -' > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" +} diff --git a/arch/tde-deps/gnokii/gnokii-config.patch b/arch/tde-deps/gnokii/gnokii-config.patch new file mode 100644 index 000000000..c10d19cec --- /dev/null +++ b/arch/tde-deps/gnokii/gnokii-config.patch @@ -0,0 +1,12 @@ +diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc +--- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 +@@ -238,7 +238,7 @@ + # In particular ensure that mgnokiidev is in this location, with + # permissions 4750, owned by root, group gnokii. Ensure you + # are in the gnokii group and that the group exists... +-bindir = /usr/local/sbin/ ++bindir = /usr/bin/ + + # Any entries in the following two sections will be set as environment + # variables when running the scripts. diff --git a/arch/tde-deps/gnokii/gnokii-gcc5.patch b/arch/tde-deps/gnokii/gnokii-gcc5.patch new file mode 100644 index 000000000..09b65f5b0 --- /dev/null +++ b/arch/tde-deps/gnokii/gnokii-gcc5.patch @@ -0,0 +1,27 @@ +Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid +build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined +reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0): +undefined reference to `CloseLogosWindow'". + +--- gnokii-0.6.31/xgnokii/xgnokii.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5 2015-06-20 15:49:59.000000000 +0200 +@@ -798,7 +798,7 @@ + } + + +-inline void GUI_HideAbout(void) ++void GUI_HideAbout(void) + { + gtk_widget_hide(AboutDialog); + } +--- gnokii-0.6.31/xgnokii/xgnokii_logos.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5 2015-06-20 15:50:15.000000000 +0200 +@@ -1304,7 +1304,7 @@ + return 0; + } + +-inline void CloseLogosWindow(void) ++void CloseLogosWindow(void) + { + gtk_widget_hide(GUI_LogosWindow); + } diff --git a/arch/tde-deps/gnokii/gnokii-gcc7.patch b/arch/tde-deps/gnokii/gnokii-gcc7.patch new file mode 100644 index 000000000..24fc9c9b1 --- /dev/null +++ b/arch/tde-deps/gnokii/gnokii-gcc7.patch @@ -0,0 +1,13 @@ +diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c +index b4ceea1..264420a 100644 +--- a/common/gsm-filetypes.c ++++ b/common/gsm-filetypes.c +@@ -1409,7 +1409,7 @@ static int get_next_token(char *src, int delim) + #define GET_NEXT_TOKEN() o = get_next_token(line + offset, ';') + #define STORE_TOKEN(a) strip_slashes(a, line + offset, sizeof(a) - 1, o - 1) + +-inline int local_atoi(char *str, int len) ++int local_atoi(char *str, int len) + { + int retval; + char *aux = strndup(str, len); diff --git a/arch/tde-deps/gnokii/gnokii-lock.patch b/arch/tde-deps/gnokii/gnokii-lock.patch new file mode 100644 index 000000000..61bcfaf40 --- /dev/null +++ b/arch/tde-deps/gnokii/gnokii-lock.patch @@ -0,0 +1,15 @@ +diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c +--- gnokii-0.6.31.orig/common/misc.c 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/common/misc.c 2013-08-12 18:38:41.021668458 +0200 +@@ -448,9 +448,9 @@ + + #define BUFFER_MAX_LENGTH 128 + #if defined (__svr4__) +-# define lock_path "/var/run/LCK.." ++# define lock_path "/var/run/lockdev/LCK.." + #else +-# define lock_path "/var/lock/LCK.." ++# define lock_path "/var/lock/lockdev/LCK.." + #endif + + /* Lock the device. Return allocated string with a lock name */ diff --git a/arch/tde-deps/gnokii/gnokii.install b/arch/tde-deps/gnokii/gnokii.install new file mode 100644 index 000000000..354b345a2 --- /dev/null +++ b/arch/tde-deps/gnokii/gnokii.install @@ -0,0 +1,3 @@ +post_install() { + echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" +} diff --git a/arch/tde-deps/htdig/.SRCINFO b/arch/tde-deps/htdig/.SRCINFO new file mode 100644 index 000000000..f4da67b4b --- /dev/null +++ b/arch/tde-deps/htdig/.SRCINFO @@ -0,0 +1,18 @@ +pkgbase = htdig + pkgdesc = Scripts and HTML code needed for using ht://Dig as a web search engine + pkgver = 3.2.0b6 + pkgrel = 11 + url = http://www.htdig.org/ + arch = i686 + arch = x86_64 + license = GPL + depends = openssl + source = http://downloads.sourceforge.net/htdig/htdig-3.2.0b6.tar.bz2 + source = gcc4.3.patch + source = CVE-2007-6110.patch + md5sums = 8b9b9587a411ac7dd278fa5413428960 + md5sums = 2aeda683f95b58efc0978d7fe951de59 + md5sums = 0d9099d3b5a32d322a8e0240f85a3578 + +pkgname = htdig + diff --git a/arch/tde-deps/htdig/CVE-2007-6110.patch b/arch/tde-deps/htdig/CVE-2007-6110.patch new file mode 100644 index 000000000..57b0e3b78 --- /dev/null +++ b/arch/tde-deps/htdig/CVE-2007-6110.patch @@ -0,0 +1,26 @@ +Index: htdig-3.2.0b6/htsearch/Display.cc +=================================================================== +--- htdig-3.2.0b6.orig/htsearch/Display.cc ++++ htdig-3.2.0b6/htsearch/Display.cc +@@ -137,7 +137,7 @@ Display::display(int pageNumber) + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char*)config->Find("sort"))); ++ String s("invalid sort method"); + + displaySyntaxError(s); + return; +Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc +=================================================================== +--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc ++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc +@@ -142,7 +142,7 @@ ResultFetch::fetch() + // Must temporarily stash the message in a String, since + // displaySyntaxError will overwrite the static temp used in form. + +- String s(form("No such sort method: `%s'", (const char *) config->Find("sort"))); ++ String s("invalid sort method"); + + displaySyntaxError(s); + //return; diff --git a/arch/tde-deps/htdig/PKGBUILD b/arch/tde-deps/htdig/PKGBUILD new file mode 100644 index 000000000..cec2ce842 --- /dev/null +++ b/arch/tde-deps/htdig/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 260530 2016-03-02 18:25:02Z foutrelis $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=htdig +pkgver=3.2.0b6 +pkgrel=11.1 +pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine" +url="http://www.htdig.org/" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +license=('GPL') +depends=('openssl') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc4.3.patch' + 'CVE-2007-6110.patch') +md5sums=('8b9b9587a411ac7dd278fa5413428960' + '2aeda683f95b58efc0978d7fe951de59' + '0d9099d3b5a32d322a8e0240f85a3578') + +prepare() { + cd ${pkgname}-${pkgver} + + patch -p1 -i "${srcdir}/gcc4.3.patch" + patch -p1 -i "${srcdir}/CVE-2007-6110.patch" + + cp -a /usr/share/libtool/build-aux/config.guess . + cp -a /usr/share/libtool/build-aux/config.sub . + cp -a /usr/share/libtool/build-aux/config.guess ./db/ + cp -a /usr/share/libtool/build-aux/config.sub ./db/ +} + +build() { + cd ${pkgname}-${pkgver} + + CFLAGS=-Wno-narrowing CXXFLAGS="-Wno-narrowing -std=c++03" \ + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --with-config-dir=/etc/htdig \ + --with-default-config-file=/etc/htdig/htdig.conf \ + --with-database-dir=/var/lib/htdig/db \ + --with-cgi-bin-dir=/usr/bin \ + --with-common-dir=/usr/share/doc/htdig \ + --with-search-dir=/usr/share/doc/htdig \ + --with-image-dir=/usr/share/doc/htdig \ + --localstatedir=/var/lib/htdig \ + --with-ssl + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/arch/tde-deps/htdig/gcc4.3.patch b/arch/tde-deps/htdig/gcc4.3.patch new file mode 100644 index 000000000..58dec1395 --- /dev/null +++ b/arch/tde-deps/htdig/gcc4.3.patch @@ -0,0 +1,15 @@ +diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h +--- htdig-3.2.0b6.orig/htsearch/Collection.h 2004-05-28 06:15:24.000000000 -0700 ++++ htdig-3.2.0b6/htsearch/Collection.h 2006-03-22 11:35:40.000000000 -0800 +@@ -36,9 +36,9 @@ public: + const char *docExcerpt); + ~Collection(); + +- void Collection::Open(); ++ void Open(); + +- void Collection::Close(); ++ void Close(); + + char *getWordFile() { return wordFile.get(); } + DocumentRef *getDocumentRef(int id); diff --git a/arch/tde-deps/imlib/CAN-2004-1026.patch b/arch/tde-deps/imlib/CAN-2004-1026.patch new file mode 100644 index 000000000..c820270d4 --- /dev/null +++ b/arch/tde-deps/imlib/CAN-2004-1026.patch @@ -0,0 +1,510 @@ +diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c +--- imlib-1.9.13.orig/Imlib/load.c Wed Mar 13 19:06:29 2002 ++++ imlib-1.9.13/Imlib/load.c Thu Sep 16 17:21:01 2004 +@@ -4,6 +4,8 @@ + #include "Imlib_private.h" + #include <setjmp.h> + ++#define G_MAXINT ((int) 0x7fffffff) ++ + /* Split the ID - damages input */ + + static char * +@@ -41,13 +43,17 @@ + + /* + * Make sure we don't wrap on our memory allocations ++ * we check G_MAXINT/4 because rend.c malloc's w * h * bpp ++ * + 3 is safety margin + */ + + void * _imlib_malloc_image(unsigned int w, unsigned int h) + { +- if( w > 32767 || h > 32767) +- return NULL; +- return malloc(w * h * 3); ++ if (w <= 0 || w > 32767 || ++ h <= 0 || h > 32767 || ++ h >= (G_MAXINT/4 - 1) / w) ++ return NULL; ++ return malloc(w * h * 3 + 3); + } + + #ifdef HAVE_LIBJPEG +@@ -360,7 +366,9 @@ + npix = ww * hh; + *w = (int)ww; + *h = (int)hh; +- if(ww > 32767 || hh > 32767) ++ if (ww <= 0 || ww > 32767 || ++ hh <= 0 || hh > 32767 || ++ hh >= (G_MAXINT/sizeof(uint32)) / ww) + { + TIFFClose(tif); + return NULL; +@@ -463,7 +471,7 @@ + } + *w = gif->Image.Width; + *h = gif->Image.Height; +- if (*h > 32767 || *w > 32767) ++ if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) + { + return NULL; + } +@@ -965,7 +973,12 @@ + comment = 0; + quote = 0; + context = 0; ++ memset(lookup, 0, sizeof(lookup)); ++ + line = malloc(lsz); ++ if (!line) ++ return NULL; ++ + while (!done) + { + pc = c; +@@ -994,25 +1007,25 @@ + { + /* Header */ + sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n"); + free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n"); + free(line); + return NULL; + } +- if (*w > 32767) ++ if (*w <= 0 || *w > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); + free(line); + return NULL; + } +- if (*h > 32767) ++ if (*h <= 0 || *h > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); + free(line); +@@ -1045,11 +1058,13 @@ + { + int slen; + int hascolor, iscolor; ++ int space; + + iscolor = 0; + hascolor = 0; + tok[0] = 0; + col[0] = 0; ++ space = sizeof(col) - 1; + s[0] = 0; + len = strlen(line); + strncpy(cmap[j].str, line, cpp); +@@ -1072,10 +1087,10 @@ + { + if (k >= len) + { +- if (col[0]) +- strcat(col, " "); +- if (strlen(col) + strlen(s) < sizeof(col)) +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + if (col[0]) + { +@@ -1105,14 +1120,17 @@ + } + } + } +- strcpy(tok, s); ++ if (slen < sizeof(tok)); ++ strcpy(tok, s); + col[0] = 0; ++ space = sizeof(col) - 1; + } + else + { +- if (col[0]) +- strcat(col, " "); +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -=1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + } + } +@@ -1341,12 +1359,12 @@ + sscanf(s, "%i %i", w, h); + a = *w; + b = *h; +- if (a > 32767) ++ if (a <= 0 || a > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n"); + return NULL; + } +- if (b > 32767) ++ if (b <= 0 || b > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n"); + return NULL; +diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c +--- imlib-1.9.13.orig/Imlib/utils.c Mon Mar 4 17:45:28 2002 ++++ imlib-1.9.13/Imlib/utils.c Thu Sep 16 17:21:15 2004 +@@ -1496,36 +1496,56 @@ + context = 0; + ptr = NULL; + end = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + while (!done) + { + line = data[count++]; ++ if (!line) ++ break; ++ line = strdup(line); ++ if (!line) ++ break; ++ len = strlen(line); ++ for (i = 0; i < len; ++i) ++ { ++ c = line[i]; ++ if (c < 32) ++ line[i] = 32; ++ else if (c > 127) ++ line[i] = 127; ++ } ++ + if (context == 0) + { + /* Header */ + sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (w > 32767) ++ if (w <= 0 || w > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } +- if (h > 32767) ++ if (h <= 0 || h > 32767) + { + fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } + cmap = malloc(sizeof(struct _cmap) * ncolors); +@@ -1533,6 +1553,7 @@ + if (!cmap) + { + free(im); ++ free(line); + return NULL; + } + im->rgb_width = w; +@@ -1542,6 +1563,7 @@ + { + free(cmap); + free(im); ++ free(line); + return NULL; + } + im->alpha_data = NULL; +@@ -1817,6 +1839,7 @@ + } + if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) + done = 1; ++ free(line); + } + if (!transp) + { +diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c +--- imlib-1.9.13.orig/gdk_imlib/io-gif.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-gif.c Thu Sep 16 16:11:31 2004 +@@ -55,7 +55,7 @@ + } + *w = gif->Image.Width; + *h = gif->Image.Height; +- if(*h > 32767 || *w > 32767) ++ if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767) + { + return NULL; + } +diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c +--- imlib-1.9.13.orig/gdk_imlib/io-ppm.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-ppm.c Thu Sep 16 16:13:13 2004 +@@ -53,12 +53,12 @@ + sscanf(s, "%i %i", w, h); + a = *w; + b = *h; +- if (a > 32767) ++ if (a <= 0 || a > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); + return NULL; + } +- if (b > 32767) ++ if (b <= 0 || b > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); + return NULL; +diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c +--- imlib-1.9.13.orig/gdk_imlib/io-tiff.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-tiff.c Thu Sep 16 16:13:57 2004 +@@ -36,7 +36,9 @@ + npix = ww * hh; + *w = (int)ww; + *h = (int)hh; +- if(ww > 32767 || hh > 32767) ++ if (ww <= 0 || ww > 32767 || ++ hh <= 0 || hh > 32767 || ++ hh >= (G_MAXINT/sizeof(uint32)) / ww) + { + TIFFClose(tif); + return NULL; +diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c +--- imlib-1.9.13.orig/gdk_imlib/io-xpm.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/io-xpm.c Thu Sep 16 17:08:24 2004 +@@ -40,8 +40,12 @@ + context = 0; + i = j = 0; + cmap = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + line = malloc(lsz); ++ if (!line) ++ return NULL; ++ + while (!done) + { + pc = c; +@@ -70,25 +74,25 @@ + { + /* Header */ + sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n"); + free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n"); + free(line); + return NULL; + } +- if (*w > 32767) ++ if (*w <= 0 || *w > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n"); + free(line); + return NULL; + } +- if (*h > 32767) ++ if (*h <= 0 || *h > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n"); + free(line); +@@ -120,11 +124,13 @@ + { + int slen; + int hascolor, iscolor; ++ int space; + + hascolor = 0; + iscolor = 0; + tok[0] = 0; + col[0] = 0; ++ space = sizeof(col) - 1; + s[0] = 0; + len = strlen(line); + strncpy(cmap[j].str, line, cpp); +@@ -147,10 +153,10 @@ + { + if (k >= len) + { +- if (col[0]) +- strcat(col, " "); +- if (strlen(col) + strlen(s) < sizeof(col)) +- strcat(col, s); ++ if (col[0] && space > 0) ++ strncat(col, " ", space), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + if (col[0]) + { +@@ -180,14 +186,17 @@ + } + } + } +- strcpy(tok, s); ++ if (slen < sizeof(tok)) ++ strcpy(tok, s); + col[0] = 0; ++ space = sizeof(col) - 1; + } + else + { +- if (col[0]) +- strcat(col, " "); +- strcat(col, s); ++ if (col[0] && space > 0) ++ strcat(col, " "), space -= 1; ++ if (slen <= space) ++ strcat(col, s), space -= slen; + } + } + } +diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c +--- imlib-1.9.13.orig/gdk_imlib/misc.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/misc.c Thu Sep 16 16:35:32 2004 +@@ -1355,11 +1355,16 @@ + + /* + * Make sure we don't wrap on our memory allocations ++ * we check G_MAX_INT/4 because rend.c malloc's w * h * bpp ++ * + 3 is safety margin + */ + + void *_gdk_malloc_image(unsigned int w, unsigned int h) + { +- if( w > 32767 || h > 32767) ++ if (w <= 0 || w > 32767 || ++ h <= 0 || h > 32767 || ++ h >= (G_MAXINT/4 - 1) / w) + return NULL; +- return malloc(w * h * 3); ++ return malloc(w * h * 3 + 3); + } ++ +diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c +--- imlib-1.9.13.orig/gdk_imlib/utils.c Mon Mar 4 17:26:51 2002 ++++ imlib-1.9.13/gdk_imlib/utils.c Thu Sep 16 17:28:35 2004 +@@ -1236,36 +1236,56 @@ + context = 0; + ptr = NULL; + end = NULL; ++ memset(lookup, 0, sizeof(lookup)); + + while (!done) + { + line = data[count++]; ++ if (!line) ++ break; ++ line = strdup(line); ++ if (!line) ++ break; ++ len = strlen(line); ++ for (i = 0; i < len; ++i) ++ { ++ c = line[i]; ++ if (c < 32) ++ line[i] = 32; ++ else if (c > 127) ++ line[i] = 127; ++ } ++ + if (context == 0) + { + /* Header */ + sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp); +- if (ncolors > 32766) ++ if (ncolors <= 0 || ncolors > 32766) + { + fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (cpp > 5) ++ if (cpp <= 0 || cpp > 5) + { + fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n"); + free(im); ++ free(line); + return NULL; + } +- if (w > 32767) ++ if (w <= 0 || w > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } +- if (h > 32767) ++ if (h <= 0 || h > 32767) + { + fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n"); + free(im); ++ free(line); + return NULL; + } + cmap = malloc(sizeof(struct _cmap) * ncolors); +@@ -1273,6 +1293,7 @@ + if (!cmap) + { + free(im); ++ free(line); + return NULL; + } + im->rgb_width = w; +@@ -1282,6 +1303,7 @@ + { + free(cmap); + free(im); ++ free(line); + return NULL; + } + im->alpha_data = NULL; +@@ -1355,7 +1377,7 @@ + strcpy(col + colptr, " "); + colptr++; + } +- if (colptr + ls <= sizeof(col)) ++ if (colptr + ls < sizeof(col)) + { + strcpy(col + colptr, s); + colptr += ls; +@@ -1558,6 +1580,7 @@ + } + if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3)) + done = 1; ++ free(line); + } + if (!transp) + { diff --git a/arch/tde-deps/imlib/PKGBUILD b/arch/tde-deps/imlib/PKGBUILD new file mode 100644 index 000000000..a3035caca --- /dev/null +++ b/arch/tde-deps/imlib/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=imlib +pkgver=1.9.15 +pkgrel=17 +pkgdesc="General image handling library for X11 and Gtk" +arch=('powerpc64le') +url="http://freshmeat.net/projects/imlib/" +license=('GPL') +depends=('giflib' 'libpng' 'libtiff' 'libxext') +makedepends=('libxt') +source=(https://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 + debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch + imlib-1.9.15-libpng15.patch imlib-giflib51.patch imlib-gtk.patch) +sha512sums=('f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a' + '0c805568c54149239a3106293e7a4f5abe127abebc1a851cda87958fede996d6c0415fe1b47a7f023f2deb2e3460204d5aae4fce5787e402a026d46c2e7e662c' + 'a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c' + 'ca4d2a047ee07f25bb462c8b34fc8298ef9a31b39f83309598a696973534e144f8f02a130bb764737dfbd329073e64abe4f8a673d66731822fece4969d7ab02a' + 'e7a6d48ef04fbcfcab998e6968130796ab3da1fd9def14ab2ccc713e0956f1f2be3f3a8f680ded5f00cb7ac9ea31d2f94de04aaa039ec5b03cece71f36f14294' + '91a62ed701974b953c2bc4f6b530ea7614b2195906110fcdc45bb200acacea0c54d431c3eafdcd2b33877606ef6b23bd34d051f99f90e5505d8e725b78278c89' + 'fb05c545e8c8e3eaf6a6cc390c0c9211c37074f7bd6805529254d9c61d56ceb9b2e3877d276f46ac0b195ae796e52c5baad11781ef91272c955529396bdf6de7') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/debian-bug448360.patch" + patch -p1 -i "${srcdir}/CAN-2004-1026.patch" + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" + patch -p1 -i "${srcdir}/imlib-giflib51.patch" + patch -p1 -i "${srcdir}/imlib-gtk.patch" + sed '/AC_PATH_XTRA/d' -i configure.in + mv configure.in configure.ac + libtoolize --force + cp /usr/bin/libtool . +} + +build() { + cd ${pkgname}-${pkgver} + autoreconf --force --install + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-shm --disable-static + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/arch/tde-deps/imlib/aclocal-fixes.patch b/arch/tde-deps/imlib/aclocal-fixes.patch new file mode 100644 index 000000000..04ef737e7 --- /dev/null +++ b/arch/tde-deps/imlib/aclocal-fixes.patch @@ -0,0 +1,20 @@ +--- imlib.m4.orig 2006-03-05 12:41:14.000000000 +0000 ++++ imlib.m4 2006-03-05 12:44:15.000000000 +0000 +@@ -6,7 +6,7 @@ + dnl AM_PATH_IMLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for IMLIB, and define IMLIB_CFLAGS and IMLIB_LIBS + dnl +-AC_DEFUN(AM_PATH_IMLIB, ++AC_DEFUN([AM_PATH_IMLIB], + [dnl + dnl Get the cflags and libraries from the imlib-config script + dnl +@@ -164,7 +164,7 @@ + ]) + + # Check for gdk-imlib +-AC_DEFUN(AM_PATH_GDK_IMLIB, ++AC_DEFUN([AM_PATH_GDK_IMLIB], + [dnl + dnl Get the cflags and libraries from the imlib-config script + dnl diff --git a/arch/tde-deps/imlib/debian-bug448360.patch b/arch/tde-deps/imlib/debian-bug448360.patch new file mode 100644 index 000000000..f1c0ef111 --- /dev/null +++ b/arch/tde-deps/imlib/debian-bug448360.patch @@ -0,0 +1,92 @@ +diff -up -ru imlib-1.9.15.orig/gdk_imlib/misc.c imlib-1.9.15/gdk_imlib/misc.c +--- imlib-1.9.15.orig/gdk_imlib/misc.c 2002-03-04 18:06:32.000000000 +0100 ++++ imlib-1.9.15/gdk_imlib/misc.c 2007-10-28 14:00:04.000000000 +0100 +@@ -674,6 +674,10 @@ gdk_imlib_init_params(GdkImlibInitParams + visual = gdk_rgb_get_visual(); + id->x.visual = GDK_VISUAL_XVISUAL(visual); /* the visual type */ + id->x.depth = visual->depth; /* the depth of the screen in bpp */ ++ ++ id->x.shm = 0; ++ id->x.shmp = 0; ++ id->max_shm = 0; + #ifdef HAVE_SHM + if (XShmQueryExtension(id->x.disp)) + { +@@ -689,17 +693,14 @@ gdk_imlib_init_params(GdkImlibInitParams + id->x.last_xim = NULL; + id->x.last_sxim = NULL; + id->max_shm = 0x7fffffff; +- if (XShmPixmapFormat(id->x.disp) == ZPixmap) ++ if ((XShmPixmapFormat(id->x.disp) == ZPixmap) && ++ (pm == True)) + id->x.shmp = 1; + } + } + } +- else + #endif +- { +- id->x.shm = 0; +- id->x.shmp = 0; +- } ++ + id->cache.on_image = 0; + id->cache.size_image = 0; + id->cache.num_image = 0; +@@ -935,8 +936,8 @@ gdk_imlib_init_params(GdkImlibInitParams + } + if (p->flags & PARAMS_SHAREDPIXMAPS) + { +- if (id->x.shm) +- id->x.shmp = p->sharedpixmaps; ++ if (!p->sharedpixmaps) ++ id->x.shmp = 0; + } + if (p->flags & PARAMS_PALETTEOVERRIDE) + override = p->paletteoverride; +diff -up -ru imlib-1.9.15.orig/Imlib/misc.c imlib-1.9.15/Imlib/misc.c +--- imlib-1.9.15.orig/Imlib/misc.c 2004-09-21 02:22:59.000000000 +0200 ++++ imlib-1.9.15/Imlib/misc.c 2007-10-28 14:00:23.000000000 +0100 +@@ -675,6 +675,10 @@ Imlib_init_with_params(Display * disp, I + id->x.root = DefaultRootWindow(disp); /* the root window id */ + id->x.visual = DefaultVisual(disp, id->x.screen); /* the visual type */ + id->x.depth = DefaultDepth(disp, id->x.screen); /* the depth of the screen in bpp */ ++ ++ id->x.shm = 0; ++ id->x.shmp = 0; ++ id->max_shm = 0; + #ifdef HAVE_SHM + if (XShmQueryExtension(id->x.disp)) + { +@@ -690,17 +694,14 @@ Imlib_init_with_params(Display * disp, I + id->x.last_xim = NULL; + id->x.last_sxim = NULL; + id->max_shm = 0x7fffffff; +- if (XShmPixmapFormat(id->x.disp) == ZPixmap) ++ if ((XShmPixmapFormat(id->x.disp) == ZPixmap && ++ (pm == True))) + id->x.shmp = 1; + } + } + } +- else + #endif +- { +- id->x.shm = 0; +- id->x.shmp = 0; +- } ++ + id->cache.on_image = 0; + id->cache.size_image = 0; + id->cache.num_image = 0; +@@ -952,8 +953,8 @@ Imlib_init_with_params(Display * disp, I + } + if (p->flags & PARAMS_SHAREDPIXMAPS) + { +- if (id->x.shm) +- id->x.shmp = p->sharedpixmaps; ++ if (!p->sharedpixmaps) ++ id->x.shmp = 0; + } + if (p->flags & PARAMS_PALETTEOVERRIDE) + override = p->paletteoverride; diff --git a/arch/tde-deps/imlib/imlib-1.9.15-libpng15.patch b/arch/tde-deps/imlib/imlib-1.9.15-libpng15.patch new file mode 100644 index 000000000..7837cd488 --- /dev/null +++ b/arch/tde-deps/imlib/imlib-1.9.15-libpng15.patch @@ -0,0 +1,142 @@ +--- gdk_imlib/io-png.c ++++ gdk_imlib/io-png.c +@@ -40,13 +40,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -275,13 +275,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -301,6 +301,9 @@ + /* Setup Translators */ + if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(png_ptr); ++ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) ++ png_set_expand(png_ptr); ++ + png_set_strip_16(png_ptr); + png_set_packing(png_ptr); + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) +@@ -440,13 +443,13 @@ + return NULL; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -635,7 +638,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); +--- Imlib/load.c ++++ Imlib/load.c +@@ -197,12 +197,12 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; +@@ -260,7 +260,8 @@ + png_read_image(png_ptr, lines); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + ptr = data; +- if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ if (color_type == PNG_COLOR_TYPE_GRAY ++ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + { + for (y = 0; y < *h; y++) + { +@@ -285,6 +286,7 @@ + } + } + } ++#if 0 + else if (color_type == PNG_COLOR_TYPE_GRAY) + { + for (y = 0; y < *h; y++) +@@ -300,6 +302,7 @@ + } + } + } ++#endif + else + { + for (y = 0; y < *h; y++) +--- Imlib/save.c ++++ Imlib/save.c +@@ -342,7 +342,7 @@ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); + return 0; + } +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + fclose(f); + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); +--- Imlib/utils.c ++++ Imlib/utils.c +@@ -1981,14 +1981,13 @@ + png_destroy_read_struct(&png_ptr, NULL, NULL); + return NULL; + } +- +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; + } + +- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) ++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA) + { + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + return NULL; diff --git a/arch/tde-deps/imlib/imlib-giflib51.patch b/arch/tde-deps/imlib/imlib-giflib51.patch new file mode 100644 index 000000000..ae0cf7043 --- /dev/null +++ b/arch/tde-deps/imlib/imlib-giflib51.patch @@ -0,0 +1,126 @@ +diff -ruN imlib-1.9.15.orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15.orig/gdk_imlib/io-gif.c 2014-05-27 09:38:13.210527763 +0000 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2014-05-27 09:43:55.435910398 +0000 +@@ -30,7 +30,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, NULL); + + transp = -1; + data = NULL; +@@ -43,14 +43,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error)); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error)); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; +@@ -62,13 +62,13 @@ + rows = malloc(*h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return NULL; + } + data = _gdk_malloc_image(*w, *h); + if (!data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return NULL; + } +@@ -79,7 +79,7 @@ + rows[i] = malloc(*w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < *h; i++) + if (rows[i]) + free(rows[i]); +@@ -168,7 +168,7 @@ + } + } + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < *h; i++) + free(rows[i]); + free(rows); +diff -ruN imlib-1.9.15.orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15.orig/Imlib/load.c 2014-05-27 09:38:13.220527723 +0000 ++++ imlib-1.9.15/Imlib/load.c 2014-05-27 09:45:25.775576104 +0000 +@@ -454,7 +454,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, NULL); + + if (!gif) + return NULL; +@@ -462,14 +462,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n"); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n"); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; +@@ -481,13 +481,13 @@ + rows = malloc(*h * sizeof(GifRowType *)); + if (!rows) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + return NULL; + } + data = _imlib_malloc_image(*w, *h); + if (!data) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + free(rows); + return NULL; + } +@@ -498,7 +498,7 @@ + rows[i] = malloc(*w * sizeof(GifPixelType)); + if (!rows[i]) + { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < *h; i++) + if (rows[i]) + free(rows[i]); +@@ -587,7 +587,7 @@ + } + } + } +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + for (i = 0; i < *h; i++) + free(rows[i]); + free(rows); diff --git a/arch/tde-deps/imlib/imlib-gtk.patch b/arch/tde-deps/imlib/imlib-gtk.patch new file mode 100644 index 000000000..c6e4fb618 --- /dev/null +++ b/arch/tde-deps/imlib/imlib-gtk.patch @@ -0,0 +1,14 @@ +--- a/configure.in 2014-04-12 17:46:28.459612102 +0200 ++++ b/configure.in 2014-04-12 17:46:33.926347877 +0200 +@@ -17,11 +17,6 @@ + dnl incase it is broken for example. + AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes") + +-AM_PATH_GTK(1.2.1,[ +- GDK_IMLIB="gdk_imlib utils"],[ +- GDK_IMLIB="" +- AC_MSG_WARN([*** gdk_imlib will not be built ***])]) +- + AC_MSG_CHECKING(whether to build gmodulized imlib) + + AC_ARG_ENABLE(modules, [ --disable-modules Disables dynamic module loading],[ diff --git a/arch/tde-deps/lcms/.SRCINFO b/arch/tde-deps/lcms/.SRCINFO new file mode 100644 index 000000000..7121ba137 --- /dev/null +++ b/arch/tde-deps/lcms/.SRCINFO @@ -0,0 +1,21 @@ +pkgbase = lcms + pkgdesc = Lightweight color management development library/engine + pkgver = 1.19 + pkgrel = 7 + url = http://www.littlecms.com + arch = x86_64 + arch = i686 + license = custom + makedepends = python2 + depends = libtiff + source = https://downloads.sourceforge.net/sourceforge/lcms/lcms-1.19.tar.gz + source = cve-2013-4276.patch + sha256sums = 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 + sha256sums = cd10cc5ce791ae782b1257e6181a71cbdb685b705779c9ef2ceffc7fb2021bd0 + +pkgname = lcms + +pkgname = python2-lcms + pkgdesc = LittleCMS Python bindings + depends = lcms + diff --git a/arch/tde-deps/lcms/PKGBUILD b/arch/tde-deps/lcms/PKGBUILD new file mode 100644 index 000000000..8471514bb --- /dev/null +++ b/arch/tde-deps/lcms/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Tobias Kieslich <neri@archlinux.org> +# Contributor: Ben <contrasutra@myrealbox.com> + +pkgbase=lcms +pkgname=(lcms) +pkgver=1.19 +pkgrel=7.1 +pkgdesc='Lightweight color management development library/engine' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +license=('custom') +depends=('libtiff') +#makedepends=('python2') +url='http://www.littlecms.com' +source=("https://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz" + 'cve-2013-4276.patch') +sha256sums=('80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9' + 'cd10cc5ce791ae782b1257e6181a71cbdb685b705779c9ef2ceffc7fb2021bd0') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -Np1 -i ../cve-2013-4276.patch + + cp -a /usr/share/libtool/build-aux/config.guess . + cp -a /usr/share/libtool/build-aux/config.sub . +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --without-python + make + #make -C python +} + +package_lcms() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -D -m0644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + rm -rf "${pkgdir}/usr/lib/python2.7/" +} + +#package_python2-lcms() { +# pkgdesc='LittleCMS Python bindings' +# depends=('lcms') +# +# cd "${srcdir}/${pkgbase}-${pkgver}" +# +# make DESTDIR="${pkgdir}" install +# install -D -m0644 COPYING \ +# "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +# +# rm -rf "${pkgdir}/usr/"{bin,include,lib/{pkgconfig,liblcms.*},share/man} +#} diff --git a/arch/tde-deps/lcms/cve-2013-4276.patch b/arch/tde-deps/lcms/cve-2013-4276.patch new file mode 100644 index 000000000..8f2f32297 --- /dev/null +++ b/arch/tde-deps/lcms/cve-2013-4276.patch @@ -0,0 +1,62 @@ +diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c +--- lcms-1.19.dfsg/samples/icctrans.c 2009-10-30 15:57:45.000000000 +0000 ++++ lcms-1.19.dfsg-patched/samples/icctrans.c 2013-08-06 11:53:14.385266647 +0100 +@@ -86,6 +86,8 @@ + static LPcmsNAMEDCOLORLIST InputColorant = NULL; + static LPcmsNAMEDCOLORLIST OutputColorant = NULL; + ++unsigned int Buffer_size = 4096; ++ + + // isatty replacement + +@@ -500,7 +502,7 @@ + + Prefix[0] = 0; + if (!lTerse) +- sprintf(Prefix, "%s=", C); ++ snprintf(Prefix, 20, "%s=", C); + + if (InHexa) + { +@@ -648,7 +650,9 @@ + static + void GetLine(char* Buffer) + { +- scanf("%s", Buffer); ++ char User_buffer[Buffer_size]; ++ fgets(User_buffer, (Buffer_size - 1), stdin); ++ sscanf(User_buffer,"%s", Buffer); + + if (toupper(Buffer[0]) == 'Q') { // Quit? + +@@ -668,7 +672,7 @@ + static + double GetAnswer(const char* Prompt, double Range) + { +- char Buffer[4096]; ++ char Buffer[Buffer_size]; + double val = 0.0; + + if (Range == 0.0) { // Range 0 means double value +@@ -738,7 +742,7 @@ + static + WORD GetIndex(void) + { +- char Buffer[4096], Name[40], Prefix[40], Suffix[40]; ++ char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40]; + int index, max; + + max = cmsNamedColorCount(hTrans)-1; +diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c +--- lcms-1.19.dfsg/tifficc/tiffdiff.c 2009-10-30 15:57:46.000000000 +0000 ++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c 2013-08-06 11:49:06.698951157 +0100 +@@ -633,7 +633,7 @@ + cmsIT8SetSheetType(hIT8, "TIFFDIFF"); + + +- sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2); ++ snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2); + + cmsIT8SetComment(hIT8, Buffer); + diff --git a/arch/tde-deps/libofx/PKGBUILD b/arch/tde-deps/libofx/PKGBUILD new file mode 100644 index 000000000..c96953d15 --- /dev/null +++ b/arch/tde-deps/libofx/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Jaroslav Lichtblau <svetlemodry@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgbase=libofx +pkgname=('libofx' 'libofx-doc') +pkgver=0.10.9 +pkgrel=1 +pkgdesc="API for the OFX banking standard" +arch=('powerpc64le') +url="https://github.com/libofx" +license=('GPL') +depends=('opensp' 'curl' 'libxml++2.6') +checkdepends=('gnupg') +source=(https://github.com/$pkgname/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz) +sha256sums=('1ca89ff7d681c9edad312172ac464231a8de686e653213612f9417492cef0d37') + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make CXXFLAGS+=-std=c++11 +} + +check() { + cd $pkgbase-$pkgver + make check +} + +package_libofx() { + options=('!docs') + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install +} + +package_libofx-doc() { + pkgdesc="Documention of the OFX banking standard API" + depends=() + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install-docDATA + make -C doc DESTDIR="$pkgdir" install +} diff --git a/arch/tde-deps/libxml++2.6/PKGBUILD b/arch/tde-deps/libxml++2.6/PKGBUILD new file mode 100644 index 000000000..56686585b --- /dev/null +++ b/arch/tde-deps/libxml++2.6/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgbase=libxml++2.6 +pkgname=(libxml++2.6 libxml++2.6-docs) +pkgver=2.42.1 +pkgrel=1 +pkgdesc="C++ bindings to libxml2" +url="https://libxmlplusplus.github.io/libxmlplusplus/" +arch=('powerpc64le') +license=(LGPL) +depends=(libxml2 glibmm) +makedepends=(git meson mm-common glibmm-docs) +options=(!emptydirs) +_commit=ceedcb1ca7462305cbca16464bbc5ea50d89c356 # tags/2.42.1^0 +source=("git+https://github.com/libxmlplusplus/libxmlplusplus#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd libxmlplusplus + git describe --tags | sed 's/-/+/g' +} + +prepare() { + cd libxmlplusplus +} + +build() { + arch-meson libxmlplusplus build -D maintainer-mode=true + meson compile -C build +} + +check() { + meson test -C build --print-errorlogs +} + +package_libxml++2.6() { + provides=("libxml++2=$pkgver" libxml++-2.6.so) + conflicts=(libxml++2) + replaces=(libxml++2) + + meson install -C build --destdir "$pkgdir" + + # Split -docs + mkdir -p docs/usr/share + mv -t docs/usr/share "$pkgdir"/usr/share/{devhelp,doc} +} + +package_libxml++2.6-docs() { + pkgdesc+=" (documentation)" + depends=() + options=(!strip) + + mv -t "$pkgdir" docs/* +} diff --git a/arch/tde-deps/opensc/PKGBUILD b/arch/tde-deps/opensc/PKGBUILD new file mode 100644 index 000000000..2195152d9 --- /dev/null +++ b/arch/tde-deps/opensc/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Alad +# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Sébastien Luttringer +# Contributor: kevku <kevku@msn.com> + +pkgname=opensc +pkgver=0.23.0 +pkgrel=1 +pkgdesc='Tools and libraries for smart cards' +arch=('powerpc64le') +url='https://github.com/OpenSC/OpenSC/wiki' +license=('LGPL') +backup=('etc/opensc.conf') +makedepends=('docbook-xsl') +depends=('pcsclite' 'glib2' 'libltdl') +options=(!emptydirs !lto) +source=("https://github.com/OpenSC/OpenSC/releases/download/$pkgver/opensc-$pkgver.tar.gz") +sha512sums=('cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b') + +build() { + cd $pkgname-$pkgver + + _sheetdir=(/usr/share/xml/docbook/xsl-stylesheets-*-nons) + + ./bootstrap + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-completiondir=/usr/share/bash-completion/completions \ + --enable-man \ + --enable-doc \ + --enable-readline \ + --enable-openssl \ + --enable-pcsc \ + --enable-zlib \ + --enable-sm \ + --with-xsl-stylesheetsdir="$_sheetdir" + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package(){ + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + install -D -m644 etc/opensc.conf "$pkgdir/etc/opensc.conf" +} + +# vim:set ts=2 sw=2 et: diff --git a/arch/tde-deps/perl-config-autoconf/PKGBUILD b/arch/tde-deps/perl-config-autoconf/PKGBUILD new file mode 100644 index 000000000..f3239c047 --- /dev/null +++ b/arch/tde-deps/perl-config-autoconf/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> +# Contributor: John D Jones III AKA jnbek <jnbek1972 -_AT_- g m a i l -_Dot_- com> +# Generator : CPANPLUS::Dist::Arch 1.32 + +pkgname='perl-config-autoconf' +_dist="Config-AutoConf" +pkgver=0.320 +pkgrel=1 +pkgdesc="A module to implement some of AutoConf macros in pure perl." +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl-capture-tiny' 'perl-file-slurper') +makedepends=('bison' 'flex' 'gawk' 'grep' 'pkg-config' 'sed') +url='https://metacpan.org/release/Config-AutoConf' +source=("https://search.cpan.org/CPAN/authors/id/A/AM/AMBS/${_dist}-${pkgver}.tar.gz") +md5sums=('71664b2864232e265179ac29298e0916') +sha256sums=('bb57a958ef49d3f7162276dae14a7bd5af43fd1d8513231af35d665459454023') + +build() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + perl Makefile.PL + make +} + +check() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + export PERL_MM_USE_DEFAULT=1 + make test +} + +package() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" +} diff --git a/arch/tde-deps/perl-extutils-libbuilder/PKGBUILD b/arch/tde-deps/perl-extutils-libbuilder/PKGBUILD new file mode 100644 index 000000000..ef80ce3b7 --- /dev/null +++ b/arch/tde-deps/perl-extutils-libbuilder/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> + +pkgname='perl-extutils-libbuilder' +_dist="ExtUtils-LibBuilder" +pkgver=0.08 +pkgrel=10 +pkgdesc="A tools to build C libraries" +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl') +makedepends=('perl-module-build') +url="https://metacpan.org/release/${_dist}" +source=("https://search.cpan.org/CPAN/authors/id/A/AM/AMBS/${_dist}-${pkgver}.tar.gz") +sha256sums=('c51171e06de53039f0bca1d97a6471ec37941ff59e8a3d1cb170ebdd2573b5d2') + +build() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + perl Build.PL + ./Build +} + +check() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + ./Build test +} + +package() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + ./Build install installdirs=vendor destdir="$pkgdir" +} diff --git a/arch/tde-deps/perl-file-slurper/PKGBUILD b/arch/tde-deps/perl-file-slurper/PKGBUILD new file mode 100644 index 000000000..6729ac806 --- /dev/null +++ b/arch/tde-deps/perl-file-slurper/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> + +pkgname=perl-file-slurper +_dist=File-Slurper +pkgver=0.013 +pkgrel=1 +pkgdesc="A simple, sane and efficient module to slurp a file" +arch=('any') +url="https://metacpan.org/release/${_dist}" +license=('PerlArtistic' 'GPL') +depends=('perl') +checkdepends=('perl-test-warnings') +options=('!emptydirs') +source=(https://search.cpan.org/CPAN/authors/id/L/LE/LEONT/${_dist}-${pkgver}.tar.gz) +sha256sums=('e2f6a4029a6a242d50054044f1fb86770b9b5cc4daeb1a967f91ffb42716a8c5') + +build() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + perl Makefile.PL + make +} + +check() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + export PERL_MM_USE_DEFAULT=1 + make test +} + +package() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + make install INSTALLDIRS=vendor DESTDIR="$pkgdir" +} diff --git a/arch/tde-deps/perl-text-bibtex/PKGBUILD b/arch/tde-deps/perl-text-bibtex/PKGBUILD new file mode 100644 index 000000000..203b53875 --- /dev/null +++ b/arch/tde-deps/perl-text-bibtex/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> + +pkgname=perl-text-bibtex +_dist=Text-BibTeX +pkgver=0.89 +pkgrel=1 +pkgdesc="Perl interface to read and parse BibTeX files" +arch=('powerpc64le') +url="https://metacpan.org/release/${_dist}" +license=('PerlArtistic' 'GPL') +depends=('perl') +makedepends=('perl-module-build' + 'perl-config-autoconf' + 'perl-extutils-libbuilder') +options=('!emptydirs') +source=(https://search.cpan.org/CPAN/authors/id/A/AM/AMBS/${_dist}-${pkgver}.tar.gz) +# Checksums from http://search.cpan.org/CPAN/authors/id/A/AM/AMBS/CHECKSUMS +md5sums=('67fa6d9c03c659627d9fd58bb380c1fe') +sha256sums=('88a78ebf088ec7502f401c5a2b138c862cf5458534b773223bbf3aaf41224196') + +prepare() { + cd "${srcdir}/${_dist}-${pkgver}" + # Don't install to /usr/lib64 + sed -i s,lib64,lib,g Build.PL +} + +build() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps + perl Build.PL + ./Build +} + +check() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + export PERL_MM_USE_DEFAULT=1 + ./Build test +} + +package() { + cd "${srcdir}/${_dist}-${pkgver}" + unset PERL5LIB PERL_MM_OPT PERL_MB_OPT PERL_LOCAL_LIB_ROOT + ./Build install installdirs=vendor destdir="$pkgdir" +} diff --git a/arch/tde-deps/pod2man/.SRCINFO b/arch/tde-deps/pod2man/.SRCINFO new file mode 100644 index 000000000..412bde20b --- /dev/null +++ b/arch/tde-deps/pod2man/.SRCINFO @@ -0,0 +1,12 @@ +pkgbase = pod2man + pkgdesc = Make pod2man easily accessible + pkgver = 5.30.2 + pkgrel = 1 + url = https://perl.org/ + arch = x86_64 + license = GPL + license = PerlArtistic + depends = perl + +pkgname = pod2man + diff --git a/arch/tde-deps/pod2man/.gitignore b/arch/tde-deps/pod2man/.gitignore new file mode 100644 index 000000000..b3cd27837 --- /dev/null +++ b/arch/tde-deps/pod2man/.gitignore @@ -0,0 +1,6 @@ +pkg +src +*.gz +*.xz +*.bak +*.new diff --git a/arch/tde-deps/pod2man/PKGBUILD b/arch/tde-deps/pod2man/PKGBUILD new file mode 100644 index 000000000..eacfb42d0 --- /dev/null +++ b/arch/tde-deps/pod2man/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Fernando Ortiz <nandub+arch@nandub.info > +# Contributor: Alexander F. Rødseth <xyproto@archlinux.org> + +pkgname=pod2man +pkgver=5.30.2 +pkgrel=1 +pkgdesc='Make pod2man easily accessible' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +license=(GPL PerlArtistic) +url='https://perl.org/' +depends=(perl) + +package() { + # perl 5 places pod2man in /usr/bin/core_perl instead of /usr/bin, + # for unknown reasons. This creates a symlink in what is what is now a more + # conventional location. + + install -d "$pkgdir/usr/bin" + ln -s /usr/bin/core_perl/pod2man "$pkgdir/usr/bin/pod2man" +} + +# vim: ts=2 sw=2 et: diff --git a/arch/tde-deps/pod2man/pkgsum.sh b/arch/tde-deps/pod2man/pkgsum.sh new file mode 100755 index 000000000..e908ad353 --- /dev/null +++ b/arch/tde-deps/pod2man/pkgsum.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +#taken from https://bbs.archlinux.org/viewtopic.php?id=131666 by falconindy +awk -v newsums="$(makepkg -g)" ' +BEGIN { + if (!newsums) exit 1 +} + +/^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*$/ { + if (!i) print newsums; i++ + next +} + +1 +' PKGBUILD > PKGBUILD.new && mv PKGBUILD{.new,}
\ No newline at end of file diff --git a/arch/tde-deps/pod2man/update.sh b/arch/tde-deps/pod2man/update.sh new file mode 100755 index 000000000..b176cad88 --- /dev/null +++ b/arch/tde-deps/pod2man/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +get_latest() { + wget -q -O- 'https://github.com/kimwalisch/primesieve/wiki/Downloads' | \ + sed -n 's,.*primesieve-\([0-9][^>]*\)\.tar.*,\1,p' | \ + grep -v '\(linux\|mac\|win\)' | \ + sort -r | \ + head -1 +} + +latest_version=$1 +#latest_version=$(get_latest) +current_version=$(cat PKGBUILD | grep pkgver= | awk -F'=' '{print $2}') + +if ! [ "$latest_version" = "$current_version" ]; then + echo Updating the package with the latest version + echo latest: $latest_version + echo current: $current_version + sed -i.bak "s/$current_version/$latest_version/g" PKGBUILD + sed -i.bak "s/pkgrel=[^d.]/pkgrel=1/g" PKGBUILD + ./pkgsum.sh + if which makepkg &> /dev/null; then + makepkg --printsrcinfo > .SRCINFO + else + mksrcinfo + fi +else + echo Nothing to update. +fi diff --git a/arch/tde-deps/sword/PKGBUILD b/arch/tde-deps/sword/PKGBUILD new file mode 100644 index 000000000..37b95756f --- /dev/null +++ b/arch/tde-deps/sword/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Maintainer: Caleb Maclennan <caleb@alerque.com> +# Maintainer: T.J. Townsend <blakkheim@archlinux.org> +# Contributor: SanskritFritz (gmail) +# Contributor: Alexander Rødseth +# Contributor: Andrea Scarpino +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: TripleE <eric1548@yahoo.com> +# Contributor: Dominic Tubach + +pkgbase=sword +pkgname=(sword python-sword) +_mainver=1.9 +pkgver=1.9.0 +pkgrel=9 +pkgdesc="Library for Bible study programs" +arch=('powerpc64le') +url="https://www.crosswire.org/sword/" +license=('GPL') +makedepends=('curl' 'clucene' 'swig' 'cmake' 'python') +source=("https://www.crosswire.org/ftpmirror/pub/$pkgbase/source/v$_mainver/$pkgbase-$pkgver.tar.gz") +sha512sums=('9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f') + +build() { + # http://site.icu-project.org/download/61#TOC-Migration-Issues + CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1' + + #./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc + cmake -B build -S $pkgbase-$pkgver \ + -DCMAKE_BUILD_TYPE='None' \ + -DLIBSWORD_LIBRARY_TYPE="Shared" \ + -DSYSCONF_INSTALL_DIR='/etc' \ + -DSWORD_BUILD_TESTS="Yes" \ + -DSWORD_PYTHON_3=TRUE \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -Wno-dev + cmake --build build +} + +package_sword() { + depends=('curl' 'clucene' 'xz') + backup=('etc/sword.conf') + + DESTDIR="$pkgdir" cmake --install build +} + +package_python-sword() { + depends=('sword' 'python') + + cd build/bindings/swig/python3 + python setup.py install --root="$pkgdir" --prefix=/usr -O1 --skip-build +} diff --git a/arch/tde-deps/tor/PKGBUILD b/arch/tde-deps/tor/PKGBUILD new file mode 100644 index 000000000..537b2902d --- /dev/null +++ b/arch/tde-deps/tor/PKGBUILD @@ -0,0 +1,69 @@ +# Maintainer: Lukas Fleischer <lfleischer@archlinux.org> +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: kpcyrd <kpcyrd[at]archlinux[dot]org> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: simo <simo@archlinux.org> +# Contributor: Sid Karunaratne + +pkgname=tor +pkgver=0.4.7.11 +pkgrel=1 +pkgdesc='Anonymizing overlay network.' +arch=('powerpc64le') +url='https://www.torproject.org/download/tor/' +license=('BSD') +depends=('openssl' 'libevent' 'bash' 'libseccomp' 'zstd' 'libcap' 'systemd-libs' + 'libsystemd.so' 'libzstd.so' 'libseccomp.so' 'libcap.so') +optdepends=('torsocks: for torify') +makedepends=('ca-certificates' 'systemd') +backup=('etc/tor/torrc') +source=("https://dist.torproject.org/${pkgname}-${pkgver}.tar.gz"{,.sha256sum{,.asc}} + 'torrc.patch' + 'tor.sysusers' + 'tor.tmpfiles' + 'tor.service') +b2sums=('2d743e7d0aea63e76f6e24aa235792af8691fde419f56bbdf8c6ee865250a09ec06454ec84abac8ba47e3d61a363c937fc050376172d3ec6b0815998d1c8679e' + '1e49ba88ae21af6589a9815603ee375cc0dc85fcd8dd5a5f52cd44659438874ae9d10b09b7f15cadd2c30d2e8012a27be4233dcb19195d4627f19a59ccf68d0b' + 'SKIP' + '3359e138d823a77df2a42ce3fe8c6ecb4004e9ec191863db7857aceea7c136c78f09518b1a199dfd3215f5d61f1c060f4a0e2141c5bdb6b847af60fb6e9a81a7' + '9053da53926f2120ac57b6c1442238f5bbd89bf9270347c4e00b721b39939bebc6adfcf814a9d7289dfd14d085d91c193529305336db93190da5b7f586a031df' + '5d55d9a7e42b6ce78b8ab985bab37afe8f0bacddb5abd895c4a490adb8f98b9422f90b40066fef05ecf37b7b21e80aadc615c4b7f6e12b05581304113a1b1f1d' + '327c1a35c3d4c44f93edb47959c8c41ab6af4cbfcbb8f4e9f54f2f69d17d148bf85e2d2c8aefe2d3165e123056dd68a248af78d1ba713b94a4e6d27a9cf412f1') +validpgpkeys=( + '2133BC600AB133E1D826D173FE43009C4607B1FB' # Nick Mathewson + 'B74417EDDF22AC9F9E90F49142E86A2A11F48D36' # David Goulet + '1C1BC007A9F607AA8152C040BEA7B180B1491921' # Alexander Færøy +) + +prepare() { + # verify the signed sums match the expected source tarball + sha256sum -c ${pkgname}-${pkgver}.tar.gz.sha256sum + cd ${pkgname}-${pkgver} + # uncomment essential config sections in the torrc file + patch -Np1 < "${srcdir}/torrc.patch" +} + +build() { + cd ${pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + mv "${pkgdir}"/etc/tor/torrc{.sample,} + + # install arch custom files + install -Dm 644 "${srcdir}"/*.service -t "${pkgdir}"/usr/lib/systemd/system + install -Dm 644 "${srcdir}"/tor.sysusers "${pkgdir}"/usr/lib/sysusers.d/tor.conf + install -Dm 644 "${srcdir}"/tor.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/tor.conf + + install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname} +} + +# vim: ts=2 sw=2 et: diff --git a/arch/tde-deps/tor/keys/pgp/1C1BC007A9F607AA8152C040BEA7B180B1491921.asc b/arch/tde-deps/tor/keys/pgp/1C1BC007A9F607AA8152C040BEA7B180B1491921.asc new file mode 100644 index 000000000..9cc80960e --- /dev/null +++ b/arch/tde-deps/tor/keys/pgp/1C1BC007A9F607AA8152C040BEA7B180B1491921.asc @@ -0,0 +1,43 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +IzfFlprFAg== +=SCcY +-----END PGP PUBLIC KEY BLOCK----- diff --git a/arch/tde-deps/tor/keys/pgp/2133BC600AB133E1D826D173FE43009C4607B1FB.asc b/arch/tde-deps/tor/keys/pgp/2133BC600AB133E1D826D173FE43009C4607B1FB.asc new file mode 100644 index 000000000..2332b8727 --- /dev/null +++ b/arch/tde-deps/tor/keys/pgp/2133BC600AB133E1D826D173FE43009C4607B1FB.asc @@ -0,0 +1,123 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +wwDAcynzMET9pI0MXmqY1qKjlMQVc7lb4FLeXw== +=y/Gu +-----END PGP PUBLIC KEY BLOCK----- diff --git a/arch/tde-deps/tor/keys/pgp/B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc b/arch/tde-deps/tor/keys/pgp/B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc new file mode 100644 index 000000000..b3a6bfaca --- /dev/null +++ b/arch/tde-deps/tor/keys/pgp/B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=Aw5d +-----END PGP PUBLIC KEY BLOCK----- diff --git a/arch/tde-deps/tor/tor.service b/arch/tde-deps/tor/tor.service new file mode 100644 index 000000000..f91b63a08 --- /dev/null +++ b/arch/tde-deps/tor/tor.service @@ -0,0 +1,35 @@ +# tor.service -- this systemd configuration file for Tor sets up a +# relatively conservative, hardened Tor service. You may need to +# edit it if you are making changes to your Tor configuration that it +# does not allow. Package maintainers: this should be a starting point +# for your tor.service; it is not the last point. + +[Unit] +Description=Anonymizing overlay network for TCP +After=syslog.target network.target nss-lookup.target + +[Service] +Type=notify +NotifyAccess=all +ExecStartPre=/usr/bin/tor -f /etc/tor/torrc --verify-config +ExecStart=/usr/bin/tor -f /etc/tor/torrc +ExecReload=/bin/kill -HUP ${MAINPID} +KillSignal=SIGINT +TimeoutSec=60 +Restart=on-failure +WatchdogSec=1m +LimitNOFILE=32768 + +# Hardening +PrivateTmp=yes +PrivateDevices=yes +ProtectHome=yes +ProtectSystem=full +ReadOnlyDirectories=/ +ReadWriteDirectories=-/var/lib/tor +ReadWriteDirectories=-/var/log/tor +NoNewPrivileges=yes +CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_NET_BIND_SERVICE CAP_DAC_READ_SEARCH + +[Install] +WantedBy=multi-user.target diff --git a/arch/tde-deps/tor/tor.sysusers b/arch/tde-deps/tor/tor.sysusers new file mode 100644 index 000000000..1f039ff57 --- /dev/null +++ b/arch/tde-deps/tor/tor.sysusers @@ -0,0 +1 @@ +u tor 43 - /var/lib/tor diff --git a/arch/tde-deps/tor/tor.tmpfiles b/arch/tde-deps/tor/tor.tmpfiles new file mode 100644 index 000000000..ed8beb4b7 --- /dev/null +++ b/arch/tde-deps/tor/tor.tmpfiles @@ -0,0 +1 @@ +d /var/lib/tor 0700 tor tor - - diff --git a/arch/tde-deps/tor/torrc.patch b/arch/tde-deps/tor/torrc.patch new file mode 100644 index 000000000..0f3c849a4 --- /dev/null +++ b/arch/tde-deps/tor/torrc.patch @@ -0,0 +1,28 @@ +--- a/src/config/torrc.sample.in 2021-03-10 19:59:10.123456789 +0100 ++++ b/src/config/torrc.sample.in 2021-03-10 19:59:10.123456789 +0100 +@@ -11,6 +11,7 @@ + ## + ## Tor will look for this file in various places based on your platform: + ## https://www.torproject.org/docs/faq#torrc ++User tor + + ## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't + ## configure one below. Set "SOCKSPort 0" if you plan to run Tor only +@@ -39,7 +40,7 @@ + ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log + #Log debug file @LOCALSTATEDIR@/log/tor/debug.log + ## Use the system log instead of Tor's logfiles +-#Log notice syslog ++Log notice syslog + ## To send all messages to stderr: + #Log debug stderr + +@@ -50,7 +51,7 @@ + + ## The directory for keeping all the keys/etc. By default, we store + ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. +-#DataDirectory @LOCALSTATEDIR@/lib/tor ++DataDirectory @LOCALSTATEDIR@/lib/tor + + ## The port on which Tor will listen for local connections from Tor + ## controller applications, as documented in control-spec.txt. diff --git a/arch/tde-deps/torsocks/PKGBUILD b/arch/tde-deps/torsocks/PKGBUILD new file mode 100644 index 000000000..0db591399 --- /dev/null +++ b/arch/tde-deps/torsocks/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com> +# Contributor: Rorschach <r0rschach@lavabit.com> + +pkgname=torsocks +pkgver=2.3.0 +pkgrel=2 +pkgdesc='Wrapper to safely torify applications' +url='https://gitweb.torproject.org/torsocks.git/' +arch=('powerpc64le') +license=('GPL2') +depends=('tor') +backup=("etc/tor/${pkgname}.conf") +source=(https://people.torproject.org/~dgoulet/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc}) +sha512sums=('4888caaffdcfebf3673e14f3491eae6aa84ca0a4a2a812ba7bdac2abb471307e89a3c5cffe7691fb6f190c7bd9ea455ee9a223d909a39152be8524f590be2031' + 'SKIP') +validpgpkeys=('B74417EDDF22AC9F9E90F49142E86A2A11F48D36') + +build() { + cd ${pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/arch/tde-deps/torsocks/keys/pgp/B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc b/arch/tde-deps/torsocks/keys/pgp/B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc new file mode 100644 index 000000000..33dd2bc7c --- /dev/null +++ b/arch/tde-deps/torsocks/keys/pgp/B74417EDDF22AC9F9E90F49142E86A2A11F48D36.asc @@ -0,0 +1,66 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +isR9 +=/Stc +-----END PGP PUBLIC KEY BLOCK----- diff --git a/arch/tde-deps/xine-lib/010-xine-lib-dav1d-1.0.0-support.patch b/arch/tde-deps/xine-lib/010-xine-lib-dav1d-1.0.0-support.patch new file mode 100644 index 000000000..aa0be9eef --- /dev/null +++ b/arch/tde-deps/xine-lib/010-xine-lib-dav1d-1.0.0-support.patch @@ -0,0 +1,28 @@ +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,5 @@ ++ * Add dav1d 1.0.0 support. ++ + xine-lib (1.2.12) 2022-03-09 + * Add string tree library (generic info parser). + * Add OpenSL ES audio output plugin. +--- a/src/video_dec/dav1d.c ++++ b/src/video_dec/dav1d.c +@@ -544,11 +544,17 @@ + + /* multithreading */ + ncpu = xine_cpu_count(); ++#if DAV1D_API_VERSION_MAJOR > 5 ++ settings.n_threads = ncpu + 1; ++ xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": " ++ "Using %d threads\n", settings.n_threads); ++#else + settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2; + settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1); + xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": " + "Using %d frame threads, %d tile threads\n", + settings.n_frame_threads, settings.n_tile_threads); ++#endif + + /* dri frame allocator */ + settings.allocator.cookie = this; diff --git a/arch/tde-deps/xine-lib/020-xine-lib-ffmpeg-5.1-fix.patch b/arch/tde-deps/xine-lib/020-xine-lib-ffmpeg-5.1-fix.patch new file mode 100644 index 000000000..baa21b2f0 --- /dev/null +++ b/arch/tde-deps/xine-lib/020-xine-lib-ffmpeg-5.1-fix.patch @@ -0,0 +1,330 @@ +--- a/m4/decoders.m4 ++++ b/m4/decoders.m4 +@@ -134,13 +134,36 @@ a52_init (); + AC_DEFINE([HAVE_FFMPEG], 1, [Define this if you have the ffmpeg library]) + dnl Check presence of ffmpeg/avutil.h to see if it's old or new + dnl style for headers. The new style would be preferred actually... ++ dnl Sigh. at least some 09/2022 ffmpeg version does violate the basic ++ dnl "get directly what you use directly" rule. especially, ++ dnl libavformat/avformat.h includes libavcodec/packet.h which uses ++ dnl (but not includes) libavutil/avutil.h. this means that a mere ++ dnl AC_CHECK_HEADERS([libavformat/avformat.h]) will fail strangely :-/ + ac_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $FFMPEG_CFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CFLAGS $FFMPEG_CFLAGS $AVUTIL_CFLAGS" +- AC_CHECK_HEADERS([ffmpeg/avutil.h]) +- AC_CHECK_HEADERS([libavutil/avutil.h]) +- AC_CHECK_HEADERS([libavutil/sha1.h]) +- AC_CHECK_HEADERS([libavutil/sha.h]) ++ AC_CHECK_HEADERS([ffmpeg/avutil.h libavutil/avutil.h libavutil/sha1.h libavutil/mem.h libavutil/sha.h]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <libavutil/avutil.h> ++#include <libavcodec/avcodec.h> ++ ]],[[]])], [have_avutil_avcodec_h=yes], [have_avutil_avcodec_h=no]) ++ test x"$have_avutil_avcodec_h" == x"yes" && AC_DEFINE([HAVE_AVUTIL_AVCODEC_H],[1], ++ [Define this if you have libavutil/avutil.h and libavcodec/avcodec.h.]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <libavutil/avutil.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++ ]],[[]])], [have_avformat_avformat_h=yes], [have_avformat_avformat_h=no]) ++ test x"$have_avformat_avformat_h" == x"yes" && AC_DEFINE([HAVE_AVFORMAT_AVFORMAT_H],[1], ++ [Define this if you have libavformat/avformat.h.]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <libavutil/avutil.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libavformat/avio.h> ++ ]],[[]])], [have_avformat_avio_h=yes], [have_avformat_avio_h=no]) ++ test x"$have_avformat_avio_h" == x"yes" && AC_DEFINE([HAVE_AVFORMAT_AVIO_H],[1], ++ [Define this if you have libavformat/avformat.h.]) + if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then + AC_MSG_ERROR([old & new ffmpeg headers found - you need to clean up!]) + fi +--- a/m4/input.m4 ++++ b/m4/input.m4 +@@ -229,6 +229,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ + fi + if test x"$have_avformat" = x"yes"; then + AC_DEFINE([HAVE_AVFORMAT], 1, [Define this if you have libavformat installed]) ++ AC_CHECK_HEADERS([libavformat/avformat.h]) + fi + fi + AM_CONDITIONAL([ENABLE_AVFORMAT], [test x"$have_avformat" = x"yes"]) +--- a/src/combined/ffmpeg/demux_avformat.c ++++ b/src/combined/ffmpeg/demux_avformat.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2013-2021 the xine project ++ * Copyright (C) 2013-2022 the xine project + * Copyright (C) 2013-2020 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This file is part of xine, a free video player. +@@ -29,6 +29,8 @@ + #include <pthread.h> + #include <errno.h> + ++#include <libavutil/avutil.h> ++#include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> + #include <libavformat/avio.h> + +@@ -922,3 +924,4 @@ void *init_avformat_demux_plugin (xine_t + (void)data; + return (demux_class_t *)&this; + } ++ +--- a/src/combined/ffmpeg/ff_audio_decoder.c ++++ b/src/combined/ffmpeg/ff_audio_decoder.c +@@ -31,13 +31,20 @@ + #include <pthread.h> + #include <math.h> + +-#ifdef HAVE_FFMPEG_AVUTIL_H +-# include <avcodec.h> +-#else +-# include <libavcodec/avcodec.h> ++#if defined(HAVE_LIBAVUTIL_AVUTIL_H) ++# include <libavutil/avutil.h> ++#endif ++ ++#if defined(HAVE_LIBAVUTIL_MEM_H) + # include <libavutil/mem.h> + #endif + ++#if defined(HAVE_AVUTIL_AVCODEC_H) ++# include <libavcodec/avcodec.h> ++#else ++# include <avcodec.h> ++#endif ++ + #define LOG_MODULE "ffmpeg_audio_dec" + #define LOG_VERBOSE + /* +--- a/src/combined/ffmpeg/ffmpeg_compat.h ++++ b/src/combined/ffmpeg/ffmpeg_compat.h +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2000-2021 the xine project ++ * Copyright (C) 2000-2022 the xine project + * + * This file is part of xine, a unix video player. + * +@@ -25,22 +25,24 @@ + + #define XFF_INT_VERSION(major,minor,micro) ((major<<16)|(minor<<8)|micro) + +-#ifndef LIBAVCODEC_VERSION_INT +-# if defined(LIBAVCODEC_VERSION_MAJOR) && defined(LIBAVCODEC_VERSION_MINOR) +-# define LIBAVCODEC_VERSION_INT XFF_INT_VERSION(LIBAVCODEC_VERSION_MAJOR,LIBAVCODEC_VERSION_MINOR,0) +-# else +-# error ffmpeg headers must be included first ! +-# endif ++/** NOTE: since 2022-09-01, ffmpeg headers are more detached from each other. ++ * this goes that far: ++ * libavformat/avformat.h includes libavcodec/packet.h which uses ++ * (but not includes) libavutil/avutil.h :-/ */ ++ ++#if !defined(LIBAVUTIL_VERSION_INT) && defined(LIBAVUTIL_VERSION_MAJOR) && defined(LIBAVUTIL_VERSION_MINOR) ++# define LIBAVUTIL_VERSION_INT XFF_INT_VERSION(LIBAVUTIL_VERSION_MAJOR,LIBAVUTIL_VERSION_MINOR,0) ++#endif ++#if !defined(LIBAVUTIL_VERSION_INT) ++# error avutil.h must be included first ! + #endif + +-#ifndef LIBAVUTIL_VERSION_INT +-# if defined(LIBAVUTIL_VERSION_MAJOR) && defined(LIBAVUTIL_VERSION_MINOR) +-# define LIBAVUTIL_VERSION_INT XFF_INT_VERSION(LIBAVUTIL_VERSION_MAJOR,LIBAVUTIL_VERSION_MINOR,0) +-# else +-# error ffmpeg headers must be included first ! +-# endif ++#if !defined(LIBAVCODEC_VERSION_INT) && defined(LIBAVCODEC_VERSION_MAJOR) && defined(LIBAVCODEC_VERSION_MINOR) ++# define LIBAVCODEC_VERSION_INT XFF_INT_VERSION(LIBAVCODEC_VERSION_MAJOR,LIBAVCODEC_VERSION_MINOR,0) + #endif + ++#if defined(LIBAVCODEC_VERSION_INT) ++ + #if LIBAVCODEC_VERSION_INT >= XFF_INT_VERSION(52,0,0) + # define bits_per_sample bits_per_coded_sample + #endif +@@ -136,38 +138,6 @@ + # define XFF_VAAPI 2 /** << libavutil/hwcontext.h, libavutil/hwcontext_vaapi.h */ + #endif + +-#if LIBAVUTIL_VERSION_INT >= XFF_INT_VERSION(52,0,0) +-# define PIX_FMT_NONE AV_PIX_FMT_NONE +-# define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P +-# define PIX_FMT_YUVJ420P AV_PIX_FMT_YUVJ420P +-# define PIX_FMT_YUV444P AV_PIX_FMT_YUV444P +-# define PIX_FMT_YUVJ444P AV_PIX_FMT_YUVJ444P +-# define PIX_FMT_YUV410P AV_PIX_FMT_YUV410P +-# define PIX_FMT_YUV411P AV_PIX_FMT_YUV411P +-# define PIX_FMT_ARGB AV_PIX_FMT_ARGB +-# define PIX_FMT_BGRA AV_PIX_FMT_BGRA +-# define PIX_FMT_RGB24 AV_PIX_FMT_RGB24 +-# define PIX_FMT_BGR24 AV_PIX_FMT_BGR24 +-# define PIX_FMT_RGB555BE AV_PIX_FMT_RGB555BE +-# define PIX_FMT_RGB555LE AV_PIX_FMT_RGB555LE +-# define PIX_FMT_RGB565BE AV_PIX_FMT_RGB565BE +-# define PIX_FMT_RGB565LE AV_PIX_FMT_RGB565LE +-# define PIX_FMT_PAL8 AV_PIX_FMT_PAL8 +-# define PixelFormat AVPixelFormat +-/* video_out/video_out_vaapi */ +-# if LIBAVCODEC_VERSION_INT < XFF_INT_VERSION(59,0,100) /** << revise this */ +-# define PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI_VLD +-# define PIX_FMT_VAAPI_IDCT AV_PIX_FMT_VAAPI_IDCT +-# define PIX_FMT_VAAPI_MOCO AV_PIX_FMT_VAAPI_MOCO +-# else +-# define PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI +-# define PIX_FMT_VAAPI_IDCT AV_PIX_FMT_VAAPI +-# define PIX_FMT_VAAPI_MOCO AV_PIX_FMT_VAAPI +-# endif +- +-# define CODEC_FLAG_BITEXACT AV_CODEC_FLAG_BITEXACT +-#endif +- + #if LIBAVCODEC_VERSION_INT >= XFF_INT_VERSION(54,25,0) + /* dxr3/ffmpeg_encoder */ + # define CODEC_ID_MPEG1VIDEO AV_CODEC_ID_MPEG1VIDEO +@@ -194,10 +164,6 @@ + /* ff_*_decoder mapping is already handled by mkcodeclists.pl */ + #endif + +-#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +-# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 +-#endif +- + #if LIBAVCODEC_VERSION_INT >= XFF_INT_VERSION(55,0,100) + # define XFF_AV_BUFFER 1 + #endif +@@ -290,5 +256,51 @@ + # define XFF_AVCODEC_REGISTER_ALL() do {} while(0) + #endif + ++#if LIBAVCODEC_VERSION_INT < XFF_INT_VERSION(59,24,100) ++# define XFF_AUDIO_CHANNEL_LAYOUT 1 /* AVCodecContext.channels, .channel_leyout */ ++#else ++# define XFF_AUDIO_CHANNEL_LAYOUT 2 /* AVCodecContext.ch_layout.nb_channels, .ch_layout.u.mask */ ++#endif ++ ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 ++#endif ++ ++#if LIBAVUTIL_VERSION_INT >= XFF_INT_VERSION(52,0,0) ++# define PIX_FMT_NONE AV_PIX_FMT_NONE ++# define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P ++# define PIX_FMT_YUVJ420P AV_PIX_FMT_YUVJ420P ++# define PIX_FMT_YUV444P AV_PIX_FMT_YUV444P ++# define PIX_FMT_YUVJ444P AV_PIX_FMT_YUVJ444P ++# define PIX_FMT_YUV410P AV_PIX_FMT_YUV410P ++# define PIX_FMT_YUV411P AV_PIX_FMT_YUV411P ++# define PIX_FMT_ARGB AV_PIX_FMT_ARGB ++# define PIX_FMT_BGRA AV_PIX_FMT_BGRA ++# define PIX_FMT_RGB24 AV_PIX_FMT_RGB24 ++# define PIX_FMT_BGR24 AV_PIX_FMT_BGR24 ++# define PIX_FMT_RGB555BE AV_PIX_FMT_RGB555BE ++# define PIX_FMT_RGB555LE AV_PIX_FMT_RGB555LE ++# define PIX_FMT_RGB565BE AV_PIX_FMT_RGB565BE ++# define PIX_FMT_RGB565LE AV_PIX_FMT_RGB565LE ++# define PIX_FMT_PAL8 AV_PIX_FMT_PAL8 ++# define PixelFormat AVPixelFormat ++/* video_out/video_out_vaapi */ ++# if LIBAVCODEC_VERSION_INT < XFF_INT_VERSION(59,0,100) /** << revise this */ ++# define PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI_VLD ++# define PIX_FMT_VAAPI_IDCT AV_PIX_FMT_VAAPI_IDCT ++# define PIX_FMT_VAAPI_MOCO AV_PIX_FMT_VAAPI_MOCO ++# else ++# define PIX_FMT_VAAPI_VLD AV_PIX_FMT_VAAPI ++# define PIX_FMT_VAAPI_IDCT AV_PIX_FMT_VAAPI ++# define PIX_FMT_VAAPI_MOCO AV_PIX_FMT_VAAPI ++# endif ++ ++# define CODEC_FLAG_BITEXACT AV_CODEC_FLAG_BITEXACT ++#endif ++ ++#else /* defined(LIBAVCODEC_VERSION_INT) */ ++# error avcodec.h must be included first ! ++#endif /* defined(LIBAVCODEC_VERSION_INT) */ ++ + #endif /* XINE_AVCODEC_COMPAT_H */ + +--- a/src/combined/ffmpeg/ffmpeg_decoder.c ++++ b/src/combined/ffmpeg/ffmpeg_decoder.c 2022-09-13 23:43:40.255615724 -0300 +@@ -26,12 +26,20 @@ + + #include <pthread.h> + +-#ifdef HAVE_FFMPEG_AVUTIL_H +-# include <avcodec.h> +-#else +-# include <libavcodec/avcodec.h> ++#if defined(HAVE_LIBAVUTIL_AVUTIL_H) ++# include <libavutil/avutil.h> ++#endif ++ ++#if defined(HAVE_LIBAVUTIL_MEM_H) + # include <libavutil/mem.h> + #endif ++ ++#if defined(HAVE_AVUTIL_AVCODEC_H) ++# include <libavcodec/avcodec.h> ++#else ++# include <avcodec.h> ++#endif ++ + #ifdef HAVE_AVFORMAT + # include <libavformat/avformat.h> // av_register_all() + #endif +--- a/src/combined/ffmpeg/ff_video_decoder.c ++++ b/src/combined/ffmpeg/ff_video_decoder.c +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2001-2021 the xine project ++ * Copyright (C) 2001-2022 the xine project + * + * This file is part of xine, a free video player. + * +@@ -32,13 +32,20 @@ + #include <math.h> + #include <assert.h> + +-#ifdef HAVE_FFMPEG_AVUTIL_H +-# include <avcodec.h> +-#else +-# include <libavcodec/avcodec.h> ++#if defined(HAVE_LIBAVUTIL_AVUTIL_H) ++# include <libavutil/avutil.h> ++#endif ++ ++#if defined(HAVE_LIBAVUTIL_MEM_H) + # include <libavutil/mem.h> + #endif + ++#if defined(HAVE_AVUTIL_AVCODEC_H) ++# include <libavcodec/avcodec.h> ++#else ++# include <avcodec.h> ++#endif ++ + #define LOG_MODULE "ffmpeg_video_dec" + #define LOG_VERBOSE + /* +--- a/src/combined/ffmpeg/input_avio.c ++++ b/src/combined/ffmpeg/input_avio.c 2022-09-13 23:43:40.255615724 -0300 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2013-2020 the xine project ++ * Copyright (C) 2013-2022 the xine project + * Copyright (C) 2013-2020 Petri Hintukainen <phintuka@users.sourceforge.net> + * + * This file is part of xine, a free video player. +@@ -28,6 +28,8 @@ + #include <string.h> + #include <pthread.h> + ++#include <libavutil/avutil.h> ++#include <libavcodec/avcodec.h> + #include <libavformat/avio.h> + + #define LOG_MODULE "libavio" diff --git a/arch/tde-deps/xine-lib/PKGBUILD b/arch/tde-deps/xine-lib/PKGBUILD new file mode 100644 index 000000000..211202c63 --- /dev/null +++ b/arch/tde-deps/xine-lib/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer : Daniel Bermond <dbermond@archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> + +pkgname=xine-lib +pkgver=1.2.12 +pkgrel=4 +pkgdesc='Multimedia playback engine' +arch=('powerpc64le') +url='https://www.xine-project.org' +license=('GPL' 'LGPL') +depends=('ffmpeg' 'libjpeg-turbo' 'libnsl' 'libpng' 'libx11' 'libxcb' + 'libxext' 'libxinerama' 'libxv' 'libxvmc' 'zlib') +optdepends=('libdvdnav: for dvd plugin' + 'libdvdread: for spu and dxr3 plugins' + 'vcdimager: for vcd plugin' + 'glu: for opengl and vaapi plugins' + 'sdl: for sdl plugin' + 'wayland: for egl_wl plugin' + 'aalib: for aalib plugin' + 'a52dec: for a52 plugin' + 'faad2: for faad plugin' + 'flac: for flac plugin' + 'libdca: for dts (dca) plugin' + 'libmad: for mad (mp3) plugin' + 'libmpcdec: for mpc (musepack) plugin' + 'wavpack: for wavpack plugin' + 'gdk-pixbuf2: for gdk_pixbuf plugin' + 'imagemagick: for imagemagick plugin' + 'libcaca: for caca plugin' + 'libmng: for mng plugin' + 'libnfs: for nfs plugin' + 'libssh2: for ssh plugin' + 'smbclient: for samba plugin') +makedepends=('mesa' 'libdvdnav' 'libdvdread' 'vcdimager' 'glu' 'sdl' + 'wayland' 'aalib' 'a52dec' 'faad2' 'flac' 'libdca' 'libmad' + 'libmpcdec' 'wavpack' 'gdk-pixbuf2' 'imagemagick' 'libcaca' + 'libmng' 'libnfs' 'smbclient') +source=("https://downloads.sourceforge.net/project/xine/xine-lib/${pkgver}/xine-lib-${pkgver}.tar.xz" + '010-xine-lib-dav1d-1.0.0-support.patch' + '020-xine-lib-ffmpeg-5.1-fix.patch') +sha256sums=('d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098' + '9e41a7e49bc81d04d8f5014d5a4fcb4961eeb735eb6329a76ac24425fdafae06' + '36930d0973c71027175530e6911a9e9ad824107eedd519b01f375800f3f98822') + +prepare() { + patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-xine-lib-dav1d-1.0.0-support.patch" + patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/020-xine-lib-ffmpeg-5.1-fix.patch" +} + +build() { + cd "${pkgname}-${pkgver}" + ./autogen.sh \ + --prefix='/usr' \ + --enable-antialiasing \ + --with-external-dvdnav \ + --with-wavpack + sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" install +} diff --git a/arch/tde-deps/xscreensaver/LICENSE b/arch/tde-deps/xscreensaver/LICENSE new file mode 100644 index 000000000..406467cd4 --- /dev/null +++ b/arch/tde-deps/xscreensaver/LICENSE @@ -0,0 +1,10 @@ +/* xscreensaver, Copyright (c) 1991-2013 Jamie Zawinski <jwz@jwz.org> + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. No representations are made about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + */ diff --git a/arch/tde-deps/xscreensaver/PKGBUILD b/arch/tde-deps/xscreensaver/PKGBUILD new file mode 100644 index 000000000..bc8dd585a --- /dev/null +++ b/arch/tde-deps/xscreensaver/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Eric Bélanger <eric@archlinux.org> +# +# Note: Build for archlinuxpower with both gtk2 and gtk3 and without gdm + +pkgname=xscreensaver +pkgver=6.05.1 +pkgrel=2 +pkgdesc='Screen saver and locker for the X Window System' +url='https://www.jwz.org/xscreensaver/' +arch=('powerpc64le') +license=('BSD') +depends=( + 'gtk2' 'gtk3' 'glu' 'xorg-appres' 'libglvnd' 'libjpeg-turbo' 'libjpeg.so' + 'libsystemd.so' 'libx11' 'libxcrypt' 'libcrypt.so' 'libxext' 'libxft' 'libxi' + 'libxinerama' 'libxmu' 'libxrandr' 'libxt' 'libxxf86vm' 'perl-libwww' 'pam' + 'libpam.so' 'glibc' 'glib2' 'gdk-pixbuf2' 'gdk-pixbuf-xlib' +) +makedepends=('bc' 'intltool' 'libxpm' 'systemd' 'systemd-libs') +optdepends=('gdm: for login manager support') +backup=('etc/pam.d/xscreensaver') +source=(https://www.jwz.org/xscreensaver/${pkgname}-${pkgver}.tar.gz + LICENSE) +sha512sums=('c659a769ff71020b9f96b7e707bd1bcc667eb304179305d56b1be45eed095d650a8aa019890a0c5d444672f9dd68516c99c53b0df94cd96196d7f30a24b987e3' + '863c699479b2ec2775a0d1cba22e615929194a14af164b3513e46a0c04229da6547255a4da8f7f1bbb40906898c124ed3c9ec2436b76b62affcb62385af9783e') +b2sums=('97c16c9f0b2a0b4d00ddccd711b921ca683bd233bc3d07ecad38b68ff94b149a20512246dd6bae052323f00b1b433f56469c5638a031cbc65b61c2b84a0180e3' + 'cacb6ba39d6ecb8703ef5f5a7dc74de0ca805cce73b43a8b9b6b4c255c909aa9b5e692de76c2fbd4da26ce6efb5f2a46138c43b1b37f53cee6d20fd6ed41f4a9') + +build() { + cd ${pkgname}-${pkgver%.*} + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --without-setuid-hacks \ + --with-pam \ + --with-login-manager \ + --with-gtk \ + --with-gl \ + --without-gle \ + --with-pixbuf \ + --with-jpeg + make +} + +package() { + cd ${pkgname}-${pkgver%.*} + install -d "${pkgdir}/etc/pam.d" + make install_prefix="${pkgdir}" install + install -Dm 644 ../LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" + echo "NotShowIn=KDE;GNOME;" >> "${pkgdir}/usr/share/applications/xscreensaver-settings.desktop" +} + +# vim: ts=2 sw=2 et: diff --git a/arch/tde-deps/yaz/PKGBUILD b/arch/tde-deps/yaz/PKGBUILD new file mode 100644 index 000000000..ff7b13d86 --- /dev/null +++ b/arch/tde-deps/yaz/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Jaroslav Lichtblau <svetlemodry@archlinux.org> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Robert Emil Berge <filoktetes@linuxophic.org> + +pkgname=yaz +pkgver=5.32.0 +pkgrel=2 +pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" +arch=('powerpc64le') +url="https://www.indexdata.dk/yaz" +license=('BSD') +depends=('gnutls' 'libxslt' 'icu') +makedepends=('zsh') +changelog=$pkgname.changelog +source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) +sha256sums=('04d08c799d5ee56a2670e6ac0b42398d2ff956bd9bf144bfe9c4c30e557140e0') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + ./configure --prefix=/usr --enable-shared=yaz + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install + +#License + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/arch/tde-deps/yaz/yaz.changelog b/arch/tde-deps/yaz/yaz.changelog new file mode 100644 index 000000000..74eb77f79 --- /dev/null +++ b/arch/tde-deps/yaz/yaz.changelog @@ -0,0 +1,104 @@ +2022-03-21 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.31.1-1 + +2021-05-15 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.31.0-1 + +2020-07-06 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.30.3-1 + +2020-04-20 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.30.2-1 + +2020-03-23 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.30.0-1 + +2020-03-08 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.29.0-1 + +2019-12-11 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.28.0-1 + +2019-10-16 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.27.2-1 + +2018-12-04 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.27.1-1 + +2018-10-14 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.27.0-1 + +2018-07-15 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.26.1-1 + +2018-05-12 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.25.0-1 + +2017-09-06 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.23.1-1 + +2017-08-05 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.23.0-1 + +2017-05-30 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.22.0-1 + +2017-05-08 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.21.1-1 + +2017-04-06 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.21.0-1 + +2017-02-21 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.20.2-1 + +2017-01-10 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.20.0-1 + +2016-12-17 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.19.0-1 + +2016-11-06 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.18.0-2 readline 7.0 rebuild + +2016-10-17 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.18.0-1 + +2016-10-04 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.17.0-1 + +2016-04-30 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.16.0-1 + +2016-01-16 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.15.2-1 + +2015-12-04 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.15.1-1 + +2015-10-05 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.14.11-1 + +2014-12-30 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.7.2-1 + +2014-10-21 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.4.4-1 + +2014-05-25 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.1.1-1 + +2014-02-06 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.0.12-1 + +2013-10-25 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.0.9-1 + +2013-10-12 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 5.0.1-1 + +2013-04-20 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 4.2.54-1 + +2013-01-20 Jaroslav Lichtblau <svetlemodry@archlinux.org> + * yaz 4.2.49-1 diff --git a/arch/tde-devel/tde-kdbg/PKGBUILD b/arch/tde-devel/tde-kdbg/PKGBUILD new file mode 100644 index 000000000..0cdaef21c --- /dev/null +++ b/arch/tde-devel/tde-kdbg/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kdbg +_cat=applications/development/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Graphical debugger interface for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('df21d728078b10467d42d254c2822674') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-devel/tde-kdiff3/PKGBUILD b/arch/tde-devel/tde-kdiff3/PKGBUILD new file mode 100644 index 000000000..375937756 --- /dev/null +++ b/arch/tde-devel/tde-kdiff3/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kdiff3 +_cat=applications/development/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Compares and merges 2 or 3 files or directories" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('d49e20da294d237aad4c34a44627f1b2') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-devel/tde-kscope/PKGBUILD b/arch/tde-devel/tde-kscope/PKGBUILD new file mode 100644 index 000000000..70fd4aa56 --- /dev/null +++ b/arch/tde-devel/tde-kscope/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kscope +_cat=applications/development/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Source editing environment for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('8e7d0a372678c7f10040d66334c6ea70') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-devel/tde-kxmleditor/PKGBUILD b/arch/tde-devel/tde-kxmleditor/PKGBUILD new file mode 100644 index 000000000..9417575f4 --- /dev/null +++ b/arch/tde-devel/tde-kxmleditor/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kxmleditor +_cat=applications/development/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="XML Editor for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('4d7f63adfac2e91e9c2970a5b68963ca') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD index eeff69672..96e407f5b 100644 --- a/arch/tde-devel/tde-tdesdk/PKGBUILD +++ b/arch/tde-devel/tde-tdesdk/PKGBUILD @@ -1,46 +1,49 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdesdk -pkgver=14.0.10 +_mod=tdesdk +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdesdk' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-devel') pkgdesc="Trinity Desktop Development Tools" depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake' 'flex' 'subversion' 'pod2man') -provides=('tdesdk') -conflicts=('trinity-tdesdk' 'trinity-kdesdk') -replaces=('trinity-tdesdk') +makedepends=('tde-cmake-trinity' 'flex' 'subversion' 'pod2man') +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/tdesdk-trinity-${pkgver}.tar.xz") -md5sums=('5d117cbbe1cd938624656917646eebab') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('52a1bb25106157a3d3b1e984b57e3605') [ -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 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-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD index 56a4ecc2c..c809473b7 100644 --- a/arch/tde-devel/tde-tdevelop/PKGBUILD +++ b/arch/tde-devel/tde-tdevelop/PKGBUILD @@ -1,53 +1,51 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-tdevelop -pkgver=14.0.10 +_mod=tdevelop +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdevelop' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-devel') pkgdesc="Trinity Desktop Developer Tools" depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake' 'tde-tdesdk' 'subversion') -provides=('tdevelop') -conflicts=('trinity-tdevelop' 'trinity-kdevelop') -replaces=('trinity-tdevelop') +makedepends=('tde-cmake-trinity' 'tde-tdesdk' 'subversion') +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/tdevelop-trinity-${pkgver}.tar.xz" - 'bp000-ba5f58bf.diff') -md5sums=('ec9eb0b745d984bf77f74bdc959d5fc8' - 'e7519ea06bd63b4fc9aa7e0ac5076576') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('721736cb0cfe07e6a966ac4bb20f022d') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} - patch -p1 < ${srcdir}/bp000-ba5f58bf.diff - - cd $srcdir 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_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=$TDEDIR \ + -DBUILD_ALL=ON \ -DWITH_BUILDTOOL_ALL=ON \ -DWITH_LANGUAGE_ALL=ON \ - -DWITH_VCS_ALL=ON \ - -DBUILD_ALL=ON + -DWITH_VCS_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-devel/tde-tdevelop/bp000-ba5f58bf.diff b/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff deleted file mode 100644 index 9cd176d3a..000000000 --- a/arch/tde-devel/tde-tdevelop/bp000-ba5f58bf.diff +++ /dev/null @@ -1,1238 +0,0 @@ -From ba5f58bf38a62eb83990951168951274c96a8e24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr> -Date: Sun, 28 Feb 2021 00:15:56 +0000 -Subject: Fix ftbfs on Fedora 34 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -error: reference to ‘data’ is ambiguous - -Signed-off-by: François Andriot <francois.andriot@free.fr> ---- - buildtools/ada/adaproject_part.cpp | 6 +++--- - buildtools/ant/antprojectpart.cpp | 6 +++--- - buildtools/autotools/autoprojectpart.cpp | 6 +++--- - buildtools/custommakefiles/customprojectpart.cpp | 6 +++--- - buildtools/pascal/pascalproject_part.cpp | 6 +++--- - buildtools/qmake/trollprojectpart.cpp | 6 +++--- - buildtools/script/scriptprojectpart.cpp | 6 +++--- - editors/editor-chooser/editorchooser_part.cpp | 6 +++--- - embedded/visualboyadvance/visualboyadvance_part.cpp | 6 +++--- - languages/ada/adasupportpart.cpp | 6 +++--- - languages/bash/bashsupport_part.cpp | 6 +++--- - languages/cpp/app_templates/kdevpart/kdevpart_part.cpp | 6 +++--- - languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp | 6 +++--- - languages/cpp/cppsupportfactory.cpp | 6 +++--- - languages/csharp/csharpsupportpart.cpp | 6 +++--- - languages/fortran/fortransupportpart.cpp | 6 +++--- - languages/java/javasupportfactory.cpp | 6 +++--- - languages/kjssupport/kjssupport_part.cpp | 6 +++--- - languages/pascal/pascalsupport_part.cpp | 6 +++--- - languages/perl/perlsupportpart.cpp | 6 +++--- - languages/php/phpsupportpart.cpp | 6 +++--- - languages/python/pythonsupportpart.cpp | 6 +++--- - languages/ruby/rubysupport_part.cpp | 6 +++--- - languages/sql/sqlsupport_part.cpp | 6 +++--- - lib/interfaces/kdevgenericfactory.h | 8 ++++---- - parts/astyle/astyle_part.cpp | 6 +++--- - parts/bookmarks/bookmarks_part.cpp | 6 +++--- - parts/classview/classviewpart.cpp | 8 ++++---- - parts/ctags2/ctags2_part.cpp | 6 +++--- - parts/diff/diffpart.cpp | 6 +++--- - parts/distpart/distpart_part.cpp | 6 +++--- - parts/documentation/documentation_part.cpp | 6 +++--- - parts/doxygen/doxygenpart.cpp | 6 +++--- - parts/filecreate/filecreate_part.cpp | 8 ++++---- - parts/fileselector/fileselector_part.cpp | 6 +++--- - parts/fileview/filegroupspart.cpp | 6 +++--- - parts/fileview/fileviewpart.cpp | 6 +++--- - parts/filter/filterpart.cpp | 6 +++--- - parts/fullscreen/fullscreen_part.cpp | 6 +++--- - parts/outputviews/appoutputviewpart.cpp | 6 +++--- - parts/outputviews/makeviewpart.cpp | 6 +++--- - parts/partexplorer/partexplorer_plugin.cpp | 6 +++--- - parts/quickopen/quickopen_part.cpp | 6 +++--- - parts/regexptest/regexptestpart.cpp | 6 +++--- - parts/scripting/scriptingpart.cpp | 6 +++--- - parts/snippet/snippet_part.cpp | 6 +++--- - parts/texttools/texttoolspart.cpp | 6 +++--- - parts/tipofday/tipofday_part.cpp | 6 +++--- - parts/tools/tools_part.cpp | 6 +++--- - parts/uimode/uichooser_part.cpp | 6 +++--- - parts/valgrind/valgrind_part.cpp | 6 +++--- - parts/vcsmanager/vcsmanagerpart.cpp | 6 +++--- - vcs/clearcase/clearcasepart.cpp | 6 +++--- - vcs/cvsservice/cvspart.cpp | 6 +++--- - vcs/perforce/perforcepart.cpp | 6 +++--- - vcs/subversion/subversion_part.cpp | 6 +++--- - 56 files changed, 171 insertions(+), 171 deletions(-) - -diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp -index 5eacf5d0..f778c9b2 100644 ---- a/buildtools/ada/adaproject_part.cpp -+++ b/buildtools/ada/adaproject_part.cpp -@@ -43,11 +43,11 @@ - #include "adaglobaloptionsdlg.h" - - typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory; --static const KDevPluginInfo data("kdevadaproject"); --K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevadaproject"); -+K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( pluginData ) ) - - AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) -- :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) -+ :KDevBuildTool(&pluginData, parent, name ? name : "AdaProjectPart" ) - { - setInstance(AdaProjectFactory::instance()); - setXMLFile("kdevadaproject.rc"); -diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp -index a9e5a2d4..f53357da 100644 ---- a/buildtools/ant/antprojectpart.cpp -+++ b/buildtools/ant/antprojectpart.cpp -@@ -35,8 +35,8 @@ - - - typedef KDevGenericFactory<AntProjectPart> AntProjectFactory; --static const KDevPluginInfo data("kdevantproject"); --K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) -+static const KDevPluginInfo pluginData("kdevantproject"); -+K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( pluginData )) - - - AntOptions::AntOptions() -@@ -46,7 +46,7 @@ AntOptions::AntOptions() - - - AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") -+ : KDevBuildTool(&pluginData, parent, name ? name : "AntProjectPart") - { - setInstance(AntProjectFactory::instance()); - -diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp -index 014e8e2f..c1008072 100644 ---- a/buildtools/autotools/autoprojectpart.cpp -+++ b/buildtools/autotools/autoprojectpart.cpp -@@ -62,12 +62,12 @@ - #define RUN_OPTIONS 2 - #define MAKE_OPTIONS 3 - --static const KDevPluginInfo data("kdevautoproject"); -+static const KDevPluginInfo pluginData("kdevautoproject"); - --K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( pluginData ) ) - - AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) -- : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") -+ : KDevBuildTool(&pluginData, parent, name ? name : "AutoProjectPart") - , m_lastCompilationFailed(false) - { - setInstance(AutoProjectFactory::instance()); -diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp -index f61782ae..cbbb4315 100644 ---- a/buildtools/custommakefiles/customprojectpart.cpp -+++ b/buildtools/custommakefiles/customprojectpart.cpp -@@ -62,11 +62,11 @@ - #include <kdevplugininfo.h> - - typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory; --static const KDevPluginInfo data( "kdevcustomproject" ); --K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) -+static const KDevPluginInfo pluginData( "kdevcustomproject" ); -+K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( pluginData ) ) - - CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) -- : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) -+ : KDevBuildTool( &pluginData, parent, name ? name : "CustomProjectPart" ) - , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) - { - setInstance( CustomProjectFactory::instance() ); -diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp -index 98127f0a..d4670adb 100644 ---- a/buildtools/pascal/pascalproject_part.cpp -+++ b/buildtools/pascal/pascalproject_part.cpp -@@ -49,11 +49,11 @@ - #include <kdevplugininfo.h> - - typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory; --static const KDevPluginInfo data("kdevpascalproject"); --K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevpascalproject"); -+K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( pluginData ) ) - - PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) -- :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) -+ :KDevBuildTool(&pluginData, parent, name ? name : "PascalProjectPart" ) - { - setInstance(PascalProjectFactory::instance()); - setXMLFile("kdevpascalproject.rc"); -diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp -index fe16d538..82bb7416 100644 ---- a/buildtools/qmake/trollprojectpart.cpp -+++ b/buildtools/qmake/trollprojectpart.cpp -@@ -57,11 +57,11 @@ - #include <urlutil.h> - - typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; --static const KDevPluginInfo data("kdevtrollproject"); --K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevtrollproject"); -+K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( pluginData ) ) - - TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) -- : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") -+ : KDevBuildTool(&pluginData, parent, name ? name : "TrollProjectPart") - { - setInstance(TrollProjectFactory::instance()); - -diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp -index 8f6b5fb4..42ce8935 100644 ---- a/buildtools/script/scriptprojectpart.cpp -+++ b/buildtools/script/scriptprojectpart.cpp -@@ -37,11 +37,11 @@ - #include "kdevplugininfo.h" - - typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; --static const KDevPluginInfo data("kdevscriptproject"); --K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevscriptproject"); -+K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( pluginData ) ) - - ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") -+ : KDevBuildTool(&pluginData, parent, name ? name : "ScriptProjectPart") - { - setInstance(ScriptProjectFactory::instance()); - -diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp -index a9a4339a..c700823d 100644 ---- a/editors/editor-chooser/editorchooser_part.cpp -+++ b/editors/editor-chooser/editorchooser_part.cpp -@@ -13,11 +13,11 @@ - #include "editorchooser_widget.h" - - typedef KDevGenericFactory<EditorChooserPart> EditorChooserFactory; --static const KDevPluginInfo data("kdeveditorchooser"); --K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) ) -+static const KDevPluginInfo pluginData("kdeveditorchooser"); -+K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( pluginData ) ) - - EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "EditorChooserPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "EditorChooserPart") - { - setInstance(EditorChooserFactory::instance()); - -diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp -index 6abe66c5..effee085 100644 ---- a/embedded/visualboyadvance/visualboyadvance_part.cpp -+++ b/embedded/visualboyadvance/visualboyadvance_part.cpp -@@ -20,11 +20,11 @@ - using namespace VisualBoyAdvance; - - typedef KDevGenericFactory<VisualBoyAdvancePart> VisualBoyAdvanceFactory; --static const KDevPluginInfo data("kdevvisualboyadvance"); --K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevvisualboyadvance"); -+K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( pluginData ) ) - - VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name){ -+ : KDevPlugin(&pluginData, parent, name){ - setInstance(VisualBoyAdvanceFactory::instance()); - - setXMLFile("kdevpart_visualboyadvance.rc"); -diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp -index 0d87f0a7..1ca3abfd 100644 ---- a/languages/ada/adasupportpart.cpp -+++ b/languages/ada/adasupportpart.cpp -@@ -40,8 +40,8 @@ enum { KDEV_PCS_VERSION = 6 }; - - typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory; - --static const KDevPluginInfo data("kdevadasupport"); --K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data)) -+static const KDevPluginInfo pluginData("kdevadasupport"); -+K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (pluginData)) - - - struct AdaSupportPartData { -@@ -51,7 +51,7 @@ struct AdaSupportPartData { - }; - - AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) -+ : KDevLanguageSupport (&pluginData, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) - { - setInstance (AdaSupportPartFactory::instance ()); - -diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp -index 7e30b913..ca289234 100644 ---- a/languages/bash/bashsupport_part.cpp -+++ b/languages/bash/bashsupport_part.cpp -@@ -33,11 +33,11 @@ - #include <codemodel.h> - - typedef KDevGenericFactory<BashSupportPart> BashSupportFactory; --static const KDevPluginInfo data("kdevbashsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevbashsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( pluginData ) ) - - BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& ) --: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) -+: KDevLanguageSupport (&pluginData, parent, name ? name : "BashSupportPart" ) - { - setInstance(BashSupportFactory::instance()); - setXMLFile("kdevbashsupport.rc"); -diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp -index aa950c8a..6a2559ba 100644 ---- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp -+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp -@@ -22,14 +22,14 @@ - #include "%{APPNAMELC}projectconfig.h" - - typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; --KDevPluginInfo data("kdev%{APPNAMELC}"); --K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); -+KDevPluginInfo pluginData("kdev%{APPNAMELC}"); -+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) ); - - #define GLOBALDOC_OPTIONS 1 - #define PROJECTDOC_OPTIONS 2 - - %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) -- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") -+ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part") - { - setInstance(%{APPNAME}Factory::instance()); - setXMLFile("kdev%{APPNAMELC}.rc"); -diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp -index aa950c8a..6a2559ba 100644 ---- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp -+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp -@@ -22,14 +22,14 @@ - #include "%{APPNAMELC}projectconfig.h" - - typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; --KDevPluginInfo data("kdev%{APPNAMELC}"); --K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); -+KDevPluginInfo pluginData("kdev%{APPNAMELC}"); -+K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( pluginData ) ); - - #define GLOBALDOC_OPTIONS 1 - #define PROJECTDOC_OPTIONS 2 - - %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) -- : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") -+ : KDevPlugin(&pluginData, parent, name ? name : "%{APPNAME}Part") - { - setInstance(%{APPNAME}Factory::instance()); - setXMLFile("kdev%{APPNAMELC}.rc"); -diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp -index 5d11ab04..cf5ff24a 100644 ---- a/languages/cpp/cppsupportfactory.cpp -+++ b/languages/cpp/cppsupportfactory.cpp -@@ -16,10 +16,10 @@ - - K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory ) - --static const KDevPluginInfo data("kdevcppsupport"); -+static const KDevPluginInfo pluginData("kdevcppsupport"); - - CppSupportFactory::CppSupportFactory() --: KDevGenericFactory<CppSupportPart>( data ) -+: KDevGenericFactory<CppSupportPart>( pluginData ) - { - } - -@@ -35,5 +35,5 @@ TDEInstance *CppSupportFactory::createInstance() - - const KDevPluginInfo * CppSupportFactory::info() - { -- return &data; -+ return &pluginData; - } -diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp -index 6da33030..8ecb44eb 100644 ---- a/languages/csharp/csharpsupportpart.cpp -+++ b/languages/csharp/csharpsupportpart.cpp -@@ -45,11 +45,11 @@ - //#include "programmingbycontract.h" - - typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory; --static const KDevPluginInfo data("kdevcsharpsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevcsharpsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( pluginData ) ) - - CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") -+ : KDevLanguageSupport(&pluginData, parent, name ? name : "CSharpSupportPart") - { - setInstance(CSharpSupportFactory::instance()); - -diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp -index 4f749ed3..170ff230 100644 ---- a/languages/fortran/fortransupportpart.cpp -+++ b/languages/fortran/fortransupportpart.cpp -@@ -45,11 +45,11 @@ - - - typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory; --static const KDevPluginInfo data("kdevfortransupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevfortransupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( pluginData ) ) - - FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") -+ : KDevLanguageSupport(&pluginData, parent, name ? name : "FortranSupportPart") - { - setInstance(FortranSupportFactory::instance()); - -diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp -index 94e435f2..299e283f 100644 ---- a/languages/java/javasupportfactory.cpp -+++ b/languages/java/javasupportfactory.cpp -@@ -14,11 +14,11 @@ - #include <kdevplugininfo.h> - #include "javasupportfactory.h" - --static const KDevPluginInfo data("kdevjavasupport"); -+static const KDevPluginInfo pluginData("kdevjavasupport"); - K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory ) - - JavaSupportFactory::JavaSupportFactory() -- : KDevGenericFactory<JavaSupportPart>( data ) -+ : KDevGenericFactory<JavaSupportPart>( pluginData ) - { - } - -@@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance() - - const KDevPluginInfo *JavaSupportFactory::info() - { -- return &data; -+ return &pluginData; - } - -diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp -index 5a00e9c6..71c680b4 100644 ---- a/languages/kjssupport/kjssupport_part.cpp -+++ b/languages/kjssupport/kjssupport_part.cpp -@@ -50,8 +50,8 @@ - #include "subclassingdlg.h" - - typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory; --static const KDevPluginInfo data("kdevkjssupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) ); -+static const KDevPluginInfo pluginData("kdevkjssupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( pluginData ) ); - - - class typeProperty -@@ -63,7 +63,7 @@ class typeProperty - }; - - kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& ) --: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) -+: KDevLanguageSupport(&pluginData, parent, name ? name : "kjsSupportPart" ) - { - setInstance(kjsSupportFactory::instance()); - setXMLFile("kdevkjssupport.rc"); -diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp -index a61ab6a0..90532c22 100644 ---- a/languages/pascal/pascalsupport_part.cpp -+++ b/languages/pascal/pascalsupport_part.cpp -@@ -44,11 +44,11 @@ struct PascalSupportPartData{ - }; - - typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory; --static const KDevPluginInfo data("kdevpascalsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevpascalsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( pluginData ) ) - - PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), -+ : KDevLanguageSupport(&pluginData, parent, name ? name : "KDevPascalSupport" ), - d( new PascalSupportPartData() ) - { - setInstance(PascalSupportFactory::instance()); -diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp -index 3236e72e..1bcbb96b 100644 ---- a/languages/perl/perlsupportpart.cpp -+++ b/languages/perl/perlsupportpart.cpp -@@ -45,11 +45,11 @@ - //#include "programmingbycontract.h" - - typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory; --static const KDevPluginInfo data("kdevperlsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevperlsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( pluginData ) ) - - PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") -+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PerlSupportPart") - { - setInstance(PerlSupportFactory::instance()); - -diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp -index c189cc5c..252b2167 100644 ---- a/languages/php/phpsupportpart.cpp -+++ b/languages/php/phpsupportpart.cpp -@@ -66,11 +66,11 @@ - - using namespace std; - --static const KDevPluginInfo data("kdevphpsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevphpsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( pluginData ) ) - - PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") -+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PHPSupportPart") - { - m_htmlView = 0; - m_parser = 0; -diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp -index e7529c2f..68baf71e 100644 ---- a/languages/python/pythonsupportpart.cpp -+++ b/languages/python/pythonsupportpart.cpp -@@ -39,11 +39,11 @@ - #include "pythonimplementationwidget.h" - - typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory; --static const KDevPluginInfo data("kdevpythonsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevpythonsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( pluginData ) ) - - PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart") -+ : KDevLanguageSupport(&pluginData, parent, name ? name : "PythonSupportPart") - { - setInstance(PythonSupportFactory::instance()); - -diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp -index e61d7cef..db9576b3 100644 ---- a/languages/ruby/rubysupport_part.cpp -+++ b/languages/ruby/rubysupport_part.cpp -@@ -38,11 +38,11 @@ - #include <codemodel_utils.h> - - typedef KDevGenericFactory<RubySupportPart> RubySupportFactory; --static const KDevPluginInfo data("kdevrubysupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevrubysupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( pluginData ) ) - - RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& ) -- : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) -+ : KDevLanguageSupport (&pluginData, parent, name ? name : "RubySupportPart" ) - { - setInstance(RubySupportFactory::instance()); - setXMLFile("kdevrubysupport.rc"); -diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp -index e676cee5..96e8ed4f 100644 ---- a/languages/sql/sqlsupport_part.cpp -+++ b/languages/sql/sqlsupport_part.cpp -@@ -30,11 +30,11 @@ - #include "domutil.h" - - typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory; --static const KDevPluginInfo data("kdevsqlsupport"); --K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevsqlsupport"); -+K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( pluginData ) ) - - SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) -- : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) -+ : KDevLanguageSupport ( &pluginData, parent, name ? name : "SQLSupportPart" ) - { - setInstance( SQLSupportFactory::instance() ); - setXMLFile( "kdevsqlsupport.rc" ); -diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h -index 6f8d3dc9..7bca8db4 100644 ---- a/lib/interfaces/kdevgenericfactory.h -+++ b/lib/interfaces/kdevgenericfactory.h -@@ -33,7 +33,7 @@ to create factories for TDevelop plugins. For example, for DummyPlugin - the factory can be created (in dummyplugin.cpp file) as: - @code - typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory; --K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) ) - @endcode - Data should be a const static object. This way it complies with the requirements - for data objecs of KDevGenericFactory constructor. -@@ -47,12 +47,12 @@ For example, dummyplugin.cpp file could contain: - @code - #include <kdevplugininfo.h> - --static const KDevPluginInfo data("KDevDummyPlugin"); -+static const KDevPluginInfo pluginData("KDevDummyPlugin"); - typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory; --K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( pluginData ) ) - - DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) -- :KDevPlugin(&data, parent, name) -+ :KDevPlugin(&pluginData, parent, name) - { - } - @endcode -diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp -index f5b5e2e7..6f9198b0 100644 ---- a/parts/astyle/astyle_part.cpp -+++ b/parts/astyle/astyle_part.cpp -@@ -33,7 +33,7 @@ - #include "astyle_widget.h" - #include "astyle_adaptor.h" - --static const KDevPluginInfo data("kdevastyle"); -+static const KDevPluginInfo pluginData("kdevastyle"); - - namespace { - const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; -@@ -41,10 +41,10 @@ namespace { - - - typedef KDevGenericFactory<AStylePart> AStyleFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( pluginData ) ) - - AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) -- : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") -+ : KDevSourceFormatter(&pluginData, parent, name ? name : "AStylePart") - { - setInstance(AStyleFactory::instance()); - -diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp -index 2d5a0a10..04fee8d7 100644 ---- a/parts/bookmarks/bookmarks_part.cpp -+++ b/parts/bookmarks/bookmarks_part.cpp -@@ -41,11 +41,11 @@ - #define BOOKMARKSETTINGSPAGE 1 - - typedef KDevGenericFactory<BookmarksPart> BookmarksFactory; --static const KDevPluginInfo data("kdevbookmarks"); --K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevbookmarks"); -+K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( pluginData ) ) - - BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) -- : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) -+ : KDevPlugin(&pluginData, parent, name ? name : "BookmarksPart" ) - { - setInstance(BookmarksFactory::instance()); - -diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp -index 92e26bd0..d068adaa 100644 ---- a/parts/classview/classviewpart.cpp -+++ b/parts/classview/classviewpart.cpp -@@ -139,12 +139,12 @@ class FunctionCompletion : public CustomCompleter { - - - typedef KDevGenericFactory<ClassViewPart> ClassViewFactory; --static const KDevPluginInfo data("kdevclassview"); --K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevclassview"); -+K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( pluginData ) ) - - ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) -- :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), -- KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), -+ :/// KDevPlugin( &pluginData, parent, name ? name : "ClassViewPart" ), -+ KDevCodeBrowserFrontend( &pluginData, parent, name ? name : "ClassViewPart" ), - m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) - { - setInstance(ClassViewFactory::instance()); -diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp -index 92dd4dc7..1333ac54 100644 ---- a/parts/ctags2/ctags2_part.cpp -+++ b/parts/ctags2/ctags2_part.cpp -@@ -55,11 +55,11 @@ namespace ctags - } - - typedef KDevGenericFactory<CTags2Part> CTags2Factory; --static const KDevPluginInfo data("kdevctags2"); --K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) -+static const KDevPluginInfo pluginData("kdevctags2"); -+K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( pluginData ) ) - - CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) -- : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) -+ : KDevPlugin(&pluginData, parent, name ? name : "ctags2Part" ) - { - setInstance(CTags2Factory::instance()); - setXMLFile("kdevpart_ctags2.rc"); -diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp -index 01c703d0..eb2063c4 100644 ---- a/parts/diff/diffpart.cpp -+++ b/parts/diff/diffpart.cpp -@@ -36,13 +36,13 @@ - #include "diffdlg.h" - #include "diffwidget.h" - --static const KDevPluginInfo data("kdevdiff"); -+static const KDevPluginInfo pluginData("kdevdiff"); - - typedef KDevGenericFactory<DiffPart> DiffFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( pluginData ) ) - - DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) -+ : KDevDiffFrontend(&pluginData, parent, name ? name : "DiffPart"), proc(0) - { - setInstance(DiffFactory::instance()); - setXMLFile("kdevdiff.rc"); -diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp -index e8a3e11a..fd235a0a 100644 ---- a/parts/distpart/distpart_part.cpp -+++ b/parts/distpart/distpart_part.cpp -@@ -34,11 +34,11 @@ - #include <kdialogbase.h> - - typedef KDevGenericFactory<DistpartPart> DistpartFactory; --static const KDevPluginInfo data("kdevdistpart"); --K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevdistpart"); -+K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( pluginData ) ) - - DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "DistpartPart") { -+ : KDevPlugin(&pluginData, parent, name ? name : "DistpartPart") { - - kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; - setInstance(DistpartFactory::instance()); -diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp -index 3b9e9b78..1d284a64 100644 ---- a/parts/documentation/documentation_part.cpp -+++ b/parts/documentation/documentation_part.cpp -@@ -72,13 +72,13 @@ - #define GLOBALDOC_OPTIONS 1 - #define PROJECTDOC_OPTIONS 2 - --static const KDevPluginInfo data("kdevdocumentation"); -+static const KDevPluginInfo pluginData("kdevdocumentation"); - - typedef KDevGenericFactory<DocumentationPart> DocumentationFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( pluginData ) ) - - DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) -- :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), -+ :KDevPlugin(&pluginData, parent, name ? name : "DocumentationPart" ), - m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) - { - setInstance(DocumentationFactory::instance()); -diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp -index d965d98b..36d41e8d 100644 ---- a/parts/doxygen/doxygenpart.cpp -+++ b/parts/doxygen/doxygenpart.cpp -@@ -48,11 +48,11 @@ - #define PROJECTOPTIONS 1 - - typedef KDevGenericFactory<DoxygenPart> DoxygenFactory; --static const KDevPluginInfo data("kdevdoxygen"); --K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevdoxygen"); -+K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( pluginData ) ) - - DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) -+ : KDevPlugin(&pluginData, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) - { - setInstance(DoxygenFactory::instance()); - setXMLFile("kdevdoxygen.rc"); -diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp -index 1c371177..a1529097 100644 ---- a/parts/filecreate/filecreate_part.cpp -+++ b/parts/filecreate/filecreate_part.cpp -@@ -54,16 +54,16 @@ - - #include "config.h" - --static const KDevPluginInfo data("kdevfilecreate"); -+static const KDevPluginInfo pluginData("kdevfilecreate"); - - typedef KDevGenericFactory<FileCreatePart> FileCreateFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( pluginData ) ) - - using namespace FileCreate; - - FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) --// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) -- : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) -+// : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) -+ : KDevCreateFile(&pluginData, parent, name ? name : "FileCreatePart"), m_subPopups(0) - { - setInstance(FileCreateFactory::instance()); - setXMLFile("kdevpart_filecreate.rc"); -diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp -index b5f9961a..de9b5fef 100644 ---- a/parts/fileselector/fileselector_part.cpp -+++ b/parts/fileselector/fileselector_part.cpp -@@ -31,11 +31,11 @@ - #include "fileselector_widget.h" - - typedef KDevGenericFactory<FileSelectorPart> FileSelectorFactory; --static const KDevPluginInfo data("kdevfileselector"); --K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevfileselector"); -+K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( pluginData ) ) - - FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "FileSelectorPart") - { - setInstance(FileSelectorFactory::instance()); - -diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp -index 77fc9646..91b1a0bc 100644 ---- a/parts/fileview/filegroupspart.cpp -+++ b/parts/fileview/filegroupspart.cpp -@@ -33,11 +33,11 @@ - #define FILEGROUPS_OPTIONS 1 - - typedef KDevGenericFactory<FileGroupsPart> FileGroupsFactory; --static const KDevPluginInfo data("kdevfilegroups"); --K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevfilegroups"); -+K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( pluginData ) ) - - FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "FileGroupsPart") - { - deleteRequested = false; - setInstance(FileGroupsFactory::instance()); -diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp -index 414cea52..25aa8f62 100644 ---- a/parts/fileview/fileviewpart.cpp -+++ b/parts/fileview/fileviewpart.cpp -@@ -50,15 +50,15 @@ VCSColors FileViewPart::vcsColors; - /////////////////////////////////////////////////////////////////////////////// - - typedef KDevGenericFactory<FileViewPart> FileViewFactory; --static const KDevPluginInfo data("kdevfileview"); --K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevfileview"); -+K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( pluginData ) ) - - /////////////////////////////////////////////////////////////////////////////// - // class FileTreeWidget - /////////////////////////////////////////////////////////////////////////////// - - FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "FileViewPart"), -+ : KDevPlugin(&pluginData, parent, name ? name : "FileViewPart"), - m_widget( 0 ) - { - setInstance( FileViewFactory::instance() ); -diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp -index 5ebd265e..3a1351ad 100644 ---- a/parts/filter/filterpart.cpp -+++ b/parts/filter/filterpart.cpp -@@ -26,11 +26,11 @@ - #include "shellinsertdlg.h" - #include "kdevfilterIface.h" - --static const KDevPluginInfo data("kdevfilter"); --K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevfilter"); -+K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( pluginData ) ) - - FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "FilterPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "FilterPart") - { - setInstance(FilterFactory::instance()); - setXMLFile("kdevfilter.rc"); -diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp -index 0bdc714f..98581a9c 100644 ---- a/parts/fullscreen/fullscreen_part.cpp -+++ b/parts/fullscreen/fullscreen_part.cpp -@@ -22,13 +22,13 @@ - - #include "fullscreen_part.h" - --static const KDevPluginInfo data("kdevfullscreen"); -+static const KDevPluginInfo pluginData("kdevfullscreen"); - - typedef KDevGenericFactory<FullScreenPart> FullScreenFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( pluginData ) ) - - FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) -- : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) -+ : KDevPlugin(&pluginData, parent, name ? name : "FullScreenPart" ) - { - setInstance(FullScreenFactory::instance()); - // const TDEAboutData &abdata1 = *(info()); -diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp -index 3a0e0e7d..3d8b47bf 100644 ---- a/parts/outputviews/appoutputviewpart.cpp -+++ b/parts/outputviews/appoutputviewpart.cpp -@@ -29,12 +29,12 @@ - #include "kdevpartcontroller.h" - #include "settings.h" - --static const KDevPluginInfo data("kdevappoutputview"); -+static const KDevPluginInfo pluginData("kdevappoutputview"); - typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) ) - - AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") -+ : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart") - { - setInstance(AppViewFactory::instance()); - -diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp -index 8b441e94..2df7d384 100644 ---- a/parts/outputviews/makeviewpart.cpp -+++ b/parts/outputviews/makeviewpart.cpp -@@ -26,12 +26,12 @@ - - #include "makewidget.h" - --static const KDevPluginInfo data("kdevmakeview"); -+static const KDevPluginInfo pluginData("kdevmakeview"); - typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) ) - - MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevMakeFrontend(&data, parent, name) -+ : KDevMakeFrontend(&pluginData, parent, name) - { - setInstance(MakeViewFactory::instance()); - -diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp -index d5240edb..57b1cd58 100644 ---- a/parts/partexplorer/partexplorer_plugin.cpp -+++ b/parts/partexplorer/partexplorer_plugin.cpp -@@ -23,13 +23,13 @@ - - #include "partexplorerform.h" - --static const KDevPluginInfo data("kdevpartexplorer"); -+static const KDevPluginInfo pluginData("kdevpartexplorer"); - - typedef KDevGenericFactory<PartExplorerPlugin> PartExplorerPluginFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( pluginData ) ) - - PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) -- : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) -+ : KDevPlugin( &pluginData, parent, name ? name : "PartExplorerPlugin" ) - { - // we need an instance - setInstance( PartExplorerPluginFactory::instance() ); -diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp -index 4d316e68..78c97eb6 100644 ---- a/parts/quickopen/quickopen_part.cpp -+++ b/parts/quickopen/quickopen_part.cpp -@@ -44,13 +44,13 @@ - #include "kdeveditorutil.h" - - typedef KDevGenericFactory<QuickOpenPart> QuickOpenFactory; --static const KDevPluginInfo data("kdevquickopen"); --K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevquickopen"); -+K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( pluginData ) ) - - using namespace KTextEditor; - - QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringList& ) -- : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) -+ : KDevQuickOpen(&pluginData, parent, name ? name : "QuickOpenPart" ) - { - setInstance(QuickOpenFactory::instance()); - setXMLFile("kdevpart_quickopen.rc"); -diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp -index 6c45a492..1e16d144 100644 ---- a/parts/regexptest/regexptestpart.cpp -+++ b/parts/regexptest/regexptestpart.cpp -@@ -19,13 +19,13 @@ - #include "kdevcore.h" - #include "regexptestdlg.h" - --static const KDevPluginInfo data("kdevregexptest"); -+static const KDevPluginInfo pluginData("kdevregexptest"); - - typedef KDevGenericFactory<RegexpTestPart> RegexpTestFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( pluginData ) ) - - RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "RegexpTestPart") - { - setInstance(RegexpTestFactory::instance()); - setXMLFile("kdevregexptest.rc"); -diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp -index 80a33c9e..d0558b79 100644 ---- a/parts/scripting/scriptingpart.cpp -+++ b/parts/scripting/scriptingpart.cpp -@@ -41,14 +41,14 @@ - #include "tdescriptactionmanager.h" - - typedef KDevGenericFactory<scriptingPart> scriptingFactory; --KDevPluginInfo data("kdevscripting"); --K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) -+KDevPluginInfo pluginData("kdevscripting"); -+K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( pluginData ) ) - - #define GLOBALDOC_OPTIONS 1 - #define PROJECTDOC_OPTIONS 2 - - scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) -- : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) -+ : KDevPlugin(&pluginData, parent, name ? name : "scriptingPart"), m_scripts(0L) - { - setInstance(scriptingFactory::instance()); - setXMLFile("kdevscripting.rc"); -diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp -index 82969151..1c650ce2 100644 ---- a/parts/snippet/snippet_part.cpp -+++ b/parts/snippet/snippet_part.cpp -@@ -33,12 +33,12 @@ - #include "snippetsettings.h" - #include "snippetconfig.h" - --static const KDevPluginInfo data("kdevsnippet"); -+static const KDevPluginInfo pluginData("kdevsnippet"); - typedef KDevGenericFactory<SnippetPart> snippetFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( pluginData ) ) - - SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) -- : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) -+ : KDevPlugin(&pluginData, parent, name ? name : "SnippetPart" ) - { - setInstance(snippetFactory::instance()); - setXMLFile("kdevpart_snippet.rc"); -diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp -index 4453030a..7e38f061 100644 ---- a/parts/texttools/texttoolspart.cpp -+++ b/parts/texttools/texttoolspart.cpp -@@ -25,11 +25,11 @@ - - - typedef KDevGenericFactory<TextToolsPart> TextToolsFactory; --static const KDevPluginInfo data("kdevtexttools"); --K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevtexttools"); -+K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( pluginData ) ) - - TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "TextToolsPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "TextToolsPart") - { - setInstance(TextToolsFactory::instance()); - // setXMLFile("kdevfileview.rc"); -diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp -index 6cd63deb..9172d44b 100644 ---- a/parts/tipofday/tipofday_part.cpp -+++ b/parts/tipofday/tipofday_part.cpp -@@ -19,13 +19,13 @@ - #include "kdevapi.h" - #include "kdevcore.h" - --static const KDevPluginInfo data("kdevtipofday"); -+static const KDevPluginInfo pluginData("kdevtipofday"); - - typedef KDevGenericFactory<TipOfDayPart> TipOfDayFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( pluginData ) ) - - TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "TipOfDayPart") - { - setInstance(TipOfDayFactory::instance()); - -diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp -index 8734eadc..61f962ad 100644 ---- a/parts/tools/tools_part.cpp -+++ b/parts/tools/tools_part.cpp -@@ -34,13 +34,13 @@ - #define TOOLSSETTINGS 1 - #define EXTRATOOLSSETTINGS 2 - --static const KDevPluginInfo data("kdevtools"); --K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevtools"); -+K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) ) - - TQMap<int, TQString> externalToolMenuEntries; - - ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin( &data, parent, name ? name : "ToolsPart") -+ : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart") - { - setInstance(ToolsFactory::instance()); - -diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp -index fdc9fa6a..a547bdef 100644 ---- a/parts/uimode/uichooser_part.cpp -+++ b/parts/uimode/uichooser_part.cpp -@@ -15,11 +15,11 @@ - #define UICHOOSERSETTINGSPAGE 1 - - typedef KDevGenericFactory<UIChooserPart> UIChooserFactory; --static const KDevPluginInfo data("kdevuichooser"); --K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevuichooser"); -+K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( pluginData ) ) - - UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) -- : KDevPlugin( &data, parent, name ? name : "UIChooserPart") -+ : KDevPlugin( &pluginData, parent, name ? name : "UIChooserPart") - { - setInstance(UIChooserFactory::instance()); - -diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp -index 1b262175..5c78d952 100644 ---- a/parts/valgrind/valgrind_part.cpp -+++ b/parts/valgrind/valgrind_part.cpp -@@ -23,11 +23,11 @@ - #include "valgrinditem.h" - - typedef KDevGenericFactory<ValgrindPart> ValgrindFactory; --static const KDevPluginInfo data("kdevvalgrind"); --K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) -+static const KDevPluginInfo pluginData("kdevvalgrind"); -+K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( pluginData ) ) - - ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) -- : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) -+ : KDevPlugin( &pluginData, parent, name ? name : "ValgrindPart" ) - { - setInstance( ValgrindFactory::instance() ); - setXMLFile( "kdevpart_valgrind.rc" ); -diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp -index ec176c47..e8606636 100644 ---- a/parts/vcsmanager/vcsmanagerpart.cpp -+++ b/parts/vcsmanager/vcsmanagerpart.cpp -@@ -42,14 +42,14 @@ - #include "vcsmanagerprojectconfig.h" - - typedef KDevGenericFactory<VCSManagerPart> VCSManagerFactory; --KDevPluginInfo data("kdevvcsmanager"); --K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) -+KDevPluginInfo pluginData("kdevvcsmanager"); -+K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( pluginData ) ) - - #define GLOBALDOC_OPTIONS 1 - #define PROJECTDOC_OPTIONS 2 - - VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) -- : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") -+ : KDevPlugin(&pluginData, parent, name ? name : "VCSManagerPart") - { - kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; - -diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp -index aeb1eea9..8f05fbad 100644 ---- a/vcs/clearcase/clearcasepart.cpp -+++ b/vcs/clearcase/clearcasepart.cpp -@@ -37,13 +37,13 @@ - #include "clearcasemanipulator.h" - - --static const KDevPluginInfo data("kdevclearcase"); -+static const KDevPluginInfo pluginData("kdevclearcase"); - - typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) ) - - ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) -- : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), -+ : KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ), - default_checkin(""), - default_checkout(""), - default_uncheckout("-rm"), -diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp -index 2bda55f1..6ded6ecb 100644 ---- a/vcs/cvsservice/cvspart.cpp -+++ b/vcs/cvsservice/cvspart.cpp -@@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false; - // Plugin factory - /////////////////////////////////////////////////////////////////////////////// - --static const KDevPluginInfo data("kdevcvsservice"); -+static const KDevPluginInfo pluginData("kdevcvsservice"); - typedef KDevGenericFactory<CvsServicePart> CvsFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) ) - - /////////////////////////////////////////////////////////////////////////////// - // class CvsServicePart - /////////////////////////////////////////////////////////////////////////////// - - CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) -- : KDevVersionControl( &data, parent, -+ : KDevVersionControl( &pluginData, parent, - name ? name : "CvsService" ), - actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), - actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), -diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp -index f92666b6..76a4456a 100644 ---- a/vcs/perforce/perforcepart.cpp -+++ b/vcs/perforce/perforcepart.cpp -@@ -33,13 +33,13 @@ - #include "commitdlg.h" - #include "execcommand.h" - --static const KDevPluginInfo data("kdevperforce"); -+static const KDevPluginInfo pluginData("kdevperforce"); - - typedef KDevGenericFactory<PerforcePart> PerforceFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) ) - - PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) -- : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) -+ : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" ) - { - setInstance(PerforceFactory::instance()); - setupActions(); -diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp -index f3f43cd9..98b44848 100644 ---- a/vcs/subversion/subversion_part.cpp -+++ b/vcs/subversion/subversion_part.cpp -@@ -56,15 +56,15 @@ - - using namespace SvnGlobal; - --static const KDevPluginInfo data("kdevsubversion"); -+static const KDevPluginInfo pluginData("kdevsubversion"); - - typedef KDevGenericFactory<subversionPart> subversionFactory; --K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) -+K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) ) - - //bool g_projectWasJustCreated = false; - - subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) -- : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { -+ : KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) { - setInstance(subversionFactory::instance()); - m_projWidget = 0; - --- -cgit v1.2.1 - diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD index 0b2221cde..7c9098758 100644 --- a/arch/tde-devel/tde-tdewebdev/PKGBUILD +++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD @@ -1,43 +1,47 @@ # Contributor: e1z0 <justinas at eofnet dot lt> -pkgname=tde-tdewebdev -pkgver=14.0.10 +_mod=tdewebdev +_cat=core/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdewebdev' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-devel') pkgdesc="Trinity Web Developer Tools" depends=('tde-tdelibs') -makedepends=('pkgconfig' 'cmake') -provides=('tdewebdev') -conflicts=('trinity-tdewebdev' 'trinity-kdewebdev') -replaces=('trinity-tdewebdev') +makedepends=('tde-cmake-trinity' 'tde-tdesdk') +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/tdewebdev-trinity-${pkgver}.tar.xz") -md5sums=('96bcdfdcd4308b0721ed23d7d5b9954f') -# install='' +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('9ac809f3c5ad6a5f3a9997a8073fb590') [ -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 + -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-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD index c8961c7d7..7c8f63c7e 100644 --- a/arch/tde-extra/tde-abakus/PKGBUILD +++ b/arch/tde-extra/tde-abakus/PKGBUILD @@ -2,13 +2,14 @@ # 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.1.1 pkgrel=1 pkgdesc="Calculator for TDE" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') provides=("${_mod}") @@ -17,20 +18,19 @@ 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=('d4f13c4ec6e5d0e35df35fba9aade207') [ -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" @@ -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..2467c9b10 --- /dev/null +++ b/arch/tde-extra/tde-akode/PKGBUILD @@ -0,0 +1,55 @@ +# Contributor: Slávek Banko <slavek.banko@axis.cz> + +_mod=akode +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="akode plugin for aRts" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-extra') +depends=('alsa-lib' + 'audiofile' + 'libmad' + 'libogg' + 'libpulse' + 'libsamplerate' + 'libvorbis' + 'speex' +) +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=('e6e2b996d0bb0bc132c6679499928840') + +[ -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..f5e439c75 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.1.1 pkgrel=1 pkgdesc="TDE Amarok" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/amarok' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('ee19572ea67d6336368a30a6c6efeca0') +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..0a2ba3d71 100644 --- a/arch/tde-extra/tde-basket/PKGBUILD +++ b/arch/tde-extra/tde-basket/PKGBUILD @@ -2,13 +2,14 @@ # 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.1.1 pkgrel=1 pkgdesc="A multi-purpose note-taking application for KDE" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') provides=("${_mod}") @@ -17,21 +18,20 @@ 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') +md5sums=('f49aa3fd3de211e6c80320d164d1e11b') [ -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" @@ -42,6 +42,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 +50,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-bibletime/PKGBUILD b/arch/tde-extra/tde-bibletime/PKGBUILD new file mode 100644 index 000000000..785740102 --- /dev/null +++ b/arch/tde-extra/tde-bibletime/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=bibletime +_cat=applications/misc/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'boost' + 'boost-libs' + 'sword' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('9dd4d8ca8609b11f598c6f9963775680') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-filelight/PKGBUILD b/arch/tde-extra/tde-filelight/PKGBUILD new file mode 100644 index 000000000..6dcb9f167 --- /dev/null +++ b/arch/tde-extra/tde-filelight/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=filelight +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Show where your diskspace is being used" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('f6cd4edd8600856f7ea7318f8c85cd5e') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD index e72405c2f..8e7ab160d 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.1.1 pkgrel=1 pkgdesc="gtk qt engine" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/gtk-qt-engine' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('eaa4e3f9d5bcb9a4e096620e3a98c2be') +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..b2a28e7b8 100644 --- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD +++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD @@ -1,58 +1,51 @@ # 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.1.1 pkgrel=1 pkgdesc="gtk3 tqt engine" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/gtk3-tqt-engine' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('6f9bc4b4b4f39d4767fd0c497fb05493') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 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 - - 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 \ - --with-extra-includes="/usr/include/tqt:/usr/include/tqt/Qt" \ - --with-extra-libs="${TDEDIR}/lib:${TDEDIR}/lib/trinity" \ - - 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}/${pkgname#*-}-trinity-${pkgver} \ + -GNinja \ + -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 + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install } 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-kbarcode/PKGBUILD b/arch/tde-extra/tde-kbarcode/PKGBUILD new file mode 100644 index 000000000..43d081298 --- /dev/null +++ b/arch/tde-extra/tde-kbarcode/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kbarcode +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('474aa0e8b5616a5cded7de2e1d3019f2') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-kbiff/PKGBUILD b/arch/tde-extra/tde-kbiff/PKGBUILD new file mode 100644 index 000000000..5c97191cd --- /dev/null +++ b/arch/tde-extra/tde-kbiff/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kbiff +_cat=applications/internet/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="TDE mail notification utility" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('c7011b7ffcfa1254a1662c1c60b5161f') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-kchmviewer/PKGBUILD b/arch/tde-extra/tde-kchmviewer/PKGBUILD new file mode 100644 index 000000000..76197fdb2 --- /dev/null +++ b/arch/tde-extra/tde-kchmviewer/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kchmviewer +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="CHM viewer for Trinity" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'chmlib' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('37f0d4b63ccd3032e2e31c67dbfaf616') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-kcpuload/PKGBUILD b/arch/tde-extra/tde-kcpuload/PKGBUILD new file mode 100644 index 000000000..3e7eeaf0a --- /dev/null +++ b/arch/tde-extra/tde-kcpuload/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kcpuload +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="A CPU meter for Kicker" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('dbc5ba66797241c9885ea38c77bf2bd3') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-kile/PKGBUILD b/arch/tde-extra/tde-kile/PKGBUILD new file mode 100644 index 000000000..a18ccc847 --- /dev/null +++ b/arch/tde-extra/tde-kile/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kile +_cat=applications/office/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="TDE Integrated LaTeX Environment" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('f584d6444b470bcb7ed8928f13668314') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install + msg "Removing conflicting syntax files" + rm -rf ${pkgdir}/opt/trinity/share/apps/katepart +} diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD index b7d17b979..ac90788d0 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.1.1 pkgrel=1 pkgdesc="TDE KMPlayer" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/kmplayer' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('8753cbb7a4cefdb88c01bbe02fe9e98d') +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-kmymoney/PKGBUILD b/arch/tde-extra/tde-kmymoney/PKGBUILD new file mode 100644 index 000000000..d936a2360 --- /dev/null +++ b/arch/tde-extra/tde-kmymoney/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kmymoney +_cat=applications/office/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Personal finance manager for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'libofx' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('cc2e3d353ef8bc59340f635486e6ca6a') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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 \ + -DBUILD_DEVELOPER_DOCS="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-kommando/PKGBUILD b/arch/tde-extra/tde-kommando/PKGBUILD new file mode 100644 index 000000000..e73cb8029 --- /dev/null +++ b/arch/tde-extra/tde-kommando/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kommando +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('c1693f2beb635122bb55c0c5acb01599') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-kompose/PKGBUILD b/arch/tde-extra/tde-kompose/PKGBUILD new file mode 100644 index 000000000..76b512239 --- /dev/null +++ b/arch/tde-extra/tde-kompose/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kompose +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'imlib2' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('ac5e1cf814ac8353b1f30791e99eade2') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-konversation/PKGBUILD b/arch/tde-extra/tde-konversation/PKGBUILD new file mode 100644 index 000000000..dbcebae2d --- /dev/null +++ b/arch/tde-extra/tde-konversation/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=konversation +_cat=applications/internet/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="User friendly Internet Relay Chat (IRC) client for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'libxss' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('b7cfacda6f0f61095a120e04a8aa98ac') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-kooldock/PKGBUILD b/arch/tde-extra/tde-kooldock/PKGBUILD new file mode 100644 index 000000000..5851d3d0d --- /dev/null +++ b/arch/tde-extra/tde-kooldock/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kooldock +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Dock for TDE with cool visual enhancements" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('e016c2bfb8aba27b2647e566a9c58e9b') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-krename/PKGBUILD b/arch/tde-extra/tde-krename/PKGBUILD new file mode 100644 index 000000000..2861076d7 --- /dev/null +++ b/arch/tde-extra/tde-krename/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=krename +_cat=applications/utilities/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="A very powerful batch renamer" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('f112042034b92189f2c2b13924fb72b0') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD index 2688b1bec..60825f098 100644 --- a/arch/tde-extra/tde-krusader/PKGBUILD +++ b/arch/tde-extra/tde-krusader/PKGBUILD @@ -1,25 +1,29 @@ # 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.1.1 pkgrel=1 pkgdesc="TDE Krusader" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/krusader' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('6fd58b897ab1016168037aea184133c6') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { ## Generate config files and update with autoreconf @@ -28,19 +32,23 @@ build() { 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 + cp -a /usr/share/libtool/build-aux/config.guess ./admin/ + cp -a /usr/share/libtool/build-aux/config.sub ./admin/ msg "Running make -f admin/Makefile.common ...." make -f admin/Makefile.common + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${TQTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + ## configure msg "Configuring - ${pkgname}..." CFLAGS="${CFLAGS} -fpermissive" \ CXXFLAGS="${CXXFLAGS} -fpermissive" \ ./configure \ --prefix=${TDEDIR} \ - --with-qt-dir=${QTDIR} \ - --with-qt-includes=${QTDIR}/include \ - --with-qt-libraries=${QTDIR}/lib \ + --with-tqt-dir=${TQTDIR} \ + --with-tqt-includes=${TQTDIR}/include \ + --with-tqt-libraries=${TQTDIR}/lib \ --sysconfdir=${TDEDIR}/etc \ --localstatedir=/var \ --enable-closure diff --git a/arch/tde-extra/tde-kshutdown/PKGBUILD b/arch/tde-extra/tde-kshutdown/PKGBUILD new file mode 100644 index 000000000..611ed417c --- /dev/null +++ b/arch/tde-extra/tde-kshutdown/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kshutdown +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="An advanced shut down utility for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('8327b0cddf97537bdc5b2ea758d4a83c') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD index 4735a9653..48fc530c9 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.1.1 pkgrel=1 pkgdesc="TDE KSplash Engine Moodin" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/ksplash-engine-moodin' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('e79d589c4bd5683e2b4e537749790d4b') +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-kvkbd/PKGBUILD b/arch/tde-extra/tde-kvkbd/PKGBUILD new file mode 100644 index 000000000..96fed55b7 --- /dev/null +++ b/arch/tde-extra/tde-kvkbd/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kvkbd +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Virtual keyboard for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('149d83ba412eecd9f4de9b093a6f2b4c') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-style-baghira/PKGBUILD b/arch/tde-extra/tde-style-baghira/PKGBUILD new file mode 100644 index 000000000..4bb2e853f --- /dev/null +++ b/arch/tde-extra/tde-style-baghira/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tde-style-baghira +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="TDE style for Apple junkies :)" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('2a47fdcc68915afd622c787f44e7b05e') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-style-domino/PKGBUILD b/arch/tde-extra/tde-style-domino/PKGBUILD new file mode 100644 index 000000000..49b085791 --- /dev/null +++ b/arch/tde-extra/tde-style-domino/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tde-style-domino +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Domino widget style and twin decoration for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('465ffec96552767120e18ad6a545f428') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-style-ia-ora/PKGBUILD b/arch/tde-extra/tde-style-ia-ora/PKGBUILD new file mode 100644 index 000000000..ccf827600 --- /dev/null +++ b/arch/tde-extra/tde-style-ia-ora/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tde-style-ia-ora +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Mandriva Ia Ora widget style and twin decoration for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('1b84ec90a15fdb0888473f009c92de32') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-style-lipstik/PKGBUILD b/arch/tde-extra/tde-style-lipstik/PKGBUILD new file mode 100644 index 000000000..a21000bca --- /dev/null +++ b/arch/tde-extra/tde-style-lipstik/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tde-style-lipstik +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Lipstik style for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('c6aab310f958d37ed357c0b48946ec6a') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + 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..dcd5d0fc0 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.1.1 pkgrel=1 pkgdesc="TDE Style QTCurve" -arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/applications/tde-style-qtcurve' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('6a6d9ed45a39e966ff2846fbb87ffc29') +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..6266e351d 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.1.1 pkgrel=1 pkgdesc="TDE System Settings" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tde-systemsettings' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('a6b0a98a7923a4a6c85ecaf3ea78a798') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -27,17 +31,17 @@ build() { msg "Starting cmake..." cmake ${srcdir}/${pkgname}-trinity-${pkgver} \ + -GNinja \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DBUILD_ALL=ON \ - -DBUILD_KNETWORKCONF=OFF + -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-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD index f0e578c38..90e4b65ff 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.1.1 pkgrel=1 pkgdesc="Accessibility utilities for the TDE Desktop" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('9cab138a2d06dd832087d7793589a925') [ -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..5592f46ab 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.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdeaddons' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('29ee3049505249ff36b0dd8acf6641ae') [ -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-tdebluez/PKGBUILD b/arch/tde-extra/tde-tdebluez/PKGBUILD new file mode 100644 index 000000000..ee0a13bc6 --- /dev/null +++ b/arch/tde-extra/tde-tdebluez/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tdebluez +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'bluez' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('7b6d7d2e601cf19c6ea36f308cf28b7e') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD index 05899c6f3..71b906290 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.1.1 pkgrel=1 pkgdesc="Educational utilities for the TDE Desktop" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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' 'python3' '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=('0450a4e272be04444d5896b24d48f489') [ -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..2a61c50be 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.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdegames' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('e2e5ee4a2cea48c8ca8282f1f2ec7ebe') [ -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-tdeio-appinfo/PKGBUILD b/arch/tde-extra/tde-tdeio-appinfo/PKGBUILD new file mode 100644 index 000000000..580ccae4d --- /dev/null +++ b/arch/tde-extra/tde-tdeio-appinfo/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tdeio-appinfo +_cat=applications/tdeio/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="TDEIO slave for the appinfo protocol" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('d942b4113468a40371835641df3cfd77') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-tdeio-ftps/PKGBUILD b/arch/tde-extra/tde-tdeio-ftps/PKGBUILD new file mode 100644 index 000000000..1229580d6 --- /dev/null +++ b/arch/tde-extra/tde-tdeio-ftps/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tdeio-ftps +_cat=applications/tdeio/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="An ftps TDEIO slave for TDE" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('02ac6a9213e413fe159454d8d4053c5d') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-tdeio-locate/PKGBUILD b/arch/tde-extra/tde-tdeio-locate/PKGBUILD new file mode 100644 index 000000000..944d1a17b --- /dev/null +++ b/arch/tde-extra/tde-tdeio-locate/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tdeio-locate +_cat=applications/tdeio/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="tdeio-slave for the locate command" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('59fbc9f8a04221dde31cfbe88ac7b913') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-tdeio-sword/PKGBUILD b/arch/tde-extra/tde-tdeio-sword/PKGBUILD new file mode 100644 index 000000000..23611325c --- /dev/null +++ b/arch/tde-extra/tde-tdeio-sword/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tdeio-sword +_cat=applications/tdeio/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'sword' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('544bcb7bfbfe9a5c77a7c167b1211b4b') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD index 092c6cd70..588084088 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.1.1 pkgrel=1 pkgdesc="Trinity Desktop MultiMedia Components" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdemultimedia' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('cc981b61ab3c1b057b3fa62ddc51d52c') # 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..fd82835d0 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.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdenetwork' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('5fe2e7d15b4301bb23e448876484910d') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build - export PKG_CONFIG_PATH=${TDEDIR}/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_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..26965f600 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.1.1 pkgrel=1 pkgdesc="gtk qt engine" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tdenetworkmanager' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('cb0a8494e89612fa0f5a6af0440cc493') +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..f9d8307f0 100644 --- a/arch/tde-extra/tde-tdepim/PKGBUILD +++ b/arch/tde-extra/tde-tdepim/PKGBUILD @@ -1,33 +1,44 @@ # 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.1.1 pkgrel=1 pkgdesc="Trinity Desktop PIM Components" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdepim' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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') +depends=( + 'boost' + 'boost-libs' + 'gnokii' + 'libxss' + 'tde-tdelibs' + 'tde-libcaldav' + 'tde-libcarddav' +) +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=('a122b4b92f036f18641fc3d8200716f2') [ -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 +47,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..107f91654 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.1.1 pkgrel=1 -pkgdesc="Trinity Desktop Enviroment $_cat$_mod" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/$_mod" +pkgdesc="Trinity Desktop Enviroment - ${_mod}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('2fcb773a2b27f50cee3d9ed06ea52a6a') [ -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..0ec9b0c12 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.1.1 pkgrel=1 pkgdesc="TDE Sudo" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tdesudo' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('a5bba24438ab3544c0ef755fe0767abd') +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..3514d953d 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.1.1 pkgrel=1 -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/tdetoys' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('c28903f3118518c9ecd29a38cbca7182') [ -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..0d17958d1 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.1.1 pkgrel=1 pkgdesc="TDM Theme" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/tdmtheme' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('a933db297dd6e73522d150db0398386f') +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-tellico/PKGBUILD b/arch/tde-extra/tde-tellico/PKGBUILD new file mode 100644 index 000000000..29623f9ef --- /dev/null +++ b/arch/tde-extra/tde-tellico/PKGBUILD @@ -0,0 +1,66 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tellico +_cat=applications/office/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=2 +pkgdesc="Trinity Desktop Enviroment $_cat$_mod" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'tde-tdegraphics' + 'tde-tdemultimedia' + 'tde-tdepim' + 'exempi' + 'perl-text-bibtex' + 'perl-xml-parser' + 'taglib' + 'v4l-utils' + 'yaz' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('d646a70e7946c4b5e2fd93fbe024cd14') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD index e5660beb6..c2f668373 100644 --- a/arch/tde-extra/tde-tork/PKGBUILD +++ b/arch/tde-extra/tde-tork/PKGBUILD @@ -2,13 +2,14 @@ # 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.1.1 pkgrel=1 pkgdesc="Anonymity manager for TDE" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') provides=("${_mod}") @@ -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=('67b980f0d68390026d3f63a2605aa6e2') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${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..6304796b8 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.1.1 pkgrel=1 pkgdesc="TDE TWin Style Crystal" -arch=('i686' 'x86_64') -url='https://scm.trinitydesktop.org/scm/git/applications/twin-style-crystal' +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +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=('6a1985f5a862f804daeda2aad34be8d0') +install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${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-twin-style-dekorator/PKGBUILD b/arch/tde-extra/tde-twin-style-dekorator/PKGBUILD new file mode 100644 index 000000000..415493d61 --- /dev/null +++ b/arch/tde-extra/tde-twin-style-dekorator/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=twin-style-dekorator +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Window decorations for TDE using user-supplied PNG files" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('1026af2da5aae9377de464edf6af5a97') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-twin-style-machbunt/PKGBUILD b/arch/tde-extra/tde-twin-style-machbunt/PKGBUILD new file mode 100644 index 000000000..e4a9c84c8 --- /dev/null +++ b/arch/tde-extra/tde-twin-style-machbunt/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=twin-style-machbunt +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Window decorations for TDE using user-supplied PNG files" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('13705ee4cebf1b39fd11156ab80e1e00') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-twin-style-suse2/PKGBUILD b/arch/tde-extra/tde-twin-style-suse2/PKGBUILD new file mode 100644 index 000000000..31b76c7b7 --- /dev/null +++ b/arch/tde-extra/tde-twin-style-suse2/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=twin-style-suse2 +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod/tde-}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="Window decorations for TDE using user-supplied PNG files" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +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=('6f922209465c76c925ef9d7d2a757e27') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p "$srcdir/build" + cd "$srcdir/build" + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + 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/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD index 81977b50f..6772e8a0b 100644 --- a/arch/tde-extra/tde-yakuake/PKGBUILD +++ b/arch/tde-extra/tde-yakuake/PKGBUILD @@ -2,13 +2,14 @@ # 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.1.1 pkgrel=1 pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') provides=("${_mod}") @@ -16,21 +17,18 @@ 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=('d77612407f4a166a4a96774d028556f0') [ -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" @@ -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 } diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD index ecd9051e5..bd8beb03f 100644 --- a/arch/tde-libs/tde-libcaldav/PKGBUILD +++ b/arch/tde-libs/tde-libcaldav/PKGBUILD @@ -1,44 +1,47 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contribuitor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-libcaldav -pkgver=14.0.10 +_mod=libcaldav +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/libcaldav" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-libs') depends=('curl' 'glib2') -makedepends=('doxygen' 'pkgconfig' 'cmake') +makedepends=('doxygen' 'tde-cmake-trinity') optdepends=() -provides=('libcaldav') -# conflicts=() -replaces=('trinity-libcaldav') +provides=("${_mod}") +replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') install= -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcaldav-trinity-${pkgver}.tar.xz") -md5sums=('3d1b4997e4789c5b3a5389f5b58fd4f0') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('d400e7a6b157fcef87ceb9aeb7185041') _prefix=/usr build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ -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-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD index 96a67ea17..be535b86c 100644 --- a/arch/tde-libs/tde-libcarddav/PKGBUILD +++ b/arch/tde-libs/tde-libcarddav/PKGBUILD @@ -1,41 +1,45 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty@gmail.com> -pkgname=tde-libcarddav -pkgver=14.0.10 +_mod=libcarddav +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="A client library adding support for the CardDAV protocol" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/libcarddav" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" groups=('tde-libs') depends=('curl') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') license=('GPL') -provides=('libcarddav') +provides=("${_mod}") # conflicts=() -replaces=('trinity-libcarddav') -source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libcarddav-trinity-${pkgver}.tar.xz") -md5sums=('54a5c89bb094ec40cc8cd5734233f743') +replaces=("trinity-${_mod}") +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('ff939f8c8fd3db542b8942393f141847') _prefix=/usr build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ -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-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD index e6f6e58b6..c6a18fab7 100644 --- a/arch/tde-libs/tde-libkdcraw/PKGBUILD +++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD @@ -1,66 +1,49 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-libkdcraw -pkgver=14.0.10 +_mod=libkdcraw +_cat=libraries/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-libs') depends=('tde-tdelibs' 'libraw' 'lcms2') -makedepends=('pkgconfig' 'autoconf' 'imake') +makedepends=('tde-cmake-trinity') 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/libraries/libkdcraw-trinity-${pkgver}.tar.xz") -md5sums=('fedf15518c80f85174071df185a45c88') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('3676823e2867c940f4c48275cd7677e7') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity -[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 +[ -n "$TQTDIR" ] || TQTDIR=${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 autotools, libtoolize, aclocal, autoupdate, autoconf, automake, autoreconf" - aclocal - autoupdate - autoconf - automake --add-missing - - 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 \ - --localstatedir=/var \ - --enable-debug=full \ - --enable-closure - - ## make $NUMJOBS - 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}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building $pkgname..." + ninja $NUMJOBS } package() { - msg "Packaging - $pkgname-$pkgver" - - cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} # use for non-out-of-source - - make -j1 DESTDIR="$pkgdir" install + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD index 68181afa8..72267416e 100644 --- a/arch/tde-libs/tde-libkexiv2/PKGBUILD +++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD @@ -1,44 +1,48 @@ # Maintainer: Michael Manley <mmanley@nasutek.com> # Contributor: David C. Rankin <drankinatty at gmail dot com> -pkgname=tde-libkexiv2 -pkgver=14.0.10 +_mod=libkexiv2 +_cat=libraries/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 pkgrel=1 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins" -arch=('i686' 'x86_64') -url="https://scm.trinitydesktop.org/scm/git/${pkgname#*-}" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-libs') depends=('tde-tdelibs' 'exiv2') -makedepends=('pkgconfig' 'cmake') +makedepends=('tde-cmake-trinity') 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/libraries/libkexiv2-trinity-${pkgver}.tar.xz") -md5sums=('0647354c2cc1da9f54cd0d0707b026a3') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('3a0b8dcbe4bedccf09a6da94d9a273dc') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 build() { - cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ${srcdir}/build + cd ${srcdir}/build msg "Starting cmake..." cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_GCC_VISIBILITY=ON + -DWITH_ALL_OPTIONS=ON msg "Building $pkgname..." - make $NUMJOBS + ninja $NUMJOBS } package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" ninja -j1 install } diff --git a/arch/tde-libs/tde-libkipi/PKGBUILD b/arch/tde-libs/tde-libkipi/PKGBUILD new file mode 100644 index 000000000..052038752 --- /dev/null +++ b/arch/tde-libs/tde-libkipi/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=libkipi +_cat=libraries/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.1.1 +pkgrel=1 +pkgdesc="The library for apps that want to use TDE kipi-plugins" +arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-libs') +depends=('tde-tdelibs') +makedepends=('tde-cmake-trinity') +optdepends=() +provides=("${_mod}") +conflicts=("trinity-${_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=('1c86d27aae6a27c1bad9545ee9333090') + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +[ -n "$TQTDIR" ] || TQTDIR=${TDEDIR}/tqt3 + +build() { + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DWITH_ALL_OPTIONS=ON + + msg "Building $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-meta/PKGBUILD b/arch/tde-meta/PKGBUILD index 91a64e928..80de34db9 100644 --- a/arch/tde-meta/PKGBUILD +++ b/arch/tde-meta/PKGBUILD @@ -1,12 +1,14 @@ pkgname=tde-meta -pkgver=14.0.10 -pkgrel=2 +pkgver=14.1.1 +pkgrel=1 pkgdesc="Trinity Desktop Environment" arch=('any') url="https://www.trinitydesktop.org/" license=('GPL') depends=( # tde-base + 'tde-i18n' + 'tde-polkit-agent-tde' 'tde-tdeadmin' 'tde-tdeartwork' 'tde-tdebindings' @@ -16,11 +18,14 @@ depends=( # tde-core 'tde-arts' 'tde-avahi-tqt' + 'tde-cmake-trinity' 'tde-dbus-1-tqt' 'tde-dbus-tqt' 'tde-libart-lgpl' + 'tde-polkit-tqt' 'tde-tdebase' 'tde-tdelibs' + 'tde-tqca' 'tde-tqca-tls' 'tde-tqt3' 'tde-tqtinterface' @@ -29,28 +34,58 @@ depends=( 'tde-tdesdk' 'tde-tdevelop' 'tde-tdewebdev' + 'tde-kdbg' + 'tde-kdiff3' + 'tde-kscope' + 'tde-kxmleditor' # tde-libs 'tde-libcaldav' 'tde-libcarddav' 'tde-libkdcraw' 'tde-libkexiv2' + 'tde-libkipi' # tde-extra 'tde-abakus' + 'tde-akode' 'tde-amarok' 'tde-basket' + 'tde-bibletime' + 'tde-filelight' 'tde-gtk3-tqt-engine' 'tde-gtk-qt-engine' + 'tde-kbarcode' + 'tde-kbiff' + 'tde-kchmviewer' + 'tde-kcpuload' + 'tde-kile' 'tde-kmplayer' + 'tde-kmymoney' + 'tde-kommando' + 'tde-kompose' + 'tde-konversation' + 'tde-kooldock' + 'tde-krename' 'tde-krusader' + 'tde-kshutdown' 'tde-ksplash-engine-moodin' + 'tde-kvkbd' + 'tde-style-baghira' + 'tde-style-domino' + 'tde-style-ia-ora' + 'tde-style-lipstik' 'tde-style-qtcurve' 'tde-systemsettings' 'tde-tdeaccessibility' 'tde-tdeaddons' + 'tde-tdebluez' 'tde-tdeedu' 'tde-tdegames' + 'tde-tdeio-appinfo' + 'tde-tdeio-ftps' + 'tde-tdeio-locate' + 'tde-tdeio-sword' 'tde-tdemultimedia' 'tde-tdenetwork' 'tde-tdenetworkmanager' @@ -59,8 +94,12 @@ depends=( 'tde-tdesudo' 'tde-tdetoys' 'tde-tdmtheme' + 'tde-tellico' 'tde-tork' 'tde-twin-style-crystal' + 'tde-twin-style-dekorator' + 'tde-twin-style-machbunt' + 'tde-twin-style-suse2' 'tde-yakuake' ) |