Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/texlive/2010/texlive-core: 030_all_installedscripts.patch 050_all_icu_arm.patch series
Date: Sat, 30 Oct 2010 18:37:29
Message-Id: 20101030183719.182A120051@flycatcher.gentoo.org
1 aballier 10/10/30 18:37:19
2
3 Modified: 030_all_installedscripts.patch series
4 Added: 050_all_icu_arm.patch
5 Log:
6 Add patch fixing build on arm, bug #343351
7
8 Revision Changes Path
9 1.5 src/patchsets/texlive/2010/texlive-core/030_all_installedscripts.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/030_all_installedscripts.patch?rev=1.5&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/030_all_installedscripts.patch?rev=1.5&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/030_all_installedscripts.patch?r1=1.4&r2=1.5
14
15 Index: 030_all_installedscripts.patch
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2010/texlive-core/030_all_installedscripts.patch,v
18 retrieving revision 1.4
19 retrieving revision 1.5
20 diff -u -r1.4 -r1.5
21 --- 030_all_installedscripts.patch 11 Oct 2010 20:17:11 -0000 1.4
22 +++ 030_all_installedscripts.patch 30 Oct 2010 18:37:19 -0000 1.5
23 @@ -2,7 +2,7 @@
24 ===================================================================
25 --- texlive-20100722-source.orig/texk/texlive/linked_scripts/Makefile.in
26 +++ texlive-20100722-source/texk/texlive/linked_scripts/Makefile.in
27 -@@ -162,86 +162,33 @@ bin_SCRIPTS =
28 +@@ -162,86 +162,32 @@ bin_SCRIPTS =
29 # dangling symlinks produced by `make install'.
30 # The instances in texmf* are the masters (except when it is CTAN).
31 #
32 @@ -23,7 +23,7 @@
33 - accfonts/mkt1font \
34 - accfonts/vpl2ovp \
35 - accfonts/vpl2vpl \
36 - authorindex/authorindex \
37 +- authorindex/authorindex \
38 - bengali/ebong.py \
39 - bibexport/bibexport.sh \
40 bundledoc/arlatex \
41 @@ -91,7 +91,7 @@
42
43
44 # Symlinks within $(bindir): FILE:LINK indicates LINK->FILE
45 -@@ -577,8 +524,8 @@ uninstall-am: uninstall-binSCRIPTS unins
46 +@@ -577,8 +523,8 @@ uninstall-am: uninstall-binSCRIPTS unins
47 #
48 install-data-hook:
49 case "$(bindir)" in \
50
51
52
53 1.2 src/patchsets/texlive/2010/texlive-core/series
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/series?rev=1.2&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/series?rev=1.2&content-type=text/plain
57 diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/series?r1=1.1&r2=1.2
58
59 Index: series
60 ===================================================================
61 RCS file: /var/cvsroot/gentoo/src/patchsets/texlive/2010/texlive-core/series,v
62 retrieving revision 1.1
63 retrieving revision 1.2
64 diff -u -r1.1 -r1.2
65 --- series 11 Oct 2010 14:33:01 -0000 1.1
66 +++ series 30 Oct 2010 18:37:19 -0000 1.2
67 @@ -1,2 +1,3 @@
68 030_all_installedscripts.patch
69 040_all_texmfdirs.patch
70 +050_all_icu_arm.patch
71
72
73
74 1.1 src/patchsets/texlive/2010/texlive-core/050_all_icu_arm.patch
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/050_all_icu_arm.patch?rev=1.1&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/texlive/2010/texlive-core/050_all_icu_arm.patch?rev=1.1&content-type=text/plain
78
79 Index: 050_all_icu_arm.patch
80 ===================================================================
81 Fixes build on arm.
82
83 Grabbed from the ICU patch:
84 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/icu/files/icu-4.4.1-arm.patch?revision=1.1
85
86 https://bugs.gentoo.org/show_bug.cgi?id=343351
87
88
89 Index: texlive-20100722-source/libs/icu/icu-4.4/tools/toolutil/pkg_genc.c
90 ===================================================================
91 --- texlive-20100722-source.orig/libs/icu/icu-4.4/tools/toolutil/pkg_genc.c
92 +++ texlive-20100722-source/libs/icu/icu-4.4/tools/toolutil/pkg_genc.c
93 @@ -1,5 +1,5 @@
94 /******************************************************************************
95 - * Copyright (C) 2009, International Business Machines
96 + * Copyright (C) 2009-2010, International Business Machines
97 * Corporation and others. All Rights Reserved.
98 *******************************************************************************
99 */
100 @@ -118,10 +118,10 @@ static const struct AssemblyType {
101 } assemblyHeader[] = {
102 {"gcc",
103 ".globl %s\n"
104 - "\t.section .note.GNU-stack,\"\",@progbits\n"
105 + "\t.section .note.GNU-stack,\"\",%%progbits\n"
106 "\t.section .rodata\n"
107 "\t.align 8\n" /* Either align 8 bytes or 2^8 (256) bytes. 8 bytes is needed. */
108 - "\t.type %s,@object\n"
109 + "\t.type %s,%%object\n"
110 "%s:\n\n",
111
112 ".long ","",HEX_0X