pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

2015Q1, misc/calibre fails to package [now with patch]



Same issue with misc/calibre.

I also had a few missing files:

@comment share/appdata/calibre-ebook-edit.appdata.xml
@comment share/appdata/calibre-ebook-viewer.appdata.xml
@comment share/appdata/calibre-gui.appdata.xml

Similar fix as py-qt5:


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/misc/calibre/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- Makefile	16 Mar 2015 22:28:38 -0000	1.96
+++ Makefile	15 Apr 2015 20:30:54 -0000
@@ -71,6 +71,12 @@
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	${FIX_PYTHON_PATHS}
 
+SUBST_CLASSES+=		x11lib
+SUBST_STAGE.x11lib=     post-patch                                    
+SUBST_SED.x11lib+=      -e 's,@X11LIB@,${X11BASE}/lib,'                        
+SUBST_MESSAGE.x11lib=   Fixing rpath for X11 libraries.      
+SUBST_FILES.x11lib+=    setup/extensions.py
+
 REPLACE_BASH+=		resources/calibre-portable.sh
 
 # These ones are for replacing python[0-9*] with PYTHONBIN
Index: patches/patch-setup_extensions.py
===================================================================
RCS file: /cvsroot/pkgsrc/misc/calibre/patches/patch-setup_extensions.py,v
retrieving revision 1.5
diff -u -r1.5 patch-setup_extensions.py
--- patches/patch-setup_extensions.py	8 Feb 2015 00:37:10 -0000	1.5
+++ patches/patch-setup_extensions.py	15 Apr 2015 20:30:54 -0000
@@ -1,10 +1,28 @@
-$NetBSD: patch-setup_extensions.py,v 1.5 2015/02/08 00:37:10 wiz Exp $
+$NetBSD$
 
-Fix build for pictureflow.
+Fix build for libheadless, pictureflow, progress_indicator and qt_hack.
 
---- setup/extensions.py.orig	2014-08-29 03:59:29.000000000 +0000
+--- setup/extensions.py.orig	2015-03-13 03:56:40.000000000 +0000
 +++ setup/extensions.py
-@@ -602,7 +602,7 @@ class Build(Command):
+@@ -536,6 +536,8 @@ class Build(Command):
+             ''').format(
+                 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
+                     target), glib=glib_flags, fontconfig=fontconfig_flags, freetype=' '.join(ft_inc_dirs))
++        if isbsd:
++            pro += "\nLIBS += -Wl,-rpath,@X11LIB@\n"
+         bdir = self.j(self.d(self.SRC), 'build', 'headless')
+         if not os.path.exists(bdir):
+             os.makedirs(bdir)
+@@ -598,6 +600,8 @@ class Build(Command):
+             sipinc=pyqt['sip_inc_dir'], pyinc=sysconfig.get_python_inc(), py_lib=py_lib,
+             ver=__version__
+         )
++        if isbsd:
++            pro += "\nLIBS += -Wl,-rpath,@X11LIB@\n"
+         for incdir in ext.inc_dirs:
+             pro += '\nINCLUDEPATH += ' + incdir
+         if not iswindows and not isosx:
+@@ -616,7 +620,7 @@ class Build(Command):
          if iswindows:
              qmc += ['-spec', 'win32-msvc2008']
          fext = 'dll' if iswindows else 'dylib' if isosx else 'so'

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- The Doctor: No, 'eureka' is Greek for
\X/ rhialto/at/xs4all.nl    -- 'this bath is too hot.'

Attachment: pgp4gqB6hRfRJ.pgp
Description: PGP signature



Home | Main Index | Thread Index | Old Index