summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/calibre/Makefile4
-rw-r--r--misc/calibre/PLIST5
-rw-r--r--misc/calibre/distinfo14
-rw-r--r--misc/calibre/patches/patch-setup_build.py26
-rw-r--r--misc/calibre/patches/patch-setup_build__environment.py57
-rw-r--r--misc/calibre/patches/patch-setup_extensions.json17
-rw-r--r--misc/calibre/patches/patch-setup_extensions.py32
7 files changed, 56 insertions, 99 deletions
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 8200e78f092..54e7b4fc8a9 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.149 2016/07/10 19:27:52 rillig Exp $
+# $NetBSD: Makefile,v 1.150 2016/07/24 07:08:54 wiz Exp $
-DISTNAME= calibre-2.62.0
+DISTNAME= calibre-2.63.0
CATEGORIES= misc
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index b46bc70497f..b7f03ec9547 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.63 2016/07/08 11:11:28 wiz Exp $
+@comment $NetBSD: PLIST,v 1.64 2016/07/24 07:08:54 wiz Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@@ -1189,6 +1189,8 @@ lib/calibre/calibre/plugins/hunspell.so
lib/calibre/calibre/plugins/icu.so
lib/calibre/calibre/plugins/imageops.so
lib/calibre/calibre/plugins/libheadless.so
+lib/calibre/calibre/plugins/libmtp.so
+lib/calibre/calibre/plugins/libusb.so
lib/calibre/calibre/plugins/lzma_binding.so
lib/calibre/calibre/plugins/lzx.so
lib/calibre/calibre/plugins/matcher.so
@@ -1481,6 +1483,7 @@ share/calibre/catalog/section_list_templates.py
share/calibre/catalog/stylesheet.css
share/calibre/catalog/template.xhtml
share/calibre/coffee-script.js
+share/calibre/common-user-agents.txt
share/calibre/compiled_coffeescript.zip
share/calibre/content-server/autoreload.js
share/calibre/content-server/calibre.png
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 5548046571a..dcd5f1c22f4 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.71 2016/07/08 11:11:28 wiz Exp $
+$NetBSD: distinfo,v 1.72 2016/07/24 07:08:54 wiz Exp $
-SHA1 (calibre-2.62.0.tar.xz) = 28a9db0f97755b091a105fcf3ad6dbc95eb9b03f
-RMD160 (calibre-2.62.0.tar.xz) = 29d26be9067271cda1c0566b6287782aea234cff
-SHA512 (calibre-2.62.0.tar.xz) = a692c336b9c4f4196d1b4da03758832217a0616f17b7289ec374ab81886801a78396a7ebfa6b5acca83c52661a30ad28c9763bafe1f57a78fd2f2a4effad308f
-Size (calibre-2.62.0.tar.xz) = 40671664 bytes
-SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
-SHA1 (patch-setup_extensions.py) = 18edee06e64294ba87a60aafa3e34dfa6f09cd94
+SHA1 (calibre-2.63.0.tar.xz) = df6c16cbf1acbad9644a60383a1d98645bf9c809
+RMD160 (calibre-2.63.0.tar.xz) = 3e37dbda4ae69b87cdacb0ec01ee73f413df261a
+SHA512 (calibre-2.63.0.tar.xz) = 74df6febe62608ab93502360e7511679102f0cbb260b1b78b4720c1aff34703d60db51a760ecd51596cb7331892d5eb7225e6ec70aa09976c219ba973d064f9b
+Size (calibre-2.63.0.tar.xz) = 40700876 bytes
+SHA1 (patch-setup_build.py) = 9699b5badd044aacd72b223c182ab14f38eb1dcb
+SHA1 (patch-setup_extensions.json) = a08c9c6675f9b7926fa53dbb74846ed47c4298c7
SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
diff --git a/misc/calibre/patches/patch-setup_build.py b/misc/calibre/patches/patch-setup_build.py
new file mode 100644
index 00000000000..e3f14763c05
--- /dev/null
+++ b/misc/calibre/patches/patch-setup_build.py
@@ -0,0 +1,26 @@
+$NetBSD: patch-setup_build.py,v 1.1 2016/07/24 07:08:54 wiz Exp $
+
+Add rpath to linker command.
+Look in libtool directory for file.
+
+--- setup/build.py.orig 2016-07-22 02:21:05.000000000 +0000
++++ setup/build.py
+@@ -251,8 +251,7 @@ class Build(Command):
+ return ['-I'+x for x in dirs]
+
+ def lib_dirs_to_ldflags(self, dirs):
+- pref = '/LIBPATH:' if iswindows else '-L'
+- return [pref+x for x in dirs]
++ return ['-L'+x+' -Wl,-R'+x for x in dirs]
+
+ def libraries_to_ldflags(self, dirs):
+ pref = '' if iswindows else '-l'
+@@ -452,7 +451,7 @@ class Build(Command):
+ if iswindows:
+ qmc += ['-spec', qmakespec]
+ fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
+- name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
++ name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
+ try:
+ os.chdir(src_dir)
+ if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):
diff --git a/misc/calibre/patches/patch-setup_build__environment.py b/misc/calibre/patches/patch-setup_build__environment.py
deleted file mode 100644
index a4f5e6e2268..00000000000
--- a/misc/calibre/patches/patch-setup_build__environment.py
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-setup_build__environment.py,v 1.1 2015/02/08 00:37:10 wiz Exp $
-
-Avoid problem on NetBSD:
-
-####### Building extension magick #######
-Compiling magick
-Traceback (most recent call last):
- File "setup.py", line 99, in <module>
- sys.exit(main())
- File "setup.py", line 85, in main
- command.run_all(opts)
- File "/scratch/wip/calibre/work/calibre-2.15.0/setup/__init__.py", line 181, in run_all
- self.run_cmd(self, opts)
- File "/scratch/wip/calibre/work/calibre-2.15.0/setup/__init__.py", line 178, in run_cmd
- cmd.run(opts)
- File "/scratch/wip/calibre/work/calibre-2.15.0/setup/extensions.py", line 412, in run
- self.build(ext, dest)
- File "/scratch/wip/calibre/work/calibre-2.15.0/setup/extensions.py", line 456, in build
- if not parallel_build(jobs, self.info):
- File "/scratch/wip/calibre/work/calibre-2.15.0/setup/parallel_build.py", line 32, in parallel_build
- p = Pool(cpu_count)
- File "/usr/pkg/lib/python2.7/multiprocessing/dummy/__init__.py", line 151, in Pool
- return ThreadPool(processes, initializer, initargs)
- File "/usr/pkg/lib/python2.7/multiprocessing/pool.py", line 718, in __init__
- Pool.__init__(self, processes, initializer, initargs)
- File "/usr/pkg/lib/python2.7/multiprocessing/pool.py", line 159, in __init__
- self._repopulate_pool()
- File "/usr/pkg/lib/python2.7/multiprocessing/pool.py", line 223, in _repopulate_pool
- w.start()
- File "/usr/pkg/lib/python2.7/multiprocessing/dummy/__init__.py", line 75, in start
- threading.Thread.start(self)
- File "/usr/pkg/lib/python2.7/threading.py", line 745, in start
- _start_new_thread(self.__bootstrap, ())
-thread.error: can't start new thread
- *** Error code 1
-
-(The same chunk works fine in the interactive shell, not sure why
-it so reliably breaks. -- wiz 20150207)
-
-See also
-http://debian.2.n7.nabble.com/Bug-760865-calibre-FTBFS-on-mips-thread-error-can-t-start-new-thread-td3353306.html
-
---- setup/build_environment.py.orig 2015-02-07 14:26:27.000000000 +0000
-+++ setup/build_environment.py
-@@ -43,11 +43,7 @@ if iswindows:
- import win32api
- cpu_count = win32api.GetSystemInfo()[5]
- else:
-- from multiprocessing import cpu_count
-- try:
-- cpu_count = cpu_count()
-- except NotImplementedError:
-- cpu_count = 1
-+ cpu_count = 1
-
- def run_pkgconfig(name, envvar, default, flag, prefix):
- ans = []
diff --git a/misc/calibre/patches/patch-setup_extensions.json b/misc/calibre/patches/patch-setup_extensions.json
new file mode 100644
index 00000000000..6e78e696e3a
--- /dev/null
+++ b/misc/calibre/patches/patch-setup_extensions.json
@@ -0,0 +1,17 @@
+$NetBSD: patch-setup_extensions.json,v 1.1 2016/07/24 07:08:54 wiz Exp $
+
+Add X11 libraries to search path.
+XXX: should be using ${PREFIX} and ${X11BASE}
+
+--- setup/extensions.json.orig 2016-07-22 02:21:05.000000000 +0000
++++ setup/extensions.json
+@@ -141,7 +141,8 @@
+ "sources": "calibre/gui2/pictureflow/pictureflow.cpp",
+ "headers": "calibre/gui2/pictureflow/pictureflow.h",
+ "sip_files": "calibre/gui2/pictureflow/pictureflow.sip",
+- "inc_dirs": "calibre/gui2/pictureflow"
++ "inc_dirs": "calibre/gui2/pictureflow",
++ "lib_dirs": "/usr/X11R7/lib /usr/pkg/X11R7/lib"
+ },
+ {
+ "name": "progress_indicator",
diff --git a/misc/calibre/patches/patch-setup_extensions.py b/misc/calibre/patches/patch-setup_extensions.py
deleted file mode 100644
index dcb1494f357..00000000000
--- a/misc/calibre/patches/patch-setup_extensions.py
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-setup_extensions.py,v 1.7 2016/06/04 12:06:07 joerg Exp $
-
-Fix build for pictureflow.
-
---- setup/extensions.py.orig 2016-02-26 03:04:36.000000000 +0000
-+++ setup/extensions.py
-@@ -549,6 +549,7 @@ class Build(Command):
- INCLUDEPATH += {freetype}
- DESTDIR = {destdir}
- CONFIG -= create_cmake # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
-+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
- QMAKE_LIBS_PRIVATE += {glib} {fontconfig}
- ''').format(
- headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
-@@ -603,6 +604,8 @@ class Build(Command):
- SOURCES = {sources}
- INCLUDEPATH += {sipinc} {pyinc}
- VERSION = {ver}
-+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
-+
- win32 {{
- LIBS += {py_lib}
- TARGET_EXT = .dll
-@@ -633,7 +636,7 @@ class Build(Command):
- if iswindows:
- qmc += ['-spec', qmakespec]
- fext = 'dll' if iswindows else 'dylib' if isosx else 'so'
-- name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext)
-+ name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext)
- try:
- os.chdir(src_dir)
- if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers):
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 15:40:35 +0000