Date: Fri, 3 Oct 2014 12:32:55 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369888 - head/x11-wm/compiz Message-ID: <201410031232.s93CWtof045415@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Oct 3 12:32:54 2014 New Revision: 369888 URL: https://svnweb.freebsd.org/changeset/ports/369888 QAT: https://qat.redports.org/buildarchive/r369888/ Log: Remove the gnome option, it doesn't work anymore after gnome3 is imported. Modified: head/x11-wm/compiz/Makefile head/x11-wm/compiz/pkg-plist Modified: head/x11-wm/compiz/Makefile ============================================================================== --- head/x11-wm/compiz/Makefile Fri Oct 3 12:26:44 2014 (r369887) +++ head/x11-wm/compiz/Makefile Fri Oct 3 12:32:54 2014 (r369888) @@ -2,7 +2,7 @@ PORTNAME= compiz PORTVERSION= 0.8.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ @@ -59,12 +59,13 @@ GCONF_SCHEMAS= gwd.schemas \ compiz-wobbly.schemas \ compiz-zoom.schemas -CONFIGURE_ARGS= --disable-kde4 --disable-kde +CONFIGURE_ARGS= --disable-kde4 --disable-kde \ + --disable-gnome --disable-gnome-keybindings CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= SVG GTK2 METACITY GNOME DBUS FUSE -OPTIONS_DEFAULT= SVG GTK2 METACITY GNOME DBUS +OPTIONS_DEFINE= SVG GTK2 METACITY DBUS FUSE +OPTIONS_DEFAULT= SVG GTK2 METACITY DBUS METACITY_DESC= Enable Metacity support @@ -95,23 +96,6 @@ USE_GNOME+= metacity CONFIGURE_ARGS+= --disable-metacity .endif -.if ${PORT_OPTIONS:MGNOME} && ${PORT_OPTIONS:MGTK2} -CONFIGURE_ARGS+= --enable-gnome \ - --enable-gnome-keybindings -USE_GNOME+= gnomecontrolcenter2 -WINDOWSETTINGSDATADIR= \ - `pkg-config --variable=prefix gnome-window-settings-2.0` -WINDOWSETTINGSLIBDIR= \ - `pkg-config --variable=libdir gnome-window-settings-2.0` -PLIST_SUB+= GNOME="" \ - WINDOWSETTINGSDATADIR="${WINDOWSETTINGSDATADIR}" \ - WINDOWSETTINGSLIBDIR="${WINDOWSETTINGSLIBDIR}" -.else -CONFIGURE_ARGS+= --disable-gnome \ - --disable-gnome-keybindings -PLIST_SUB+= GNOME="@comment " -.endif - .if ${PORT_OPTIONS:MDBUS} CONFIGURE_ARGS+= --enable-dbus BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus @@ -126,13 +110,10 @@ CONFIGURE_ARGS+= --disable-dbus --disabl .endif post-patch: - @${REINPLACE_CMD} -e 's|libpng|libpng15|' -e 's|gnome-desktop-2.0|gnome-desktop-2.0 gconf-2.0|g' \ + @${REINPLACE_CMD} -e 's|libpng|libpng15|' \ ${WRKSRC}/configure post-install: ${INSTALL_SCRIPT} ${WRKDIR}/compiz-manager ${STAGEDIR}${PREFIX}/bin/compiz-manager -.if ${PORT_OPTIONS:MGNOME} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/window-manager-settings/libcompiz.so -.endif .include <bsd.port.mk> Modified: head/x11-wm/compiz/pkg-plist ============================================================================== --- head/x11-wm/compiz/pkg-plist Fri Oct 3 12:26:44 2014 (r369887) +++ head/x11-wm/compiz/pkg-plist Fri Oct 3 12:32:54 2014 (r369888) @@ -110,15 +110,6 @@ libdata/pkgconfig/libdecoration.pc %%DATADIR%%/water.xml %%DATADIR%%/wobbly.xml %%DATADIR%%/zoom.xml -%%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%% -%%GNOME%%share/gnome/wm-properties/compiz-wm.desktop -%%GNOME%%share/gnome-control-center/keybindings/50-compiz-desktop-key.xml -%%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml -%%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%% -%%GNOME%%window-manager-settings/libcompiz.a -%%GNOME%%window-manager-settings/libcompiz.so -%%GNOME%%@cwd %%RESETPREFIX%% -%%GNOME%%share/applications/compiz.desktop share/locale/af/LC_MESSAGES/compiz.mo share/locale/ar/LC_MESSAGES/compiz.mo share/locale/bg/LC_MESSAGES/compiz.mo @@ -175,10 +166,3 @@ share/locale/xh/LC_MESSAGES/compiz.mo share/locale/zh_CN/LC_MESSAGES/compiz.mo share/locale/zh_TW/LC_MESSAGES/compiz.mo share/locale/zu/LC_MESSAGES/compiz.mo -@dirrmtry share/locale/en_US/LC_MESSAGES -@dirrmtry share/locale/en_US -@dirrmtry share/locale/lo/LC_MESSAGES -@dirrmtry share/locale/lo -@dirrm %%DATADIR%% -@dirrm lib/compiz -@dirrm include/compiz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410031232.s93CWtof045415>