Marcel Telka
2023-12-01 d0234da34037dedd743d4c0576ae406749307f07
libpeas: switch to Python 3.9

1 files added
5 files modified
49 ■■■■■ changed files
components/library/libpeas/Makefile 17 ●●●●● patch | view | raw | blame | history
components/library/libpeas/libpeas-python3loader.p5m 1 ●●●● patch | view | raw | blame | history
components/library/libpeas/libpeas.p5m 3 ●●●● patch | view | raw | blame | history
components/library/libpeas/manifests/sample-manifest.p5m 7 ●●●●● patch | view | raw | blame | history
components/library/libpeas/patches/05-python3.9.patch 11 ●●●●● patch | view | raw | blame | history
components/library/libpeas/pkg5 10 ●●●●● patch | view | raw | blame | history
components/library/libpeas/Makefile
@@ -25,7 +25,6 @@
#
# requires gobject-introspection
BUILD_BITS = 64
include ../../../make-rules/shared-macros.mk
@@ -34,7 +33,7 @@
COMPONENT_DESCRIPTION=    libpeas is a gobject-based plugins engine, and is targeted\
 at giving every application the chance to assume its own extensibility.
COMPONENT_VERSION=    1.20.0
COMPONENT_REVISION=    4
COMPONENT_REVISION=    5
COMPONENT_PROJECT_URL=  https://wiki.gnome.org/Projects/Libpeas
COMPONENT_MAJOR_MINOR=        $(basename $(COMPONENT_VERSION))
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
@@ -49,9 +48,8 @@
include $(WS_MAKE_RULES)/common.mk
# Note, there's no 32-bit Python 3.5
CONFIGURE_ENV += PYTHON=$(PYTHON.3.5.64)
CONFIGURE_ENV += PYTHON3_CONFIG=/usr/bin/python3.5-config
CONFIGURE_ENV += PYTHON=$(PYTHON)
CONFIGURE_ENV += PYTHON3_CONFIG=/usr/bin/python$(PYTHON_VERSION)-config
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --enable-gtk
@@ -63,18 +61,17 @@
CONFIGURE_OPTIONS += --with-pic
# Assumes GNU xgettext in PATH
CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
PATH = $(PATH.gnu)
# gobject introspection
COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
# Required due to patches.
COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
COMPONENT_PREP_ACTION += (cd $(@D); PATH="$(PATH)" autoreconf -fiv);
# for the tests
unexport SHELLOPTS
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
COMPONENT_TEST_ARGS =   -k -i
# Strip pids from test output, since they're always different
COMPONENT_TEST_TRANSFORMS += '-e "s% (pid=[0-9]*)%%"'
@@ -85,17 +82,17 @@
        '-e "/FAIL:/p" '
# Build dependencies
PYTHON_REQUIRED_PACKAGES += library/python/pygobject-3
REQUIRED_PACKAGES += developer/ui-designer/glade
REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
REQUIRED_PACKAGES += library/lua/lgi-52
REQUIRED_PACKAGES += library/python/pygobject-3
REQUIRED_PACKAGES += text/xmlto
# Auto-generated dependencies
PYTHON_REQUIRED_PACKAGES += runtime/python
REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
REQUIRED_PACKAGES += library/desktop/gtk3
REQUIRED_PACKAGES += library/glib2
REQUIRED_PACKAGES += runtime/lua
REQUIRED_PACKAGES += runtime/python-35
REQUIRED_PACKAGES += system/library
components/library/libpeas/libpeas-python3loader.p5m
@@ -14,6 +14,7 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)/libpeas-python3loader@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="libpeas python 3 loader plugin"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
components/library/libpeas/libpeas.p5m
@@ -15,6 +15,7 @@
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -24,7 +25,7 @@
depend type=require fmri=library/lua/lgi-52
depend type=conditional fmri=$(COMPONENT_FMRI)/libpeas-python3loader \
    predicate=runtime/python-35
    predicate=runtime/python-$(PYV)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
components/library/libpeas/manifests/sample-manifest.p5m
@@ -10,10 +10,11 @@
#
#
# Copyright 2022 <contributor>
# Copyright 2023 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.human-version value=$(HUMAN_VERSION)
set name=pkg.summary value="$(COMPONENT_SUMMARY)"
set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
@@ -52,8 +53,8 @@
file path=usr/lib/$(MACH64)/peas-demo/plugins/helloworld/helloworld.plugin
file path=usr/lib/$(MACH64)/peas-demo/plugins/helloworld/libhelloworld.so
file path=usr/lib/$(MACH64)/peas-demo/plugins/luahello/luahello.plugin
file path=usr/lib/$(MACH64)/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-35.opt-1.pyc
file path=usr/lib/$(MACH64)/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-35.pyc
file path=usr/lib/$(MACH64)/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-39.opt-1.pyc
file path=usr/lib/$(MACH64)/peas-demo/plugins/pythonhello/__pycache__/pythonhello.cpython-39.pyc
file path=usr/lib/$(MACH64)/peas-demo/plugins/pythonhello/pythonhello.plugin
file path=usr/lib/$(MACH64)/peas-demo/plugins/pythonhello/pythonhello.py
file path=usr/lib/$(MACH64)/peas-demo/plugins/secondtime/libsecondtime.so
components/library/libpeas/patches/05-python3.9.patch
New file
@@ -0,0 +1,11 @@
--- libpeas-1.20.0/configure.ac.orig
+++ libpeas-1.20.0/configure.ac
@@ -442,7 +442,7 @@
                 found_python3=yes
                 PYTHON3_BIN="$PYTHON"
                 PYTHON3_CFLAGS=`${PYTHON3_CONFIG} --includes`
-                PYTHON3_LIBS=`${PYTHON3_CONFIG} --libs`
+                PYTHON3_LIBS=`${PYTHON3_CONFIG} --embed --libs`
                 PYTHON3_LDFLAGS=`${PYTHON3_CONFIG} --ldflags`
                 AC_SUBST(PYTHON3_BIN)
                 AC_SUBST(PYTHON3_CFLAGS)
components/library/libpeas/pkg5
@@ -1,6 +1,5 @@
{
    "dependencies": [
        "SUNWcs",
        "developer/documentation-tool/gtk-doc",
        "developer/ui-designer/glade",
        "library/desktop/gdk-pixbuf",
@@ -8,16 +7,15 @@
        "library/desktop/gtk3",
        "library/glib2",
        "library/lua/lgi-52",
        "library/python/pygobject-3",
        "library/python/pygobject-3-39",
        "runtime/lua",
        "runtime/python-35",
        "shell/ksh93",
        "runtime/python-39",
        "system/library",
        "text/xmlto"
    ],
    "fmris": [
        "library/desktop/libpeas",
        "library/desktop/libpeas/libpeas-python3loader"
        "library/desktop/libpeas/libpeas-python3loader",
        "library/desktop/libpeas"
    ],
    "name": "libpeas"
}