afab1bd548
sadly, gpsd uses scons as a build system, which is python2 only, thus tries to load py-cairo and py-gobject3 to detect their presence. We enfore the RUN_DEPENDS on the python3 version of those, so no need for this check. to be revisited if scons switches to python3 someday. Fixes packaging problem when py-cairo/py-gobject3 are missing as reported by ajacoutot@
72 lines
2.6 KiB
Plaintext
72 lines
2.6 KiB
Plaintext
$OpenBSD: patch-SConstruct,v 1.2 2020/09/22 15:16:20 landry Exp $
|
|
Index: SConstruct
|
|
--- SConstruct.orig
|
|
+++ SConstruct
|
|
@@ -72,8 +72,7 @@ gpsd_version = "3.19"
|
|
libgps_version_current = 25
|
|
libgps_version_revision = 0
|
|
libgps_version_age = 0
|
|
-libgps_version = "%d.%d.%d" % (libgps_version_current, libgps_version_age,
|
|
- libgps_version_revision)
|
|
+libgps_version = "%s" % ('${LIBgps_VERSION}')
|
|
#
|
|
# Release identification ends here
|
|
|
|
@@ -546,7 +545,7 @@ def CheckPKG(context, name):
|
|
|
|
|
|
# Stylesheet URLs for making HTML and man pages from DocBook XML.
|
|
-docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'
|
|
+docbook_url_stem = '${LOCALBASE}/share/xsl/docbook/'
|
|
docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
|
|
docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
|
|
|
|
@@ -1090,6 +1089,10 @@ else:
|
|
# if not, force qt to off
|
|
if config.env["qt"]:
|
|
qt_net_name = 'Qt%sNetwork' % config.env["qt_versioned"]
|
|
+ if env["qt_versioned"] == "5":
|
|
+ qt_net_name = 'Qt5Network'
|
|
+ elif env["qt_versioned"] == "4":
|
|
+ qt_net_name = 'QtNetwork'
|
|
qt_network = config.CheckPKG(qt_net_name)
|
|
if not qt_network:
|
|
config.env["qt"] = False
|
|
@@ -1584,25 +1587,6 @@ else:
|
|
}
|
|
|
|
if env['xgps']:
|
|
- # check for pycairo
|
|
- try:
|
|
- imp.find_module('cairo')
|
|
- except ImportError:
|
|
- # no pycairo, don't build xgps, xgpsspeed
|
|
- announce("WARNING: Python module pycairo not found.\n"
|
|
- " xgps and xgpsspeed will not be installed")
|
|
- env['xgps'] = False
|
|
-
|
|
- # check for pygobject
|
|
- try:
|
|
- imp.find_module('gi')
|
|
- except ImportError:
|
|
- # no pycairo, don't build xgps, xgpsspeed
|
|
- announce("WARNING: Python module pygobject not found.\n"
|
|
- " xgps and xgpsspeed will not be installed")
|
|
- env['xgps'] = False
|
|
-
|
|
- if env['xgps']:
|
|
python_progs.extend(["xgps", "xgpsspeed"])
|
|
python_manpages.update({
|
|
"man/xgps.1": "man/gps.xml",
|
|
@@ -1685,9 +1669,7 @@ else:
|
|
python_objects[ext].append(
|
|
python_env.NoCache(
|
|
python_env.SharedObject(
|
|
- src.split(".")[0] + '-py_' +
|
|
- '_'.join(['%s' % (x) for x in sys.version_info]) +
|
|
- python_config['SO'], src
|
|
+ src.split(".")[0] + python_config['SO'], src
|
|
)
|
|
)
|
|
)
|