Author: mvidner Date: Mon Feb 1 15:53:52 2010 New Revision: 60639 URL: http://svn.opensuse.org/viewcvs/yast?rev=60639&view=rev Log: Backported from trunk to allow compiling the old code on 11.2: * Fixed char* constness for glibc-2.10 (r57367). * Fixed makefiles to work with "install" calls changed via automake-1.11 (r57509) Modified: branches/SuSE-Code-11-SP1-Branch/core/ (props changed) branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/src/y2log.cc branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/Makefile.am branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/ycp/Makefile.am branches/SuSE-Code-11-SP1-Branch/core/libycp/src/StaticDeclaration.cc branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes branches/SuSE-Code-11-SP1-Branch/core/wfm/doc/Makefile.am Modified: branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/src/y2log.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/l... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/src/y2log.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/core/liby2util-r/src/y2log.cc Mon Feb 1 15:53:52 2010 @@ -199,10 +199,10 @@ /* Prepare the file, strip rooted path */ if(*file == '/') // rooted path { - char *slashptr = strrchr (file, '/'); + const char *slashptr = strrchr (file, '/'); if (slashptr > file) // last slash is second slash { - char *slashptr2 = slashptr-1; + const char *slashptr2 = slashptr-1; // find last but one slash Modified: branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/l... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/Makefile.am Mon Feb 1 15:53:52 2010 @@ -10,7 +10,7 @@ xmlfiles = combined.xml # needed for building the overall documentation xmlfilesseparated := $(foreach xml,$(builtinxml),$(notdir $(xml))) -htmlfiles = $(wildcard html/*.html html/*/*.html) +htmlfiles = $(filter-out html/index.html,$(wildcard html/*.html html/*/*.html)) html_DATA = \ Modified: branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/l... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/ycp/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/core/libycp/doc/ycp/Makefile.am Mon Feb 1 15:53:52 2010 @@ -15,7 +15,7 @@ html/index.html: ycp.xml customize-html.xsl $(XSLTPROC) $(XSLTPROC_FLAGS) customize-html.xsl ycp.xml -html_DATA = $(wildcard html/*) +html_DATA = $(wildcard html/*.*) EXTRA_DIST = *.xml $(html_DATA) Modified: branches/SuSE-Code-11-SP1-Branch/core/libycp/src/StaticDeclaration.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/l... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/libycp/src/StaticDeclaration.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/core/libycp/src/StaticDeclaration.cc Mon Feb 1 15:53:52 2010 @@ -282,7 +282,8 @@ #endif // split the name by the namespace - char *next = strstr (name, "::"); + char *next = const_cast<char *>(strstr (name, "::")); + // cast away const because of the (temporary) '\0' below #if DO_DEBUG y2debug( "Next is %p", next ); Modified: branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/p... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/core/package/yast2-core.changes Mon Feb 1 15:53:52 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Feb 1 15:50:51 CET 2010 - mvidner@suse.cz + +- Backported from trunk to allow compiling the old code on 11.2: + * Fixed char* constness for glibc-2.10 (r57367). + * Fixed makefiles to work with "install" calls changed via + automake-1.11 (r57509) + +------------------------------------------------------------------- Fri Oct 2 14:31:32 CEST 2009 - lslezak@suse.cz - backported tty_wrapper fixes from TRUNK (bnc#470645) Modified: branches/SuSE-Code-11-SP1-Branch/core/wfm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/core/w... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/core/wfm/doc/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/core/wfm/doc/Makefile.am Mon Feb 1 15:53:52 2010 @@ -4,7 +4,7 @@ htmldir = $(yastdocdir)/ycp/WFM -htmlfiles = $(wildcard html/*.html) +htmlfiles = $(filter-out html/index.html,$(wildcard html/*.html)) builtin = $(srcdir)/../src/Y2WFMComponent.cc builtinxml := $(builtin:%.cc=%.xml) xmlfiles := $(foreach xml,$(builtinxml),$(notdir $(xml))) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org