summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-02-24 18:32:22 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-02-24 18:32:22 -0200
commitbf2824ca3cc22bb746ca7baef50651ef8e516b2b (patch)
tree384b193e688fe7b97b23ea57fa1495004961923b
parent033b7d65ba9fab251b72c1e971da87614a990ca3 (diff)
downloadabslibre-bf2824ca3cc22bb746ca7baef50651ef8e516b2b.tar.gz
abslibre-bf2824ca3cc22bb746ca7baef50651ef8e516b2b.tar.bz2
abslibre-bf2824ca3cc22bb746ca7baef50651ef8e516b2b.zip
clementine-libre-1.2.2-1: updating version
-rw-r--r--libre/clementine-libre/PKGBUILD30
-rw-r--r--libre/clementine-libre/clementine-unistd.patch11
-rw-r--r--libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch46
3 files changed, 30 insertions, 57 deletions
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index e74b26c45..4468b7832 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103980 2014-01-14 12:52:23Z jgc $
+# $Id: PKGBUILD 106122 2014-02-23 15:32:14Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: BlackEagle <ike.devolder@gmail.com>
@@ -9,8 +9,8 @@
_pkgname=clementine
pkgname=clementine-libre
-pkgver=1.2.1
-pkgrel=2.1
+pkgver=1.2.2
+pkgrel=1
pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
url="http://www.clementine-player.org/"
license=('GPL')
@@ -26,17 +26,19 @@ replaces=('clementine')
conflicts=('clementine')
provides=("clementine=$pkgver")
install=clementine.install
-mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
+mksource=("${_pkgname}-${pkgver}.tar.gz::https://github.com/clementine-player/Clementine/archive/${pkgver}.tar.gz"
'remove-nonfree-artwork-and-spotify.patch'
'moognu.png')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
- '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ "${_pkgname}-unistd.patch")
+mksha256sums=('1f674c42f05c476baf74f1dd37b1aa357ff9199e4493173052c856a53e5f0a96'
+ '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b'
'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
-sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2')
+sha256sums=('02d799056435f244a319eea110672c404c8804a2418677253d5cdd4ea01a340f'
+ 'bb02f82c3bcdad542396fc0788010321d618fc0545d34d00fee63bed987a0bbf')
mksource() {
- cd ${_pkgname}-${pkgver}
+ cd Clementine-${pkgver}
# remove nonfree nonfree artwork and spotify references on files
patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
@@ -61,8 +63,14 @@ mksource() {
touch data/schema/schema-30.sql
}
+prepare() {
+ cd Clementine-${pkgver}
+
+ patch -Np1 -i ../${_pkgname}-unistd.patch
+}
+
build() {
- cd ${_pkgname}-${pkgver}
+ cd Clementine-${pkgver}
if [[ -d build ]]; then
rm -rf build
@@ -74,7 +82,7 @@ build() {
}
package() {
- cd ${_pkgname}-${pkgver}/build
+ cd Clementine-${pkgver}/build
make DESTDIR="${pkgdir}" install
}
diff --git a/libre/clementine-libre/clementine-unistd.patch b/libre/clementine-libre/clementine-unistd.patch
new file mode 100644
index 000000000..9bd053b60
--- /dev/null
+++ b/libre/clementine-libre/clementine-unistd.patch
@@ -0,0 +1,11 @@
+diff -rupN Clementine-1.2.2.orig/src/core/utilities.cpp Clementine-1.2.2/src/core/utilities.cpp
+--- Clementine-1.2.2.orig/src/core/utilities.cpp 2014-02-23 16:14:06.919406700 +0100
++++ Clementine-1.2.2/src/core/utilities.cpp 2014-02-23 16:16:12.107064900 +0100
+@@ -50,6 +50,7 @@
+ #endif
+
+ #ifdef Q_OS_LINUX
++# include <unistd.h>
+ # include <sys/syscall.h>
+ #endif
+ #ifdef Q_OS_DARWIN
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 38bac21bf..8c1b9aafd 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -157,52 +157,6 @@ index e054619..3568a6f 100755
for plugin in QT_PLUGINS:
FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi
-index 038a60b..1d29a9e 100644
---- a/dist/windows/clementine.nsi
-+++ b/dist/windows/clementine.nsi
-@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
- Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
- Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
-
-- ; 1.0 prerelease
-- Delete "$INSTDIR\spotify.dll"
--
- ; 1.0
- Delete "$INSTDIR\libofa.dll"
- Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
-@@ -128,7 +125,6 @@ Section "Clementine" Clementine
- File "avutil-51.dll"
- File "clementine.exe"
- File "clementine-tagreader.exe"
-- File "clementine-spotifyblob.exe"
- File "clementine.ico"
- File "glew32.dll"
- File "intl.dll"
-@@ -181,7 +177,6 @@ Section "Clementine" Clementine
- File "libqjson.dll"
- File "libsoup-2.4-1.dll"
- File "libspeex-1.dll"
-- File "libspotify.dll"
- File "libstdc++-6.dll"
- File "libtag.dll"
- File "libtasn1-3.dll"
-@@ -939,7 +934,6 @@ Section "Uninstall"
- Delete "$INSTDIR\clementine.ico"
- Delete "$INSTDIR\clementine.exe"
- Delete "$INSTDIR\clementine-tagreader.exe"
-- Delete "$INSTDIR\clementine-spotifyblob.exe"
- Delete "$INSTDIR\glew32.dll"
- Delete "$INSTDIR\intl.dll"
- Delete "$INSTDIR\libcdio-14.dll"
-@@ -992,7 +986,6 @@ Section "Uninstall"
- Delete "$INSTDIR\libqjson.dll"
- Delete "$INSTDIR\libsoup-2.4-1.dll"
- Delete "$INSTDIR\libspeex-1.dll"
-- Delete "$INSTDIR\libspotify.dll"
- Delete "$INSTDIR\libstdc++-6.dll"
- Delete "$INSTDIR\libtag.dll"
- Delete "$INSTDIR\libtasn1-3.dll"
diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
index 750b332..6bf47ff 100644
--- a/dist/windows/clementine.nsi.in