[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: [PATCH] two patches for 114771
From:       Stefan Teleman <steleman () nyc ! rr ! com>
Date:       2005-11-23 13:22:51
Message-ID: 200511230822.51916.steleman () nyc ! rr ! com
[Download RAW message or body]

On Wednesday 23 November 2005 08:14, Stefan Teleman wrote:
> hi.
>
> here are two patches based on 3.5rc1 (attached) for bug 114771.
>
> --Stefan

whoops.

--Stefan

-- 
Stefan Teleman          'Nobody Expects the Spanish Inquisition'
steleman@nyc.rr.com                          -Monty Python

["ktimezones.cpp.diff" (text/x-diff)]

--- ktimezones.cpp.kde.orig	2005-10-10 11:06:02.000000000 -0400
+++ ktimezones.cpp	2005-11-22 23:49:33.850938000 -0500
@@ -376,13 +376,22 @@
     if (!f.open(IO_ReadOnly))
     {
         kdDebug() << "Can't open " << f.name() << endl;
+#if defined(SOLARIS) || defined(USE_SOLARIS)
+        m_zoneinfoDir = "/usr/share/lib/zoneinfo";
+        f.setName(m_zoneinfoDir + "/tab/zone_sun.tab");
+#else
         m_zoneinfoDir = "/usr/lib/zoneinfo";
         f.setName(m_zoneinfoDir + "/zone.tab");
+#endif
         if (!f.open(IO_ReadOnly))
         {
             kdDebug() << "Can't open " << f.name() << endl;
             m_zoneinfoDir = ::getenv("TZDIR");
+#if defined(SOLARIS) || defined(USE_SOLARIS)
+            f.setName(m_zoneinfoDir + "/tab/zone_sun.tab");
+#else
             f.setName(m_zoneinfoDir + "/zone.tab");
+#endif
             if (m_zoneinfoDir.isEmpty() || !f.open(IO_ReadOnly))
             {
                 kdDebug() << "Can't open " << f.name() << endl;
@@ -396,8 +405,7 @@
                 m_zoneinfoDir = "/usr/share/lib/zoneinfo";
                 KTempFile temp;
                 KShellProcess reader;
-                reader << "/bin/grep" << "-h" << "^Zone" << m_zoneinfoDir << \
                "/src/*" << temp.name() << "|" <<
-                    "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'";
+                reader << "/usr/bin/egrep" << " -h" << " \"^Zone\" " << \
m_zoneinfoDir << "/src/* " << " | " << "/usr/bin/nawk " << "'{ print \
                \"??\\t+9999+99999\\t\" $2 }' > " << temp.name();
                 // Note the use of blocking here...it is a trivial amount of data!
                 temp.close();
                 reader.start(KProcess::Block);



[prev in list] [next in list] [prev in thread] [next in thread]