[Lsb-messages] /var/www/bzr/lsb/4.1/t2c-desktop-tests r83: Use a default value for XDG_DATA_HOME if not set (FcConfig, bug 3663)

[Stew Benedict]

------------------------------------------------------------
revno: 83
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: t2c-desktop-tests
timestamp: Thu 2013-02-07 07:47:19 -0500
message:
  Use a default value for XDG_DATA_HOME if not set (FcConfig, bug 3663)
modified:
  desktop-t2c/fontconfig-t2c/src/FcConfig/FcConfig.t2c
  desktop-t2c/package/Makefile
-------------- next part --------------
=== modified file 'desktop-t2c/fontconfig-t2c/src/FcConfig/FcConfig.t2c'
--- a/desktop-t2c/fontconfig-t2c/src/FcConfig/FcConfig.t2c	2013-02-06 15:27:40 +0000
+++ b/desktop-t2c/fontconfig-t2c/src/FcConfig/FcConfig.t2c	2013-02-07 12:47:19 +0000
@@ -35,6 +35,7 @@
 #define _HOME           "HOME"
 #define	HOME_ENV		getenv (_HOME)
 #define XDG_DIR         getenv("XDG_DATA_HOME")
+#define XDG_DEFAULT     "/.local/share/"
 #define SLASH           "/"
 #define HEXADECIMAL     16
 #define MAX_BLANKS      66000
@@ -309,8 +310,18 @@
                 // xdg style entries have no leading '/'
                 if (strncmp((char *)ss, SLASH, 1) != 0)
                 {
-                    strcat ((char *)str1, HOME_ENV);
-                    strcat ((char *)str1, XDG_DIR);
+                    if (XDG_DIR != NULL)
+                    {
+                        if (strlen(XDG_DIR) != 0)
+                        {
+                            strcat ((char *)str1, XDG_DIR);
+                        }
+                    }
+                    else
+                    {
+                        strcat ((char *)str1, HOME_ENV);
+                        strcat ((char *)str1, XDG_DEFAULT);
+                    }
                 }
                 strcat ((char *)str1, (char *)ss);
                 free (ss);
@@ -696,8 +707,18 @@
                 // xdg style entries have no leading '/'
                 if (strncmp((char *)ss, SLASH, 1) != 0)
                 {
-                    strcat ((char *)str1, HOME_ENV);
-                    strcat ((char *)str1, XDG_DIR);
+                    if (XDG_DIR != NULL)
+                    {
+                        if (strlen(XDG_DIR) != 0)
+                        {
+                            strcat ((char *)str1, XDG_DIR);
+                        }
+                    }
+                    else
+                    {
+                        strcat ((char *)str1, HOME_ENV);
+                        strcat ((char *)str1, XDG_DEFAULT);
+                    }
                 }
                 strcat ((char *)str1, (char *)ss);
                 free (ss);

=== modified file 'desktop-t2c/package/Makefile'
--- a/desktop-t2c/package/Makefile	2013-02-06 15:27:40 +0000
+++ b/desktop-t2c/package/Makefile	2013-02-07 12:47:19 +0000
@@ -1,6 +1,6 @@
 PACKAGE=lsb-test-desktop-t2c
 VERSION=4.1.3
-RELEASE=2
+RELEASE=3
 
 # Derive date string for daily snapshots
 ISO_DATE=$(shell date +"%Y%m%d")