From d2575ab0ded3fd169af5d5e27eb3bf88a1b4d8f9 Mon Sep 17 00:00:00 2001 From: Dustin Polke Date: Wed, 23 May 2012 14:54:47 +0200 Subject: [x11-plugins/cd-plugins-old] Version bump to 3.0.1. --- x11-plugins/cd-plugins-old/ChangeLog | 6 + x11-plugins/cd-plugins-old/Manifest | 5 +- .../cd-plugins-old/cd-plugins-old-3.0.1.ebuild | 55 ++++++++ .../files/cd-plugins-old-3.0.1-CMakeLists.txt | 154 +++++++++++++++++++++ 4 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 x11-plugins/cd-plugins-old/cd-plugins-old-3.0.1.ebuild create mode 100644 x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.1-CMakeLists.txt diff --git a/x11-plugins/cd-plugins-old/ChangeLog b/x11-plugins/cd-plugins-old/ChangeLog index 913e157..7b4e9fb 100644 --- a/x11-plugins/cd-plugins-old/ChangeLog +++ b/x11-plugins/cd-plugins-old/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*cd-plugins-old-3.0.1 (23 May 2012) + + 23 May 2012; Dustin Polke +cd-plugins-old-3.0.1.ebuild, + +files/cd-plugins-old-3.0.1-CMakeLists.txt: + Version bump to 3.0.1. + 23 May 2012; Dustin Polke -cd-plugins-old-2.4.0.2.ebuild, -files/cd-plugins-old-2.4.0-CMakeLists.txt: Drop old. diff --git a/x11-plugins/cd-plugins-old/Manifest b/x11-plugins/cd-plugins-old/Manifest index 5697ea9..c5a0196 100644 --- a/x11-plugins/cd-plugins-old/Manifest +++ b/x11-plugins/cd-plugins-old/Manifest @@ -1,6 +1,9 @@ AUX cd-plugins-old-3.0.0-CMakeLists.txt 6211 RMD160 b961aafc682dcd77b64d3912d6c1bbe3d06712b5 SHA1 cb8609da984cf19311b927b95c2467332a688d01 SHA256 5a7cc72b1ae9ff40ac28a14f772e086e4da3d208ef3926acdac24d537b8e7cc4 +AUX cd-plugins-old-3.0.1-CMakeLists.txt 6211 RMD160 85a1b0b27af9c8bf5b0c2c770f711f296dbc6fe6 SHA1 df6651752dc1e98e8fd34c77a33494fbd6aa33a9 SHA256 968494e939e5d583cb43225e6ef6460a19e88d4b10a024bae6d5f59ce1914742 AUX cd-plugins-old-fix-wifi-script.patch 392 RMD160 213f9b349a85e4d1fd2e0ad0e14ece9fb931242f SHA1 e31a62fd238e6c161a68e5d2e629e7220595e045 SHA256 2c15d1d91b63a01710f516990921f63cd6250d82f7e1836bb897b46d3d4d397f DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef +DIST cairo-dock-plugins-3.0.1.tar.gz 6232909 RMD160 91926b5c9578eeac9b3c81ce3d862358d810c148 SHA1 f3f828d19fa23d3ca18a8666df6c7af9ef296c8a SHA256 4b6dcf77013c96ef4d04f4d7f2c5e2daf3d7a7009edc5a2729b4ead75bb983ce EBUILD cd-plugins-old-3.0.0.ebuild 1231 RMD160 abc42d7b88f877c235def785bcc3e8da9913e1fe SHA1 354e158fb49b4df64df8290949bf978cb1e82bbc SHA256 048ff7a099c5de31b057862c79faf7b1f171f2a7e18d71839238a7dc4850509f -MISC ChangeLog 2027 RMD160 eb59014c0863afbf2bbcdb0956a2c4a4ea7154e1 SHA1 b3b8d8e38a01b1ef3b0b0ccdd70df896a3a4e713 SHA256 0d1d0775dbc4f59646425865f2e35461ba170d939b367dabd2bdb5d64f59691a +EBUILD cd-plugins-old-3.0.1.ebuild 1231 RMD160 abc42d7b88f877c235def785bcc3e8da9913e1fe SHA1 354e158fb49b4df64df8290949bf978cb1e82bbc SHA256 048ff7a099c5de31b057862c79faf7b1f171f2a7e18d71839238a7dc4850509f +MISC ChangeLog 2209 RMD160 34a6a5be146700e26c8acb654ed201b7153ea240 SHA1 a27aa5babc34767893f84dfe39060b85ed65ec51 SHA256 893f64e31f8e2b6d3629ea96df04d66e0a358a30af4f32504509c0c855d96e19 MISC metadata.xml 551 RMD160 50e9d1a3f54de739b4e542b8ee7d84d2dd2919af SHA1 2ecf4ba95a5c84051ee07d5734baa6932e110ae3 SHA256 8b471de58b155d370e2a0741a6ccf617f60b6a00218e30b3e9888a76f8842916 diff --git a/x11-plugins/cd-plugins-old/cd-plugins-old-3.0.1.ebuild b/x11-plugins/cd-plugins-old/cd-plugins-old-3.0.1.ebuild new file mode 100644 index 0000000..2613f98 --- /dev/null +++ b/x11-plugins/cd-plugins-old/cd-plugins-old-3.0.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +EAPI="4" + +inherit cmake-utils cairo-dock + +DESCRIPTION="Official plugins for cairo-dock subject to removal" +HOMEPAGE="http://www.glx-dock.org" + +LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +CD_PLUGIN_IUSE="netspeed wifi" +IUSE="${CD_PLUGIN_IUSE} gtk2" +REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )" + +CDP_DEPEND="dev-libs/dbus-glib + >=dev-libs/glib-2.22:2 + dev-libs/libxml2:2 + gnome-base/librsvg:2 + sys-apps/dbus + x11-libs/cairo + ~x11-misc/cairo-dock-${PV}[gtk2=] + !x11-misc/cairo-dock-plugins + !x11-plugins/cairo-dock-plugins + !gtk2? ( x11-libs/gtk+:3 ) + gtk2? ( x11-libs/gtk+:2 )" +RDEPEND="${CDP_DEPEND}" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig" + +pkg_setup() { + use netspeed && CD_PLUGINS+=( "netspeed" ) + use wifi && CD_PLUGINS+=( "wifi" ) +} + +src_unpack() { + cairo-dock_src_unpack +} + +src_prepare() { + cairo-dock_src_prepare + use wifi && epatch "${FILESDIR}"/${PN}-fix-wifi-script.patch +} + +src_configure() { + mycmakeargs+=( + "$(cmake-utils_use_enable netspeed NETSPEED)" + "$(cmake-utils_use_enable wifi WIFI)" + ) + cmake-utils_src_configure +} diff --git a/x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.1-CMakeLists.txt b/x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.1-CMakeLists.txt new file mode 100644 index 0000000..721c44d --- /dev/null +++ b/x11-plugins/cd-plugins-old/files/cd-plugins-old-3.0.1-CMakeLists.txt @@ -0,0 +1,154 @@ +########### requirements ############### + +cmake_minimum_required (VERSION 2.6) +find_package (PkgConfig) +include (CheckLibraryExists) +include (CheckIncludeFiles) +include (CheckFunctionExists) +include (CheckSymbolExists) +include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake") + +########### project ############### + +project ("cairo-dock-plugins") +set (VERSION "3.0.1") + +add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall +add_definitions (-DGL_GLEXT_PROTOTYPES="1") + +############ sources tarball ############# + +set (CPACK_SOURCE_GENERATOR "TGZ") +set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}") +set (CPACK_SOURCE_IGNORE_FILES + "/build/;/.bzr/;bzrignore$;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}") +include (CPack) + +add_custom_target(dist + COMMAND ${CMAKE_MAKE_PROGRAM} package_source) +add_custom_target(dist-bzr + COMMAND bzr export ${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + +########### global variables ############### + +if( WIN32 ) + message(FATAL_ERROR "Cairo-Dock requires an air-conditioned room. Please close Windows!") +endif( WIN32 ) + +set (PACKAGE ${CMAKE_PROJECT_NAME}) +set (GETTEXT_PACKAGE ${PACKAGE}) + +# get plug-ins install dir +execute_process( + COMMAND pkg-config gldi --variable=pluginsdir # /usr/lib/cairo-dock # or /usr/lib/x86_64-linux-gnu/cairo-dock + OUTPUT_VARIABLE pluginsdir) +STRING (REGEX REPLACE "\n" "" pluginsdir ${pluginsdir}) # remove the \n +# get plug-ins data dir +execute_process( + COMMAND pkg-config gldi --variable=pluginsdatadir # /usr/share/cairo-dock/plug-ins + OUTPUT_VARIABLE pluginsdatadir) +STRING (REGEX REPLACE "\n" "" pluginsdatadir ${pluginsdatadir}) +# get prefix dir +execute_process( + COMMAND pkg-config gldi --variable=prefix # /usr/share/cairo-dock/plug-ins + OUTPUT_VARIABLE prefix) +STRING (REGEX REPLACE "\n" "" prefix ${prefix}) +# get GTK version (must be the same as the core, as GTK2 and GTK3 can't coexist at runtime) +execute_process( + COMMAND pkg-config gldi --variable=gtkversion # 2 or 3 + OUTPUT_VARIABLE gtkversion) +STRING (REGEX REPLACE "\n" "" gtkversion ${gtkversion}) +# check that version matches with the core +execute_process( + COMMAND pkg-config --modversion gldi # 2.2.0-3 + OUTPUT_VARIABLE dock_version) +STRING (REGEX REPLACE "\n" "" dock_version ${dock_version}) +if (NOT "${dock_version}" STREQUAL "${VERSION}") # Version + if ("${PACKAGEMENT}" STREQUAL "") + MESSAGE (FATAL_ERROR "Error : version mismatch with the core : " ${VERSION} <> ${dock_version}) + else () + MESSAGE (WARNING "Warning : version mismatch with the core : " ${VERSION} <> ${dock_version}) + endif () +endif() + +# check that installation dir matches with the core +GET_FILENAME_COMPONENT(libdir "${pluginsdir}/.." ABSOLUTE) # /usr/lib # or /usr/lib/x86_64-linux-gnu +GET_FILENAME_COMPONENT(datadir "${pluginsdatadir}/../.." ABSOLUTE) # /usr/share +if (NOT "${CMAKE_INSTALL_PREFIX}" STREQUAL "${prefix}" + OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" STREQUAL "${libdir}" + OR NOT "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}" STREQUAL "${datadir}") + message (STATUS "It seems that the current CMAKE_INSTALL_{PREFIX,LIBDIR,DATAROOTDIR} flags are not the same that you have used with the core.") + message (STATUS " It will be replaced by this value: ${prefix}") + message (WARNING "Plug-ins should be installed in the same directory as the core, that is to say in ${pluginsdir}") + set (CMAKE_INSTALL_PREFIX "${prefix}") + #set (libdir "${CMAKE_INSTALL_PREFIX}/${libname}/cairo-dock") +endif() + +# set internationalisation +set (GETTEXT_PLUGINS "cairo-dock-plugins") +set (localedir "${prefix}/${CMAKE_INSTALL_LOCALEDIR}") +set (gaugesdir "${datadir}/cairo-dock/gauges") + +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/") # additionnal FindPackage files + +########### dependencies ############### + +message ("") +message (STATUS "=====================") +message (STATUS "Check dependencies...") +message (STATUS "=====================") +message ("") + +pkg_check_modules ("PACKAGE" REQUIRED "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0") +#pkg_check_modules ("PACKAGE" REQUIRED "ig") +pkg_check_modules ("GLDI" REQUIRED "gldi") # we don't want to link with gldi, so we check it separately. +set (PACKAGE_INCLUDE_DIRS "${GLDI_INCLUDE_DIRS}") + +add_definitions (-DGTK_DISABLE_DEPRECATED="1") + +############# GLIB ################# +pkg_check_modules (GLIB glib-2.0) + STRING (REGEX REPLACE "\\..*" "" GLIB_MAJOR "${GLIB_VERSION}") # 2.28.3 => 2 + STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" GLIB_MINOR "${GLIB_VERSION}") # 2.28.3 => 2.28 + STRING (REGEX REPLACE "\\.[0-9]*" "" GLIB_MINOR "${GLIB_MINOR}") # 2.28 => 28 + STRING (REGEX REPLACE ".*\\." "" GLIB_NANO "${GLIB_VERSION}") # 2.28.3 => 3 + STRING (REGEX REPLACE "-.*" "" GLIB_NANO "${GLIB_NANO}") + +############# NETSPEED ################# +if (ENABLE_NETSPEED) + message (STATUS "> NetSpeed:") + set (GETTEXT_NETSPEED ${GETTEXT_PLUGINS}) + set (VERSION_NETSPEED "1.2.9") + set (PACKAGE_NETSPEED "cd-netspeed") + set (netspeeddatadir "${pluginsdatadir}/netspeed") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/netspeed/data/netspeed.conf.in ${CMAKE_CURRENT_BINARY_DIR}/netspeed/data/netspeed.conf) + add_subdirectory (netspeed) + set (with_netspeed "yes") +else() + set (with_netspeed "no") +endif() + +############# WIFI ################# +if (ENABLE_WIFI) + message (STATUS "> WiFi:") + set (GETTEXT_WIFI ${GETTEXT_PLUGINS}) + set (VERSION_WIFI "1.2.11") + set (PACKAGE_WIFI "cd-wifi") + set (wifidatadir "${pluginsdatadir}/wifi") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/wifi/data/wifi.conf.in ${CMAKE_CURRENT_BINARY_DIR}/wifi/data/wifi.conf) + add_subdirectory (wifi) + set (with_wifi "yes") +else() + set (with_wifi "no") +endif() + +message ("") +message (STATUS "===============") +message (STATUS "Plug-ins build:") +message (STATUS "===============") +message ("") +message (STATUS "Old:") +message (STATUS " - with Netspeed applet: ${with_netspeed}") +message (STATUS " - with Wifi applet: ${with_wifi}") +message ("") -- cgit v1.2.3-65-gdbad