summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2009-03-15 19:55:37 (GMT)
committerJames Meyer <james.meyer@operamail.com>2009-03-15 19:55:37 (GMT)
commit6628d60f1d8284d74732c3645f444e67bd7d470b (patch)
tree8df50684f42334010e0d843646929b12d24a3009
parentb7ce5faca8f4d984690ebd4beb383c17efbcbbfd (diff)
downloadlinhes_pkgbuild-6628d60f1d8284d74732c3645f444e67bd7d470b.zip
linhes_pkgbuild-6628d60f1d8284d74732c3645f444e67bd7d470b.tar.gz
linhes_pkgbuild-6628d60f1d8284d74732c3645f444e67bd7d470b.tar.bz2
Fix support for gnome-screensaver.
-rw-r--r--abs/core-testing/mythtv/stable/mythtv/PKGBUILD8
-rw-r--r--abs/core-testing/mythtv/stable/mythtv/gnome_screensaver.patch18
-rw-r--r--abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch15
3 files changed, 30 insertions, 11 deletions
diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
index 5220e37..b431c46 100644
--- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD
@@ -1,13 +1,13 @@
pkgname=mythtv
pkgver=0.21
-pkgrel=43
+pkgrel=50
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883')
backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml)
source=(ftp://ftp.knoppmyth.net/R6/sources/${pkgname}-${pkgver}-fixes.tar.bz2 \
- mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch smolt_jump.patch pretty)
+ mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch smolt_jump.patch pretty gnome_screensaver.patch)
#md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
# 'a0ecb7f476cb71c0c1ac90d349fc7695')
@@ -20,7 +20,7 @@ install=mythtv.install
build() {
cd $startdir/src/${pkgname}-${pkgver} || return 1
- svn update -r 19990
+ #svn update -r 19990
#apply patches
patch -p0 < ../myththemedmenu.cpp.patch
@@ -29,7 +29,7 @@ build() {
# patch -p0 < ../pop_be_restart.cpp.patch
patch -p0 < ../smolt_jump.patch
# patch -p0 < ../2.6.28_dvb_api_version.diff
-
+ patch -p0 < ../gnome_screensaver.patch
. /etc/profile.d/qt3.sh
# use QT3 qmake
diff --git a/abs/core-testing/mythtv/stable/mythtv/gnome_screensaver.patch b/abs/core-testing/mythtv/stable/mythtv/gnome_screensaver.patch
new file mode 100644
index 0000000..6da37be
--- /dev/null
+++ b/abs/core-testing/mythtv/stable/mythtv/gnome_screensaver.patch
@@ -0,0 +1,18 @@
+--- libs/libmyth/screensaver-x11.cpp.orig 2009-03-15 19:10:47.000000000 +0000
++++ libs/libmyth/screensaver-x11.cpp 2009-03-15 19:10:56.000000000 +0000
+@@ -143,9 +143,13 @@
+ (m_last_deactivated.secsTo(current_time) > 30))
+ {
+ if (m_xscreensaverRunning)
++ {
+ myth_system("xscreensaver-command -deactivate >&- 2>&- &");
+- else if (m_gscreensaverRunning)
+- myth_system("gnome-screensaver-command --poke >&- 2>&- &");
++ }
++ if (m_gscreensaverRunning)
++ {
++ myth_system("gnome-screensaver-command -dp &");
++ }
+ m_last_deactivated = current_time;
+ }
+ }
diff --git a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
index 078318f..749e1e7 100644
--- a/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
+++ b/abs/core-testing/mythtv/stable/mythtv/menu-xml/library.xml.patch
@@ -1,14 +1,15 @@
---- library.xml.orig 2008-08-31 03:27:59.000000000 +0000
-+++ library.xml 2009-02-19 18:55:23.000000000 +0000
-@@ -119,9 +119,9 @@
+--- library.xml.orig 2009-03-15 19:20:15.000000000 +0000
++++ library.xml 2009-03-15 19:20:44.000000000 +0000
+@@ -119,10 +119,8 @@
<button>
<type>STREAM</type>
-- <text>Play online streams</text>
-+ <text>Online streams</text>
- <text lang="HE">נגן מדיה מכוונת</text>
+- <text>Play Online Streams</text>
+- <text lang="HE">נגן מדיה מכוונת</text>
- <action>PLUGIN mythstream</action>
+- <depends>mythstream</depends>
++ <text>Online Streams</text>
+ <action>MENU is.xml</action>
- <depends>mythstream</depends>
</button>
+ <button>