Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Dec 2020 08:30:23 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r557214 - in head/devel: libpeas libpeas/files py-libpeas
Message-ID:  <202012070830.0B78UN5r093925@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Mon Dec  7 08:30:22 2020
New Revision: 557214
URL: https://svnweb.freebsd.org/changeset/ports/557214

Log:
  devel/libpeas: update to 1.26.0
  
  - remove py2.7 flavor (end of year is coming)
  
  PR:		243743
  Submitted by:	Greg V <greg@unrelenting.technology>

Deleted:
  head/devel/libpeas/files/
Modified:
  head/devel/libpeas/Makefile
  head/devel/libpeas/distinfo
  head/devel/libpeas/pkg-plist
  head/devel/py-libpeas/pkg-plist

Modified: head/devel/libpeas/Makefile
==============================================================================
--- head/devel/libpeas/Makefile	Mon Dec  7 07:45:31 2020	(r557213)
+++ head/devel/libpeas/Makefile	Mon Dec  7 08:30:22 2020	(r557214)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libpeas
-PORTVERSION=	1.22.0
+PORTVERSION=	1.26.0
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -25,34 +25,41 @@ LIB_DEPENDS+=	libpeas-1.0.so:devel/libpeas
 PORTSCOUT=	ignore:1
 .endif
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
+USES=		gettext gnome meson pkgconfig tar:xz
 USE_GNOME=	cairo gtk30 intlhack introspection
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-CONFIGURE_ARGS+=--disable-glade-catalog
-PLIST=          ${.CURDIR}/pkg-plist
+MESON_ARGS+=	-Dglade_catalog=false
+PLIST=		${.CURDIR}/pkg-plist
 
+OPTIONS_DEFINE=	DOCS
+OPTIONS_SUB=	yes
+
+DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
+DOCS_MESON_TRUE=	gtk_doc
+
 .if ${LIBPEAS_SLAVE} == python
-USES+=		python
+USES+=		python:3.6+
 USE_PYTHON=	flavors
 USE_GNOME+=	pygobject3
-.if ${FLAVOR:Upy36:Mpy2*}
-CONFIGURE_ARGS+=	--disable-python3
-BUILD_WRKSRC=	${WRKSRC}/loaders/python
-INSTALL_WRKSRC=	${WRKSRC}/loaders/python
+MESON_ARGS+=	-Dpython3=true
+ALL_TARGET=	loaders/python3/libpython3loader.so
+
+post-patch:
+	${REINPLACE_CMD} -e "s|dependency('python3'|dependency('python-${PYTHON_VER}'|" \
+		-e "s|dependency('python3-embed'|dependency('python-${PYTHON_VER}-embed'|" \
+		${WRKSRC}/meson.build
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/libpeas-1.0/loaders/
+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/loaders/python3/libpython3loader.so \
+		${STAGEDIR}${PREFIX}/lib/libpeas-1.0/loaders/
+
 .else
-CONFIGURE_ARGS+=	--disable-python2 \
-			ac_cv_path_PYTHON3_CONFIG=${LOCALBASE}/bin/python${PYTHON_VER}-config
-BUILD_WRKSRC=	${WRKSRC}/loaders/python3
-INSTALL_WRKSRC=	${WRKSRC}/loaders/python3
+MESON_ARGS+=	-Dpython3=false
 .endif
-.else
-CONFIGURE_ARGS+=	--disable-python2 --disable-python3
-.endif
 
 # lua needs lua 5.1 and devel/lua-lgi. The latter is build for lua 5.2 however..
-CONFIGURE_ARGS+=	--disable-lua5.1 --disable-luajit
+MESON_ARGS+=	-Dpython2=false -Dlua51=false
 
 .include <bsd.port.mk>

Modified: head/devel/libpeas/distinfo
==============================================================================
--- head/devel/libpeas/distinfo	Mon Dec  7 07:45:31 2020	(r557213)
+++ head/devel/libpeas/distinfo	Mon Dec  7 08:30:22 2020	(r557214)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1516305648
-SHA256 (gnome3/libpeas-1.22.0.tar.xz) = 5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962
-SIZE (gnome3/libpeas-1.22.0.tar.xz) = 561332
+TIMESTAMP = 1590064625
+SHA256 (gnome3/libpeas-1.26.0.tar.xz) = a976d77e20496479a8e955e6a38fb0e5c5de89cf64d9f44e75c2213ee14f7376
+SIZE (gnome3/libpeas-1.26.0.tar.xz) = 191708

Modified: head/devel/libpeas/pkg-plist
==============================================================================
--- head/devel/libpeas/pkg-plist	Mon Dec  7 07:45:31 2020	(r557213)
+++ head/devel/libpeas/pkg-plist	Mon Dec  7 08:30:22 2020	(r557214)
@@ -12,15 +12,17 @@ include/libpeas-1.0/libpeas/peas-extension-set.h
 include/libpeas-1.0/libpeas/peas-extension.h
 include/libpeas-1.0/libpeas/peas-object-module.h
 include/libpeas-1.0/libpeas/peas-plugin-info.h
+include/libpeas-1.0/libpeas/peas-version-macros.h
+include/libpeas-1.0/libpeas/peas-version.h
 include/libpeas-1.0/libpeas/peas.h
 lib/girepository-1.0/Peas-1.0.typelib
 lib/girepository-1.0/PeasGtk-1.0.typelib
 lib/libpeas-1.0.so
 lib/libpeas-1.0.so.0
-lib/libpeas-1.0.so.0.2200.0
+lib/libpeas-1.0.so.0.2600.0
 lib/libpeas-gtk-1.0.so
 lib/libpeas-gtk-1.0.so.0
-lib/libpeas-gtk-1.0.so.0.2200.0
+lib/libpeas-gtk-1.0.so.0.2600.0
 lib/peas-demo/plugins/helloworld/helloworld.plugin
 lib/peas-demo/plugins/helloworld/libhelloworld.so
 lib/peas-demo/plugins/secondtime/libsecondtime.so
@@ -29,108 +31,109 @@ libdata/pkgconfig/libpeas-1.0.pc
 libdata/pkgconfig/libpeas-gtk-1.0.pc
 share/gir-1.0/Peas-1.0.gir
 share/gir-1.0/PeasGtk-1.0.gir
-share/gtk-doc/html/libpeas/PeasActivatable.html
-share/gtk-doc/html/libpeas/PeasEngine.html
-share/gtk-doc/html/libpeas/PeasExtensionBase.html
-share/gtk-doc/html/libpeas/PeasExtensionSet.html
-share/gtk-doc/html/libpeas/PeasGtkConfigurable.html
-share/gtk-doc/html/libpeas/PeasGtkPluginManager.html
-share/gtk-doc/html/libpeas/PeasGtkPluginManagerView.html
-share/gtk-doc/html/libpeas/PeasObjectModule.html
-share/gtk-doc/html/libpeas/PeasPluginInfo.html
-share/gtk-doc/html/libpeas/annotation-glossary.html
-share/gtk-doc/html/libpeas/api-index-1-14.html
-share/gtk-doc/html/libpeas/api-index-1-18.html
-share/gtk-doc/html/libpeas/api-index-1-2.html
-share/gtk-doc/html/libpeas/api-index-1-4.html
-share/gtk-doc/html/libpeas/api-index-1-6.html
-share/gtk-doc/html/libpeas/api-index-deprecated.html
-share/gtk-doc/html/libpeas/api-index-full.html
-share/gtk-doc/html/libpeas/ch01.html
-share/gtk-doc/html/libpeas/ch02.html
-share/gtk-doc/html/libpeas/ch03.html
-share/gtk-doc/html/libpeas/home.png
-share/gtk-doc/html/libpeas/index.html
-share/gtk-doc/html/libpeas/left-insensitive.png
-share/gtk-doc/html/libpeas/left.png
-share/gtk-doc/html/libpeas/libpeas-PeasExtension.html
-share/gtk-doc/html/libpeas/libpeas.devhelp2
-share/gtk-doc/html/libpeas/peas-gtk-plugin-manager.png
-share/gtk-doc/html/libpeas/pt01.html
-share/gtk-doc/html/libpeas/right-insensitive.png
-share/gtk-doc/html/libpeas/right.png
-share/gtk-doc/html/libpeas/style.css
-share/gtk-doc/html/libpeas/up-insensitive.png
-share/gtk-doc/html/libpeas/up.png
+%%DOCS%%share/gtk-doc/html/libpeas/PeasActivatable.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasEngine.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasExtensionBase.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasExtensionSet.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasGtkConfigurable.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasGtkPluginManager.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasGtkPluginManagerView.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasObjectModule.html
+%%DOCS%%share/gtk-doc/html/libpeas/PeasPluginInfo.html
+%%DOCS%%share/gtk-doc/html/libpeas/annotation-glossary.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-1-14.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-1-18.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-1-2.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-1-4.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-1-6.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-deprecated.html
+%%DOCS%%share/gtk-doc/html/libpeas/api-index-full.html
+%%DOCS%%share/gtk-doc/html/libpeas/ch01.html
+%%DOCS%%share/gtk-doc/html/libpeas/ch02.html
+%%DOCS%%share/gtk-doc/html/libpeas/ch03.html
+%%DOCS%%share/gtk-doc/html/libpeas/home.png
+%%DOCS%%share/gtk-doc/html/libpeas/index.html
+%%DOCS%%share/gtk-doc/html/libpeas/left-insensitive.png
+%%DOCS%%share/gtk-doc/html/libpeas/left.png
+%%DOCS%%share/gtk-doc/html/libpeas/libpeas-PeasExtension.html
+%%DOCS%%share/gtk-doc/html/libpeas/libpeas.devhelp2
+%%DOCS%%share/gtk-doc/html/libpeas/peas-gtk-plugin-manager.png
+%%DOCS%%share/gtk-doc/html/libpeas/pt01.html
+%%DOCS%%share/gtk-doc/html/libpeas/right-insensitive.png
+%%DOCS%%share/gtk-doc/html/libpeas/right.png
+%%DOCS%%share/gtk-doc/html/libpeas/style.css
+%%DOCS%%share/gtk-doc/html/libpeas/up-insensitive.png
+%%DOCS%%share/gtk-doc/html/libpeas/up.png
 share/icons/hicolor/16x16/actions/libpeas-plugin.png
 share/icons/hicolor/22x22/actions/libpeas-plugin.png
 share/icons/hicolor/32x32/actions/libpeas-plugin.png
 share/icons/hicolor/scalable/actions/libpeas-plugin.svg
-share/locale/an/LC_MESSAGES/libpeas.mo
-share/locale/ar/LC_MESSAGES/libpeas.mo
-share/locale/as/LC_MESSAGES/libpeas.mo
-share/locale/ast/LC_MESSAGES/libpeas.mo
-share/locale/be/LC_MESSAGES/libpeas.mo
-share/locale/bg/LC_MESSAGES/libpeas.mo
-share/locale/bn_IN/LC_MESSAGES/libpeas.mo
-share/locale/bs/LC_MESSAGES/libpeas.mo
-share/locale/ca/LC_MESSAGES/libpeas.mo
-share/locale/ca@valencia/LC_MESSAGES/libpeas.mo
-share/locale/cs/LC_MESSAGES/libpeas.mo
-share/locale/da/LC_MESSAGES/libpeas.mo
-share/locale/de/LC_MESSAGES/libpeas.mo
-share/locale/el/LC_MESSAGES/libpeas.mo
-share/locale/en_GB/LC_MESSAGES/libpeas.mo
-share/locale/eo/LC_MESSAGES/libpeas.mo
-share/locale/es/LC_MESSAGES/libpeas.mo
-share/locale/et/LC_MESSAGES/libpeas.mo
-share/locale/eu/LC_MESSAGES/libpeas.mo
-share/locale/fa/LC_MESSAGES/libpeas.mo
-share/locale/fi/LC_MESSAGES/libpeas.mo
-share/locale/fr/LC_MESSAGES/libpeas.mo
-share/locale/fur/LC_MESSAGES/libpeas.mo
-share/locale/gl/LC_MESSAGES/libpeas.mo
-share/locale/gu/LC_MESSAGES/libpeas.mo
-share/locale/he/LC_MESSAGES/libpeas.mo
-share/locale/hi/LC_MESSAGES/libpeas.mo
-share/locale/hr/LC_MESSAGES/libpeas.mo
-share/locale/hu/LC_MESSAGES/libpeas.mo
-share/locale/id/LC_MESSAGES/libpeas.mo
-share/locale/is/LC_MESSAGES/libpeas.mo
-share/locale/it/LC_MESSAGES/libpeas.mo
-share/locale/ja/LC_MESSAGES/libpeas.mo
-share/locale/kk/LC_MESSAGES/libpeas.mo
-share/locale/kn/LC_MESSAGES/libpeas.mo
-share/locale/ko/LC_MESSAGES/libpeas.mo
-share/locale/lt/LC_MESSAGES/libpeas.mo
-share/locale/lv/LC_MESSAGES/libpeas.mo
-share/locale/ml/LC_MESSAGES/libpeas.mo
-share/locale/mr/LC_MESSAGES/libpeas.mo
-share/locale/nb/LC_MESSAGES/libpeas.mo
-share/locale/nds/LC_MESSAGES/libpeas.mo
-share/locale/ne/LC_MESSAGES/libpeas.mo
-share/locale/nl/LC_MESSAGES/libpeas.mo
-share/locale/oc/LC_MESSAGES/libpeas.mo
-share/locale/or/LC_MESSAGES/libpeas.mo
-share/locale/pa/LC_MESSAGES/libpeas.mo
-share/locale/pl/LC_MESSAGES/libpeas.mo
-share/locale/pt/LC_MESSAGES/libpeas.mo
-share/locale/pt_BR/LC_MESSAGES/libpeas.mo
-share/locale/ro/LC_MESSAGES/libpeas.mo
-share/locale/ru/LC_MESSAGES/libpeas.mo
-share/locale/sk/LC_MESSAGES/libpeas.mo
-share/locale/sl/LC_MESSAGES/libpeas.mo
-share/locale/sr/LC_MESSAGES/libpeas.mo
-share/locale/sr@latin/LC_MESSAGES/libpeas.mo
-share/locale/sv/LC_MESSAGES/libpeas.mo
-share/locale/ta/LC_MESSAGES/libpeas.mo
-share/locale/te/LC_MESSAGES/libpeas.mo
-share/locale/tg/LC_MESSAGES/libpeas.mo
-share/locale/th/LC_MESSAGES/libpeas.mo
-share/locale/tr/LC_MESSAGES/libpeas.mo
-share/locale/ug/LC_MESSAGES/libpeas.mo
-share/locale/uk/LC_MESSAGES/libpeas.mo
-share/locale/vi/LC_MESSAGES/libpeas.mo
-share/locale/zh_CN/LC_MESSAGES/libpeas.mo
-share/locale/zh_HK/LC_MESSAGES/libpeas.mo
-share/locale/zh_TW/LC_MESSAGES/libpeas.mo
+share/locale/an/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ar/LC_MESSAGES/libpeas-1.0.mo
+share/locale/as/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ast/LC_MESSAGES/libpeas-1.0.mo
+share/locale/be/LC_MESSAGES/libpeas-1.0.mo
+share/locale/bg/LC_MESSAGES/libpeas-1.0.mo
+share/locale/bn_IN/LC_MESSAGES/libpeas-1.0.mo
+share/locale/bs/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ca/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ca@valencia/LC_MESSAGES/libpeas-1.0.mo
+share/locale/cs/LC_MESSAGES/libpeas-1.0.mo
+share/locale/da/LC_MESSAGES/libpeas-1.0.mo
+share/locale/de/LC_MESSAGES/libpeas-1.0.mo
+share/locale/el/LC_MESSAGES/libpeas-1.0.mo
+share/locale/en_GB/LC_MESSAGES/libpeas-1.0.mo
+share/locale/eo/LC_MESSAGES/libpeas-1.0.mo
+share/locale/es/LC_MESSAGES/libpeas-1.0.mo
+share/locale/et/LC_MESSAGES/libpeas-1.0.mo
+share/locale/eu/LC_MESSAGES/libpeas-1.0.mo
+share/locale/fa/LC_MESSAGES/libpeas-1.0.mo
+share/locale/fi/LC_MESSAGES/libpeas-1.0.mo
+share/locale/fr/LC_MESSAGES/libpeas-1.0.mo
+share/locale/fur/LC_MESSAGES/libpeas-1.0.mo
+share/locale/gl/LC_MESSAGES/libpeas-1.0.mo
+share/locale/gu/LC_MESSAGES/libpeas-1.0.mo
+share/locale/he/LC_MESSAGES/libpeas-1.0.mo
+share/locale/hi/LC_MESSAGES/libpeas-1.0.mo
+share/locale/hr/LC_MESSAGES/libpeas-1.0.mo
+share/locale/hu/LC_MESSAGES/libpeas-1.0.mo
+share/locale/id/LC_MESSAGES/libpeas-1.0.mo
+share/locale/is/LC_MESSAGES/libpeas-1.0.mo
+share/locale/it/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ja/LC_MESSAGES/libpeas-1.0.mo
+share/locale/kk/LC_MESSAGES/libpeas-1.0.mo
+share/locale/kn/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ko/LC_MESSAGES/libpeas-1.0.mo
+share/locale/lt/LC_MESSAGES/libpeas-1.0.mo
+share/locale/lv/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ml/LC_MESSAGES/libpeas-1.0.mo
+share/locale/mr/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ms/LC_MESSAGES/libpeas-1.0.mo
+share/locale/nb/LC_MESSAGES/libpeas-1.0.mo
+share/locale/nds/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ne/LC_MESSAGES/libpeas-1.0.mo
+share/locale/nl/LC_MESSAGES/libpeas-1.0.mo
+share/locale/oc/LC_MESSAGES/libpeas-1.0.mo
+share/locale/or/LC_MESSAGES/libpeas-1.0.mo
+share/locale/pa/LC_MESSAGES/libpeas-1.0.mo
+share/locale/pl/LC_MESSAGES/libpeas-1.0.mo
+share/locale/pt/LC_MESSAGES/libpeas-1.0.mo
+share/locale/pt_BR/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ro/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ru/LC_MESSAGES/libpeas-1.0.mo
+share/locale/sk/LC_MESSAGES/libpeas-1.0.mo
+share/locale/sl/LC_MESSAGES/libpeas-1.0.mo
+share/locale/sr/LC_MESSAGES/libpeas-1.0.mo
+share/locale/sr@latin/LC_MESSAGES/libpeas-1.0.mo
+share/locale/sv/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ta/LC_MESSAGES/libpeas-1.0.mo
+share/locale/te/LC_MESSAGES/libpeas-1.0.mo
+share/locale/tg/LC_MESSAGES/libpeas-1.0.mo
+share/locale/th/LC_MESSAGES/libpeas-1.0.mo
+share/locale/tr/LC_MESSAGES/libpeas-1.0.mo
+share/locale/ug/LC_MESSAGES/libpeas-1.0.mo
+share/locale/uk/LC_MESSAGES/libpeas-1.0.mo
+share/locale/vi/LC_MESSAGES/libpeas-1.0.mo
+share/locale/zh_CN/LC_MESSAGES/libpeas-1.0.mo
+share/locale/zh_HK/LC_MESSAGES/libpeas-1.0.mo
+share/locale/zh_TW/LC_MESSAGES/libpeas-1.0.mo

Modified: head/devel/py-libpeas/pkg-plist
==============================================================================
--- head/devel/py-libpeas/pkg-plist	Mon Dec  7 07:45:31 2020	(r557213)
+++ head/devel/py-libpeas/pkg-plist	Mon Dec  7 08:30:22 2020	(r557214)
@@ -1,2 +1 @@
-%%PYTHON2%%lib/libpeas-1.0/loaders/libpythonloader.so
-%%PYTHON3%%lib/libpeas-1.0/loaders/libpython3loader.so
+lib/libpeas-1.0/loaders/libpython3loader.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012070830.0B78UN5r093925>