Attachment 144781 Details for Bug 191957 – calibre-1.45.0.diff

[patch] calibre-1.45.0.diff

calibre-1.45.0.diff (text/plain), 4.61 KB, created by rnejdl on 2014-07-18 18:49:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rnejdl

Created: 2014-07-18 18:49:45 UTC

Size: 4.61 KB

patch

obsolete

>diff -ruN calibre/Makefile calibre.new/Makefile
>--- calibre/Makefile	2014-07-12 10:19:15.000000000 -0500
>+++ calibre.new/Makefile	2014-07-18 12:11:00.000000000 -0500
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/deskutils/calibre/Makefile 361620 2014-07-12 15:19:15Z madpilot $
> 
> PORTNAME=	calibre
>-PORTVERSION=	1.44.0
>+PORTVERSION=	1.45.0
> CATEGORIES=	deskutils python
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
> 
>diff -ruN calibre/distinfo calibre.new/distinfo
>--- calibre/distinfo	2014-07-12 10:19:15.000000000 -0500
>+++ calibre.new/distinfo	2014-07-18 12:11:08.000000000 -0500
>@@ -1,2 +1,2 @@
>-SHA256 (calibre-1.44.0.tar.xz) = b2a49485ece16454169dfdd9da7481fabf0ae644b8e53f3fd114de4ceecf6992
>-SIZE (calibre-1.44.0.tar.xz) = 36438768
>+SHA256 (calibre-1.45.0.tar.xz) = 40d4fbe7da0f1af1e8cf767cd6e247ad3f448b207bccaf0a3c10c42de7fd2e3d
>+SIZE (calibre-1.45.0.tar.xz) = 36470032
>diff -ruN calibre/files/calibre.in calibre.new/files/calibre.in
>--- calibre/files/calibre.in	2014-07-12 10:19:15.000000000 -0500
>+++ calibre.new/files/calibre.in	2014-07-18 13:45:34.000000000 -0500
>@@ -59,7 +59,7 @@
> 		command_args="${command_args} --password=${calibre_password}"
> 	fi
> 	if [ ! -z "${calibre_url_prefix}" ]; then
>-		command_args="${command_args} --url-prefx=${calibre_url_prefix}"
>+		command_args="${command_args} --url-prefix=${calibre_url_prefix}"
> 	fi
> 
> 	calibre_home=${calibre_home:-$(getent passwd ${calibre_user} | awk -F: '{print $6}')}
>diff -ruN calibre/files/patch-calibre_browse.html calibre.new/files/patch-calibre_browse.html
>--- calibre/files/patch-calibre_browse.html	1969-12-31 18:00:00.000000000 -0600
>+++ calibre.new/files/patch-calibre_browse.html	2014-07-18 13:17:46.000000000 -0500
>@@ -0,0 +1,20 @@
>+--- resources/content_server/browse/browse.html.orig	2014-07-18 13:16:04.000000000 -0500
>++++ resources/content_server/browse/browse.html	2014-07-18 13:17:42.000000000 -0500
>+@@ -6,7 +6,7 @@
>+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
>+     <title>..:: calibre {library} ::.. {title}</title>
>+     <meta http-equiv="X-UA-Compatible" content="IE=100" />
>+-    <link rel="icon" type="image/x-icon" href="http://calibre-ebook.com/favicon.ico" />
>++    <link rel="icon" type="image/x-icon" href="{prefix}/static/favicon.ico" />
>+ 
>+     <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
>+     <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
>+@@ -62,8 +62,6 @@
>+                     <input type="image"
>+                     src="{prefix}/static/button-donate.png"
>+                         name="submit"></input>
>+-                    <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
>+-                        width="1" height="1"></img>
>+                 </div>
>+             </form>
>+             <div id="calibre-home-link" title="Go to the calibre website"></div>
>diff -ruN calibre/files/patch-calibre_content.py calibre.new/files/patch-calibre_content.py
>--- calibre/files/patch-calibre_content.py	1969-12-31 18:00:00.000000000 -0600
>+++ calibre.new/files/patch-calibre_content.py	2014-07-18 13:15:40.000000000 -0500
>@@ -0,0 +1,10 @@
>+--- src/calibre/library/server/content.py.orig	2014-07-18 13:13:33.000000000 -0500
>++++ src/calibre/library/server/content.py	2014-07-18 13:14:11.000000000 -0500
>+@@ -111,6 +111,7 @@
>+                      'png'  : 'image/png',
>+                      'gif'  : 'image/gif',
>+                      'html' : 'text/html',
>++                     'ico'  : 'image/x-icon',
>+                      }[fname.rpartition('.')[-1].lower()]
>+         except KeyError:
>+             raise cherrypy.HTTPError(404, '%r not a valid resource type'%name)
>diff -ruN calibre/files/patch-calibre_index.html calibre.new/files/patch-calibre_index.html
>--- calibre/files/patch-calibre_index.html	1969-12-31 18:00:00.000000000 -0600
>+++ calibre.new/files/patch-calibre_index.html	2014-07-18 13:18:46.000000000 -0500
>@@ -0,0 +1,11 @@
>+--- resources/content_server/index.html.orig	2014-07-18 13:18:05.000000000 -0500
>++++ resources/content_server/index.html	2014-07-18 13:18:28.000000000 -0500
>+@@ -8,7 +8,7 @@
>+         <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
>+         <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
>+         <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
>+-		<link rel="icon" href="http://calibre-ebook.com/favicon.ico" type="image/x-icon" />
>++		<link rel="icon" href="{prefix}/static/favicon.ico" type="image/x-icon" />
>+ 	</head>
>+ 	<body>
>+ 	    <div id="banner">
>--- calibre-1.45.0.diff ends here ---

Actions: View | Diff

Attachments on bug 191957: 144781