[arch-commits] Commit in phonon/repos/extra-x86_64 (PKGBUILD PKGBUILD qt-5.4.2.patch)
Antonio Rojas
arojas at archlinux.org
Fri Feb 9 11:12:18 UTC 2018
Date: Friday, February 9, 2018 @ 11:12:18
Author: arojas
Revision: 316507
archrelease: copy trunk to extra-x86_64
Added:
phonon/repos/extra-x86_64/PKGBUILD
(from rev 316506, phonon/trunk/PKGBUILD)
Deleted:
phonon/repos/extra-x86_64/PKGBUILD
phonon/repos/extra-x86_64/qt-5.4.2.patch
----------------+
PKGBUILD | 140 +++++++++++++++++++++++++++----------------------------
qt-5.4.2.patch | 23 ---------
2 files changed, 70 insertions(+), 93 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-09 11:11:51 UTC (rev 316506)
+++ PKGBUILD 2018-02-09 11:12:18 UTC (rev 316507)
@@ -1,70 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=phonon
-pkgname=('phonon-qt4' 'phonon-qt5')
-pkgver=4.9.1
-pkgrel=4
-arch=('i686' 'x86_64')
-url='http://phonon.kde.org/'
-license=('LGPL')
-makedepends=('extra-cmake-modules' 'automoc4' 'libpulse' 'qt5-base' 'qt5-tools')
-source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.sig})
-md5sums=('7896a560f5da345a626e782610c8e71e'
- 'SKIP')
-validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter at kde.org>
-
-prepare() {
- mkdir build
- mkdir build-qt5
-}
-
-build() {
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
- -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
- -D__KDE_HAVE_GCC_VISIBILITY=NO \
- -DCMAKE_INSTALL_LIBDIR=lib
- make
-
- cd ../build-qt5
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
- -DPHONON_BUILD_PHONON4QT5=ON \
- -D__KDE_HAVE_GCC_VISIBILITY=NO \
- -DCMAKE_INSTALL_LIBDIR=lib
- make
-}
-
-package_phonon-qt4(){
- pkgdesc="The multimedia framework for KDE4"
- depends=('qt4' 'libpulse' 'phonon-qt4-backend')
- optdepends=('pulseaudio: PulseAudio support')
-
- cd build
- make DESTDIR="${pkgdir}" install
-
- # Install headers into the Qt4 dir
- install -d "${pkgdir}"/usr/include/qt4
- mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
-
- sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
- "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
-}
-
-package_phonon-qt5(){
- pkgdesc="The multimedia framework for KF5"
- depends=('libpulse' 'qt5-base' 'phonon-qt5-backend')
- optdepends=('pulseaudio: PulseAudio support')
-
- cd build-qt5
- make DESTDIR="${pkgdir}" install
-}
Copied: phonon/repos/extra-x86_64/PKGBUILD (from rev 316506, phonon/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-02-09 11:12:18 UTC (rev 316507)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon
+pkgname=(phonon-qt4 phonon-qt5)
+pkgver=4.9.1
+pkgrel=5
+arch=(x86_64)
+url='http://phonon.kde.org/'
+license=(LGPL)
+makedepends=(extra-cmake-modules libpulse qt4 qt5-base qt5-tools)
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig})
+sha256sums=('67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c'
+ 'SKIP')
+validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter at kde.org>
+
+prepare() {
+ mkdir build
+ mkdir build-qt5
+}
+
+build() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+ -D__KDE_HAVE_GCC_VISIBILITY=NO \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+
+ cd ../build-qt5
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DPHONON_BUILD_PHONON4QT5=ON \
+ -D__KDE_HAVE_GCC_VISIBILITY=NO \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+package_phonon-qt4(){
+ pkgdesc="The multimedia framework for KDE4"
+ depends=(qt4 libpulse phonon-qt4-backend)
+ optdepends=('pulseaudio: PulseAudio support')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ # Install headers into the Qt4 dir
+ install -d "$pkgdir"/usr/include/qt4
+ mv "$pkgdir"/usr/include/{phonon,KDE} "$pkgdir"/usr/include/qt4/
+
+ sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
+ "$pkgdir/usr/lib/pkgconfig/phonon.pc"
+}
+
+package_phonon-qt5(){
+ pkgdesc="The multimedia framework for KF5"
+ depends=(libpulse qt5-base phonon-qt5-backend)
+ optdepends=('pulseaudio: PulseAudio support')
+
+ cd build-qt5
+ make DESTDIR="$pkgdir" install
+}
Deleted: qt-5.4.2.patch
===================================================================
--- qt-5.4.2.patch 2018-02-09 11:11:51 UTC (rev 316506)
+++ qt-5.4.2.patch 2018-02-09 11:12:18 UTC (rev 316507)
@@ -1,23 +0,0 @@
-From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
-Date: Thu, 28 May 2015 15:56:47 +0000
-Subject: Yet another _include_dirs fix
-X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
----
-Yet another _include_dirs fix
-
-The variable is set as a definition, so mark it as such
----
-
-
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -409,7 +409,7 @@
- file(WRITE "${_source_file}" "${_source}")
- set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
-
-- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
-+ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
-
- if(NOT _compile_result)
- message("${_compile_output_var}")
-
More information about the arch-commits
mailing list