patches/kdelibs-06-ktimezones.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 856 14f4552ed11c
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
856
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     1
--- kdelibs-3.5.8/kdecore/ktimezones.cpp.orig	2008-02-01 21:21:57.109792234 +0530
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     2
+++ kdelibs-3.5.8/kdecore/ktimezones.cpp	2008-02-01 22:14:15.976351156 +0530
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     3
@@ -396,13 +396,13 @@
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     4
                 m_zoneinfoDir = "/usr/share/lib/zoneinfo";
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     5
                 KTempFile temp;
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     6
                 KShellProcess reader;
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     7
-                reader << "/bin/grep" << "-h" << "^Zone" << m_zoneinfoDir << "/src/*" << temp.name() << "|" <<
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     8
-                    "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'";
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
     9
+                reader << "/bin/grep" << "-h" << "^Zone" <<  "/usr/share/lib/zoneinfo/src/*" << "|" <<
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    10
+                    "/bin/awk" << "'{print \"??\\t+9999+99999\\t\" $2}'" << ">" << temp.name();
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    11
                 // Note the use of blocking here...it is a trivial amount of data!
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    12
                 temp.close();
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    13
                 reader.start(KProcess::Block);
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    14
                 f.setName(temp.name());
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    15
-                if (!temp.status() || !f.open(IO_ReadOnly))
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    16
+                if (temp.status() || !f.open(IO_ReadOnly))
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    17
                 {
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    18
                     kdDebug() << "Can't open " << f.name() << endl;
14f4552ed11c SFEkdelibs3.spec:
moinakg
parents:
diff changeset
    19
                     return *m_zones;