From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- x11-misc/trayer/Manifest | 11 +- .../trayer-1.0-as-needed-and-pre-stripped.patch | 17 +- .../trayer-1.0-dont-include-gdk-pixbuf-xlib.patch | 26 +-- .../files/trayer-1.0-dont-include-libXmu.patch | 14 -- x11-misc/trayer/files/trayer.1 | 186 +++++++++++++++++++++ x11-misc/trayer/trayer-1.0-r3.ebuild | 2 + x11-misc/trayer/trayer-1.0-r4.ebuild | 43 +++++ 7 files changed, 241 insertions(+), 58 deletions(-) create mode 100644 x11-misc/trayer/files/trayer.1 create mode 100644 x11-misc/trayer/trayer-1.0-r4.ebuild (limited to 'x11-misc/trayer') diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest index 6da53ecd2979..33f012b18337 100644 --- a/x11-misc/trayer/Manifest +++ b/x11-misc/trayer/Manifest @@ -1,6 +1,9 @@ -AUX trayer-1.0-as-needed-and-pre-stripped.patch 681 BLAKE2B 9cfc48673198f86c059685dfcdda3fde0c7a1b3bd531c34bf9d48e3c9e08e912657da7198e84fbc39d6ee07e510416eee9b55dcb37c919093c210e6bdd7c8ffd SHA512 15712e3bc1973f649d5906d42f40825d9f972baf5fcbdf77d751e29da84ae3b539c1fd1807ba0211f36f25876e9475977472d16389d6e1d95426c6b789c650e6 -AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 1300 BLAKE2B 7badd5397e756d352f8f7afd0ef2008ff3907b3016a2062bbee263a93e064a912e110407d4099685d0196ebd590f42864a2af2154910f6f132df25092991d62e SHA512 76455b1cbe29979b14ea22a9978d1dff9fdee0ec08027464fd0e93d41ddd4fb5149e3936ff63fa0682e30c6ffe58bf11f7a78ce305fc5aac1d5fa4ebaa29a1e9 -AUX trayer-1.0-dont-include-libXmu.patch 524 BLAKE2B e81700086751d315feee7e00844866536daca99cd1caf04ab7fed2f2c90a16fdbb91c5110f887c66b0118eea178bb795faceaeceefbc91c4a4df402fbd57f84f SHA512 6dba64b746f655db3c7666f8504a4a3cff06bf91cd475d576a4e50839b3a2fb63c190f62082dec694559fc1d0cf7272d93f629b7ef6e49bf3599d6f36bc22dd0 +AUX trayer-1.0-as-needed-and-pre-stripped.patch 300 BLAKE2B d941ab99841ed60de03866e53be1ea517dd6a7fc10bd10aed053b8ef378cd85e2b65e5da1fa1cb0701970d6d3a287777ed292118486d48af7de0bb32999f4f65 SHA512 5dac4a877f32fa63d18013c8c67666520ceac51de55a2e42c5f03db60487e82b7aac2f43e07ba40e7f2ff48e7fca56f11eee6eb90759db37cd0722164f14cc9f +AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 745 BLAKE2B 8fc70b5b9bf8d0764e0da5138cb89a57874e5987f2531ea72837aeaf152db98312d774bb1c7692c3e935ccf90133c05f3dd5bdaac1db0092bdaa528c0a401db7 SHA512 48efbf9de7c608fa4981e658eb815ef5d40e113ef85363bd09db7ed8a09ea807b38b359380f8f5499e4e9e996cd1a6d3f26dce4a5348a654aa67a6a6d0e75d73 +AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a808c16b0ca6400face67330b0e3feeeb633a25f8e6ecc542f3fba59d9b48b2673c3162e4c3797fd29b32aba77af110d6432f44 SHA512 b17ea529431e36e82c5aaab6548410a1f839d978ece5ca42ac90732ca899012b9b871a5b9a37d3b2ee05238222c02b1ac4c6edbdb70f6a04e39267fce1c2fba0 +AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1 +DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049 DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7 -EBUILD trayer-1.0-r3.ebuild 821 BLAKE2B 7029f6eec63577a2065505996e1cf6fe4f59a44f290086da6551e7782536a486978c451c36fcba0a653f9c2a986950dd3bd0c790e332965dbd0afb18d0120c1c SHA512 d93e6bb8119d547e2234ebd2463376002b5ca8088e04412b7a82e2cc6aa143d792fec0708644f916071b737ccd71ec856db0144d99e79f7bd650d1f0a309eb0b +EBUILD trayer-1.0-r3.ebuild 844 BLAKE2B 362597df72f4d78bdb9284b02477714292b90115eb95fe5581ed009328679762800653cd3daf345e4844ac814524ecb84e1d255183f801d085f26e6a95205add SHA512 cb43354e391789acc533667d1a0a7aa84b8f39ac2b21c1bbb2b59bb08a36036c18fbbe52ad07d6df87db8c2253063b943d22f4823044ebfff2a4a3c08751e5e5 +EBUILD trayer-1.0-r4.ebuild 998 BLAKE2B 587eef597495479d1d355f0983036c4f8eddbfde46bca935bbb739e0ed161a1c276c1d0ef0de7ba1cd575bbd7162c63bc698362deefd15203194bde6e4afcb72 SHA512 d63de02bc9027c2e5aad524cceaadd9c715d6ecd148617202c3a2aec8039abdfb12c0a890faed702431683242558588f0ed56fcc5f291b6eff9682694f8191d5 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607 diff --git a/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch index 9db338424220..84f54a4bfdfa 100644 --- a/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch +++ b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch @@ -1,15 +1,3 @@ -From 6d0c1123441633660c2ec4f336e1e800b4dfebb5 Mon Sep 17 00:00:00 2001 -From: Harri Nieminen -Date: Sat, 25 Mar 2017 12:18:13 +0200 -Subject: [PATCH 2/2] Fix for as-needed and pre-stripped files - -Gentoo bugs: #141707, #252098 ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 9d7c4fb..faaa85d 100644 --- a/Makefile +++ b/Makefile @@ -36,9 +36,9 @@ endif @@ -17,13 +5,10 @@ index 9d7c4fb..faaa85d 100644 TARGET = trayer $(TARGET): $(OBJ) $(SYSTRAYOBJ) - $(CC) $(LDFLAGS) $(LIBS) $(OBJ) $(SYSTRAYOBJ) -o $@ -+ $(CC) $(LDFLAGS) $(OBJ) $(SYSTRAYOBJ) $(LIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(SYSTRAYOBJ) $(LIBS) -o $@ ifeq (,$(DEVEL)) - strip $@ + true $@ endif TARGETMAN = $(TARGET).1.gz --- -2.12.1 - diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch index ccb1e12869b8..ecb013a37ad4 100644 --- a/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch +++ b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch @@ -1,19 +1,3 @@ -From 1aa5f4164b86fd0c5cf174c8403442060cad497d Mon Sep 17 00:00:00 2001 -From: Harri Nieminen -Date: Sat, 25 Mar 2017 12:17:09 +0200 -Subject: [PATCH 1/2] Remove useless include on - gdk-pixbuf-xlib/gdk-pixbuf-xlib.h - -Also fix underlinking, bug #369591 - -Thanks for leio@g.o for reporting ---- - Makefile.common | 4 ++-- - plugin.c | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/Makefile.common b/Makefile.common -index 0d50340..ec2bc3c 100644 --- a/Makefile.common +++ b/Makefile.common @@ -16,8 +16,8 @@ endif @@ -22,13 +6,11 @@ index 0d50340..ec2bc3c 100644 CC = gcc -LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib -lXmu -INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -+LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11) -+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11) ++LIBS = $(shell ${PKG_CONFIG} --libs gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11) ++INCS = $(shell ${PKG_CONFIG} --cflags gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11) CFLAGS = -O2 # overwriten by command line or env. variable CFLAGS += -Wall # always nice to have ifneq (,$(DEVEL)) -diff --git a/plugin.c b/plugin.c -index 7fd5398..a6f8fbb 100644 --- a/plugin.c +++ b/plugin.c @@ -2,7 +2,6 @@ @@ -38,7 +20,3 @@ index 7fd5398..a6f8fbb 100644 -#include #include #include - --- -2.12.1 - diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch index 8b9fd291d15f..56f3000ff69c 100644 --- a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch +++ b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch @@ -1,14 +1,3 @@ -From 710efb0c8192e704a83fd3d4b8b3c0d6be984246 Mon Sep 17 00:00:00 2001 -From: Harri Nieminen -Date: Sun, 26 Mar 2017 10:08:05 +0300 -Subject: [PATCH] Don't include libXmu - ---- - systray/main.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/systray/main.c b/systray/main.c -index dff5455..79cbe34 100644 --- a/systray/main.c +++ b/systray/main.c @@ -2,7 +2,6 @@ @@ -19,6 +8,3 @@ index dff5455..79cbe34 100644 #include #include "panel.h" --- -2.12.1 - diff --git a/x11-misc/trayer/files/trayer.1 b/x11-misc/trayer/files/trayer.1 new file mode 100644 index 000000000000..a00cdbadecd1 --- /dev/null +++ b/x11-misc/trayer/files/trayer.1 @@ -0,0 +1,186 @@ +.TH TRAYER 1 "Feb 14, 2005" "FVWM\-Crystal" +.SH NAME +trayer \- a lightweight GTK2\-based systray for UNIX desktop +.SH SYNOPSIS +.B trayer \-h +.br +.B trayer \-v +.br +.B trayer +.\" +.RB [\| \-\-edge +.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|] +.\" +.RB [\| \-\-align +.RI \| left \||\| right \||\| center \|] +.\" +.RB [\| \-\-margin +.RI \| \|] +.\" +.RB [\| \-\-widthtype +.RI \| request \||\| pixel \||\| percent +.RI \|] +.\" +.RB [\| \-\-width +.RI \| \|] +.\" +.RB [\| \-\-heighttype +.RI \| \|] +.\" +.RB [\| \-\-height +.RI \| \|] +.\" +.RB [\| \-\-SetDockType +.RI \| true \||\| false \|] +.\" +.RB [\| \-\-SetPartialStrut +.RI \| true \||\| false \|] +.\" +.RB [\| \-\-transparent +.RI \| true \||\| false \|] +.\" +.RB [\| \-\-alpha +.RI \| \|] +.\" +.RB [\| \-\-tint +.RI \| \|] +.\" +.RB [\| \-\-distance +.RI \| \|] +.\" +.RB [\| \-\-expand +.RI \| true \||\| false \|] +.\" +.RB [\| \-\-padding +.RI \| \|] +.\" +.SH DESCRIPTION +.B trayer +is small program designed to provide system tray similar to these in +.B GNOME +/ +.B KDE +desktop environments for window managers which does not +support that function. It is similar to other applications such as +.B peksystray +and \fBdocker\fP. +.PP +System tray is a place, where many applications put their icons, so they are +always visible. Such icons may present status of an application and allow user +to control the program. +.PP +\fBtrayer\fP code was extracted from \fBfbpanel\fP application, you can find more +about it on its homepage: http://fbpanel.sourceforge.net/. +.SH OPTIONS +This programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-h +Show summary of options and exit. + +.TP +.B \-v +Show version of program and exit. + +.TP +\fB\-\-edge\fP \fIleft\fP\||\|\fIright\fP\||\|\fItop\fP\||\|\fIbottom\fP\||\|\fInone\fP +Specifies a screen edge to use. + +.TP +\fB\-\-align\fP \fIleft\fP\||\|\fIcenter\fP\||\|\fIright\fP +Specifies an align of the icons. + +.TP +\fB\-\-margin\fP \fI\fP +Specifies length of margin (in pixels) + +.TP +\fB\-\-widthtype\fB \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP +Specifies method of calculating trayer's window width: +.RS +.TP +\fIrequest\fP +Follow application icons' size, so trayer may shrink or expand dynamically. + +.TP +\fIpixel\fP +Set a fixed size, given with \fB\-\-width\fP option in pixels. + +.TP +\fIpercent\fP +Set a fixed size, given with \fB\-\-width\fP option in percentage of a lenght of screen edge. +.RE + +.TP +\fB\-\-width\fP \fI\fP +Width of trayer's window. Ignored when \fB\-\-widthtype\fP is set to \fIrequest\fP. + +.TP +\fB\-\-heighttype\fP \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP +Specifies method of calculating trayer's window height: +.RS +.TP +\fIrequest\fP +Follow application icons' size, so trayer may shrink or expand dynamically. + +.TP +\fIpixel\fP +Set a fixed size, given with \fB\-\-height\fP option in pixels. + +.TP +\fIpercent\fP +Set a fixed size, given with \fB\-\-height\fP option in percentage of a lenght of screen edge. +.RE + +.TP +\fB\-\-height\fP \fI\fP +Height of trayer's window. Ignored when \fB\-\-heighttype\fP is set to \fIrequest\fP. + +.TP +\fB\-\-SetDockType\fP \fItrue\fP\||\|\fIfalse\fP +Identify panel window type as dock. + +.TP +\fB\-\-SetPartialStrut\fP \fItrue\fP\||\|\fIfalse\fP +Reserve panel space so that it will not be covered by maximized windows. + +.TP +\fB\-\-transparent\fP \fItrue\fP\||\|\fIfalse\fP +Use transparency. + +.TP +\fB\-\-alpha\fP \fI\fP +Percentage of transparency (0 \- nontransparent, 256 \- fully transparent) + +.TP +\fB\-\-tint\fP \fI\fP +Color used to tint transparent background. Color is given as a 24-bit C hexadecimal integer, for example: 0xff0000 is red, 0xff8800 is orange and 0x00ff00 is green. + +.TP +\fB\-\-distance\fP \fI\fP +Specifies distance between trayer's window and screen edge (in pixels) + +.TP +\fB\-\-expand\fP \fItrue\fP\||\|\fIfalse\fP +Specifies whether trayer may accomodate extra space when there is too much +icons. + +.TP +\fB\-\-padding\fP \fI\fP +Extra space between icons and trayer window's border. + +.SH SEE ALSO +.BR fbpanel (1) +.SH AUTHORS +Anatoly Asviyan \- fbpanel +.br +Rafal Bisingier +.br +Maciej Delmanowski +.br +Grzegorz Nieweglowski +.br +Thomas Rydzynski +.PP +This manual page was written by Tomasz Melcer . diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild index 1d79f1312512..f130f5ec280a 100644 --- a/x11-misc/trayer/trayer-1.0-r3.ebuild +++ b/x11-misc/trayer/trayer-1.0-r3.ebuild @@ -31,6 +31,8 @@ PATCHES=( ) src_compile() { + tc-export PKG_CONFIG + emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" } diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild new file mode 100644 index 000000000000..eab20e264425 --- /dev/null +++ b/x11-misc/trayer/trayer-1.0-r4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs + +DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" +HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/" +SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +RDEPEND=" + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11 +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch + "${FILESDIR}"/${P}-dont-include-libXmu.patch + "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch +) + +src_compile() { + tc-export PKG_CONFIG + + emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray + emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" +} + +src_install() { + dobin trayer + doman "${FILESDIR}"/trayer.1 + einstalldocs +} -- cgit v1.2.3