diff options
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/compiz/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/compiz/compiz-9999.ebuild | 54 | ||||
| -rw-r--r-- | x11-wm/compiz/files/gcc-10.patch | 24 | ||||
| -rw-r--r-- | x11-wm/compiz/metadata.xml | 14 |
4 files changed, 32 insertions, 64 deletions
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index 4e2249b..0d1fea6 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,4 +1,4 @@ AUX access_violation.patch 1023 BLAKE2B cc06552acc0241a4f4c30feee61023023143fbb935cf925a9c18037ddb6d8bb6ceafd6f8b05da5ab40b448195cbfdd71cd3a145d204330c7c4f708e26e9aead5 SHA512 9772aaa487284599ecbffabee4bc91d522c71797c3e08dddd549b4f13c1565f861c66a1b63feb72ce12b4432d852e259de2d22c9b82314ebcf28d10420736a63 -AUX gcc-10.patch 1187 BLAKE2B f4f2daa0ec40c58d022c48cf78dc04c87509ec434569695e0dbccd9df4251977f29bce78b570c4ab5d65f8ac64238fb83ab4ae56899cc0119e6090d7b1c6d6bf SHA512 6d5f19ce3f2fc1e24698a3a6dcf5c53b985c149a1c1084f92ed4904cd4c0ff343e38804bcd139e1382026670d0495dcd7663efc508a781978421c1c51ee16f42 AUX gtk-extents.patch 491 BLAKE2B 11aa0d8ef8c2972585a8eaa23caf205f29e188e0f0bf89cd2334280c15809db2f9c05717c51aa62ffc8868cc97d4cb00d93233f7bb4ae2c0cb9604d127477923 SHA512 8943cbcfdeefe1fd4148b38278dab7091338265fa003ce98b32d0cda562a26cbe443ea00a99b39fae522f6db6559b5482a22e3826d256febd4e3aa4f7ebf267f -EBUILD compiz-9999.ebuild 3685 BLAKE2B 0b355ecbc8575290438b66f234c37b88cf1e71286260517e605eaee4a4413ba79011f4c7ebc462679d426608764b8e002e57a9c455237185f2df55b778f2fd2c SHA512 01c7761584eaf4ab8e402de8aac2443aab3829fb675503cc8b4faa09f1b71a3adbd8e73b6fe4418d5bcb1d0b8d7650d5ca14a875c24fc239b5e88e65e2819027 +EBUILD compiz-9999.ebuild 3105 BLAKE2B 65ddd99bb0ea8ef513f741cceaffe9fa8a333bad5fa9d1c4bdb516ad6b8059349c9a7205a17ff235fb24f9f82cde84266c36baebd1a3c3e4d947f21ff35374bb SHA512 36e2d57b4acecf019858820e106396ee56de1a57f74cc11b147c518fbd5455c6da2a1312fc3c8e50c02f2b819675aa4be844058fd103264782770dc5a8e133b5 +MISC metadata.xml 396 BLAKE2B b855aea7791b881ee8db99abc49f94ee825e6e7fa3b212e462867ae7c7485f0bf3739120cf5f369f6a20ae6ab32c7f1d8746dad0b291fe07f3098471b5885485 SHA512 e5ee8439fe8207f40da97145fdfe03993150d62487c51b3c57ff2e996ef288756095d94c430a0869fd11db17f9b4f566a73b7a6c8f0b1778cb2b58ff0fa8c05c diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild index e59a9d2..6edd0cb 100644 --- a/x11-wm/compiz/compiz-9999.ebuild +++ b/x11-wm/compiz/compiz-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) +EAPI=8 +PYTHON_COMPAT=( python3_{8..12} ) -inherit cmake-utils eutils gnome2-utils xdg-utils python-single-r1 toolchain-funcs +inherit cmake xdg-utils python-single-r1 toolchain-funcs if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -12,45 +12,36 @@ if [[ ${PV} == 9999* ]]; then S="${WORKDIR}/${P}" else SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.xz" + KEYWORDS="~amd64" fi -KEYWORDS="~amd64" DESCRIPTION="OpenGL window and compositing manager" -HOMEPAGE="http://www.compiz.org/" +HOMEPAGE="https://launchpad.net/compiz" LICENSE="GPL-2 LGPL-2.1 MIT" SLOT="0" -IUSE="+cairo debug dbus fuse gles gnome gtk kde +svg test" +IUSE="+cairo debug dbus gles gnome gtk kde +svg test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" COMMONDEPEND=" ${PYTHON_DEPS} - !x11-wm/compiz-fusion - !x11-libs/compiz-bcop - !x11-libs/libcompizconfig - !x11-libs/compizconfig-backend-gconf - !x11-libs/compizconfig-backend-kconfig4 - !x11-plugins/compiz-plugins-main - !x11-plugins/compiz-plugins-extra - !x11-plugins/compiz-plugins-unsupported - !x11-apps/ccsm - !dev-python/compizconfig-python - !x11-apps/fusion-icon dev-libs/boost dev-libs/glib:2 - dev-cpp/glibmm + dev-cpp/glibmm:2 dev-libs/libxml2 dev-libs/libxslt $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_MULTI_USEDEP}] - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ') dev-libs/protobuf media-libs/libpng x11-base/xorg-server x11-libs/libX11 x11-libs/libXcomposite + x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXrandr @@ -62,14 +53,12 @@ COMMONDEPEND=" virtual/opengl virtual/glu cairo? ( x11-libs/cairo[X] ) - fuse? ( sys-fs/fuse:= ) gtk? ( x11-libs/gtk+:3 x11-libs/libwnck:3 x11-libs/pango gnome? ( gnome-base/gnome-desktop:= - gnome-base/gconf x11-wm/metacity ) ) @@ -93,7 +82,6 @@ RDEPEND="${COMMONDEPEND} x11-themes/hicolor-icon-theme" PATCHES=( "${FILESDIR}/access_violation.patch" - "${FILESDIR}/gcc-10.patch" "${FILESDIR}/gtk-extents.patch" ) @@ -110,7 +98,7 @@ pkg_setup() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -i \ -e 's|CYTHON_BIN cython3|CYTHON_BIN cython|' \ compizconfig/compizconfig-python/CMakeLists.txt || die @@ -124,32 +112,26 @@ src_configure() { -DUSE_GNOME=$(usex gnome) -DUSE_METACITY=$(usex gnome) -DUSE_GTK=$(usex gtk) + -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DCOMPIZ_BUILD_TESTING=$(usex test) -DCOMPIZ_DEFAULT_PLUGINS=composite,opengl,decor,resize,place,move,ccp -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On -DCOMPIZ_PACKAGING_ENABLED=On -DCOMPIZ_BUILD_WITH_RPATH=Off - -DCOMPIZ_BUILD_TESTING=Off -DCOMPIZ_WERROR=Off -Wno-dev ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install python_fix_shebang "${ED}" python_optimize } -pkg_preinst() { - use gnome && gnome2_gconf_savelist - gnome2_icon_savelist -} - pkg_postinst() { - use gnome && gnome2_gconf_install xdg_desktop_database_update xdg_icon_cache_update if use dbus; then @@ -158,10 +140,6 @@ pkg_postinst() { fi } -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} - pkg_postrm() { xdg_desktop_database_update xdg_icon_cache_update diff --git a/x11-wm/compiz/files/gcc-10.patch b/x11-wm/compiz/files/gcc-10.patch deleted file mode 100644 index a5867b4..0000000 --- a/x11-wm/compiz/files/gcc-10.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur original/gtk/window-decorator/gtk-window-decorator.c modified/gtk/window-decorator/gtk-window-decorator.c ---- original/gtk/window-decorator/gtk-window-decorator.c 2019-11-27 13:24:31.000000000 +0000 -+++ modified/gtk/window-decorator/gtk-window-decorator.c 2020-05-17 00:28:11.586617947 +0100 -@@ -122,7 +122,7 @@ - - XRenderPictFormat *xformat_rgba; - --const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM] = { -+const gchar * __attribute__((__common__))window_type_frames[WINDOW_TYPE_FRAMES_NUM] = { - "normal", "modal_dialog", "dialog", "menu", "utility" - }; - -diff -Nur original/gtk/window-decorator/gtk-window-decorator.h modified/gtk/window-decorator/gtk-window-decorator.h ---- original/gtk/window-decorator/gtk-window-decorator.h 2019-11-27 13:24:31.000000000 +0000 -+++ modified/gtk/window-decorator/gtk-window-decorator.h 2020-05-17 00:27:21.383286282 +0100 -@@ -272,7 +272,7 @@ - } default_frame_references_t; - - extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2]; --const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM]; -+const gchar * __attribute__((__common__))window_type_frames[WINDOW_TYPE_FRAMES_NUM]; - - extern char *program_name; - diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml new file mode 100644 index 0000000..a5619d0 --- /dev/null +++ b/x11-wm/compiz/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>marcin.deranek@slonko.net</email> + <name>Marcin Deranek</name> + </maintainer> + <use> + <flag name="gles">Enable support for GLES</flag> + </use> + <upstream> + <remote-id type="launchpad">compiz</remote-id> + </upstream> +</pkgmetadata> |