diff options
| author | Eduardo Sánchez Muñoz | 2017-03-11 20:34:11 +0100 |
|---|---|---|
| committer | Eduardo Sánchez Muñoz | 2017-03-11 20:34:11 +0100 |
| commit | bd90f661cdb4882e2af0aba111317afe105eb63e (patch) | |
| tree | 67669ceeb17a6323b65f2688acd884fdb970e8d9 | |
| parent | a6678294a966a812b76037077bcb3c2f1ebc4791 (diff) | |
| download | aur-bd90f661cdb4882e2af0aba111317afe105eb63e.tar.gz | |
Workaround Qt5 moc bug.
See: https://bugzilla.redhat.com/show_bug.cgi?id=1396755
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | moc-fix.diff | 13 |
3 files changed, 25 insertions, 5 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Feb 27 06:28:02 UTC 2017 +# Sat Mar 11 19:33:48 UTC 2017 pkgbase = clementine-git pkgdesc = A modern music player and library organizer - pkgver = 1.3.1.r287.g652f38ac8 + pkgver = 1.3.1.r306.g021570781 pkgrel = 1 url = http://www.clementine-player.org/ arch = i686 @@ -42,7 +42,9 @@ pkgbase = clementine-git optdepends = gst-libav: Libav plugin optdepends = gvfs: Various devices support source = git+https://github.com/clementine-player/Clementine.git + source = moc-fix.diff sha256sums = SKIP + sha256sums = 39325b46ad17259e8a1a6987d0875375c13c352760610f4cb05b6c043ff07dd4 pkgname = clementine-git @@ -7,7 +7,7 @@ # Based on community/clementine PKGBUILD pkgname=clementine-git -pkgver=1.3.1.r287.g652f38ac8 +pkgver=1.3.1.r306.g021570781 pkgrel=1 pkgdesc='A modern music player and library organizer' url='http://www.clementine-player.org/' @@ -24,14 +24,19 @@ optdepends=('gst-plugins-base: "Base" plugin libraries' 'gst-plugins-ugly: "Ugly" plugin libraries' 'gst-libav: Libav plugin' 'gvfs: Various devices support') -source=("git+https://github.com/clementine-player/Clementine.git") -sha256sums=('SKIP') +source=("git+https://github.com/clementine-player/Clementine.git" "moc-fix.diff") +sha256sums=('SKIP' '39325b46ad17259e8a1a6987d0875375c13c352760610f4cb05b6c043ff07dd4') pkgver() { cd "$srcdir/Clementine" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } +prepare() { + cd "$srcdir/Clementine" + git apply "$srcdir/moc-fix.diff" +} + build() { mkdir -p "$srcdir/clementine-build" cd "$srcdir/clementine-build" diff --git a/moc-fix.diff b/moc-fix.diff new file mode 100644 index 000000000000..ff8fb8a115db --- /dev/null +++ b/moc-fix.diff @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2243d4481..f0a8a569b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1199,7 +1199,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/version.h) + +-qt4_wrap_cpp(MOC ${HEADERS}) ++qt4_wrap_cpp(MOC ${HEADERS} OPTIONS "-D_SYS_SYSMACROS_H_OUTER") + qt4_wrap_ui(UIC ${UI}) + qt4_add_resources(QRC ${RESOURCES}) + |