diff options
author | Dustin Polke <DuPol@gmx.de> | 2012-04-28 14:03:51 +0200 |
---|---|---|
committer | Dustin Polke <DuPol@gmx.de> | 2012-04-29 22:50:09 +0200 |
commit | dc48d52a07d137a25786488f6c18e13c10fb18f8 (patch) | |
tree | 4af1c90231c1aaae849367604c63efaa88d4ee42 /x11-plugins | |
parent | [x11-misc/cairo-dock] Version bump to 3.0.0; add ~x86 wrt bug #412543c10. (diff) | |
download | DuPol-dc48d52a07d137a25786488f6c18e13c10fb18f8.tar.gz DuPol-dc48d52a07d137a25786488f6c18e13c10fb18f8.tar.bz2 DuPol-dc48d52a07d137a25786488f6c18e13c10fb18f8.zip |
[x11-plugins/cd-plugins-core] Version bump to 3.0.0; add ~x86 wrt bug #412543c10; drop unused part from 2.4.0's CMakeLists.txt.
Diffstat (limited to 'x11-plugins')
9 files changed, 585 insertions, 26 deletions
diff --git a/x11-plugins/cd-plugins-core/ChangeLog b/x11-plugins/cd-plugins-core/ChangeLog index a9dc5e4..60b36e1 100644 --- a/x11-plugins/cd-plugins-core/ChangeLog +++ b/x11-plugins/cd-plugins-core/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*cd-plugins-core-3.0.0 (28 Apr 2012) + + 28 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-core-2.4.0.2.ebuild, + files/cd-plugins-core-2.4.0-CMakeLists.txt, +cd-plugins-core-3.0.0.ebuild, + +files/cd-plugins-core-3.0.0-CMakeLists.txt, + +files/cd-plugins-core-3.0.0-python_Dbus.patch, + +files/cd-plugins-core-3.0.0-xfce-integration_CMakeLists.patch, metadata.xml: + Version bump to 3.0.0; add ~x86 wrt bug #412543c10; drop unused part from + 2.4.0's CMakeLists.txt. + 27 Apr 2012; Dustin Polke <DuPol@gmx.de> cd-plugins-core-2.4.0.2.ebuild: Restructure dependencies and loose glib dependency again. diff --git a/x11-plugins/cd-plugins-core/Manifest b/x11-plugins/cd-plugins-core/Manifest index 04a769a..ab8325a 100644 --- a/x11-plugins/cd-plugins-core/Manifest +++ b/x11-plugins/cd-plugins-core/Manifest @@ -1,7 +1,12 @@ -AUX cd-plugins-core-2.4.0-CMakeLists.txt 15020 RMD160 b2043b2424f0f9168240e17d82f5679de8218333 SHA1 f03025a04e43d0cb7ac03a73be1593f6d77a979f SHA256 101b3cd60e2d6f4f8ce457271417b53cf5cea92f5d92f052c7469dba80692be7 +AUX cd-plugins-core-2.4.0-CMakeLists.txt 14402 RMD160 3bb445f5271e04113b9a4f71baa7b930978b7b6c SHA1 a9b66a280e75105213e76db66b497a6b98b0b403 SHA256 74907629ab1b677a61541f4216c2dd0b2abde53e83aa22dc9c181645a93a93b5 AUX cd-plugins-core-2.4.0-Dbus_CMakeLists.patch 3603 RMD160 0acb39f173b1b061a082b664c57e2cedf573d9d8 SHA1 2ac61bec9d9001bb45acc3f90a45d02f8d9199e6 SHA256 f419b25bb3aeeca91e92c16a7d15eab0d85bc80f4f3646a704f563945e3b659f AUX cd-plugins-core-2.4.0-xfce-integration_CMakeLists.patch 604 RMD160 625e232433175471468e3f475434b8d5bd662f26 SHA1 8a5961746341e620f9840d316fdb813772e0e078 SHA256 09606a693469f27e3ec81080fcf6d369c36e8d47c8d4f26bf90eebc7c3a2743f +AUX cd-plugins-core-3.0.0-CMakeLists.txt 14860 RMD160 b7d14ec191d9847b7b5deeed9997ccfeabd60bc3 SHA1 758911d25dfd5f62ec476bc3b7e9ec28b14ea7a8 SHA256 69e4443a04f32ddd8def4fc09034006f42769a1406092bb376129f065b2ef68b +AUX cd-plugins-core-3.0.0-python_Dbus.patch 3019 RMD160 8bcf960ea41ccd29d3c731a0ea9d6d221d3d2916 SHA1 c4b25e6fd702e3f1da6bf0f4c341dd110a70b706 SHA256 fcfed2f5d9585029950b71c00a2bbea7f0645fca828829b1b27552688e06f457 +AUX cd-plugins-core-3.0.0-xfce-integration_CMakeLists.patch 1344 RMD160 781cc9b8ca3d5dbcd17ff1209aa57c94630da10f SHA1 d773cb679c0f7047016aee0a75e9382d9cacfb56 SHA256 97034e73c8cc149656eb8c5361a40fd6575a1016b24db3c2f15cfd8bf5d918d1 DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230 -EBUILD cd-plugins-core-2.4.0.2.ebuild 2833 RMD160 0f78174bd7b5aade77efd41ad1a44ef466b034f3 SHA1 6d73e94c9bb7ccbfa899ad4c820da176174c31db SHA256 a37c338a5a9d3d9494af2bbb90facd9a00cb0cf83925ece9f5f83fdea66690db -MISC ChangeLog 2482 RMD160 1e62f71ea351142de7e3c8a45bd543065c988432 SHA1 c9521dd0048fa4a202be9c406df7f6acb71845ba SHA256 80b938fd18c760641909456eb384c50ec39a6e8c9973d9a4dc4924924e8bcacd -MISC metadata.xml 793 RMD160 35c1977ec8f9488cac1422a8622ffa6956e89b12 SHA1 27637472eb491801968abf0df0abaef58673c63e SHA256 87a558d17b9a21b747c8cbd4833d92325b6e511555e208a9697b03063e97eb1b +DIST cairo-dock-plugins-3.0.0.tar.gz 6230574 RMD160 6c1358627768303ed386f62328ff598a77c9617f SHA1 448f4c9300f0652e16d5a41afabd8ea6e4dd9338 SHA256 8040f0a7865592436b57bc1d867f0ee001ae45350255aafe4786a80fc9a981ef +EBUILD cd-plugins-core-2.4.0.2.ebuild 2838 RMD160 9342acc3c1a6aa89b58b36e2c0ae99bfd0a25fce SHA1 6bb103d3187f6b0f66cf06bf64d5a3fa8c207183 SHA256 5a1bebf07533727179e03cd83b5cfaa282b430c05aaa582c4c6ab59709265ef5 +EBUILD cd-plugins-core-3.0.0.ebuild 3152 RMD160 8a70c2f67da5ed95df28f249ddabc26eb0b6d783 SHA1 e5c2041c38e14177f6b95c74741036829b2c41e4 SHA256 41f29daafcf078da894969400ef9ea57cf5465ba5b0b7e78a52fefed3223b717 +MISC ChangeLog 2952 RMD160 2608f413b6e7515d7213aed308c9d2351ba1492b SHA1 5c95442d9acebeec768181dae85558d823ab20e3 SHA256 82d23b75050a6c9f20f5f5c714ecacea2cd5e6ee17b3711be6fb32b4f882250f +MISC metadata.xml 856 RMD160 4b53cdf49d505b4fc66b7b639faab518704fa053 SHA1 0dea5403a26bc2387cfe6c61c491fbb1fcd632b1 SHA256 312686bfef2ef78f0443a33156f514119f89c827fa37bffa98e137f2b1c44dfd diff --git a/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild b/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild index 6494d84..b58b8f7 100644 --- a/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild +++ b/x11-plugins/cd-plugins-core/cd-plugins-core-2.4.0.2.ebuild @@ -13,7 +13,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_PLUGINS_IUSE="gnome xfce" IUSE="${CD_PLUGINS_IUSE} mono python ruby vala" diff --git a/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild b/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild new file mode 100644 index 0000000..c642904 --- /dev/null +++ b/x11-plugins/cd-plugins-core/cd-plugins-core-3.0.0.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +EAPI="3" +PYTHON_DEPEND="python? 2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit cmake-utils cairo-dock python + +DESCRIPTION="Official recommended 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_PLUGINS_IUSE="gnome xfce" +IUSE="${CD_PLUGINS_IUSE} gtk2 mono python ruby vala" + +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} + mono? ( + dev-dotnet/glib-sharp + dev-dotnet/ndesk-dbus + dev-dotnet/ndesk-dbus-glib + dev-lang/mono + ) + ruby? ( dev-lang/ruby ) + vala? ( + dev-lang/vala + >=dev-libs/glib-2.26:2 + )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + dev-util/pkgconfig" + +pkg_setup() { + CD_PLUGINS=( + "dock-rendering" + "desklet-rendering" + "dialog-rendering" + "Dbus" + "Animated-icons" + "icon-effect" + "illusion" + "drop-indicator" + ) + use gnome && CD_PLUGINS+=( "gnome-integration" ) + use xfce && CD_PLUGINS+=( "xfce-integration" ) + use gnome || use xfce && CD_PLUGINS+=( "gvfs-integration" ) +} + +src_unpack() { + cairo-dock_src_unpack +} + +src_prepare() { + cairo-dock_src_prepare + if use python; then + epatch "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN_MIC}-python_Dbus.patch + python_copy_sources Dbus/interfaces/{bash,python} + add_target_to_CMakeLists() { + cat >> Dbus/interfaces/CMakeLists.txt <<-EOF + add_subdirectory(bash-${PYTHON_ABI}) + add_subdirectory(python-${PYTHON_ABI}) + EOF + } + python_execute_function add_target_to_CMakeLists + fi + use xfce && epatch \ + "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN_MIC}-xfce-integration_CMakeLists.patch +} + +src_configure() { + mycmakeargs+=( + "$(cmake-utils_use_enable gnome GNOME-INTEGRATION)" + "$(cmake-utils_use_enable xfce XFCE-INTEGRATION)" + "$(cmake-utils_use_with mono MONO-INTERFACE)" + "$(cmake-utils_use_with python PYTHON-INTERFACE)" + "$(cmake-utils_use_with ruby RUBY-INTERFACE)" + "$(cmake-utils_use_with vala VALA-INTERFACE)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use python; then + build_bindings() { + "$(PYTHON)" setup.py -q build + } + local target sdir="../${P}_build/Dbus/interfaces/" + for target in "bash" "python"; do + python_execute_function -s --source-dir ${sdir}${target} build_bindings + done + fi +} + +src_install() { + cmake-utils_src_install + + if use python; then + install_bindings() { + insinto "$(python_get_sitedir)"/cairodock + doins build/lib/*.py + touch "${D}/$(python_get_sitedir)"/cairodock/__init__.py + } + local target sdir="../${P}_build/Dbus/interfaces/" + for target in "bash" "python"; do + python_execute_function -s --source-dir ${sdir}${target} install_bindings + done + fi +} + +pkg_postinst() { + use python && python_mod_optimize cairodock +} + +pkg_postrm() { + use python && python_mod_cleanup cairodock +} diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt index 307e3e7..dbc788f 100644 --- a/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt +++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-2.4.0-CMakeLists.txt @@ -319,24 +319,6 @@ else() set (with_xfce_integration "no") endif() -############# XGAMMA ################# -if (ENABLE_XGAMMA-PLUGIN) - message (STATUS "> XGamma:") - pkg_check_modules (XGAMMA_PACKAGE x11 xxf86vm) - if ("${XGAMMA_PACKAGE_FOUND}" STREQUAL "") - message (FATAL_ERROR "Could not find xxf86vm!") - endif() - set (GETTEXT_XGAMMA ${GETTEXT_PLUGINS}) - set (VERSION_XGAMMA "1.2.1") - set (PACKAGE_XGAMMA "cd-Xgamma") - set (with_xgamma "yes") - set (xgammadatadir "${pluginsdatadir}/Xgamma") - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Xgamma/data/Xgamma.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Xgamma/data/Xgamma.conf) - add_subdirectory ("Xgamma") -else() - set (with_xgamma "no") -endif() - ############# SHARED-IMAGES ################# set (shared_imagesdatadir "${pluginsdatadir}/shared-images") add_subdirectory (shared-images) @@ -360,5 +342,5 @@ message (STATUS " - with Python interface: ${with_python}") message (STATUS " - with Ruby interface: ${with_ruby}") message (STATUS " - with Mono interface: ${with_mono}") message (STATUS " - with Vala interface: ${with_vala}") -message (STATUS " - with Vala Translator (valac) : ${with_valac}") +message (STATUS " - with Vala Translator (valac): ${with_valac}") message ("") diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-CMakeLists.txt b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-CMakeLists.txt new file mode 100644 index 0000000..b947cef --- /dev/null +++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-CMakeLists.txt @@ -0,0 +1,347 @@ +########### 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}") + +############# ANIMATED ICONS ################# +message (STATUS "> Animated Icons:") +set (GETTEXT_ANIMATED_ICONS ${GETTEXT_PLUGINS}) +set (VERSION_ANIMATED_ICONS "1.0.10") +set (PACKAGE_ANIMATED_ICONS "cd-Animated-icons") +set (animated_iconsdatadir "${pluginsdatadir}/Animated-icons") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Animated-icons/data/Animated-icons.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Animated-icons/data/Animated-icons.conf) +add_subdirectory (Animated-icons) + +############# DBUS ################# +message (STATUS "> DBus:") +if (WITH_PYTHON-INTERFACE) + message (STATUS " * Python:") + find_program (PYTHON_EXECUTABLE python2) # if python v3 is the default python interpreter (e.g. on ArchLinux), python2 program should exist and we have to use it... + if ("${PYTHON_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${PYTHON_EXECUTABLE}) + find_program (PYTHON_EXECUTABLE python) + endif() + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version" OUTPUT_VARIABLE PYTHON_VERSION) + if ("${PYTHON_VERSION}" STREQUAL "") + message (FATAL_ERROR "Could not find Python!") + endif() + STRING (REGEX REPLACE "\n" "" PYTHON_VERSION ${PYTHON_VERSION}) + message (STATUS " Python Version: ${PYTHON_VERSION}") + message (STATUS " Python executable program: ${PYTHON_EXECUTABLE}") + GET_FILENAME_COMPONENT(DEBIAN_VERSION /etc/debian_version ABSOLUTE) + if (EXISTS ${DEBIAN_VERSION}) + message (STATUS " will use '--install-layout deb' with 'python setup.py install'") + set (DEBIAN_INSTALL_LAYOUT "--install-layout deb") + endif() + set (PYTHON_FOUND "TRUE") + set (with_python "yes") +else() + set (with_python "no") +endif() + +# find_package(Ruby) found libs of ruby-dev but we only need a directory where we can install ruby libs. +if (WITH_RUBY-INTERFACE) + message (STATUS " * Ruby:") + find_program (RUBY_EXECUTABLE ruby) + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['rubylibdir']" + OUTPUT_VARIABLE RUBY_LIB_DIR) + message (STATUS " Ruby library dir: ${RUBY_LIB_DIR}") + if ("${RUBY_LIB_DIR}" STREQUAL "" OR "${RUBY_LIB_DIR}" STREQUAL "nil") + message (FATAL_ERROR "Could not find ruby libs!") + endif() + string (REGEX REPLACE "lib/ruby/[0-9].[0-9]" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}") + string (REGEX REPLACE "${RUBY_LIB_DIR_INSTALL}" "" RUBY_LIB_DIR_INSTALL "${RUBY_LIB_DIR}") + set (RUBY_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${RUBY_LIB_DIR_INSTALL}") + message (STATUS " will be installed in: ${RUBY_LIB_DIR}") + set (RUBY_FOUND "TRUE") + set (with_ruby "yes") +else() + set (with_ruby "no") +endif() + +#find_package (Mono) +if (WITH_MONO-INTERFACE) + message (STATUS " * Mono:") + find_program (GMCS_EXECUTABLE gmcs) + if ("${GMCS_EXECUTABLE}" STREQUAL "" OR NOT EXISTS ${GMCS_EXECUTABLE}) + message (FATAL_ERROR "Could not find Mono compiler gmcs!") + endif() + pkg_check_modules ("MONO_PACKAGE" REQUIRED "glib-sharp-2.0" "ndesk-dbus-1.0" "ndesk-dbus-glib-1.0") + set (MONO_FOUND "TRUE") + set (with_mono "yes") +else() + set (with_mono "no") +endif() + +# Valac is only required to convert vala files to C files. +# So we can directly use produced files (c, h, vapi) without using valac. +if (WITH_VALA-INTERFACE) + message (STATUS " * Vala:") + set (with_vala "yes") + + find_program (VALAC_EXE valac) + message (STATUS " Path to valac: ${VALAC_EXE}") + + if ( (NOT "${VALAC_EXE}" STREQUAL "VALAC_EXE-NOTFOUND") AND (EXISTS ${VALAC_EXE}) ) # now it works with 0.10 and 0.11 (= next 0.12) # $VALAC_EXE may be the correct path, even if valac is not installed ! + execute_process(COMMAND ${VALAC_EXE} "--version" + OUTPUT_VARIABLE "VALA_VERSION") + string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION}) + string(STRIP ${VALA_VERSION} "VALA_VERSION") + message (STATUS " Vala version: ${VALA_VERSION}") + + STRING (REGEX REPLACE "\\..*" "" VALA_MAJOR "${VALA_VERSION}") + # message (STATUS "VALA_MAJOR : ${VALA_MAJOR}") + + STRING (REGEX REPLACE "[0-9]*\\.([^ ]+)" "\\1" VALA_MINOR "${VALA_VERSION}") # 0.1.7 => 1.7 + STRING (REGEX REPLACE "\\.[0-9]*" "" VALA_MINOR "${VALA_MINOR}") + # message (STATUS "VALA_MINOR : ${VALA_MINOR}") + + STRING (REGEX REPLACE ".*\\." "" VALA_NANO "${VALA_VERSION}") + STRING (REGEX REPLACE "-.*" "" VALA_NANO "${VALA_NANO}") + # message (STATUS "VALA_NANO : ${VALA_NANO}") + + if (${VALA_MAJOR} GREATER 0 OR ${VALA_MINOR} GREATER 9) # vala >= 0.10 + # AND (${VALA_MAJOR} LESS 1 AND ${VALA_MINOR} LESS 13)) # and <= 0.12 + message (STATUS " Vala compiler OK (>= 0.10).")# and <= 0.12).") + set (VALAC_FOUND "TRUE") + set (with_valac "yes") + else() + set (with_valac "no") + message (STATUS " Vala compiler is too old (0.10 required) or too new (> 0.12), won't build Vala interface.") + endif() + else() + set (with_valac "no") + endif() +else() + set (with_vala "no") + set (with_valac "no") +endif() + +set (GETTEXT_DBUS ${GETTEXT_PLUGINS}) +set (VERSION_DBUS "1.2.1") +set (PACKAGE_DBUS "cd-Dbus") +set (dbusdatadir "${pluginsdatadir}/Dbus") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Dbus/data/Dbus.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Dbus/data/Dbus.conf) +add_subdirectory (Dbus) + +############# DESKLET_RENDERING ################# +message (STATUS "> Desklet Rendering:") +set (GETTEXT_DESKLET_RENDERING ${GETTEXT_PLUGINS}) +set (VERSION_DESKLET_RENDERING "1.5.6") +set (PACKAGE_DESKLET_RENDERING "cd-desklet-rendering") +set (desklet_renderingdatadir "${pluginsdatadir}/desklet-rendering") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/desklet-rendering/data/desklet-rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/desklet-rendering/data/desklet-rendering.conf) +add_subdirectory (desklet-rendering) + +############# DIALOG_RENDERING ################# +message (STATUS "> Dialog Rendering:") +set (GETTEXT_DIALOG_RENDERING ${GETTEXT_PLUGINS}) +set (VERSION_DIALOG_RENDERING "0.5.1") +set (PACKAGE_DIALOG_RENDERING "cd-dialog-rendering") +set (dialog_renderingdatadir "${pluginsdatadir}/dialog-rendering") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dialog-rendering/data/dialog-rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dialog-rendering/data/dialog-rendering.conf) +add_subdirectory (dialog-rendering) + +############# DOCK RENDERING ################# +message (STATUS "> Dock Rendering:") +set (GETTEXT_RENDERING ${GETTEXT_PLUGINS}) +set (VERSION_RENDERING "1.5.9") +set (PACKAGE_RENDERING "cd-rendering") +set (renderingdatadir "${pluginsdatadir}/rendering") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/dock-rendering/data/rendering.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dock-rendering/data/rendering.conf) +add_subdirectory (dock-rendering) + +############# DROP INDICATOR ################# +message (STATUS "> Drop Indicator:") +set (GETTEXT_DROP_INDICATOR ${GETTEXT_PLUGINS}) +set (VERSION_DROP_INDICATOR "1.1.5") +set (PACKAGE_DROP_INDICATOR "cd-drop_indicator") +set (drop_indicatordatadir "${pluginsdatadir}/drop-indicator") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/drop-indicator/data/drop_indicator.conf.in ${CMAKE_CURRENT_BINARY_DIR}/drop-indicator/data/drop_indicator.conf) +add_subdirectory (drop-indicator) + +############# 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() + +############# GNOME-INTEGRATION ################# +if (ENABLE_GNOME-INTEGRATION) + message (STATUS "> Gnome-Integration:") + pkg_check_modules ("GNOME_INTEGRATION" REQUIRED "gio-2.0") + set (VERSION_GNOME_INTEGRATION "1.0.3") + set (PACKAGE_GNOME_INTEGRATION "cd_gnome-integration") + set (with_gnome_integration "yes") + set (gnome_integrationdatadir "${pluginsdatadir}/gnome-integration") + add_subdirectory ("gnome-integration") +else() + set (with_gnome_integration "no") +endif() + +############# ICON EFFECTS ################# +message (STATUS "> Icon Effects:") +set (GETTEXT_ICON_EFFECTS ${GETTEXT_PLUGINS}) +set (VERSION_ICON_EFFECTS "1.2.4") +set (PACKAGE_ICON_EFFECTS "cd-icon-effect") +set (icon_effectsdatadir "${pluginsdatadir}/icon-effect") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/icon-effect/data/icon-effect.conf.in ${CMAKE_CURRENT_BINARY_DIR}/icon-effect/data/icon-effect.conf) +add_subdirectory (icon-effect) + +############# ILLUSION ################# +message (STATUS "> Illusion:") +set (GETTEXT_ILLUSION ${GETTEXT_PLUGINS}) +set (VERSION_ILLUSION "1.0.7") +set (PACKAGE_ILLUSION "cd-illusion") +set (illusiondatadir "${pluginsdatadir}/illusion") +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/illusion/data/illusion.conf.in ${CMAKE_CURRENT_BINARY_DIR}/illusion/data/illusion.conf) +add_subdirectory (illusion) + +############# XFCE-INTEGRATION ################# +if (ENABLE_XFCE-INTEGRATION) + message (STATUS "> XFCE-Integration:") + pkg_check_modules ("XFCE_INTEGRATION_GVFS" REQUIRED "gio-2.0") + set (VERSION_XFCE_INTEGRATION "1.0.3") + set (PACKAGE_XFCE_INTEGRATION "cd_xfce-integration") + set (with_xfce_integration "yes") + set (xfce_integrationdatadir "${pluginsdatadir}/xfce-integration") + add_subdirectory ("xfce-integration") +else() + set (with_xfce_integration "no") +endif() + +message ("") +message (STATUS "===============") +message (STATUS "Language build:") +message (STATUS "===============") +message ("") +add_subdirectory (po) + +message ("") +message (STATUS "===============") +message (STATUS "Plug-ins build:") +message (STATUS "===============") +message ("") +message (STATUS "Stable:") +message (STATUS " Integration plug-ins:") +message (STATUS " - with Gnome support: ${with_gnome_integration}") +message (STATUS " - with XFCE support: ${with_xfce_integration}") +message (STATUS "Third Party Interfaces:") +message (STATUS " - with Python interface: ${with_python}") +message (STATUS " - with Ruby interface: ${with_ruby}") +message (STATUS " - with Mono interface: ${with_mono}") +message (STATUS " - with Vala interface: ${with_vala}") +message (STATUS " - with Vala Translator (valac): ${with_valac}") +message ("") diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-python_Dbus.patch b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-python_Dbus.patch new file mode 100644 index 0000000..c175e19 --- /dev/null +++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-python_Dbus.patch @@ -0,0 +1,58 @@ +--- a/Dbus/interfaces/python/CMakeLists.txt ++++ b/Dbus/interfaces/python/CMakeLists.txt +@@ -4,12 +4,14 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI + if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + # copy *.py to current binary dir (cleaner) + execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" ${CMAKE_CURRENT_BINARY_DIR}) +- exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") + endif() +- +-########### install files ############### +-# Run a custom script with 'make install' +-add_custom_target(python_pyc ALL) +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake) +-set_target_properties(python_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake) +-# execute_process(COMMAND python setup.py install ${DEBIAN_INSTALL_LAYOUT}) ++### handle python stuff in ebuild ++# exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") ++#endif() ++# ++############ install files ############### ++## Run a custom script with 'make install' ++#add_custom_target(python_pyc ALL) ++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PythonInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake) ++#set_target_properties(python_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/PythonInstall.cmake) ++## execute_process(COMMAND python setup.py install ${DEBIAN_INSTALL_LAYOUT}) +--- a/Dbus/interfaces/bash/CMakeLists.txt ++++ b/Dbus/interfaces/bash/CMakeLists.txt +@@ -4,12 +4,14 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI + if (NOT "${CMAKE_CURRENT_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + # copy *.py to current binary dir (cleaner) + execute_process(COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/setup.py" ${CMAKE_CURRENT_BINARY_DIR}) +- exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") + endif() +-# Run a custom script with 'make install' +-add_custom_target(bash_pyc ALL) +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake) +-set_target_properties(bash_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake) ++### handle python stuff in ebuild ++# exec_program("${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}" ARGS "setup.py" "-q" "build") ++#endif() ++## Run a custom script with 'make install' ++#add_custom_target(bash_pyc ALL) ++#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BashInstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake) ++#set_target_properties(bash_pyc PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BashInstall.cmake) + + ########### install files ############### + +--- a/Dbus/interfaces/CMakeLists.txt ++++ b/Dbus/interfaces/CMakeLists.txt +@@ -1,8 +1,3 @@ +- +-if ("${PYTHON_FOUND}" STREQUAL "TRUE") +- add_subdirectory(python) +- add_subdirectory(bash) +-endif() + if ("${RUBY_FOUND}" STREQUAL "TRUE") + add_subdirectory(ruby) + endif() diff --git a/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-xfce-integration_CMakeLists.patch b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-xfce-integration_CMakeLists.patch new file mode 100644 index 0000000..a871c73 --- /dev/null +++ b/x11-plugins/cd-plugins-core/files/cd-plugins-core-3.0.0-xfce-integration_CMakeLists.patch @@ -0,0 +1,25 @@ +--- a/xfce-integration/src/CMakeLists.txt 2012-04-22 21:22:14.000000000 +0200 ++++ b/xfce-integration/src/CMakeLists.txt 2012-04-22 21:23:59.000000000 +0200 +@@ -8,19 +8,9 @@ SET(cd_xfce-integration_LIB_SRCS + applet-utils.c + applet-utils.h + ) +-if(${XFCE_INTEGRATION_GVFS_FOUND}) +- SET (XFCE_INTEGRATION_INCLUDE_DIRS ${XFCE_INTEGRATION_GVFS_INCLUDE_DIRS}) +- SET (XFCE_INTEGRATION_LIBRARY_DIRS ${XFCE_INTEGRATION_GVFS_LIBRARY_DIRS}) +- SET (XFCE_INTEGRATION_LIBRARIES ${XFCE_INTEGRATION_GVFS_LIBRARIES}) +- MESSAGE(STATUS " GVFS found: source file applet-thunar-vfs.c NOT included for compilation.") +-else() +- LIST(APPEND cd_xfce-integration_LIB_SRCS applet-thunar-vfs.c) +- add_definitions (-DHAVE_THUNAR="1") +- SET (XFCE_INTEGRATION_INCLUDE_DIRS ${XFCE_INTEGRATION_THUNAR_INCLUDE_DIRS}) +- SET (XFCE_INTEGRATION_LIBRARY_DIRS ${XFCE_INTEGRATION_THUNAR_LIBRARY_DIRS}) +- SET (XFCE_INTEGRATION_LIBRARIES ${XFCE_INTEGRATION_THUNAR_LIBRARIES}) +- MESSAGE(STATUS " GVFS NOT found: source file applet-thunar-vfs.c included for compilation.") +-endif() ++SET (XFCE_INTEGRATION_INCLUDE_DIRS ${XFCE_INTEGRATION_GVFS_INCLUDE_DIRS}) ++SET (XFCE_INTEGRATION_LIBRARY_DIRS ${XFCE_INTEGRATION_GVFS_LIBRARY_DIRS}) ++SET (XFCE_INTEGRATION_LIBRARIES ${XFCE_INTEGRATION_GVFS_LIBRARIES}) + + add_library(${PACKAGE_XFCE_INTEGRATION} SHARED ${cd_xfce-integration_LIB_SRCS}) + diff --git a/x11-plugins/cd-plugins-core/metadata.xml b/x11-plugins/cd-plugins-core/metadata.xml index 6fe5eba..b8d4da0 100644 --- a/x11-plugins/cd-plugins-core/metadata.xml +++ b/x11-plugins/cd-plugins-core/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <use> <flag name="gnome">Enables the integration in <pkg>gnome-base/gnome</pkg> desktop.</flag> + <flag name="gtk2">Force GTK+2 instead of default GTK+3.</flag> <flag name="mono">Enables Mono interface in Cairo-Dock.</flag> <flag name="python">Enables Python interface in Cairo-Dock.</flag> <flag name="ruby">Enables Ruby interface in Cairo-Dock.</flag> @@ -15,5 +16,3 @@ <name>Dustin Polke</name> </maintainer> </pkgmetadata> - - |