Date: Thu, 16 Jun 2022 10:11:18 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: Minoru TANABE <kotanabe3@gmail.com> Cc: freebsd-ports@freebsd.org, Chris <portmaster@bsdforge.com> Subject: Re: MATE desktop , compiz does not work properly after disable gconf support Message-ID: <20220616101118.fc0dbb2532d7e9684839dc68@dec.sakura.ne.jp> In-Reply-To: <CA%2BGDr7gjK86g2tgjkKVOq8Tj-O4F-GCTMBm=_SSuHYsKxBnp%2BQ@mail.gmail.com> References: <CA%2BGDr7gjK86g2tgjkKVOq8Tj-O4F-GCTMBm=_SSuHYsKxBnp%2BQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Thu__16_Jun_2022_10_11_18_+0900_jktDcPSyk3ml.QwK Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 15 Jun 2022 23:50:24 +0000 Minoru TANABE <kotanabe3@gmail.com> wrote: > Hi all. > I'm using MATE desktop and compiz. For several years, they work fine. > But after commit below > --- > commit d631449922df1f12590bdd282ea21f2cbf885109 > Author: Baptiste Daroussin <bapt@FreeBSD.org> > Date: Wed Jun 8 14:49:53 2022 +0200 > > compiz: disable gconf support > > Approved by: maintainer (private email) > --- > X display freeze, (System is still working). > I wonder Why disable gconf, and I want to know how to fix it. > Thanks. > -- > Minoru TANABE > 15-1-406, aoto 1-chome, tokyo, japan > EMail kotanabe3@gmail.com It is because only gconf holds the working configuration of compiz. I've already commented about it at dev-commits-ports-main ML [1] and the maintainer is working on it. But the current approach (port again x11-wm/ccsm) requires working gconf backend, maybe. If something is NOT already broken, applying attached patch (partially reverts the commit, excluding MOVED entry) onto latest ports tree and forcibly rebuild / reinstall x11-wm/compiz x11-wm/compiz-plugins-main x11-wm/compiz-plugins-extra x11-wm/compiz-plugins-unsupported would hopefully help. If you already deinstalled x11-wm/compizconfig-backend-gconf on update, you should build / install it again. If you want to backup your configuration from gconf backend, run gconftool-2 --recursive-list /schemas/apps/compiz > somewhere1 gconftool-2 --recursive-list /apps/compiz > somewhere2 would export them to XML data. Note that I've locked affected ports before update, I'm on gconf backend. So if the update actually break something, the above would not help. One advice: Checking dev-commits-ports-main ML whether there's any dangerous commits like this exists or not would bless you. I'm checking it via ML archive. (Not subscribed.) Or check via cgit [2]. [1] https://lists.freebsd.org/archives/dev-commits-ports-main/2022-June/026094.html [2] https://cgit.freebsd.org/ports/log/ -- Tomoaki AOKI <junchoon@dec.sakura.ne.jp> --Multipart=_Thu__16_Jun_2022_10_11_18_+0900_jktDcPSyk3ml.QwK Content-Type: text/x-diff; name="REV_ports_git_d631449922df_Disable-gconf-support-on-compiz-rev2.diff" Content-Disposition: attachment; filename="REV_ports_git_d631449922df_Disable-gconf-support-on-compiz-rev2.diff" Content-Transfer-Encoding: 7bit author Baptiste Daroussin <bapt@FreeBSD.org> 2022-06-08 12:49:53 +0000 committer Baptiste Daroussin <bapt@FreeBSD.org> 2022-06-08 20:18:19 +0000 commit d631449922df1f12590bdd282ea21f2cbf885109 (patch) tree f76f030091271ccb630c42090d5c03553b9618f2 parent afc34de8e3e18e6ce82f8949f65aff64be5931a8 (diff) download ports-d631449922df1f12590bdd282ea21f2cbf885109.tar.gz ports-d631449922df1f12590bdd282ea21f2cbf885109.zip compiz: disable gconf support Approved by: maintainer (private email) Diffstat -rw-r--r-- MOVED 1 -rw-r--r-- x11-wm/Makefile 1 -rw-r--r-- x11-wm/compiz-plugins-extra/Makefile 33 -rw-r--r-- x11-wm/compiz-plugins-main/Makefile 32 -rw-r--r-- x11-wm/compiz-plugins-unsupported/Makefile 14 -rw-r--r-- x11-wm/compiz/Makefile 41 -rw-r--r-- x11-wm/compiz/pkg-plist 4 -rw-r--r-- x11-wm/compizconfig-backend-gconf/Makefile 30 -rw-r--r-- x11-wm/compizconfig-backend-gconf/distinfo 2 -rw-r--r-- x11-wm/compizconfig-backend-gconf/pkg-descr 3 -rw-r--r-- x11-wm/compizconfig-backend-gconf/pkg-plist 3 11 files changed, 15 insertions, 149 deletions diff --git a/x11-wm/Makefile b/x11-wm/Makefile index 3c2ee70e2451..56f462979a67 100644 --- a/x11-wm/Makefile +++ b/x11-wm/Makefile @@ -19,6 +19,7 @@ SUBDIR += compiz-plugins-extra SUBDIR += compiz-plugins-main SUBDIR += compiz-plugins-unsupported + SUBDIR += compizconfig-backend-gconf SUBDIR += compton SUBDIR += ctwm SUBDIR += cwm diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 13503cda963e..82a2537cccc6 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -26,14 +26,41 @@ USES= gettext-tools gmake gl gnome libtool:keepla localbase:ldflags \ pathfix pkgconfig tar:bzip2 xorg USE_GL= glu USE_CSTD= gnu89 -USE_GNOME= gdkpixbuf2 intltool libxslt +USE_GNOME= gconf2 gdkpixbuf2 intltool libxslt USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr xrender USE_LDCONFIG= yes -CONFIGURE_ARGS= --disable-schemas +CONFIGURE_ARGS= --enable-schemas GNU_CONFIGURE= yes INSTALL_TARGET= install-strip +GCONF_SCHEMAS= compiz-3d.schemas \ + compiz-addhelper.schemas \ + compiz-animationaddon.schemas \ + compiz-bench.schemas \ + compiz-bicubic.schemas \ + compiz-crashhandler.schemas \ + compiz-cubeaddon.schemas \ + compiz-extrawm.schemas \ + compiz-fadedesktop.schemas \ + compiz-firepaint.schemas \ + compiz-gears.schemas \ + compiz-grid.schemas \ + compiz-group.schemas \ + compiz-loginout.schemas \ + compiz-maximumize.schemas \ + compiz-mblur.schemas \ + compiz-notification.schemas \ + compiz-reflex.schemas \ + compiz-scalefilter.schemas \ + compiz-shelf.schemas \ + compiz-showdesktop.schemas \ + compiz-showmouse.schemas \ + compiz-splash.schemas \ + compiz-trailfocus.schemas \ + compiz-wallpaper.schemas \ + compiz-widget.schemas + OPTIONS_DEFINE= NLS NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile index e6fe95820571..a2c74c70a2fc 100644 --- a/x11-wm/compiz-plugins-main/Makefile +++ b/x11-wm/compiz-plugins-main/Makefile @@ -25,14 +25,40 @@ USES= gettext-tools gl gmake gnome jpeg libtool:keepla localbase:ldflags pathfi pkgconfig tar:bzip2 xorg USE_CSTD= gnu89 USE_GL= glu -USE_GNOME= intltool libxslt +USE_GNOME= gconf2 intltool libxslt USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr xrender USE_LDCONFIG= yes # Fix build with clang11 CFLAGS+= -fcommon +GCONF_SCHEMAS= compiz-animation.schemas \ + compiz-colorfilter.schemas \ + compiz-expo.schemas \ + compiz-ezoom.schemas \ + compiz-imgjpeg.schemas \ + compiz-kdecompat.schemas \ + compiz-mag.schemas \ + compiz-mousepoll.schemas \ + compiz-neg.schemas \ + compiz-opacify.schemas \ + compiz-put.schemas \ + compiz-resizeinfo.schemas \ + compiz-ring.schemas \ + compiz-staticswitcher.schemas \ + compiz-session.schemas \ + compiz-snap.schemas \ + compiz-text.schemas \ + compiz-thumbnail.schemas \ + compiz-wall.schemas \ + compiz-winrules.schemas \ + compiz-workarounds.schemas \ + compiz-scaleaddon.schemas \ + compiz-titleinfo.schemas \ + compiz-vpswitch.schemas \ + compiz-shift.schemas + -CONFIGURE_ARGS= --disable-schemas +CONFIGURE_ARGS= --enable-schemas OPTIONS_DEFINE= NLS diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile index 1b7c9c813781..069a4eaad4b1 100644 --- a/x11-wm/compiz-plugins-unsupported/Makefile +++ b/x11-wm/compiz-plugins-unsupported/Makefile @@ -25,11 +25,19 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= gettext-tools gmake gnome libtool:keepla localbase:ldflags pathfix \ pkgconfig tar:bzip2 xorg -USE_GNOME= intltool libxslt +USE_GNOME= gconf2 intltool libxslt USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto xrandr USE_LDCONFIG= yes +GCONF_SCHEMAS= compiz-atlantis.schemas \ + compiz-cubemodel.schemas \ + compiz-elements.schemas \ + compiz-fakeargb.schemas \ + compiz-mswitch.schemas \ + compiz-snow.schemas \ + compiz-tile.schemas + -CONFIGURE_ARGS= --disable-schemas +CONFIGURE_ARGS= --enable-schemas OPTIONS_DEFINE= NLS diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index f7bab6c16648..430a68623a47 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS_i386= nvidia-settings:x11/nvidia-settings USES= gettext-runtime gettext-tools gl gmake gnome libtool \ localbase pathfix tar:bzip2 xorg xorg-cat:app USE_GL= gl glu -USE_GNOME= cairo intltool libxslt +USE_GNOME= cairo gconf2 intltool libxslt USE_LDCONFIG= yes USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \ xorgproto xrandr xrender @@ -34,11 +34,9 @@ USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-kde4 \ --disable-kde \ - --disable-gconf \ --disable-gnome \ --disable-gnome-keybindings \ - --disable-metacity \ - --disable-inotify + --disable-metacity INSTALL_TARGET= install-strip SUB_FILES= compiz-manager @@ -48,6 +46,39 @@ DESKTOP_ENTRIES= "Compiz Manager" \ "compiz-manager" \ "System;Core;" \ false +GCONF_SCHEMAS= gwd.schemas \ + compiz-annotate.schemas \ + compiz-blur.schemas \ + compiz-clone.schemas \ + compiz-commands.schemas \ + compiz-core.schemas \ + compiz-cube.schemas \ + compiz-dbus.schemas \ + compiz-decoration.schemas \ + compiz-fade.schemas \ + compiz-fs.schemas \ + compiz-gconf.schemas \ + compiz-glib.schemas \ + compiz-gnomecompat.schemas \ + compiz-ini.schemas \ + compiz-inotify.schemas \ + compiz-kconfig.schemas \ + compiz-minimize.schemas \ + compiz-move.schemas \ + compiz-obs.schemas \ + compiz-place.schemas \ + compiz-png.schemas \ + compiz-regex.schemas \ + compiz-resize.schemas \ + compiz-rotate.schemas \ + compiz-scale.schemas \ + compiz-screenshot.schemas \ + compiz-svg.schemas \ + compiz-switcher.schemas \ + compiz-video.schemas \ + compiz-water.schemas \ + compiz-wobbly.schemas \ + compiz-zoom.schemas OPTIONS_DEFINE= DBUS FUSE GTK2 SVG OPTIONS_DEFAULT=DBUS GTK2 SVG diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist index a4f90c804adb..a5f6cfc0bd3f 100644 --- a/x11-wm/compiz/pkg-plist +++ b/x11-wm/compiz/pkg-plist @@ -26,6 +26,8 @@ lib/compiz/libfade.a lib/compiz/libfade.so %%FUSE%%lib/compiz/libfs.a %%FUSE%%lib/compiz/libfs.so +lib/compiz/libgconf.a +lib/compiz/libgconf.so lib/compiz/libglib.a lib/compiz/libglib.so lib/compiz/libgnomecompat.a @@ -69,6 +71,7 @@ lib/libdecoration.so lib/libdecoration.so.0 lib/libdecoration.so.0.0.0 libdata/pkgconfig/compiz-cube.pc +libdata/pkgconfig/compiz-gconf.pc libdata/pkgconfig/compiz-scale.pc libdata/pkgconfig/compiz.pc libdata/pkgconfig/libdecoration.pc @@ -99,6 +102,7 @@ libdata/pkgconfig/libdecoration.pc %%DATADIR%%/resize.xml %%DATADIR%%/rotate.xml %%DATADIR%%/scale.xml +%%DATADIR%%/schemas.xslt %%DATADIR%%/screenshot.xml %%DATADIR%%/svg.xml %%DATADIR%%/switcher.xml diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile index 92738c4d3dbd..000000000000 --- /dev/null +++ b/x11-wm/compizconfig-backend-gconf/Makefile @@ -0,0 +1,30 @@ +# Created by: Robert Noland <rnoland@FreeBSD.org> + +PORTNAME= compizconfig-backend-gconf +PORTVERSION= 0.8.8 +PORTREVISION= 4 +CATEGORIES= x11-wm +MASTER_SITES= https://BSDforge.com/projects/source/x11-wm/compizconfig-backend-gconf/ + +MAINTAINER= portmaster@BSDforge.com +COMMENT= GConf backend for CompizConfig + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:x11-wm/compiz +LIB_DEPENDS= libcompizconfig.so:x11-wm/libcompizconfig \ + libstartup-notification-1.so:x11/startup-notification + +GNU_CONFIGURE= yes +INSTALL_TARGET= install-strip +USES= gmake gnome libtool:keepla pathfix pkgconfig tar:bzip2 xorg +USE_GNOME= gconf2 glib20 libxslt +USE_LDCONFIG= yes +USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama xrandr + +post-patch: + @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ + ${WRKSRC}/settings-backend/gconf.c \ + +.include <bsd.port.mk> diff --git a/x11-wm/compizconfig-backend-gconf/distinfo b/x11-wm/compizconfig-backend-gconf/distinfo index 38fd8c31cbac..000000000000 --- /dev/null +++ b/x11-wm/compizconfig-backend-gconf/distinfo @@ -0,0 +1,2 @@ +SHA256 (compizconfig-backend-gconf-0.8.8.tar.bz2) = 19a8df7f417535db80945cabb9a09c532241e6308406352d12cb5cbc6a1322cc +SIZE (compizconfig-backend-gconf-0.8.8.tar.bz2) = 248650 diff --git a/x11-wm/compizconfig-backend-gconf/pkg-descr b/x11-wm/compizconfig-backend-gconf/pkg-descr index 53dcdeb21343..000000000000 --- /dev/null +++ b/x11-wm/compizconfig-backend-gconf/pkg-descr @@ -0,0 +1,3 @@ +The gconf backend for CompizConfig. It uses the +Gnome configuration system and provides integration into the Gnome desktop +environment. diff --git a/x11-wm/compizconfig-backend-gconf/pkg-plist b/x11-wm/compizconfig-backend-gconf/pkg-plist index 4dc77a1b44e4..000000000000 --- /dev/null +++ b/x11-wm/compizconfig-backend-gconf/pkg-plist @@ -0,0 +1,3 @@ +lib/compizconfig/backends/libgconf.so +lib/compizconfig/backends/libgconf.la +lib/compizconfig/backends/libgconf.a --Multipart=_Thu__16_Jun_2022_10_11_18_+0900_jktDcPSyk3ml.QwK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20220616101118.fc0dbb2532d7e9684839dc68>