From 13efdd36c00198ed4f9ab3ae508b7bc91d39b35a Mon Sep 17 00:00:00 2001 From: Dustin Polke Date: Sun, 29 Apr 2012 22:27:53 +0200 Subject: [x11-plugins/cd-plugins-experimental] Version bump to 3.0.0; add ~x86 wrt bug #412543c10. --- x11-plugins/cd-plugins-experimental/ChangeLog | 8 + x11-plugins/cd-plugins-experimental/Manifest | 9 +- .../cd-plugins-experimental-2.4.0.2.ebuild | 2 +- .../cd-plugins-experimental-3.0.0.ebuild | 72 ++++++ .../cd-plugins-experimental-3.0.0-CMakeLists.txt | 256 +++++++++++++++++++++ x11-plugins/cd-plugins-experimental/metadata.xml | 1 + 6 files changed, 344 insertions(+), 4 deletions(-) create mode 100644 x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.0.ebuild create mode 100644 x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.0-CMakeLists.txt diff --git a/x11-plugins/cd-plugins-experimental/ChangeLog b/x11-plugins/cd-plugins-experimental/ChangeLog index b5e0583..552fbed 100644 --- a/x11-plugins/cd-plugins-experimental/ChangeLog +++ b/x11-plugins/cd-plugins-experimental/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*cd-plugins-experimental-3.0.0 (29 Apr 2012) + + 29 Apr 2012; Dustin Polke + cd-plugins-experimental-2.4.0.2.ebuild, + +cd-plugins-experimental-3.0.0.ebuild, + +files/cd-plugins-experimental-3.0.0-CMakeLists.txt, metadata.xml: + Version bump to 3.0.0; add ~x86 wrt bug #412543c10. + 27 Apr 2012; Dustin Polke cd-plugins-experimental-2.4.0.2.ebuild, metadata.xml: Restructure dependencies, loose glib dependency again and comment out unused diff --git a/x11-plugins/cd-plugins-experimental/Manifest b/x11-plugins/cd-plugins-experimental/Manifest index 532b556..445f131 100644 --- a/x11-plugins/cd-plugins-experimental/Manifest +++ b/x11-plugins/cd-plugins-experimental/Manifest @@ -1,5 +1,8 @@ AUX cd-plugins-experimental-2.4.0-CMakeLists.txt 9286 RMD160 0a92f01f229e6db4d885c81890bf9e025a8f87d0 SHA1 d35f6789624b06b26fe54237c1b26ca6a43d64d0 SHA256 f7927224f3f277bacbdc0ac1c221e1d285e0fba4354d5745a635cceb9a937395 +AUX cd-plugins-experimental-3.0.0-CMakeLists.txt 10040 RMD160 20102cf2183d1e4e8c219cf87521905433508eb0 SHA1 cc73ffb65104a534aa9f8e02da72d4aa8234a8af SHA256 f6c1d8f56d6e3a27f62868b89d1b2943b8c8b7e91eca7129f676033787030acc DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230 -EBUILD cd-plugins-experimental-2.4.0.2.ebuild 1566 RMD160 0aae2479bad14d7b719cfb2c470267580b68097c SHA1 9b363e800e5a4768bb7a6ddbed8dbf0a8f771b58 SHA256 1482177a85312a6adee6d1433529d4b0616f584a447ff0f01de61b6c893f6955 -MISC ChangeLog 1764 RMD160 b32fc7995a5d948123a6e57fc91a5ad39712d4c5 SHA1 0c62157949a5e6f6272f382343db485e82efd000 SHA256 2366e045389405389788731ee96215fa9ca9b40541f985529d0808037c2da5ff -MISC metadata.xml 697 RMD160 b8eb7414a381edcffb3de726e52c27c82391aa45 SHA1 e70a5d9dbe2d54833a6032292757fbea90e61a02 SHA256 86f7b6f74bb7a1da90fff002d210594185c09d6a585adee79fd71dee644d487c +DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef +EBUILD cd-plugins-experimental-2.4.0.2.ebuild 1571 RMD160 858c830b1855ae8fa1adfccb2707101507048d5f SHA1 ea82793444d6a361ae1fd136ff53c26c305fa7ea SHA256 9f108a93c334a9244342566295212fe534530a1dc41b5cfa1edc8742570639f8 +EBUILD cd-plugins-experimental-3.0.0.ebuild 1691 RMD160 d2f3c6d439b63f95bb2098aa563a365e66f852a6 SHA1 0cd24373e8a31a4f0fdbb0bfe4f8bc21d721c104 SHA256 a01e2ba1deab005dd09a78081f43d459b807bd391f39fa1ef819295489c7f4ab +MISC ChangeLog 2060 RMD160 8149e04681135df3e61c9fd983a850d18168a965 SHA1 f5baa27c74413d4d6914cf4d52ad0fe596f8ab48 SHA256 d9ec8f69468c80bff542f1083d55615c89a70cac10d3523e172753df5e8675b7 +MISC metadata.xml 762 RMD160 2e5e0d96c00a0dc5bac6f9903b086c819e536c67 SHA1 31ae254f4ce6a16c88d57643da407b43553ccfa4 SHA256 8cd84113b57b42e0a381ae726c4972a390e4de65670aa077809a6ae85097fd39 diff --git a/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-2.4.0.2.ebuild b/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-2.4.0.2.ebuild index b0e3b96..672da8c 100644 --- a/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-2.4.0.2.ebuild +++ b/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-2.4.0.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://www.glx-dock.org" LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 ) GPL-2 GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" CD_PLUGIN_IUSE="disks doncky network-monitor scoobydo" #kde" IUSE="${CD_PLUGIN_IUSE}" REQUIRED_USE="|| ( ${CD_PLUGIN_IUSE} )" diff --git a/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.0.ebuild b/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.0.ebuild new file mode 100644 index 0000000..f05db4a --- /dev/null +++ b/x11-plugins/cd-plugins-experimental/cd-plugins-experimental-3.0.0.ebuild @@ -0,0 +1,72 @@ +# 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 unstable plugins for cairo-dock" +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="disks doncky network-monitor scoobydo" #kde +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}" +# kde? ( +# kde-base/kdelibs +# x11-libs/qt-core +# ) +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig" + +pkg_setup() { + use disks && CD_PLUGINS+=( "Disks" ) + use doncky && CD_PLUGINS+=( "Doncky" ) +# use kde && CD_PLUGINS+=( "kde-integration" ) #"gvfs-integration" ) + use network-monitor && CD_PLUGINS+=( "Network-Monitor" ) + use scoobydo && CD_PLUGINS+=( "Scooby-Do" ) +} + +src_unpack() { + cairo-dock_src_unpack +} + +src_prepare() { + cairo-dock_src_prepare +} + +src_configure() { +# "$(cmake-utils_use_enable kde NEWKDE-INTEGRATION)" + mycmakeargs+=( + "$(cmake-utils_use_enable disks DISKS-PLUGIN)" + "$(cmake-utils_use_enable doncky DONCKY-PLUGIN)" + "$(cmake-utils_use_enable network-monitor NETWORK-MONITOR-PLUGIN)" + "$(cmake-utils_use_enable scoobydo SCOOBY-DO-PLUGIN)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install +} diff --git a/x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.0-CMakeLists.txt b/x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.0-CMakeLists.txt new file mode 100644 index 0000000..cd345a1 --- /dev/null +++ b/x11-plugins/cd-plugins-experimental/files/cd-plugins-experimental-3.0.0-CMakeLists.txt @@ -0,0 +1,256 @@ +########### 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.0") + +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}") + +############# DISKS ################# +if (ENABLE_DISKS-PLUGIN) + message (STATUS "> Disks:") + set (GETTEXT_DISKS ${GETTEXT_PLUGINS}) + set (VERSION_DISKS "0.0.4") + set (PACKAGE_DISKS "cd-disks") + set (with_disks "yes") + set (disksdatadir "${pluginsdatadir}/Disks") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Disks/data/Disks.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Disks/data/Disks.conf) + add_subdirectory ("Disks") +else() + set (with_disks "no") +endif() + +############# DONCKY ################# +if (ENABLE_DONCKY-PLUGIN) + message (STATUS "> Doncky:") + set (GETTEXT_DONCKY ${GETTEXT_PLUGINS}) + set (VERSION_DONCKY "0.0.6") + set (PACKAGE_DONCKY "cd-doncky") + set (with_doncky "yes") + set (donckydatadir "${pluginsdatadir}/Doncky") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Doncky/data/Doncky.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Doncky/data/Doncky.conf) + add_subdirectory (Doncky) +else() + set (with_doncky "no") +endif() + +############## GVFS-INTEGRATION ################# +#if (ENABLE_GNOME-INTEGRATION OR ENABLE_XFCE-INTEGRATION) +# message (STATUS "> GVFS-Integration:") +# pkg_check_modules ("LIBGIO" "gio-2.0") +# add_subdirectory (gvfs-integration) +#endif() + +############# KDE-INTEGRATION ################# +if (ENABLE_NEWKDE-INTEGRATION) + message (STATUS "> KDE-Integration:") + set (with_kde_integration "no") + #find_package(KDE4) + find_package(Qt4) + if (QT4_FOUND) + message (STATUS " * Qt Includes: ${QT_INCLUDES}") + message (STATUS " * Qt Definitions: ${QT_DEFINITIONS}") + message (STATUS " * QtCore Library: ${QT_QTCORE_LIBRARY} / ${PACKAGE_LIBRARIES}") + else() + message (STATUS " * Qt unavailable") + endif() + + find_path(KDECORE_INCLUDE_DIR "kdecore_export.h") + find_library(KDECORE_LIBRARY NAMES "kdecore") + GET_FILENAME_COMPONENT(KDECORE_LIBRARY ${KDECORE_LIBRARY} PATH) + + find_path(KIO_INCLUDE_DIR "kio_export.h" PATH_SUFFIXES "kio") + find_library(KIO_LIBRARY NAMES "kio") + GET_FILENAME_COMPONENT(KIO_LIBRARY ${KIO_LIBRARY} PATH) + + find_path(KDE_INCLUDE_DIR "KDirWatch" PATH_SUFFIXES "KDE") + + if (NOT "${KDECORE_LIBRARY}" STREQUAL "") + message (STATUS " * KDECORE Dir: ${KDECORE_INCLUDE_DIR}") + message (STATUS " * KDECORE Library: ${KDECORE_LIBRARY}") + else() + message (STATUS " * KDECORE unavailable") + endif() + if (NOT "${KIO_LIBRARY}" STREQUAL "") + message (STATUS " * KIO Dir: ${KIO_INCLUDE_DIR}") + message (STATUS " * KIO Library: ${KIO_LIBRARY}") + else() + message (STATUS " * KIO unavailable") + endif() + if (NOT "${KDE_LIBRARY}" STREQUAL "") ## always empty? + message (STATUS " * KDE4 Dir: ${KDE_INCLUDE_DIR}") + message (STATUS " * KDE4 Library: ${KDE_LIBRARY}") + else() + message (STATUS " * KDE4 unavailable") + endif() + + if (QT4_FOUND + AND KDECORE_INCLUDE_DIR + AND KDECORE_LIBRARY + AND KIO_INCLUDE_DIR + AND KIO_LIBRARY + AND KDE_INCLUDE_DIR) + message (STATUS " KDE: OK") + set (VERSION_KDE_INTEGRATION "0.0.3") + set (PACKAGE_KDE_INTEGRATION "cd_kde-integration") + set (with_kde_integration2 "yes") + set (kde_integrationdatadir "${pluginsdatadir}/kde-integration2") + add_subdirectory ("kde-integration2") + else() + message (STATUS "Could not find kde libs; Cairo-Dock won't be built with KDE support.") + message (STATUS "These libraries are required to compile KDE experimental applet: kdecore, kio, kde4") + set (MODULES_INTEGRATION_MISSING "${MODULES_INTEGRATION_MISSING} kdecore, kio, kde4") + endif() +else() + set (with_kde_integration2 "no") +endif() + +############# NETWORK_MONITOR ################# +if (ENABLE_NETWORK-MONITOR-PLUGIN) + message (STATUS "> Network Monitor:") + set (GETTEXT_NETWORK_MONITOR ${GETTEXT_PLUGINS}) + set (VERSION_NETWORK_MONITOR "0.2.6") + set (PACKAGE_NETWORK_MONITOR "cd-network-monitor") + set (with_network_monitor "yes") + set (network_monitordatadir "${pluginsdatadir}/Network-Monitor") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Network-Monitor/data/Network-Monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Network-Monitor/data/Network-Monitor.conf) + add_subdirectory (Network-Monitor) +else() + set (with_network_monitor "no") +endif() + +############# SCOOBY_DO ################# +if (ENABLE_SCOOBY-DO-PLUGIN) + message (STATUS "> Scooby-Do:") + set (GETTEXT_SCOOBY_DO ${GETTEXT_PLUGINS}) + set (VERSION_SCOOBY_DO "0.1.1") + set (PACKAGE_SCOOBY_DO "cd-scooby-do") + set (with_scooby_do "yes") + set (scooby_dodatadir "${pluginsdatadir}/Scooby-Do") + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Scooby-Do/data/Scooby-Do.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Scooby-Do/data/Scooby-Do.conf) + add_subdirectory (Scooby-Do) +else() + set (with_scooby_do "no") +endif() + +message ("") +message (STATUS "===============") +message (STATUS "Plug-ins build:") +message (STATUS "===============") +message ("") +message (STATUS "Unstable:") +message (STATUS " - with Disks applet: ${with_disks}") +message (STATUS " - with Doncky applet: ${with_doncky}") +message (STATUS " - with KDE experimental support: ${with_kde_integration2}") +message (STATUS " - with Network-Monitor applet: ${with_network_monitor}") +message (STATUS " - with Scooby-Do applet: ${with_scooby_do}") +message ("") diff --git a/x11-plugins/cd-plugins-experimental/metadata.xml b/x11-plugins/cd-plugins-experimental/metadata.xml index a1b1545..93717a8 100644 --- a/x11-plugins/cd-plugins-experimental/metadata.xml +++ b/x11-plugins/cd-plugins-experimental/metadata.xml @@ -4,6 +4,7 @@ Enables the Disks applet. Enables the Doncky applet. + Force GTK+2 instead of default GTK+3. Enables the Network-Monitor applet. Enables the Scooby-Do applet. -- cgit v1.2.3-65-gdbad