Tue Feb 25 03:19:16 UTC 2014

6 files changed, 41 insertions, 66 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
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index a565c8421..6d883edd9 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104515 2014-01-22 06:55:21Z spupykin $
+# $Id: PKGBUILD 106153 2014-02-24 09:49:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -11,8 +11,8 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=8.1
-pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
+pkgrel=9
+pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation and without nonfree components"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
 license=('GPL' 'custom')
@@ -39,7 +39,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"polkit.rules"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
-         '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+         '4d3cc17703a9a477a32db486c257a305'
          '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
@@ -93,7 +93,8 @@ build() {
     --enable-libusb \
     --enable-libcec \
     --enable-external-libraries \
-    --enable-external-ffmpeg
+    --enable-external-ffmpeg \
+    --disable-non-free
   # Now (finally) build
   make
 }
@@ -121,7 +122,7 @@ package() {
   done
 
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
-  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
+#  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+#  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index 32626f28f..8076fe2d3 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -3,7 +3,8 @@ post_install() {
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
   getent group xbmc > /dev/null || groupadd -r xbmc
   getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
-  usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+  usermod -a -G xbmc,audio,video,network,optical xbmc
+  mkdir -p var/lib/xbmc
   chown -R xbmc:xbmc var/lib/xbmc
 }
 
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index b6430e255..9987dfeb9 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -6,7 +6,7 @@ After = remote-fs.target
 User = xbmc
 Group = xbmc
 Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+ExecStart = /usr/bin/xinit /usr/bin/dbus-launch /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
 Restart = on-abort
 
 [Install]