Attachment 105391 Details for Bug 145859 – file.diff

[patch] file.diff

file.diff (text/plain), 3.45 KB, created by J.R. Oldroyd on 2010-04-19 20:20:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: J.R. Oldroyd

Created: 2010-04-19 20:20:03 UTC

Size: 3.45 KB

patch

obsolete

>diff -ruN /usr/ports/multimedia/freevo/Makefile multimedia/freevo/Makefile
>--- /usr/ports/multimedia/freevo/Makefile	2010-03-28 02:40:39.000000000 -0400
>+++ multimedia/freevo/Makefile	2010-04-19 13:53:09.000000000 -0400
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	freevo
> PORTVERSION=	1.9.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/${PORTNAME}/Freevo%20releases/${PORTVERSION}
> 
>@@ -62,9 +62,8 @@
> 
> post-patch:
> .if defined(WITHOUT_NLS)
>-	@${REINPLACE_CMD} -e  '451d' ${WRKSRC}/${PORTNAME}
>+	@${REINPLACE_CMD} -e 's| freevo_locale| # freevo_locale|' ${WRKSRC}/${PORTNAME}
> .endif
>-
> 	@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/freevo_config.py
> 	@${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/local_conf.py.example
> 
>diff -ruN /usr/ports/multimedia/freevo/files/patch-src-helpers-recordserver.py multimedia/freevo/files/patch-src-helpers-recordserver.py
>--- /usr/ports/multimedia/freevo/files/patch-src-helpers-recordserver.py	1969-12-31 19:00:00.000000000 -0500
>+++ multimedia/freevo/files/patch-src-helpers-recordserver.py	2010-04-09 08:08:03.000000000 -0400
>@@ -0,0 +1,15 @@
>+--- src/helpers/recordserver.py.orig	2009-05-23 08:51:25.000000000 -0400
>++++ src/helpers/recordserver.py	2010-04-09 07:53:38.000000000 -0400
>+@@ -503,10 +503,11 @@
>+                 thisprog = progs[proglist[i]]
>+                 nextprog = progs[proglist[i+1]]
>+                 if thisprog.stop > nextprog.start:
>+-                    conflictRating = conflictRating+1
>+                     if thisprog == prog:
>++                        conflictRating = conflictRating+1
>+                         conflicts.append(nextprog)
>+                     elif nextprog == prog:
>++                        conflictRating = conflictRating+1
>+                         conflicts.append(thisprog)
>+             self.removeRecordingFromSchedule(prog, myScheduledRecordings)
>+             return (conflictRating, conflicts)
>diff -ruN /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy
>--- /usr/ports/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy	1969-12-31 19:00:00.000000000 -0500
>+++ multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy	2010-02-19 11:05:05.000000000 -0500
>@@ -0,0 +1,14 @@
>+--- src/www/htdocs/favorites.rpy.orig	2009-02-19 12:59:44.000000000 -0500
>++++ src/www/htdocs/favorites.rpy	2010-02-19 11:03:40.000000000 -0500
>+@@ -115,9 +115,9 @@
>+         fv.tableRowClose()
>+ 
>+         def sortByPriority(a,b):
>+-            if (a.priority < b.priority):
>++            if (int(a.priority) < int(b.priority)):
>+                 return -1
>+-            elif (a.priority > b.priority):
>++            elif (int(a.priority) > int(b.priority)):
>+                 return 1
>+             else:
>+                 return 0
>diff -ruN /usr/ports/multimedia/freevo/pkg-plist multimedia/freevo/pkg-plist
>--- /usr/ports/multimedia/freevo/pkg-plist	2009-06-01 15:56:31.000000000 -0400
>+++ multimedia/freevo/pkg-plist	2010-04-19 12:51:55.000000000 -0400
>@@ -2342,8 +2342,8 @@
> %%NLS%%share/locale/sv/LC_MESSAGES/freevo.po
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.mo
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.po
>-@dirrm %%NLS%%share/locale/nn_NO/LC_MESSAGES
>-@dirrm %%NLS%%share/locale/nn_NO
>+%%NLS%%@dirrm share/locale/nn_NO/LC_MESSAGES
>+%%NLS%%@dirrm share/locale/nn_NO
> @dirrmtry etc/freevo
> @dirrm %%PYTHON_SITELIBDIR%%/freevo/animation
> @dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins

Actions: View | Diff

Attachments on bug 145859: 105391