summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-26 12:40:11 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-26 12:40:11 -0300
commitcb607eaf6eb23ddc950c26a11b1fc581c2250339 (patch)
tree03d6d650d6f0dee366cd870e8bacc98beaa4e706 /libre
parent200076f2bb86ebe7a541a71946d7723d52f10292 (diff)
downloadabslibre-cb607eaf6eb23ddc950c26a11b1fc581c2250339.tar.gz
abslibre-cb607eaf6eb23ddc950c26a11b1fc581c2250339.tar.bz2
abslibre-cb607eaf6eb23ddc950c26a11b1fc581c2250339.zip
xbmc-libre-13.0-5: updating revision from Arch
* cleaned and improved pkgbuild * updated install script for 420 uid/gid FIXES: FS#40247 (https://bugs.archlinux.org/task/40247) - [xbmc] optional dependency description for upower is wrong FS#40422 (https://bugs.archlinux.org/task/40422) - [xbmc] /user in PKGBUILD instead of /usr in package() FS#40539 (https://bugs.archlinux.org/task/40539) - [xbmc] .desktop entry has executable attributes
Diffstat (limited to 'libre')
-rw-r--r--libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch27
-rw-r--r--libre/xbmc-libre/PKGBUILD32
-rw-r--r--libre/xbmc-libre/xbmc.install29
3 files changed, 64 insertions, 24 deletions
diff --git a/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch
new file mode 100644
index 000000000..71841758e
--- /dev/null
+++ b/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch
@@ -0,0 +1,27 @@
+From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder@gmail.com>
+Date: Sun, 25 May 2014 12:10:01 +0200
+Subject: [PATCH] make sure applications/xbmc.desktop does'nt have executable
+ flag
+
+Signed-off-by: BlackEagle <ike.devolder@gmail.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 754f153..bee1fdd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -646,7 +646,7 @@ endif
+ endif
+ @# Icons and links
+ @install -d $(DESTDIR)$(datarootdir)/applications
+- @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
++ @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
+ @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
+ @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
+ @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
+--
+1.9.1
+
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 1aff83340..f865e8820 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 110974 2014-05-11 14:59:58Z idevolder $
+# $Id: PKGBUILD 111871 2014-05-26 05:27:25Z idevolder $
# Maintainer (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>
# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Maintainer: André Silva <emulatorman@parabola.nu>
_prefix=/usr
@@ -12,11 +13,11 @@ _pkgname=xbmc
pkgname=xbmc-libre
pkgver=13.0
_codename=Gotham_r2
-pkgrel=3
+pkgrel=5
pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support"
arch=('i686' 'x86_64')
url="http://xbmc.org"
-license=('GPL' 'custom')
+license=('GPL2')
replaces=($_pkgname)
conflicts=($_pkgname)
provides=($_pkgname=$pkgver)
@@ -41,7 +42,7 @@ optdepends=(
'lirc: remote controller support'
'xorg-xinit: autostart xbmc'
'udisks: automount external drives'
-'upower: used to trigger power management functionality'
+'upower: display battery level'
)
install="${_pkgname}.install"
mksource=(
@@ -53,6 +54,7 @@ source=(
"polkit.rules"
"enable-external-ffmpeg.patch"
'0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch'
+ '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
)
mksha256sums=(
'663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903'
@@ -63,6 +65,7 @@ sha256sums=(
'4ea78374a08e13a64dcf6a424b111b8bfc11de03ed5829744fc6d9b5fc1ec96e'
'0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355'
'4d643f1bc5a0f9a6bba36c8c2c2d220351acb58172c57d86417b67c02d39fa2b'
+ '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe'
)
mksource() {
@@ -76,6 +79,11 @@ prepare() {
cd "$srcdir/xbmc-$pkgver-$_codename"
patch -p1 -i "$srcdir/enable-external-ffmpeg.patch"
patch -p1 -i "$srcdir/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch"
+ patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch"
+
+ find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
+ sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
+ sed 's/python/python2/' -i tools/Linux/xbmc.sh.in
msg2 "Use addons.xml from Parabola server (without nonfree addons support)"
sed -i -e 's|mirrors[.]xbmc[.]org/addons/gotham/addons.xml|repo.parabolagnulinux.org/other/xbmc-libre/addons/gotham/addons.xml|' addons/repository.xbmc.org/addon.xml
@@ -131,19 +139,11 @@ package() {
# Running make install
make DESTDIR="$pkgdir" install
- # Python2
- sed 's/python/python2/g' -i \
- "$pkgdir"/usr/{bin/xbmc,share/xbmc/addons/service.xbmc.versioncheck/service.py}
-
# Tools
- msg2 "Tools"
- install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/xbmc-xrandr" \
- "${pkgdir}$_prefix/lib/xbmc/xbmc-xrandr"
install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \
"${pkgdir}$_prefix/lib/xbmc/"
# Licenses
- msg2 "Copy licenses"
install -dm755 "${pkgdir}$_prefix/share/licenses/$_pkgname"
for licensef in LICENSE.GPL copying.txt; do
mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \
@@ -154,7 +154,11 @@ package() {
install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service"
# install polkit rules
- install -dm700 "$pkgdir/user/share/polkit-1/rules.d"
- install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/user/share/polkit-1/rules.d/10-xbmc.rules"
+ install -dm700 "$pkgdir/usr/share/polkit-1/rules.d"
+ install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules"
+
+ # XBMC user home
+ install -dm 700 "${pkgdir}"/var/lib/xbmc
+ chown 420:420 "${pkgdir}"/var/lib/xbmc
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index 8076fe2d3..6e477d103 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -1,19 +1,28 @@
post_install() {
- [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(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,network,optical xbmc
- mkdir -p var/lib/xbmc
- chown -R xbmc:xbmc var/lib/xbmc
+ update_icons
+ getent group xbmc > /dev/null || groupadd -g 420 xbmc
+ getent passwd xbmc > /dev/null || useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc
+ passwd -l xbmc > /dev/null
}
post_upgrade() {
post_install $1
+ if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then
+ groupmod -g 420 xbmc
+ fi
+ if ! id -u xbmc | grep 420 > /dev/null 2>&1; then
+ usermod -u 420 xbmc
+ chown -R xbmc:xbmc /var/lib/xbmc
+ fi
}
post_remove() {
- [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
- getent passwd xbmc > /dev/null && userdel xbmc
+ update_icons
+ getent passwd xbmc > /dev/null 2>&1 && userdel xbmc
+ getent group xbmc > /dev/null 2>&1 && groupdel xbmc
+}
+
+update_icons() {
+ type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+ type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications
}