diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-10-28 01:38:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-10-28 01:38:39 +0200 |
| commit | ddc027255b1bafb5c0544a60947b7c448140e384 (patch) | |
| tree | 37e8b384eadf2f7f32e478ca41f10d3610b7aedd /arch/tde-extra/tde-amarok | |
| parent | a5c233945a54cedfcaf97a8d839b09a68b228e85 (diff) | |
| download | tde-packaging-ddc027255b1bafb5c0544a60947b7c448140e384.tar.gz tde-packaging-ddc027255b1bafb5c0544a60947b7c448140e384.zip | |
ArchLinux: Update for final R14.0.13.
Add aarch64 and armv7h to architectures.
Add pkgbuilds for several applications.
Add pkgbuild for libkipi library.
Add pkgbuilds for dependencies.
Remove dependence on Python 2.
Remove backported patches.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'arch/tde-extra/tde-amarok')
| -rw-r--r-- | arch/tde-extra/tde-amarok/PKGBUILD | 16 | ||||
| -rw-r--r-- | arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff | 28 |
2 files changed, 4 insertions, 40 deletions
diff --git a/arch/tde-extra/tde-amarok/PKGBUILD b/arch/tde-extra/tde-amarok/PKGBUILD index 0dc0b2db0..bf7771377 100644 --- a/arch/tde-extra/tde-amarok/PKGBUILD +++ b/arch/tde-extra/tde-amarok/PKGBUILD @@ -5,10 +5,10 @@ _cat=applications/multimedia/ _kdemod="${_mod/tde/kde}" pkgname="tde-${_mod}" -pkgver=14.0.12 +pkgver=14.0.13 pkgrel=1 pkgdesc="TDE Amarok" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'aarch64' 'armv7h') url="https://scm.trinitydesktop.org/scm/git/${_mod}" license=('GPL') groups=('tde-extra') @@ -18,20 +18,12 @@ 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" - 'bp000-fix-configure-tests.diff') -md5sums=('bf63df52af7ea829fb07b3a2615bf30e' - '967ae8710e90d9e7a3a519ed08e437ed') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz") +md5sums=('6985738985bc2cb99ee599a1b3e38739') 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 deleted file mode 100644 index 5668cc562..000000000 --- a/arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff +++ /dev/null @@ -1,28 +0,0 @@ -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; } " |