summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Phillips <write2david@gmail.com>2012-05-20 15:32:31 -0500
committerDavid Phillips <write2david@gmail.com>2012-05-20 15:32:31 -0500
commit40dc13fac544041295c625ed2b8f099aef236b67 (patch)
tree7d7fd3e798ab92b54733a363cf89aa69d72f7288 /x11-plugins
parentAgain (diff)
downloadwrite2David-40dc13fac544041295c625ed2b8f099aef236b67.tar.gz
write2David-40dc13fac544041295c625ed2b8f099aef236b67.tar.bz2
write2David-40dc13fac544041295c625ed2b8f099aef236b67.zip
Back to working again
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/cairo-dock-plugins/Manifest2
-rw-r--r--x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild38
2 files changed, 23 insertions, 17 deletions
diff --git a/x11-plugins/cairo-dock-plugins/Manifest b/x11-plugins/cairo-dock-plugins/Manifest
index 52f94c3..9612631 100644
--- a/x11-plugins/cairo-dock-plugins/Manifest
+++ b/x11-plugins/cairo-dock-plugins/Manifest
@@ -1,4 +1,4 @@
-EBUILD cairo-dock-plugins-9999-r1.ebuild 3446 RMD160 1315147e046571f2bf3d493aafad6617d9541c4a SHA1 f88ca1fc8a215ee6badbbf812038cc841605ee49 SHA256 1e462f79c0443afe27e5d99b94cfb9e77ff5b66c6f04f4a392e24b174fc10560
+EBUILD cairo-dock-plugins-9999-r1.ebuild 3991 RMD160 692d367c857d1026d74398e517a6c58995afbaaf SHA1 d59bdfb343aaacb478f689a3073ebe4ed7a9f612 SHA256 664c79e9585a97806e88454d4975f9cf23ef45538c6097d5edcaa45e7ee6d9df
EBUILD cairo-dock-plugins-9999.ebuild 2916 RMD160 261557b98a558304fb6a04c62fe124b6f2c9ccca SHA1 652f06bd27049676f0b56508c2907105b13c2f3b SHA256 fa91a8cb095df1a25a4362065ad1aea0367656da1e439c1f0e45da35bdf0b3d4
MISC ChangeLog 240 RMD160 55af20059609afd5f2f7c6587a398a8771ad3b97 SHA1 954131dc27940452045dd947d865332f92420cbe SHA256 ffd103359939888e5c0463fda3245d4e54b55fdcc16782e5e83f14fbaaa31efd
MISC metadata.xml 276 RMD160 0c0c308f1457fd6b3524628543f0452d1dc39197 SHA1 e296372ecbbb13ad02430b5d323ea54c7fc5f086 SHA256 cc9796aef23ea695fd2cc82f8c763e3463f4ddcc335f716740ef0d568f4ca6e9
diff --git a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild
index e3dd30a..7abbbbb 100644
--- a/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild
+++ b/x11-plugins/cairo-dock-plugins/cairo-dock-plugins-9999-r1.ebuild
@@ -26,7 +26,7 @@ KEYWORDS=""
# https://bugs.launchpad.net/cairo-dock-plug-ins/+bug/922981/comments/8
IUSE="alsa exif gmenu terminal vala webkit xfce xgamma xklavier"
-# Dependencies are listed here:
+# Installation instructions (from BZR source) and dependencies are listed here:
# http://glx-dock.org/ww_page.php?p=From%20BZR&lang=en
RDEPEND="
@@ -49,6 +49,7 @@ DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
dev-util/pkgconfig
+ dev-libs/libdbusmenu:3[gtk]
"
pkg_setup()
@@ -80,29 +81,31 @@ src_prepare() {
src_configure() {
- # Next line added because of the same issues/solutions reported on...
- # ... # https://bugs.launchpad.net/cairo-dock-plug-ins/+bug/922981
- #
- # With a solution inspired on...
- # http://code.google.com/p/rion-overlay/source/browse/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.3.9999.ebuild?spec=svn71d4acbbb8c297b818ff886fb5dd434a6f54c377&r=71d4acbbb8c297b818ff886fb5dd434a6f54c377
-
- mycmakeargs="${mycmakeargs} -DROOT_PREFIX=${D} -DCMAKE_INSTALL_PREFIX=/usr"
- cmake-utils_src_configure
-}
-
-src_compile() {
# Next line added because of the same issues/solution as reported on...
# ... http://glx-dock.org/bg_topic.php?t=5733
# Where to put this variable declaration was inspired from...
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/cairo/cairo-0.1.18.ebuild?hideattic=0&view=markup
+ # However, adding this to "configure" not "compile" because the error show
+ # up during configure stage.
- PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig
+ # Weird, cairo-dock installs files are under /usr/usr not /usr
- # May also need this?
- #pkg-config gldi --variable=pluginsdir
+ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}/usr/usr/lib/pkgconfig"
- emake || die
+ # Check the PKG_CONFIG_PATH value to make sure we're good...
+ echo "The pkg_config variable is: ${PKG_CONFIG_PATH}"
+
+
+ # Next line added because of the same issues/solutions reported on...
+ # ... # https://bugs.launchpad.net/cairo-dock-plug-ins/+bug/922981
+ #
+ # With a solution inspired on...
+ # http://code.google.com/p/rion-overlay/source/browse/x11-misc/cairo-dock-plugins/cairo-dock-plugins-2.3.9999.ebuild?spec=svn71d4acbbb8c297b818ff886fb5dd434a6f54c377&r=71d4acbbb8c297b818ff886fb5dd434a6f54c377
+
+ # Some more info... http://www.cmake.org/Wiki/CMake_Useful_Variables
+ mycmakeargs="${mycmakeargs} -DROOT_PREFIX=${D} -DCMAKE_INSTALL_PREFIX=/usr"
+ cmake-utils_src_configure
}
pkg_postinst() {
@@ -114,4 +117,7 @@ pkg_postinst() {
ewarn " Instead, report all bugs to write2david@gmail.com"
ewarn ""
ewarn ""
+ # Dealing with the weird issue of cairo-dock installing under /usr/usr
+ # Without this next line, cairo-dock won't start
+ ln -s /usr/usr/lib/libgldi.so.3 /usr/lib/libgldi.so.3
}