diff --git a/devel/meson/Makefile b/devel/meson/Makefile index b5d9659131ca..034ca5d86d51 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,35 +1,35 @@ # Created by: Ting-Wei Lan PORTNAME= meson -PORTVERSION= 0.60.3 +PORTVERSION= 0.61.1 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= desktop@FreeBSD.org COMMENT= High performance build system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} USES= ninja:run python:3.6+ shebangfix USE_PYTHON= autoplist distutils noflavors SHEBANG_FILES= mesonbuild/rewriter.py \ mesonbuild/scripts/cmake_run_ctgt.py NO_ARCH= yes # https://github.com/mesonbuild/meson/issues/6016 TEST_ENV= ${MAKE_ENV:NCC=*:NCXX=*} # Hide from regular build to avoid accidental dependency on symlinks .if make(test) # helper_create_binary_wrapper, test_python_module, test cases/*.py BINARY_ALIAS+= python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T} do-test: create-binary-alias # force if run late .endif do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py) .include diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 0a00e2dbfba7..0fb066827c0a 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597508825 -SHA256 (meson-0.60.3.tar.gz) = 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e -SIZE (meson-0.60.3.tar.gz) = 2001124 +TIMESTAMP = 1642416645 +SHA256 (meson-0.61.1.tar.gz) = feb2cefb325b437dbf36146df7c6b87688ddff0b0205caa31dc64055c6da410c +SIZE (meson-0.61.1.tar.gz) = 2009680 diff --git a/devel/meson/files/patch-mesonbuild_backend_backends.py b/devel/meson/files/patch-mesonbuild_backend_backends.py deleted file mode 100644 index 4adb3d825661..000000000000 --- a/devel/meson/files/patch-mesonbuild_backend_backends.py +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/mesonbuild/meson/pull/4324 - -From 068f0b3bc7becab6762ada45ecdd5dc601ee2473 Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan -Date: Thu, 4 Oct 2018 23:03:30 +0800 -Subject: [PATCH] backends: Use raw_link_args to check for the need of RPATH - -Function rpaths_for_bundled_shared_libraries assumes it needs RPATH when -linking arguments of an external dependency has exactly one argument and -the only argument is an absolute path to a library file. This was mostly -fine because almost all .pc files use a -L -l pair instead of the full -path of the library, which means pkg-config dependencies almost always -have at least two arguments. However, there are patches landed in the -meson 0.47 cycle which convert -L -l pair returned by pkg-config to the -absolute path of library. If the output of pkg-config includes exactly -one -L argument and one -l argument, it will be converted to exactly one -absolute path by meson and rpaths_for_bundled_shared_libraries will -assume it needs RPATH. Since meson passes both -rpath and -rpath-link to -the linker and -rpath-link has precedence over LD_LIBRARY_PATH, it -changes the search order of dependent libraries in an unexpected way and -it causes a lot of linking troubles in JHBuild environments on FreeBSD. - -To make the method behave like the old way of using -L -l pairs and -avoid library path order problems, we use raw_link_args instead of -link_args here. raw_link_args stores the unmodified output of pkg-config -and it is much less likely to accidentally match the rule currently used -by the method. - -Works around https://github.com/mesonbuild/meson/issues/4270. ---- mesonbuild/backend/backends.py.orig 2018-09-22 13:22:03 UTC -+++ mesonbuild/backend/backends.py -@@ -371,7 +371,7 @@ class Backend: - for dep in target.external_deps: - if not isinstance(dep, (dependencies.ExternalLibrary, dependencies.PkgConfigDependency)): - continue -- la = dep.link_args -+ la = dep.get_link_args(raw=True) - if len(la) != 1 or not os.path.isabs(la[0]): - continue - # The only link argument is an absolute path to a library file. diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile index 9f51fb93592f..6e254feef3c7 100644 --- a/lang/cjs/Makefile +++ b/lang/cjs/Makefile @@ -1,39 +1,36 @@ # Created by: Gustau Perez i Querol PORTNAME= cjs PORTVERSION= 4.8.2 CATEGORIES= lang gnome DIST_SUBDIR= gnome -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= a4f6cfc52109.patch:-p1 # https://github.com/linuxmint/cjs/pull/98 - MAINTAINER= gnome@FreeBSD.org COMMENT= JavaScript bindings based on gobject-introspection LICENSE= MIT LGPL20+ LICENSE_COMB= dual LICENSE_FILE_MIT= ${WRKSRC}/COPYING LICENSE_FILE_LGPL20+ = ${WRKSRC}/COPYING.LGPL LIB_DEPENDS= libffi.so:devel/libffi \ libmozjs-78.so:lang/spidermonkey78 USES= compiler:c++14-lang gettext gnome localbase meson pkgconfig \ python:3.5+,build readline shebangfix xorg USE_GNOME= cairo gdkpixbuf2 gtk30 introspection USE_XORG= x11 xext MESON_ARGS= -Dinstalled_tests=false \ -Dcairo=enabled \ -Dreadline=enabled \ -Dprofiler=disabled USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= linuxmint SHEBANG_GLOB= *.py PORTSCOUT= limit:^[0-9.]+$$ # ignore master.mint* tags .include diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo index 0c9848fae59f..f75743f2f749 100644 --- a/lang/cjs/distinfo +++ b/lang/cjs/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1610463497 SHA256 (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e SIZE (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = 600711 -SHA256 (gnome/a4f6cfc52109.patch) = 0ff33f1c88ca929e9e6501cb3f5a5c15014e8f37cb8c81a8e84cfc46049bba98 -SIZE (gnome/a4f6cfc52109.patch) = 3164 diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile index e0fbdea31e93..276eb47dc222 100644 --- a/lang/gjs/Makefile +++ b/lang/gjs/Makefile @@ -1,36 +1,33 @@ # Created by: Pawel Worach PORTNAME= gjs PORTVERSION= 1.70.0 CATEGORIES= lang gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome -PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ -PATCHFILES+= 59bbb5e4795d.patch:-p1 # https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/694 - MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME Javascript binding LICENSE= MPL11 LGPL20+ GPLv2+ LICENSE_COMB= multi LICENSE_FILE_MPL11= ${WRKSRC}/LICENSES/MPL-1.1.txt LICENSE_FILE_LGPL20+ = ${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt LIB_DEPENDS= libmozjs-78.so:lang/spidermonkey78 \ libffi.so:devel/libffi USES= compiler:c++11-lib gettext gnome \ localbase meson pkgconfig python:build readline tar:xz xorg USE_GNOME= cairo gdkpixbuf2 gtk30 introspection USE_XORG= x11 xext MESON_ARGS= -Dcairo=enabled \ -Dreadline=enabled \ -Dprofiler=disabled \ -Dinstalled_tests=false USE_LDCONFIG= yes CONFIGURE_ENV= PYTHONDONTWRITEBYTECODE=1 MAKE_ENV= PYTHONDONTWRITEBYTECODE=1 .include diff --git a/lang/gjs/distinfo b/lang/gjs/distinfo index be70eec9bd0d..5e52ad348982 100644 --- a/lang/gjs/distinfo +++ b/lang/gjs/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1632801889 SHA256 (gnome/gjs-1.70.0.tar.xz) = 4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b043a5ffb01861c5f SIZE (gnome/gjs-1.70.0.tar.xz) = 595292 -SHA256 (gnome/59bbb5e4795d.patch) = b3b517689d3e4f0934ba437f011a2af9fcdd3614a2e61f932dfb8a887fb387e1 -SIZE (gnome/59bbb5e4795d.patch) = 4179 diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index e1fae6d192e8..2b6489c9fa08 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -1,123 +1,122 @@ # Created by: Gustau Perez i Querol PORTNAME= cinnamon PORTVERSION= 4.8.6 PORTREVISION= 1 CATEGORIES= x11 gnome DIST_SUBDIR= gnome PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 8fc2df08b40a.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10489 PATCHFILES+= aa0bf5b13078.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10606 MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of GNOME Shell with layout similar to GNOME 2 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ca_root_nss>0:security/ca_root_nss LIB_DEPENDS= libcjs.so:lang/cjs \ libmuffin.so:x11-wm/muffin \ libcinnamon-menu-3.so:x11/cinnamon-menus \ libdbus-1.so:devel/dbus \ libpolkit-agent-1.so:sysutils/polkit \ libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libstartup-notification-1.so:x11/startup-notification \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ ca_root_nss>0:security/ca_root_nss \ gnome-themes-extra>3.0.0:x11-themes/gnome-themes-extra \ caribou>0:accessibility/caribou \ cinnamon-control-center:sysutils/cinnamon-control-center \ cinnamon-screensaver:x11/cinnamon-screensaver \ nemo:x11-fm/nemo \ ${PY_PILLOW} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-xapp>0:x11/py-python-xapp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-pam>0:security/py-python-pam@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tinycss>0:textproc/py-tinycss@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \ timezonemap>0:misc/timezonemap \ gnome-backgrounds>0:x11-themes/gnome-backgrounds \ metacity:x11-wm/metacity \ tint2:x11/tint USES= compiler:c11 cpe gettext gl gnome meson pkgconfig python:3.5+ shebangfix xorg CPE_VENDOR= linuxmint USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intltool introspection libxml2 pygobject3 USE_XORG= x11 xfixes USE_GL= gl USE_GSTREAMER1= yes USE_GITHUB= yes GH_ACCOUNT= linuxmint SHEBANG_GLOB= *.py SHEBANG_FILES= files/* USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_CMD} MESON_ARGS= -Ddisable_networkmanager=true GLIB_SCHEMAS= org.cinnamon.gschema.xml OPTIONS_DEFINE= DOCS NLS OPTIONS_DEFAULT= DOCS NLS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc DOCS_MESON_TRUE= docs NLS_RUN_DEPENDS= cinnamon-translations>0:misc/cinnamon-translations post-patch: @${REINPLACE_CMD} -e '/prefix/s|/usr|${PREFIX}|g ;\ /datadir/s|/usr|${PREFIX}|g ;\ /libdir/s|/usr|${PREFIX}|g ;\ /libexecdir/s|/usr|${PREFIX}|g' \ ${WRKSRC}/files/usr/share/cinnamon/cinnamon-menu-editor/cme/config.py @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/share/cinnamon/locale" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/share/cinnamon/locale|${PREFIX}/share/locale|g" @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/share" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g" @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/lib" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/lib|${PREFIX}/lib|g" @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "/usr/bin" | \ ${XARGS} ${REINPLACE_CMD} -e "s|/usr/bin|${PREFIX}/bin|g" @${REINPLACE_CMD} -e '/cs-bluetooth/d; /cs-network/d' \ ${WRKSRC}/files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py # Some python files use #! /usr/bin/python (note the space between the bang and the python interpreter @${FIND} ${WRKSRC} -name \* -type f | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \ ${XARGS} ${REINPLACE_CMD} -e "s|#!.*python.*|#!/usr/bin/env python|g" # gtk-doc builds erroneous documentation files otherwise @${FIND} ${WRKSRC} -name '*.orig' -type f -delete @${FIND} ${WRKSRC} -name '*.bak' -type f -delete # Adhere to our hier(7) @${MKDIR} ${WRKSRC}/files${PREFIX} @${MV} ${WRKSRC}/files/etc ${WRKSRC}/files${PREFIX} . for i in bin share @${MV} ${WRKSRC}/files/usr/${i} ${WRKSRC}/files${PREFIX} . endfor post-install: # Ship the GNOME Backgrounds set @${MKDIR} ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties @${LN} -s ${PREFIX}/share/gnome-background-properties/adwaita.xml \ ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/adwaita.xml @${LN} -s ${PREFIX}/share/gnome-background-properties/gnome-backgrounds.xml \ ${STAGEDIR}${PREFIX}/share/cinnamon-background-properties/gnome-backgrounds.xml .include diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo index 3d39a3b530ee..9fe715816dac 100644 --- a/x11/cinnamon/distinfo +++ b/x11/cinnamon/distinfo @@ -1,7 +1,5 @@ TIMESTAMP = 1612598797 SHA256 (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893 SIZE (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 2378117 -SHA256 (gnome/8fc2df08b40a.patch) = b8e0624acaa6c29bba532bf4a9de7f762686b3090827ac926583df92a64f117f -SIZE (gnome/8fc2df08b40a.patch) = 1332 SHA256 (gnome/aa0bf5b13078.patch) = 82e482496063ab479759b9561f56b18a72578c32af7fbc1237d8566d39a63227 SIZE (gnome/aa0bf5b13078.patch) = 1573