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 /arch/tde-extra/tde-amarok | |
| parent | 4a4b5b038b986cfa18a3526e3e811b1aacf415a7 (diff) | |
| download | tde-packaging-c0059995dde778fd838de18f649a8d12d0bef39a.tar.gz tde-packaging-c0059995dde778fd838de18f649a8d12d0bef39a.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)
Diffstat (limited to 'arch/tde-extra/tde-amarok')
| -rw-r--r-- | arch/tde-extra/tde-amarok/PKGBUILD | 14 | ||||
| -rw-r--r-- | arch/tde-extra/tde-amarok/bp000-fix-configure-tests.diff | 28 |
2 files changed, 39 insertions, 3 deletions
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; } " |