View | Details | Raw Unified | Return to bug 236116
Collapse All | Expand All

(-)Makefile (-7 / +10 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	lxsession
4
PORTNAME=	lxsession
5
PORTVERSION=	0.5.3
5
PORTVERSION=	0.5.4
6
PORTREVISION=	1
6
PORTREVISION=	1
7
CATEGORIES=	x11-wm
7
CATEGORIES=	x11-wm
8
MASTER_SITES=	SF/lxde/LXSession%20%28session%20manager%29/LXSession%200.5.x/
8
MASTER_SITES=	SF/lxde/LXSession%20%28session%20manager%29/LXSession%200.5.x/
Lines 21-37 Link Here
21
		libpolkit-agent-1.so:sysutils/polkit \
21
		libpolkit-agent-1.so:sysutils/polkit \
22
		libck-connector.so:sysutils/consolekit2
22
		libck-connector.so:sysutils/consolekit2
23
23
24
USES=		autoreconf gmake localbase pkgconfig tar:xz
24
USES=		autoreconf gmake gnome localbase pkgconfig tar:xz
25
USE_GNOME=	glib20 gtk20 intltool cairo gdkpixbuf2 libxslt
25
USE_GNOME=	glib20 gtk20 intltool cairo gdkpixbuf2 libxslt
26
GNU_CONFIGURE=	yes
27
USE_XORG=	x11
26
USE_XORG=	x11
28
USE_LDCONFIG=	yes
29
INSTALL_TARGET=	install-strip
30
27
31
SUB_FILES=	pkg-message
28
GNU_CONFIGURE=	yes
32
33
CONFIGURE_ARGS=	--enable-buildin-clipboard \
29
CONFIGURE_ARGS=	--enable-buildin-clipboard \
34
		--enable-buildin-polkit
30
		--enable-buildin-polkit
31
INSTALL_TARGET=	install-strip
32
SUB_FILES=	pkg-message
35
33
36
OPTIONS_DEFINE=	NLS UPOWER
34
OPTIONS_DEFINE=	NLS UPOWER
37
OPTIONS_SUB=	yes
35
OPTIONS_SUB=	yes
Lines 42-47 Link Here
42
UPOWER_DESC=	Suspend/Hibernate support
40
UPOWER_DESC=	Suspend/Hibernate support
43
41
44
post-patch:
42
post-patch:
43
	@${REINPLACE_CMD} -e \
44
		's|/usr/lib64/kde4|%%QT4_LIBDIR%%|g ; \
45
		 s|/usr/lib/kde4|%%QT5_LIBDIR%%|g' \
46
		 ${WRKSRC}/lxsession/environement.c \
47
		 ${WRKSRC}/lxsession/environement.vala
45
	@${FIND} ${WRKSRC} -type f | ${XARGS} \
48
	@${FIND} ${WRKSRC} -type f | ${XARGS} \
46
		${REINPLACE_CMD} -e 's|/etc/xdg|${PREFIX}/etc/xdg|g ;\
49
		${REINPLACE_CMD} -e 's|/etc/xdg|${PREFIX}/etc/xdg|g ;\
47
			s|%%PREFIX%%|${PREFIX}| ;\
50
			s|%%PREFIX%%|${PREFIX}| ;\
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1482592330
1
TIMESTAMP = 1551381756
2
SHA256 (lxsession-0.5.3.tar.xz) = 90bf42a45421f45f2c745d60f2c730176e1472642451c06c2ab07dcebdaf1fa8
2
SHA256 (lxsession-0.5.4.tar.xz) = 252f84c80fd3713a506cc8d8ac9773175712d47b031cacc08c8027622ce7ec5d
3
SIZE (lxsession-0.5.3.tar.xz) = 407600
3
SIZE (lxsession-0.5.4.tar.xz) = 422756
(-)files/patch-lxsession_environement.c (-11 lines)
Lines 1-11 Link Here
1
--- lxsession/environement.c.orig	2016-12-10 01:54:04 UTC
2
+++ lxsession/environement.c
3
@@ -963,7 +963,7 @@ void lxsession_lxsession_env_set_misc (L
4
 			gchar* _tmp31_ = NULL;
5
 			gchar* _tmp32_ = NULL;
6
 			_tmp30_ = qt_plugin;
7
-			_tmp31_ = g_strconcat (_tmp30_, ":/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins", NULL);
8
+			_tmp31_ = g_strconcat (_tmp30_, ":%%QT4_LIBDIR%%/plugins:%%QT5_LIBDIR%%/plugins", NULL);
9
 			_tmp32_ = _tmp31_;
10
 			g_setenv ("QT_PLUGIN_PATH", _tmp32_, TRUE);
11
 			_g_free0 (_tmp32_);
(-)files/patch-lxsession_environement.vala (-11 lines)
Lines 1-11 Link Here
1
--- lxsession/environement.vala.orig	2016-12-05 20:07:14 UTC
2
+++ lxsession/environement.vala
3
@@ -331,7 +331,7 @@ namespace Lxsession
4
             {
5
                 if (qt_plugin != "")
6
                 {
7
-                    Environment.set_variable("QT_PLUGIN_PATH" , qt_plugin + ":/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins", true);
8
+                    Environment.set_variable("QT_PLUGIN_PATH" , qt_plugin + ":%%QT4_LIBDIR%%/plugins:%%QT5_LIBDIR%%/plugins", true);
9
                 }
10
             }
11
 

Return to bug 236116