From: Jim Ramsay Date: Wed, 21 Feb 2007 15:27:16 +0000 (+0000) Subject: Added patch to fix TEXTREL problem and GTK warnings (bug 45650) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7254abaf0332a994c767360259217b2c0d4f46aa;p=gentoo.git Added patch to fix TEXTREL problem and GTK warnings (bug 45650) Package-Manager: portage-2.1.2-r10 --- diff --git a/x11-plugins/gkrellm-vaiobright/ChangeLog b/x11-plugins/gkrellm-vaiobright/ChangeLog index 66f7d8bd852b..b97b571f8e09 100644 --- a/x11-plugins/gkrellm-vaiobright/ChangeLog +++ b/x11-plugins/gkrellm-vaiobright/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-plugins/gkrellm-vaiobright # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/ChangeLog,v 1.4 2007/02/05 00:51:45 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/ChangeLog,v 1.5 2007/02/21 15:27:16 lack Exp $ + +*gkrellm-vaiobright-2.5-r1 (21 Feb 2007) + + 21 Feb 2007; Jim Ramsay + +files/gkrellm-vaiobright-2.5-fixinfo.patch, + +files/gkrellm-vaiobright-2.5-textrel.patch, +metadata.xml, + +gkrellm-vaiobright-2.5-r1.ebuild: + Added patch to fix TEXTREL problem and GTK warnings (bug 45650) 05 Feb 2007; Diego Pettenò ChangeLog: Regenerate digest in Manifest2 format. diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest index b22bc8813f00..ea9fad53d675 100644 --- a/x11-plugins/gkrellm-vaiobright/Manifest +++ b/x11-plugins/gkrellm-vaiobright/Manifest @@ -1,22 +1,31 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX gkrellm-vaiobright-2.5-fixinfo.patch 1774 RMD160 82156355ba9fcb1faba2d64757cae973296255e6 SHA1 2fdf46fec93b5951e0732f7748942a0b15abdc79 SHA256 906bece1eb6e927081e10f7708c4b9d256b5f84437e42976718ed193ac83b5ec +MD5 b2188ae334f201f026273f2aaf37aa14 files/gkrellm-vaiobright-2.5-fixinfo.patch 1774 +RMD160 82156355ba9fcb1faba2d64757cae973296255e6 files/gkrellm-vaiobright-2.5-fixinfo.patch 1774 +SHA256 906bece1eb6e927081e10f7708c4b9d256b5f84437e42976718ed193ac83b5ec files/gkrellm-vaiobright-2.5-fixinfo.patch 1774 +AUX gkrellm-vaiobright-2.5-textrel.patch 1053 RMD160 27697d50903b2ac3230f3eddcf3f34e0bae90dd5 SHA1 457fefa32db71d1df66e2c6f437f4ee479aeefaf SHA256 5aa8cf11af7830e99c08018b16db1d58bbd072f8f4964bb9dade2cd5b64c74cd +MD5 c64eebe522d2e5260b5a6bbab892bdc5 files/gkrellm-vaiobright-2.5-textrel.patch 1053 +RMD160 27697d50903b2ac3230f3eddcf3f34e0bae90dd5 files/gkrellm-vaiobright-2.5-textrel.patch 1053 +SHA256 5aa8cf11af7830e99c08018b16db1d58bbd072f8f4964bb9dade2cd5b64c74cd files/gkrellm-vaiobright-2.5-textrel.patch 1053 DIST vaiobright-2.5.tar.gz 6178 RMD160 e507f6cf02ba1cb4c276e0e9d074605d8359ac1e SHA1 564f5fb7338515523fbed210751387dc119b423e SHA256 de80a3d29d00a5230958e65488846bd959244a2b3be881883b349b9c9e20a0e4 +EBUILD gkrellm-vaiobright-2.5-r1.ebuild 891 RMD160 71307acc60f20e190020477c54304a49f96e32f8 SHA1 3721d43cfdaccf773cd85bddf8e15360920234e4 SHA256 747e8e1c64837afbd6ab1e4cc73299b35e554aecb695aabd7bf2045f7cdba371 +MD5 6d530df393bfdc70aba1a625ff2b0c64 gkrellm-vaiobright-2.5-r1.ebuild 891 +RMD160 71307acc60f20e190020477c54304a49f96e32f8 gkrellm-vaiobright-2.5-r1.ebuild 891 +SHA256 747e8e1c64837afbd6ab1e4cc73299b35e554aecb695aabd7bf2045f7cdba371 gkrellm-vaiobright-2.5-r1.ebuild 891 EBUILD gkrellm-vaiobright-2.5.ebuild 664 RMD160 214cc01c7f4a53fd06abebb9fc078f28d52e04c6 SHA1 5ad4ab30618a79480ae5b51d5d4ae5f81034f661 SHA256 ac11a002f87ca56bdee7357f5a2d2567288503ae0475665d5a3dfa763b335948 MD5 0b1f0168263ab2893bb51a82a929499f gkrellm-vaiobright-2.5.ebuild 664 RMD160 214cc01c7f4a53fd06abebb9fc078f28d52e04c6 gkrellm-vaiobright-2.5.ebuild 664 SHA256 ac11a002f87ca56bdee7357f5a2d2567288503ae0475665d5a3dfa763b335948 gkrellm-vaiobright-2.5.ebuild 664 -MISC ChangeLog 582 RMD160 eebba1a386c22ed6b49a623fa4a4318a6b751f25 SHA1 0248bf4554821206ace785d1bd7ca5f1c05c39b9 SHA256 237fed1e1272feca0f4b3bd01ec1ca9fb69ab93c9fc9459366176a04c4d087a2 -MD5 fc468d00f8dbd006a25f496c05a9b25e ChangeLog 582 -RMD160 eebba1a386c22ed6b49a623fa4a4318a6b751f25 ChangeLog 582 -SHA256 237fed1e1272feca0f4b3bd01ec1ca9fb69ab93c9fc9459366176a04c4d087a2 ChangeLog 582 +MISC ChangeLog 876 RMD160 ed8ad9cc48f6f7596c08f19232936bc42d488707 SHA1 26a1b57db74b034f99c3264d46b84b617bf608ce SHA256 37903380193319b116edf8a76b16c64b5e85a3fe471ea8f39a9cc04d99060694 +MD5 4c22e027b4833915269261f4f094c1aa ChangeLog 876 +RMD160 ed8ad9cc48f6f7596c08f19232936bc42d488707 ChangeLog 876 +SHA256 37903380193319b116edf8a76b16c64b5e85a3fe471ea8f39a9cc04d99060694 ChangeLog 876 +MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279 +MD5 599b71bb15dd853af7b7733ed80c5d79 metadata.xml 254 +RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c metadata.xml 254 +SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279 metadata.xml 254 MD5 a68d39740c800e26ab020de062d5adbb files/digest-gkrellm-vaiobright-2.5 238 RMD160 e246dde79af1cde409726e9a54cae34d1b62ced6 files/digest-gkrellm-vaiobright-2.5 238 SHA256 148a2f070e1fa9073815ab420383e7a00ee651a77937ae36cc6e20dec301bbb6 files/digest-gkrellm-vaiobright-2.5 238 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFxn+nAiZjviIA2XgRAtgrAKCFbl8UAR/dp/Xz4qRSSpuDvoZoDACePZ2o -6Aa2Qniqq1onssPTQ+dupLQ= -=hWcD ------END PGP SIGNATURE----- +MD5 a68d39740c800e26ab020de062d5adbb files/digest-gkrellm-vaiobright-2.5-r1 238 +RMD160 e246dde79af1cde409726e9a54cae34d1b62ced6 files/digest-gkrellm-vaiobright-2.5-r1 238 +SHA256 148a2f070e1fa9073815ab420383e7a00ee651a77937ae36cc6e20dec301bbb6 files/digest-gkrellm-vaiobright-2.5-r1 238 diff --git a/x11-plugins/gkrellm-vaiobright/files/digest-gkrellm-vaiobright-2.5-r1 b/x11-plugins/gkrellm-vaiobright/files/digest-gkrellm-vaiobright-2.5-r1 new file mode 100644 index 000000000000..1e3fd68a75cf --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/files/digest-gkrellm-vaiobright-2.5-r1 @@ -0,0 +1,3 @@ +MD5 b2ba070aaee9ccea37f775c6d5d102ed vaiobright-2.5.tar.gz 6178 +RMD160 e507f6cf02ba1cb4c276e0e9d074605d8359ac1e vaiobright-2.5.tar.gz 6178 +SHA256 de80a3d29d00a5230958e65488846bd959244a2b3be881883b349b9c9e20a0e4 vaiobright-2.5.tar.gz 6178 diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch new file mode 100644 index 000000000000..f2e4ac4c56e0 --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-fixinfo.patch @@ -0,0 +1,38 @@ +diff -ur vaiobright-2.5/readme vaiobright-2.5-infofix/readme +--- vaiobright-2.5/README 2004-03-20 13:58:13.000000000 -0500 ++++ vaiobright-2.5-infofix/README 2004-03-20 13:59:30.000000000 -0500 +@@ -28,6 +28,7 @@ + bright or max dark depending on the current value. + + Changelog: ++ Sat 20 Mar 2004 Fixed the "Info" tab (Billy Goto) + 2.5 Sun 20 Oct 2002 Removed need for external helper applications + entirely. SonyPI is now required, but no suid + or spicctrl binaries are needed. +diff -ur vaiobright-2.5/vaiobright.c vaiobright-2.5-infofix/vaiobright.c +--- vaiobright-2.5/vaiobright.c 2002-10-20 19:22:26.000000000 -0400 ++++ vaiobright-2.5-infofix/vaiobright.c 2004-03-20 12:55:38.000000000 -0500 +@@ -422,21 +422,9 @@ + (GtkSignalFunc) vaiobright_toggle_toggled, REVERSE_TOGGLE); + + /* Help tab */ +- frame = gtk_frame_new(NULL); +- gtk_container_border_width(GTK_CONTAINER(frame),3); +- scrolled = gtk_scrolled_window_new(NULL,NULL); +- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), +- GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); +- +- gtk_container_add(GTK_CONTAINER(frame),scrolled); +- label = gtk_label_new("Info"); +- gtk_notebook_append_page(GTK_NOTEBOOK(tabs),frame,label); +- +- text = gtk_text_view_new(); +- gtk_text_view_set_editable(GTK_TEXT_VIEW(text),FALSE); ++ vbox = gkrellm_gtk_framed_notebook_page(tabs,"Info"); ++ text = gkrellm_gtk_scrolled_text_view(vbox, NULL, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + vaiobright_create_help_text(text); +- gtk_container_add(GTK_CONTAINER(scrolled),text); +- + + /* About tab */ + plugin_about_text = g_strdup_printf( diff --git a/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch new file mode 100644 index 000000000000..4cdaa1dd4c8e --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/files/gkrellm-vaiobright-2.5-textrel.patch @@ -0,0 +1,38 @@ +--- vaiobright-2.5/Makefile.orig 2002-10-20 16:52:19.000000000 -0600 ++++ vaiobright-2.5/Makefile 2007-02-21 08:55:39.000000000 -0600 +@@ -1,10 +1,11 @@ + HOME = . + PREFIX = /usr +-CC = cc ++CC ?= cc + INCLUDE = -I./ -I${PREFIX}/include +-OPTS = -shared `pkg-config gtk+-2.0 --cflags` ++CFLAGS += -shared `pkg-config gtk+-2.0 --cflags` -fPIC ++LDFLAGS += -shared -fPIC + DEFINES = +-LIBS = `pkg-config gtk+-2.0 --cflags` ++LIBS = `pkg-config gtk+-2.0 --libs` + + GKVO = vaiobright.o + GKV = vaiobright.so +@@ -12,7 +13,7 @@ + all: $(GKV) + + $(GKV): $(GKVO) +- $(CC) $(OPTS) -o $(GKV) $(GKVO) $(LIBS) ++ $(CC) $(LDFLAGS) -o $(GKV) $(GKVO) $(LIBS) + + install: + @-echo "Copy the plugin ($(GKV) to ~/.gkrellm2/plugins/$(GKV) and restart gkrellm." +@@ -22,9 +23,9 @@ + @-rm *.o *.so + + .c.so: $(DEPEND) +- $(CC) $(OPTS) $(INCLUDE) $(DEFINES) -fPIC -c $*.c -o $@ ++ $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -fPIC -c $*.c -o $@ + + .c.o: $(DEPEND) +- $(CC) $(OPTS) $(INCLUDE) $(DEFINES) -c $*.c -o $@ ++ $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c $*.c -o $@ + + .SUFFIXES: .c .so .o diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r1.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r1.ebuild new file mode 100644 index 000000000000..2770cee992d7 --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r1.ebuild,v 1.1 2007/02/21 15:27:16 lack Exp $ + +inherit eutils + +IUSE="" + +MY_P=${P/gkrellm-/} +S=${WORKDIR}/${MY_P} +DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm" +SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz" +HOMEPAGE="http://nerv-un.net/~dragorn/" + +RDEPEND=">=app-admin/gkrellm-2.0" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +SLOT="2" +LICENSE="GPL-2" +KEYWORDS="~x86 -*" + +src_unpack() { + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}/${P}-textrel.patch" || die "Patch failed" + epatch "${FILESDIR}/${P}-fixinfo.patch" || die "Patch failed" +} + +src_compile() { + make || die +} + +src_install () { + insinto /usr/lib/gkrellm2/plugins + doins vaiobright.so + dodoc README +} diff --git a/x11-plugins/gkrellm-vaiobright/metadata.xml b/x11-plugins/gkrellm-vaiobright/metadata.xml new file mode 100644 index 000000000000..220d60947054 --- /dev/null +++ b/x11-plugins/gkrellm-vaiobright/metadata.xml @@ -0,0 +1,9 @@ + + + + desktop-dock + + lack@gentoo.org + Jim Ramsay + +