On Sat, 9 Oct 2021, ASC wrote:
> Hello ports@,
>
> Are there any plans to replace Compiz with Compiz Reloaded?
> There don't seem to be any updates since a few years to Compiz Fusion,
> and CCSM seems to only show an empty window (unlike the Reloaded version).
> I have been able to build it by removing a few `-ldl`s in the configure.ac
> and it works fine on my machine.
>
> ASC
>
>
>
>
I would be willing to commit an update if you send one through. This port
needs to move from python2 to python3.
Which version did you build on your end out of interest?
I made a diff to move from 0.8.8 -> 0.8.12 which I was thinking of
committing soon. See below and let me know if any feedback.
Getting an update tested by someone with an actual interest in compiz
would be very much appreciated.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/x11/compiz/Makefile.inc,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile.inc
--- Makefile.inc 12 Jul 2019 20:51:09 -0000 1.4
+++ Makefile.inc 2 Jan 2022 21:58:33 -0000
@@ -2,9 +2,11 @@
PORTROACH += limitw:1,even
+V ?= 0.8.12
+
CATEGORIES = x11
-HOMEPAGE = http://www.compiz.org/
+HOMEPAGE = https://gitlab.com/compiz
# MIT, GPL and LGPL
PERMIT_PACKAGE = Yes
Index: bcop/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/bcop/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- bcop/Makefile 9 Jun 2020 07:14:46 -0000 1.3
+++ bcop/Makefile 2 Jan 2022 21:58:33 -0000
@@ -2,15 +2,18 @@
COMMENT = compiz option code generator
-V = 0.8.8
+H = 730f46b80c25891535c905511d7da6887ce38028
DISTNAME = compiz-bcop-${V}
-REVISION = 1
-MASTER_SITES = http://releases.compiz.org/${V}/
+MASTER_SITES = https://gitlab.com/compiz/compiz-bcop/-/archive/v${V}/
BUILD_DEPENDS = textproc/libxslt
RUN_DEPENDS = textproc/libxslt
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+
+WRKDIST = ${WRKDIR}/compiz-bcop-v${V}-${H}
.include <bsd.port.mk>
Index: bcop/distinfo
===================================================================
RCS file: /cvs/ports/x11/compiz/bcop/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- bcop/distinfo 3 Dec 2013 00:47:07 -0000 1.1
+++ bcop/distinfo 2 Jan 2022 21:58:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (compiz/compiz-bcop-0.8.8.tar.gz) =
BUegOO2dbSZUsG0IuZn9YvGOeJ58028L5+8mo9a+HHg=
-SIZE (compiz/compiz-bcop-0.8.8.tar.gz) = 93555
+SHA256 (compiz/compiz-bcop-0.8.12.tar.gz) =
BZ0Fw9hj6z8UkRGtocVXqAREEpA+yGYh5zFGCg5Tx18=
+SIZE (compiz/compiz-bcop-0.8.12.tar.gz) = 18323
Index: ccsm/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/ccsm/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- ccsm/Makefile 23 Feb 2021 19:39:49 -0000 1.6
+++ ccsm/Makefile 2 Jan 2022 21:58:33 -0000
@@ -2,13 +2,14 @@
COMMENT = compiz configuration manager
-DISTNAME = ccsm-0.8.4
-REVISION = 3
+H = 1bfec2f6012067ec334813423b54cbf3512f08f6
+DISTNAME = ccsm-${V}
-MASTER_SITES = http://releases.compiz.org/components/ccsm/
+MASTER_SITES = https://gitlab.com/compiz/ccsm/-/archive/v${V}/
MODULES = lang/python \
textproc/intltool
+
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
RUN_DEPENDS = devel/desktop-file-utils \
@@ -16,5 +17,9 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dbus-python \
x11/gtk+3,-guic \
x11/py-gtk2
+
+WRKDIST = ${WRKDIR}/ccsm-v${V}-${H}
+
+NO_TEST = Yes
.include <bsd.port.mk>
Index: ccsm/distinfo
===================================================================
RCS file: /cvs/ports/x11/compiz/ccsm/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- ccsm/distinfo 3 Dec 2013 00:52:03 -0000 1.1
+++ ccsm/distinfo 2 Jan 2022 21:58:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (compiz/ccsm-0.8.4.tar.gz) =
iMJZGGiH7WHLoFrHZ1WSa6YqM/lZYsWHYlGNoFuYICQ=
-SIZE (compiz/ccsm-0.8.4.tar.gz) = 635866
+SHA256 (compiz/ccsm-0.8.12.tar.gz) =
htc2ge3BMp+Ii4pxH2SmEoVRvAez3G+GjZQ1/DHQnEw=
+SIZE (compiz/ccsm-0.8.12.tar.gz) = 886784
Index: ccsm/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/compiz/ccsm/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- ccsm/pkg/PLIST 29 Jun 2018 22:16:22 -0000 1.3
+++ ccsm/pkg/PLIST 2 Jan 2022 21:58:33 -0000
@@ -17,7 +17,9 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ccm/Window.pyc
lib/python${MODPY_VERSION}/site-packages/ccm/__init__.py
lib/python${MODPY_VERSION}/site-packages/ccm/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ccsm-0.8.4-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/ccsm-0.8.12-py${MODPY_VERSION}.egg-info
+share/appdata/
+share/appdata/ccsm.appdata.xml
share/applications/ccsm.desktop
share/ccsm/
share/ccsm/icons/
@@ -43,8 +45,11 @@ share/ccsm/icons/hicolor/scalable/
share/ccsm/icons/hicolor/scalable/apps/
share/ccsm/icons/hicolor/scalable/apps/plugin-3d.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-addhelper.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-anaglyph.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-animation.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-animationaddon.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-animationplus.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-animationsim.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-annotate.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-atlantis.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-bench.svg
@@ -57,25 +62,32 @@ share/ccsm/icons/hicolor/scalable/apps/p
share/ccsm/icons/hicolor/scalable/apps/plugin-crashhandler.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-cube.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-cubeaddon.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-cubemodel.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-dbus.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-debug.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-decoration.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-dialog.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-elements.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-expo.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-extrawm.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-ezoom.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-fade.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-fadedesktop.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-fakeargb.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-fireflies.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-firepaint.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-freewins.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-fs.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-gears.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-ghost.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-glib.svg
-share/ccsm/icons/hicolor/scalable/apps/plugin-gnomecompat.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-grid.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-group.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-imgjpeg.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-inotify.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-loginout.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-mag.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-maximumize.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-mblur.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-minimize.svg
@@ -86,9 +98,11 @@ share/ccsm/icons/hicolor/scalable/apps/p
share/ccsm/icons/hicolor/scalable/apps/plugin-notification.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-obs.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-opacify.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-photo.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-place.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-png.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-put.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-putplus.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-reflex.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-regex.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-resize.svg
@@ -106,16 +120,22 @@ share/ccsm/icons/hicolor/scalable/apps/p
share/ccsm/icons/hicolor/scalable/apps/plugin-shift.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-showdesktop.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-showmouse.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-smartput.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-snap.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-snow.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-snowglobe.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-splash.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-stackswitch.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-star.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-static.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-staticswitcher.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-svg.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-swap.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-switcher.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-text.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-thumbnail.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-tile.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-toggledeco.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-trailfocus.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-unknown.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-video.svg
@@ -125,8 +145,10 @@ share/ccsm/icons/hicolor/scalable/apps/p
share/ccsm/icons/hicolor/scalable/apps/plugin-water.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-widget.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-winrules.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-wizard.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-wobbly.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-workarounds.svg
+share/ccsm/icons/hicolor/scalable/apps/plugin-workspacenames.svg
share/ccsm/icons/hicolor/scalable/apps/plugin-zoom.svg
share/ccsm/icons/hicolor/scalable/categories/
share/ccsm/icons/hicolor/scalable/categories/plugins-accessibility.svg
@@ -179,12 +201,12 @@ share/locale/id/LC_MESSAGES/ccsm.mo
share/locale/it/LC_MESSAGES/ccsm.mo
share/locale/ja/LC_MESSAGES/ccsm.mo
share/locale/ko/LC_MESSAGES/ccsm.mo
-share/locale/md/
-share/locale/md/LC_MESSAGES/
-share/locale/md/LC_MESSAGES/ccsm.mo
share/locale/ml_IN/
share/locale/ml_IN/LC_MESSAGES/
share/locale/ml_IN/LC_MESSAGES/ccsm.mo
+share/locale/mnk/
+share/locale/mnk/LC_MESSAGES/
+share/locale/mnk/LC_MESSAGES/ccsm.mo
share/locale/nb/LC_MESSAGES/ccsm.mo
share/locale/nl/LC_MESSAGES/ccsm.mo
share/locale/or/LC_MESSAGES/ccsm.mo
Index: compizconfig-python/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/compizconfig-python/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- compizconfig-python/Makefile 28 Feb 2021 21:01:32 -0000 1.6
+++ compizconfig-python/Makefile 2 Jan 2022 21:58:33 -0000
@@ -2,14 +2,15 @@
COMMENT = compiz configuration system bindings
-DISTNAME = compizconfig-python-0.8.4
-REVISION = 3
+H = 126bda6161ffca190ed83a59830e6681eb03bd67
+DISTNAME = compizconfig-python-${V}
-MASTER_SITES = http://releases.compiz.org/components/compizconfig-python/
+MASTER_SITES = https://gitlab.com/compiz/compizconfig-python/-/archive/v${V}/
-WANTLIB = ICE SM X11 X11-xcb Xcomposite Xdamage Xext Xfixes Xinerama
-WANTLIB += Xrandr Xrender compizconfig glib-2.0 iconv intl lzma m pcre
-WANTLIB += pthread startup-notification-1 xcb xcb-util xml2 xslt z
+WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
+WANTLIB += Xfixes Xinerama Xrandr Xrender compizconfig glib-2.0
+WANTLIB += iconv intl lzma m pcre pthread startup-notification-1
+WANTLIB += xcb xcb-util xml2 z
LIB_DEPENDS = x11/compiz/libcompizconfig
@@ -20,18 +21,21 @@ BUILD_DEPENDS = lang/cython${MODPY_FLAVO
LIBTOOL_FLAGS = --tag=disable-static
-AUTOCONF_VERSION = 2.63
-AUTOMAKE_VERSION = 1.12
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
CONFIGURE_STYLE = autoreconf
+WRKDIST = ${WRKDIR}/compizconfig-python-v${V}-${H}
+
pre-patch:
- @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
- @ln -s ${LOCALBASE}/bin/cython${MODPY_BIN_SUFFIX} ${WRKDIR}/bin/cython
+ ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
+ ln -s ${LOCALBASE}/bin/cython${MODPY_BIN_SUFFIX} ${WRKDIR}/bin/cython
+
pre-build:
- @rm -f ${WRKSRC}/src/compizconfig.c
+ rm -f ${WRKSRC}/src/compizconfig.c
post-install:
- @rm -f ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/*.la
+ rm -f ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/*.la
.include <bsd.port.mk>
Index: compizconfig-python/distinfo
===================================================================
RCS file: /cvs/ports/x11/compiz/compizconfig-python/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- compizconfig-python/distinfo 3 Dec 2013 00:51:19 -0000 1.1
+++ compizconfig-python/distinfo 2 Jan 2022 21:58:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (compiz/compizconfig-python-0.8.4.tar.gz) =
hxSG/5oH93tJ3GnEKw4n4fMXjnK6ZjR4kerz4A8qan8=
-SIZE (compiz/compizconfig-python-0.8.4.tar.gz) = 327707
+SHA256 (compiz/compizconfig-python-0.8.12.tar.gz) =
CljDxacUC0QQr34LSPZ9HFnsADZMC8esmFuTHTKYknQ=
+SIZE (compiz/compizconfig-python-0.8.12.tar.gz) = 18286
Index: compizconfig-python/patches/patch-configure_ac
===================================================================
RCS file: compizconfig-python/patches/patch-configure_ac
diff -N compizconfig-python/patches/patch-configure_ac
--- compizconfig-python/patches/patch-configure_ac 28 Feb 2021 21:01:32
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2021/02/28 21:01:32 daniel Exp $
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -31,10 +31,10 @@ else
- AM_PATH_PYTHON_VERSION(2.5,2.5.0)
- fi
-
--AC_CHECK_PROGS(PYREX, pyrexc)
-+AC_CHECK_PROGS(PYREX, cython)
- if test -z "$PYREX"
- then
-- AC_MSG_ERROR([Couldn't find Pyrex])
-+ AC_MSG_ERROR([Couldn't find Cython])
- fi
-
- AC_CONFIG_FILES([
Index: compizconfig-python/patches/patch-src_Makefile_am
===================================================================
RCS file: compizconfig-python/patches/patch-src_Makefile_am
diff -N compizconfig-python/patches/patch-src_Makefile_am
--- compizconfig-python/patches/patch-src_Makefile_am 28 Feb 2021 21:01:32
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_Makefile_am,v 1.1 2021/02/28 21:01:32 daniel Exp $
-
-Index: src/Makefile.am
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -3,7 +3,7 @@ INCLUDES=\
- @CCS_CFLAGS@
-
- compizconfig.c: compizconfig.pyx
-- -pyrexc compizconfig.pyx
-+ -cython compizconfig.pyx
-
- compizconfig_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex
initcompizconfig -lX11
- compizconfig_la_LIBADD = @CCS_LIBS@
Index: compizconfig-python/patches/patch-src_compizconfig_pyx
===================================================================
RCS file: compizconfig-python/patches/patch-src_compizconfig_pyx
diff -N compizconfig-python/patches/patch-src_compizconfig_pyx
--- compizconfig-python/patches/patch-src_compizconfig_pyx 28 Feb 2021
21:01:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-$OpenBSD: patch-src_compizconfig_pyx,v 1.2 2021/02/28 21:01:32 daniel Exp $
-Index: src/compizconfig.pyx
---- src/compizconfig.pyx.orig
-+++ src/compizconfig.pyx
-@@ -583,7 +583,7 @@ cdef class Setting:
- cdef object extendedStrRestrictions
- cdef object baseStrRestrictions
-
-- def __new__ (self, Plugin plugin, name, isScreen, screenNum = 0):
-+ def __cinit__ (self, Plugin plugin, name, isScreen, screenNum = 0):
- cdef CCSSettingType t
- cdef CCSSettingInfo * i
-
-@@ -653,7 +653,7 @@ cdef class Setting:
-
- property Hints:
- def __get__ (self):
-- if self.ccsSetting.hints == '':
-+ if not self.ccsSetting.hints:
- return []
- else:
- return str (self.ccsSetting.hints).split (";")[:-1]
-@@ -689,7 +689,7 @@ cdef class SSGroup:
- cdef object display
- cdef object screens
-
-- def __new__ (self, disp, screen):
-+ def __cinit__ (self, disp, screen):
- self.display = disp
- self.screens = screen
-
-@@ -715,7 +715,7 @@ cdef class Plugin:
- cdef object ranking
- cdef object hasExtendedString
-
-- def __new__ (self, Context context, name):
-+ def __cinit__ (self, Context context, name):
- self.ccsPlugin = ccsFindPlugin (context.ccsContext, name)
- self.context = context
- self.screens = []
-@@ -1056,7 +1056,7 @@ cdef class Profile:
- cdef Context context
- cdef char * name
-
-- def __new__ (self, Context context, name):
-+ def __cinit__ (self, Context context, name):
- self.context = context
- self.name = strdup (name)
-
-@@ -1078,7 +1078,7 @@ cdef class Backend:
- cdef Bool profileSupport
- cdef Bool integrationSupport
-
-- def __new__ (self, Context context, info):
-+ def __cinit__ (self, Context context, info):
- self.context = context
- self.name = strdup (info[0])
- self.shortDesc = strdup (info[1])
-@@ -1122,7 +1122,7 @@ cdef class Context:
- cdef int nScreens
- cdef Bool integration
-
-- def __new__ (self, screens = [0], plugins = [], basic_metadata = False):
-+ def __cinit__ (self, screens = [0], plugins = [], basic_metadata = False):
- cdef CCSPlugin * pl
- cdef CCSList * pll
- if basic_metadata:
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/core/Makefile,v
retrieving revision 1.39
diff -u -p -u -r1.39 Makefile
--- core/Makefile 9 Jun 2020 07:14:46 -0000 1.39
+++ core/Makefile 2 Jan 2022 21:58:33 -0000
@@ -2,39 +2,40 @@
COMMENT = OpenGL window and compositing manager
-V = 0.8.8
+H = cf0c8deba03ee739b503aa5a4109ebd0b2c1ba09
DISTNAME = compiz-${V}
-REVISION = 9
SHARED_LIBS = decoration 1.0
# MIT, GPL and LGPL
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU ICE SM X11 X11-xcb XRes Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
-WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm expat
-WANTLIB += ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl lzma m
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread rsvg-2 startup-notification-1 wnck-1 xcb
-WANTLIB += xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render xcb-shm
-WANTLIB += xcb-sync xcb-util xcb-xfixes xml2 xshmfence xslt z
+WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 X11-xcb XRes Xau
+WANTLIB += Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender Xxf86vm atk-1.0 c cairo cairo-gobject
+WANTLIB += dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
+WANTLIB += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gtk-x11-2.0
+WANTLIB += harfbuzz iconv intl jpeg lzma m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 pcre pixman-1 png rsvg-2 startup-notification-1
+WANTLIB += wnck-1 xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render
+WANTLIB += xcb-shm xcb-sync xcb-util xcb-xfixes xml2 xshmfence
+WANTLIB += z
COMPILER = base-clang ports-gcc base-gcc
-MASTER_SITES = http://releases.compiz.org/${V}/
+MASTER_SITES = https://gitlab.com/compiz/compiz-core/-/archive/v${V}/
-MODULES = devel/gconf2 \
- textproc/intltool
+MODULES = textproc/intltool
MODGCONF2_SCHEMAS_DIR = compiz
+BUILD_DEPENDS = textproc/libxslt
+
LIB_DEPENDS = devel/startup-notification \
devel/libwnck \
textproc/libxml \
- textproc/libxslt \
+ x11/dbus-glib \
x11/gnome/librsvg \
x11/gtk+2
@@ -42,18 +43,19 @@ USE_GMAKE = Yes
LIBTOOL_FLAGS = --tag=disable-static
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
CONFIGURE_ARGS = --disable-static \
--disable-fuse \
- --disable-inotify \
- --disable-metacity \
- --disable-gnome \
- --disable-gnome-keybindings \
- --disable-kde \
- --disable-kde4 \
- --disable-kconfig
+ --disable-inotify
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+WRKDIST = ${WRKDIR}/compiz-core-v${V}-${H}
+
+pre-configure:
+ cd ${WRKDIST} && intltoolize
post-install:
@rm -f ${PREFIX}/lib/compiz/*.la
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/x11/compiz/core/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- core/distinfo 26 Nov 2013 11:59:32 -0000 1.2
+++ core/distinfo 2 Jan 2022 21:58:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (compiz/compiz-0.8.8.tar.gz) =
HCr4VT6hY3k5NjDRbzzN1Eh8QdCZ5PVDWOcVQ98TrAA=
-SIZE (compiz/compiz-0.8.8.tar.gz) = 1758943
+SHA256 (compiz/compiz-0.8.12.tar.gz) =
i7DX/ablKvoWt+C/UUtPf5IAl0VaZSI0OuIrnEbYdY0=
+SIZE (compiz/compiz-0.8.12.tar.gz) = 1322169
Index: core/patches/patch-configure_ac
===================================================================
RCS file: core/patches/patch-configure_ac
diff -N core/patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ core/patches/patch-configure_ac 2 Jan 2022 21:58:33 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -327,7 +327,7 @@ if test "x$use_gtk" = "xyes"; then
+ CFLAGS="$CFLAGS $GTK_WINDOW_DECORATOR_CFLAGS"
+ LIBS="$LIBS $GTK_WINDOW_DECORATOR_LIBS"
+ CFLAGS="$save_CFLAGS"
+- LIBS="$save_LIBS -lm -ldl"
++ LIBS="$save_LIBS -lm"
+
+ if test "x$use_gsettings" = "xyes"; then
+ PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.25.0)
Index: core/patches/patch-plugins_gconf_c
===================================================================
RCS file: core/patches/patch-plugins_gconf_c
diff -N core/patches/patch-plugins_gconf_c
--- core/patches/patch-plugins_gconf_c 26 Nov 2013 11:59:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_gconf_c,v 1.1 2013/11/26 11:59:32 fgsch Exp $
---- plugins/gconf.c.orig Mon Apr 1 19:45:59 2013
-+++ plugins/gconf.c Mon Apr 1 19:46:01 2013
-@@ -725,8 +725,6 @@ gconfInitCore (CompPlugin *p,
- if (!gc)
- return FALSE;
-
-- g_type_init ();
--
- gc->client = gconf_client_get_default ();
-
- gconf_client_add_dir (gc->client, "/apps/" APP_NAME,
Index: core/patches/patch-plugins_screenshot_c
===================================================================
RCS file: core/patches/patch-plugins_screenshot_c
diff -N core/patches/patch-plugins_screenshot_c
--- core/patches/patch-plugins_screenshot_c 26 Nov 2013 11:59:32 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-plugins_screenshot_c,v 1.1 2013/11/26 11:59:32 fgsch Exp $
---- plugins/screenshot.c.orig Mon Apr 1 19:46:19 2013
-+++ plugins/screenshot.c Mon Apr 1 19:47:21 2013
-@@ -179,11 +179,9 @@ shotFilter (const struct dirent *d)
- }
-
- static int
--shotSort (const void *_a,
-- const void *_b)
-+shotSort (const struct dirent **a,
-+ const struct dirent **b)
- {
-- struct dirent **a = (struct dirent **) _a;
-- struct dirent **b = (struct dirent **) _b;
- int al = strlen ((*a)->d_name);
- int bl = strlen ((*b)->d_name);
-
Index: core/patches/patch-plugins_svg_c
===================================================================
RCS file: core/patches/patch-plugins_svg_c
diff -N core/patches/patch-plugins_svg_c
--- core/patches/patch-plugins_svg_c 26 Nov 2013 11:59:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,74 +0,0 @@
-$OpenBSD: patch-plugins_svg_c,v 1.1 2013/11/26 11:59:32 fgsch Exp $
---- plugins/svg.c.orig Fri May 21 12:18:14 2010
-+++ plugins/svg.c Mon Apr 1 20:32:28 2013
-@@ -28,7 +28,6 @@
-
- #include <cairo/cairo-xlib.h>
- #include <librsvg/rsvg.h>
--#include <librsvg/rsvg-cairo.h>
-
- #include <X11/Xatom.h>
- #include <X11/extensions/shape.h>
-@@ -514,7 +513,7 @@ svgSet (CompDisplay *d,
-
- if (sw->source)
- {
-- rsvg_handle_free (sw->source->svg);
-+ g_object_unref (sw->source->svg);
- sw->source->svg = svg;
- }
- else
-@@ -538,7 +537,7 @@ svgSet (CompDisplay *d,
- else
- {
- if (svg)
-- rsvg_handle_free (svg);
-+ g_object_unref (svg);
-
- if (sw->source)
- {
-@@ -669,7 +668,7 @@ readSvgFileToImage (char *file,
- *data = malloc (svgDimension.width * svgDimension.height * 4);
- if (!*data)
- {
-- rsvg_handle_free (svgHandle);
-+ g_object_unref (svgHandle);
- return FALSE;
- }
-
-@@ -694,7 +693,7 @@ readSvgFileToImage (char *file,
- cairo_surface_destroy (surface);
- }
-
-- rsvg_handle_free (svgHandle);
-+ g_object_unref (svgHandle);
-
- return TRUE;
- }
-@@ -925,7 +924,7 @@ svgFiniWindow (CompPlugin *p,
-
- if (sw->source)
- {
-- rsvg_handle_free (sw->source->svg);
-+ g_object_unref (sw->source->svg);
- free (sw->source);
- }
-
-@@ -1013,8 +1012,6 @@ svgInit (CompPlugin *p)
- return FALSE;
- }
-
-- rsvg_init ();
--
- compAddMetadataFromFile (&svgMetadata, p->vTable->name);
-
- return TRUE;
-@@ -1025,8 +1022,6 @@ svgFini (CompPlugin *p)
- {
- freeDisplayPrivateIndex (displayPrivateIndex);
- compFiniMetadata (&svgMetadata);
--
-- rsvg_term ();
- }
-
- static CompMetadata *
Index: core/patches/patch-src_Makefile_am
===================================================================
RCS file: core/patches/patch-src_Makefile_am
diff -N core/patches/patch-src_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ core/patches/patch-src_Makefile_am 2 Jan 2022 21:58:33 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Makefile.am
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
+
+ bin_PROGRAMS = compiz
+
+-compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm -ldl
++compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
+ compiz_LDFLAGS = -export-dynamic -pthread
+ compiz_SOURCES = \
+ main.c \
Index: core/patches/patch-src_Makefile_in
===================================================================
RCS file: core/patches/patch-src_Makefile_in
diff -N core/patches/patch-src_Makefile_in
--- core/patches/patch-src_Makefile_in 26 Nov 2013 11:59:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2013/11/26 11:59:32 fgsch Exp $
---- src/Makefile.in.orig Sat Feb 23 22:00:56 2013
-+++ src/Makefile.in Sat Feb 23 22:00:59 2013
-@@ -292,7 +292,7 @@ INCLUDES = \
- -DIMAGEDIR=\"$(imagedir)\" \
- -DMETADATADIR=\"$(metadatadir)\"
-
--compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm -ldl
-+compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
- compiz_LDFLAGS = -export-dynamic -pthread
- compiz_SOURCES = \
- main.c \
Index: core/patches/patch-src_display_c
===================================================================
RCS file: core/patches/patch-src_display_c
diff -N core/patches/patch-src_display_c
--- core/patches/patch-src_display_c 26 Nov 2013 11:59:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_display_c,v 1.1 2013/11/26 11:59:32 fgsch Exp $
---- src/display.c.orig Wed Sep 29 13:39:49 2010
-+++ src/display.c Sat Mar 16 11:27:12 2013
-@@ -1106,9 +1106,10 @@ updateModifierMappings (CompDisplay *d)
- index = 0;
- do
- {
-- keysym = XKeycodeToKeysym (d->display,
-- d->modMap->modifiermap[i],
-- index++);
-+ keysym = XkbKeycodeToKeysym (d->display,
-+ d->modMap->modifiermap[i],
-+ 0,
-+ index++);
- } while (!keysym && index < keysymsPerKeycode);
-
- if (keysym)
Index: core/patches/patch-src_option_c
===================================================================
RCS file: core/patches/patch-src_option_c
diff -N core/patches/patch-src_option_c
--- core/patches/patch-src_option_c 26 Nov 2013 11:59:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_option_c,v 1.1 2013/11/26 11:59:32 fgsch Exp $
---- src/option.c.orig Fri May 21 12:18:14 2010
-+++ src/option.c Sat Mar 16 11:27:40 2013
-@@ -606,7 +606,7 @@ keyBindingToString (CompDisplay *d,
- KeySym keysym;
- char *keyname;
-
-- keysym = XKeycodeToKeysym (d->display, key->keycode, 0);
-+ keysym = XkbKeycodeToKeysym (d->display, key->keycode, 0, 0);
- keyname = XKeysymToString (keysym);
-
- if (keyname)
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/compiz/core/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST
--- core/pkg/PLIST 4 Sep 2018 12:46:27 -0000 1.7
+++ core/pkg/PLIST 2 Jan 2022 21:58:33 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2018/09/04 12:46:27 espie Exp $
@bin bin/compiz
+bin/compiz-decorator
@bin bin/gtk-window-decorator
include/compiz/
include/compiz/compiz-common.h
@@ -10,41 +11,42 @@ include/compiz/compiz-scale.h
include/compiz/compiz.h
include/compiz/decoration.h
lib/compiz/
-lib/compiz/libannotate.so
-lib/compiz/libblur.so
-lib/compiz/libclone.so
-lib/compiz/libcommands.so
-lib/compiz/libcube.so
-lib/compiz/libdbus.so
-lib/compiz/libdecoration.so
-lib/compiz/libfade.so
-lib/compiz/libgconf.so
-lib/compiz/libglib.so
-lib/compiz/libgnomecompat.so
-lib/compiz/libini.so
-lib/compiz/libminimize.so
-lib/compiz/libmove.so
-lib/compiz/libobs.so
-lib/compiz/libplace.so
-lib/compiz/libpng.so
-lib/compiz/libregex.so
-lib/compiz/libresize.so
-lib/compiz/librotate.so
-lib/compiz/libscale.so
-lib/compiz/libscreenshot.so
-lib/compiz/libsvg.so
-lib/compiz/libswitcher.so
-lib/compiz/libvideo.so
-lib/compiz/libwater.so
-lib/compiz/libwobbly.so
-lib/compiz/libzoom.so
+@so lib/compiz/libannotate.so
+@so lib/compiz/libblur.so
+@so lib/compiz/libclone.so
+@so lib/compiz/libcommands.so
+@so lib/compiz/libcube.so
+@so lib/compiz/libdbus.so
+@so lib/compiz/libdecoration.so
+@so lib/compiz/libfade.so
+@so lib/compiz/libglib.so
+@so lib/compiz/libini.so
+@so lib/compiz/libmatecompat.so
+@so lib/compiz/libminimize.so
+@so lib/compiz/libmove.so
+@so lib/compiz/libobs.so
+@so lib/compiz/libplace.so
+@so lib/compiz/libpng.so
+@so lib/compiz/libregex.so
+@so lib/compiz/libresize.so
+@so lib/compiz/librotate.so
+@so lib/compiz/libscale.so
+@so lib/compiz/libscreenshot.so
+@so lib/compiz/libsvg.so
+@so lib/compiz/libswitcher.so
+@so lib/compiz/libvideo.so
+@so lib/compiz/libwall.so
+@so lib/compiz/libwater.so
+@so lib/compiz/libwobbly.so
+@so lib/compiz/libzoom.so
lib/libdecoration.la
@lib lib/libdecoration.so.${LIBdecoration_VERSION}
lib/pkgconfig/compiz-cube.pc
-lib/pkgconfig/compiz-gconf.pc
lib/pkgconfig/compiz-scale.pc
lib/pkgconfig/compiz.pc
lib/pkgconfig/libdecoration.pc
+share/applications/
+share/applications/compiz.desktop
share/compiz/
share/compiz/annotate.xml
share/compiz/blur.xml
@@ -57,13 +59,11 @@ share/compiz/decoration.xml
share/compiz/fade.xml
share/compiz/freedesktop.png
share/compiz/fs.xml
-share/compiz/gconf.xml
share/compiz/glib.xml
-share/compiz/gnomecompat.xml
share/compiz/icon.png
share/compiz/ini.xml
share/compiz/inotify.xml
-share/compiz/kconfig.xml
+share/compiz/matecompat.xml
share/compiz/minimize.xml
share/compiz/move.xml
share/compiz/obs.xml
@@ -73,24 +73,33 @@ share/compiz/regex.xml
share/compiz/resize.xml
share/compiz/rotate.xml
share/compiz/scale.xml
-share/compiz/schemas.xslt
share/compiz/screenshot.xml
share/compiz/svg.xml
share/compiz/switcher.xml
share/compiz/video.xml
+share/compiz/wall.xml
share/compiz/water.xml
share/compiz/wobbly.xml
share/compiz/zoom.xml
share/doc/pkg-readmes/${PKGSTEM}
-share/locale/af/LC_MESSAGES/compiz.mo
+share/glib-2.0/schemas/org.compiz-0.gwd.gschema.xml
+share/icons/hicolor/16x16/apps/compiz.png
+share/icons/hicolor/16x16/apps/gtk-decorator.png
+share/icons/hicolor/22x22/apps/compiz.png
+share/icons/hicolor/22x22/apps/gtk-decorator.png
+share/icons/hicolor/24x24/apps/compiz.png
+share/icons/hicolor/24x24/apps/gtk-decorator.png
+share/icons/hicolor/32x32/apps/compiz.png
+share/icons/hicolor/32x32/apps/gtk-decorator.png
+share/icons/hicolor/48x48/apps/gtk-decorator.png
+share/icons/hicolor/scalable/apps/compiz.svg
+share/icons/hicolor/scalable/apps/gtk-decorator.svg
share/locale/ar/LC_MESSAGES/compiz.mo
share/locale/bg/LC_MESSAGES/compiz.mo
share/locale/bn/LC_MESSAGES/compiz.mo
share/locale/bn_IN/LC_MESSAGES/compiz.mo
-share/locale/bs/LC_MESSAGES/compiz.mo
share/locale/ca/LC_MESSAGES/compiz.mo
share/locale/cs/LC_MESSAGES/compiz.mo
-share/locale/cy/LC_MESSAGES/compiz.mo
share/locale/da/LC_MESSAGES/compiz.mo
share/locale/de/LC_MESSAGES/compiz.mo
share/locale/el/LC_MESSAGES/compiz.mo
@@ -112,12 +121,8 @@ share/locale/hu/LC_MESSAGES/compiz.mo
share/locale/id/LC_MESSAGES/compiz.mo
share/locale/it/LC_MESSAGES/compiz.mo
share/locale/ja/LC_MESSAGES/compiz.mo
-share/locale/ka/LC_MESSAGES/compiz.mo
share/locale/km/LC_MESSAGES/compiz.mo
share/locale/ko/LC_MESSAGES/compiz.mo
-share/locale/lo/
-share/locale/lo/LC_MESSAGES/
-share/locale/lo/LC_MESSAGES/compiz.mo
share/locale/lt/LC_MESSAGES/compiz.mo
share/locale/mk/LC_MESSAGES/compiz.mo
share/locale/mr/LC_MESSAGES/compiz.mo
@@ -138,43 +143,7 @@ share/locale/ta/LC_MESSAGES/compiz.mo
share/locale/tr/LC_MESSAGES/compiz.mo
share/locale/uk/LC_MESSAGES/compiz.mo
share/locale/vi/LC_MESSAGES/compiz.mo
-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
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas
>/dev/null 2>&1
-${SCHEMAS_INSTDIR}/
-${SCHEMAS_INSTDIR}/compiz-annotate.schemas
-${SCHEMAS_INSTDIR}/compiz-blur.schemas
-${SCHEMAS_INSTDIR}/compiz-clone.schemas
-${SCHEMAS_INSTDIR}/compiz-commands.schemas
-${SCHEMAS_INSTDIR}/compiz-core.schemas
-${SCHEMAS_INSTDIR}/compiz-cube.schemas
-${SCHEMAS_INSTDIR}/compiz-dbus.schemas
-${SCHEMAS_INSTDIR}/compiz-decoration.schemas
-${SCHEMAS_INSTDIR}/compiz-fade.schemas
-${SCHEMAS_INSTDIR}/compiz-fs.schemas
-${SCHEMAS_INSTDIR}/compiz-gconf.schemas
-${SCHEMAS_INSTDIR}/compiz-glib.schemas
-${SCHEMAS_INSTDIR}/compiz-gnomecompat.schemas
-${SCHEMAS_INSTDIR}/compiz-ini.schemas
-${SCHEMAS_INSTDIR}/compiz-inotify.schemas
-${SCHEMAS_INSTDIR}/compiz-kconfig.schemas
-${SCHEMAS_INSTDIR}/compiz-minimize.schemas
-${SCHEMAS_INSTDIR}/compiz-move.schemas
-${SCHEMAS_INSTDIR}/compiz-obs.schemas
-${SCHEMAS_INSTDIR}/compiz-place.schemas
-${SCHEMAS_INSTDIR}/compiz-png.schemas
-${SCHEMAS_INSTDIR}/compiz-regex.schemas
-${SCHEMAS_INSTDIR}/compiz-resize.schemas
-${SCHEMAS_INSTDIR}/compiz-rotate.schemas
-${SCHEMAS_INSTDIR}/compiz-scale.schemas
-${SCHEMAS_INSTDIR}/compiz-screenshot.schemas
-${SCHEMAS_INSTDIR}/compiz-svg.schemas
-${SCHEMAS_INSTDIR}/compiz-switcher.schemas
-${SCHEMAS_INSTDIR}/compiz-video.schemas
-${SCHEMAS_INSTDIR}/compiz-water.schemas
-${SCHEMAS_INSTDIR}/compiz-wobbly.schemas
-${SCHEMAS_INSTDIR}/compiz-zoom.schemas
-${SCHEMAS_INSTDIR}/gwd.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source`
%D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas
>/dev/null 2>&1
Index: libcompizconfig/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/libcompizconfig/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- libcompizconfig/Makefile 5 Jun 2021 03:50:40 -0000 1.8
+++ libcompizconfig/Makefile 2 Jan 2022 21:58:33 -0000
@@ -2,13 +2,12 @@
COMMENT = compiz configuration system library
-V = 0.8.8
+H = 42c57acda9b1027af59f91632fa0f7101447778a
DISTNAME = libcompizconfig-${V}
-REVISION = 3
SHARED_LIBS = compizconfig 0.0 # 0.0
-MASTER_SITES = http://releases.compiz.org/${V}/
+MASTER_SITES = https://gitlab.com/compiz/libcompizconfig/-/archive/v${V}/
WANTLIB += X11 iconv lzma m pthread ${COMPILER_LIBCXX} xcb xml2 z
@@ -25,10 +24,17 @@ LIBTOOL_FLAGS = --tag=disable-static
BASESYSCONFDIR = ${LOCALBASE}/share/compiz
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
CONFIGURE_ARGS = --disable-protobuf
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+WRKDIST = ${WRKDIR}/libcompizconfig-v${V}-${H}
+
+pre-configure:
+ cd ${WRKDIST} && intltoolize
post-install:
@rm -f ${PREFIX}/lib/compiz/*.la \
Index: libcompizconfig/distinfo
===================================================================
RCS file: /cvs/ports/x11/compiz/libcompizconfig/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- libcompizconfig/distinfo 3 Dec 2013 00:49:44 -0000 1.1
+++ libcompizconfig/distinfo 2 Jan 2022 21:58:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (compiz/libcompizconfig-0.8.8.tar.gz) =
32a7JDA3WJxpI59P5doMUp9GYZS8vncviJlCZIWTLtw=
-SIZE (compiz/libcompizconfig-0.8.8.tar.gz) = 408366
+SHA256 (compiz/libcompizconfig-0.8.12.tar.gz) =
M9mOZra13DrP5IEe8spYYb2a9D9/MEMJlY6oSiPMqkg=
+SIZE (compiz/libcompizconfig-0.8.12.tar.gz) = 71871
Index: libcompizconfig/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/compiz/libcompizconfig/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -u -r1.1 PLIST
--- libcompizconfig/pkg/PLIST 3 Dec 2013 00:49:44 -0000 1.1
+++ libcompizconfig/pkg/PLIST 2 Jan 2022 21:58:33 -0000
@@ -2,10 +2,10 @@
include/compizconfig/
include/compizconfig/ccs-backend.h
include/compizconfig/ccs.h
-lib/compiz/libccp.so
+@so lib/compiz/libccp.so
lib/compizconfig/
lib/compizconfig/backends/
-lib/compizconfig/backends/libini.so
+@so lib/compizconfig/backends/libini.so
lib/libcompizconfig.la
@lib lib/libcompizconfig.so.${LIBcompizconfig_VERSION}
lib/pkgconfig/libcompizconfig.pc
Index: plugins-main/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/plugins-main/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- plugins-main/Makefile 13 Feb 2021 22:16:12 -0000 1.7
+++ plugins-main/Makefile 2 Jan 2022 21:58:33 -0000
@@ -2,19 +2,18 @@
COMMENT = main plugins for compiz
-V = 0.8.8
+H = aa26ec20660a21ff7426f83ade0e7dd9df8a4acb
DISTNAME = compiz-plugins-main-${V}
-REVISION = 5
-MASTER_SITES = http://releases.compiz.org/${V}/
+MASTER_SITES = https://gitlab.com/compiz/compiz-plugins-main/-/archive/v${V}/
-WANTLIB = GL GLU ICE SM X11 X11-xcb Xcomposite Xdamage Xext Xfixes
-WANTLIB += Xinerama Xrandr Xrender Xxf86vm cairo drm expat ffi
-WANTLIB += fontconfig freetype glapi glib-2.0 gobject-2.0 graphite2
-WANTLIB += gthread-2.0 harfbuzz iconv intl jpeg lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += startup-notification-1 xcb xcb-dri2 xcb-glx xcb-render
-WANTLIB += xcb-shm xcb-util xml2 xslt z
+WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 X11-xcb Xau Xcomposite
+WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xinerama Xrandr Xrender
+WANTLIB += cairo expat ffi fontconfig freetype fribidi gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 harfbuzz
+WANTLIB += iconv intl jpeg lzma m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png startup-notification-1 xcb xcb-render
+WANTLIB += xcb-shm xcb-util xml2 z
MODULES = textproc/intltool
@@ -26,9 +25,13 @@ BUILD_DEPENDS = x11/compiz/bcop \
x11/compiz/core
RUN_DEPENDS = x11/compiz/core
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = autoreconf
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+WRKDIST = ${WRKDIR}/compiz-plugins-main-v${V}-${H}
post-install:
@rm -f ${PREFIX}/lib/compiz/*.la
Index: plugins-main/distinfo
===================================================================
RCS file: /cvs/ports/x11/compiz/plugins-main/distinfo,v
retrieving revision 1.1
diff -u -p -u -r1.1 distinfo
--- plugins-main/distinfo 3 Dec 2013 00:53:41 -0000 1.1
+++ plugins-main/distinfo 2 Jan 2022 21:58:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (compiz/compiz-plugins-main-0.8.8.tar.gz) =
BaBBo0KsbdM/cWZV3QDcKDx3f2pkpmbb4zztZnN/r7A=
-SIZE (compiz/compiz-plugins-main-0.8.8.tar.gz) = 1838991
+SHA256 (compiz/compiz-plugins-main-0.8.12.tar.gz) =
qbPuZP3VGMnMELmsAIsfjfBDgZyuFz9d89IXhB+iEWw=
+SIZE (compiz/compiz-plugins-main-0.8.12.tar.gz) = 1410986
Index: plugins-main/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/compiz/plugins-main/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -u -r1.1 PLIST
--- plugins-main/pkg/PLIST 3 Dec 2013 00:53:41 -0000 1.1
+++ plugins-main/pkg/PLIST 2 Jan 2022 21:58:33 -0000
@@ -2,40 +2,35 @@
include/compiz/compiz-animation.h
include/compiz/compiz-mousepoll.h
include/compiz/compiz-text.h
-lib/compiz/libanimation.so
-lib/compiz/libcolorfilter.so
-lib/compiz/libexpo.so
-lib/compiz/libezoom.so
-lib/compiz/libimgjpeg.so
-lib/compiz/libkdecompat.so
-lib/compiz/libmag.so
-lib/compiz/libmousepoll.so
-lib/compiz/libneg.so
-lib/compiz/libopacify.so
-lib/compiz/libput.so
-lib/compiz/libresizeinfo.so
-lib/compiz/libring.so
-lib/compiz/libscaleaddon.so
-lib/compiz/libsession.so
-lib/compiz/libshift.so
-lib/compiz/libsnap.so
-lib/compiz/libstaticswitcher.so
-lib/compiz/libtext.so
-lib/compiz/libthumbnail.so
-lib/compiz/libtitleinfo.so
-lib/compiz/libvpswitch.so
-lib/compiz/libwall.so
-lib/compiz/libwinrules.so
-lib/compiz/libworkarounds.so
+@so lib/compiz/libanimation.so
+@so lib/compiz/libcolorfilter.so
+@so lib/compiz/libexpo.so
+@so lib/compiz/libezoom.so
+@so lib/compiz/libimgjpeg.so
+@so lib/compiz/libmag.so
+@so lib/compiz/libmousepoll.so
+@so lib/compiz/libneg.so
+@so lib/compiz/libopacify.so
+@so lib/compiz/libput.so
+@so lib/compiz/libresizeinfo.so
+@so lib/compiz/libring.so
+@so lib/compiz/libscaleaddon.so
+@so lib/compiz/libsession.so
+@so lib/compiz/libshift.so
+@so lib/compiz/libsnap.so
+@so lib/compiz/libstaticswitcher.so
+@so lib/compiz/libtext.so
+@so lib/compiz/libthumbnail.so
+@so lib/compiz/libtitleinfo.so
+@so lib/compiz/libvpswitch.so
+@so lib/compiz/libwinrules.so
+@so lib/compiz/libworkarounds.so
lib/pkgconfig/compiz-animation.pc
lib/pkgconfig/compiz-mousepoll.pc
lib/pkgconfig/compiz-text.pc
-share/compiz/Gnome/
-share/compiz/Gnome/mask.png
-share/compiz/Gnome/overlay.png
-share/compiz/Oxygen/
-share/compiz/Oxygen/mask.png
-share/compiz/Oxygen/overlay.png
+share/compiz/Default/
+share/compiz/Default/mask.png
+share/compiz/Default/overlay.png
share/compiz/animation.xml
share/compiz/colorfilter.xml
share/compiz/expo.xml
@@ -54,7 +49,6 @@ share/compiz/filters/swap-green-blue
share/compiz/filters/swap-red-blue
share/compiz/filters/swap-red-green
share/compiz/imgjpeg.xml
-share/compiz/kdecompat.xml
share/compiz/mag.xml
share/compiz/mousepoll.xml
share/compiz/neg.xml
@@ -71,7 +65,6 @@ share/compiz/text.xml
share/compiz/thumbnail.xml
share/compiz/titleinfo.xml
share/compiz/vpswitch.xml
-share/compiz/wall.xml
share/compiz/winrules.xml
share/compiz/workarounds.xml
share/locale/ar/LC_MESSAGES/compiz-plugins-main.mo
