aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2022-01-17 10:50:45 +0000
committerJan Beich <jbeich@FreeBSD.org>2022-01-26 19:58:13 +0000
commit2061fd18688e1257b25822b4cf61c3c6baf03a22 (patch)
treedcc7721943eabb868f74393edf7193126e518f2c
parent45ae8fa1620e6d58f42fc882d176b14cb08dc969 (diff)
downloadports-2061fd18688e1257b25822b4cf61c3c6baf03a22.tar.gz
ports-2061fd18688e1257b25822b4cf61c3c6baf03a22.zip
devel/meson: update to 0.61.1
- Revert some 0.60.2 fixes incompatible with 0.61.0 - Drop rpath workaround for JHBuild as it's non-trivial to rebase Changes: https://mesonbuild.com/Release-notes-for-0-61-0.html PR: 260943 Reported by: GitHub (watch releases) Approved by: tcberner Exp-run by: antoine
-rw-r--r--devel/meson/Makefile2
-rw-r--r--devel/meson/distinfo6
-rw-r--r--devel/meson/files/patch-mesonbuild_backend_backends.py40
-rw-r--r--lang/cjs/Makefile3
-rw-r--r--lang/cjs/distinfo2
-rw-r--r--lang/gjs/Makefile3
-rw-r--r--lang/gjs/distinfo2
-rw-r--r--x11/cinnamon/Makefile1
-rw-r--r--x11/cinnamon/distinfo2
9 files changed, 4 insertions, 57 deletions
diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index b5d9659131ca..034ca5d86d51 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -1,7 +1,7 @@
# Created by: Ting-Wei Lan <lantw44@gmail.com>
PORTNAME= meson
-PORTVERSION= 0.60.3
+PORTVERSION= 0.61.1
CATEGORIES= devel python
MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
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 <lantw@src.gnome.org>
-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
@@ -5,9 +5,6 @@ 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
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
@@ -6,9 +6,6 @@ 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
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
@@ -7,7 +7,6 @@ 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
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