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