[gentoo-commits] dev/xmw:master commit in: x11-misc/trayer-srg/files/, x11-misc/trayer-srg/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Weber" <xmw@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/xmw:master commit in: x11-misc/trayer-srg/files/, x11-misc/trayer-srg/
Date: Tue,  9 Aug 2011 02:22:19 +0000 (UTC)	[thread overview]
Message-ID: <99bce18f66447dd744e3842af278c9d7b7a5dc39.xmw@gentoo> (raw)

commit:     99bce18f66447dd744e3842af278c9d7b7a5dc39
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 02:22:08 2011 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 02:22:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/xmw.git;a=commit;h=99bce18f

x11-misc/trayer-srg: Added some patches

(Portage version: 2.1.10.3/git/Linux x86_64, signed Manifest commit with key 62EEF090)

---
 x11-misc/trayer-srg/ChangeLog                      |    6 ++++
 x11-misc/trayer-srg/Manifest                       |   15 ++++++----
 .../files/trayer-srg-1.1.2-as-needed.patch         |   13 ++++++++
 .../trayer-srg/files/trayer-srg-1.1.2-cflags.patch |   26 ++++++++++++++++
 .../files/trayer-srg-1.1.2-panel_height.patch      |   31 ++++++++++++++++++++
 x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild        |   10 ++----
 x11-misc/trayer-srg/trayer-srg-9999.ebuild         |   10 ++----
 7 files changed, 91 insertions(+), 20 deletions(-)

diff --git a/x11-misc/trayer-srg/ChangeLog b/x11-misc/trayer-srg/ChangeLog
index 45cdc15..7a86d5c 100644
--- a/x11-misc/trayer-srg/ChangeLog
+++ b/x11-misc/trayer-srg/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2011; Michael Weber <xmw@gentoo.org> trayer-srg-1.1.2.ebuild,
+  +files/trayer-srg-1.1.2-as-needed.patch,
+  +files/trayer-srg-1.1.2-cflags.patch,
+  +files/trayer-srg-1.1.2-panel_height.patch, trayer-srg-9999.ebuild:
+  Added some patches
+
 *trayer-srg-9999 (09 Aug 2011)
 *trayer-srg-1.1.2 (09 Aug 2011)
 

diff --git a/x11-misc/trayer-srg/Manifest b/x11-misc/trayer-srg/Manifest
index be01c79..6c5f54f 100644
--- a/x11-misc/trayer-srg/Manifest
+++ b/x11-misc/trayer-srg/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX trayer-srg-1.1.2-as-needed.patch 280 RMD160 b9fc1b91c5b24f996ece1ab6a50defc6b9e42518 SHA1 62ed7488c7b8bffca12ac13b015b6f917f133057 SHA256 92de65225a5b9112eca895ff96e5d9be6cd894140bfa26bed4f8c0c43c7efd3e
+AUX trayer-srg-1.1.2-cflags.patch 771 RMD160 41438a786b6526f400c941e181901038915d0338 SHA1 ae7f59789379395dad30df2a24cdcf162b1c2f61 SHA256 b6e753a5800221d3957c8812b9b264b44123622017969e46174aa308eac23532
+AUX trayer-srg-1.1.2-panel_height.patch 911 RMD160 15c6fbfc0b294cced42d7bebe9907fc907a1bddd SHA1 97e0776b23c47163fa378d950b696de113d7e121 SHA256 fb8d0a14540b10aa67c12f120d8bd98ed41a2b5fd856c4f54c23e2b2d41fd538
 DIST trayer-srg-1.1.2.tar.gz 24640 RMD160 0e5204fb92cda2ad529062ac664c498d13b570cf SHA1 33519e225115830322b03a97893a54ffacd9e465 SHA256 31ddc1cfcd6b3f142ffa46e8fde369026d15556c5867884188f5cb1d2c917ad7
-EBUILD trayer-srg-1.1.2.ebuild 899 RMD160 db08d2cbeb415381fe378b83352281e424e94948 SHA1 dbb4d51e62cebbcd3ea066e0007f4be22a71c3ff SHA256 217cb12ee27a5f4a25d72ca152752cca9e8584b0d58c8bd3d11c2faa2183bec9
-EBUILD trayer-srg-9999.ebuild 823 RMD160 38e2bdfb389cbc02737b1df82a29420d80214af8 SHA1 614bd6a615386159d61ade0d839862eedef7b3cf SHA256 d9ff6bc01d916967fcfa3652a9dfc1460277ba25b83203c56fd47dc174d488f8
-MISC ChangeLog 316 RMD160 17337d748e99142f3c6896919fc45256ee138e0a SHA1 86d3c6d88a862008d9e108ea45f329d5fd23e190 SHA256 92433cc3579a7925f5660fcb234b568f8caf494bdd27ecc35b1b59d109d322ee
+EBUILD trayer-srg-1.1.2.ebuild 862 RMD160 936ddad5fbdb703cb73f83230c01329f44174a0d SHA1 e303b3c7d78f67954422b339c8bbd75949f310a4 SHA256 421d831cbc52f6266074b59bc0701fea0eeb88e7927d7f0792f5a12bf64f5625
+EBUILD trayer-srg-9999.ebuild 793 RMD160 3d99f964aeb61c6e7150c70bdae3bb803ebf4f6b SHA1 643ac1e93bb549ffe7a271986d3b579c28a17fc8 SHA256 1723e53f5795d764385236b74512e49de426f5c6b98a150ac13560bab287be59
+MISC ChangeLog 562 RMD160 1d09c84aff5783a95c1231dfa7922e552b02b138 SHA1 51e3a7f60e0f22ffee1aef19c014a549a6fb8bbc SHA256 1e961829cfacdd4b48617aef9a49230735ce019f437334a2d9ae1fea3cef8dd8
 MISC metadata.xml 245 RMD160 6b03982a4d5f32d9fa6b9259ae36f9fcb07c8404 SHA1 fb16c7b4c5ab071dd979f761b8bb075f5396b737 SHA256 375a1da02cd2c393ce2378a73c1ce08134bc030b3bb378c6a4d6ca9cd5be1f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5AhikACgkQknrdDGLu8JBjoAD+NRs2PP6YE8LwwV4vZQUQyFrV
-YMxO463Wu3mXcBcTSZQA/2VEO4y8vqi/46vaXGrJo9yJCBio5OxlV/dHEmUkmbXa
-=XOLC
+iF4EAREIAAYFAk5AmdAACgkQknrdDGLu8JDaxwEAkIANdhZAlTdu0SZu+Zh7Med8
+ln/fwLNjWhuW16k29lsA/Al5cmUkqqFmq0nWBUCl2xf5AEYewu1T6okx7v3wvPe6
+=F0we
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch
new file mode 100644
index 0000000..851b21f
--- /dev/null
+++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-as-needed.patch
@@ -0,0 +1,13 @@
+https://github.com/sargon/trayer-srg/issues/4
+
+--- trayer-srg-1.1.2/Makefile
++++ trayer-srg-1.1.2/Makefile
+@@ -19,7 +19,7 @@
+ 
+ TARGET = trayer
+ $(TARGET): $(OBJ) 
+-	$(CC) $(LDFLAGS) $(LIBS) $(OBJ) -o $@
++	$(CC) $(LDFLAGS) $(OBJ) -o $@ $(LIBS)
+ ifeq (,$(DEVEL))
+ 	strip $@
+ endif

diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch
new file mode 100644
index 0000000..d9d56de
--- /dev/null
+++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-cflags.patch
@@ -0,0 +1,26 @@
+https://github.com/sargon/trayer-srg/issues/3
+
+--- trayer-srg-1.1.2/Makefile.common
++++ trayer-srg-1.1.2/Makefile.common
+@@ -15,17 +15,16 @@
+ endif
+ endif
+ 
+-CC = gcc
++CC ?= gcc
+ LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -lX11 -L/usr/X11R6/lib  -lXmu
+ INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
+-CFLAGS = -O2    # overwriten by command line or env. variable
+-CFLAGS += -Wall # always nice to have 
++CFLAGS ?= -O2 -Wall
+ ifneq (,$(DEVEL))
+-CFLAGS := -g -Wall 
++CFLAGS ?= -g -Wall 
+ endif
+ 
+ # -DGTK_DISABLE_DEPRECATED does not work yet
+-CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
++#CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(INCS) -c $<

diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patch
new file mode 100644
index 0000000..a5d87cb
--- /dev/null
+++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.2-panel_height.patch
@@ -0,0 +1,31 @@
+https://github.com/sargon/trayer-srg/issues/5
+
+--- trayer-srg-1.1.2/panel.h
++++ trayer-srg-1.1.2/panel.h
+@@ -18,7 +18,7 @@
+ 
+ #define PANEL_HEIGHT_DEFAULT  26
+ #define PANEL_HEIGHT_MAX      200
+-#define PANEL_HEIGHT_MIN      16
++#define PANEL_HEIGHT_MIN      2
+ 
+ 
+ typedef struct {
+--- trayer-srg-1.1.2/panel.c
++++ trayer-srg-1.1.2/panel.c
+@@ -337,10 +337,13 @@
+         p->width = 100;
+     p->heighttype = HEIGHT_PIXEL;
+     if (p->heighttype == HEIGHT_PIXEL) {
+-        if (p->height < PANEL_HEIGHT_MIN)
++        if (p->height < PANEL_HEIGHT_MIN) {
++	    ERR( "height is bound by %i pixels\n", PANEL_HEIGHT_MIN );
+             p->height = PANEL_HEIGHT_MIN;
+-        else if (p->height > PANEL_HEIGHT_MAX)
++	} else if (p->height > PANEL_HEIGHT_MAX) {
++	    ERR( "height is bound by %i pixels\n", PANEL_HEIGHT_MAX );
+             p->height = PANEL_HEIGHT_MAX;
++	}
+     }
+     panel_start_gui(p);
+     RET(1);

diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild
index 5c47bb0..f607282 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=3
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="trayer fork with multi monitor support, cleaned up codebase and other fancy stuff"
 HOMEPAGE="https://github.com/sargon/trayer-srg"
@@ -28,15 +28,11 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -e 's:$(LIBS) $(OBJ) -o $@:$(OBJ) -o $@ $(LIBS):' \
-		-i Makefile || die
+	epatch "${FILESDIR}"/${P}-{as-needed,cflags,panel_height}.patch
 }
 
 src_compile() {
-	emake \
-		DEVEL=1 TARGET=${PN} \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		|| die
+	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)" || die
 }
 
 src_install() {

diff --git a/x11-misc/trayer-srg/trayer-srg-9999.ebuild b/x11-misc/trayer-srg/trayer-srg-9999.ebuild
index d26095c..5a2bc86 100644
--- a/x11-misc/trayer-srg/trayer-srg-9999.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=3
 
 EGIT_REPO_URI="https://github.com/sargon/trayer-srg.git"
 
-inherit git-2 toolchain-funcs
+inherit eutils git-2 toolchain-funcs
 
 DESCRIPTION="trayer fork with multi monitor support, cleaned up codebase and other fancy stuff"
 HOMEPAGE="https://github.com/sargon/trayer-srg"
@@ -25,15 +25,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	sed -e 's:$(LIBS) $(OBJ) -o $@:$(OBJ) -o $@ $(LIBS):' \
-		-i Makefile || die
+	epatch "${FILESDIR}"/${PN}-1.1.2-{as-needed,cflags,panel_height}.patch
 }
 
 src_compile() {
-	emake \
-		DEVEL=1 TARGET=${PN} \
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		|| die
+	emake DEVEL=1 TARGET=${PN} CC="$(tc-getCC)" || die
 }
 
 src_install() {

next             reply	other threads:[~2011-08-09  2:22 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-09  2:22 Michael Weber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-08-10  0:43 [gentoo-commits] dev/xmw:master commit in: x11-misc/trayer-srg/files/, x11-misc/trayer-srg/ Michael Weber

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:45cdc15 dfblob:7a86d5c dfblob:be01c79 dfblob:6c5f54f
dfblob:851b21f dfblob:d9d56de dfblob:a5d87cb dfblob:5c47bb0
dfblob:f607282 dfblob:d26095c dfblob:5a2bc86 )
 OR (
bs:"[gentoo-commits] dev/xmw:master commit in: x11-misc/trayer-srg/files/, x11-misc/trayer-srg/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=99bce18f66447dd744e3842af278c9d7b7a5dc39.xmw@gentoo \
    --to=xmw@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox