From f3fd91216406605b1a46be4646ee9bb85843824d Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 12 Feb 2015 04:41:22 -0800 Subject: [PATCH] Use tint2 ebuild from https://github.com/tokiclover/bar-overlay/tree/master/x11-misc/tint2 --- x11-misc/tint2/Manifest | 7 +- x11-misc/tint2/files/battery_segfault.patch | 20 ------ .../tint2/files/gtk-icon-cache.sandbox.patch | 10 --- x11-misc/tint2/tint2-0.11-r1.ebuild | 58 ---------------- x11-misc/tint2/tint2-9999.ebuild | 66 ++++++++++--------- 5 files changed, 37 insertions(+), 124 deletions(-) delete mode 100644 x11-misc/tint2/files/battery_segfault.patch delete mode 100644 x11-misc/tint2/files/gtk-icon-cache.sandbox.patch delete mode 100644 x11-misc/tint2/tint2-0.11-r1.ebuild diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest index 56de595..6833fb4 100644 --- a/x11-misc/tint2/Manifest +++ b/x11-misc/tint2/Manifest @@ -1,5 +1,2 @@ -AUX battery_segfault.patch 660 SHA256 725b414ddbaa05a27a723ac899b85c9ed21ad572bda31dd18706b92b25bab844 SHA512 2d56f4eeda038618ddaba8bc9f766566f3dc911b217d89bab98d09d00dc10baaf301afac579cc309e80c3a8eafb65911560018f3ddd571679027598a930b7f30 WHIRLPOOL 09ed06c24bf904bb929efd1ee1338a4c8451316efc3f9f9f33fdbf452ee710b759e41184a5d97ac53952d2baf29bec4d87cbb72282022fd01e628d90b27e3f62 -AUX gtk-icon-cache.sandbox.patch 788 SHA256 b6b35cc88520b1263e3c66a803f7ddf6dd68fa7c957e632c6029abc671e6e869 SHA512 f7ab6c5351848f46f0da01829d7549c1baae1c1e97101b00f4c4fa38856f3182186e9522ecf78c0fca4f007e171c0a87418810ab4a6968637af73e40f9097cab WHIRLPOOL 513828c0949ffd7e20cb5010a20304d489b76e9ed0d7f08f86c82421ed3fc4ac2b70af03aeab72a273dbdfde0064a8e2d787c7540e6b0447ce4b06a2568799ca -DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d SHA512 db88c17780d24b82badbedbce4518d736dfcb2a730ff500bcb36f2b32f65271c2424f0c2a34981f9d3af033b84252db0c8217e2dd7ca57f9a0eadbc98796115c WHIRLPOOL 4c497995bc5713199a8e624ebfa463edbd610b6d948f1cbfce11ec78e4cd2cd6fad51bd58937b0fce343bb86a29a35bc40eec2bafb687c6ee89355bceb5486ec -EBUILD tint2-0.11-r1.ebuild 1295 SHA256 d23bf038e7a2cf674772c2fdd2ef16385d15454532b326ba90c95c4b3069e4b3 SHA512 c1d2f5b9764bef84c40a87fa763f17cf31db6d6200a524e5e4d07486bbd5e55f7492f6d2fdbef08df192dfda4968477fbc141545ad836cdc75c53de2deb8bb04 WHIRLPOOL 017f753e928b9be636c74d382df9814cae9722aec9feefa67756d1539e3d479817c40fe654236871eca6d5dee7877f22273c4d471c4b3edaa1338611dd745989 -EBUILD tint2-9999.ebuild 1509 SHA256 0451e75fedb4fd4540c9bccc99346d83256f1cb68d3e25328603bfdb31c02021 SHA512 a5279f3cc3ffff7d6232da744df2799db31ec4f22e6468f90fe31d4dbdb3c35889764f9759ef7dc186d99d6ea03bc65ff8f7567c92e14b93cf0d37eade6d2824 WHIRLPOOL 8981ca1cbc592ec54249b9fa37467a4d44b7f1e1020f0dc1422822d3893d792fb61d63b78898027729899c4054c93dafa380a5129538d4229feda38b29c99b00 +DIST tint2patchfiles.tar.gz 3894 SHA256 bb24d1ff1a60b9a5abe36db8a7642d03ecaa42c96a1610aedd517e9ebb02cf09 SHA512 fbfe30d298e46ce2dd7482f4471b2fdb4de85b5ff585538c674f3968db3af546e5820bf4a704b169b1aad1112e2897fe00ff9f9a8b402089d345412e9924d754 WHIRLPOOL d4c51103e41d271cab42f3c7f84690b3274943a86f3441c09ee0468bbb16e7e74d0347baef3957a13976efc7f50bbf95a2ebb5436b1ed778a4d16459b40a4c55 +EBUILD tint2-9999.ebuild 1442 SHA256 12eb97fe6009965ed28c777c7f644fd79c26248870c50da2d40edc039218f523 SHA512 5e1876e9cd86712784f1d4342675366d34f4e08ea7244e67f67f16df20fccb6b0c88b95a3f57ba1bbefe0d136c02a2ce1b9ea8e31f8bd3eb80578a380f493710 WHIRLPOOL 751e23b66a38884163d29ca16f3b7660db390536f7e12bbb57e0b886212afa15136c6a0e8ea47784174118fe0a75cab6b02ef643d31974132998f2af3c1db4a6 diff --git a/x11-misc/tint2/files/battery_segfault.patch b/x11-misc/tint2/files/battery_segfault.patch deleted file mode 100644 index 3f933e2..0000000 --- a/x11-misc/tint2/files/battery_segfault.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: battery.c -=================================================================== ---- src/battery/battery.c (revision 575) -+++ src/battery/battery.c (revision 576) -@@ -194,8 +194,14 @@ - } - g_free(path2); - } -+ -+ path_current_now = g_build_filename(battery_dir, "power_now", NULL); -+ if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) { -+ g_free(path_current_now); -+ path_current_now = g_build_filename(battery_dir, "current_now", NULL); -+ } -+ - if (path_energy_now && path_energy_full) { -- path_current_now = g_build_filename(battery_dir, "current_now", NULL); - path_status = g_build_filename(battery_dir, "status", NULL); - - // check file diff --git a/x11-misc/tint2/files/gtk-icon-cache.sandbox.patch b/x11-misc/tint2/files/gtk-icon-cache.sandbox.patch deleted file mode 100644 index 9e0d58c..0000000 --- a/x11-misc/tint2/files/gtk-icon-cache.sandbox.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -rtub tint2-svn.orig/src/tint2conf/CMakeLists.txt tint2-svn/src/tint2conf/CMakeLists.txt ---- tint2-svn.orig/src/tint2conf/CMakeLists.txt 2013-01-06 13:35:36.058104968 -0800 -+++ tint2-svn/src/tint2conf/CMakeLists.txt 2013-01-06 13:36:22.939105361 -0800 -@@ -48,4 +48,5 @@ - install( PROGRAMS tintwizard.py DESTINATION bin ) - install( FILES taskbar.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps ) - install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications ) --install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) -+# Causes sandbox violations -+# install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) diff --git a/x11-misc/tint2/tint2-0.11-r1.ebuild b/x11-misc/tint2/tint2-0.11-r1.ebuild deleted file mode 100644 index 508cbbb..0000000 --- a/x11-misc/tint2/tint2-0.11-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.11-r1.ebuild,v 1.5 2012/09/11 17:38:41 idl0r Exp $ - -EAPI="3" - -inherit cmake-utils eutils - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="A lightweight panel/taskbar" -HOMEPAGE="http://code.google.com/p/tint2/" -SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="battery examples tint2conf" - -COMMON_DEPEND="dev-libs/glib:2 - x11-libs/cairo - x11-libs/pango[X] - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libXdamage - x11-libs/libXcomposite - x11-libs/libXrender - x11-libs/libXrandr - media-libs/imlib2[X]" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - x11-proto/xineramaproto" -RDEPEND="${COMMON_DEPEND} - tint2conf? ( x11-misc/tintwizard )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/battery_segfault.patch" # bug 343963 -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_enable battery BATTERY) - $(cmake-utils_use_enable examples EXAMPLES) - $(cmake-utils_use_enable tint2conf TINT2CONF) - - # bug 296890 - "-DDOCDIR=/usr/share/doc/${PF}" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - rm -f "${D}/usr/bin/tintwizard.py" -} diff --git a/x11-misc/tint2/tint2-9999.ebuild b/x11-misc/tint2/tint2-9999.ebuild index 8cefbe3..5988e89 100644 --- a/x11-misc/tint2/tint2-9999.ebuild +++ b/x11-misc/tint2/tint2-9999.ebuild @@ -1,31 +1,22 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.11-r1.ebuild,v 1.5 2012/09/11 17:38:41 idl0r Exp $ +# $Header: x11-misc/tint2/tint2-9999.ebuild,v 1.6 2014/10/31 17:38:41 -tclover Exp $ -EAPI="3" +EAPI=5 -inherit cmake-utils eutils - -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="http://tint2.googlecode.com/svn/trunk" - SRC_URI="" - KEYWORDS="~amd64 ~x86" - inherit subversion -else - MY_P="${PN}-${PV/_/-}" - SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.bz2" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${MY_P}" -fi +inherit eutils cmake-utils subversion DESCRIPTION="A lightweight panel/taskbar" HOMEPAGE="http://code.google.com/p/tint2/" +ESVN_REPO_URI="http://tint2.googlecode.com/svn/trunk/" +SRC_URI="https://dl.dropbox.com/s/gmko5d6sy8qjpao/tint2patchfiles.tar.gz" LICENSE="GPL-2" SLOT="0" -IUSE="examples tint2conf" +KEYWORDS="amd64 x86" +IUSE="battery examples tint2conf" -COMMON_DEPEND="dev-libs/glib:2 +DEPEND="dev-libs/glib:2 x11-libs/cairo x11-libs/pango[X] x11-libs/libX11 @@ -34,35 +25,48 @@ COMMON_DEPEND="dev-libs/glib:2 x11-libs/libXcomposite x11-libs/libXrender x11-libs/libXrandr - media-libs/imlib2[X]" -DEPEND="${COMMON_DEPEND} + media-libs/imlib2[X] virtual/pkgconfig x11-proto/xineramaproto" + RDEPEND="${COMMON_DEPEND} tint2conf? ( x11-misc/tintwizard )" -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - epatch "${FILESDIR}/gtk-icon-cache.sandbox.patch" - else - epatch "${FILESDIR}/battery_segfault.patch" # bug 343963 - fi +PATCHES=( + "${WORKDIR}"/freespace.patch + "${WORKDIR}"/launcher_apps_dir-v2.patch + "${WORKDIR}"/src-task-align.patch +) + +src_unpack() +{ + subversion_src_unpack + unpack "${A}" } -src_configure() { - local mycmakeargs=( - -DBATTERY=ON +src_prepare() +{ + subversion_src_prepare + cmake-utils_src_prepare +} + +src_configure() +{ + local mycmakeargs=( + $(cmake-utils_use_enable battery BATTERY) $(cmake-utils_use_enable examples EXAMPLES) $(cmake-utils_use_enable tint2conf TINT2CONF) # bug 296890 "-DDOCDIR=/usr/share/doc/${PF}" ) - cmake-utils_src_configure } -src_install() { +src_install() +{ cmake-utils_src_install rm -f "${D}/usr/bin/tintwizard.py" + dodoc } +