summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Sánchez Muñoz2017-03-15 00:02:45 +0100
committerEduardo Sánchez Muñoz2017-03-15 00:02:45 +0100
commitba19e89e054e9f03c79588a99a39ddc2d97b2b1e (patch)
tree672e28d88f0c21301968beb1b5822006958d3eb7
parentbd90f661cdb4882e2af0aba111317afe105eb63e (diff)
downloadaur-ba19e89e054e9f03c79588a99a39ddc2d97b2b1e.tar.gz
Remove moc fix.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--moc-fix.diff13
3 files changed, 5 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 43a0bcf0901..189436ac782 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sat Mar 11 19:33:48 UTC 2017
+# Tue Mar 14 23:02:25 UTC 2017
pkgbase = clementine-git
pkgdesc = A modern music player and library organizer
- pkgver = 1.3.1.r306.g021570781
+ pkgver = 1.3.1.r312.gf7eea6c50
pkgrel = 1
url = http://www.clementine-player.org/
arch = i686
@@ -42,9 +42,7 @@ 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
diff --git a/PKGBUILD b/PKGBUILD
index dd0f9131a7e..a19bc5993ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
# Based on community/clementine PKGBUILD
pkgname=clementine-git
-pkgver=1.3.1.r306.g021570781
+pkgver=1.3.1.r312.gf7eea6c50
pkgrel=1
pkgdesc='A modern music player and library organizer'
url='http://www.clementine-player.org/'
@@ -24,8 +24,8 @@ 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" "moc-fix.diff")
-sha256sums=('SKIP' '39325b46ad17259e8a1a6987d0875375c13c352760610f4cb05b6c043ff07dd4')
+source=("git+https://github.com/clementine-player/Clementine.git")
+sha256sums=('SKIP')
pkgver() {
cd "$srcdir/Clementine"
@@ -34,7 +34,6 @@ pkgver() {
prepare() {
cd "$srcdir/Clementine"
- git apply "$srcdir/moc-fix.diff"
}
build() {
diff --git a/moc-fix.diff b/moc-fix.diff
deleted file mode 100644
index ff8fb8a115d..00000000000
--- a/moc-fix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-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})
-