From f7304a7e7d92834741afa76509117f57d1e67d51 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Mon, 29 Aug 2022 11:51:15 +0300 Subject: [PATCH] x11-plugins/cairo-dock-plugins: update to snapshot version to prevent build failures Disable broken weather plugin --- x11-plugins/cairo-dock-plugins/Manifest | 2 +- ...cairo-dock-plugins-3.4.1_p20210730.ebuild} | 16 ++++++++-- .../cairo-dock-plugins-2.3.0.2-sandbox.patch | 24 --------------- ...gins-3.4.1_p20210730-disable-weather.patch | 29 +++++++++++++++++++ 4 files changed, 44 insertions(+), 27 deletions(-) rename x11-plugins/cairo-dock-plugins/{cairo-dock-plugins-3.4.1.ebuild => cairo-dock-plugins-3.4.1_p20210730.ebuild} (78%) delete mode 100644 x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch create mode 100644 x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1_p20210730-disable-weather.patch diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest index f821250..04d6b8c 100644 --- a/x11-plugins/cairo-dock-plugins/Manifest +++ b/x11-plugins/cairo-dock-plugins/Manifest @@ -1 +1 @@ -DIST cairo-dock-plug-ins-3.4.1.tar.gz 6827195 BLAKE2B 7944a92ca0b70c92e3974e6201da22a5a718aeb3e250cec1ee9204e7a6eb0a51f5658e84aac484c81f2b5fb01be3ffc9e0c0a45d93faeadd1014ade916ac9f30 SHA512 0b6ab8f06f8e7f24787a6b87531434286276a3a626fcd31a136ff1e256241fbea96a72b673fd8a05bd5be772f6c3abcb7c593e30784c183f7be0c5b373e96f03 +DIST cairo-dock-plugins-3.4.1_p20210730.zip 8474825 BLAKE2B 37ca7fa7d572305a004eefe03f27d5d7034cb4ecfa9c2b5a0a8817fb06cadf2d13428628b8c5fd4100912f1ff9859bdf35ab758fd36d26942a3986ab8e1d1b6b SHA512 e2fabd380ce25d418b40a857b645759f897d77801eb5018e37a0bb77fc65e9c3b31f30aa781e91ab76645a09421cdb1db315f8e435791d622921b960249fe90e diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1_p20210730.ebuild similarity index 78% rename from x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild rename to x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1_p20210730.ebuild index 9d83c91..c039e57 100644 --- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1.ebuild +++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-3.4.1_p20210730.ebuild @@ -10,7 +10,7 @@ MM_PV=$(ver_cut 1-2) DESCRIPTION="Official plugins for cairo-dock" HOMEPAGE="http://www.glx-dock.org" -SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${PV}/+download/${MY_PN}-${PV}.tar.gz" +SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.zip" LICENSE="GPL-3" SLOT="0" @@ -25,7 +25,7 @@ RDEPEND=" sys-apps/dbus x11-libs/cairo x11-libs/gtkglext - ~x11-misc/cairo-dock-${PV} + >=x11-misc/cairo-dock-3.4.1 x11-libs/gtk+:3 alsa? ( media-libs/alsa-lib ) exif? ( media-libs/libexif ) @@ -51,6 +51,18 @@ DEPEND="${RDEPEND} dev-libs/libdbusmenu[gtk3] " +S="${WORKDIR}/cairo-dock-plug-ins-master" + +src_prepare() { + # fix version to compile with cairo-dock-3.4.1 + sed -i -e '/set (VERSION/s/3.4.99.alpha1/3.4.1/' CMakeLists.txt || die + + # disable broken weather plugin + eapply "${FILESDIR}/${P}-disable-weather.patch" + + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -Denable-alsa-mixer=$(usex alsa) diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch deleted file mode 100644 index 19e8f3c..0000000 --- a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-2.3.0.2-sandbox.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/bash/BashInstall.cmake.in cairo-dock-plugins-2.3.0~2/Dbus/interfaces/bash/BashInstall.cmake.in ---- cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/bash/BashInstall.cmake.in 2011-10-03 07:51:28.000000000 -0700 -+++ cairo-dock-plugins-2.3.0~2/Dbus/interfaces/bash/BashInstall.cmake.in 2012-01-27 18:31:33.714287648 -0800 -@@ -1,7 +1,7 @@ - IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS - "setup.py" "install" -- "--prefix=${CMAKE_INSTALL_PREFIX}" -+ "--prefix=$ENV{D}${CMAKE_INSTALL_PREFIX}" - "@DEBIAN_INSTALL_LAYOUT@") - ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS -diff -ru cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/python/PythonInstall.cmake.in cairo-dock-plugins-2.3.0~2/Dbus/interfaces/python/PythonInstall.cmake.in ---- cairo-dock-plugins-2.3.0~2.orig//Dbus/interfaces/python/PythonInstall.cmake.in 2011-10-03 07:51:28.000000000 -0700 -+++ cairo-dock-plugins-2.3.0~2/Dbus/interfaces/python/PythonInstall.cmake.in 2012-01-27 18:31:43.582287380 -0800 -@@ -1,7 +1,7 @@ - IF("@ROOT_PREFIX@" STREQUAL "") - EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS - "setup.py" "install" -- "--prefix=${CMAKE_INSTALL_PREFIX}" -+ "--prefix=$ENV{D}${CMAKE_INSTALL_PREFIX}" - "@DEBIAN_INSTALL_LAYOUT@") - ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "") - EXEC_PROGRAM("@PYTHON_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS diff --git a/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1_p20210730-disable-weather.patch b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1_p20210730-disable-weather.patch new file mode 100644 index 0000000..df43de1 --- /dev/null +++ b/x11-plugins/cairo-dock-plugins/files/cairo-dock-plugins-3.4.1_p20210730-disable-weather.patch @@ -0,0 +1,29 @@ +--- a/CMakeLists.txt 2022-08-29 11:47:42.214319853 +0300 ++++ b/CMakeLists.txt 2022-08-29 11:47:52.078319128 +0300 +@@ -1391,26 +1391,6 @@ + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Toons/data/Toons.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Toons/data/Toons.conf) + add_subdirectory (Toons) + +-############# WEATHER ################# +-message (STATUS "> Weather:") +-set (with_weather no) +-set (WEATHER_MODULE openssl) +-pkg_check_modules (WEATHER ${WEATHER_MODULE}) +-if (NOT WEATHER_FOUND) +- message (STATUS "Could not find ${WEATHER_MODULE}; Cairo-Dock won't be built with Weather applet.") +- message (WARNING "This module is required to compile Weather applet: ${WEATHER_MODULE}") +- set (MODULES_MISSING "${MODULES_MISSING} ${WEATHER_MODULE}") +-else() +- set (GETTEXT_WEATHER ${GETTEXT_PLUGINS}) +- set (VERSION_WEATHER "2.1.0") +- set (PACKAGE_WEATHER "cd-weather") +- set (weatherdatadir "${pluginsdatadir}/weather") +- set (weatheruserdirname "weather") +- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/weather/data/weather.conf.in ${CMAKE_CURRENT_BINARY_DIR}/weather/data/weather.conf) +- add_subdirectory (weather) +- set (with_weather yes) +-endif() +- + ############# WEBLETS ################# + message (STATUS "> Weblets:") + set (with_weblets no)