diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-05-01 16:10:10 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-05-01 16:20:51 +0200 |
| commit | c0059995dde778fd838de18f649a8d12d0bef39a (patch) | |
| tree | 07b0b66349491df6848ae4a2cd5e1792bf15f975 | |
| parent | 4a4b5b038b986cfa18a3526e3e811b1aacf415a7 (diff) | |
| download | tde-packaging-r14.0.12.tar.gz tde-packaging-r14.0.12.zip | |
ArchLinux: Update for final R14.0.12.r14.0.12
Add pkgbuilds for several applications.
Add pkgbuild for polkit-tqt library.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4627271715ae3e062a3d1723deffdeff608418b3)
62 files changed, 536 insertions, 239 deletions
diff --git a/arch/tde-base/tde-i18n/PKGBUILD b/arch/tde-base/tde-i18n/PKGBUILD index 5d9fcec95..f598f6a1e 100644 --- a/arch/tde-base/tde-i18n/PKGBUILD +++ b/arch/tde-base/tde-i18n/PKGBUILD @@ -6,7 +6,7 @@ _kdemod="${_mod/tde/kde}" pkgbase="tde-${_mod/tde-}" pkgname=("$pkgbase") -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Internationalized (i18n) files for TDE" arch=('any') @@ -17,7 +17,7 @@ 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') +md5sums=('62e049f7717401eed9994d05c1430578') install='' _languages=( diff --git a/arch/tde-base/tde-polkit-agent-tde/PKGBUILD b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD new file mode 100644 index 000000000..c27ddf9d9 --- /dev/null +++ b/arch/tde-base/tde-polkit-agent-tde/PKGBUILD @@ -0,0 +1,60 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=polkit-agent-tde +_cat=applications/system/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.12 +pkgrel=1 +pkgdesc="TDE dialogs for PolicyKit" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-base') +depends=( + 'tde-tdelibs' + 'tde-polkit-tqt' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('3d3987adfcac0d9bd9e342d58fd063a8') + +[ -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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-base/tde-tdeadmin/PKGBUILD b/arch/tde-base/tde-tdeadmin/PKGBUILD index 8ad9aab9a..a1ca30728 100644 --- a/arch/tde-base/tde-tdeadmin/PKGBUILD +++ b/arch/tde-base/tde-tdeadmin/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The TDE system administration utilities" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ conflicts=("trinity-${_mod}") replaces=("${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('1cdc7261b0a07b2b5767024ee699d852') +md5sums=('e76c21cbd47a42c2d71e882c2f1283c2') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-base/tde-tdeartwork/PKGBUILD b/arch/tde-base/tde-tdeartwork/PKGBUILD index 5c4f59b62..12c2cc377 100644 --- a/arch/tde-base/tde-tdeartwork/PKGBUILD +++ b/arch/tde-base/tde-tdeartwork/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -21,7 +21,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('fc7ac94e49b18619699b7872339fe8d1') +md5sums=('a5dd6908aff6731593deddaaefcd03cd') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-base/tde-tdebindings/PKGBUILD b/arch/tde-base/tde-tdebindings/PKGBUILD index eadab5f96..cd59a6156 100644 --- a/arch/tde-base/tde-tdebindings/PKGBUILD +++ b/arch/tde-base/tde-tdebindings/PKGBUILD @@ -8,7 +8,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https//scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ 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/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('3f4933a66c0e1b32011148b9b4733579') +md5sums=('305423d327fe5b7ca3260932044fa51d') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD index cde148275..1731412cb 100644 --- a/arch/tde-base/tde-tdegraphics/PKGBUILD +++ b/arch/tde-base/tde-tdegraphics/PKGBUILD @@ -6,8 +6,8 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 -pkgrel=3 +pkgver=14.0.12 +pkgrel=1 pkgdesc="Trinity Desktop Graphics Components" arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -20,9 +20,9 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" - "bp000-544868bcc9.diff") -md5sums=('04d2c95040a3a5664c4b0dca8556d10d' - "17ef39c263fb05827242762813b8c4b2") + 'bp000-poppler-2203.diff') +md5sums=('9e91406d7e02515a41ae60bd2a21440a' + 'cd9b5a969ce31dae64fb8764a5e7b60f') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity @@ -30,7 +30,7 @@ md5sums=('04d2c95040a3a5664c4b0dca8556d10d' prepare() { msg "Apply backported patches" cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 - patch -p1 < ${srcdir}/bp000-544868bcc9.diff + patch -p1 < ${srcdir}/bp000-poppler-2203.diff } build() { diff --git a/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff b/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff deleted file mode 100644 index 975fd5224..000000000 --- a/arch/tde-base/tde-tdegraphics/bp000-544868bcc9.diff +++ /dev/null @@ -1,60 +0,0 @@ -commit 9cde144216b331f0eef2ce2c3800d8356109ccc7 -Author: Slávek Banko <slavek.banko@axis.cz> -Date: Wed Dec 15 17:30:53 2021 +0100 - - Add support for Poppler >= 21.11. - This resolves issue #36. - - Signed-off-by: Slávek Banko <slavek.banko@axis.cz> - -diff --git a/config.h.cmake b/config.h.cmake -index b3b6d1ec..fa71d600 100644 ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -1,6 +1,7 @@ - #cmakedefine VERSION "@VERSION@" - - // poppler-tqt -+#cmakedefine HAVE_POPPLER_2111 - #cmakedefine HAVE_POPPLER_2108 - #cmakedefine HAVE_POPPLER_086 - #cmakedefine HAVE_POPPLER_083 -diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake -index 9c15e64f..78f6ffbc 100644 ---- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake -+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake -@@ -24,7 +24,7 @@ check_cxx_source_compiles(" - HAVE_POPPLER_030 ) - tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - --foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 ) -+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 ) - string( REPLACE "." "" _poppler_str "${_poppler_ver}" ) - if( NOT DEFINED HAVE_POPPLER_${_poppler_str} ) - message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" ) -diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp -index 426b750f..9b4f6208 100644 ---- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp -+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp -@@ -173,7 +173,11 @@ TQValueList<TextBox*> Page::textList() const - data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72, - 0, false, false, false, -1, -1, -1, -1); - -+# if defined(HAVE_POPPLER_2111) -+ std::unique_ptr<TextWordList> word_list = output_dev->makeWordList(); -+# else - TextWordList *word_list = output_dev->makeWordList(); -+# endif - - if (!word_list) { - delete output_dev; -@@ -193,7 +197,9 @@ TQValueList<TextBox*> Page::textList() const - output_list.append(text_box); - } - -+# if !defined(HAVE_POPPLER_2111) - delete word_list; -+# endif - delete output_dev; - - return output_list; diff --git a/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff new file mode 100644 index 000000000..aa170d53e --- /dev/null +++ b/arch/tde-base/tde-tdegraphics/bp000-poppler-2203.diff @@ -0,0 +1,81 @@ +commit 9adc0f647c04e84792be63d913274633cc2ecd65 +Author: Slávek Banko <slavek.banko@axis.cz> +Date: Sat Apr 30 01:48:37 2022 +0200 + + Add support for Poppler >= 22.03. + + Signed-off-by: Slávek Banko <slavek.banko@axis.cz> + +diff --git a/config.h.cmake b/config.h.cmake +index 7c1ab17a..fea46aaf 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -1,6 +1,7 @@ + #cmakedefine VERSION "@VERSION@" + + // poppler-tqt ++#cmakedefine HAVE_POPPLER_2203 + #cmakedefine HAVE_POPPLER_2112 + #cmakedefine HAVE_POPPLER_2111 + #cmakedefine HAVE_POPPLER_2108 +diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +index fa82dd3c..def19529 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake ++++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +@@ -24,7 +24,7 @@ check_cxx_source_compiles(" + HAVE_POPPLER_030 ) + tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + +-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 ) ++foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 22.03 ) + string( REPLACE "." "" _poppler_str "${_poppler_ver}" ) + if( NOT DEFINED HAVE_POPPLER_${_poppler_str} ) + message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" ) +diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +index 78e8befe..86e831ee 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cpp +@@ -50,7 +50,11 @@ Document *Document::load(const TQString &filePath) + #endif + } + ++# if defined(HAVE_POPPLER_2203) ++ DocumentData *doc = new DocumentData(std::make_unique<GooString>(TQFile::encodeName(filePath)), {}); ++# else + DocumentData *doc = new DocumentData(new GooString(TQFile::encodeName(filePath)), NULL); ++# endif + Document *pdoc; + if (doc->doc.isOk() || doc->doc.getErrorCode() == errEncrypted) { + pdoc = new Document(doc); +@@ -84,10 +88,15 @@ bool Document::unlock(const TQCString &password) + { + if (data->locked) { + /* racier then it needs to be */ ++# if defined(HAVE_POPPLER_2203) ++ DocumentData *doc2 = new DocumentData(std::make_unique<GooString>(data->doc.getFileName()), ++ GooString(password.data())); ++# else + GooString *filename = new GooString(data->doc.getFileName()); + GooString *pwd = new GooString(password.data()); + DocumentData *doc2 = new DocumentData(filename, pwd); + delete pwd; ++# endif + if (!doc2->doc.isOk()) { + delete doc2; + } else { +diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +index c98d02b8..f1096ceb 100644 +--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h ++++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-private.h +@@ -104,7 +104,11 @@ class LinkDestinationData { + + class DocumentData { + public: ++# if defined(HAVE_POPPLER_2203) ++ DocumentData(std::unique_ptr<GooString> &&filePath, const std::optional<GooString> &password) : doc(std::move(filePath), password), m_fontInfoScanner(0), m_outputDev(0) {} ++# else + DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {} ++# endif + + ~DocumentData() + { diff --git a/arch/tde-base/tde-tdeutils/PKGBUILD b/arch/tde-base/tde-tdeutils/PKGBUILD index d3c4ea03b..91c530e94 100644 --- a/arch/tde-base/tde-tdeutils/PKGBUILD +++ b/arch/tde-base/tde-tdeutils/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The TDE something - with Trinity upstream" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('9d5bc073642e7f540f9c168e7d8ea989') +md5sums=('d5b2c81c4fc59351ae1be3059fc5df1f') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD index 285e29f57..a546c02dc 100644 --- a/arch/tde-core/tde-arts/PKGBUILD +++ b/arch/tde-core/tde-arts/PKGBUILD @@ -8,7 +8,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity aRts Sound System and libraries" arch=('i686' 'x86_64') @@ -36,7 +36,7 @@ conflicts=("kdemod3-${_mod}" "${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('8906e1030ed7caa3ce72e8c41288b320') +md5sums=('a48103a0a8ecdc098f6f2f834f0951cb') install="tde-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD index 737408364..5be183188 100644 --- a/arch/tde-core/tde-avahi-tqt/PKGBUILD +++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD @@ -6,7 +6,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Avahi-TQt" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ provides=("${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('e9e31775dc7ad94159e9e8ea0edf028c') +md5sums=('ad128b35e54f8000a620aaf54023aa5d') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-cmake-trinity/PKGBUILD b/arch/tde-core/tde-cmake-trinity/PKGBUILD index 70e18af33..6164de7f7 100644 --- a/arch/tde-core/tde-cmake-trinity/PKGBUILD +++ b/arch/tde-core/tde-cmake-trinity/PKGBUILD @@ -5,8 +5,8 @@ _cat=common/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 -pkgrel=3 +pkgver=14.0.12 +pkgrel=1 pkgdesc="TDE CMake modules" arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake" @@ -25,7 +25,7 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz") -md5sums=('954185aabae978ef840c78efd940bee0') +md5sums=('b41eaff33371172c2a12b9e47f9c1fdf') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD index cedb30c85..984822105 100644 --- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD @@ -8,8 +8,8 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 -pkgrel=2 +pkgver=14.0.12 +pkgrel=1 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT" arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -22,7 +22,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3') options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('c801be15308438c85043d5f52f28bcc9') +md5sums=('907b32908215ffb7aa8ba802e29de93f') install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD index 8c96c3944..67264ec18 100644 --- a/arch/tde-core/tde-dbus-tqt/PKGBUILD +++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD @@ -8,7 +8,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -20,7 +20,7 @@ makedepends=('tde-cmake-trinity') provides=("${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('fd23c1a0f57d7ed08f443b3e2a2f98d6') +md5sums=('d57e740bb2437e25b25694188fae1b4c') install="trinity-${_mod}.install" [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD index 6edf7368c..1f577ab22 100644 --- a/arch/tde-core/tde-libart-lgpl/PKGBUILD +++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD @@ -6,7 +6,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Desktop LGPL'd Component" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ replaces=() options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('02e9f48e719c1a189638ddb1f932cea3') +md5sums=('8318cba1b6d3220fd4cf18c29977f67d') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-core/tde-polkit-tqt/PKGBUILD b/arch/tde-core/tde-polkit-tqt/PKGBUILD new file mode 100644 index 000000000..34fcd8308 --- /dev/null +++ b/arch/tde-core/tde-polkit-tqt/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=polkit-tqt +_cat=dependencies/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.12 +pkgrel=1 +pkgdesc="Trinity PolicyKit-tqt library" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +groups=('tde-core' 'tde-base') +depends=('tde-tqtinterface' 'tde-dbus-1-tqt' 'polkit') +makedepends=('tde-cmake-trinity') +provides=("${_mod}") +conflicts=("trinity-${_mod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('4cfc24c4c4c4adc7e589aa4f2c27be4e') +install="trinity-${_mod}.install" + +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + +build() { + msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" + mkdir -p ${srcdir}/build + cd ${srcdir}/build + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - $pkgname..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + DESTDIR="${pkgdir}" ninja -j1 install +} diff --git a/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install new file mode 100644 index 000000000..2a8dc4c98 --- /dev/null +++ b/arch/tde-core/tde-polkit-tqt/trinity-polkit-tqt.install @@ -0,0 +1,12 @@ +post_install() { + ldconfig &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD index 10a18556e..c03d9add0 100644 --- a/arch/tde-core/tde-tdebase/PKGBUILD +++ b/arch/tde-core/tde-tdebase/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Desktop Enviroment base components" arch=('i686' 'x86_64') @@ -57,7 +57,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/ 'tdm.service' 'xsession.patch') -md5sums=('38d71c4d3fa51219b4f734b9d862308e' +md5sums=('cea523c3144c4c22966244e9921848d4' '18e8d01124b19f7df2937c06e177bf7f' 'c963ef6e37c9051119972a58c67f05fb' 'bb4c25e560fa719e8e8f49ef80bd1c99' diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD index f63821c0e..bdb3d5e00 100644 --- a/arch/tde-core/tde-tdelibs/PKGBUILD +++ b/arch/tde-core/tde-tdelibs/PKGBUILD @@ -8,8 +8,8 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 -pkgrel=2 +pkgver=14.0.12 +pkgrel=1 pkgdesc="Trinity Desktop core libraries and applications" arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -42,7 +42,7 @@ conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemo replaces=("trinity-${_kdemod}" "trinity-${_mod}") options=('staticlibs' 'libtool' '!makeflags' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('6a93917c4879d0a34764264f53e8519f') +md5sums=('51ee6897dd364a3d6f42d633fcf53efc') install="trinity-${_mod}.install" diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD index 36be28cd2..878c4da6c 100644 --- a/arch/tde-core/tde-tqca-tls/PKGBUILD +++ b/arch/tde-core/tde-tqca-tls/PKGBUILD @@ -8,7 +8,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz") -md5sums=('2b149701a8ad80d4ea69f97f83089b8a') +md5sums=('0ded8a6923a3d77459daf2f8f207905c') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD index 7cfb78540..4c04b7be4 100644 --- a/arch/tde-core/tde-tqca/PKGBUILD +++ b/arch/tde-core/tde-tqca/PKGBUILD @@ -9,7 +9,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)" arch=('i686' 'x86_64') @@ -23,7 +23,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('2b149701a8ad80d4ea69f97f83089b8a') +md5sums=('0ded8a6923a3d77459daf2f8f207905c') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD index 9fca983df..33c584b19 100644 --- a/arch/tde-core/tde-tqt3/PKGBUILD +++ b/arch/tde-core/tde-tqt3/PKGBUILD @@ -9,7 +9,7 @@ _kdemod="${_mod/tde/kde}" pkgbase="tde-${_mod}" pkgname=("$pkgbase" "${pkgbase}-docs") -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3" arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ makedepends=('libcups' 'libxmu' 'glu') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('3923dc1a1460c556ef5d1fc296211f3a') +md5sums=('a147fb23063a794f3e06dd6aa52ef087') _prefix="/opt/trinity/tqt3" diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD index 6d59ac7c7..2297b62f4 100644 --- a/arch/tde-core/tde-tqtinterface/PKGBUILD +++ b/arch/tde-core/tde-tqtinterface/PKGBUILD @@ -8,7 +8,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -24,7 +24,7 @@ replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('4f2001045468bce4483819d91fef113a') +md5sums=('fae4701c1b7416fdf32855063642612b') install="trinity-${_mod}.install" diff --git a/arch/tde-devel/tde-tdesdk/PKGBUILD b/arch/tde-devel/tde-tdesdk/PKGBUILD index 14b9b1e79..b87d2763a 100644 --- a/arch/tde-devel/tde-tdesdk/PKGBUILD +++ b/arch/tde-devel/tde-tdesdk/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('36895ffc0ee52be3c30bfef9019cf424') +md5sums=('ee3b844a8dc81219100240e6f6ddf4bb') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-devel/tde-tdevelop/PKGBUILD b/arch/tde-devel/tde-tdevelop/PKGBUILD index db57ea73b..2cdfdf0fd 100644 --- a/arch/tde-devel/tde-tdevelop/PKGBUILD +++ b/arch/tde-devel/tde-tdevelop/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('2323f9116e354a28e72da92a4f820641') +md5sums=('3eb446016b6c55e2cca31ba236298bb3') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-devel/tde-tdewebdev/PKGBUILD b/arch/tde-devel/tde-tdewebdev/PKGBUILD index 7373b661e..978b981c2 100644 --- a/arch/tde-devel/tde-tdewebdev/PKGBUILD +++ b/arch/tde-devel/tde-tdewebdev/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('e345b611edd878ca09a65d9d9e0739e0') +md5sums=('0e91af91e68fa79e12117c31690fda70') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-abakus/PKGBUILD b/arch/tde-extra/tde-abakus/PKGBUILD index 67e4b762e..a6754eef6 100644 --- a/arch/tde-extra/tde-abakus/PKGBUILD +++ b/arch/tde-extra/tde-abakus/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/utilities/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Calculator for TDE" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('5f8e3779d9d4f7ddad3c436cb5bbfd03') +md5sums=('40ad2a4afc8c3c982833b46baefd3b3e') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-extra/tde-akode/PKGBUILD b/arch/tde-extra/tde-akode/PKGBUILD index 062c1e1a1..da8d0a8eb 100644 --- a/arch/tde-extra/tde-akode/PKGBUILD +++ b/arch/tde-extra/tde-akode/PKGBUILD @@ -5,7 +5,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="akode plugin for aRts" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ conflicts=("kdemod3-${_mod}" "${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('64f003d3a2098535d07a6dc9a210f148') +md5sums=('85e6dc1a63be5d401527643d79d269d5') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD index 7068c8547..0dc0b2db0 100644 --- a/arch/tde-extra/tde-amarok/PKGBUILD +++ b/arch/tde-extra/tde-amarok/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/multimedia/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE Amarok" arch=('i686' 'x86_64') @@ -18,12 +18,20 @@ 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/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('4542cc22dc8104f46e6dd1640ea54cb7') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz" + 'bp000-fix-configure-tests.diff') +md5sums=('bf63df52af7ea829fb07b3a2615bf30e' + '967ae8710e90d9e7a3a519ed08e437ed') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity +prepare() { + msg "Apply backported patches" + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1 + patch -p1 < ${srcdir}/bp000-fix-configure-tests.diff +} + build() { msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p ${srcdir}/build diff --git a/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff b/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff new file mode 100644 index 000000000..5668cc562 --- /dev/null +++ b/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff @@ -0,0 +1,28 @@ +diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake +index f1b7246b..bab3b80d 100644 +--- a/ConfigureChecks.cmake ++++ b/ConfigureChecks.cmake +@@ -197,7 +197,10 @@ find_package( OpenGL ) + + tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + set( CMAKE_REQUIRED_INCLUDES ${TQT_INCLUDE_DIRS} ) +-set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} ${TQT_LIBRARIES} ) ++foreach( _dirs ${TQT_LIBRARY_DIRS} ) ++ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" ) ++endforeach() ++list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} ) + + check_cxx_source_compiles(" + #include <cstdlib> +@@ -219,7 +222,10 @@ if( WITH_KONQSIDEBAR ) + set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} ) + set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} ) + set( CMAKE_REQUIRED_FLAGS "-include tqt.h" ) +- set( CMAKE_REQUIRED_LIBRARIES -L${TQT_LIBRARY_DIRS} -L${QT_LIBRARY_DIRS} ${TQT_LIBRARIES} ) ++ foreach( _dirs ${TQT_LIBRARY_DIRS} ) ++ list( APPEND CMAKE_REQUIRED_LIBRARIES "-L${_dirs}" ) ++ endforeach() ++ list( APPEND CMAKE_REQUIRED_LIBRARIES ${TQT_LIBRARIES} ) + check_cxx_source_compiles(" + #include <konqsidebarplugin.h> + int main(int, char**) { return 0; } " diff --git a/arch/tde-extra/tde-basket/PKGBUILD b/arch/tde-extra/tde-basket/PKGBUILD index b36019020..7458edf16 100644 --- a/arch/tde-extra/tde-basket/PKGBUILD +++ b/arch/tde-extra/tde-basket/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/office/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="A multi-purpose note-taking application for KDE" arch=('i686' 'x86_64') @@ -27,19 +27,12 @@ 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-fix-crash-on-export-basket-archive.diff') -md5sums=('1b078e8c8d67c2ce110080fa687bd5cb' - '402c273bb65646cf377ff9d1be762f07') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('7253c7c8c886fce5a882496824955fd3') [ -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" 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 deleted file mode 100644 index 172333cf3..000000000 --- a/arch/tde-extra/tde-basket/bp000-fix-crash-on-export-basket-archive.diff +++ /dev/null @@ -1,60 +0,0 @@ -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 6a1657746..ff2611e85 100644 --- a/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD +++ b/arch/tde-extra/tde-gtk-qt-engine/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/themes/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="gtk qt engine" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('60aa938573a877aa4589e49ee312253e') +md5sums=('e07f2e577861adb6e0295effc32eff02') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD index ad7e7015c..d2ca554d6 100644 --- a/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD +++ b/arch/tde-extra/tde-gtk3-tqt-engine/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/themes/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="gtk3 tqt engine" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('00a83443141c5c588f41e72ef74ceaf7') +md5sums=('a3078835150c1c83dfe733fb0d730ad1') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-kile/PKGBUILD b/arch/tde-extra/tde-kile/PKGBUILD new file mode 100644 index 000000000..d57e2b6eb --- /dev/null +++ b/arch/tde-extra/tde-kile/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kile +_cat=applications/office/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.12 +pkgrel=1 +pkgdesc="TDE Integrated LaTeX Environment" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('03b36fb00b27ce2df4f4ef8b91abed8f') + +[ -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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install + msg "Removing conflicting syntax files" + rm -rf ${pkgdir}/opt/trinity/share/apps/katepart +} diff --git a/arch/tde-extra/tde-kmplayer/PKGBUILD b/arch/tde-extra/tde-kmplayer/PKGBUILD index 70029df30..049480cf3 100644 --- a/arch/tde-extra/tde-kmplayer/PKGBUILD +++ b/arch/tde-extra/tde-kmplayer/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/multimedia/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE KMPlayer" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('bafbf516d47a05cfe2e943f27a93408c') +md5sums=('00e1b5dc90d38c6b1f85cc86ce31d5b0') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-kmymoney/PKGBUILD b/arch/tde-extra/tde-kmymoney/PKGBUILD new file mode 100644 index 000000000..f0aa5b39e --- /dev/null +++ b/arch/tde-extra/tde-kmymoney/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=kmymoney +_cat=applications/office/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.12 +pkgrel=1 +pkgdesc="Personal finance manager for TDE" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdelibs' + 'libofx' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('ce63a58983e8e5400861f0b3d782e6c9') + +[ -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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON \ + -DBUILD_DEVELOPER_DOCS="OFF" + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-krusader/PKGBUILD b/arch/tde-extra/tde-krusader/PKGBUILD index e53722835..48b669da2 100644 --- a/arch/tde-extra/tde-krusader/PKGBUILD +++ b/arch/tde-extra/tde-krusader/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/system/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE Krusader" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('2040364b94ba52f8c8c8961b50e7296f') +md5sums=('08dca0604ad9c3ceb495cfb093d32e44') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD index 55931d492..f168a4960 100644 --- a/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD +++ b/arch/tde-extra/tde-ksplash-engine-moodin/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/themes/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE KSplash Engine Moodin" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('dcb22daf00d9604f284d1315b2870f5e') +md5sums=('92d27418e368ae05cdbc212cb28660f1') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-style-domino/PKGBUILD b/arch/tde-extra/tde-style-domino/PKGBUILD new file mode 100644 index 000000000..603671a8f --- /dev/null +++ b/arch/tde-extra/tde-style-domino/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer: Michael Manley <mmanley@nasutek.com> +# Contributor: David C. Rankin <drankinatty at gmail dot com> + +_mod=tde-style-domino +_cat=applications/themes/ +_kdemod="${_mod/tde/kde}" + +pkgname="tde-${_mod}" +pkgver=14.0.12 +pkgrel=1 +pkgdesc="Domino widget style and twin decoration for TDE" +arch=('i686' 'x86_64') +url="https://scm.trinitydesktop.org/scm/git/${_mod}" +license=('GPL') +provides=("${_mod}") +groups=('tde-complete') +depends=( + 'tde-tdebase' +) +makedepends=( + 'tde-cmake-trinity' +) +optdepends=() +conflicts=("trinity-${_mod}" "kdemod3-${_kdemod}") +replaces=("trinity-${_mod}") +options=('staticlibs' 'libtool' '!strip') +install= + +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('8253c84df5f816b5e031ba3f13554386') + +[ -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=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${_mod}-trinity-${pkgver} \ + -GNinja \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \ + -DBUILD_ALL=ON \ + -DWITH_ALL_OPTIONS=ON + + msg "Building - ${pkgname}..." + ninja $NUMJOBS +} + +package() { + msg "Packaging - ${pkgname}-${pkgver}" + cd "$srcdir/build" + DESTDIR="$pkgdir" ninja -j1 install +} diff --git a/arch/tde-extra/tde-style-qtcurve/PKGBUILD b/arch/tde-extra/tde-style-qtcurve/PKGBUILD index 9f3003db6..04e30ca7d 100644 --- a/arch/tde-extra/tde-style-qtcurve/PKGBUILD +++ b/arch/tde-extra/tde-style-qtcurve/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/themes/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE Style QTCurve" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('145c6de3ab7c8910feff4d3b2e2e0dc4') +md5sums=('ae19bf2b511b7da7f27f1ddc5979893e') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-systemsettings/PKGBUILD b/arch/tde-extra/tde-systemsettings/PKGBUILD index faaa47b1c..554a1b0ee 100644 --- a/arch/tde-extra/tde-systemsettings/PKGBUILD +++ b/arch/tde-extra/tde-systemsettings/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/settings/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE System Settings" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('17d6a2c9a6135680162a10de6ca0f4ae') +md5sums=('aed70440548689af112dd493b9587063') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD index 98e554999..21add833d 100644 --- a/arch/tde-extra/tde-tdeaccessibility/PKGBUILD +++ b/arch/tde-extra/tde-tdeaccessibility/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Accessibility utilities for the TDE Desktop" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('f364bf5a1a460c2278f78b99ded4d646') +md5sums=('4d45f1d2c9b5d4900cefeffc80c9d01a') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdeaddons/PKGBUILD b/arch/tde-extra/tde-tdeaddons/PKGBUILD index 2fe6f8d5c..fa594a0d0 100644 --- a/arch/tde-extra/tde-tdeaddons/PKGBUILD +++ b/arch/tde-extra/tde-tdeaddons/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('70b3c7131761a0c405942614ea8f5243') +md5sums=('c71cf752673ec1b4169dc5b5a0118ffe') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdeedu/PKGBUILD b/arch/tde-extra/tde-tdeedu/PKGBUILD index c5988fc4e..82d1ae384 100644 --- a/arch/tde-extra/tde-tdeedu/PKGBUILD +++ b/arch/tde-extra/tde-tdeedu/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Educational utilities for the TDE Desktop" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('10d3f00e8539e7bb74ecb02c6a91c507') +md5sums=('e3490fae70dfb7f6a0c7763f11020399') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdegames/PKGBUILD b/arch/tde-extra/tde-tdegames/PKGBUILD index 5c12f1e0a..c95ddfdba 100644 --- a/arch/tde-extra/tde-tdegames/PKGBUILD +++ b/arch/tde-extra/tde-tdegames/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('ef150b0d95ed82704e6d622da077dd60') +md5sums=('dce9a881d00f4187ef36f04aea1a7d17') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdemultimedia/PKGBUILD b/arch/tde-extra/tde-tdemultimedia/PKGBUILD index 89c71dcbd..b23b2e4c3 100644 --- a/arch/tde-extra/tde-tdemultimedia/PKGBUILD +++ b/arch/tde-extra/tde-tdemultimedia/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Desktop MultiMedia Components" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('dc18c8aa1cdd7f4cbbb6628378ad0e82') +md5sums=('5e1356fd402b11b9e774f2aa5c50985d') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdenetwork/PKGBUILD b/arch/tde-extra/tde-tdenetwork/PKGBUILD index 6d405c578..378935813 100644 --- a/arch/tde-extra/tde-tdenetwork/PKGBUILD +++ b/arch/tde-extra/tde-tdenetwork/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -20,7 +20,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('c5ec9a45b636c8da74d71194ed384b81') +md5sums=('5048cf9f889c2a8e8fd64c76224ee27f') # install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD index f6ca86d33..d11df23ab 100644 --- a/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD +++ b/arch/tde-extra/tde-tdenetworkmanager/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/settings/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="gtk qt engine" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('9e36a8f2697081bdb92589ea914980f0') +md5sums=('79c8188473e95ca85b8fb8b438c810f7') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdepim/PKGBUILD b/arch/tde-extra/tde-tdepim/PKGBUILD index 706aed242..c87adf2c7 100644 --- a/arch/tde-extra/tde-tdepim/PKGBUILD +++ b/arch/tde-extra/tde-tdepim/PKGBUILD @@ -6,7 +6,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Desktop PIM Components" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=("${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('55519a87ac6c16da15c4b1364e2c33f3') +md5sums=('9ddb88a43eb99aa811049465711f0b46') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdepowersave/PKGBUILD b/arch/tde-extra/tde-tdepowersave/PKGBUILD index 968037a4b..d59974f7e 100644 --- a/arch/tde-extra/tde-tdepowersave/PKGBUILD +++ b/arch/tde-extra/tde-tdepowersave/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/system/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Desktop Enviroment - ${_mod}" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('68686e75e26795c31d051cf84e0fd06a') +md5sums=('68ce639931ea71db005f8d0b04e6056f') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdesudo/PKGBUILD b/arch/tde-extra/tde-tdesudo/PKGBUILD index 6c62c34c9..d20cfb5cc 100644 --- a/arch/tde-extra/tde-tdesudo/PKGBUILD +++ b/arch/tde-extra/tde-tdesudo/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/settings/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE Sudo" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('5943e82101e4a19499fcfd8cc21388e4') +md5sums=('bb4b1a81fcf57661647dcafb8492e84c') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdetoys/PKGBUILD b/arch/tde-extra/tde-tdetoys/PKGBUILD index 445bb144a..ad0835ae1 100644 --- a/arch/tde-extra/tde-tdetoys/PKGBUILD +++ b/arch/tde-extra/tde-tdetoys/PKGBUILD @@ -5,7 +5,7 @@ _cat=core/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 arch=('i686' 'x86_64') url="https://scm.trinitydesktop.org/scm/git/${_mod}" @@ -19,7 +19,7 @@ conflicts=("trinity-${_mod}" "trinity-${_kdemod}") 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=('2bb8f5d47d4e094e459597b5069b7a3d') +md5sums=('716916107b87ec5cf16b8ca5c51b6d4c') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tdmtheme/PKGBUILD b/arch/tde-extra/tde-tdmtheme/PKGBUILD index 8d931d10e..5db2d9827 100644 --- a/arch/tde-extra/tde-tdmtheme/PKGBUILD +++ b/arch/tde-extra/tde-tdmtheme/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/themes/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod/tde-}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDM Theme" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") 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=('6428e97a82389819dd02e1608cd43b8b') +md5sums=('ab41cdf18750b0108458abf4f87d8bd5') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-tork/PKGBUILD b/arch/tde-extra/tde-tork/PKGBUILD index ff7dbd53b..335e18dd9 100644 --- a/arch/tde-extra/tde-tork/PKGBUILD +++ b/arch/tde-extra/tde-tork/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/internet/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Anonymity manager for TDE" arch=('i686' 'x86_64') @@ -27,7 +27,7 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('5833c06b815dc333f921dfdc6d7d844b') +md5sums=('c7be5ce0ed1cb5d4cfb6817adc74cfb6') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD index cbe5cf1d2..52759c833 100644 --- a/arch/tde-extra/tde-twin-style-crystal/PKGBUILD +++ b/arch/tde-extra/tde-twin-style-crystal/PKGBUILD @@ -5,7 +5,7 @@ _cat=applications/themes/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="TDE TWin Style Crystal" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}") replaces=("trinity-${_kdemod}") options=('staticlibs' 'libtool' '!strip') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('b435ddeae50565fd440dc3705f503218') +md5sums=('3752135a01154bb63996fceaf7c251a2') install='' [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity diff --git a/arch/tde-extra/tde-yakuake/PKGBUILD b/arch/tde-extra/tde-yakuake/PKGBUILD index 6ae669d96..87886c30a 100644 --- a/arch/tde-extra/tde-yakuake/PKGBUILD +++ b/arch/tde-extra/tde-yakuake/PKGBUILD @@ -6,7 +6,7 @@ _cat=applications/system/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="A Quake-style terminal emulator based on TDE Konsole technology" arch=('i686' 'x86_64') @@ -25,7 +25,7 @@ options=('staticlibs' 'libtool' '!strip') install= source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('77fb98c6bfd0d5e91b38417ae39083e4') +md5sums=('d3836b4624ac1254fd2fb40b2e69341e') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-libs/tde-libcaldav/PKGBUILD b/arch/tde-libs/tde-libcaldav/PKGBUILD index 2759e3d0e..04102921c 100644 --- a/arch/tde-libs/tde-libcaldav/PKGBUILD +++ b/arch/tde-libs/tde-libcaldav/PKGBUILD @@ -6,7 +6,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="A client library adding support for the CalDAV protocol (rfc4791)" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ 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=('75662017b1a02ffc631e5120b7addfd0') +md5sums=('fe296650d0777cd2cd0edcb092b2cdb6') _prefix=/usr diff --git a/arch/tde-libs/tde-libcarddav/PKGBUILD b/arch/tde-libs/tde-libcarddav/PKGBUILD index 58250939e..4120d5ae1 100644 --- a/arch/tde-libs/tde-libcarddav/PKGBUILD +++ b/arch/tde-libs/tde-libcarddav/PKGBUILD @@ -6,7 +6,7 @@ _cat=dependencies/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="A client library adding support for the CardDAV protocol" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ provides=("${_mod}") # conflicts=() replaces=("trinity-${_mod}") source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('79e1c4e92751eb72c843ce0ddc70e5fe') +md5sums=('fb818ef1597b4f5cb4028b25b7ca26c8') _prefix=/usr diff --git a/arch/tde-libs/tde-libkdcraw/PKGBUILD b/arch/tde-libs/tde-libkdcraw/PKGBUILD index 9dd9cfdc2..bf2ab4815 100644 --- a/arch/tde-libs/tde-libkdcraw/PKGBUILD +++ b/arch/tde-libs/tde-libkdcraw/PKGBUILD @@ -6,7 +6,7 @@ _cat=libraries/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('2daaa1a383d0ccdfd914c29db7f05c37') +md5sums=('5475e0b6c71879516579373a6c7bb523') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-libs/tde-libkexiv2/PKGBUILD b/arch/tde-libs/tde-libkexiv2/PKGBUILD index 3d89af561..15c4d66bd 100644 --- a/arch/tde-libs/tde-libkexiv2/PKGBUILD +++ b/arch/tde-libs/tde-libkexiv2/PKGBUILD @@ -6,7 +6,7 @@ _cat=libraries/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="The EXIV2 Library interface for TDE kipi-plugins" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ conflicts=("trinity-${_mod}") replaces=("trinity-${_mod}") options=('staticlibs' 'libtool' '!emptydirs') source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") -md5sums=('94635dfeca198fce57cb45a15d31a222') +md5sums=('f86d32878031edb6e60796bfa047b8d5') [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3 diff --git a/arch/tde-meta/PKGBUILD b/arch/tde-meta/PKGBUILD index 863867c1f..92ddf2457 100644 --- a/arch/tde-meta/PKGBUILD +++ b/arch/tde-meta/PKGBUILD @@ -1,5 +1,5 @@ pkgname=tde-meta -pkgver=14.0.11 +pkgver=14.0.12 pkgrel=1 pkgdesc="Trinity Desktop Environment" arch=('any') @@ -8,6 +8,7 @@ license=('GPL') depends=( # tde-base 'tde-i18n' + 'tde-polkit-agent-tde' 'tde-tdeadmin' 'tde-tdeartwork' 'tde-tdebindings' @@ -21,6 +22,7 @@ depends=( 'tde-dbus-1-tqt' 'tde-dbus-tqt' 'tde-libart-lgpl' + 'tde-polkit-tqt' 'tde-tdebase' 'tde-tdelibs' 'tde-tqca' @@ -46,9 +48,12 @@ depends=( 'tde-basket' 'tde-gtk3-tqt-engine' 'tde-gtk-qt-engine' + 'tde-kile' 'tde-kmplayer' + 'tde-kmymoney' 'tde-krusader' 'tde-ksplash-engine-moodin' + 'tde-style-domino' 'tde-style-qtcurve' 'tde-systemsettings' 'tde-tdeaccessibility' |