* [gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/, x11-misc/trayer/files/
@ 2017-03-25 10:40 Mart Raudsepp
0 siblings, 0 replies; 4+ messages in thread
From: Mart Raudsepp @ 2017-03-25 10:40 UTC (permalink / raw
To: gentoo-commits
commit: 865cdd57ef94a65a9b75d88fe18384496cae83bc
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Sat Mar 25 10:34:00 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 10:40:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865cdd57
x11-misc/trayer: Patch to remove dependency on gdk-pixbuf[X]
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4295
.../trayer-1.0-as-needed-and-pre-stripped.patch | 29 ++++++++++++++
.../trayer-1.0-dont-include-gdk-pixbuf-xlib.patch | 44 ++++++++++++++++++++++
x11-misc/trayer/trayer-1.0-r3.ebuild | 40 ++++++++++++++++++++
3 files changed, 113 insertions(+)
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
new file mode 100644
index 00000000000..9db33842422
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
@@ -0,0 +1,29 @@
+From 6d0c1123441633660c2ec4f336e1e800b4dfebb5 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+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
+
+ TARGET = trayer
+ $(TARGET): $(OBJ) $(SYSTRAYOBJ)
+- $(CC) $(LDFLAGS) $(LIBS) $(OBJ) $(SYSTRAYOBJ) -o $@
++ $(CC) $(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
new file mode 100644
index 00000000000..ccb1e12869b
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
@@ -0,0 +1,44 @@
+From 1aa5f4164b86fd0c5cf174c8403442060cad497d Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+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
+ endif
+
+ 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)
+ 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 @@
+ #include "plugin.h"
+
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+
+--
+2.12.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
new file mode 100644
index 00000000000..adb95419546
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="http://home.gna.org/fvwm-crystal/"
+SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ x11-libs/libX11
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+ "${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+)
+
+src_compile() {
+ emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+ dobin trayer
+ doman trayer.1
+ einstalldocs
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/, x11-misc/trayer/files/
@ 2017-04-01 10:21 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-04-01 10:21 UTC (permalink / raw
To: gentoo-commits
commit: f87a7939f464757daef7cdd5559a9639129fcbbc
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Sun Mar 26 07:31:06 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 10:20:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87a7939
x11-misc/trayer: Dont include libXmu
Gentoo-Bug: https://bugs.gentoo.org/613842
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4302
.../files/trayer-1.0-dont-include-libXmu.patch | 24 ++++++++++++++++++++++
x11-misc/trayer/trayer-1.0-r2.ebuild | 2 ++
x11-misc/trayer/trayer-1.0-r3.ebuild | 1 +
3 files changed, 27 insertions(+)
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
new file mode 100644
index 00000000000..8b9fd291d15
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
@@ -0,0 +1,24 @@
+From 710efb0c8192e704a83fd3d4b8b3c0d6be984246 Mon Sep 17 00:00:00 2001
+From: Harri Nieminen <moikkis@gmail.com>
+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 @@
+ #include <unistd.h>
+ #include <string.h>
+
+-#include <X11/Xmu/WinUtil.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+
+ #include "panel.h"
+--
+2.12.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r2.ebuild b/x11-misc/trayer/trayer-1.0-r2.ebuild
index eb0f827a998..9876527f2e6 100644
--- a/x11-misc/trayer/trayer-1.0-r2.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r2.ebuild
@@ -24,6 +24,8 @@ DEPEND="
virtual/pkgconfig
"
+PATCHES=( "${FILESDIR}"/${P}-dont-include-libXmu.patch )
+
src_prepare() {
default
# fix for as-needed, bug #141707
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
index 574902f5043..ad5fb8df846 100644
--- a/x11-misc/trayer/trayer-1.0-r3.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r3.ebuild
@@ -26,6 +26,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+ "${FILESDIR}"/${P}-dont-include-libXmu.patch
"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/, x11-misc/trayer/files/
@ 2020-02-02 14:29 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-02-02 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 3f2ecfb5581586a98c25ae204d2c98c3d03d8680
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 14:28:39 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 14:29:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f2ecfb5
x11-misc/trayer: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/trayer/files/trayer-1.0-fno-common.patch | 11 +++++++++++
x11-misc/trayer/trayer-1.0-r4.ebuild | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/x11-misc/trayer/files/trayer-1.0-fno-common.patch b/x11-misc/trayer/files/trayer-1.0-fno-common.patch
new file mode 100644
index 00000000000..c8fd20a6cee
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/plugin.h
++++ b/plugin.h
+@@ -9,8 +9,6 @@
+ #include <stdio.h>
+ #include "panel.h"
+
+-struct _plugin *stam;
+-
+ typedef struct {
+ /* common */
+ char *fname;
diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild
index eab20e26442..db168a56b03 100644
--- a/x11-misc/trayer/trayer-1.0-r4.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -27,6 +27,7 @@ PATCHES=(
"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
"${FILESDIR}"/${P}-dont-include-libXmu.patch
"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_compile() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/, x11-misc/trayer/files/
@ 2022-12-04 23:58 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-04 23:58 UTC (permalink / raw
To: gentoo-commits
commit: da8be2e6b4210e2d25c161485a34aaeadca1b2d0
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Sat Dec 3 14:19:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 23:57:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8be2e6
x11-misc/trayer: fix incompatible pointer types
Closes: https://bugs.gentoo.org/881081
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/28523
Signed-off-by: Sam James <sam <AT> gentoo.org>
...trayer-1.0-fix-incompatible-pointer-types.patch | 19 ++++++++++
x11-misc/trayer/trayer-1.0-r5.ebuild | 42 ++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..e2d750641214
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-fix-incompatible-pointer-types.patch
@@ -0,0 +1,19 @@
+Clang16 will not allow incompatible pointer types by default.
+
+Bug: https://bugs.gentoo.org/881081
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+--- a/plugin.h
++++ b/plugin.h
+@@ -9,6 +9,8 @@
+ #include <stdio.h>
+ #include "panel.h"
+
++struct _plugin;
++
+ typedef struct {
+ /* common */
+ char *fname;
+--
+2.38.1
+
diff --git a/x11-misc/trayer/trayer-1.0-r5.ebuild b/x11-misc/trayer/trayer-1.0-r5.ebuild
new file mode 100644
index 000000000000..051d15d92456
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}"
+BDEPEND="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
+ "${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-fix-incompatible-pointer-types.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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-04 23:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-02 14:29 [gentoo-commits] repo/gentoo:master commit in: x11-misc/trayer/, x11-misc/trayer/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 23:58 Sam James
2017-04-01 10:21 David Seifert
2017-03-25 10:40 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox