Attachment 201092 Details for Bug 234915 – patch to update from 0.13 to 0.15

[patch] patch to update from 0.13 to 0.15

patch-update-to-0.15 (text/plain), 9.42 KB, created by John Cheetham on 2019-01-13 09:22:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Cheetham

Created: 2019-01-13 09:22:43 UTC

Size: 9.42 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 490116)
>+++ Makefile	(working copy)
>@@ -2,10 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	griffith
>-PORTVERSION=	0.13
>-PORTREVISION=	7
>+PORTVERSION=	0.15
> CATEGORIES=	deskutils
>-MASTER_SITES=	http://launchpadlibrarian.net/87859599/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Lightweight film collection manager
>@@ -14,30 +12,30 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.5:databases/py-sqlalchemy10@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1:databases/py-sqlalchemy12@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pillow>=4.3:graphics/py-pillow@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}reportlab>=3.4:print/py-reportlab@${PY_FLAVOR}
> 
>-USES=		gmake gettext python:2.7 shebangfix tar:xz
>+USES=		gmake python:3.4+ gnome shebangfix
>+
>+USE_GITLAB=	yes
>+GL_ACCOUNT=	Strit
>+GL_COMMIT=	a593201179695efe93829d9c9a70962ef29dd109
>+
> SHEBANG_FILES=	griffith
>-USE_GNOME=	pygtk2
>+USE_GNOME=	pygobject3
> NO_BUILD=	yes
> NO_ARCH=	yes
> 
>-OPTIONS_DEFINE=		CHARDET LXML
>-OPTIONS_DEFAULT=	LXML
>-
>+OPTIONS_DEFINE=		CHARDET
> CHARDET_DESC=		chardet support
> CHARDET_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR}
> 
>-LXML_DESC=		lxml support
>-LXML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
>-
> post-patch:
> .for file in Makefile
> 	@${REINPLACE_CMD} -e \
> 		'/^LANGUAGES=/s|find.*|cd i18n/\&\&ls -d *)|g ; \
>-		 /^PREFIX/s|?=|=|g ; s|/usr|${PREFIX}|; /ln -s/d; \
>+		 /^PREFIX/s|?=|=|g ; s|/usr|${PREFIX}|; /ln -s/d; /chmod +x/d; \
> 		 /^ETCDIR/s|=.*|= $$(PREFIX)/etc|g' ${WRKSRC}/${file}
> .endfor
> .for f in docs/en/Makefile docs/pl/Makefile docs/pt/Makefile
>Index: distinfo
>===================================================================
>--- distinfo	(revision 490116)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (griffith-0.13.tar.xz) = b704bf79109ffe787cf194af24152b897ef826ee54eab4b05f29a51f945af304
>-SIZE (griffith-0.13.tar.xz) = 758668
>+TIMESTAMP = 1547195358
>+SHA256 (Strit-griffith-a593201179695efe93829d9c9a70962ef29dd109_GL0.tar.gz) = f05f2813d39d59a2e3316ccc2ca5e71be7ad3493a78249e347f159aece028af1
>+SIZE (Strit-griffith-a593201179695efe93829d9c9a70962ef29dd109_GL0.tar.gz) = 1478116
>Index: files/patch-griffith
>===================================================================
>--- files/patch-griffith	(nonexistent)
>+++ files/patch-griffith	(working copy)
>@@ -0,0 +1,17 @@
>+--- griffith.orig	2019-01-10 08:50:33 UTC
>++++ griffith
>+@@ -1289,11 +1289,11 @@ class Griffith(object):
>+             gutils.run_browser(self._trailer_url)
>+ 
>+     def on_goto_homepage_activate(site, *args):
>+-        gutils.run_browser('https://github.com/Strit/griffith')
>++        gutils.run_browser('https://gitlab.com/Strit/griffith')
>+     def on_goto_forum_activate(site, *args):
>+-        gutils.run_browser('https://github.com/Strit/griffith')
>++        gutils.run_browser('https://gitlab.com/Strit/griffith')
>+     def on_goto_report_bug_activate(site, *args):
>+-        gutils.run_browser('https://github.com/Strit/griffith/issues')
>++        gutils.run_browser('https://gitlab.com/Strit/griffith/issues')
>+ 
>+     # toolbar -------------------------------------------------------------
>+     def toggle_toolbar(self, *args):
>
>Property changes on: files/patch-griffith
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-lib_plugins_movie_PluginMovieIMDB.py
>===================================================================
>--- files/patch-lib_plugins_movie_PluginMovieIMDB.py	(nonexistent)
>+++ files/patch-lib_plugins_movie_PluginMovieIMDB.py	(working copy)
>@@ -0,0 +1,31 @@
>+--- lib/plugins/movie/PluginMovieIMDB.py.orig	2019-01-10 08:53:18 UTC
>++++ lib/plugins/movie/PluginMovieIMDB.py
>+@@ -43,7 +43,7 @@ class Plugin(movie.Movie):
>+ 
>+     def initialize(self):
>+         self.cast_page = self.open_page(url=self.url + '/fullcredits')
>+-        self.plot_page = self.open_page(url=self.url + '/plotsummary')
>++        self.plot_page = self.open_page(url=self.url)
>+         self.comp_page = self.open_page(url=self.url + '/companycredits')
>+         self.tagl_page = self.open_page(url=self.url + '/taglines')
>+ 
>+@@ -78,17 +78,8 @@ class Plugin(movie.Movie):
>+             self.director = self.director[0:len(self.director) - 2]
>+ 
>+     def get_plot(self):
>+-        self.plot = gutils.regextrim(self.page, 'itemprop="description"', '<')
>+-        self.plot = gutils.after(self.plot, '>')
>+-        elements = self.plot_page.split('<p class="plotpar">')
>+-        if len(elements) < 2:
>+-            elements = re.split('<li class="(?:odd|even)">', self.plot_page)
>+-        if len(elements) > 1:
>+-            self.plot = self.plot + '\n\n'
>+-            elements[0] = ''
>+-            for element in elements[1:]:
>+-                if element != '':
>+-                    self.plot = self.plot + gutils.strip_tags(gutils.before(element, '</a>')) + '\n\n'
>++        self.plot = gutils.trim(self.page, '<h2>Storyline</h2>', '</span>')
>++        self.plot = gutils.after(self.plot, '<span>    ')
>+ 
>+     def get_year(self):
>+         self.year = gutils.trim(self.page, '<a href="/year/', '</a>')
>
>Property changes on: files/patch-lib_plugins_movie_PluginMovieIMDB.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 490116)
>+++ pkg-plist	(working copy)
>@@ -30,11 +30,11 @@
> %%DATADIR%%/export_templates/xml/page.tpl
> %%DATADIR%%/glade/add_poster.png
> %%DATADIR%%/glade/delete_poster.png
>-%%DATADIR%%/glade/exporthtml.glade
>-%%DATADIR%%/glade/griffith.glade
>+%%DATADIR%%/glade/exporthtml.ui
>+%%DATADIR%%/glade/griffith.ui
> %%DATADIR%%/glade/griffith.png
>-%%DATADIR%%/glade/import.glade
>-%%DATADIR%%/glade/importcsv.glade
>+%%DATADIR%%/glade/import.ui
>+%%DATADIR%%/glade/importcsv.ui
> %%DATADIR%%/glade/nill.png
> %%DATADIR%%/images/00.png
> %%DATADIR%%/images/01.png
>@@ -68,6 +68,7 @@
> %%DATADIR%%/images/meter09.png
> %%DATADIR%%/images/nill.png
> %%DATADIR%%/images/seen.png
>+%%DATADIR%%/images/tmdb.png
> %%DATADIR%%/images/unseen.png
> %%DATADIR%%/lib/__init__.py
> %%DATADIR%%/lib/about.py
>@@ -125,49 +126,22 @@
> %%DATADIR%%/lib/plugins/imp/MovieTrack.py
> %%DATADIR%%/lib/plugins/imp/MyDVDs.py
> %%DATADIR%%/lib/plugins/imp/PersonalVideoDatabase.py
>+%%DATADIR%%/lib/plugins/imp/Tellico.py
> %%DATADIR%%/lib/plugins/imp/TheMovieLibrary.py
> %%DATADIR%%/lib/plugins/imp/WintoolzFilmdatenbank.py
> %%DATADIR%%/lib/plugins/imp/__init__.py
> %%DATADIR%%/lib/plugins/imp/eXtremeMovieManager.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovie7arte.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieAllRovi.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieAllocine.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieAmazon.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieAniDB.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieCSFD.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieCineMovies.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieCinematografo.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieCineteka.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieClubedevideo.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieCulturalia.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieDVDEmpire.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieDVDPalace.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieE-Pipoca.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieFDb.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieFilmAffinity.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieFilmDb.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieFilmeVonAZ.py
>+%%DATADIR%%/lib/plugins/movie/PluginMovieDVDpt.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieFilmtipset.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieFilmweb.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieHKMDB.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieIMDB-de.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieIMDB-es.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieIMDB-it.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieIMDB-pt.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieIMDB.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieInterfilmes.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieKinoDe.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieMediadis.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieMovieMeter.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieMoviefone.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieMyMoviesIt.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieOFDb.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieOnet.py
> %%DATADIR%%/lib/plugins/movie/PluginMoviePTGate.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieScope.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieStopklatka.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieTanukiAnime.py
>-%%DATADIR%%/lib/plugins/movie/PluginMovieWP.py
>+%%DATADIR%%/lib/plugins/movie/PluginMovieTMDB.py
> %%DATADIR%%/lib/plugins/movie/PluginMovieZelluloid.py
> %%DATADIR%%/lib/plugins/movie/__init__.py
> %%DATADIR%%/lib/preferences.py

Actions: View | Diff

Attachments on bug 234915: 201091 | 201092