Package: xsunpinyin Version: 2.0.3-2 Followup-For: Bug #647046 User: [email protected] Usertags: precise ubuntu-patch
This patch separates the flags out, by using Environment.MergeFlags instead of just assigning them to Environment's dictionary. -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise') Architecture: i386 (i686) Kernel: Linux 3.1.0-2-generic-pae (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru xsunpinyin-2.0.3/debian/patches/separate_ldflags.patch xsunpinyin-2.0.3/debian/patches/separate_ldflags.patch --- xsunpinyin-2.0.3/debian/patches/separate_ldflags.patch 1969-12-31 19:00:00.000000000 -0500 +++ xsunpinyin-2.0.3/debian/patches/separate_ldflags.patch 2011-11-22 11:01:01.000000000 -0500 @@ -0,0 +1,16 @@ +Description: Use MergeFlags to correctly handle multi-word variables +Author: Michael Terry <[email protected]> + +Index: xsunpinyin-2.0.3/SConstruct +=================================================================== +--- xsunpinyin-2.0.3.orig/SConstruct 2011-11-22 11:00:46.889491444 -0500 ++++ xsunpinyin-2.0.3/SConstruct 2011-11-22 11:00:59.173491573 -0500 +@@ -48,7 +48,7 @@ + for (x, y) in envvar: + if x in os.environ: + print 'Warning: you\'ve set %s in the environmental variable!' % x +- env[y] = os.environ[x] ++ env.MergeFlags(os.environ[x]) + + env = Environment(ENV=os.environ, + CFLAGS=cflags, CXXFLAGS=cflags, diff -Nru xsunpinyin-2.0.3/debian/patches/series xsunpinyin-2.0.3/debian/patches/series --- xsunpinyin-2.0.3/debian/patches/series 2011-02-23 09:06:15.000000000 -0500 +++ xsunpinyin-2.0.3/debian/patches/series 2011-11-22 10:47:09.000000000 -0500 @@ -1 +1,2 @@ append-os-environ-toenv.patch +separate_ldflags.patch
