dist-git conversion

#2781)

02_tvonscreen-1.0-fixes.dpatch

@@ -0,0 +1,151 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_tvonscreen-1.0-fixes.dpatch by apex at vdrportal.de
+## http://vdrportal.de/board/thread.php?postid=517272#post517272
+##
+## Contains following patches:
+## - http://toms-cafe.de/vdr/download/tvonscreen-0.7.0-fix-noepg.diff
+##   (fixes segmentation fault without any epg data)
+## - http://vdrportal.de/board/thread.php?postid=401733#post401733
+##   (fixes segmentation fault with empty columns)
+## - http://www.vdr-portal.de/board/thread.php?postid=681720#post681720
+##   (fixes segfault when switching to edit mode)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes segmentation faults.
+
+@DPATCH@
+diff -urNad vdr-plugin-tvonscreen-1.0.141~/magazine.c vdr-plugin-tvonscreen-1.0.141/magazine.c
+--- vdr-plugin-tvonscreen-1.0.141~/magazine.c	2006-06-18 15:59:36.000000000 +0200
++++ vdr-plugin-tvonscreen-1.0.141/magazine.c	2008-04-13 18:11:49.000000000 +0200
+@@ -458,6 +458,9 @@
+ }
+ const cEvent *magazine::getNext(const cSchedule *s,const cEvent *e)
+ {
++	if (e == NULL)
++		return NULL;
++
+ 	const cEvent *pe = NULL;
+ 	time_t ref = e->StartTime();
+ 
+@@ -480,6 +483,9 @@
+ }
+ const cEvent *magazine::getPrev(const cSchedule *s,const cEvent *e)
+ {
++	if (e == NULL)
++		return NULL;
++
+ 	const cEvent *pe = NULL;
+ 	time_t ref = e->StartTime();
+ 	time_t delta = INT_MAX;
+@@ -1077,9 +1083,9 @@
+ 	{
+ 		state = cOsdObject::ProcessKey(Key);
+ 	
+-		if (state == osUnknown)
++		if (state == osUnknown && schedArrayNum>currentFirst)
+ 		{
+-			if (curmode==SHOW && schedArrayNum>currentFirst)
++			if (curmode==SHOW)
+ 			{
+ 				switch (Key & ~k_Repeat)
+ 				{
+@@ -1111,6 +1117,8 @@
+ 						currentFirst++;
+ 						if (currentFirst>schedArrayNum-3)
+ 							currentFirst=schedArrayNum-3;
++						if (currentFirst<0)
++							currentFirst=0;
+ 						output();
+ 						break;
+ 					case kUp:
+@@ -1145,6 +1153,8 @@
+ 						currentFirst+=3;
+ 						if (currentFirst>schedArrayNum-3)
+ 							currentFirst=schedArrayNum-3;
++						if (currentFirst<0)
++							currentFirst=0;
+ 						output();
+ 						break;
+ 					case k8: // zum aktuellen Sender
+@@ -1206,14 +1216,17 @@
+ 				{
+ 					case kOk:
+ 						{
+-							delete osd;
+-							osd=NULL;
+ 							cEvent **ev=ev4ch(EDIT_curChannel);
+-							me=new tvOcMenuEvent(ev[EDIT_curEVI]);
+-							me->Display();
+-							curmode=SHOW;
+-							EDIT_curEvent=0;
+-							return osContinue;
++							if (ev[EDIT_curEVI] != NULL)
++							{
++								delete osd;
++								osd=NULL;
++								me=new tvOcMenuEvent(ev[EDIT_curEVI]);
++								me->Display();
++								curmode=SHOW;
++								EDIT_curEvent=0;
++								return osContinue;
++							}
+ 						}
+ 						break;
+             		case kBack:
+@@ -1238,11 +1251,15 @@
+ 							EDIT_curChannel++;
+ 						if (EDIT_curChannel>schedArrayNum-1)
+ 							EDIT_curChannel=schedArrayNum-1;
++						if (EDIT_curChannel<0)
++							EDIT_curChannel=0;
+ 						if (EDIT_curChannel>currentFirst+2)
+ 						{
+ 							currentFirst++;
+ 							if (currentFirst>schedArrayNum-3)
+ 								currentFirst=schedArrayNum-3;
++							if (currentFirst<0)
++								currentFirst=0;
+ 							EDIT_curChannel=currentFirst+2;
+ 						}
+ 						outputLR();
+@@ -1343,17 +1360,20 @@
+ 						break;			*/
+ 				case kRecord:
+ 					{
+-						delete osd;
+-						osd=NULL;
+ 						cEvent **ev=ev4ch(EDIT_curChannel);
+-						cTimer *timer = new cTimer(ev[EDIT_curEVI]);
+-						cTimer *t = Timers.GetTimer(timer);
+-						if (t)
++						if (ev[EDIT_curEVI] != NULL)
+ 						{
+-							delete timer;
+-							timer = t;
++							delete osd;
++							osd=NULL;
++							cTimer *timer = new cTimer(ev[EDIT_curEVI]);
++							cTimer *t = Timers.GetTimer(timer);
++							if (t)
++							{
++								delete timer;
++								timer = t;
++							}
++							met=new cMenuEditTimer(timer, !t);
+ 						}
+-						met=new cMenuEditTimer(timer, !t);
+ 					}
+ 					break;
+ 					default:
+diff -urNad vdr-plugin-tvonscreen-1.0.141~/magazine.h vdr-plugin-tvonscreen-1.0.141/magazine.h
+--- vdr-plugin-tvonscreen-1.0.141~/magazine.h	2006-06-18 15:59:36.000000000 +0200
++++ vdr-plugin-tvonscreen-1.0.141/magazine.h	2008-04-13 18:12:15.000000000 +0200
+@@ -70,7 +70,7 @@
+ 	enum modes {SHOW,EDIT};
+ 	enum modes curmode;
+ 
+-	unsigned short EDIT_curEvent;
++	int EDIT_curEvent;
+ 	int EDIT_curChannel;
+ 	int EDIT_curEVI;
+ 	

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: vdr-tvonscreen
-# $Id$
-NAME := vdr-tvonscreen
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

vdr-tvonscreen.spec

@@ -5,7 +5,7 @@
 
 Name:           vdr-%{pname}
 Version:        1.0.141
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Enhanced EPG data viewer for VDR
 
 Group:          Applications/Multimedia
@@ -13,11 +13,15 @@ License:        GPL+
 URL:            http://www.js-home.org/vdr/tvonscreen/
 Source0:        http://www.js-home.org/vdr/tvonscreen/%{name}-%{version}.tar.gz
 Source1:        %{name}.conf
+# Fixes several bugs, from e-tobi
+Patch0:         02_tvonscreen-1.0-fixes.dpatch
 # VDR 1.6 compatibility patch
-Patch0:         http://toms-cafe.de/vdr/download/%{pname}-%{version}-1.5.3.diff
+Patch1:         http://toms-cafe.de/vdr/download/%{pname}-%{version}-1.5.3.diff
+# I18n patch from Mandriva
+Patch2:         tvonscreen-1.0.141-i18n-1.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  vdr-devel >= 1.6.0
+BuildRequires:  vdr-devel >= 1.6.0 gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
@@ -29,30 +33,34 @@ screen.
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
 sed -i -e 's|^\(.*ConfigDirectory=\).*"logos".*|\1"%{datadir}/logos";|' \
     magazine.c
 sed -i -e 's|<configDir>/plugins/logos|%{datadir}/logos|' README
 iconv -f iso-8859-1 -t utf-8 README > README.utf8 ; mv README.utf8 README
-chmod -x i18n.h
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
+make libvdr-%{pname}.so %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make i18n LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
 install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
+%find_lang %{name}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
@@ -60,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun May 04 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.0.141-4
+- Add a combined patch from e-tobi, fixes segfaults
+- Add I18n patch from Mandriva, adds fi and de translations, thanks to Anssi
+  Hannula
+
 * Tue Apr 08 2008 - Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 1.0.141-3
 - Add VDR 1.6.0 compatibility patch and rebuild against new VDR