FreeBSD Bugzilla – Attachment 196535 Details for
Bug 230894
[patch] x11-wm/compiz: add modesetting; use xfwm4; remove reference to former option GNOME, mark option METACITY as broken; update Makefile
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch file generated with svn diff
compiz-0.8.8_6.diff (text/plain), 4.52 KB, created by
Samy Mahmoudi
on 2018-08-25 15:26:17 UTC
(
hide
)
Description:
Patch file generated with svn diff
Filename:
MIME Type:
Creator:
Samy Mahmoudi
Created:
2018-08-25 15:26:17 UTC
Size:
4.52 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (révision 477874) >+++ Makefile (copie de travail) >@@ -2,7 +2,7 @@ > > PORTNAME= compiz > PORTVERSION= 0.8.8 >-PORTREVISION= 5 >+PORTREVISION= 6 > CATEGORIES= x11-wm > MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ > >@@ -9,8 +9,16 @@ > 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 >@@ -18,11 +26,11 @@ > XORG_CAT= app > GNU_CONFIGURE= yes > 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 >+USES= gmake libtool pathfix tar:bzip2 >+USE_GL= gl glu >+USE_GNOME= cairo gconf2 intltool libxslt >+USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \ >+ xorgproto xrandr xrender > USE_LDCONFIG= yes > > GCONF_SCHEMAS= gwd.schemas \ >@@ -64,10 +72,11 @@ > CPPFLAGS+= -I${LOCALBASE}/include > LIBS+= -L${LOCALBASE}/lib > >-OPTIONS_DEFINE= SVG GTK2 METACITY DBUS FUSE >-OPTIONS_DEFAULT= SVG GTK2 METACITY DBUS >+OPTIONS_DEFINE= DBUS FUSE GTK2 METACITY NLS SVG >+OPTIONS_DEFAULT=DBUS GTK2 NLS SVG > >-METACITY_DESC= Enable Metacity support >+METACITY_DESC= Enable Metacity support [broken since Metacity migrated to GTK+ 3] >+METACITY_BROKEN= Metacity support is broken. Deselect the option METACITY to build > > SUB_FILES= compiz-manager > DESKTOP_ENTRIES= "Compiz Manager" \ >@@ -87,9 +96,16 @@ > 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 >+ >+NLS_CONFIGURE_ENABLE= nls >+NLS_USES= gettext-runtime gettext-tools >+ > .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 +112,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/patch-plugins_fuse.c >=================================================================== >--- files/patch-plugins_fuse.c (révision 477874) >+++ 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 477874) >+++ 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)\" > >Index: pkg-plist >=================================================================== >--- pkg-plist (révision 477874) >+++ pkg-plist (copie de travail) >@@ -32,6 +32,8 @@ > lib/compiz/libglib.so > lib/compiz/libgnomecompat.a > lib/compiz/libgnomecompat.so >+lib/compiz/libinotify.a >+lib/compiz/libinotify.so > lib/compiz/libini.a > lib/compiz/libini.so > lib/compiz/libminimize.a
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 230894
:
196535
|
198226
|
202312
|
204167