[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                          |    3 -
 patches/dev300/postset-add-ro.diff            |    4 +-
 patches/dev300/soltools-mkdepend-getline.diff |   42 --------------------------
 3 files changed, 2 insertions(+), 47 deletions(-)

New commits:
commit 5bc60e1d42c34d36fe36f83d26c8581cf6c75b9e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 13:28:50 2009 +0300

    getline() has been renamed in upstream also
    
    * patches/dev300/soltools-mkdepend-getline.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 59dba6d..f18031d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -982,9 +982,6 @@ ucb-neon-0.24.diff, pmladek
 # add ro
 postset-add-ro.diff
 
-# rename getline() to avoid conflict with glibc-2.10.1 and above
-soltools-mkdepend-getline.diff, aradke
-
 # localize fails with duplicated symlinks
 transex3-localize-find.diff, i#102296, pmladek
 
diff --git a/patches/dev300/soltools-mkdepend-getline.diff b/patches/dev300/soltools-mkdepend-getline.diff
deleted file mode 100644
index 9fed114..0000000
--- a/patches/dev300/soltools-mkdepend-getline.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
-+++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
-@@ -154,7 +154,7 @@
- 
- char			*copy();
- char			*base_name();
--char			*getline();
-+char			*ooo_getline();
- char			*isdefined();
- struct filepointer	*getfile();
- struct inclist		*newinclude();
---- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
-+++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
-@@ -548,7 +548,7 @@
-  * Get the next line.  We only return lines beginning with '#' since that
-  * is all this program is ever interested in.
-  */
--char *getline(filep)
-+char *ooo_getline(filep)
- 	register struct filepointer	*filep;
- {
- 	register char	*p,	/* walking pointer */
---- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
-+++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
-@@ -45,7 +45,7 @@
- 	register int	type;
- 	boolean recfailOK;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
- 		case IF:
- 		doif:
-@@ -168,7 +168,7 @@
- 	register char	*line;
- 	register int	type;
- 
--	while ((line = getline(filep))) {
-+	while ((line = ooo_getline(filep))) {
- 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
- 		case IF:
- 		case IFFALSE:
commit 0dfda529f6e07e2519d84ecf01b49d09b9ca1af8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 11 13:24:23 2009 +0300

    Adapt postset-add-ro.diff for dev300-m54.
    
    * patches/dev300/postset-add-ro.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/postset-add-ro.diff b/patches/dev300/postset-add-ro.diff
index 139790d..341fcf3 100644
--- a/patches/dev300/postset-add-ro.diff
+++ b/patches/dev300/postset-add-ro.diff
@@ -4,7 +4,7 @@
  defaultlangiso=en-US
  
  # Complete list of all supported ISO codes
--completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu-IN he hi-IN hr hu it ja ka kk km kn-IN ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
-+completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu-IN he hi-IN hr hu it ja ka kk km kn-IN ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ro ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
+-completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
++completelangiso=af ar as-IN be-BY bg br brx bn bn-BD bn-IN bs by ca cs cy da de dgo dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gd gl gu gu-IN he hi-IN hr hu it ja ka kk km kn ko kok ks ku lo lt lv mai mk mn mni ms ml-IN mr-IN my ne nb nl nn nr ns oc or-IN pa-IN pl pt pt-BR ro ru rw sat sa-IN sc sd sk sl sh sr ss st sv sw sw-TZ te-IN ti-ER ta-IN th tn tr ts tg ur-IN uk uz ve vi xh zh-CN zh-TW zu
  
  alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))