desktop/xfce4-xkb-plugin: Fixed display of Bosnia/Herzegovina flag

Thanks to Armin Besirovic <armin@linux.org.ba> for the report.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

2 files changed, 283 insertions, 3 deletions

diff --git a/desktop/xfce4-xkb-plugin/rename_bs_to_ba_dot_svg.diff b/desktop/xfce4-xkb-plugin/rename_bs_to_ba_dot_svg.diff
new file mode 100644
index 0000000000..6429937a6a
--- /dev/null
+++ b/desktop/xfce4-xkb-plugin/rename_bs_to_ba_dot_svg.diff
@@ -0,0 +1,278 @@
+diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.am xfce4-xkb-plugin-0.5.3.3/flags/Makefile.am
+--- xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.am	2009-03-06 07:16:06.000000000 -0600
++++ xfce4-xkb-plugin-0.5.3.3/flags/Makefile.am	2011-06-20 12:43:15.982508648 -0500
+@@ -11,7 +11,7 @@
+ 			bg.svg \
+ 			bh.svg \
+ 			br.svg \
+-			bs.svg \
++			ba.svg \
+ 			by.svg \
+ 			ca.svg \
+ 			ch.svg \
+diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.in xfce4-xkb-plugin-0.5.3.3/flags/Makefile.in
+--- xfce4-xkb-plugin-0.5.3.3.orig//flags/Makefile.in	2009-03-06 07:16:29.000000000 -0600
++++ xfce4-xkb-plugin-0.5.3.3/flags/Makefile.in	2011-06-20 12:43:15.983508640 -0500
+@@ -259,7 +259,7 @@
+ 			bg.svg \
+ 			bh.svg \
+ 			br.svg \
+-			bs.svg \
++			ba.svg \
+ 			by.svg \
+ 			ca.svg \
+ 			ch.svg \
+diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/ba.svg xfce4-xkb-plugin-0.5.3.3/flags/ba.svg
+--- xfce4-xkb-plugin-0.5.3.3.orig//flags/ba.svg	1969-12-31 18:00:00.000000000 -0600
++++ xfce4-xkb-plugin-0.5.3.3/flags/ba.svg	2011-06-20 12:43:05.472594747 -0500
+@@ -0,0 +1,123 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++<svg
++   xmlns:dc="http://purl.org/dc/elements/1.1/"
++   xmlns:cc="http://web.resource.org/cc/"
++   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
++   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
++   width="1000"
++   height="500"
++   id="svg11581"
++   sodipodi:version="0.32"
++   inkscape:version="0.44"
++   version="1.0"
++   sodipodi:docbase="C:\Documents and Settings\David Nelson\Archives\Svg"
++   sodipodi:docname="Flag_of_Bosnia_and_Herzegovina.svg"
++   viewBox="0 0 200 100">
++  <defs
++     id="defs11583" />
++  <sodipodi:namedview
++     id="base"
++     pagecolor="#ffffff"
++     bordercolor="#666666"
++     borderopacity="1.0"
++     gridtolerance="10000"
++     guidetolerance="10"
++     objecttolerance="50"
++     inkscape:pageopacity="0.0"
++     inkscape:pageshadow="2"
++     inkscape:zoom="0.754"
++     inkscape:cx="500"
++     inkscape:cy="250"
++     inkscape:document-units="px"
++     inkscape:current-layer="layer1"
++     width="200px"
++     height="100px"
++     showgrid="true"
++     inkscape:grid-points="true"
++     inkscape:grid-bbox="true"
++     inkscape:object-nodes="false"
++     inkscape:object-paths="false"
++     inkscape:object-points="false"
++     inkscape:window-width="853"
++     inkscape:window-height="573"
++     inkscape:window-x="11"
++     inkscape:window-y="22" />
++  <metadata
++     id="metadata11586">
++    <rdf:RDF>
++      <cc:Work
++         rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type
++           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <g
++     inkscape:label="Layer 1"
++     inkscape:groupmode="layer"
++     id="layer1">
++    <rect
++       style="opacity:1;fill:#171796;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.403;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
++       id="rect11593"
++       width="200"
++       height="100"
++       x="0"
++       y="0" />
++    <path
++       style="fill:#f7d117;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       d="M 53,0 L 153,0 L 153,100 L 53,0 z "
++       id="path11595" />
++    <path
++       id="path11682"
++       d="M 81.53125,51.125 L 85,51.125 L 88.46875,51.125 L 90.58396,57.685662 L 85,53.625 L 79.41604,57.685661 L 81.53125,51.125 z "
++       style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       transform="translate(-50,-51.125)"
++       sodipodi:nodetypes="ccccccc" />
++    <path
++       id="path11689"
++       d="M 81.53125,51.125 L 75.964963,47.064338 L 82.875,47.0625 L 85,40.5 L 87.125,47.0625 L 94.035037,47.064339 L 88.46875,51.125 L 85,51.125 L 81.53125,51.125 z "
++       style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       transform="translate(50,48.875)"
++       sodipodi:nodetypes="ccccccccc" />
++    <path
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       id="path11746"
++       transform="translate(-37.5,-38.625)" />
++    <path
++       id="path11754"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       transform="translate(-25,-26.125)" />
++    <path
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       id="path11762"
++       transform="translate(-12.5,-13.625)" />
++    <path
++       id="path11770"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       transform="translate(0,-1.125)" />
++    <path
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       id="path11778"
++       transform="translate(12.5,11.375)" />
++    <path
++       id="path11786"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       transform="translate(25,23.875)" />
++    <path
++       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
++       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
++       id="path11794"
++       transform="translate(37.5,36.375)" />
++  </g>
++</svg>
+diff -Nur xfce4-xkb-plugin-0.5.3.3.orig//flags/bs.svg xfce4-xkb-plugin-0.5.3.3/flags/bs.svg
+--- xfce4-xkb-plugin-0.5.3.3.orig//flags/bs.svg	2009-03-06 07:16:06.000000000 -0600
++++ xfce4-xkb-plugin-0.5.3.3/flags/bs.svg	1969-12-31 18:00:00.000000000 -0600
+@@ -1,123 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+-<svg
+-   xmlns:dc="http://purl.org/dc/elements/1.1/"
+-   xmlns:cc="http://web.resource.org/cc/"
+-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+-   xmlns:svg="http://www.w3.org/2000/svg"
+-   xmlns="http://www.w3.org/2000/svg"
+-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+-   width="1000"
+-   height="500"
+-   id="svg11581"
+-   sodipodi:version="0.32"
+-   inkscape:version="0.44"
+-   version="1.0"
+-   sodipodi:docbase="C:\Documents and Settings\David Nelson\Archives\Svg"
+-   sodipodi:docname="Flag_of_Bosnia_and_Herzegovina.svg"
+-   viewBox="0 0 200 100">
+-  <defs
+-     id="defs11583" />
+-  <sodipodi:namedview
+-     id="base"
+-     pagecolor="#ffffff"
+-     bordercolor="#666666"
+-     borderopacity="1.0"
+-     gridtolerance="10000"
+-     guidetolerance="10"
+-     objecttolerance="50"
+-     inkscape:pageopacity="0.0"
+-     inkscape:pageshadow="2"
+-     inkscape:zoom="0.754"
+-     inkscape:cx="500"
+-     inkscape:cy="250"
+-     inkscape:document-units="px"
+-     inkscape:current-layer="layer1"
+-     width="200px"
+-     height="100px"
+-     showgrid="true"
+-     inkscape:grid-points="true"
+-     inkscape:grid-bbox="true"
+-     inkscape:object-nodes="false"
+-     inkscape:object-paths="false"
+-     inkscape:object-points="false"
+-     inkscape:window-width="853"
+-     inkscape:window-height="573"
+-     inkscape:window-x="11"
+-     inkscape:window-y="22" />
+-  <metadata
+-     id="metadata11586">
+-    <rdf:RDF>
+-      <cc:Work
+-         rdf:about="">
+-        <dc:format>image/svg+xml</dc:format>
+-        <dc:type
+-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+-      </cc:Work>
+-    </rdf:RDF>
+-  </metadata>
+-  <g
+-     inkscape:label="Layer 1"
+-     inkscape:groupmode="layer"
+-     id="layer1">
+-    <rect
+-       style="opacity:1;fill:#171796;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.403;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+-       id="rect11593"
+-       width="200"
+-       height="100"
+-       x="0"
+-       y="0" />
+-    <path
+-       style="fill:#f7d117;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       d="M 53,0 L 153,0 L 153,100 L 53,0 z "
+-       id="path11595" />
+-    <path
+-       id="path11682"
+-       d="M 81.53125,51.125 L 85,51.125 L 88.46875,51.125 L 90.58396,57.685662 L 85,53.625 L 79.41604,57.685661 L 81.53125,51.125 z "
+-       style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       transform="translate(-50,-51.125)"
+-       sodipodi:nodetypes="ccccccc" />
+-    <path
+-       id="path11689"
+-       d="M 81.53125,51.125 L 75.964963,47.064338 L 82.875,47.0625 L 85,40.5 L 87.125,47.0625 L 94.035037,47.064339 L 88.46875,51.125 L 85,51.125 L 81.53125,51.125 z "
+-       style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       transform="translate(50,48.875)"
+-       sodipodi:nodetypes="ccccccccc" />
+-    <path
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       id="path11746"
+-       transform="translate(-37.5,-38.625)" />
+-    <path
+-       id="path11754"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       transform="translate(-25,-26.125)" />
+-    <path
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       id="path11762"
+-       transform="translate(-12.5,-13.625)" />
+-    <path
+-       id="path11770"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       transform="translate(0,-1.125)" />
+-    <path
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       id="path11778"
+-       transform="translate(12.5,11.375)" />
+-    <path
+-       id="path11786"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       transform="translate(25,23.875)" />
+-    <path
+-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+-       d="M 79.41604,57.685661 L 85,40.5 L 90.58396,57.685662 L 75.964963,47.064338 L 94.035037,47.064339 L 79.41604,57.685661 z "
+-       id="path11794"
+-       transform="translate(37.5,36.375)" />
+-  </g>
+-</svg>
diff --git a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
index 7e38a54118..b74787faed 100644
--- a/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
+++ b/desktop/xfce4-xkb-plugin/xfce4-xkb-plugin.SlackBuild
@@ -24,15 +24,13 @@
 
 PRGNAM=xfce4-xkb-plugin
 VERSION=0.5.3.3
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -81,6 +79,10 @@ patch -p1 < $CWD/xfce4-xkb-plugin-libxklavier_api_chance.diff
 # https://bugs.archlinux.org/task/21067?project=1&string=xfce4-xkb-plugin
 patch -p1 < $CWD/xfce4-xkb-plugin-gtk.patch
 
+# Fix display of Bosnia/Herzegovina flag
+# Thanks to Armin Besirovic <armin@linux.org.ba> for the report
+patch -p1 < $CWD/rename_bs_to_ba_dot_svg.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \