Attachment 202458 Details for Bug 236116 – Patch file generated with svn diff

[patch] Patch file generated with svn diff

patch.diff (text/plain), 3.99 KB, created by Samy Mahmoudi on 2019-02-28 22:13:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samy Mahmoudi

Created: 2019-02-28 22:13:57 UTC

Size: 3.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 494180)
>+++ Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	lxsession
>-PORTVERSION=	0.5.3
>+PORTVERSION=	0.5.4
> PORTREVISION=	1
> CATEGORIES=	x11-wm
> MASTER_SITES=	SF/lxde/LXSession%20%28session%20manager%29/LXSession%200.5.x/
>@@ -21,17 +21,15 @@
> 		libpolkit-agent-1.so:sysutils/polkit \
> 		libck-connector.so:sysutils/consolekit2
> 
>-USES=		autoreconf gmake localbase pkgconfig tar:xz
>+USES=		autoreconf gmake gnome localbase pkgconfig tar:xz
> USE_GNOME=	glib20 gtk20 intltool cairo gdkpixbuf2 libxslt
>-GNU_CONFIGURE=	yes
> USE_XORG=	x11
>-USE_LDCONFIG=	yes
>-INSTALL_TARGET=	install-strip
> 
>-SUB_FILES=	pkg-message
>-
>+GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-buildin-clipboard \
> 		--enable-buildin-polkit
>+INSTALL_TARGET=	install-strip
>+SUB_FILES=	pkg-message
> 
> OPTIONS_DEFINE=	NLS UPOWER
> OPTIONS_SUB=	yes
>@@ -42,6 +40,11 @@
> UPOWER_DESC=	Suspend/Hibernate support
> 
> post-patch:
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/lib64/kde4|%%QT4_LIBDIR%%|g ; \
>+		 s|/usr/lib/kde4|%%QT5_LIBDIR%%|g' \
>+		 ${WRKSRC}/lxsession/environement.c \
>+		 ${WRKSRC}/lxsession/environement.vala
> 	@${FIND} ${WRKSRC} -type f | ${XARGS} \
> 		${REINPLACE_CMD} -e 's|/etc/xdg|${PREFIX}/etc/xdg|g ;\
> 			s|%%PREFIX%%|${PREFIX}| ;\
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 494180)
>+++ distinfo	(copie de travail)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1482592330
>-SHA256 (lxsession-0.5.3.tar.xz) = 90bf42a45421f45f2c745d60f2c730176e1472642451c06c2ab07dcebdaf1fa8
>-SIZE (lxsession-0.5.3.tar.xz) = 407600
>+TIMESTAMP = 1551381756
>+SHA256 (lxsession-0.5.4.tar.xz) = 252f84c80fd3713a506cc8d8ac9773175712d47b031cacc08c8027622ce7ec5d
>+SIZE (lxsession-0.5.4.tar.xz) = 422756
>Index: files/patch-lxsession_environement.c
>===================================================================
>--- files/patch-lxsession_environement.c	(rÃ©vision 494180)
>+++ files/patch-lxsession_environement.c	(nonexistent)
>@@ -1,11 +0,0 @@
>---- lxsession/environement.c.orig	2016-12-10 01:54:04 UTC
>-+++ lxsession/environement.c
>-@@ -963,7 +963,7 @@ void lxsession_lxsession_env_set_misc (L
>- 			gchar* _tmp31_ = NULL;
>- 			gchar* _tmp32_ = NULL;
>- 			_tmp30_ = qt_plugin;
>--			_tmp31_ = g_strconcat (_tmp30_, ":/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins", NULL);
>-+			_tmp31_ = g_strconcat (_tmp30_, ":%%QT4_LIBDIR%%/plugins:%%QT5_LIBDIR%%/plugins", NULL);
>- 			_tmp32_ = _tmp31_;
>- 			g_setenv ("QT_PLUGIN_PATH", _tmp32_, TRUE);
>- 			_g_free0 (_tmp32_);
>
>Property changes on: files/patch-lxsession_environement.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-lxsession_environement.vala
>===================================================================
>--- files/patch-lxsession_environement.vala	(rÃ©vision 494180)
>+++ files/patch-lxsession_environement.vala	(nonexistent)
>@@ -1,11 +0,0 @@
>---- lxsession/environement.vala.orig	2016-12-05 20:07:14 UTC
>-+++ lxsession/environement.vala
>-@@ -331,7 +331,7 @@ namespace Lxsession
>-             {
>-                 if (qt_plugin != "")
>-                 {
>--                    Environment.set_variable("QT_PLUGIN_PATH" , qt_plugin + ":/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins", true);
>-+                    Environment.set_variable("QT_PLUGIN_PATH" , qt_plugin + ":%%QT4_LIBDIR%%/plugins:%%QT5_LIBDIR%%/plugins", true);
>-                 }
>-             }
>- 
>
>Property changes on: files/patch-lxsession_environement.vala
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 236116: 202458 | 202459