| 1 |
loki_val 08/06/29 13:19:24 |
| 2 |
|
| 3 |
Modified: lavaps-2.7-this-makes-it-compile.patch |
| 4 |
lavaps-2.7-build-fixes.patch |
| 5 |
Log: |
| 6 |
Build-only fixes to avoid makefile patching, acinclude patching, and sundry other ways people have abused this package over the years. Fixes bug #226845. |
| 7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: lavaps-2.7-this-makes-it-compile.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-this-makes-it-compile.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- lavaps-2.7-this-makes-it-compile.patch 23 Jun 2005 20:45:32 -0000 1.1 |
| 23 |
+++ lavaps-2.7-this-makes-it-compile.patch 29 Jun 2008 13:19:23 -0000 1.2 |
| 24 |
@@ -14,24 +14,6 @@ |
| 25 |
- rm lavaps.pod |
| 26 |
+ rm -f lavaps.pod |
| 27 |
|
| 28 |
-diff -ur lavaps-2.7/doc/Makefile.in lavaps-2.7.fixed/doc/Makefile.in |
| 29 |
---- lavaps-2.7/doc/Makefile.in 2004-12-25 03:42:02.000000000 +0100 |
| 30 |
-+++ lavaps-2.7.fixed/doc/Makefile.in 2005-06-23 08:36:29.000000000 +0200 |
| 31 |
-@@ -573,12 +573,12 @@ |
| 32 |
- lavaps.1: master.pod |
| 33 |
- $(PERL) podprune $(MANUAL_NON_SECTIONS) <master.pod >lavaps.pod |
| 34 |
- $(POD2MAN) --section=1 --release="lavaps-@VERSION@" --center="Lavaps Documentation" lavaps.pod >lavaps.1 |
| 35 |
-- rm lavaps.pod |
| 36 |
-+ rm -f lavaps.pod |
| 37 |
- |
| 38 |
- lavaps_man.html: master.pod |
| 39 |
- $(PERL) podprune $(MANUAL_NON_SECTIONS) <master.pod >lavaps.pod |
| 40 |
- $(POD2HTML) --title "lavaps-@VERSION@ manual page" lavaps.pod >lavaps_man.html |
| 41 |
-- rm lavaps.pod |
| 42 |
-+ rm -f lavaps.pod |
| 43 |
- # Tell versions [3.59,3.63) of GNU make to not export all variables. |
| 44 |
- # Otherwise a system limit (for SysV at least) may be exceeded. |
| 45 |
- .NOEXPORT: |
| 46 |
diff -ur lavaps-2.7/src/linux/proc/devname.c lavaps-2.7.fixed/src/linux/proc/devname.c |
| 47 |
--- lavaps-2.7/src/linux/proc/devname.c 2004-12-17 18:34:44.000000000 +0100 |
| 48 |
+++ lavaps-2.7.fixed/src/linux/proc/devname.c 2005-06-23 08:37:00.000000000 +0200 |
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.2 x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch?rev=1.2&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch?rev=1.2&content-type=text/plain |
| 56 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch?r1=1.1&r2=1.2 |
| 57 |
|
| 58 |
Index: lavaps-2.7-build-fixes.patch |
| 59 |
=================================================================== |
| 60 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/lavaps/files/lavaps-2.7-build-fixes.patch,v |
| 61 |
retrieving revision 1.1 |
| 62 |
retrieving revision 1.2 |
| 63 |
diff -u -r1.1 -r1.2 |
| 64 |
--- lavaps-2.7-build-fixes.patch 8 Mar 2008 19:54:29 -0000 1.1 |
| 65 |
+++ lavaps-2.7-build-fixes.patch 29 Jun 2008 13:19:23 -0000 1.2 |
| 66 |
@@ -32,41 +32,3 @@ |
| 67 |
char *wchan(unsigned long); |
| 68 |
char *find_func(unsigned long address); |
| 69 |
void *xcalloc(void *pointer, int size); |
| 70 |
---- lavaps-2.7.orig/acinclude.m4 |
| 71 |
-+++ lavaps-2.7/acinclude.m4 |
| 72 |
-@@ -1556,7 +1556,7 @@ |
| 73 |
- ], [])[extern int _nl_msg_cat_cntr; |
| 74 |
- extern int *_nl_domain_bindings;], |
| 75 |
- [bindtextdomain ("", ""); |
| 76 |
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], |
| 77 |
-+return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], |
| 78 |
- gt_cv_func_gnugettext_libc=yes, |
| 79 |
- gt_cv_func_gnugettext_libc=no)]) |
| 80 |
- |
| 81 |
-@@ -1592,7 +1592,7 @@ |
| 82 |
- #endif |
| 83 |
- const char *_nl_expand_alias ();], |
| 84 |
- [bindtextdomain ("", ""); |
| 85 |
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], |
| 86 |
-+return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], |
| 87 |
- gt_cv_func_gnugettext_libintl=yes, |
| 88 |
- gt_cv_func_gnugettext_libintl=no) |
| 89 |
- dnl Now see whether libintl exists and depends on libiconv. |
| 90 |
-@@ -1613,7 +1613,7 @@ |
| 91 |
- #endif |
| 92 |
- const char *_nl_expand_alias ();], |
| 93 |
- [bindtextdomain ("", ""); |
| 94 |
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], |
| 95 |
-+return (long) gettext ("")]ifelse([$2], [need-ngettext], [ + (long) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], |
| 96 |
- [LIBINTL="$LIBINTL $LIBICONV" |
| 97 |
- LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
| 98 |
- gt_cv_func_gnugettext_libintl=yes |
| 99 |
-@@ -2077,7 +2077,7 @@ |
| 100 |
- [AC_TRY_LINK([ |
| 101 |
- #include <libintl.h> |
| 102 |
- ], |
| 103 |
-- [return (int) dgettext ("","")], |
| 104 |
-+ [return (long) dgettext ("","")], |
| 105 |
- gt_cv_func_dgettext_libc=yes, |
| 106 |
- gt_cv_func_dgettext_libc=no) |
| 107 |
- ]) |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
-- |
| 112 |
gentoo-commits@l.g.o mailing list |
Archives