View | Details | Raw Unified | Return to bug 260943 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/meson/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# Created by: Ting-Wei Lan <lantw44@gmail.com>
1
# Created by: Ting-Wei Lan <lantw44@gmail.com>
2
2
3
PORTNAME=	meson
3
PORTNAME=	meson
4
PORTVERSION=	0.60.3
4
PORTVERSION=	0.61.0
5
CATEGORIES=	devel python
5
CATEGORIES=	devel python
6
MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
6
MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
7
7
(-)b/devel/meson/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1597508825
1
TIMESTAMP = 1641832169
2
SHA256 (meson-0.60.3.tar.gz) = 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
2
SHA256 (meson-0.61.0.tar.gz) = ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c
3
SIZE (meson-0.60.3.tar.gz) = 2001124
3
SIZE (meson-0.61.0.tar.gz) = 2007070
(-)a/devel/meson/files/patch-mesonbuild_backend_backends.py (-40 lines)
Removed Link Here
1
https://github.com/mesonbuild/meson/pull/4324
2
3
From 068f0b3bc7becab6762ada45ecdd5dc601ee2473 Mon Sep 17 00:00:00 2001
4
From: Ting-Wei Lan <lantw@src.gnome.org>
5
Date: Thu, 4 Oct 2018 23:03:30 +0800
6
Subject: [PATCH] backends: Use raw_link_args to check for the need of RPATH
7
8
Function rpaths_for_bundled_shared_libraries assumes it needs RPATH when
9
linking arguments of an external dependency has exactly one argument and
10
the only argument is an absolute path to a library file. This was mostly
11
fine because almost all .pc files use a -L -l pair instead of the full
12
path of the library, which means pkg-config dependencies almost always
13
have at least two arguments. However, there are patches landed in the
14
meson 0.47 cycle which convert -L -l pair returned by pkg-config to the
15
absolute path of library. If the output of pkg-config includes exactly
16
one -L argument and one -l argument, it will be converted to exactly one
17
absolute path by meson and rpaths_for_bundled_shared_libraries will
18
assume it needs RPATH. Since meson passes both -rpath and -rpath-link to
19
the linker and -rpath-link has precedence over LD_LIBRARY_PATH, it
20
changes the search order of dependent libraries in an unexpected way and
21
it causes a lot of linking troubles in JHBuild environments on FreeBSD.
22
23
To make the method behave like the old way of using -L -l pairs and
24
avoid library path order problems, we use raw_link_args instead of
25
link_args here. raw_link_args stores the unmodified output of pkg-config
26
and it is much less likely to accidentally match the rule currently used
27
by the method.
28
29
Works around https://github.com/mesonbuild/meson/issues/4270.
30
--- mesonbuild/backend/backends.py.orig	2018-09-22 13:22:03 UTC
31
+++ mesonbuild/backend/backends.py
32
@@ -371,7 +371,7 @@ class Backend:
33
         for dep in target.external_deps:
34
             if not isinstance(dep, (dependencies.ExternalLibrary, dependencies.PkgConfigDependency)):
35
                 continue
36
-            la = dep.link_args
37
+            la = dep.get_link_args(raw=True)
38
             if len(la) != 1 or not os.path.isabs(la[0]):
39
                 continue
40
             # The only link argument is an absolute path to a library file.
(-)b/lang/cjs/Makefile (-3 lines)
Lines 5-13 PORTVERSION= 4.8.2 Link Here
5
CATEGORIES=	lang gnome
5
CATEGORIES=	lang gnome
6
DIST_SUBDIR=	gnome
6
DIST_SUBDIR=	gnome
7
7
8
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
9
PATCHFILES+=	a4f6cfc52109.patch:-p1 # https://github.com/linuxmint/cjs/pull/98
10
11
MAINTAINER=	gnome@FreeBSD.org
8
MAINTAINER=	gnome@FreeBSD.org
12
COMMENT=	JavaScript bindings based on gobject-introspection
9
COMMENT=	JavaScript bindings based on gobject-introspection
13
10
(-)b/lang/cjs/distinfo (-2 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1610463497
1
TIMESTAMP = 1610463497
2
SHA256 (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e
2
SHA256 (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = c3248663e0084dbcee1bf4d1db56966c1321983617dbbec9b1253e50614a3f4e
3
SIZE (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = 600711
3
SIZE (gnome/linuxmint-cjs-4.8.2_GH0.tar.gz) = 600711
4
SHA256 (gnome/a4f6cfc52109.patch) = 0ff33f1c88ca929e9e6501cb3f5a5c15014e8f37cb8c81a8e84cfc46049bba98
5
SIZE (gnome/a4f6cfc52109.patch) = 3164
(-)b/lang/gjs/Makefile (-3 lines)
Lines 6-14 CATEGORIES= lang gnome Link Here
6
MASTER_SITES=	GNOME
6
MASTER_SITES=	GNOME
7
DIST_SUBDIR=	gnome
7
DIST_SUBDIR=	gnome
8
8
9
PATCH_SITES=	https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
10
PATCHFILES+=	59bbb5e4795d.patch:-p1 # https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/694
11
12
MAINTAINER=	gnome@FreeBSD.org
9
MAINTAINER=	gnome@FreeBSD.org
13
COMMENT=	GNOME Javascript binding
10
COMMENT=	GNOME Javascript binding
14
11
(-)b/lang/gjs/distinfo (-2 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1632801889
1
TIMESTAMP = 1632801889
2
SHA256 (gnome/gjs-1.70.0.tar.xz) = 4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b043a5ffb01861c5f
2
SHA256 (gnome/gjs-1.70.0.tar.xz) = 4b0629341a318a02374e113ab97f9a9f3325423269fc1e0b043a5ffb01861c5f
3
SIZE (gnome/gjs-1.70.0.tar.xz) = 595292
3
SIZE (gnome/gjs-1.70.0.tar.xz) = 595292
4
SHA256 (gnome/59bbb5e4795d.patch) = 3f116c0dea6faea4adbcf294d901f3e39342d10526f5e212aca025c7f2cf6f71
5
SIZE (gnome/59bbb5e4795d.patch) = 4173
(-)b/x11/cinnamon/Makefile (-3 lines)
Lines 6-14 PORTREVISION= 1 Link Here
6
CATEGORIES=	x11 gnome
6
CATEGORIES=	x11 gnome
7
DIST_SUBDIR=	gnome
7
DIST_SUBDIR=	gnome
8
8
9
PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
10
PATCHFILES+=	8fc2df08b40a.patch:-p1 # https://github.com/linuxmint/cinnamon/pull/10489
11
12
MAINTAINER=	gnome@FreeBSD.org
9
MAINTAINER=	gnome@FreeBSD.org
13
COMMENT=	Fork of GNOME Shell with layout similar to GNOME 2
10
COMMENT=	Fork of GNOME Shell with layout similar to GNOME 2
14
11
(-)b/x11/cinnamon/distinfo (-2 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1612598797
1
TIMESTAMP = 1612598797
2
SHA256 (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893
2
SHA256 (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 00f82253f44c694c379e29959aa6e57b4878b722df1f08d68f9466272ef64893
3
SIZE (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 2378117
3
SIZE (gnome/linuxmint-cinnamon-4.8.6_GH0.tar.gz) = 2378117
4
SHA256 (gnome/8fc2df08b40a.patch) = b8e0624acaa6c29bba532bf4a9de7f762686b3090827ac926583df92a64f117f
5
SIZE (gnome/8fc2df08b40a.patch) = 1332

Return to bug 260943