ports/184182: deskutils/calibre update to 1.12.0

[Andrea Magliano]

>Number:         184182
>Category:       ports
>Synopsis:       deskutils/calibre update to 1.12.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 23 07:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Andrea Magliano
>Release:        
>Organization:
>Environment:
>Description:
1.12.0 update (with patch refresh)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index f2dd610..0909e1a 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: deskutils/calibre/Makefile 327718 2013-09-20 16:21:37Z bapt $
 
 PORTNAME=	calibre
-PORTVERSION=	1.2.0
+PORTVERSION=	1.12.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 51f6f99..24e51ee 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-1.2.0.tar.xz) = d27fdbe981620aa63f5c70909c63a3a7b747ced1da2ee7065879f07b8a75ca40
-SIZE (calibre-1.2.0.tar.xz) = 29652528
+SHA256 (calibre-1.12.0.tar.xz) = 7a1edbd6aa4e2b7c6fd92f59c47511442baf404bcf8b3840e566f80894f42f1c
+SIZE (calibre-1.12.0.tar.xz) = 30941380
diff --git a/deskutils/calibre/files/patch-calibre_constants.py b/deskutils/calibre/files/patch-calibre_constants.py
index f7f8639..403551a 100644
--- a/deskutils/calibre/files/patch-calibre_constants.py
+++ b/deskutils/calibre/files/patch-calibre_constants.py
@@ -1,10 +1,10 @@
---- src/calibre/constants.py.orig	2013-03-29 06:15:02.000000000 +0100
-+++ src/calibre/constants.py	2013-04-09 18:11:37.710213634 +0200
-@@ -136,7 +136,6 @@
+--- src/calibre/constants.py~	2013-11-22 13:02:31.255485000 +0100
++++ src/calibre/constants.py	2013-11-22 13:07:03.340830000 +0100
+@@ -138,7 +138,6 @@
                  'freetype',
                  'woff',
                  'unrar',
 -                'qt_hack',
+                 '_regex'
              ]
          if iswindows:
-             plugins.extend(['winutil', 'wpd', 'winfonts'])
diff --git a/deskutils/calibre/files/patch-setup_extensions.py b/deskutils/calibre/files/patch-setup_extensions.py
index 24aa943..73fd4d6 100644
--- a/deskutils/calibre/files/patch-setup_extensions.py
+++ b/deskutils/calibre/files/patch-setup_extensions.py
@@ -1,25 +1,22 @@
---- setup/extensions.py.orig	2013-03-29 06:15:02.000000000 +0100
-+++ setup/extensions.py	2013-04-09 18:10:19.236217223 +0200
-@@ -183,13 +183,6 @@
-                 sip_files = ['calibre/gui2/progress_indicator/QProgressIndicator.sip']
+--- setup/extensions.py~	2013-11-22 04:20:51.000000000 +0100
++++ setup/extensions.py	2013-11-22 13:16:45.770864000 +0100
+@@ -187,13 +187,6 @@
+                 sip_files=['calibre/gui2/progress_indicator/QProgressIndicator.sip']
                  ),
  
 -    Extension('qt_hack',
 -                ['calibre/ebooks/pdf/render/qt_hack.cpp'],
--                inc_dirs = qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'],
--                headers = ['calibre/ebooks/pdf/render/qt_hack.h'],
--                sip_files = ['calibre/ebooks/pdf/render/qt_hack.sip']
+-                inc_dirs=qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'],
+-                headers=['calibre/ebooks/pdf/render/qt_hack.h'],
+-                sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
 -                ),
 -
      Extension('unrar',
                ['unrar/%s.cpp'%(x.partition('.')[0]) for x in '''
                 rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o
-@@ -492,8 +485,9 @@
- 
-         pro = textwrap.dedent('''
+@@ -498,6 +491,7 @@
          TEMPLATE = lib
--        CONFIG += qt plugin release
-+        CONFIG += qt plugin release link_pkgconfig
+         CONFIG += qt plugin release
          CONFIG -= embed_manifest_dll
 +        PKGCONFIG += glib-2.0 gtk+-2.0
          VERSION = 1.0.0
diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py
deleted file mode 100644
index ce8c5dd..0000000
--- a/deskutils/calibre/files/patch-setup_install.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup/install.py.orig	2013-09-06 06:28:39.000000000 +0200
-+++ setup/install.py	2013-09-10 22:34:23.970135119 +0200
-@@ -160,7 +160,7 @@
-         self.info('Installing mount helper to '+ dest)
-         cflags = os.environ.get('OVERRIDE_CFLAGS', '-Wall -pedantic')
-         cflags = shlex.split(cflags)
--        p = subprocess.Popen(['gcc']+cflags+[src, '-o', dest])
-+        p = subprocess.Popen([os.getenv('CC', 'gcc')]+cflags+[src, '-o', dest])
-         ret = p.wait()
-         if ret != 0:
-             return warn()


>Release-Note:
>Audit-Trail:
>Unformatted: