patches/icon-naming-utils-01-extra-file.diff
author dcarbery
Tue, 06 Mar 2007 17:49:42 +0000
changeset 9467 2b47d8dfadba
child 9469 81603881fc68
permissions -rw-r--r--
2007-03-06 Damien Carbery <[email protected]> * SUNWgnome-themes.spec: Rename ICON_NAME_MAPPING_DIR var to INU_DATA_DIR after bumping icon-name-mapping. * icon-name-mapping.spec: Remove upstream patch, 01-mapping-dir. Renumber rest. * patches/icon-naming-utils-01-mapping-dir.diff: Removed, upstream. * patches/icon-naming-utils-01-extra-file.diff: Added, renumber from 01.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9467
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     1
diff -u icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in icon-naming-utils-0.8.1/icon-name-mapping.pl.in
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     2
--- icon-naming-utils-0.8.1-orig/icon-name-mapping.pl.in	Tue Sep 19 09:59:27 2006
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     3
+++ icon-naming-utils-0.8.1/icon-name-mapping.pl.in	Tue Sep 19 10:04:25 2006
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     4
@@ -16,6 +16,7 @@
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     5
 my $condir;
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     6
 my $LN_S = ($^O eq 'MSWin32' ? 'cp' : 'ln -s');
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     7
 my $mappingdir = "@DATADIR@";
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     8
+my $extrafile;
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
     9
 
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    10
 if (defined ($ENV{"ICON_NAME_MAPPING_DIR"})) {
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    11
        $mappingdir = $ENV{ICON_NAME_MAPPING_DIR};
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    12
@@ -27,9 +28,9 @@
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    13
 
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    14
 Getopt::Long::Configure (@default_getopt_config);
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    15
 GetOptions ("help|h" => \&usage,
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    16
-	    "context|c=s" => \$condir);
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    17
+	    "context|c=s" => \$condir,
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    18
+	    "extrafile|e=s" => \$extrafile);
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    19
 
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    20
-
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    21
 ############################################################################
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    22
 
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    23
 sub tls_load_mapping {
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    24
@@ -75,6 +76,7 @@
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    25
     print "Usage: $PROGRAM [OPTIONS] ...
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    26
 
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    27
   -c, --context=<dirname>       Set up mapping for Context <dirname>
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    28
+  -e, --extrafile=<file>        Specify an extra mapping file <file>
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    29
 
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    30
 This utility must be run from the <theme>/<size> directory, with a
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    31
 context passsed in as the argument.
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    32
@@ -89,4 +91,9 @@
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    33
 } else {
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    34
     my $iconmap = tls_load_mapping ("$mappingdir/legacy-icon-mapping.xml");
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    35
     tls_map_icons ($iconmap, $condir);
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    36
+    if (defined $extrafile)
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    37
+    {
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    38
+      my $tmpiconmap = tls_load_mapping ("$extrafile");
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    39
+      tls_map_icons ($tmpiconmap, $condir);
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    40
+    }
2b47d8dfadba 2007-03-06 Damien Carbery <[email protected]>
dcarbery
parents:
diff changeset
    41
 }