commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Mon Jun 28 10:13:42 CEST 2010. -------- --- xorg-x11/xorg-x11.changes 2010-06-19 14:39:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2010-06-25 14:30:02.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jun 25 14:17:05 CEST 2010 - sndirsch@suse.de + +- xrdb-traditional-cpp.diff + * run cpp with option "-traditional-cpp" to fix multiline X + resources (bnc #615036) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xrdb-traditional-cpp.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.x2Q3yV/_old 2010-06-28 10:12:26.000000000 +0200 +++ /var/tmp/diff_new_pack.x2Q3yV/_new 2010-06-28 10:12:26.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 10 +Release: 11 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -161,6 +161,7 @@ Patch66: xinit-suse.diff Patch67: xinit-tolerant-hostname-changes.diff Patch68: xrdb.diff +Patch69: xrdb-traditional-cpp.diff %description This package contains the X.Org core and sample applications. @@ -288,6 +289,7 @@ patch -d xinit-* -p1 -s < %PATCH66 patch -d xinit-* -p1 -s < %PATCH67 patch -d xrdb-* -p2 -s < %PATCH68 +patch -d xrdb-* -p0 -s < %PATCH69 %build ++++++ xrdb-traditional-cpp.diff ++++++ --- xrdb.c.orig 2010-06-25 12:46:40.000000000 +0200 +++ xrdb.c 2010-06-25 14:13:12.000000000 +0200 @@ -142,6 +142,7 @@ static Display *dpy; static Buffer buffer; static Entries newDB; +static int cpp_option_in_use=0; static void fatal(char *, ...); static void addstring ( String *arg, const char *s ); @@ -807,6 +808,7 @@ } else if (isabbreviation ("-cpp", arg, 2)) { if (++i >= argc) Syntax (); cpp_program = argv[i]; + cpp_option_in_use=1; continue; } else if (!strcmp ("-n", arg)) { dont_execute = True; @@ -1166,12 +1168,17 @@ fclose(input); (void) mktemp(tmpname3); if((cmd = (char *) - malloc(strlen(cpp_program) + strlen(includes.val) + + malloc(strlen(cpp_program) + strlen(includes.val) + strlen(" -traditional-cpp ") + 1 + strlen(tmpname2) + 3 + strlen(tmpname3) + 1)) == NULL) fatal("%s: Out of memory\n", ProgramName); - sprintf(cmd, "%s%s %s > %s", cpp_program, includes.val, + if (cpp_option_in_use)) { + sprintf(cmd, "%s%s %s > %s", cpp_program, includes.val, tmpname2, tmpname3); + } else { + sprintf(cmd, "%s -traditional-cpp %s %s > %s", cpp_program, includes.val, + tmpname2, tmpname3); + } if (system(cmd) < 0) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); @@ -1185,10 +1192,14 @@ fflush(stdin); fseek(stdin, 0, 0); if((cmd = (char *) - malloc(strlen(cpp_program) + strlen(includes.val) + 1)) == + malloc(strlen(cpp_program) + strlen(" -traditional-cpp ") + strlen(includes.val) + 1)) == NULL) fatal("%s: Out of memory\n", ProgramName); - sprintf(cmd, "%s%s", cpp_program, includes.val); + if (cpp_option_in_use) { + sprintf(cmd, "%s%s", cpp_program, includes.val); + } else { + sprintf(cmd, "%s -traditional-cpp %s", cpp_program, includes.val); + } if (!(input = popen(cmd, "r"))) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); @@ -1203,15 +1214,21 @@ #ifdef WIN32 (void) mktemp(tmpname3); if((cmd = (char *) - malloc(strlen(cpp_program) + strlen(includes.val) + + malloc(strlen(cpp_program) + strlen(" -traditional-cpp ") + strlen(includes.val) + 1 + strlen(defines.val) + 1 + strlen(filename ? filename : "") + 3 + strlen(tmpname3) + 1)) == NULL) fatal("%s: Out of memory\n", ProgramName); - sprintf(cmd, "%s%s %s %s > %s", cpp_program, - includes.val, defines.val, - filename ? filename : "", tmpname3); + if (cpp_option_in_use) { + sprintf(cmd, "%s%s %s %s > %s", cpp_program, + includes.val, defines.val, + filename ? filename : "", tmpname3); + } else { + sprintf(cmd, "%s -traditional-cpp %s %s %s > %s", cpp_program, + includes.val, defines.val, + filename ? filename : "", tmpname3); + } if (system(cmd) < 0) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); @@ -1219,14 +1236,20 @@ fatal("%s: can't open file '%s'\n", ProgramName, tmpname3); #else if((cmd = (char *) - malloc(strlen(cpp_program) + strlen(includes.val) + 1 + + malloc(strlen(cpp_program) + strlen(" -traditional-cpp ") + strlen(includes.val) + 1 + strlen(defines.val) + 1 + strlen(filename ? filename : "") + 1)) == NULL) fatal("%s: Out of memory\n", ProgramName); - sprintf(cmd, "%s%s %s %s", cpp_program, - includes.val, defines.val, - filename ? filename : ""); + if (cpp_option_in_use) { + sprintf(cmd, "%s%s %s %s", cpp_program, + includes.val, defines.val, + filename ? filename : ""); + } else { + sprintf(cmd, "%s -traditional-cpp %s %s %s", cpp_program, + includes.val, defines.val, + filename ? filename : ""); + } if (!(input = popen(cmd, "r"))) fatal("%s: cannot run '%s'\n", ProgramName, cmd); free(cmd); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de