From 23fd1ea79faf3e0194728b6b188ef15088bd477b Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 27 Jul 2025 12:29:25 +0300 Subject: x11-wm/compiz: several improvements * add a missing BDEPEND * remove python's eggs * bump up PYTHON_COMPAT to python3_13 Signed-off-by: Alexander Golubev --- x11-wm/compiz/compiz-0.9.14.2-r1.ebuild | 149 ------------------------------- x11-wm/compiz/compiz-0.9.14.2-r2.ebuild | 152 ++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 149 deletions(-) delete mode 100644 x11-wm/compiz/compiz-0.9.14.2-r1.ebuild create mode 100644 x11-wm/compiz/compiz-0.9.14.2-r2.ebuild diff --git a/x11-wm/compiz/compiz-0.9.14.2-r1.ebuild b/x11-wm/compiz/compiz-0.9.14.2-r1.ebuild deleted file mode 100644 index ff87c39d..00000000 --- a/x11-wm/compiz/compiz-0.9.14.2-r1.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{8..12} ) -BRANCH="0.9.14" - -inherit cmake xdg-utils python-single-r1 toolchain-funcs - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.launchpad.net/${PN}" - S="${WORKDIR}/${P}" -else - SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64" -fi - -DESCRIPTION="OpenGL window and compositing manager" -HOMEPAGE="https://launchpad.net/compiz" - -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" - -IUSE="+cairo debug dbus gles2 gnome gtk kde libnotify +svg test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -COMMONDEPEND=" - ${PYTHON_DEPS} - dev-libs/boost - dev-libs/glib:2 - dev-cpp/glibmm:2 - dev-libs/libxml2 - dev-libs/libxslt - $(python_gen_cond_dep ' - 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 - x11-libs/libXrender - x11-libs/libXinerama - x11-libs/libICE - x11-libs/libSM - x11-libs/startup-notification - virtual/opengl - virtual/glu - cairo? ( x11-libs/cairo[X] ) - gtk? ( - x11-libs/gtk+:3 - x11-libs/libwnck:3 - x11-libs/pango - gnome? ( - gnome-base/gnome-desktop:= - x11-wm/metacity - ) - ) - kde? ( kde-plasma/kwin ) - libnotify? ( x11-libs/libnotify ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - ) - dbus? ( sys-apps/dbus )" - -DEPEND="${COMMONDEPEND} - app-admin/chrpath - virtual/pkgconfig - test? ( - dev-cpp/gtest - )" - -RDEPEND="${COMMONDEPEND} - x11-apps/mesa-progs - x11-apps/xvinfo - x11-themes/hicolor-icon-theme" -PATCHES=( - "${FILESDIR}/access_violation.patch" - "${FILESDIR}/gtk-extents.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ - && die "Sorry, but gcc 4.6 or higher is required." - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - sed -i \ - -e 's|CYTHON_BIN cython3|CYTHON_BIN cython|' \ - compizconfig/compizconfig-python/CMakeLists.txt || die - eapply_user -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE=Debug - local mycmakeargs=( - -DBUILD_GLES=$(usex gles2) - -DBUILD_GNOME=$(usex gnome) - -DBUILD_METACITY=$(usex gnome) - -DBUILD_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_ENABLED_PLUGIN_NOTIFICATION=$(usex libnotify) - -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On - -DCOMPIZ_PACKAGING_ENABLED=On - -DCOMPIZ_BUILD_WITH_RPATH=Off - -DCOMPIZ_WERROR=Off - -Wno-dev - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_fix_shebang "${ED}" - python_optimize -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - if use dbus; then - ewarn "The dbus plugin is known to crash compiz in this version. Disable" - ewarn "it if you experience crashes when plugins are enabled/disabled." - fi -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-wm/compiz/compiz-0.9.14.2-r2.ebuild b/x11-wm/compiz/compiz-0.9.14.2-r2.ebuild new file mode 100644 index 00000000..24c8c523 --- /dev/null +++ b/x11-wm/compiz/compiz-0.9.14.2-r2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{11..13} ) +BRANCH="0.9.14" + +inherit cmake xdg-utils python-single-r1 toolchain-funcs + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.launchpad.net/${PN}" + S="${WORKDIR}/${P}" +else + SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64" +fi + +DESCRIPTION="OpenGL window and compositing manager" +HOMEPAGE="https://launchpad.net/compiz" + +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0" + +IUSE="+cairo debug dbus gles2 gnome gtk kde libnotify +svg test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +COMMONDEPEND=" + ${PYTHON_DEPS} + dev-libs/boost + dev-libs/glib:2 + dev-cpp/glibmm:2 + dev-libs/libxml2 + dev-libs/libxslt + $(python_gen_cond_dep ' + 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 + x11-libs/libXrender + x11-libs/libXinerama + x11-libs/libICE + x11-libs/libSM + x11-libs/startup-notification + virtual/opengl + virtual/glu + cairo? ( x11-libs/cairo[X] ) + gtk? ( + x11-libs/gtk+:3 + x11-libs/libwnck:3 + x11-libs/pango + gnome? ( + gnome-base/gnome-desktop:= + x11-wm/metacity + ) + ) + kde? ( kde-plasma/kwin ) + libnotify? ( x11-libs/libnotify ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + dbus? ( sys-apps/dbus )" + +DEPEND="${COMMONDEPEND} + app-admin/chrpath + virtual/pkgconfig + test? ( + dev-cpp/gtest + )" + +RDEPEND="${COMMONDEPEND} + x11-apps/mesa-progs + x11-apps/xvinfo + x11-themes/hicolor-icon-theme" +BDEPEND=" + dev-util/intltool" +PATCHES=( + "${FILESDIR}/access_violation.patch" + "${FILESDIR}/gtk-extents.patch" +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-major-version) -lt 4 ]] || \ + ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \ + && die "Sorry, but gcc 4.6 or higher is required." + fi +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + sed -i \ + -e 's|CYTHON_BIN cython3|CYTHON_BIN cython|' \ + compizconfig/compizconfig-python/CMakeLists.txt || die + eapply_user +} + +src_configure() { + use debug && CMAKE_BUILD_TYPE=Debug + local mycmakeargs=( + -DBUILD_GLES=$(usex gles2) + -DBUILD_GNOME=$(usex gnome) + -DBUILD_METACITY=$(usex gnome) + -DBUILD_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_ENABLED_PLUGIN_NOTIFICATION=$(usex libnotify) + -DCOMPIZ_DISABLE_SCHEMAS_INSTALL=On + -DCOMPIZ_PACKAGING_ENABLED=On + -DCOMPIZ_BUILD_WITH_RPATH=Off + -DCOMPIZ_WERROR=Off + -Wno-dev + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + python_fix_shebang "${ED}" + python_optimize + rm -r "${D}/$(python_get_sitedir)"/*.egg-info || die +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + if use dbus; then + ewarn "The dbus plugin is known to crash compiz in this version. Disable" + ewarn "it if you experience crashes when plugins are enabled/disabled." + fi +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} -- cgit v1.2.3