x11-plugins/cairo-dock-plugins: update to snapshot version to prevent build failures

Disable broken weather plugin
This commit is contained in:
2022-08-29 11:51:15 +03:00
parent b85752b9fc
commit cdafe72ae1
4 changed files with 45 additions and 26 deletions

View File

@ -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

View File

@ -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)