From 9a7fe947fb84b425de9dcffb98f8fcfaff97d9bb Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Tue, 2 Aug 2016 08:54:56 +0200 Subject: Version bump --- x11-wm/compiz/Manifest | 4 +- x11-wm/compiz/compiz-0.9.12.9999.ebuild | 156 ----------------------------- x11-wm/compiz/compiz-0.9.13.9999.ebuild | 156 +++++++++++++++++++++++++++++ x11-wm/compiz/files/access_violation.patch | 10 ++ 4 files changed, 168 insertions(+), 158 deletions(-) delete mode 100644 x11-wm/compiz/compiz-0.9.12.9999.ebuild create mode 100644 x11-wm/compiz/compiz-0.9.13.9999.ebuild (limited to 'x11-wm') diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index ca02b3e..67ee67f 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,2 +1,2 @@ -AUX access_violation.patch 961 SHA256 72b0532e123e5c57112bc00fc7dfac23aa9cae63349a6611f942a1776633416b SHA512 33671b36e0da71382c475fc432610a890c978ee3c7f23a3339dd033293ebf25e3220a2ae99d1b8ae0b5940e581a58011e3ab1d6abbdded8c57c1ac6b290eb360 WHIRLPOOL cf51a49b7c7ccb54733372008019d929a32d856a2ccb66b1143f6c9c1bfe1b65b39bff464a513eca56cbcd3278b58b2a6c26312e0fbc51fc370079b320ea15d8 -EBUILD compiz-0.9.12.9999.ebuild 3817 SHA256 ad6bdd3584415e1daca77303c9d17ecce502f04518bc064d4fbc7b4062883ea4 SHA512 35039070e738a712fa8d3d776086c7da3bc04cdc0ab1a6d2670fade29afdccdfbd958d6b2fb05e887e8f865e30214ed52b479e0731220a93edc3d6c397767189 WHIRLPOOL a615d5e0297de8c1ef9398ac7bdc21abb97937c2f9c55170729c8c3c510f61c3faea08f2be8aa39476476cbda03bdc619b5a594135895c505d0899600903f09b +AUX access_violation.patch 1456 SHA256 efcfe62878821c78eee374508762f4cb769ee7f19235c8d6deb7a81b031690b8 SHA512 04af43f754aca8490e8462562311372e12306bb89aa3c9ed4ac466c65827f17a9f379c1250ad0881c0b3db18a068fd458a7275c8184851d72519a71f1e4fc3f1 WHIRLPOOL 43c5e35f202fc1e5a44168cea3b25ee92d5dbce1bfd62a06e188f534b81eb8b41b5fa050dbf8f82d0336fea05be9c5ea7afecb30af613f3a889b31836adcd5e5 +EBUILD compiz-0.9.13.9999.ebuild 3817 SHA256 ad6bdd3584415e1daca77303c9d17ecce502f04518bc064d4fbc7b4062883ea4 SHA512 35039070e738a712fa8d3d776086c7da3bc04cdc0ab1a6d2670fade29afdccdfbd958d6b2fb05e887e8f865e30214ed52b479e0731220a93edc3d6c397767189 WHIRLPOOL a615d5e0297de8c1ef9398ac7bdc21abb97937c2f9c55170729c8c3c510f61c3faea08f2be8aa39476476cbda03bdc619b5a594135895c505d0899600903f09b diff --git a/x11-wm/compiz/compiz-0.9.12.9999.ebuild b/x11-wm/compiz/compiz-0.9.12.9999.ebuild deleted file mode 100644 index e089c1a..0000000 --- a/x11-wm/compiz/compiz-0.9.12.9999.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit cmake-utils eutils gnome2-utils toolchain-funcs python versionator - -BRANCH="$(get_version_component_range 1-3)" -MINOR="$(get_version_component_range 4)" - -if [[ ${MINOR} == 9999 ]]; then - EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${BRANCH}" - inherit bzr -else - SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.bz2" -fi - -KEYWORDS="~amd64" -DESCRIPTION="OpenGL window and compositing manager" -HOMEPAGE="http://www.compiz.org/" - -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" - -IUSE="+cairo debug dbus fuse gles gnome gtk kde +svg test" - -COMMONDEPEND=" - !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-libs/libxml2 - dev-libs/libxslt - dev-python/pyrex - dev-libs/protobuf - media-libs/libpng - x11-base/xorg-server - x11-libs/libX11 - x11-libs/libXcomposite - 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] ) - 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 - ) - ) - kde? ( kde-base/kwin:4 ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - ) - dbus? ( sys-apps/dbus )" - -DEPEND="${COMMONDEPEND} - app-admin/chrpath - virtual/pkgconfig - x11-proto/damageproto - x11-proto/xineramaproto - test? ( - dev-cpp/gtest - dev-cpp/gmock - )" - -RDEPEND="${COMMONDEPEND} - dev-python/pygtk - x11-apps/mesa-progs - x11-apps/xvinfo - x11-themes/hicolor-icon-theme" - -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 -} - -src_unpack() { - if [[ ${MINOR} == 9999 ]]; then - bzr_src_unpack - else - default - fi -} - -src_prepare() { - epatch "${FILESDIR}"/access_violation.patch -} - -pkg_setup() { - python_set_active_version 2 -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE=Debug - local mycmakeargs=( - "$(cmake-utils_use_use gles GLES)" - "$(cmake-utils_use_use gnome GCONF)" - "$(cmake-utils_use_use gnome GNOME)" - "$(cmake-utils_use_use gnome GNOME_KEYBINDINGS)" - "$(cmake-utils_use_use gnome GSETTINGS)" - "$(cmake-utils_use_use gtk GTK)" - "$(cmake-utils_use_use kde KDE4)" - "$(cmake-utils_use test COMPIZ_BUILD_TESTING)" - "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_PREFIX=/usr" - "-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 -} - -pkg_preinst() { - use gnome && gnome2_gconf_savelist -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - 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_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/x11-wm/compiz/compiz-0.9.13.9999.ebuild b/x11-wm/compiz/compiz-0.9.13.9999.ebuild new file mode 100644 index 0000000..e089c1a --- /dev/null +++ b/x11-wm/compiz/compiz-0.9.13.9999.ebuild @@ -0,0 +1,156 @@ +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit cmake-utils eutils gnome2-utils toolchain-funcs python versionator + +BRANCH="$(get_version_component_range 1-3)" +MINOR="$(get_version_component_range 4)" + +if [[ ${MINOR} == 9999 ]]; then + EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${BRANCH}" + inherit bzr +else + SRC_URI="http://launchpad.net/${PN}/${BRANCH}/${PV}/+download/${P}.tar.bz2" +fi + +KEYWORDS="~amd64" +DESCRIPTION="OpenGL window and compositing manager" +HOMEPAGE="http://www.compiz.org/" + +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0" + +IUSE="+cairo debug dbus fuse gles gnome gtk kde +svg test" + +COMMONDEPEND=" + !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-libs/libxml2 + dev-libs/libxslt + dev-python/pyrex + dev-libs/protobuf + media-libs/libpng + x11-base/xorg-server + x11-libs/libX11 + x11-libs/libXcomposite + 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] ) + 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 + ) + ) + kde? ( kde-base/kwin:4 ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + dbus? ( sys-apps/dbus )" + +DEPEND="${COMMONDEPEND} + app-admin/chrpath + virtual/pkgconfig + x11-proto/damageproto + x11-proto/xineramaproto + test? ( + dev-cpp/gtest + dev-cpp/gmock + )" + +RDEPEND="${COMMONDEPEND} + dev-python/pygtk + x11-apps/mesa-progs + x11-apps/xvinfo + x11-themes/hicolor-icon-theme" + +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 +} + +src_unpack() { + if [[ ${MINOR} == 9999 ]]; then + bzr_src_unpack + else + default + fi +} + +src_prepare() { + epatch "${FILESDIR}"/access_violation.patch +} + +pkg_setup() { + python_set_active_version 2 +} + +src_configure() { + use debug && CMAKE_BUILD_TYPE=Debug + local mycmakeargs=( + "$(cmake-utils_use_use gles GLES)" + "$(cmake-utils_use_use gnome GCONF)" + "$(cmake-utils_use_use gnome GNOME)" + "$(cmake-utils_use_use gnome GNOME_KEYBINDINGS)" + "$(cmake-utils_use_use gnome GSETTINGS)" + "$(cmake-utils_use_use gtk GTK)" + "$(cmake-utils_use_use kde KDE4)" + "$(cmake-utils_use test COMPIZ_BUILD_TESTING)" + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_INSTALL_PREFIX=/usr" + "-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 +} + +pkg_preinst() { + use gnome && gnome2_gconf_savelist +} + +pkg_postinst() { + use gnome && gnome2_gconf_install + 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_prerm() { + use gnome && gnome2_gconf_uninstall +} diff --git a/x11-wm/compiz/files/access_violation.patch b/x11-wm/compiz/files/access_violation.patch index 6104bdc..98e8966 100644 --- a/x11-wm/compiz/files/access_violation.patch +++ b/x11-wm/compiz/files/access_violation.patch @@ -13,3 +13,13 @@ - ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file} + ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} \"$ENV{DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}\" ) +--- cmake/recompile_gsettings_schemas_in_dir_user_env.cmake.orig 2016-08-01 22:56:04.317994940 +0200 ++++ cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2016-08-01 22:58:03.707528553 +0200 +@@ -18,6 +18,6 @@ + if (GLIB_COMPILE_SCHEMAS) + + message ("-- Recompiling GSettings schemas in ${SCHEMADIR}") +- execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR}) ++ execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} \"$ENV{DESTDIR}${SCHEMADIR}\") + + endif (GLIB_COMPILE_SCHEMAS) -- cgit v1.2.3