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-plugins/gkrellm-mailwatch/Manifest | 9 +++++ .../files/2.4.3-0001-Respect-LDFLAGS.patch | 36 +++++++++++++++++++ .../2.4.3-0002-Use-gkrellm_gkd_string_width.patch | 29 +++++++++++++++ ...2.4.3-0003-Remove-a-few-more-GCC-warnings.patch | 41 ++++++++++++++++++++++ .../2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch | 28 +++++++++++++++ .../gkrellm-mailwatch-2.4.3-r2.ebuild | 31 ++++++++++++++++ x11-plugins/gkrellm-mailwatch/metadata.xml | 5 +++ 7 files changed, 179 insertions(+) create mode 100644 x11-plugins/gkrellm-mailwatch/Manifest create mode 100644 x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch create mode 100644 x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch create mode 100644 x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch create mode 100644 x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch create mode 100644 x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild create mode 100644 x11-plugins/gkrellm-mailwatch/metadata.xml (limited to 'x11-plugins/gkrellm-mailwatch') diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest new file mode 100644 index 000000000000..d1317a0948a5 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/Manifest @@ -0,0 +1,9 @@ +AUX 2.4.3-0001-Respect-LDFLAGS.patch 998 SHA256 61826ba4d27f0148a599b5b78087312781b9baad7138a234b0479a96256a1b20 SHA512 1c6677b285a42c557c0d09459c27b7a6354a5802ab30606fe786bf52a73b80ec7026c2cf365cfc6315dc82eada4eaa1f9697119b23d01fd4315d93c7aaa2479e WHIRLPOOL e8a39c61ab07ba9c8c489c6f25dbaedfcef096d0b82d56992abc0c83887f4730aaae9796dc3b8e1a0eed3ea0ac01ea8d161a95502b8619d14ba8c28850b72118 +AUX 2.4.3-0002-Use-gkrellm_gkd_string_width.patch 914 SHA256 5fc8937277e985d90bc4ef73070ca653f4558de953c065044788ff27caa547c5 SHA512 05e9b1387df691ceab91791f7e3903137a0bfd77fc69c1d23707aac274f61e0ffe647f5114e3992ec8c512a2cbd63ce10610fa9f5efc269914829ff36ddb83da WHIRLPOOL fced62d207648aa3bad354b888248ec1487e9017728e746257073b531fb6bcdde1c38e11d156a01dbc01e2d957c2f14237af44745f4b640ccd01f39a217967e7 +AUX 2.4.3-0003-Remove-a-few-more-GCC-warnings.patch 1227 SHA256 7757284b182e92fa2527afe2c681c4392eec4ecd632958da370a12fd6db1dfb4 SHA512 608088d86196397e8a43edabfae0bed2f44f0e6a0e8e6ff0607589365c53a0448a8a8207b53a9b7255b16a071cdc4c34a8c4abf3ffe1d1b603d0d4d29910dedb WHIRLPOOL 69614ec61121df7a604bccb4419cd78a17ddddbbe2e629f64356cd28bdf3f34bdbc9930457da3733ff0fee565d70ec86a256dae65827f9abcbe55fb4f8bb55fc +AUX 2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch 761 SHA256 fa04f6bd124e266cedc834b13a6c745607f126bdb52287471f8c0320f0a98dfe SHA512 48381a81041befe925bb50fc7026e9543671242e824b8ccaadd7614778258af1dfd819aa4c0bdeb856b822a23af8f265463da1eb11e4340e328e13c969d42808 WHIRLPOOL 01393a0b9476265558705640643733fb11fbef0a00995baef418b10afaa16d3110ed96e31088501785c845aa8dd915dff17943ee5393217c757dff9c23784a1f +DIST gkrellm-mailwatch-2.4.3.tar.gz 27407 SHA256 d492d7e494800c80abc2410d4266071132da23b06ae9d903ac4bf279b2b3a4b0 SHA512 31ada9fa55a97a1c76e93f1130b5d84ce3c3db52608aaaeedcd8d482917c53e0c868ca2b61c58da966bdce7de74a88a6bdc5869c40b41e017014f34626df4bb9 WHIRLPOOL 6ced9e098b71f8ecb57ec246da0acd2935f1fa99679ab41d1ae3cca564060f6c98da9b931111c1041d8c18f14aec685383f767a7471005c49334fbc79bc71c9f +EBUILD gkrellm-mailwatch-2.4.3-r2.ebuild 785 SHA256 292fc4fe720cb9588fa61344943712e8cbe67b3ac5c0a942ee83a5bebc4b4d82 SHA512 3a394e6eb7d6eb9d3f68130def85c8102a378ebb8b0c4712bfca16cc456a7c69ae043ed57fefceb2a85dfa902c629ab25e1128f01d37b9400dc7e369cdcbc826 WHIRLPOOL 59cabe8f17b32dd3d1d4aed13fca35d2e098414f23d3f7d48884ae7acc77295eb15a7429c8b32e47279efa01a04b74e236cf6975ec0fc8a1b94906dc3d75de2d +MISC ChangeLog 2705 SHA256 65255d1bbcf95e76a87c53ba8524cb0d97e6a4146f2464d0b1793353ecdad3ce SHA512 caedc40ee4987c5f803f81c45295ef3d979fd19ac959b0f7af2f1ee9dc01b4b203268702ad35181d8c0ccfd3d63482febda77f36a3ee651c9ec5dcf8386805b1 WHIRLPOOL dbfbf7726e6b9fd461f6a90934067658c33d8adfa78ab1dc53a5faf3bced5c39198fb2f6552584237687f7b89557495d077f1a55ad00208d86d40993ebe7ac22 +MISC ChangeLog-2015 4416 SHA256 e8d0d45f6ea0001ee5d07fbf7a3a2acdaf3a5d2f587ac61defa010dead2f0b1e SHA512 86845f925c86f06bb92d096bb4b49f012f15376355b0d546fd953d2f017e27b762785d4c85be8adbc94ef707be1ad2c41531098518a12ddfdb6618d88acdc20a WHIRLPOOL 3626d10df97e6cb9eb941a946c5fb530e68b2903d169249b692e3c75e7bef4f83c71164cfeb44649ec7cb23caca3a408b3cb1df82577b86a490d743228e57e9e +MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968 diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch new file mode 100644 index 000000000000..158357dc4855 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0001-Respect-LDFLAGS.patch @@ -0,0 +1,36 @@ +From 139912e0cf5d9714e5e1fe4576d01251491701f5 Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Mon, 1 Nov 2010 08:36:17 -0400 +Subject: [PATCH 1/3] Respect LDFLAGS + +Instead of using a non-standard varible name like LFLAGS, using LDFLAGS +lets this play nice with Gentoo's build system. +--- + Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index b8cf927..02ca376 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ INSTALL=install -c -m 755 + + CFLAGS += -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) $(IMLIB_LIB) +-LFLAGS += -shared ++LDFLAGS += -shared + + LOCALEDIR := $(DESTDIR)/usr/share/locale + PACKAGE ?= gkrellm-mailwatch +@@ -30,7 +30,7 @@ all: mailwatch.so + + mailwatch.so: $(OBJS) + (cd po && ${MAKE}) +- $(CC) $(CFLAGS) $(OBJS) -o mailwatch.so $(LFLAGS) $(LIBS) ++ $(CC) $(CFLAGS) $(OBJS) -o mailwatch.so $(LDFLAGS) $(LIBS) + + clean: + (cd po && ${MAKE} clean ) +-- +1.7.3.1 + diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch new file mode 100644 index 000000000000..7edff1c74990 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0002-Use-gkrellm_gkd_string_width.patch @@ -0,0 +1,29 @@ +From c9db9953296709ba3c86a7b0471fcd60469225ed Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Mon, 1 Nov 2010 08:43:17 -0400 +Subject: [PATCH 2/3] Use gkrellm_gkd_string_width + +This wrapper is designed to transition from GdkFont to +PangoFontDescription. Without it, there is a warning and a probable +runtime crash, as we are feeding the wrong structure into +'gdk_string_width'. +--- + mailwatch.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/mailwatch.c b/mailwatch.c +index 3f0f0a2..5cca01e 100644 +--- a/mailwatch.c ++++ b/mailwatch.c +@@ -608,7 +608,7 @@ update_plugin(void) { + + p->statstext->x_off = + gkrellm_chart_width() - +- gdk_string_width(p->panel->textstyle->font, ++ gkrellm_gdk_string_width(p->panel->textstyle->font, + buf) - + 2 * gkrellm_get_style_margins(p->panel->style)->left; + +-- +1.7.3.1 + diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch new file mode 100644 index 000000000000..5cc76c6fc828 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch @@ -0,0 +1,41 @@ +From 873186988c7b7cbde50d1f44ad0e745ddadf0e18 Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Mon, 1 Nov 2010 08:44:17 -0400 +Subject: [PATCH 3/3] Remove a few more GCC warnings + +These are mostly harmless, but no harm in cleaning them up. +--- + mailwatch.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/mailwatch.c b/mailwatch.c +index 5cca01e..fcb77a8 100644 +--- a/mailwatch.c ++++ b/mailwatch.c +@@ -198,7 +198,7 @@ check_mh(Mailbox * mbox) { + return TRUE; + + /* Check the unseen mail */ +- while (fgets(buf, sizeof(buf), f), !feof(f)) ++ while (fgets(buf, sizeof(buf), f) && !feof(f)) + if (!strncmp(buf, "unseen", sizeof("unseen") - 1)) { + found = 1; + break; +@@ -444,12 +444,13 @@ plug_expose_event(GtkWidget * widget, GdkEventExpose * event) { + static gint + button_release(GtkWidget * widget, GdkEventButton * ev, Mailpanel * panel) { + gchar *command; ++ int retcode; + + if (panel->command == NULL) + return FALSE; + command = malloc((strlen(panel->command) + 4) * sizeof(char)); + strcpy(command, panel->command); +- system(strcat(command, " &")); ++ retcode = system(strcat(command, " &")); + free(command); + return FALSE; + } +-- +1.7.3.1 + diff --git a/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch new file mode 100644 index 000000000000..828c9dd2d5f4 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/files/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch @@ -0,0 +1,28 @@ +From 68bd98eb4144ce1f784e9c7aee4735a3f668453e Mon Sep 17 00:00:00 2001 +From: Jim Ramsay +Date: Mon, 1 Nov 2010 10:11:30 -0400 +Subject: [PATCH 4/4] Do not force -O2 in CFLAGS + +Only uses -O2 if the user has not specified any CFLAGS in the +environment. +--- + Makefile | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 02ca376..c4ca35c 100644 +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,8 @@ GKRELLM_INCLUDE= -I/usr/local/include + + INSTALL=install -c -m 755 + +-CFLAGS += -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) ++CFLAGS ?= -O2 ++CFLAGS += -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) $(IMLIB_LIB) + LDFLAGS += -shared + +-- +1.7.3.1 + diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild new file mode 100644 index 000000000000..d46420e88244 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gkrellm-plugin toolchain-funcs + +DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes" +SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz" +HOMEPAGE="http://gkrellm.luon.net/mailwatch.php" + +SLOT="2" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" +IUSE="" + +PLUGIN_SO=mailwatch.so +S="${WORKDIR}/${PN}" + +RDEPEND="app-admin/gkrellm[X]" + +PATCHES=( + "${FILESDIR}"/2.4.3-0001-Respect-LDFLAGS.patch + "${FILESDIR}"/2.4.3-0002-Use-gkrellm_gkd_string_width.patch + "${FILESDIR}"/2.4.3-0003-Remove-a-few-more-GCC-warnings.patch + "${FILESDIR}"/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch +) + +src_compile() { + tc-export CC + default_src_compile +} diff --git a/x11-plugins/gkrellm-mailwatch/metadata.xml b/x11-plugins/gkrellm-mailwatch/metadata.xml new file mode 100644 index 000000000000..6f49eba8f496 --- /dev/null +++ b/x11-plugins/gkrellm-mailwatch/metadata.xml @@ -0,0 +1,5 @@ + + + + + -- cgit v1.2.3