Attachment 202312 Details for Bug 230894 – Patch file generated with svn diff

[patch] Patch file generated with svn diff

patch.diff (text/plain), 5.22 KB, created by Samy Mahmoudi on 2019-02-24 05:29:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samy Mahmoudi

Created: 2019-02-24 05:29:29 UTC

Size: 5.22 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 493256)
>+++ Makefile	(copie de travail)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	compiz
> PORTVERSION=	0.8.8
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	x11-wm
> MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
> 
>@@ -9,21 +9,34 @@
> MAINTAINER=	freebsd-ports@dan.me.uk
> COMMENT=	Compiz Composite/Window Manager
> 
>-LIB_DEPENDS=	libpng.so:graphics/png \
>+LICENSE=		GPLv2+ LGPL21+ MIT
>+LICENSE_COMB=		multi
>+LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GPL
>+LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LGPL
>+LICENSE_FILE_MIT=	${WRKSRC}/COPYING.MIT
>+
>+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
>+		libfreetype.so:print/freetype2 \
> 		libgtop-2.0.so:devel/libgtop \
>+		libpng.so:graphics/png \
> 		libstartup-notification-1.so:x11/startup-notification
> RUN_DEPENDS=	glxinfo:graphics/mesa-demos \
> 		nvidia-settings:x11/nvidia-settings
> 
>+USES=		gettext-runtime gettext-tools gl gmake gnome libtool pathfix tar:bzip2
>+USE_GL=		gl glu
>+USE_GNOME=	cairo gconf2 intltool libxslt
>+USE_LDCONFIG=	yes
> XORG_CAT=	app
>+USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xinerama \
>+		xorgproto xrandr xrender
>+
> GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--disable-kde4 --disable-kde \
>+		--disable-gnome --disable-gnome-keybindings
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>-USES=		gettext gmake libtool pathfix tar:bzip2
>-USE_GL=		glu
>-USE_GNOME=	gconf2 libxslt intltool
>-USE_XORG=	xorgproto ice sm x11 xcomposite xdamage xext xfixes xinerama \
>-		xrandr xrender
>-USE_LDCONFIG=	yes
> 
> GCONF_SCHEMAS=	gwd.schemas \
> 		compiz-annotate.schemas \
>@@ -59,16 +72,12 @@
> 		compiz-wobbly.schemas \
> 		compiz-zoom.schemas
> 
>-CONFIGURE_ARGS=	--disable-kde4 --disable-kde \
>-		--disable-gnome --disable-gnome-keybindings
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
>+OPTIONS_DEFINE=	DBUS FUSE GTK2 METACITY SVG
>+OPTIONS_DEFAULT=DBUS      GTK2          SVG
> 
>-OPTIONS_DEFINE=	SVG GTK2 METACITY DBUS FUSE
>-OPTIONS_DEFAULT=	SVG GTK2 METACITY DBUS
>+METACITY_DESC=		Enable Metacity support [broken since Metacity migrated to GTK+ 3]
>+METACITY_BROKEN=	Metacity support is broken.   Deselect the option METACITY to build
> 
>-METACITY_DESC=	Enable Metacity support
>-
> SUB_FILES=		compiz-manager
> DESKTOP_ENTRIES=	"Compiz Manager" \
> 			"Wrapper script for starting compiz" \
>@@ -87,9 +96,13 @@
> FUSE_CONFIGURE_ENABLE=	fuse
> FUSE_USES=		fuse
> 
>+DBUS_CONFIGURE_ENABLE=	dbus
>+DBUS_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
>+DBUS_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
>+
> .include <bsd.port.options.mk>
> 
>-.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGNOME) && !empty(PORT_OPTIONS:MGTK2)
>+.if !empty(PORT_OPTIONS:MMETACITY) && !empty(PORT_OPTIONS:MGTK2)
> CONFIGURE_ARGS+=	--enable-metacity
> USE_GNOME+=	metacity
> .else
>@@ -96,17 +109,12 @@
> CONFIGURE_ARGS+=	--disable-metacity
> .endif
> 
>-.if ${PORT_OPTIONS:MDBUS}
>-CONFIGURE_ARGS+=	--enable-dbus
>-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
>-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:devel/dbus
>-.if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MGNOME}
>+.if !empty(PORT_OPTIONS:MDBUS) && !empty(PORT_OPTIONS:MGTK2)
> CONFIGURE_ARGS+=	--enable-dbus-glib
> BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
> RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:devel/dbus-glib
>-.endif
> .else
>-CONFIGURE_ARGS+=	--disable-dbus --disable-dbus-glib
>+CONFIGURE_ARGS+=	--disable-dbus-glib
> .endif
> 
> post-install:
>Index: files/compiz-manager.in
>===================================================================
>--- files/compiz-manager.in	(rÃ©vision 493256)
>+++ files/compiz-manager.in	(copie de travail)
>@@ -32,7 +32,7 @@
> GLXINFO="%%LOCALBASE%%/bin/glxinfo"
> KWIN="%%LOCALBASE%%/bin/kwin"
> METACITY="%%LOCALBASE%%/bin/metacity"
>-XFWM="%%LOCALBASE%%/bin/xfwm"
>+XFWM="%%LOCALBASE%%/bin/xfwm4"
> COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
> 
> # For Xgl LD_PRELOAD
>@@ -59,7 +59,7 @@
> FALLBACKWM_OPTIONS="--replace $@"
> 
> # Driver whitelist
>-WHITELIST="nvidia intel ati radeon i810"
>+WHITELIST="nvidia intel ati radeon i810 modesetting"
> 
> # blacklist based on the pci ids 
> # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
>Index: files/patch-plugins_fuse.c
>===================================================================
>--- files/patch-plugins_fuse.c	(rÃ©vision 493256)
>+++ files/patch-plugins_fuse.c	(copie de travail)
>@@ -1,5 +1,5 @@
>---- plugins/fuse.c.orig	Mon Apr  2 14:15:28 2007
>-+++ plugins/fuse.c	Mon May  7 20:07:09 2007
>+--- plugins/fuse.c.orig	2010-05-21 11:18:14 UTC
>++++ plugins/fuse.c
> @@ -28,6 +28,8 @@
>  #include <errno.h>
>  #include <poll.h>
>Index: files/patch-src-Makefile.in
>===================================================================
>--- files/patch-src-Makefile.in	(rÃ©vision 493256)
>+++ files/patch-src-Makefile.in	(copie de travail)
>@@ -1,6 +1,6 @@
>---- src/Makefile.in.orig	2014-06-02 19:14:25.669435783 +0100
>-+++ src/Makefile.in	2014-06-02 19:14:34.064435780 +0100
>-@@ -292,7 +292,7 @@
>+--- src/Makefile.in.orig	2018-08-24 22:46:14 UTC
>++++ src/Makefile.in
>+@@ -292,7 +292,7 @@ INCLUDES = \
>  	-DIMAGEDIR=\"$(imagedir)\"   \
>  	-DMETADATADIR=\"$(metadatadir)\"
>

Actions: View | Diff

Attachments on bug 230894: 196535 | 198226 | 202312 | 204167