commit: 1be8dc5d5ad3aca439e5499c7b0e10e3dbb43be7 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Nov 20 11:39:32 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Nov 20 12:15:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1be8dc5d
x11-misc/trayer: Clean up git cruft in patches, use PKG_CONFIG Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../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/trayer-1.0-r3.ebuild | 2 ++ x11-misc/trayer/trayer-1.0-r4.ebuild | 2 ++ 5 files changed, 7 insertions(+), 54 deletions(-) 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 9db33842422..84f54a4bfdf 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 <[email protected]> -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 ccb1e12869b..ecb013a37ad 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 <[email protected]> -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 [email protected] 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 <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h> #include <gdk/gdk.h> #include <string.h> - --- -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 8b9fd291d15..56f3000ff69 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 <[email protected]> -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 <gdk-pixbuf/gdk-pixbuf.h> #include "panel.h" --- -2.12.1 - diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild index 1d79f131251..f130f5ec280 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 index 2e11ffd72f0..eab20e26442 100644 --- a/x11-misc/trayer/trayer-1.0-r4.ebuild +++ b/x11-misc/trayer/trayer-1.0-r4.ebuild @@ -30,6 +30,8 @@ PATCHES=( ) src_compile() { + tc-export PKG_CONFIG + emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" }
