From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- x11-misc/fbpanel/Manifest | 9 ++ x11-misc/fbpanel/fbpanel-7.0.ebuild | 57 ++++++++++ .../fbpanel/files/fbpanel-6.1-underlinking.patch | 15 +++ x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch | 13 +++ x11-misc/fbpanel/files/fbpanel-7.0-clang.patch | 57 ++++++++++ x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch | 120 +++++++++++++++++++++ x11-misc/fbpanel/metadata.xml | 12 +++ 7 files changed, 283 insertions(+) create mode 100644 x11-misc/fbpanel/Manifest create mode 100644 x11-misc/fbpanel/fbpanel-7.0.ebuild create mode 100644 x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch create mode 100644 x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch create mode 100644 x11-misc/fbpanel/files/fbpanel-7.0-clang.patch create mode 100644 x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch create mode 100644 x11-misc/fbpanel/metadata.xml (limited to 'x11-misc/fbpanel') diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest new file mode 100644 index 000000000000..58130197a43d --- /dev/null +++ b/x11-misc/fbpanel/Manifest @@ -0,0 +1,9 @@ +AUX fbpanel-6.1-underlinking.patch 789 SHA256 9f2681ef55a323313ed3a96083429762255ef88c23c00c339f8942c6ede4c5b5 SHA512 9c19199bc4f24ffe967b14dbee5165f78dccd120bc73f22e4846f083b4be3b92b60855f5ad08bdcb6d3b55b33a070a54e904cfdcc36786211d7d252dc7faac04 WHIRLPOOL f190ddb3e4efa7cac4732ea24dbca24d8877c49b146d9190926231a2ae5344937b4b107496a4f9aeb1c81f8faebd8045cf4aee351c75ac096f0b7795de9d652e +AUX fbpanel-6.1-xlogout.patch 369 SHA256 c1d1be75d6173e3fa684098eb39e17b0335392fdb138f6ce912b8d29d75af952 SHA512 cfd6b0b05f2c1e243888e7619a4a3f7f2e80f4cc48f13418854f23b0fd0f8a152d9757f6babd4fa873c0bdd297beaab246de55a1c08fae105d9906464048d702 WHIRLPOOL b1df6fe4e971a09689d086b0c95fd94e08c0f41d15b4f8440cafca9f48f175970ad7d391dd632d3ff48437f98d29897823ebe535171d9845500b5498b3acf0f4 +AUX fbpanel-7.0-clang.patch 2596 SHA256 9da628126ef805b5d1009acf1abe01311ceef84e1e55c8d2708769405262be41 SHA512 78dfea33f3a29b857768b64bc6ea61404dee3cb75587500e98e17aeecf92a310abf1796577d433e13aab4a5524ce2400906d0e6ce2ab468a488dbae03857902f WHIRLPOOL 5b77e3e5a9daf8389b6820bd6ded9be970a8363ef225e2146f7bf2df3a5fb707784303a4354ff6ec6289688ca5b2660d4c9631ed512e4bf4e9404cb505ebd8b5 +AUX fbpanel-7.0-shebangs.patch 2348 SHA256 fd26d8ccef2c9123fd22a9fdddac0d9fa3097ecdce5907d142519abf005ac9da SHA512 547367bc298548b0936e4b83e8ddccc9c9e689f5aac8a7aac1ef5e09050ce33936dba4c39d971c4f3ff5065daa55bc28989588cb08e8277ca9e201ca6994eec7 WHIRLPOOL d0dff44d397404b3069196b9d20caa8b963efd68e42ae50fb58928802e0b98e42902d0988df511dc7a93c54cf6d6310146bf3f70e7c1ed4a06222223ac4d42ff +DIST fbpanel-7.0.tar.gz 3746477 SHA256 711570954f8f99235d6afb7ec3226dede20b832eb712a5bd00e4f793b75ac5bb SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874 WHIRLPOOL 37fc5f86b80474026b660491b83ee26c4e9e260cadafff9673d161feb79efe2b2d6c89f1c83c76ebfe41eeee61e83cf3dc271667d4a2aeefe37c5e93c30f8e31 +EBUILD fbpanel-7.0.ebuild 1335 SHA256 4ff8f5b6821b245eb631de193b8d32f7af34c9aed2d91c869f4a75e1dce97f94 SHA512 32bcca23691bc8478b35c4bf93e05980fe64c2551decec1cb9cf4f08dd80d5eaceadacd403fe1a8db006dc0c7d27bf9ae72d8a4ebcdbe343f059825e44fb679e WHIRLPOOL 980cab21c8af2cbccabe48d64c9abbc965e707d3832ce44df19db6582ff0cb631f42b5d21c4e74d7f5f0245395d673cb71e584c4487c8465efbfc6657dc9d2e6 +MISC ChangeLog 2629 SHA256 2f48537bae7796d3c66f5eb41681dc392f9d95eb6f987dbd7581314b9961037d SHA512 97448b0876648d00d0d2324287a732e9482f22a27776b0521b37bf5e1943dbb2a4175d6e6d8f73a27183146d7a0c8dac587960acaae0ce710d651ec89e7faff5 WHIRLPOOL e0136f00a87b9d3e84b13425f728136021d8bce47e81260989dd03058d2eb95b97a30a55f41588d2511784affdf0dbf66c933c6d4a3dd695a26618b2574af37a +MISC ChangeLog-2015 8343 SHA256 3bec43d5dc89c2a860faf49df3a510b423855460a23d11e4dd83918eaaa68ed0 SHA512 1ae8f1de9c2b5414093cf5e65074c62e80df399ae8eb9e54b1479bd18a407a7a61e626a9393dbe32d5ffc6bb9d076027082f56890a57a174b3d167e80ecf09c1 WHIRLPOOL 243d284c9c9579f959d683aa4c0a5a6cd5c973abb5e407ac39606efd0e9aa9749f68c0bb85f277971d37feb529e4a857e3d3dc1d1c54935788161001f28083e2 +MISC metadata.xml 421 SHA256 52bd187e55f19daae6913d787633929a5945d75fe58ce41c7b09f24c5c151637 SHA512 6e50dcf1443603726214701d8187864db64227db01b5c19f630d703864faec0d4692a5967a6286bd5fcd0b4762997a2bcb8ad6d4742ae5b2dc33bfe38d808fbe WHIRLPOOL 172b526e7efa72a44c96178bea9d2f69a24c15b5e382f9e854305bd580560bf395b25db07321ff6d271af0fbdb17c66d4c95f1aba26d5ac6a63949cf07d4947c diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild new file mode 100644 index 000000000000..8a3a05f7abd3 --- /dev/null +++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) + +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="light-weight X11 desktop panel" +HOMEPAGE="https://aanatoly.github.io/fbpanel/" +SRC_URI="https://github.com/aanatoly/fbpanel/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 x86" +IUSE="alsa" + +RDEPEND=" + dev-libs/glib:2 + alsa? ( media-libs/alsa-lib ) + x11-libs/gdk-pixbuf:2[X] + x11-libs/gtk+:2 + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} + virtual/pkgconfig + x11-proto/xproto +" + +PATCHES=( + "${FILESDIR}"/${PN}-6.1-underlinking.patch + "${FILESDIR}"/${P}-shebangs.patch + "${FILESDIR}"/${P}-clang.patch +) + +src_configure() { + tc-export CC + # not autotools based + local myconfigure=( + ./configure V=1 + --mandir="${EPREFIX}"/usr/share/man/man1 + --datadir="${EPREFIX}"/usr/share/${PN} + --prefix="${EPREFIX}"/usr + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} + $(usex alsa --sound --no-sound) + ) + echo ${myconfigure[@]} || die + ${myconfigure[@]} || die +} + +pkg_postinst() { + elog "For the volume plugin to work, you need to configure your kernel" + elog "with CONFIG_SND_MIXER_OSS or CONFIG_SOUND_PRIME or some other means" + elog "that provide the /dev/mixer device node." +} diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch new file mode 100644 index 000000000000..74c04d55f76d --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-6.1-underlinking.patch @@ -0,0 +1,15 @@ +--- a/scripts/custom.sh ++++ b/scripts/custom.sh +@@ -18,10 +18,10 @@ + add_feature dependency "disable dependency tracking" disabled + + add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`' +-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`' ++add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0 x11`' + + add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`' +-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`' ++add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0 x11` -lm' + + add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC' + add_var ldflagsx "linker flags" '$glib_libs $gtk_libs' diff --git a/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch new file mode 100644 index 000000000000..8adf4bf4cf72 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-6.1-xlogout.patch @@ -0,0 +1,13 @@ +Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=501804 +Upstream: https://sourceforge.net/p/fbpanel/code/474/ + +Signed-off-by: Markos Chandras + +--- a/exec/xlogout ++++ b/exec/xlogout +@@ -45,5 +45,5 @@ + [ -z "$SPID" ] && exit 1 + echo "Session start up script" + ps -o uid,pid,ppid,sess,cmd --pid $SPID +-kill -SIGTERM -$SPID ++kill -SIGTERM -$SPID $SPID diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch b/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch new file mode 100644 index 000000000000..69347c0f3aa9 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch @@ -0,0 +1,57 @@ +diff -u -r fbpanel-7.0/plugins/battery/power_supply.c fbpanel-7.0-3/plugins/battery/power_supply.c +--- fbpanel-7.0/plugins/battery/power_supply.c 2015-12-05 08:34:19.000000000 +0200 ++++ fbpanel-7.0-3/plugins/battery/power_supply.c 2017-02-25 14:52:55.431202738 +0200 +@@ -154,7 +154,7 @@ + tmp->path = path; + tmp->name = NULL; + tmp->status = NULL; +- tmp->capacity = -1.0d; ++ tmp->capacity = -1.0f; + return tmp; + } + +@@ -206,12 +206,12 @@ + bat->capacity = g_ascii_strtod(tmp_value, NULL); + } else { // for older kernels + tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_ENERGY_NOW_KEY); +- gdouble tmp = -1.0d; ++ gdouble tmp = -1.0f; + if (tmp_value != NULL) { // ac off + tmp = g_ascii_strtod(tmp_value, NULL); + tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_ENERGY_FULL_KEY); +- if (tmp_value != NULL && tmp > 0.0d) { +- tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0d; ++ if (tmp_value != NULL && tmp > 0.0f) { ++ tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0f; + bat->capacity = tmp; + } + } else { +@@ -219,8 +219,8 @@ + if (tmp_value != NULL) { // ac on + tmp = g_ascii_strtod(tmp_value, NULL); + tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_CHARGE_FULL_KEY); +- if (tmp_value != NULL && tmp > 0.0d) { +- tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0d; ++ if (tmp_value != NULL && tmp > 0.0f) { ++ tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0f; + bat->capacity = tmp; + } + } +@@ -327,7 +327,7 @@ + extern gdouble + power_supply_get_bat_capacity(power_supply* ps) + { +- gdouble total_bat_capacity = 0.0d; ++ gdouble total_bat_capacity = 0.0f; + guint bat_count = 0; + GSequenceIter* it; + bat* battery; +@@ -335,7 +335,7 @@ + it = g_sequence_get_begin_iter(ps->bat_list); + while (!g_sequence_iter_is_end(it)) { + battery = (bat*) g_sequence_get(it); +- if (battery->capacity > 0.0d) { ++ if (battery->capacity > 0.0f) { + total_bat_capacity = total_bat_capacity + battery->capacity; + } + bat_count++; diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch new file mode 100644 index 000000000000..cdbe998e0660 --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch @@ -0,0 +1,120 @@ +--- a/.config/help ++++ b/.config/help +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python2 + + import re, os, sys, textwrap + # Formats help message +--- a/.config/repl.py ++++ b/.config/repl.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python2 + + import re, sys + +--- a/.config/tar.py ++++ b/.config/tar.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python2 + + import subprocess as sp + import re, tempfile +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python2 + + import sys + if sys.version_info < (2, 7): +--- a/exec/make_profile.in ++++ b/exec/make_profile.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + umask 0077 + # new profile directory +--- a/exec/xlogout ++++ b/exec/xlogout +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # xlogout - logs user out of its X session + # Linux specific since uses /proc +--- a/scripts/endianess.sh ++++ b/scripts/endianess.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # When cross compiling, you may put cross compiler directory + # in PATH before native gcc (aka spoofing), or you may set CC +--- a/scripts/install_locale.sh ++++ b/scripts/install_locale.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + dir=/tmp/lo-$$ + mkdir $dir +--- a/scripts/install_locale.sh.in ++++ b/scripts/install_locale.sh.in +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + dir=/tmp/lo-$$ + mkdir $dir +--- a/scripts/install.sh ++++ b/scripts/install.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + usage () + { +--- a/scripts/mk_tar ++++ b/scripts/mk_tar +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + + function info() +--- a/scripts/rfs-pkg-config ++++ b/scripts/rfs-pkg-config +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + # Tt runs pkg-config in a way that everything is searched under RFS + # but reported including full path. Suitable for cross-compiling +--- a/scripts/update-proj.sh ++++ b/scripts/update-proj.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + + function usage () + { +--- a/www/plugins/mk_gallery ++++ b/www/plugins/mk_gallery +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env sh + + echo > "$1" + #echo '' >> "$1" +--- a/www/shots/mk_gallery ++++ b/www/shots/mk_gallery +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/bin/env sh + + function help () + { diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml new file mode 100644 index 000000000000..725beec5cb42 --- /dev/null +++ b/x11-misc/fbpanel/metadata.xml @@ -0,0 +1,12 @@ + + + + + desktop-misc@gentoo.org + Gentoo Desktop Miscellaneous Project + + + fbpanel + aanatoly/fbpanel + + -- cgit v1.2.3