From: Bryan Østergaard Date: Tue, 10 Oct 2006 18:48:34 +0000 (+0000) Subject: Modular X + gcc-4.1 fixes. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3869a25ad8ab9ddd122c2c4a3db7ae0658cf416e;p=gentoo.git Modular X + gcc-4.1 fixes. Package-Manager: portage-2.1.2_pre2-r6 --- diff --git a/x11-plugins/asclock/ChangeLog b/x11-plugins/asclock/ChangeLog index 0aeed532da66..1878afe4f753 100644 --- a/x11-plugins/asclock/ChangeLog +++ b/x11-plugins/asclock/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/asclock -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.12 2006/01/02 10:53:52 s4t4n Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/ChangeLog,v 1.13 2006/10/10 18:48:34 kloeri Exp $ + +*asclock-2.0.12-r1 (10 Oct 2006) + + 10 Oct 2006; Bryan Østergaard + +files/asclock-gcc41.patch, +asclock-2.0.12-r1.ebuild: + Modular X + gcc-4.1 fixes. 02 Jan 2006; Michele Noberasco asclock-2.0.12.ebuild: removed COPYING and INSTALL from dodoc. diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest index b85fd1aa1173..35618070d130 100644 --- a/x11-plugins/asclock/Manifest +++ b/x11-plugins/asclock/Manifest @@ -1,4 +1,27 @@ -MD5 608c2b361f7166ebaa0fc09df717d33a ChangeLog 1514 +AUX asclock-gcc41.patch 1528 RMD160 9e9bd1640cb1f4335d5e10ee11b8232503f4418b SHA1 b8b998d3fb10dfb93717981be7a633abf3c1f99e SHA256 e5a7889a089da8a9c94dfc74f6bd40ac4cdcf82e59db1b4b356915cd96b66355 +MD5 90949058ced886ea0a486027966609a0 files/asclock-gcc41.patch 1528 +RMD160 9e9bd1640cb1f4335d5e10ee11b8232503f4418b files/asclock-gcc41.patch 1528 +SHA256 e5a7889a089da8a9c94dfc74f6bd40ac4cdcf82e59db1b4b356915cd96b66355 files/asclock-gcc41.patch 1528 +DIST asclock-2.0.12.tar.gz 111858 RMD160 c3673329c5bcf5be097abb770e861502e20f77ca SHA1 8527d7b013f6d55bdb49e6d6a08c2085d081b486 SHA256 70df9bd991bc707c0fdf76ea1acbeff5924e9ae0b0704feb46afa591030704e6 +EBUILD asclock-2.0.12-r1.ebuild 1511 RMD160 7309668ae313d0c88c1b1dc152a05b2da08d0c6e SHA1 0b0eca890af4ebc987fa5188f791db4237ce8ea6 SHA256 463e6e4663053dcf434ed5be054cf50241b026453f2b5f15a285ac5d3de5b98a +MD5 728529bab0579cb1a81f1f0f2984cf44 asclock-2.0.12-r1.ebuild 1511 +RMD160 7309668ae313d0c88c1b1dc152a05b2da08d0c6e asclock-2.0.12-r1.ebuild 1511 +SHA256 463e6e4663053dcf434ed5be054cf50241b026453f2b5f15a285ac5d3de5b98a asclock-2.0.12-r1.ebuild 1511 +EBUILD asclock-2.0.12.ebuild 1176 RMD160 06b94bf03bd946c41ff044fcf8cf713e7dc492f4 SHA1 8c4fcaa6a56847139afcc9001380460bdd3b7db8 SHA256 1ecfeab817d81282542ab9315e042426f08eaa8d12788c15c9a1ed00ae133ad6 MD5 b4b2cba889b04d3c81192bb46fb6e28b asclock-2.0.12.ebuild 1176 -MD5 ba94dc8581c7dcd9b2110d891f17dbb8 files/digest-asclock-2.0.12 66 +RMD160 06b94bf03bd946c41ff044fcf8cf713e7dc492f4 asclock-2.0.12.ebuild 1176 +SHA256 1ecfeab817d81282542ab9315e042426f08eaa8d12788c15c9a1ed00ae133ad6 asclock-2.0.12.ebuild 1176 +MISC ChangeLog 1689 RMD160 811ee3b4c90a6a9afdbb8c20b61b846793d7ccbe SHA1 4db5c4b2606c5cfb8259038ed02549c9443a7f8a SHA256 878ed6a7b892902a5338a33d1dc8f2435ab9c61989cbac89a387b81e6ebaadd2 +MD5 1e69a09711000976e1a384e308b83f3e ChangeLog 1689 +RMD160 811ee3b4c90a6a9afdbb8c20b61b846793d7ccbe ChangeLog 1689 +SHA256 878ed6a7b892902a5338a33d1dc8f2435ab9c61989cbac89a387b81e6ebaadd2 ChangeLog 1689 +MISC metadata.xml 163 RMD160 46208909b296ad228342e5181a46ef97a03129c7 SHA1 deae2be5c8bfd52bb2842f43b9dc83a8e9a222a6 SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163 +RMD160 46208909b296ad228342e5181a46ef97a03129c7 metadata.xml 163 +SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c metadata.xml 163 +MD5 dbbf50881ee472369a10df8f931b374b files/digest-asclock-2.0.12 244 +RMD160 7aba78ab47e8d474be140a3f2536c747579c6499 files/digest-asclock-2.0.12 244 +SHA256 1bb381c39ca1edb045706da7fb7c18295bb29ae8f25565bccb178e0a2f1cb1d3 files/digest-asclock-2.0.12 244 +MD5 dbbf50881ee472369a10df8f931b374b files/digest-asclock-2.0.12-r1 244 +RMD160 7aba78ab47e8d474be140a3f2536c747579c6499 files/digest-asclock-2.0.12-r1 244 +SHA256 1bb381c39ca1edb045706da7fb7c18295bb29ae8f25565bccb178e0a2f1cb1d3 files/digest-asclock-2.0.12-r1 244 diff --git a/x11-plugins/asclock/asclock-2.0.12-r1.ebuild b/x11-plugins/asclock/asclock-2.0.12-r1.ebuild new file mode 100644 index 000000000000..839066d7eb01 --- /dev/null +++ b/x11-plugins/asclock/asclock-2.0.12-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asclock/asclock-2.0.12-r1.ebuild,v 1.1 2006/10/10 18:48:34 kloeri Exp $ + +inherit eutils toolchain-funcs + +IUSE="" +DESCRIPTION="Clock applet for AfterStep" +SRC_URI="http://www.tigr.net/afterstep/download/asclock/${P}.tar.gz" +HOMEPAGE="http://www.tigr.net/afterstep/list.pl" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~mips" + +DEPEND="x11-libs/libXpm" +RDEPEND="${DEPEND} + x11-proto/xextproto + x11-proto/xproto" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-gcc41.patch + ln -s themes/classic default_theme +} + +src_compile() { + local x + for x in asclock parser symbols config + do + $(tc-getCC) \ + ${CFLAGS} \ + -I/usr/include \ + -Dlinux -D__i386__ \ + -D_POSIX_C_SOURCE=199309L \ + -D_POSIX_SOURCE \ + -D_XOPEN_SOURCE \ + -D_BSD_SOURCE \ + -D_SVID_SOURCE \ + -DFUNCPROTO=15 \ + -DNARROWPROTO \ + -c -o ${x}.o ${x}.c || die "compile failed" + done + $(tc-getCC) \ + ${CFLAGS} \ + -o asclock \ + asclock.o parser.o symbols.o config.o \ + -L/usr/lib \ + -L/usr/lib/X11 \ + -lXpm -lXext -lX11 || die "compile asclock failed" +} + +src_install() { + dobin asclock + local themesdir="/usr/share/${PN}/themes" + insinto ${themesdir} + doins -r themes/* + dodoc README README.THEMES TODO + cd ${D}/${themesdir} + rm -f Freeamp/Makefile{,.*} + ln -s classic default_theme +} diff --git a/x11-plugins/asclock/files/asclock-gcc41.patch b/x11-plugins/asclock/files/asclock-gcc41.patch new file mode 100644 index 000000000000..5a5291219ee5 --- /dev/null +++ b/x11-plugins/asclock/files/asclock-gcc41.patch @@ -0,0 +1,44 @@ +diff -ur asclock-2.0.12-orig/asclock.h asclock-2.0.12/asclock.h +--- asclock-2.0.12-orig/asclock.h 2006-06-03 15:31:58.000000000 -0400 ++++ asclock-2.0.12/asclock.h 2006-06-03 15:35:51.000000000 -0400 +@@ -38,15 +38,15 @@ + #define INT_TYPE 0; + + /* the xpm data */ +-extern char *clock_xpm[]; +-extern char *month_xpm[]; +-extern char *weekday_xpm[]; +-extern char *led_xpm[]; +-extern char *date_xpm[]; +-extern char *hour_xpm[]; +-extern char *minute_xpm[]; +-extern char *second_xpm[]; +-extern char *beats_xpm[]; ++static char *clock_xpm[]; ++static char *month_xpm[]; ++static char *weekday_xpm[]; ++static char *led_xpm[]; ++static char *date_xpm[]; ++static char *hour_xpm[]; ++static char *minute_xpm[]; ++static char *second_xpm[]; ++static char *beats_xpm[]; + + /* the filenames */ + extern char clock_xpm_fn[MAX_PATH_LEN]; +diff -ur asclock-2.0.12-orig/themes/classic/beats.xpm asclock-2.0.12/themes/classic/beats.xpm +--- asclock-2.0.12-orig/themes/classic/beats.xpm 2006-06-03 15:31:58.000000000 -0400 ++++ asclock-2.0.12/themes/classic/beats.xpm 2006-06-03 15:37:04.000000000 -0400 +@@ -1 +1 @@ +-char *beats_xpm[] = { NULL }; ++static char *beats_xpm[] = { NULL }; +diff -ur asclock-2.0.12-orig/themes/classic/led.xpm asclock-2.0.12/themes/classic/led.xpm +--- asclock-2.0.12-orig/themes/classic/led.xpm 2006-06-03 15:31:58.000000000 -0400 ++++ asclock-2.0.12/themes/classic/led.xpm 2006-06-03 15:36:53.000000000 -0400 +@@ -1,5 +1,5 @@ + /* XPM */ +-char * led_xpm[] = { ++static char * led_xpm[] = { + "135 11 3 1", + " c #282828", + "O c #00df00", diff --git a/x11-plugins/asclock/files/digest-asclock-2.0.12 b/x11-plugins/asclock/files/digest-asclock-2.0.12 index e3c7be5c5b9c..23ba1be22b1d 100644 --- a/x11-plugins/asclock/files/digest-asclock-2.0.12 +++ b/x11-plugins/asclock/files/digest-asclock-2.0.12 @@ -1 +1,3 @@ MD5 99cb6491358bb0044e9b75b2e06b043b asclock-2.0.12.tar.gz 111858 +RMD160 c3673329c5bcf5be097abb770e861502e20f77ca asclock-2.0.12.tar.gz 111858 +SHA256 70df9bd991bc707c0fdf76ea1acbeff5924e9ae0b0704feb46afa591030704e6 asclock-2.0.12.tar.gz 111858 diff --git a/x11-plugins/asclock/files/digest-asclock-2.0.12-r1 b/x11-plugins/asclock/files/digest-asclock-2.0.12-r1 new file mode 100644 index 000000000000..23ba1be22b1d --- /dev/null +++ b/x11-plugins/asclock/files/digest-asclock-2.0.12-r1 @@ -0,0 +1,3 @@ +MD5 99cb6491358bb0044e9b75b2e06b043b asclock-2.0.12.tar.gz 111858 +RMD160 c3673329c5bcf5be097abb770e861502e20f77ca asclock-2.0.12.tar.gz 111858 +SHA256 70df9bd991bc707c0fdf76ea1acbeff5924e9ae0b0704feb46afa591030704e6 asclock-2.0.12.tar.gz 111858