[arch-commits] Commit in phonon/repos (8 files)

Antonio Rojas arojas at archlinux.org
Thu Mar 3 18:54:46 UTC 2016


    Date: Thursday, March 3, 2016 @ 19:54:46
  Author: arojas
Revision: 260678

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  phonon/repos/extra-i686/PKGBUILD
    (from rev 260677, phonon/trunk/PKGBUILD)
  phonon/repos/extra-i686/qt-5.4.2.patch
    (from rev 260677, phonon/trunk/qt-5.4.2.patch)
  phonon/repos/extra-x86_64/PKGBUILD
    (from rev 260677, phonon/trunk/PKGBUILD)
  phonon/repos/extra-x86_64/qt-5.4.2.patch
    (from rev 260677, phonon/trunk/qt-5.4.2.patch)
Deleted:
  phonon/repos/extra-i686/PKGBUILD
  phonon/repos/extra-i686/qt-5.4.2.patch
  phonon/repos/extra-x86_64/PKGBUILD
  phonon/repos/extra-x86_64/qt-5.4.2.patch

-----------------------------+
 /PKGBUILD                   |  152 ++++++++++++++++++++++++++++++++++++++++++
 /qt-5.4.2.patch             |   46 ++++++++++++
 extra-i686/PKGBUILD         |   76 ---------------------
 extra-i686/qt-5.4.2.patch   |   23 ------
 extra-x86_64/PKGBUILD       |   76 ---------------------
 extra-x86_64/qt-5.4.2.patch |   23 ------
 6 files changed, 198 insertions(+), 198 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-03-03 18:53:49 UTC (rev 260677)
+++ extra-i686/PKGBUILD	2016-03-03 18:54:46 UTC (rev 260678)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=phonon
-pkgname=('phonon-qt4' 'phonon-qt5')
-pkgver=4.8.3
-pkgrel=5
-arch=('i686' 'x86_64')
-url='http://phonon.kde.org/'
-license=('LGPL')
-makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools' 'qt5-quick1')
-options=('!emptydirs')
-source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'qt-5.4.2.patch')
-md5sums=('88bb9867261803eed61ff53a7c026338'
-         '0235218127e47f646dd037661970aa97')
-
-prepare() {
-  mkdir build
-  mkdir build-qt5
-
-# Fix build with Qt 5.4.2
-  cd $pkgbase-$pkgver
-  patch -p1 -i "$srcdir"/qt-5.4.2.patch
-}
-
-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=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
-  optdepends=('pulseaudio: PulseAudio support')
-  replaces=('phonon')
-  provides=('phonon')
-  conflicts=('phonon')
-
-  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=('phonon-qt5-backend' 'libpulse' 'qt5-base')
-  optdepends=('pulseaudio: PulseAudio support')
-
-  cd build-qt5
-  make DESTDIR="${pkgdir}" install
-}

Copied: phonon/repos/extra-i686/PKGBUILD (from rev 260677, phonon/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-03-03 18:54:46 UTC (rev 260678)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon
+pkgname=('phonon-qt4' 'phonon-qt5')
+pkgver=4.8.3
+pkgrel=6
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools')
+options=('!emptydirs')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'qt-5.4.2.patch')
+md5sums=('88bb9867261803eed61ff53a7c026338'
+         '0235218127e47f646dd037661970aa97')
+
+prepare() {
+  mkdir build
+  mkdir build-qt5
+
+# Fix build with Qt 5.4.2
+  cd $pkgbase-$pkgver
+  patch -p1 -i "$srcdir"/qt-5.4.2.patch
+}
+
+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=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
+  optdepends=('pulseaudio: PulseAudio support')
+  replaces=('phonon')
+  provides=('phonon')
+  conflicts=('phonon')
+
+  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=('phonon-qt5-backend' 'libpulse' 'qt5-base')
+  optdepends=('pulseaudio: PulseAudio support')
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/qt-5.4.2.patch
===================================================================
--- extra-i686/qt-5.4.2.patch	2016-03-03 18:53:49 UTC (rev 260677)
+++ extra-i686/qt-5.4.2.patch	2016-03-03 18:54:46 UTC (rev 260678)
@@ -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}")
-

Copied: phonon/repos/extra-i686/qt-5.4.2.patch (from rev 260677, phonon/trunk/qt-5.4.2.patch)
===================================================================
--- extra-i686/qt-5.4.2.patch	                        (rev 0)
+++ extra-i686/qt-5.4.2.patch	2016-03-03 18:54:46 UTC (rev 260678)
@@ -0,0 +1,23 @@
+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}")
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-03-03 18:53:49 UTC (rev 260677)
+++ extra-x86_64/PKGBUILD	2016-03-03 18:54:46 UTC (rev 260678)
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=phonon
-pkgname=('phonon-qt4' 'phonon-qt5')
-pkgver=4.8.3
-pkgrel=5
-arch=('i686' 'x86_64')
-url='http://phonon.kde.org/'
-license=('LGPL')
-makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools' 'qt5-quick1')
-options=('!emptydirs')
-source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'qt-5.4.2.patch')
-md5sums=('88bb9867261803eed61ff53a7c026338'
-         '0235218127e47f646dd037661970aa97')
-
-prepare() {
-  mkdir build
-  mkdir build-qt5
-
-# Fix build with Qt 5.4.2
-  cd $pkgbase-$pkgver
-  patch -p1 -i "$srcdir"/qt-5.4.2.patch
-}
-
-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=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
-  optdepends=('pulseaudio: PulseAudio support')
-  replaces=('phonon')
-  provides=('phonon')
-  conflicts=('phonon')
-
-  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=('phonon-qt5-backend' 'libpulse' 'qt5-base')
-  optdepends=('pulseaudio: PulseAudio support')
-
-  cd build-qt5
-  make DESTDIR="${pkgdir}" install
-}

Copied: phonon/repos/extra-x86_64/PKGBUILD (from rev 260677, phonon/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-03-03 18:54:46 UTC (rev 260678)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon
+pkgname=('phonon-qt4' 'phonon-qt5')
+pkgver=4.8.3
+pkgrel=6
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools')
+options=('!emptydirs')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'qt-5.4.2.patch')
+md5sums=('88bb9867261803eed61ff53a7c026338'
+         '0235218127e47f646dd037661970aa97')
+
+prepare() {
+  mkdir build
+  mkdir build-qt5
+
+# Fix build with Qt 5.4.2
+  cd $pkgbase-$pkgver
+  patch -p1 -i "$srcdir"/qt-5.4.2.patch
+}
+
+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=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
+  optdepends=('pulseaudio: PulseAudio support')
+  replaces=('phonon')
+  provides=('phonon')
+  conflicts=('phonon')
+
+  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=('phonon-qt5-backend' 'libpulse' 'qt5-base')
+  optdepends=('pulseaudio: PulseAudio support')
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/qt-5.4.2.patch
===================================================================
--- extra-x86_64/qt-5.4.2.patch	2016-03-03 18:53:49 UTC (rev 260677)
+++ extra-x86_64/qt-5.4.2.patch	2016-03-03 18:54:46 UTC (rev 260678)
@@ -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}")
-

Copied: phonon/repos/extra-x86_64/qt-5.4.2.patch (from rev 260677, phonon/trunk/qt-5.4.2.patch)
===================================================================
--- extra-x86_64/qt-5.4.2.patch	                        (rev 0)
+++ extra-x86_64/qt-5.4.2.patch	2016-03-03 18:54:46 UTC (rev 260678)
@@ -0,0 +1,23 @@
+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