From e15d0ad388d58f6ab8841661760065ffaded6912 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 14 Jul 2014 01:29:51 -0300
Subject: xbmc-libre-lts-12.3-5: libnfs 1.9.4 build issue fixed

---
 libre/xbmc-libre-lts/PKGBUILD                    |  9 ++++++---
 libre/xbmc-libre-lts/libnfs-header-changes.patch | 24 ++++++++++++++++++++++++
 libre/xbmc-libre-lts/xbmc.service                |  2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 libre/xbmc-libre-lts/libnfs-header-changes.patch

(limited to 'libre/xbmc-libre-lts')

diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD
index 5596513a9..df8a55c76 100644
--- a/libre/xbmc-libre-lts/PKGBUILD
+++ b/libre/xbmc-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
 # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com>
@@ -12,7 +12,7 @@ _pkgname=xbmc
 pkgname=xbmc-libre-lts
 pkgver=12.3
 _codename=Frodo
-pkgrel=4
+pkgrel=5
 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -47,15 +47,17 @@ source=(
   'xbmc.service'
   "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285"
   '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
+  'libnfs-header-changes.patch'
 )
 mkmd5sums=(
   '7ae385ebf8e5cfcb917393235e6efbdb'
 )
 md5sums=(
   '10ed8b9cb84b2825d746c26bd5236899'
-  '12c9b4dfb8dd0d5b20cc230c28388160'
+  'a3e68ff230fac14cd58f2b5eff1661ba'
   '7fd6399d2ffbdf06b724f0cc2efa0784'
   '8998bc505ae4c66604c90b1c005be8c2'
+  '27f1e75d99977d5bdd3eee58921514cb'
 )
 
 mksource() {
@@ -70,6 +72,7 @@ prepare() {
 
   patch -p0 <$srcdir/libass.patch
   patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch"
+  patch -p1 -i "$srcdir/libnfs-header-changes.patch"
 
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
diff --git a/libre/xbmc-libre-lts/libnfs-header-changes.patch b/libre/xbmc-libre-lts/libnfs-header-changes.patch
new file mode 100644
index 000000000..ef3d45e2c
--- /dev/null
+++ b/libre/xbmc-libre-lts/libnfs-header-changes.patch
@@ -0,0 +1,24 @@
+diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
+index 85084a5..8efa7bf 100644
+--- a/xbmc/filesystem/NFSDirectory.cpp
++++ b/xbmc/filesystem/NFSDirectory.cpp
+@@ -37,6 +37,7 @@
+ using namespace XFILE;
+ using namespace std;
+ #include <limits.h>
++#include <nfsc/libnfs-zdr.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ #include <nfsc/libnfs-raw-nfs.h>
+ 
+diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp
+index 479f3fe..2aeea32 100644
+--- a/xbmc/filesystem/NFSFile.cpp
++++ b/xbmc/filesystem/NFSFile.cpp
+@@ -32,6 +32,7 @@
+ #include "network/DNSNameCache.h"
+ #include "threads/SystemClock.h"
+ 
++#include <nfsc/libnfs-zdr.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ 
+ #ifdef TARGET_WINDOWS
diff --git a/libre/xbmc-libre-lts/xbmc.service b/libre/xbmc-libre-lts/xbmc.service
index 81a37ac7e..90119f07d 100644
--- a/libre/xbmc-libre-lts/xbmc.service
+++ b/libre/xbmc-libre-lts/xbmc.service
@@ -1,6 +1,6 @@
 [Unit]
 Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service
+After = systemd-user-sessions.service network.target
 Conflicts=getty@tty7.service
 
 [Service]
-- 
cgit v1.2.3-54-g00ecf