Fix sandbox violation in cairo-dock-plugins
This commit is contained in:
Stefan Reimer
parent
2842ca7aeb
commit
97448b7e32
@ -1,4 +1,3 @@
|
|||||||
DIST cairo-dock-plugins-2.2.0-4.tar.gz 5533523 RMD160 33e6ad6831e66d9da5ad313210913f9d81138502 SHA1 1873ae26a1d90f8ac3cfde665536eca5dab7645f SHA256 e8905dc6f397c89b53b6e6a15489bf4d78e19427bd95e01f7c1b3df21a564ce2
|
AUX python_sandbox.patch 1618 RMD160 e4de650d2dab0383454c74223330e2e138e5ae21 SHA1 fe54f288e471ebf2607376e0bb970daf1b003569 SHA256 87183587afe0a4d38a614ddebc7359b775ab9cc7d2bbf6c52298484e80cd7f23
|
||||||
DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230
|
DIST cairo-dock-plugins-2.4.0~2.tar.gz 6039150 RMD160 9f53cd22bf341b7f1b7ee5d308150c4f1dde5100 SHA1 0989556b79e245094d40379a6ee17a4a8aa501b3 SHA256 f042fab774351087908f99e5598765b858489a0fc8481e672897887bd6d08230
|
||||||
EBUILD cairo-dock-plugins-2.2.0.4.ebuild 2440 RMD160 02c78725056ae8bb2080d4422e885df712a41e11 SHA1 62ffbf7beb76849915d915093341805e5d2227e9 SHA256 23d647594c00682c352fbcb8ebcd7a3e553218a89cdf4f1bd1c28164e8f6cad1
|
EBUILD cairo-dock-plugins-2.4.0.2.ebuild 1471 RMD160 d498968cc49394b25bb67452107f8644187c938c SHA1 90f08588e0a7a4c4f6d4cd6b21bdab8c59c733c3 SHA256 cf7d1d67dcea4c2a3ebad915291bdbba26c8a187a0a88e25c623568d73a87298
|
||||||
EBUILD cairo-dock-plugins-2.4.0.2.ebuild 1402 RMD160 1ae27050b2c2047c9dda0a2a0622dc5b5364eea5 SHA1 89e3353d64ed9ae385751a357871fca48e5c3cfa SHA256 bce816b616a5972b28375253588a7cc36a4e49eaace7e53edac7d0e67fee3f73
|
|
||||||
|
|||||||
@ -1,90 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
|
|
||||||
inherit cmake-utils eutils versionator
|
|
||||||
|
|
||||||
MY_PN="${PN/plugins/plug-ins}"
|
|
||||||
MY_PV=$(replace_version_separator 3 '-')
|
|
||||||
MM_PV=$(get_version_component_range '1-2')
|
|
||||||
MMD_PV=$(get_version_component_range '1-3')
|
|
||||||
|
|
||||||
DESCRIPTION="Official plugins for cairo-dock"
|
|
||||||
HOMEPAGE="https://launchpad.net/cairo-dock-plug-ins/"
|
|
||||||
SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-3"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="alsa compiz exif gio gmenu gnome kde mail musicplayer network-monitor powermanager terminal tomboy webkit wifi xfce xgamma xklavier"
|
|
||||||
|
|
||||||
# "dbus-glib-1"
|
|
||||||
# "gthread-2.0" - glib
|
|
||||||
# "libxml-2.0"
|
|
||||||
# "librsvg-2.0"
|
|
||||||
# "dbus-1"
|
|
||||||
# "cairo"
|
|
||||||
# "gtk+-2.0"
|
|
||||||
# "gtkglext-1.0"
|
|
||||||
# "cairo-dock"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/dbus-glib
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/libxml2
|
|
||||||
gnome-base/librsvg
|
|
||||||
sys-apps/dbus
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
x11-libs/gtkglext
|
|
||||||
~x11-misc/cairo-dock-${PV}
|
|
||||||
|
|
||||||
alsa? ( media-libs/alsa-lib )
|
|
||||||
exif? ( media-libs/libexif )
|
|
||||||
gmenu? ( gnome-base/gnome-menus )
|
|
||||||
kde? ( kde-base/kdelibs )
|
|
||||||
terminal? ( x11-libs/vte )
|
|
||||||
webkit? ( >=net-libs/webkit-gtk-1.0 )
|
|
||||||
xfce? ( xfce-base/thunar )
|
|
||||||
xgamma? ( x11-libs/libXxf86vm )
|
|
||||||
xklavier? ( x11-libs/libxklavier )
|
|
||||||
"
|
|
||||||
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-util/intltool
|
|
||||||
sys-devel/gettext
|
|
||||||
dev-util/pkgconfig
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
|
||||||
|
|
||||||
# Additional config options
|
|
||||||
#dnd2share
|
|
||||||
#rssreader
|
|
||||||
#xrandr-in-show-desktop
|
|
||||||
#scooby-do
|
|
||||||
#src_configure() {
|
|
||||||
# econf --disable-dependency-tracking \
|
|
||||||
# --disable-old-gnome-integration \
|
|
||||||
# $(use_enable alsa alsa-mixer) \
|
|
||||||
# $(use_enable compiz compiz-icon) \
|
|
||||||
# $(use_enable exif) \
|
|
||||||
# $(use_enable gio gio-in-gmenu) \
|
|
||||||
# $(use_enable gio gmenu) \
|
|
||||||
# $(use_enable gmenu) \
|
|
||||||
# $(use_enable gnome gnome-integration) \
|
|
||||||
# $(use_enable kde kde-integration) \
|
|
||||||
# $(use_enable mail) \
|
|
||||||
# $(use_enable musicplayer) \
|
|
||||||
# $(use_enable network-monitor) \
|
|
||||||
# $(use_enable powermanager) \
|
|
||||||
# $(use_enable terminal) \
|
|
||||||
# $(use_enable tomboy) \
|
|
||||||
# $(use_enable webkit weblets) \
|
|
||||||
# $(use_enable wifi) \
|
|
||||||
# $(use_enable xfce xfce-integration) \
|
|
||||||
# $(use_enable xgamma) \
|
|
||||||
# $(use_enable xklavier keyboard-indicator)
|
|
||||||
#}
|
|
||||||
@ -51,6 +51,10 @@ DEPEND="${RDEPEND}
|
|||||||
|
|
||||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
epatch "${FILESDIR}/python_sandbox.patch" || die
|
||||||
|
}
|
||||||
|
|
||||||
pkg_setup() {
|
pkg_setup() {
|
||||||
if use gio; then
|
if use gio; then
|
||||||
if ! use gmenu; then
|
if ! use gmenu; then
|
||||||
|
|||||||
24
x11-misc/cairo-dock-plugins/files/python_sandbox.patch
Normal file
24
x11-misc/cairo-dock-plugins/files/python_sandbox.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
diff -ru cairo-dock-plugins-2.4.0~2.orig//Dbus/interfaces/bash/BashInstall.cmake.in cairo-dock-plugins-2.4.0~2/Dbus/interfaces/bash/BashInstall.cmake.in
|
||||||
|
--- cairo-dock-plugins-2.4.0~2.orig//Dbus/interfaces/bash/BashInstall.cmake.in 2011-10-03 07:51:28.000000000 -0700
|
||||||
|
+++ cairo-dock-plugins-2.4.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.4.0~2.orig//Dbus/interfaces/python/PythonInstall.cmake.in cairo-dock-plugins-2.4.0~2/Dbus/interfaces/python/PythonInstall.cmake.in
|
||||||
|
--- cairo-dock-plugins-2.4.0~2.orig//Dbus/interfaces/python/PythonInstall.cmake.in 2011-10-03 07:51:28.000000000 -0700
|
||||||
|
+++ cairo-dock-plugins-2.4.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
|
||||||
@ -1,6 +1,3 @@
|
|||||||
AUX cairo-dock-2.2.0.4-rpath.patch 553 RMD160 3d22935978ea90b8629a9527cf55861e6bf1b9e7 SHA1 9682d118974e06b0f2754b797b5a84e525f257c3 SHA256 4f80c8aabd51c5ad67353676baaced276e5350cc2b97a601a22675a0b1edd467
|
|
||||||
AUX improved-cairo-dock-session.patch 5129 RMD160 33000789484425f77ade2f9016c37ac514183b67 SHA1 3cc8dbea855e11c51804183c6156b71fb2608fa1 SHA256 015147962c7e9a0a131b8ec52334d6ad51409e12f814011ce31653a7024cceb2
|
AUX improved-cairo-dock-session.patch 5129 RMD160 33000789484425f77ade2f9016c37ac514183b67 SHA1 3cc8dbea855e11c51804183c6156b71fb2608fa1 SHA256 015147962c7e9a0a131b8ec52334d6ad51409e12f814011ce31653a7024cceb2
|
||||||
DIST cairo-dock-2.2.0-4.tar.gz 2335519 RMD160 23d0917e5b0c49790b7b5f266d40b837af555bd2 SHA1 4edc1d4f71d71b5c7cf295bdcc4b40bc016bc54e SHA256 dc2de939e8fe8bb2b020d7c12c106114f321a104ea41d3538fbc1fce2fadff95
|
|
||||||
DIST cairo-dock-2.4.0~2.tar.gz 2281677 RMD160 662810cf0bf67be75cde36bb6c31c150abebc391 SHA1 140670d97985a8a623bc126fa86eed00e7b5a69e SHA256 8087e68c174d06dcd62bb9acfdd54cc534cc09ddbfffcc0f9cfac967d882123c
|
DIST cairo-dock-2.4.0~2.tar.gz 2281677 RMD160 662810cf0bf67be75cde36bb6c31c150abebc391 SHA1 140670d97985a8a623bc126fa86eed00e7b5a69e SHA256 8087e68c174d06dcd62bb9acfdd54cc534cc09ddbfffcc0f9cfac967d882123c
|
||||||
EBUILD cairo-dock-2.2.0.4.ebuild 1708 RMD160 d7c55b03ab87bb560a676f7ee09036ec47dbbbe3 SHA1 f05f441ee356d7e49351eccb8ecde0e5193731e8 SHA256 208769e6bf9d3fadf4041a20f074aca38dd608d0b5a13fdc1762b803a4c32b93
|
EBUILD cairo-dock-2.4.0.2.ebuild 2025 RMD160 437aedcf234ba74d8df8376c63ee059720b750e3 SHA1 c9ef90a1f726390cdc8f94acedaa61d4d58b529e SHA256 f0c9bc9e29505898ebe2073c408afa2e36681a38a3b25fd1a85f0f0f837c9380
|
||||||
EBUILD cairo-dock-2.4.0.2.ebuild 2028 RMD160 ea10b2721b66dfadc6723e645b8a3ea506130406 SHA1 fc6ef9b3cc2b22c5203ed3a37d03e9cbfb8eab63 SHA256 43bdb7da1442d485a9e106c69791d7fbd741cd6a160a11c2bef56b004cf2a225
|
|
||||||
|
|||||||
@ -1,75 +0,0 @@
|
|||||||
# Copyright 1999-2010 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: $
|
|
||||||
|
|
||||||
EAPI="2"
|
|
||||||
|
|
||||||
inherit cmake-utils eutils versionator
|
|
||||||
|
|
||||||
MY_PN="${PN}-core"
|
|
||||||
MY_PV=$(replace_version_separator 3 '-')
|
|
||||||
MM_PV=$(get_version_component_range '1-2')
|
|
||||||
MMD_PV=$(get_version_component_range '1-3')
|
|
||||||
|
|
||||||
DESCRIPTION="Cairo-dock is a fast, responsive, Mac OS X-like dock."
|
|
||||||
HOMEPAGE="https://launchpad.net/cairo-dock-core/"
|
|
||||||
SRC_URI="http://launchpad.net/${MY_PN}/${MM_PV}/${MMD_PV}/+download/${PN}-${MY_PV}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="xcomposite"
|
|
||||||
|
|
||||||
#"libcurl"
|
|
||||||
#"gthread-2.0"
|
|
||||||
|
|
||||||
#"dbus-glib-1"
|
|
||||||
#"libxml-2.0"
|
|
||||||
#"librsvg-2.0"
|
|
||||||
#"dbus-1"
|
|
||||||
#"cairo"
|
|
||||||
#"gtk+-2.0"
|
|
||||||
#"gtkglext-1.0"
|
|
||||||
#"xrender"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-libs/dbus-glib
|
|
||||||
dev-libs/glib:2
|
|
||||||
dev-libs/libxml2
|
|
||||||
gnome-base/librsvg
|
|
||||||
sys-apps/dbus
|
|
||||||
x11-libs/cairo
|
|
||||||
x11-libs/gtk+:2
|
|
||||||
x11-libs/gtkglext
|
|
||||||
x11-libs/libXrender
|
|
||||||
xcomposite? (
|
|
||||||
x11-libs/libXcomposite
|
|
||||||
x11-libs/libXinerama
|
|
||||||
x11-libs/libXtst
|
|
||||||
)
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
dev-util/intltool
|
|
||||||
dev-util/pkgconfig
|
|
||||||
sys-devel/gettext
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
epatch "${FILESDIR}/${P}-rpath.patch" || die
|
|
||||||
}
|
|
||||||
|
|
||||||
#src_configure() {
|
|
||||||
# econf $(use_enable xcomposite xextend)
|
|
||||||
#}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
elog "Cairo-Dock is an app that draws on a RGBA GLX visual."
|
|
||||||
elog "Some users have noticed that if the dock is launched,"
|
|
||||||
elog "severals qt4-based applications could crash, like skype or vlc."
|
|
||||||
elog "If you have this problem, add the following line into your bashrc :"
|
|
||||||
echo
|
|
||||||
elog "alias vlc='export XLIB_SKIP_ARGB_VISUALS=1; vlc; unset XLIB_SKIP_ARGB_VISUALS'"
|
|
||||||
elog "see http://www.qtforum.org/article/26669/qt4-mess-up-the-opengl-context.html for more details."
|
|
||||||
}
|
|
||||||
@ -26,7 +26,7 @@ RDEPEND="
|
|||||||
dev-libs/glib:2
|
dev-libs/glib:2
|
||||||
dev-libs/libxml2:2
|
dev-libs/libxml2:2
|
||||||
gnome-base/librsvg:2
|
gnome-base/librsvg:2
|
||||||
net-misc/curl
|
net-misc/curl
|
||||||
sys-apps/dbus
|
sys-apps/dbus
|
||||||
x11-libs/cairo
|
x11-libs/cairo
|
||||||
x11-libs/gtk+:2
|
x11-libs/gtk+:2
|
||||||
|
|||||||
@ -1,14 +0,0 @@
|
|||||||
diff -urN cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt
|
|
||||||
--- cairo-dock-2.2.0-4/src/gldit/CMakeLists.txt 2010-10-30 19:13:36.000000000 +0000
|
|
||||||
+++ cairo-dock-2.2.0-4-new//src/gldit/CMakeLists.txt 2010-10-30 19:27:45.000000000 +0000
|
|
||||||
@@ -84,9 +84,7 @@
|
|
||||||
link_directories(
|
|
||||||
${PACKAGE_LIBRARY_DIRS}
|
|
||||||
${XEXTEND_LIBRARY_DIRS}
|
|
||||||
- ${CMAKE_SOURCE_DIR}/src/gldit
|
|
||||||
- ${CMAKE_SOURCE_DIR}/src/icon-factory
|
|
||||||
- ${CMAKE_SOURCE_DIR}/src/implementations)
|
|
||||||
+ )
|
|
||||||
|
|
||||||
# Define the library
|
|
||||||
add_library ("gldi" SHARED ${core_lib_SRCS})
|
|
||||||
Loading…
Reference in New Issue
Block a user