summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-03-05 04:00:14 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-03-05 04:00:14 +0000
commit4f7963b7ddc283ae57ceb68e7f4d51b3994e0070 (patch)
tree6ebcd67cfca9e9554f131b1ae746d9819f599294 /extra
parenta78b434ff9cfdfb3d175c900ff622a561b84123f (diff)
Wed Mar 5 03:57:00 UTC 2014
Diffstat (limited to 'extra')
-rw-r--r--extra/eclipse/PKGBUILD58
-rw-r--r--extra/eclipse/eclipse.sh2
-rw-r--r--extra/eclipse/eclipse.svg1623
-rw-r--r--extra/gptfdisk/PKGBUILD6
-rw-r--r--extra/kdebase-workspace/PKGBUILD13
-rw-r--r--extra/kdebase-workspace/systemd209.patch32
-rw-r--r--extra/libots/PKGBUILD20
-rw-r--r--extra/libunique/PKGBUILD16
-rw-r--r--extra/libzvt/PKGBUILD29
-rw-r--r--extra/mkvtoolnix/PKGBUILD8
-rw-r--r--extra/ntfs-3g/PKGBUILD49
-rw-r--r--extra/orbit2/PKGBUILD21
-rw-r--r--extra/orbit2/git-fixes.patch1226
-rw-r--r--extra/qt-assistant-compat/PKGBUILD4
-rw-r--r--extra/testdisk/PKGBUILD4
-rw-r--r--extra/xterm/PKGBUILD9
16 files changed, 1380 insertions, 1740 deletions
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 0a17572cc..dfeb50580 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,44 +1,48 @@
-# $Id: PKGBUILD 198727 2013-11-02 10:00:23Z ioni $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 206684 2014-03-04 22:49:29Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Andrew Wright <andreww@photism.org>
# Contributor: Andreas W. Hauser <andy-aur@splashground.de>
# Contributor: Marco Crosio <marco.crosio@gmail.com>
pkgname=eclipse
-pkgver=4.3.1
+pkgver=4.3.2
pkgrel=2
-_date=201309111000
+_release=kepler-SR2
pkgdesc="An IDE for Java and other languages"
+license=("EPL")
arch=('i686' 'x86_64')
url="http://eclipse.org"
depends=('java-environment' 'gtk2' 'unzip' 'webkitgtk2' 'libxtst')
install=${pkgname}.install
-makedepends=('zip')
-license=("EPL/1.0")
-source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
- 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
-md5sums=('04880311281ff9de71a7d1def630b29e'
- '7ea99a30fbaf06ec29261541b8eb1e23'
- 'ba2cf02c48e6e35bfe3685401c26bb5b'
- '77cff7543ccf7e177cb6667f5a20ce19')
-[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='61e44d550751d3b176fbe56dd0f75060'
+source=("http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$pkgname-standard-$_release-linux-gtk.tar.gz"
+ "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/${_release/-//}/$pkgname-standard-$_release-linux-gtk-x86_64.tar.gz"
+ 'eclipse.sh' 'eclipse.desktop')
+md5sums=('3fbb62eeef189dc0a45ff4c020588d6f'
+ 'b72d5a6caae4e2fd86be2f2f134fc8cb'
+ 'e07b2ccfc4689c288fd876a4beb8403d'
+ 'ba2cf02c48e6e35bfe3685401c26bb5b')
+
+if (( ! GENINTEG )); then
+ if [[ $CARCH == x86_64 ]]; then
+ source=("${source[@]:1}")
+ md5sums=("${md5sums[@]:1}")
+ else
+ source=("${source[0]}" "${source[@]:2}")
+ md5sums=("${md5sums[0]}" "${md5sums[@]:2}")
+ fi
+fi
package() {
- # install eclipse
- install -m755 -d "$pkgdir/usr/share/licenses/eclipse/"
- mv eclipse "$pkgdir/usr/share/"
+ install -d "$pkgdir/usr/share"
+ cp -a eclipse "$pkgdir/usr/share"
- # install misc
- install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \
- $pkgdir/usr/share/icons/hicolor/apps
- install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse"
- install -m644 eclipse.desktop "$pkgdir/usr/share/applications/"
- # install icon
- install -Dm644 "$srcdir"/eclipse.svg \
- "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
- sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.4.v201303080030/bin/runant.py
+ install -D eclipse.sh "$pkgdir/usr/bin/eclipse"
+ install -Dm644 eclipse.desktop "$pkgdir/usr/share/applications/eclipse.desktop"
- mv $pkgdir/usr/share/eclipse/epl-v10.html "$pkgdir/usr/share/licenses/eclipse/epl-v10.html"
+ for _i in 16 32 48 256; do
+ install -Dm644 eclipse/plugins/org.eclipse.platform_*/eclipse${_i}.png \
+ "$pkgdir/usr/share/icons/hicolor/${_i}x${_i}/apps/eclipse.png"
+ done
}
diff --git a/extra/eclipse/eclipse.sh b/extra/eclipse/eclipse.sh
index 498d7fefb..d39cee0b3 100644
--- a/extra/eclipse/eclipse.sh
+++ b/extra/eclipse/eclipse.sh
@@ -1,4 +1,4 @@
#!/bin/bash
export ECLIPSE_HOME=/usr/share/eclipse
export GDK_NATIVE_WINDOWS=true
-${ECLIPSE_HOME}/eclipse "$@"
+exec ${ECLIPSE_HOME}/eclipse "$@"
diff --git a/extra/eclipse/eclipse.svg b/extra/eclipse/eclipse.svg
deleted file mode 100644
index 56316be9e..000000000
--- a/extra/eclipse/eclipse.svg
+++ /dev/null
@@ -1,1623 +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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2254"
- sodipodi:version="0.32"
- inkscape:version="0.45.1"
- width="48"
- height="48"
- version="1.0"
- sodipodi:docbase="/home/matt/eclipse33"
- sodipodi:docname="eclipse-icon-clean.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-ubuntu.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata2259">
- <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>
- <defs
- id="defs2257">
- <linearGradient
- id="linearGradient4373">
- <stop
- style="stop-color:#8ea6d6;stop-opacity:0.73762375;"
- offset="0"
- id="stop4375" />
- <stop
- style="stop-color:#bbc9e6;stop-opacity:1;"
- offset="1"
- id="stop4377" />
- </linearGradient>
- <linearGradient
- id="linearGradient4035">
- <stop
- style="stop-color:#7474bb;stop-opacity:1;"
- offset="0"
- id="stop4037" />
- <stop
- style="stop-color:#070553;stop-opacity:1;"
- offset="1"
- id="stop4039" />
- </linearGradient>
- <linearGradient
- id="linearGradient4003">
- <stop
- style="stop-color:#494991;stop-opacity:1;"
- offset="0"
- id="stop4005" />
- <stop
- style="stop-color:#695ae8;stop-opacity:1;"
- offset="1"
- id="stop4007" />
- </linearGradient>
- <linearGradient
- id="linearGradient3987">
- <stop
- style="stop-color:#414083;stop-opacity:1;"
- offset="0"
- id="stop3989" />
- <stop
- style="stop-color:#5649b9;stop-opacity:1;"
- offset="1"
- id="stop3991" />
- </linearGradient>
- <linearGradient
- id="XMLID_8_"
- gradientUnits="userSpaceOnUse"
- x1="36.2495"
- y1="18.1187"
- x2="92.7495"
- y2="18.1187"
- gradientTransform="translate(-142.55625,-33.100248)">
- <stop
- offset="0"
- style="stop-color:#FEE8BD"
- id="stop264" />
- <stop
- offset="0.0483"
- style="stop-color:#FEEBC6"
- id="stop266" />
- <stop
- offset="0.2334"
- style="stop-color:#FFF6E5"
- id="stop268" />
- <stop
- offset="0.3905"
- style="stop-color:#FFFDF8"
- id="stop270" />
- <stop
- offset="0.5"
- style="stop-color:#FFFFFF"
- id="stop272" />
- <stop
- offset="0.6094"
- style="stop-color:#FFFDF9"
- id="stop274" />
- <stop
- offset="0.7588"
- style="stop-color:#FFF7E7"
- id="stop276" />
- <stop
- offset="0.9306"
- style="stop-color:#FEEDCB"
- id="stop278" />
- <stop
- offset="1"
- style="stop-color:#FEE8BD"
- id="stop280" />
- </linearGradient>
- <linearGradient
- id="XMLID_7_"
- gradientUnits="userSpaceOnUse"
- x1="45.416"
- y1="107.0176"
- x2="83.3354"
- y2="107.0176"
- gradientTransform="translate(-142.55625,-33.100248)">
- <stop
- offset="0"
- style="stop-color:#A86E45"
- id="stop205" />
- <stop
- offset="0.1124"
- style="stop-color:#E8A06C"
- id="stop207" />
- <stop
- offset="0.1609"
- style="stop-color:#E59E6B"
- id="stop209" />
- <stop
- offset="0.2012"
- style="stop-color:#DA9969"
- id="stop211" />
- <stop
- offset="0.2387"
- style="stop-color:#C99066"
- id="stop213" />
- <stop
- offset="0.2743"
- style="stop-color:#B18461"
- id="stop215" />
- <stop
- offset="0.3084"
- style="stop-color:#92745A"
- id="stop217" />
- <stop
- offset="0.3315"
- style="stop-color:#786755"
- id="stop219" />
- <stop
- offset="0.4068"
- style="stop-color:#B5ACA2"
- id="stop221" />
- <stop
- offset="0.478"
- style="stop-color:#EAE8E5"
- id="stop223" />
- <stop
- offset="0.5112"
- style="stop-color:#FFFFFF"
- id="stop225" />
- <stop
- offset="0.5376"
- style="stop-color:#FDFCFC"
- id="stop227" />
- <stop
- offset="0.5589"
- style="stop-color:#F5F3F2"
- id="stop229" />
- <stop
- offset="0.5783"
- style="stop-color:#E8E4E1"
- id="stop231" />
- <stop
- offset="0.5966"
- style="stop-color:#D6CEC9"
- id="stop233" />
- <stop
- offset="0.6142"
- style="stop-color:#BFB3AA"
- id="stop235" />
- <stop
- offset="0.6312"
- style="stop-color:#A39185"
- id="stop237" />
- <stop
- offset="0.6475"
- style="stop-color:#816959"
- id="stop239" />
- <stop
- offset="0.6517"
- style="stop-color:#785E4C"
- id="stop241" />
- <stop
- offset="0.671"
- style="stop-color:#83654F"
- id="stop243" />
- <stop
- offset="0.7414"
- style="stop-color:#A87958"
- id="stop245" />
- <stop
- offset="0.807"
- style="stop-color:#C3895F"
- id="stop247" />
- <stop
- offset="0.8652"
- style="stop-color:#D39263"
- id="stop249" />
- <stop
- offset="0.9101"
- style="stop-color:#D99564"
- id="stop251" />
- <stop
- offset="0.9278"
- style="stop-color:#C48557"
- id="stop253" />
- <stop
- offset="0.9557"
- style="stop-color:#AA7045"
- id="stop255" />
- <stop
- offset="0.9807"
- style="stop-color:#9A633B"
- id="stop257" />
- <stop
- offset="1"
- style="stop-color:#945F37"
- id="stop259" />
- </linearGradient>
- <linearGradient
- id="XMLID_6_"
- gradientUnits="userSpaceOnUse"
- x1="-34.5078"
- y1="-100.6235"
- x2="-20.9253"
- y2="-100.6235"
- gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)">
- <stop
- offset="0"
- style="stop-color:#A86E45"
- id="stop146" />
- <stop
- offset="0.1124"
- style="stop-color:#E8A06C"
- id="stop148" />
- <stop
- offset="0.1609"
- style="stop-color:#E59E6B"
- id="stop150" />
- <stop
- offset="0.2012"
- style="stop-color:#DA9969"
- id="stop152" />
- <stop
- offset="0.2387"
- style="stop-color:#C99066"
- id="stop154" />
- <stop
- offset="0.2743"
- style="stop-color:#B18461"
- id="stop156" />
- <stop
- offset="0.3084"
- style="stop-color:#92745A"
- id="stop158" />
- <stop
- offset="0.3315"
- style="stop-color:#786755"
- id="stop160" />
- <stop
- offset="0.4068"
- style="stop-color:#B5ACA2"
- id="stop162" />
- <stop
- offset="0.478"
- style="stop-color:#EAE8E5"
- id="stop164" />
- <stop
- offset="0.5112"
- style="stop-color:#FFFFFF"
- id="stop166" />
- <stop
- offset="0.5376"
- style="stop-color:#FDFCFC"
- id="stop168" />
- <stop
- offset="0.5589"
- style="stop-color:#F5F3F2"
- id="stop170" />
- <stop
- offset="0.5783"
- style="stop-color:#E8E4E1"
- id="stop172" />
- <stop
- offset="0.5966"
- style="stop-color:#D6CEC9"
- id="stop174" />
- <stop
- offset="0.6142"
- style="stop-color:#BFB3AA"
- id="stop176" />
- <stop
- offset="0.6312"
- style="stop-color:#A39185"
- id="stop178" />
- <stop
- offset="0.6475"
- style="stop-color:#816959"
- id="stop180" />
- <stop
- offset="0.6517"
- style="stop-color:#785E4C"
- id="stop182" />
- <stop
- offset="0.671"
- style="stop-color:#83654F"
- id="stop184" />
- <stop
- offset="0.7414"
- style="stop-color:#A87958"
- id="stop186" />
- <stop
- offset="0.807"
- style="stop-color:#C3895F"
- id="stop188" />
- <stop
- offset="0.8652"
- style="stop-color:#D39263"
- id="stop190" />
- <stop
- offset="0.9101"
- style="stop-color:#D99564"
- id="stop192" />
- <stop
- offset="0.9278"
- style="stop-color:#C48557"
- id="stop194" />
- <stop
- offset="0.9557"
- style="stop-color:#AA7045"
- id="stop196" />
- <stop
- offset="0.9807"
- style="stop-color:#9A633B"
- id="stop198" />
- <stop
- offset="1"
- style="stop-color:#945F37"
- id="stop200" />
- </linearGradient>
- <linearGradient
- id="XMLID_5_"
- gradientUnits="userSpaceOnUse"
- x1="44.7505"
- y1="94.7715"
- x2="83.3739"
- y2="89.1356"
- gradientTransform="translate(-142.55625,-33.100248)">
- <stop
- offset="0"
- style="stop-color:#A86E45"
- id="stop87" />
- <stop
- offset="0.1124"
- style="stop-color:#E8A06C"
- id="stop89" />
- <stop
- offset="0.1609"
- style="stop-color:#E59E6B"
- id="stop91" />
- <stop
- offset="0.2012"
- style="stop-color:#DA9969"
- id="stop93" />
- <stop
- offset="0.2387"
- style="stop-color:#C99066"
- id="stop95" />
- <stop
- offset="0.2743"
- style="stop-color:#B18461"
- id="stop97" />
- <stop
- offset="0.3084"
- style="stop-color:#92745A"
- id="stop99" />
- <stop
- offset="0.3315"
- style="stop-color:#786755"
- id="stop101" />
- <stop
- offset="0.4068"
- style="stop-color:#B5ACA2"
- id="stop103" />
- <stop
- offset="0.478"
- style="stop-color:#EAE8E5"
- id="stop105" />
- <stop
- offset="0.5112"
- style="stop-color:#FFFFFF"
- id="stop107" />
- <stop
- offset="0.5376"
- style="stop-color:#FDFCFC"
- id="stop109" />
- <stop
- offset="0.5589"
- style="stop-color:#F5F3F2"
- id="stop111" />
- <stop
- offset="0.5783"
- style="stop-color:#E8E4E1"
- id="stop113" />
- <stop
- offset="0.5966"
- style="stop-color:#D6CEC9"
- id="stop115" />
- <stop
- offset="0.6142"
- style="stop-color:#BFB3AA"
- id="stop117" />
- <stop
- offset="0.6312"
- style="stop-color:#A39185"
- id="stop119" />
- <stop
- offset="0.6475"
- style="stop-color:#816959"
- id="stop121" />
- <stop
- offset="0.6517"
- style="stop-color:#785E4C"
- id="stop123" />
- <stop
- offset="0.671"
- style="stop-color:#83654F"
- id="stop125" />
- <stop
- offset="0.7414"
- style="stop-color:#A87958"
- id="stop127" />
- <stop
- offset="0.807"
- style="stop-color:#C3895F"
- id="stop129" />
- <stop
- offset="0.8652"
- style="stop-color:#D39263"
- id="stop131" />
- <stop
- offset="0.9101"
- style="stop-color:#D99564"
- id="stop133" />
- <stop
- offset="0.9278"
- style="stop-color:#C48557"
- id="stop135" />
- <stop
- offset="0.9557"
- style="stop-color:#AA7045"
- id="stop137" />
- <stop
- offset="0.9807"
- style="stop-color:#9A633B"
- id="stop139" />
- <stop
- offset="1"
- style="stop-color:#945F37"
- id="stop141" />
- </linearGradient>
- <linearGradient
- id="XMLID_2_"
- gradientUnits="userSpaceOnUse"
- x1="44.8901"
- y1="95.7324"
- x2="83.5847"
- y2="90.0861"
- gradientTransform="translate(-142.55625,-33.100248)">
- <stop
- offset="0"
- style="stop-color:#A86E45"
- id="stop60" />
- <stop
- offset="0.5787"
- style="stop-color:#785E4C"
- id="stop62" />
- <stop
- offset="1"
- style="stop-color:#945F37"
- id="stop64" />
- </linearGradient>
- <linearGradient
- id="XMLID_1_"
- gradientUnits="userSpaceOnUse"
- x1="47.9995"
- y1="100.5"
- x2="81.9995"
- y2="100.5"
- gradientTransform="translate(-142.55625,-33.100248)">
- <stop
- offset="0.0056"
- style="stop-color:#9C6137"
- id="stop47" />
- <stop
- offset="0.1685"
- style="stop-color:#C98452"
- id="stop49" />
- <stop
- offset="0.5337"
- style="stop-color:#CD8D5F"
- id="stop51" />
- <stop
- offset="0.809"
- style="stop-color:#C47D4A"
- id="stop53" />
- <stop
- offset="1"
- style="stop-color:#9C6137"
- id="stop55" />
- </linearGradient>
- <radialGradient
- id="light_1_"
- cx="-27.6724"
- cy="-109.9067"
- r="9"
- gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
- gradientUnits="userSpaceOnUse">
- <stop
- offset="0.264"
- style="stop-color:#FFFFFF;"
- id="stop37" />
- <stop
- offset="2.5"
- style="stop-color:#FFF18F;stop-opacity:0"
- id="stop39" />
- </radialGradient>
- <radialGradient
- id="XMLID_10_"
- cx="-27.6128"
- cy="-86.5356"
- r="6.2114"
- gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
- gradientUnits="userSpaceOnUse">
- <stop
- offset="0.3427"
- style="stop-color:#FFFFFF"
- id="stop8" />
- <stop
- offset="0.3754"
- style="stop-color:#ECECEC"
- id="stop10" />
- <stop
- offset="0.4665"
- style="stop-color:#BCBCBC"
- id="stop12" />
- <stop
- offset="0.5531"
- style="stop-color:#979797"
- id="stop14" />
- <stop
- offset="0.6331"
- style="stop-color:#7C7C7C"
- id="stop16" />
- <stop
- offset="0.704"
- style="stop-color:#6C6C6C"
- id="stop18" />
- <stop
- offset="0.7584"
- style="stop-color:#666666"
- id="stop20" />
- </radialGradient>
- <linearGradient
- id="XMLID_4_"
- gradientUnits="userSpaceOnUse"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006"
- gradientTransform="translate(-2.6725931e-2,-44.465488)">
- <stop
- offset="0"
- style="stop-color:#FCB462"
- id="stop40" />
- <stop
- offset="1"
- style="stop-color:#FCAF55"
- id="stop42" />
- </linearGradient>
- <linearGradient
- id="XMLID_3_"
- gradientUnits="userSpaceOnUse"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307"
- gradientTransform="translate(-2.6725931e-2,-44.465488)">
- <stop
- offset="0"
- style="stop-color:#F99D77"
- id="stop33" />
- <stop
- offset="1"
- style="stop-color:#F7804E"
- id="stop35" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4035"
- id="linearGradient4041"
- x1="-43.03101"
- y1="8.6383018"
- x2="-15.677965"
- y2="37.492428"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4035"
- id="linearGradient4189"
- gradientUnits="userSpaceOnUse"
- x1="-43.03101"
- y1="8.6383018"
- x2="-15.677965"
- y2="37.492428" />
- <mask
- maskUnits="userSpaceOnUse"
- id="mask4181">
- <g
- id="g4183"
- transform="matrix(0.7925926,0,0,0.8907563,4.6132029,-3.2693226)">
- <path
- transform="translate(-15.844752,8.8397036)"
- d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z"
- sodipodi:ry="20.014421"
- sodipodi:rx="20.014421"
- sodipodi:cy="23.982693"
- sodipodi:cx="-30.021633"
- id="path4185"
- style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- <path
- transform="translate(-13.843309,8.8397036)"
- d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z"
- sodipodi:ry="20.014421"
- sodipodi:rx="20.014421"
- sodipodi:cy="23.982693"
- sodipodi:cx="-30.021633"
- id="path4187"
- style="opacity:1;fill:url(#linearGradient4189);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- </g>
- </mask>
- <filter
- inkscape:collect="always"
- x="-0.42083731"
- width="1.8416746"
- y="-0.42480746"
- height="1.8496149"
- id="filter4267">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="3.12931"
- id="feGaussianBlur4269" />
- </filter>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4035"
- id="linearGradient4301"
- gradientUnits="userSpaceOnUse"
- x1="-43.03101"
- y1="8.6383018"
- x2="-15.677965"
- y2="37.492428" />
- <mask
- maskUnits="userSpaceOnUse"
- id="mask4297">
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#linearGradient4301);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4299"
- sodipodi:cx="-30.021633"
- sodipodi:cy="23.982693"
- sodipodi:rx="20.014421"
- sodipodi:ry="20.014421"
- d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z"
- transform="translate(3.5679857,1.3974438)" />
- </mask>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4003"
- id="linearGradient4368"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.9683099,0,0,0.9683099,47.162254,-1.0174889)"
- x1="-47.534256"
- y1="2.9675496"
- x2="-0.16679382"
- y2="49.50108" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4003"
- id="linearGradient4371"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.0105249,0,0,1.0105249,3.4549308e-2,-50.022066)"
- x1="-47.534256"
- y1="2.9675496"
- x2="-0.16679382"
- y2="49.50108" />
- <clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath4423">
- <path
- transform="translate(4.9557997,-4.7430601e-2)"
- d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z"
- sodipodi:ry="20.014421"
- sodipodi:rx="20.014421"
- sodipodi:cy="23.982693"
- sodipodi:cx="-30.021633"
- id="path4425"
- style="opacity:1;fill:url(#linearGradient4427);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- sodipodi:type="arc" />
- </clipPath>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4035"
- id="linearGradient4427"
- gradientUnits="userSpaceOnUse"
- x1="-43.03101"
- y1="8.6383018"
- x2="-15.677965"
- y2="37.492428" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4373"
- id="linearGradient4429"
- gradientUnits="userSpaceOnUse"
- x1="-46.468069"
- y1="19.312662"
- x2="-6.439226"
- y2="19.312662" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4373"
- id="linearGradient4431"
- gradientUnits="userSpaceOnUse"
- x1="-46.468067"
- y1="22.481251"
- x2="-6.4392262"
- y2="22.481251" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4373"
- id="linearGradient4433"
- gradientUnits="userSpaceOnUse"
- x1="-46.468067"
- y1="25.482334"
- x2="-6.4392262"
- y2="25.482334" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4373"
- id="linearGradient4435"
- gradientUnits="userSpaceOnUse"
- x1="-46.468067"
- y1="28.481611"
- x2="-6.4392262"
- y2="28.481611" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#XMLID_10_"
- id="radialGradient4753"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
- cx="-27.6128"
- cy="-86.5356"
- r="6.2114" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#light_1_"
- id="radialGradient4755"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
- cx="-27.6724"
- cy="-109.9067"
- r="9" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_1_"
- id="linearGradient4757"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="47.9995"
- y1="100.5"
- x2="81.9995"
- y2="100.5" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_2_"
- id="linearGradient4759"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="44.8901"
- y1="95.7324"
- x2="83.5847"
- y2="90.0861" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_3_"
- id="linearGradient4761"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="linearGradient4763"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_5_"
- id="linearGradient4765"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="44.7505"
- y1="94.7715"
- x2="83.3739"
- y2="89.1356" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_6_"
- id="linearGradient4767"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"
- x1="-34.5078"
- y1="-100.6235"
- x2="-20.9253"
- y2="-100.6235" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_7_"
- id="linearGradient4769"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="45.416"
- y1="107.0176"
- x2="83.3354"
- y2="107.0176" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_8_"
- id="linearGradient4771"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="36.2495"
- y1="18.1187"
- x2="92.7495"
- y2="18.1187" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#XMLID_10_"
- id="radialGradient4817"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
- cx="-27.6128"
- cy="-86.5356"
- r="6.2114" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#light_1_"
- id="radialGradient4819"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
- cx="-27.6724"
- cy="-109.9067"
- r="9" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_1_"
- id="linearGradient4821"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="47.9995"
- y1="100.5"
- x2="81.9995"
- y2="100.5" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_2_"
- id="linearGradient4823"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="44.8901"
- y1="95.7324"
- x2="83.5847"
- y2="90.0861" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_3_"
- id="linearGradient4825"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="linearGradient4827"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_5_"
- id="linearGradient4829"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="44.7505"
- y1="94.7715"
- x2="83.3739"
- y2="89.1356" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_6_"
- id="linearGradient4831"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"
- x1="-34.5078"
- y1="-100.6235"
- x2="-20.9253"
- y2="-100.6235" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_7_"
- id="linearGradient4833"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="45.416"
- y1="107.0176"
- x2="83.3354"
- y2="107.0176" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_8_"
- id="linearGradient4835"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-142.55625,-33.100248)"
- x1="36.2495"
- y1="18.1187"
- x2="92.7495"
- y2="18.1187" />
- <clipPath
- clipPathUnits="userSpaceOnUse"
- id="clipPath7503">
- <g
- id="g7505"
- transform="matrix(7.4511206,0,0,7.4511206,305.77432,266.76067)">
- <path
- id="path7507"
- d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z "
- style="opacity:0.2;fill:#141414" />
- <path
- id="path7509"
- d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z "
- style="opacity:0.2;fill:#141414" />
- <path
- id="path7511"
- d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z "
- style="fill:url(#radialGradient7547)" />
- <path
- id="path7513"
- d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z "
- style="opacity:0.4;fill:#ffbf61" />
- <path
- id="path7515"
- d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- style="opacity:0.2;fill:#ff8b17" />
- <path
- id="path7517"
- d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- style="opacity:0.2;fill:#ff8b17" />
- <path
- id="path7519"
- d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- style="opacity:0.4;fill:#ff8b17" />
- <path
- id="path7521"
- d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- style="opacity:0.2;fill:#ffbf61" />
- <path
- id="path7523"
- d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z "
- style="fill:#cba572" />
- <path
- id="path7525"
- d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z "
- style="fill:#9e8c68" />
- <path
- id="path7527"
- d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z "
- style="fill:#966746" />
- <path
- id="path7529"
- d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z "
- style="fill:url(#linearGradient7549)" />
- <path
- id="path7531"
- d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z "
- style="fill:url(#linearGradient7551)" />
- <path
- id="path7533"
- d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z "
- style="fill:url(#linearGradient7553)" />
- <path
- id="path7535"
- d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z "
- style="fill:url(#linearGradient7555)" />
- <path
- id="path7537"
- d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z "
- style="fill:url(#linearGradient7557)" />
- <path
- id="path7539"
- d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z "
- style="fill:url(#linearGradient7559)" />
- <path
- id="path7541"
- d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z "
- style="fill:url(#linearGradient7561)" />
- <path
- id="path7543"
- d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z "
- style="fill:url(#linearGradient7563)" />
- <path
- id="path7545"
- d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z "
- style="fill:#3f3f3f" />
- </g>
- </clipPath>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#XMLID_10_"
- id="radialGradient7547"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)"
- cx="-27.6128"
- cy="-86.5356"
- r="6.2114" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_1_"
- id="linearGradient7549"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="47.9995"
- y1="100.5"
- x2="81.9995"
- y2="100.5" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_2_"
- id="linearGradient7551"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="44.8901"
- y1="95.7324"
- x2="83.5847"
- y2="90.0861" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_3_"
- id="linearGradient7553"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="linearGradient7555"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_5_"
- id="linearGradient7557"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="44.7505"
- y1="94.7715"
- x2="83.3739"
- y2="89.1356" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_6_"
- id="linearGradient7559"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)"
- x1="-34.5078"
- y1="-100.6235"
- x2="-20.9253"
- y2="-100.6235" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_7_"
- id="linearGradient7561"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="45.416"
- y1="107.0176"
- x2="83.3354"
- y2="107.0176" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_8_"
- id="linearGradient7563"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="36.2495"
- y1="18.1187"
- x2="92.7495"
- y2="18.1187" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#light_1_"
- id="radialGradient7653"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
- cx="-27.6724"
- cy="-109.9067"
- r="9" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#XMLID_10_"
- id="radialGradient8092"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)"
- cx="-27.6128"
- cy="-86.5356"
- r="6.2114" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_1_"
- id="linearGradient8094"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="47.9995"
- y1="100.5"
- x2="81.9995"
- y2="100.5" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_2_"
- id="linearGradient8096"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="44.8901"
- y1="95.7324"
- x2="83.5847"
- y2="90.0861" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_3_"
- id="linearGradient8098"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="linearGradient8100"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_5_"
- id="linearGradient8102"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="44.7505"
- y1="94.7715"
- x2="83.3739"
- y2="89.1356" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_6_"
- id="linearGradient8104"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)"
- x1="-34.5078"
- y1="-100.6235"
- x2="-20.9253"
- y2="-100.6235" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_7_"
- id="linearGradient8106"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="45.416"
- y1="107.0176"
- x2="83.3354"
- y2="107.0176" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_8_"
- id="linearGradient8108"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
- x1="36.2495"
- y1="18.1187"
- x2="92.7495"
- y2="18.1187" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#light_1_"
- id="radialGradient8110"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
- cx="-27.6724"
- cy="-109.9067"
- r="9" />
- <mask
- maskUnits="userSpaceOnUse"
- id="mask8044">
- <g
- id="g8046"
- transform="translate(8.8639968,22.032387)">
- <g
- id="g8048">
- <path
- style="opacity:0.2;fill:#141414"
- d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z "
- id="path8050" />
- <path
- style="opacity:0.2;fill:#141414"
- d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z "
- id="path8052" />
- <path
- style="fill:url(#radialGradient8092)"
- d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z "
- id="path8054" />
- <path
- style="opacity:0.4;fill:#ffbf61"
- d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z "
- id="path8056" />
- <path
- style="opacity:0.2;fill:#ff8b17"
- d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- id="path8058" />
- <path
- style="opacity:0.2;fill:#ff8b17"
- d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- id="path8060" />
- <path
- style="opacity:0.4;fill:#ff8b17"
- d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- id="path8062" />
- <path
- style="opacity:0.2;fill:#ffbf61"
- d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
- id="path8064" />
- <path
- style="fill:#cba572"
- d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z "
- id="path8066" />
- <path
- style="fill:#9e8c68"
- d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z "
- id="path8068" />
- <path
- style="fill:#966746"
- d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z "
- id="path8070" />
- <path
- style="fill:url(#linearGradient8094)"
- d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z "
- id="path8072" />
- <path
- style="fill:url(#linearGradient8096)"
- d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z "
- id="path8074" />
- <path
- style="fill:url(#linearGradient8098)"
- d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z "
- id="path8076" />
- <path
- style="fill:url(#linearGradient8100)"
- d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z "
- id="path8078" />
- <path
- style="fill:url(#linearGradient8102)"
- d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z "
- id="path8080" />
- <path
- style="fill:url(#linearGradient8104)"
- d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z "
- id="path8082" />
- <path
- style="fill:url(#linearGradient8106)"
- d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z "
- id="path8084" />
- <path
- style="fill:url(#linearGradient8108)"
- d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z "
- id="path8086" />
- <path
- style="fill:#3f3f3f"
- d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z "
- id="path8088" />
- </g>
- <ellipse
- clip-path="url(#clipPath7503)"
- transform="matrix(0.134208,0,0,0.134208,-41.03736,-36.195284)"
- ry="60.116001"
- rx="60.125"
- cy="44.278999"
- cx="64.5"
- id="ellipse8090"
- style="fill:url(#radialGradient8110)"
- sodipodi:cx="64.5"
- sodipodi:cy="44.278999"
- sodipodi:rx="60.125"
- sodipodi:ry="60.116001" />
- </g>
- </mask>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_3_"
- id="linearGradient8386"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="linearGradient8388"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_3_"
- id="linearGradient8470"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="75.5039"
- y1="11.96"
- x2="85.5969"
- y2="36.3307" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#XMLID_4_"
- id="linearGradient8472"
- gradientUnits="userSpaceOnUse"
- gradientTransform="translate(-2.6725931e-2,-44.465488)"
- x1="37.6743"
- y1="25.6035"
- x2="37.6743"
- y2="47.5006" />
- <mask
- maskUnits="userSpaceOnUse"
- id="mask8432">
- <g
- style="overflow:visible"
- id="g8434"
- transform="matrix(0.1570828,0,0,0.1570828,-28.616402,11.0008)">
- <path
- id="path8436"
- d="M 51.868,84.936 C 45.459,79.297 41.784,71.221 41.784,62.78 C 41.784,54.276 45.498,46.164 51.974,40.523 C 52.339,40.204 52.419,39.667 52.16,39.256 L 42.036,23.192 C 41.888,22.958 41.648,22.796 41.375,22.748 C 41.102,22.7 40.819,22.769 40.602,22.937 C 32.334,29.305 26.119,38.265 23.1,48.167 C 22.982,48.554 23.112,48.974 23.431,49.226 C 27.586,52.517 30.066,57.583 30.066,62.779 C 30.066,67.975 27.585,73.043 23.429,76.334 C 23.112,76.585 22.98,77.004 23.098,77.392 C 26.093,87.211 32.238,96.12 40.404,102.474 C 40.623,102.645 40.903,102.715 41.177,102.667 C 41.45,102.62 41.691,102.459 41.84,102.226 L 52.049,86.204 C 52.309,85.794 52.232,85.256 51.868,84.936 z M 12.803,50.223 C 5.732,50.223 0,55.951 0,63.016 C 0,70.081 5.732,75.81 12.803,75.81 C 19.874,75.81 25.606,70.081 25.606,63.016 C 25.606,55.951 19.874,50.223 12.803,50.223 z M 58.779,35.162 C 59.036,35.57 59.551,35.732 59.996,35.545 C 63.75,33.958 67.65,33.153 71.586,33.153 C 86.064,33.153 98.693,43.887 100.963,58.122 C 101.039,58.6 101.451,58.951 101.934,58.951 L 121.014,58.98 C 121.292,58.98 121.557,58.863 121.744,58.657 C 121.931,58.451 122.021,58.178 121.995,57.9 C 120.967,47.338 116.471,37.15 109.336,29.215 C 109.014,28.855 108.477,28.783 108.07,29.046 C 105.193,30.904 101.925,31.888 98.623,31.888 C 88.99,31.888 81.154,24.098 81.153,14.524 C 81.154,14.519 81.172,14.158 81.172,14.142 C 81.172,13.665 80.829,13.254 80.356,13.172 C 77.344,12.65 74.394,12.284 71.586,12.284 C 63.875,12.284 56.084,14.221 49.054,17.695 C 48.804,17.819 48.618,18.043 48.543,18.311 C 48.467,18.579 48.509,18.866 48.657,19.102 L 58.779,35.162 z M 98,27.5 C 104.908,27.5 110.51,21.902 110.51,15 C 110.51,8.096 104.908,2.5 98,2.5 C 91.092,2.5 85.49,8.096 85.49,15 C 85.49,21.902 91.092,27.5 98,27.5 z M 120.994,66.733 L 101.916,66.795 C 101.435,66.796 101.024,67.147 100.947,67.621 C 98.646,81.75 86.024,92.405 71.586,92.405 C 67.604,92.405 63.66,91.581 59.864,89.955 C 59.42,89.766 58.906,89.925 58.645,90.33 L 48.442,106.345 C 48.293,106.58 48.25,106.867 48.324,107.136 C 48.398,107.404 48.583,107.629 48.832,107.753 C 55.917,111.3 63.786,113.174 71.586,113.174 C 74.479,113.174 77.492,112.901 80.541,112.36 C 80.969,112.285 81.297,111.936 81.348,111.505 C 82.364,102.73 89.791,96.112 98.623,96.112 C 101.361,96.112 104.147,96.81 106.679,98.13 C 107.064,98.331 107.533,98.257 107.838,97.946 C 115.823,89.803 120.846,79.104 121.978,67.817 C 122.006,67.54 121.915,67.264 121.727,67.057 C 121.539,66.85 121.272,66.732 120.994,66.733 z M 98.486,100.545 C 91.415,100.545 85.682,106.242 85.682,113.273 C 85.682,120.302 91.414,126.001 98.486,126.001 C 105.556,126.001 111.289,120.303 111.289,113.273 C 111.289,106.242 105.557,100.545 98.486,100.545 z "
- style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
- <path
- id="path8438"
- d="M 51.868,85.936 C 45.459,80.297 41.784,72.221 41.784,63.78 C 41.784,55.276 45.498,47.164 51.974,41.523 C 52.339,41.204 52.419,40.667 52.16,40.256 L 42.036,24.192 C 41.888,23.958 41.648,23.796 41.375,23.748 C 41.102,23.7 40.819,23.769 40.602,23.937 C 32.334,30.305 26.119,39.265 23.1,49.167 C 22.982,49.554 23.112,49.974 23.431,50.226 C 27.586,53.517 30.066,58.583 30.066,63.779 C 30.066,68.975 27.585,74.043 23.429,77.334 C 23.112,77.585 22.98,78.004 23.098,78.392 C 26.093,88.211 32.238,97.12 40.404,103.474 C 40.623,103.645 40.903,103.715 41.177,103.667 C 41.45,103.62 41.691,103.459 41.84,103.226 L 52.049,87.204 C 52.309,86.794 52.232,86.256 51.868,85.936 z M 12.803,51.223 C 5.732,51.223 0,56.951 0,64.016 C 0,71.081 5.732,76.81 12.803,76.81 C 19.874,76.81 25.606,71.081 25.606,64.016 C 25.606,56.951 19.874,51.223 12.803,51.223 z M 58.779,36.162 C 59.036,36.57 59.551,36.732 59.996,36.545 C 63.75,34.958 67.65,34.153 71.586,34.153 C 86.064,34.153 98.693,44.887 100.963,59.122 C 101.039,59.6 101.451,59.951 101.934,59.951 L 121.014,59.98 C 121.292,59.98 121.557,59.863 121.744,59.657 C 121.931,59.451 122.021,59.178 121.995,58.9 C 120.967,48.338 116.471,38.15 109.336,30.215 C 109.014,29.855 108.477,29.783 108.07,30.046 C 105.193,31.904 101.925,32.888 98.623,32.888 C 88.99,32.888 81.154,25.098 81.153,15.524 C 81.154,15.519 81.172,15.158 81.172,15.142 C 81.172,14.665 80.829,14.254 80.356,14.172 C 77.344,13.65 74.394,13.284 71.586,13.284 C 63.875,13.284 56.084,15.221 49.054,18.695 C 48.804,18.819 48.618,19.043 48.543,19.311 C 48.467,19.579 48.509,19.866 48.657,20.102 L 58.779,36.162 z M 98,28.5 C 104.908,28.5 110.51,22.902 110.51,16 C 110.51,9.096 104.908,3.5 98,3.5 C 91.092,3.5 85.49,9.096 85.49,16 C 85.49,22.902 91.092,28.5 98,28.5 z M 120.994,67.733 L 101.916,67.795 C 101.435,67.796 101.024,68.147 100.947,68.621 C 98.646,82.75 86.024,93.405 71.586,93.405 C 67.604,93.405 63.66,92.581 59.864,90.955 C 59.42,90.766 58.906,90.925 58.645,91.33 L 48.442,107.345 C 48.293,107.58 48.25,107.867 48.324,108.136 C 48.398,108.404 48.583,108.629 48.832,108.753 C 55.917,112.3 63.786,114.174 71.586,114.174 C 74.479,114.174 77.492,113.901 80.541,113.36 C 80.969,113.285 81.297,112.936 81.348,112.505 C 82.364,103.73 89.791,97.112 98.623,97.112 C 101.361,97.112 104.147,97.81 106.679,99.13 C 107.064,99.331 107.533,99.257 107.838,98.946 C 115.823,90.803 120.846,80.104 121.978,68.817 C 122.006,68.54 121.915,68.264 121.727,68.057 C 121.539,67.85 121.272,67.732 120.994,67.733 z M 98.486,101.545 C 91.415,101.545 85.682,107.242 85.682,114.273 C 85.682,121.302 91.414,127.001 98.486,127.001 C 105.556,127.001 111.289,121.303 111.289,114.273 C 111.289,107.242 105.557,101.545 98.486,101.545 z "
- style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
- <path
- id="path8440"
- d="M 51.868,86.936 C 45.459,81.297 41.784,73.221 41.784,64.78 C 41.784,56.276 45.498,48.164 51.974,42.523 C 52.339,42.204 52.419,41.667 52.16,41.256 L 42.036,25.192 C 41.888,24.958 41.648,24.796 41.375,24.748 C 41.102,24.7 40.819,24.769 40.602,24.937 C 32.334,31.305 26.119,40.265 23.1,50.167 C 22.982,50.554 23.112,50.974 23.431,51.226 C 27.586,54.517 30.066,59.583 30.066,64.779 C 30.066,69.975 27.585,75.043 23.429,78.334 C 23.112,78.585 22.98,79.004 23.098,79.392 C 26.093,89.211 32.238,98.12 40.404,104.474 C 40.623,104.645 40.903,104.715 41.177,104.667 C 41.45,104.62 41.691,104.459 41.84,104.226 L 52.049,88.204 C 52.309,87.794 52.232,87.256 51.868,86.936 z M 12.803,52.223 C 5.732,52.223 0,57.951 0,65.016 C 0,72.081 5.732,77.81 12.803,77.81 C 19.874,77.81 25.606,72.081 25.606,65.016 C 25.606,57.951 19.874,52.223 12.803,52.223 z M 58.779,37.162 C 59.036,37.57 59.551,37.732 59.996,37.545 C 63.75,35.958 67.65,35.153 71.586,35.153 C 86.064,35.153 98.693,45.887 100.963,60.122 C 101.039,60.6 101.451,60.951 101.934,60.951 L 121.014,60.98 C 121.292,60.98 121.557,60.863 121.744,60.657 C 121.931,60.451 122.021,60.178 121.995,59.9 C 120.967,49.338 116.471,39.15 109.336,31.215 C 109.014,30.855 108.477,30.783 108.07,31.046 C 105.193,32.904 101.925,33.888 98.623,33.888 C 88.99,33.888 81.154,26.098 81.153,16.524 C 81.154,16.519 81.172,16.158 81.172,16.142 C 81.172,15.665 80.829,15.254 80.356,15.172 C 77.344,14.65 74.394,14.284 71.586,14.284 C 63.875,14.284 56.084,16.221 49.054,19.695 C 48.804,19.819 48.618,20.043 48.543,20.311 C 48.467,20.579 48.509,20.866 48.657,21.102 L 58.779,37.162 z M 98,29.5 C 104.908,29.5 110.51,23.902 110.51,17 C 110.51,10.096 104.908,4.5 98,4.5 C 91.092,4.5 85.49,10.096 85.49,17 C 85.49,23.902 91.092,29.5 98,29.5 z M 120.994,68.733 L 101.916,68.795 C 101.435,68.796 101.024,69.147 100.947,69.621 C 98.646,83.75 86.024,94.405 71.586,94.405 C 67.604,94.405 63.66,93.581 59.864,91.955 C 59.42,91.766 58.906,91.925 58.645,92.33 L 48.442,108.345 C 48.293,108.58 48.25,108.867 48.324,109.136 C 48.398,109.404 48.583,109.629 48.832,109.753 C 55.917,113.3 63.786,115.174 71.586,115.174 C 74.479,115.174 77.492,114.901 80.541,114.36 C 80.969,114.285 81.297,113.936 81.348,113.505 C 82.364,104.73 89.791,98.112 98.623,98.112 C 101.361,98.112 104.147,98.81 106.679,100.13 C 107.064,100.331 107.533,100.257 107.838,99.946 C 115.823,91.803 120.846,81.104 121.978,69.817 C 122.006,69.54 121.915,69.264 121.727,69.057 C 121.539,68.85 121.272,68.732 120.994,68.733 z M 98.486,102.545 C 91.415,102.545 85.682,108.242 85.682,115.273 C 85.682,122.302 91.414,128.001 98.486,128.001 C 105.556,128.001 111.289,122.303 111.289,115.273 C 111.289,108.242 105.557,102.545 98.486,102.545 z "
- style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
- <path
- id="path8442"
- d="M 40.602,21.938 C 32.334,28.306 26.119,37.266 23.1,47.168 C 22.982,47.555 23.112,47.975 23.431,48.227 C 27.586,51.518 30.066,56.584 30.066,61.78 C 30.066,66.976 27.585,72.044 23.429,75.335 C 23.112,75.586 22.98,76.005 23.098,76.393 C 26.093,86.212 32.238,95.121 40.404,101.475 C 40.623,101.646 40.903,101.716 41.177,101.668 C 41.45,101.621 41.691,101.46 41.84,101.227 L 52.049,85.205 C 52.31,84.796 52.234,84.258 51.869,83.937 C 45.46,78.298 41.785,70.222 41.785,61.781 C 41.785,53.277 45.499,45.165 51.975,39.524 C 52.34,39.205 52.42,38.668 52.161,38.257 L 42.036,22.192 C 41.888,21.958 41.648,21.796 41.375,21.748 C 41.102,21.7 40.819,21.769 40.602,21.938 z "
- style="fill:#f97a00" />
- <path
- id="path8444"
- d="M 24.042,47.455 C 28.431,50.932 31.051,56.219 31.051,61.779 C 31.051,67.339 28.43,72.628 24.04,76.104 C 26.991,85.785 32.981,94.45 41.008,100.697 C 42.028,99.097 50.449,85.879 51.217,84.674 C 44.602,78.854 40.799,70.574 40.799,61.779 C 40.799,52.92 44.642,44.603 51.327,38.78 C 50.565,37.572 42.215,24.322 41.203,22.717 C 33.076,28.978 27.018,37.694 24.042,47.455 z "
- style="fill:#fb8b00" />
- <ellipse
- id="ellipse8446"
- ry="12.794"
- rx="12.803"
- cy="62.015999"
- cx="12.803"
- style="fill:#f83011;fill-rule:evenodd"
- sodipodi:cx="12.803"
- sodipodi:cy="62.015999"
- sodipodi:rx="12.803"
- sodipodi:ry="12.794" />
- <path
- id="path8448"
- d="M 0.984,62.016 C 0.984,68.528 6.286,73.827 12.802,73.827 C 19.318,73.827 24.62,68.528 24.62,62.016 C 24.62,55.504 19.318,50.206 12.802,50.206 C 6.286,50.206 0.984,55.504 0.984,62.016 z "
- style="fill:#f83011;fill-rule:evenodd" />
- <path
- id="path8450"
- d="M 49.054,16.696 C 48.804,16.82 48.618,17.044 48.543,17.312 C 48.467,17.58 48.509,17.867 48.657,18.103 L 58.779,34.162 C 59.036,34.57 59.551,34.732 59.996,34.545 C 63.75,32.958 67.65,32.153 71.586,32.153 C 86.064,32.153 98.693,42.887 100.963,57.122 C 101.039,57.6 101.451,57.951 101.934,57.951 L 121.014,57.98 C 121.292,57.98 121.557,57.863 121.744,57.657 C 121.931,57.451 122.021,57.178 121.995,56.9 C 120.967,46.338 116.471,36.15 109.336,28.215 C 109.014,27.855 108.477,27.783 108.07,28.046 C 105.193,29.904 101.925,30.888 98.623,30.888 C 88.99,30.888 81.154,23.098 81.153,13.524 C 81.154,13.519 81.172,13.158 81.172,13.142 C 81.172,12.665 80.829,12.254 80.356,12.172 C 77.344,11.65 74.394,11.284 71.586,11.284 C 63.875,11.285 56.084,13.222 49.054,16.696 z "
- style="fill:#f13b00" />
- <path
- id="path8452"
- d="M 49.491,17.578 C 50.527,19.223 58.856,32.437 59.613,33.639 C 63.439,32.022 67.458,31.17 71.587,31.17 C 86.704,31.17 99.583,42.205 101.937,56.968 C 103.373,56.97 119.109,56.993 121.017,56.996 C 120.004,46.605 115.636,36.693 108.606,28.873 C 105.609,30.81 102.191,31.872 98.625,31.872 C 88.449,31.872 80.17,23.641 80.17,13.523 C 80.17,13.523 80.18,13.313 80.189,13.142 C 77.356,12.65 74.471,12.268 71.588,12.268 C 63.928,12.269 56.327,14.199 49.491,17.578 z "
- style="fill:#f13b00" />
- <ellipse
- id="ellipse8454"
- ry="12.5"
- rx="12.51"
- cy="14"
- cx="98"
- style="fill:#e00916;fill-rule:evenodd"
- sodipodi:cx="98"
- sodipodi:cy="14"
- sodipodi:rx="12.51"
- sodipodi:ry="12.5" />
- <path
- id="path8456"
- d="M 86.992,14 C 86.992,20.065 91.93,25 98,25 C 104.07,25 109.008,20.065 109.008,14 C 109.008,7.935 104.07,3 98,3 C 91.93,3 86.992,7.935 86.992,14 z "
- style="fill:#e56363;fill-rule:evenodd" />
- <path
- id="path8458"
- d="M 120.994,65.733 L 101.916,65.795 C 101.435,65.796 101.024,66.147 100.947,66.621 C 98.646,80.75 86.024,91.405 71.586,91.405 C 67.604,91.405 63.66,90.581 59.864,88.955 C 59.42,88.766 58.906,88.925 58.645,89.33 L 48.442,105.345 C 48.293,105.58 48.25,105.867 48.324,106.136 C 48.398,106.404 48.583,106.629 48.832,106.753 C 55.917,110.3 63.786,112.174 71.586,112.174 C 74.479,112.174 77.492,111.901 80.541,111.36 C 80.969,111.285 81.297,110.936 81.348,110.505 C 82.364,101.73 89.791,95.112 98.623,95.112 C 101.361,95.112 104.147,95.81 106.679,97.13 C 107.064,97.331 107.533,97.257 107.838,96.946 C 115.823,88.803 120.846,78.104 121.978,66.817 C 122.006,66.54 121.915,66.264 121.727,66.057 C 121.539,65.85 121.272,65.732 120.994,65.733 z "
- style="fill:#d40000" />
- <ellipse
- id="ellipse8460"
- ry="12.728"
- rx="12.803"
- cy="112.272"
- cx="98.486"
- style="fill:#ff7516;fill-rule:evenodd"
- sodipodi:cx="98.486"
- sodipodi:cy="112.272"
- sodipodi:rx="12.803"
- sodipodi:ry="12.728" />
- <path
- id="path8462"
- d="M 86.844,112.272 C 86.844,118.651 92.067,123.841 98.487,123.841 C 104.907,123.841 110.13,118.651 110.13,112.272 C 110.13,105.893 104.907,100.703 98.487,100.703 C 92.067,100.703 86.844,105.894 86.844,112.272 z "
- style="fill:#fb9200;fill-rule:evenodd" />
- <path
- id="path8464"
- d="M 49.785,17.67 C 50.008,18.024 59.527,33.127 59.695,33.395 C 63.548,31.791 67.547,30.969 71.586,30.969 C 78.265,30.969 84.635,33.086 90.02,37.08 C 90.155,37.07 103.667,36.099 103.667,36.099 C 103.667,36.099 112.654,35.447 113.294,35.4 C 111.865,33.167 110.392,31.264 108.67,29.337 C 105.639,31.256 102.097,32.173 98.623,32.173 C 88.337,32.173 79.969,23.752 79.969,13.525 C 79.969,13.519 79.973,13.418 79.979,13.318 C 77.094,12.827 74.27,12.47 71.586,12.47 C 64.13,12.469 56.6,14.34 49.785,17.67 z "
- style="fill:url(#linearGradient8470);fill-rule:evenodd" />
- <path
- id="path8466"
- d="M 24.274,47.396 C 26.599,49.268 28.451,51.682 29.658,54.398 C 34.14,51.488 38.459,49.95 43.889,47.772 C 45.598,44.761 48.481,41.04 51.074,38.755 C 50.915,38.503 41.39,23.39 41.155,23.017 C 33.202,29.201 27.214,37.844 24.274,47.396 z "
- style="fill:url(#linearGradient8472);fill-rule:evenodd" />
- <path
- id="path8468"
- d="M 23.732,58.691 C 22.313,53.996 17.948,50.566 12.794,50.566 C 6.493,50.566 1.367,55.689 1.367,61.985 C 1.367,66.015 3.469,69.565 6.633,71.597 C 11.926,67.035 17.919,62.755 23.732,58.691 z "
- style="fill:#f88657;fill-rule:evenodd" />
- </g>
- </mask>
- </defs>
- <sodipodi:namedview
- inkscape:window-height="627"
- inkscape:window-width="910"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- guidetolerance="10.0"
- gridtolerance="10.0"
- objecttolerance="10.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- inkscape:zoom="7.2055766"
- inkscape:cx="35.602016"
- inkscape:cy="22.962506"
- inkscape:window-x="238"
- inkscape:window-y="96"
- inkscape:current-layer="svg2254"
- showguides="true"
- inkscape:guide-bbox="true">
- <sodipodi:guide
- orientation="horizontal"
- position="0"
- id="guide4273" />
- <sodipodi:guide
- orientation="horizontal"
- position="48"
- id="guide4275" />
- <sodipodi:guide
- orientation="vertical"
- position="0"
- id="guide4437" />
- <sodipodi:guide
- orientation="vertical"
- position="48"
- id="guide4439" />
- </sodipodi:namedview>
- <rect
- style="fill:url(#linearGradient4371);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect4011"
- width="47.866001"
- height="47.866001"
- x="-48"
- y="-47.866001"
- transform="scale(-1,-1)"
- inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-bulb.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <rect
- style="fill:url(#linearGradient4368);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3016"
- width="45.866379"
- height="45.866383"
- x="1.1343775"
- y="1.048512" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4033"
- sodipodi:cx="-30.021633"
- sodipodi:cy="23.982693"
- sodipodi:rx="20.014421"
- sodipodi:ry="20.014421"
- d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z"
- transform="translate(53.070541,-2.5560054e-2)" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4031"
- sodipodi:cx="-30.021633"
- sodipodi:cy="23.982693"
- sodipodi:rx="20.014421"
- sodipodi:ry="20.014421"
- d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1 -50.036055,23.982693 A 20.014421 20.014421 0 1 1 -10.007212 23.982693 z"
- transform="translate(55.071984,-2.5560054e-2)" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:#fffffa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4267)"
- id="path4043"
- sodipodi:cx="-38.944729"
- sodipodi:cy="15.643351"
- sodipodi:rx="8.9230967"
- sodipodi:ry="8.8397036"
- d="M -30.021632 15.643351 A 8.9230967 8.8397036 0 1 1 -47.867826,15.643351 A 8.9230967 8.8397036 0 1 1 -30.021632 15.643351 z"
- transform="matrix(1.2616822,0,0,1.1226415,62.529072,-5.2595765)"
- mask="url(#mask4181)" />
- <g
- id="g4417"
- clip-path="url(#clipPath4423)"
- transform="translate(50.116184,2.1870546e-2)">
- <path
- transform="translate(1.387814,-0.4734046)"
- clip-path="none"
- id="path4279"
- d="M -47.32329,19.312662 L -6.0456207,19.312662"
- style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4429);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- transform="translate(1.387814,-0.4734046)"
- clip-path="none"
- id="path4281"
- d="M -47.32329,22.48125 L -6.045621,22.48125"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4431);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- transform="translate(1.387814,-0.4734046)"
- clip-path="none"
- id="path4283"
- d="M -47.32329,25.482334 L -6.0456207,25.482334"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4433);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- transform="translate(1.387814,-0.4734046)"
- clip-path="none"
- id="path4285"
- d="M -47.32329,28.481612 L -6.0456207,28.481612"
- style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4435);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- </g>
-</svg>
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 9db6b6dcf..32fde900e 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 206141 2014-02-20 07:26:51Z foutrelis $
+# $Id: PKGBUILD 206653 2014-03-04 11:18:26Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Hokum <hokum_at_mail_dot_ru>
pkgname=gptfdisk
-pkgver=0.8.9
+pkgver=0.8.10
pkgrel=1
pkgdesc="A text-mode partitioning tool that works on GUID Partition Table (GPT) disks"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ provides=("gdisk=$pkgver")
conflicts=('gdisk')
replaces=('gdisk')
source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('4f7e6199f8b2eae8d4b7f0f65afebac0835331f571605ec70172067bbbd004ca')
+sha256sums=('73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 90b77805d..d08be502f 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 205802 2014-02-10 11:01:54Z andrea $
+# $Id: PKGBUILD 206679 2014-03-04 18:38:55Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -6,7 +6,7 @@ pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.11.6
_pkgver=4.12.2
-pkgrel=2
+pkgrel=3
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -28,7 +28,8 @@ install="${pkgname}.install"
backup=('usr/share/config/kdm/kdmrc')
source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
- 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+ 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+ 'systemd209.patch')
sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -37,7 +38,8 @@ sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
+ 'd509dac592bd8b310df27991b208c95b6d907514'
+ 'cf57f90debbdabb359272e87696280f8df423fba')
prepare() {
mkdir build
@@ -51,6 +53,9 @@ prepare() {
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
+
+ # KDEBUG#331403
+ patch -p1 -i "${srcdir}"/systemd209.patch
}
build() {
diff --git a/extra/kdebase-workspace/systemd209.patch b/extra/kdebase-workspace/systemd209.patch
new file mode 100644
index 000000000..42b3f5efe
--- /dev/null
+++ b/extra/kdebase-workspace/systemd209.patch
@@ -0,0 +1,32 @@
+commit 7584a63924620bac3bd87277c11cdb8cdb5018b1
+Author: Raymond Wooninck <tittiatcoke@gmail.com>
+Date: Tue Feb 25 20:12:58 2014 +0100
+
+ Perform the systemd version evaluation through a regular expression to be more flexible for changes in the version string that systemd returns (Based on Review request 115271)
+
+diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+index cc3b6ad..70124ad 100644
+--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
++++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+@@ -41,13 +41,17 @@
+
+ bool checkSystemdVersion(uint requiredVersion)
+ {
+- bool ok;
+
+ QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
+ QDBusConnection::systemBus(), 0);
+- const uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok);
+- if (ok) {
+- return (version >= requiredVersion);
++
++ const QString reply = systemdIface.property("Version").toString();
++
++ QRegExp expsd("(systemd )?([0-9]+)");
++
++ if (expsd.exactMatch(reply)) {
++ const uint version = expsd.cap(2).toUInt();
++ return (version >= requiredVersion);
+ }
+
+ // Since version 1.11 Upstart user sessions implement the exact same API as logind
diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD
index 74267b655..ad9af6689 100644
--- a/extra/libots/PKGBUILD
+++ b/extra/libots/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 198218 2013-10-30 13:31:42Z allan $
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 206642 2014-03-03 23:27:24Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=libots
pkgver=0.5.0
-pkgrel=3
+pkgrel=4
pkgdesc='Open Text Summarizer'
url='http://libots.sourceforge.net/'
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libxml2' 'glib2')
-options=('!makeflags')
+depends=('libxml2' 'glib2' 'popt')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/ots-${pkgver}.tar.gz")
sha1sums=('4468bc06470734848c2369a37c84f76ca4ac3f9a')
+options=('!makeflags')
-build() {
+prepare() {
cd "${srcdir}/ots-${pkgver}"
touch gtk-doc.make
- sed -i -e 's/en.xml$//' dic/Makefile.am
+ sed 's/en.xml$//' -i dic/Makefile.am
libtoolize --force
aclocal
automake --add-missing --force
autoconf
- ./configure --prefix=/usr --disable-static
+}
+
+build() {
+ cd "${srcdir}/ots-${pkgver}"
+ ./configure --prefix=/usr
make
}
diff --git a/extra/libunique/PKGBUILD b/extra/libunique/PKGBUILD
index a981256f8..9456d54e2 100644
--- a/extra/libunique/PKGBUILD
+++ b/extra/libunique/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198251 2013-10-30 13:44:03Z allan $
+# $Id: PKGBUILD 206659 2014-03-04 12:25:15Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libunique
pkgver=1.1.6
-pkgrel=5
+pkgrel=6
pkgdesc="Library for writing single instance applications"
arch=('i686' 'x86_64')
license=('LGPL')
@@ -16,11 +16,15 @@ sha256sums=('e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb'
'bf99ddbf9104502ea498a6812ec2d700f61f4dbbaa2471cd52174b0b27070769'
'194ebfcc4c9297c44bbcfe5d45474310983121cdad881b72265d79cf4ec44235')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd $pkgname-$pkgver
patch -Np1 -i "${srcdir}/unique-gdbus.patch"
patch -Np1 -i "${srcdir}/remove_G_CONST_RETURN.patch"
- autoreconf
+}
+
+build() {
+ cd $pkgname-$pkgver
+ autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--disable-dbus
@@ -28,7 +32,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
# Remove documentation, provided by libunique3
diff --git a/extra/libzvt/PKGBUILD b/extra/libzvt/PKGBUILD
deleted file mode 100644
index 613d14db8..000000000
--- a/extra/libzvt/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 198306 2013-10-30 14:03:48Z allan $
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libzvt
-pkgver=2.0.1
-pkgrel=7
-pkgdesc="Zed's virtual terminal library"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://ftp.gnome.org/pub/GNOME/sources/libzvt"
-depends=('gtk2' 'libart-lgpl')
-makedepends=('pkgconfig')
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/libzvt/2.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bbea49495a341650fa1f89908e6554e')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e 's/-DGTK_DISABLE_DEPRECATED//g' libzvt/Makefile.*
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index e7338e4e0..ca089edd6 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 203527 2014-01-12 13:16:58Z giovanni $
+# $Id: PKGBUILD 206674 2014-03-04 17:57:38Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: xduugu <xduugu@gmx.com>
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.7.0
-pkgrel=2
+pkgver=6.8.0
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('27bb6b0a10b3bb2fcf1c3e520c300207')
+md5sums=('4315d48d0b8227fc246ecefa1d927a6a')
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/ntfs-3g/PKGBUILD b/extra/ntfs-3g/PKGBUILD
index d329507db..ae80eb3c0 100644
--- a/extra/ntfs-3g/PKGBUILD
+++ b/extra/ntfs-3g/PKGBUILD
@@ -1,40 +1,47 @@
-# $Id: PKGBUILD 198347 2013-10-30 14:18:55Z allan $
-# Maintainer: Tom Gundersen <teg@jklm.no>
+# $Id: PKGBUILD 206643 2014-03-04 02:29:33Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Bächler <thomas.archlinux.org>
-pkgbase=ntfs-3g_ntfsprogs
pkgname=ntfs-3g
-pkgver=2013.1.13
-pkgrel=4
-pkgdesc="NTFS filesystem utilities"
+_pkgname=ntfs-3g_ntfsprogs
+pkgver=2014.2.15
+pkgrel=1
+pkgdesc='NTFS filesystem driver and utilities'
+url='http://www.tuxera.com/community/ntfs-3g-download/'
arch=('i686' 'x86_64')
-url="http://www.tuxera.com/community/ntfs-3g-download/"
license=('GPL2')
depends=('util-linux' 'fuse')
+source=("http://tuxera.com/opensource/${_pkgname}-${pkgver}.tgz")
+sha1sums=('c9836f340b508f5d7776156e5afb02434d3f0174')
+
conflicts=('ntfsprogs')
provides=('ntfsprogs')
replaces=('ntfsprogs')
-source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
-sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
prepare() {
- cd $pkgbase-$pkgver
- sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i {ntfsprogs,src}/Makefile.in
}
build() {
- cd $pkgbase-$pkgver
- ./configure --prefix=/usr \
- --with-fuse=external --disable-static \
- --enable-posix-acls --disable-ldconfig \
- --mandir=/usr/share/man --sbin=/usr/bin \
- --enable-extras
- make
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --sbin=/usr/bin \
+ --mandir=/usr/share/man \
+ --disable-ldconfig \
+ --disable-static \
+ --with-fuse=external \
+ --enable-posix-acls \
+ --enable-extras \
+
+ make
}
package_ntfs-3g() {
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
- ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+ ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
}
diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD
index 6fc2245a3..530e802d8 100644
--- a/extra/orbit2/PKGBUILD
+++ b/extra/orbit2/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 198359 2013-10-30 14:23:25Z allan $
+# $Id: PKGBUILD 206657 2014-03-04 11:58:53Z jgc $
# Maintainer: Jan de Groot <jan@archlinux.org>
pkgname=orbit2
pkgver=2.14.19
-pkgrel=2
+pkgrel=3
pkgdesc="Thin/fast CORBA ORB"
arch=('i686' 'x86_64')
license=('LGPL' 'GPL')
depends=('libidl2')
+makedepends=('gtk-doc')
options=('!makeflags' 'staticlibs')
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2)
-sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550')
+source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2
+ git-fixes.patch)
+sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550'
+ '7f145ed715d5a1d7f6ccf1e9bcce6a6a584a6b125845a84a3d69bfe30b0d6e04')
+
+prepare() {
+ cd ORBit2-$pkgver
+ patch -Np1 -i ../git-fixes.patch
+}
build() {
- cd "${srcdir}/ORBit2-${pkgver}"
+ cd ORBit2-$pkgver
+ autoreconf -fi
./configure --prefix=/usr --disable-static
make
}
package() {
- cd "${srcdir}/ORBit2-${pkgver}"
+ cd ORBit2-$pkgver
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/orbit2/git-fixes.patch b/extra/orbit2/git-fixes.patch
new file mode 100644
index 000000000..cef941532
--- /dev/null
+++ b/extra/orbit2/git-fixes.patch
@@ -0,0 +1,1226 @@
+diff --git a/NEWS b/NEWS
+index bddfdff..7734385 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,10 @@
++ORBit2-2.14.20
++
++ - build fixes
++ + Stop using -DG_DISABLE_DEPRECATED since it doesn't build
++ + Use AM_CPPFLAGS instead of INCLUDES
++ + Move configure.in to configure.ac
++
+ ORBit2-2.14.19
+
+ - bug fixes
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..bd6fcac
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,414 @@
++m4_define([orbit_major_version],[2])
++m4_define([orbit_minor_version],[14])
++m4_define([orbit_micro_version],[20])
++m4_define([orbit_version],[orbit_major_version.orbit_minor_version.orbit_micro_version])
++
++dnl Process this file with autoconf to produce a configure script.
++AC_INIT([ORBit2],[orbit_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=ORBit2],[ORBit2])
++
++# Process this file with autoconf to produce a configure script.
++# require autoconf 2.60
++AC_PREREQ(2.60)
++
++# Before making a release, the LT_VERSION string should be modified.
++# The string is of the form C:R:A.
++# - If interfaces have been changed or added, but binary compatibility has
++# been preserved, change to C+1:0:A+1
++# - If binary compatibility has been broken (eg removed or changed interfaces)
++# change to C+1:0:0
++# - If the interface is the same as the previous version, change to C:R+1:A
++
++LT_VERSION=1:0:1
++AC_SUBST(LT_VERSION)
++
++ORBIT_MAJOR_VERSION=orbit_major_version
++ORBIT_MINOR_VERSION=orbit_minor_version
++ORBIT_MICRO_VERSION=orbit_micro_version
++ORBIT_VERSION=orbit_version
++AC_SUBST(ORBIT_MAJOR_VERSION)
++AC_SUBST(ORBIT_MINOR_VERSION)
++AC_SUBST(ORBIT_MICRO_VERSION)
++AC_SUBST(ORBIT_VERSION)
++
++# Increment this every time a feature is added in the .idl compiler
++# that needs help from the main libraries.
++ORBIT_SERIAL=20
++AC_SUBST(ORBIT_SERIAL)
++
++# For automake.
++
++AC_CONFIG_HEADERS([config.h])
++
++dnl Initialize automake stuff
++AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 no-define])
++
++dnl Required by autoconf 2.60
++AC_SUBST(datarootdir)
++
++AC_CANONICAL_HOST
++AC_MSG_CHECKING([for Win32])
++case "$host" in
++ *-*-mingw*)
++ os_win32=yes
++ LIBM=
++ MINGW_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc"
++ ;;
++ *)
++ os_win32=no
++ LIBM=-lm
++ MINGW_LDFLAGS=
++ ;;
++esac
++AC_MSG_RESULT([$os_win32])
++
++AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
++
++AC_SUBST(LIBM)
++AC_SUBST(MINGW_LDFLAGS)
++LDFLAGS="$MINGW_LDFLAGS $LDFLAGS"
++
++if test "$os_win32" = "yes"; then
++ if test x$enable_static = xyes -o x$enable_static = x; then
++ AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
++ enable_static=no
++ fi
++ if test x$enable_shared = xno; then
++ AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
++ fi
++ enable_shared=yes
++fi
++
++dnl Checks for programs.
++AC_PROG_CC
++AC_PROG_INSTALL
++
++AC_LIBTOOL_DLOPEN
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++AM_MAINTAINER_MODE([enable])
++
++dnl Useful for automating stuff
++AC_CACHE_CHECK([for aclocal flags], ac_cv_orbit_aclocal_flags,[
++ ac_cv_orbit_aclocal_flags="$ACLOCAL_FLAGS"
++])
++ACLOCAL="$ACLOCAL $ac_cv_orbit_aclocal_flags"
++
++AC_ARG_ENABLE(http, [--enable-http enables http connections],, enable_http=no)
++AM_CONDITIONAL(ENABLE_HTTP, test x"$enable_http" = xyes)
++if test x"$enable_http" = xyes ; then
++ AC_DEFINE(ENABLE_HTTP, 1, [Define if HTTP connections are available])
++fi
++dnl --enable-compile-warnings
++AC_ARG_ENABLE(compile-warnings, [ --enable-compile-warnings=[no/yes] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="yes"])
++
++dnl --enable-debug=(yes|minimum|no)
++AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum)
++if test "x$enable_debug" = "xyes"; then
++ ORBIT_DEBUG_CFLAGS="-ggdb -O0 -DG_ENABLE_DEBUG"
++else
++ if test "x$enable_debug" = "xno"; then
++ ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
++ else
++ ORBIT_DEBUG_CFLAGS=""
++ fi
++fi
++
++AC_ARG_ENABLE(purify, [ --enable-purify be clean for memory debuggers], enable_purify=yes, enable_purify=no)
++if test z$enable_purify = zyes; then
++ AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
++fi
++
++AC_MSG_CHECKING(which idl compiler to use)
++IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
++AC_ARG_WITH(idl-compiler,
++ [ --with-idl-compiler use specific idl compiler (useful when crosscompiling)],
++ if test "x$withval" != x; then
++ if test -f "$withval"; then
++ IDL_COMPILER=$withval
++ fi
++ fi
++)
++if test x$IDL_COMPILER == x"\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"; then
++ AC_MSG_RESULT(internal)
++else
++ AC_MSG_RESULT(external ($IDL_COMPILER))
++fi
++AC_SUBST(IDL_COMPILER)
++
++AC_PROG_AWK
++
++GLIB_REQUIRED=2.8.0
++LIBIDL_REQUIRED=0.8.2
++AC_SUBST(GLIB_REQUIRED)
++AC_SUBST(LIBIDL_REQUIRED)
++
++dnl Check for pkg-config version; want >= 0.14.0 because of -pthread bug
++PKG_PROG_PKG_CONFIG([0.18])
++
++LOCAL_LINC_LIBS='$(top_builddir)/linc2/src/liblinc.la'
++LOCAL_LINC_CFLAGS='-I$(top_srcdir)/linc2/include -I$(top_builddir)/linc2/include'
++AC_SUBST(LOCAL_LINC_LIBS)
++AC_SUBST(LOCAL_LINC_CFLAGS)
++
++dnl Checks for libraries.
++PKG_CHECK_MODULES(ORBIT, \
++ glib-2.0 >= $GLIB_REQUIRED \
++ gobject-2.0 >= $GLIB_REQUIRED \
++ gthread-2.0 >= $GLIB_REQUIRED \
++ gmodule-2.0 >= $GLIB_REQUIRED)
++AC_SUBST(ORBIT_LIBS)
++AC_SUBST(ORBIT_CFLAGS)
++
++PKG_CHECK_MODULES(ORBIT_IDL, \
++ libIDL-2.0 >= $LIBIDL_REQUIRED \
++ glib-2.0 >= $GLIB_REQUIRED \
++ gobject-2.0 >= $GLIB_REQUIRED \
++ gmodule-2.0 >= $GLIB_REQUIRED)
++AC_SUBST(ORBIT_IDL_LIBS)
++AC_SUBST(ORBIT_IDL_CFLAGS)
++
++PKG_CHECK_MODULES(ORBIT_NAME,
++ glib-2.0 >= $GLIB_REQUIRED \
++ gobject-2.0 >= $GLIB_REQUIRED \
++ gthread-2.0 >= $GLIB_REQUIRED \
++ gmodule-2.0 >= $GLIB_REQUIRED)
++AC_SUBST(ORBIT_NAME_LIBS)
++AC_SUBST(ORBIT_NAME_CFLAGS)
++
++dnl Checks for header files.
++AC_HEADER_STDC
++AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h)
++AC_CHECK_HEADERS(sys/machine.h sys/isa_defs.h sys/poll.h sys/select.h)
++AC_CHECK_HEADERS(sys/time.h netinet/in.h sys/socket.h arpa/inet.h)
++AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h)
++AC_CHECK_HEADERS(sys/un.h sys/uio.h syslog.h)
++AC_CHECK_HEADERS(sys/wait.h netdb.h)
++AC_CHECK_HEADERS(utime.h sys/utime.h)
++AC_CHECK_HEADERS([linux/socket.h])
++AC_CHECK_HEADERS(sys/sockio.h)
++
++if test "$os_win32" = "yes"; then
++ AC_CHECK_HEADERS(winsock2.h)
++ if test $ac_cv_header_winsock2_h = yes; then
++ dnl If we have <winsock2.h>, assume we find the functions
++ dnl in -lws2_32.
++ LIBS="-lws2_32 $LIBS"
++ fi
++fi
++
++dnl Checks for typedefs, structures, and compiler characteristics.
++AC_C_CONST
++AC_C_INLINE
++AC_TYPE_SIZE_T
++
++dnl Checks for library functions.
++AC_FUNC_VPRINTF
++
++AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
++AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
++AC_CHECK_FUNC(sigaction)
++AC_CHECK_FUNC(syslog)
++
++dnl This generates warnings from autoconf...
++AC_C_BIGENDIAN
++
++
++dnl
++dnl So many people with broken linking setups asked about this
++dnl it turned out to be necessary to check for this.
++dnl
++dofus_save_libs="$LIBS"
++LIBS="$ORBIT_LIBS $LIBS"
++AC_TRY_RUN([ #include <stdio.h>
++ main ()
++ {
++ return 0;
++ } ],,
++ AC_MSG_ERROR([
++Linking is badly borked on your system. Please ensure your library path is correct
++Check config.log for details - check near the end of the log above 'failed program was'
++Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
++prefix you're compiling on: '${prefix}' ]),
++AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
++LIBS="$dofus_save_libs"
++
++orig_CPPFLAGS=$CPPFLAGS
++CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
++AC_CHECK_ALIGNOF(CORBA_octet)
++AC_CHECK_ALIGNOF(CORBA_boolean)
++AC_CHECK_ALIGNOF(CORBA_char)
++AC_CHECK_ALIGNOF(CORBA_wchar)
++AC_CHECK_ALIGNOF(CORBA_short)
++AC_CHECK_ALIGNOF(CORBA_long)
++AC_CHECK_ALIGNOF(CORBA_long_long)
++AC_CHECK_ALIGNOF(CORBA_float)
++AC_CHECK_ALIGNOF(CORBA_double)
++AC_CHECK_ALIGNOF(CORBA_long_double)
++AC_CHECK_ALIGNOF(CORBA_struct)
++AC_CHECK_ALIGNOF(CORBA_pointer)
++CPPFLAGS=$orig_CPPFLAGS
++
++if test "x$GCC" = "xyes" -a "x$enable_compile_warnings" != "xno"; then
++ WARN_CFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations"
++else
++ WARN_CFLAGS=
++fi
++
++AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++AC_MSG_RESULT($WARN_CFLAGS)
++AC_SUBST(WARN_CFLAGS)
++
++AC_SUBST(pkglibdir)
++
++if test "$enable_maintainer_mode" = "yes"; then
++ DISABLE_DEPRECATED_CFLAGS=" \
++ -DG_DISABLE_SINGLE_INCLUDES"
++ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
++fi
++
++dnl
++dnl --------- start linc bits ---------
++dnl
++
++dnl Checks for libraries.
++PKG_CHECK_MODULES(LINC, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED)
++AC_SUBST(LINC_LIBS)
++AC_SUBST(LINC_CFLAGS)
++
++dnl Checks for header files.
++AC_HEADER_STDC
++AC_HEADER_RESOLV
++AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h sys/machine.h sys/isa_defs.h sys/poll.h)
++AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h)
++AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h sys/un.h)
++AC_CHECK_HEADERS(arpa/nameser.h)
++dnl AC_CHECK_HEADERS(linux/irda.h)
++
++dnl Checks for library functions.
++AC_CHECK_FUNCS(poll basename)
++AC_CHECK_FUNC(res_init,,[AC_CHECK_LIB(resolv,res_init)])
++AC_CHECK_LIB(resolv,res_9_init)
++AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
++AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
++AC_CHECK_FUNC(getaddrinfo,,[AC_CHECK_LIB(nsl,getaddrinfo)])
++if test x"$ac_cv_func_getaddrinfo" = "xyes" ; then
++ AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo() is available])
++fi
++AC_CHECK_FUNC(getnameinfo,,[AC_CHECK_LIB(nsl,getnameinfo)])
++if test x"$ac_cv_func_getnameinfo" = "xyes" ; then
++ AC_DEFINE(HAVE_GETNAMEINFO, 1, [Define if getnameinfo() is available])
++fi
++have_inet_pton=no
++AC_CHECK_FUNC(inet_pton,,)
++if test x"$ac_cv_func_inet_pton" = "xyes" ; then
++ have_inet_pton=yes
++ AC_DEFINE(HAVE_INET_PTON, 1, [Define if inet_pton() is available])
++fi
++
++# AC_CHECK_TYPE doesn't work here.
++AC_MSG_CHECKING([for socklen_t])
++AC_TRY_COMPILE(
++ [#ifdef _WIN32
++#include <ws2tcpip.h>
++#else
++#include <sys/types.h>
++#include <sys/socket.h>
++#endif],
++ [socklen_t len;],
++ [AC_MSG_RESULT(yes)],
++ [AC_DEFINE(socklen_t, size_t, [Define socklen_t to be of type size_t])
++ AC_MSG_RESULT(no)])
++
++# Blatantly stolen from configure.in in the sample code from
++# "UNIX Network Programming, Volume 1" by W. Richard Stevens
++AC_CACHE_CHECK(if sockaddr has sa_len member,
++ac_cv_sockaddr_has_sa_len,
++ AC_TRY_COMPILE([
++# include <sys/types.h>
++# include <sys/socket.h>],
++ [unsigned int i = sizeof(((struct sockaddr *)0)->sa_len)],
++ ac_cv_sockaddr_has_sa_len=yes,
++ ac_cv_sockaddr_has_sa_len=no))
++if test x"$ac_cv_sockaddr_has_sa_len" = "xyes" ; then
++ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member])
++fi
++
++dnl
++dnl --------- end linc bits ---------
++dnl
++
++dnl
++dnl --------- set additional gcc flags to catch errors ---------
++dnl
++AX_CFLAGS_GCC_OPTION(-Werror-implicit-function-declaration)
++CFLAGS="$CFLAGS $ORBIT_DEBUG_CFLAGS"
++AC_SUBST(CFLAGS)
++
++
++dnl ----- gtk-doc ------
++GTK_DOC_CHECK([1.0])
++
++
++AC_CONFIG_FILES([
++Makefile
++orbit2-config
++ORBit-2.0.pc
++ORBit-2.0-uninstalled.pc
++ORBit-CosNaming-2.0.pc
++ORBit-CosNaming-2.0-uninstalled.pc
++ORBit-imodule-2.0.pc
++ORBit-imodule-2.0-uninstalled.pc
++ORBit.spec
++orbit2-zip
++src/Makefile
++src/idl-compiler/Makefile
++src/idl-compiler/ORBit-idl-2.0.pc
++src/idl/Makefile
++src/idl/CORBA/Makefile
++src/idl/CORBA_PIDL/Makefile
++src/idl/interop/Makefile
++src/idl/misc/Makefile
++src/orb/Makefile
++src/orb/include/Makefile
++src/orb/util/Makefile
++src/orb/GIOP/Makefile
++src/orb/orb-core/Makefile
++src/orb/dynamic/Makefile
++src/orb/poa/Makefile
++src/services/Makefile
++src/services/name/Makefile
++src/services/imodule/Makefile
++include/Makefile
++include/orbit/Makefile
++include/orbit/orbit-config.h
++include/orbit/GIOP/Makefile
++include/orbit/util/Makefile
++include/orbit/orb-core/Makefile
++include/orbit/poa/Makefile
++include/orbit/dynamic/Makefile
++test/Makefile
++test/everything/Makefile
++test/inhibit/Makefile
++test/poa/Makefile
++docs/Makefile
++docs/devel/Makefile
++docs/internals/Makefile
++docs/api/Makefile
++
++linc2/Makefile
++linc2/src/Makefile
++linc2/test/Makefile
++linc2/include/Makefile
++linc2/include/linc/Makefile
++linc2/include/linc/linc-config.h
++])
++
++AC_OUTPUT
++
++echo "ORBit configuration:
++
++ Source code location: ${srcdir}
++ Compiler: ${CC}
++
++ Purify cleanliness: ${enable_purify}
++"
+diff --git a/configure.in b/configure.in
+deleted file mode 100644
+index 04d4b2a..0000000
+--- a/configure.in
++++ /dev/null
+@@ -1,413 +0,0 @@
+-m4_define([orbit_major_version],[2])
+-m4_define([orbit_minor_version],[14])
+-m4_define([orbit_micro_version],[19])
+-m4_define([orbit_version],[orbit_major_version.orbit_minor_version.orbit_micro_version])
+-
+-dnl Process this file with autoconf to produce a configure script.
+-AC_INIT([ORBit2],[orbit_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=ORBit2],[ORBit2])
+-
+-# Process this file with autoconf to produce a configure script.
+-# require autoconf 2.54
+-AC_PREREQ(2.54)
+-
+-# Before making a release, the LT_VERSION string should be modified.
+-# The string is of the form C:R:A.
+-# - If interfaces have been changed or added, but binary compatibility has
+-# been preserved, change to C+1:0:A+1
+-# - If binary compatibility has been broken (eg removed or changed interfaces)
+-# change to C+1:0:0
+-# - If the interface is the same as the previous version, change to C:R+1:A
+-
+-LT_VERSION=1:0:1
+-AC_SUBST(LT_VERSION)
+-
+-ORBIT_MAJOR_VERSION=orbit_major_version
+-ORBIT_MINOR_VERSION=orbit_minor_version
+-ORBIT_MICRO_VERSION=orbit_micro_version
+-ORBIT_VERSION=orbit_version
+-AC_SUBST(ORBIT_MAJOR_VERSION)
+-AC_SUBST(ORBIT_MINOR_VERSION)
+-AC_SUBST(ORBIT_MICRO_VERSION)
+-AC_SUBST(ORBIT_VERSION)
+-
+-# Increment this every time a feature is added in the .idl compiler
+-# that needs help from the main libraries.
+-ORBIT_SERIAL=20
+-AC_SUBST(ORBIT_SERIAL)
+-
+-# For automake.
+-
+-AC_CONFIG_HEADERS([config.h])
+-
+-dnl Initialize automake stuff
+-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 no-define])
+-
+-dnl Required by autoconf 2.60
+-AC_SUBST(datarootdir)
+-
+-AC_CANONICAL_HOST
+-AC_MSG_CHECKING([for Win32])
+-case "$host" in
+- *-*-mingw*)
+- os_win32=yes
+- LIBM=
+- MINGW_LDFLAGS="-Wl,--enable-runtime-pseudo-reloc"
+- ;;
+- *)
+- os_win32=no
+- LIBM=-lm
+- MINGW_LDFLAGS=
+- ;;
+-esac
+-AC_MSG_RESULT([$os_win32])
+-
+-AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
+-
+-AC_SUBST(LIBM)
+-AC_SUBST(MINGW_LDFLAGS)
+-LDFLAGS="$MINGW_LDFLAGS $LDFLAGS"
+-
+-if test "$os_win32" = "yes"; then
+- if test x$enable_static = xyes -o x$enable_static = x; then
+- AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
+- enable_static=no
+- fi
+- if test x$enable_shared = xno; then
+- AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
+- fi
+- enable_shared=yes
+-fi
+-
+-dnl Checks for programs.
+-AC_PROG_CC
+-AC_PROG_INSTALL
+-
+-AC_LIBTOOL_DLOPEN
+-AC_LIBTOOL_WIN32_DLL
+-AM_PROG_LIBTOOL
+-AM_MAINTAINER_MODE
+-
+-dnl Useful for automating stuff
+-AC_CACHE_CHECK([for aclocal flags], ac_cv_orbit_aclocal_flags,[
+- ac_cv_orbit_aclocal_flags="$ACLOCAL_FLAGS"
+-])
+-ACLOCAL="$ACLOCAL $ac_cv_orbit_aclocal_flags"
+-
+-AC_ARG_ENABLE(http, [--enable-http enables http connections],, enable_http=no)
+-AM_CONDITIONAL(ENABLE_HTTP, test x"$enable_http" = xyes)
+-if test x"$enable_http" = xyes ; then
+- AC_DEFINE(ENABLE_HTTP, 1, [Define if HTTP connections are available])
+-fi
+-dnl --enable-compile-warnings
+-AC_ARG_ENABLE(compile-warnings, [ --enable-compile-warnings=[no/yes] Turn on compiler warnings.], [enable_compile_warnings="$enableval"],[enable_compile_warnings="yes"])
+-
+-dnl --enable-debug=(yes|minimum|no)
+-AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=minimum)
+-if test "x$enable_debug" = "xyes"; then
+- ORBIT_DEBUG_CFLAGS="-ggdb -O0 -DG_ENABLE_DEBUG"
+-else
+- if test "x$enable_debug" = "xno"; then
+- ORBIT_DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+- else
+- ORBIT_DEBUG_CFLAGS=""
+- fi
+-fi
+-
+-AC_ARG_ENABLE(purify, [ --enable-purify be clean for memory debuggers], enable_purify=yes, enable_purify=no)
+-if test z$enable_purify = zyes; then
+- AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
+-fi
+-
+-AC_MSG_CHECKING(which idl compiler to use)
+-IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
+-AC_ARG_WITH(idl-compiler,
+- [ --with-idl-compiler use specific idl compiler (useful when crosscompiling)],
+- if test "x$withval" != x; then
+- if test -f "$withval"; then
+- IDL_COMPILER=$withval
+- fi
+- fi
+-)
+-if test x$IDL_COMPILER == x"\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"; then
+- AC_MSG_RESULT(internal)
+-else
+- AC_MSG_RESULT(external ($IDL_COMPILER))
+-fi
+-AC_SUBST(IDL_COMPILER)
+-
+-AC_PROG_AWK
+-
+-GLIB_REQUIRED=2.8.0
+-LIBIDL_REQUIRED=0.8.2
+-AC_SUBST(GLIB_REQUIRED)
+-AC_SUBST(LIBIDL_REQUIRED)
+-
+-dnl Check for pkg-config version; want >= 0.14.0 because of -pthread bug
+-PKG_PROG_PKG_CONFIG([0.18])
+-
+-LOCAL_LINC_LIBS='$(top_builddir)/linc2/src/liblinc.la'
+-LOCAL_LINC_CFLAGS='-I$(top_srcdir)/linc2/include -I$(top_builddir)/linc2/include'
+-AC_SUBST(LOCAL_LINC_LIBS)
+-AC_SUBST(LOCAL_LINC_CFLAGS)
+-
+-dnl Checks for libraries.
+-PKG_CHECK_MODULES(ORBIT, \
+- glib-2.0 >= $GLIB_REQUIRED \
+- gobject-2.0 >= $GLIB_REQUIRED \
+- gthread-2.0 >= $GLIB_REQUIRED \
+- gmodule-2.0 >= $GLIB_REQUIRED)
+-AC_SUBST(ORBIT_LIBS)
+-AC_SUBST(ORBIT_CFLAGS)
+-
+-PKG_CHECK_MODULES(ORBIT_IDL, \
+- libIDL-2.0 >= $LIBIDL_REQUIRED \
+- glib-2.0 >= $GLIB_REQUIRED \
+- gobject-2.0 >= $GLIB_REQUIRED \
+- gmodule-2.0 >= $GLIB_REQUIRED)
+-AC_SUBST(ORBIT_IDL_LIBS)
+-AC_SUBST(ORBIT_IDL_CFLAGS)
+-
+-PKG_CHECK_MODULES(ORBIT_NAME,
+- glib-2.0 >= $GLIB_REQUIRED \
+- gobject-2.0 >= $GLIB_REQUIRED \
+- gthread-2.0 >= $GLIB_REQUIRED \
+- gmodule-2.0 >= $GLIB_REQUIRED)
+-AC_SUBST(ORBIT_NAME_LIBS)
+-AC_SUBST(ORBIT_NAME_CFLAGS)
+-
+-dnl Checks for header files.
+-AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h)
+-AC_CHECK_HEADERS(sys/machine.h sys/isa_defs.h sys/poll.h sys/select.h)
+-AC_CHECK_HEADERS(sys/time.h netinet/in.h sys/socket.h arpa/inet.h)
+-AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h)
+-AC_CHECK_HEADERS(sys/un.h sys/uio.h syslog.h)
+-AC_CHECK_HEADERS(sys/wait.h netdb.h)
+-AC_CHECK_HEADERS(utime.h sys/utime.h)
+-AC_CHECK_HEADERS([linux/socket.h])
+-AC_CHECK_HEADERS(sys/sockio.h)
+-
+-if test "$os_win32" = "yes"; then
+- AC_CHECK_HEADERS(winsock2.h)
+- if test $ac_cv_header_winsock2_h = yes; then
+- dnl If we have <winsock2.h>, assume we find the functions
+- dnl in -lws2_32.
+- LIBS="-lws2_32 $LIBS"
+- fi
+-fi
+-
+-dnl Checks for typedefs, structures, and compiler characteristics.
+-AC_C_CONST
+-AC_C_INLINE
+-AC_TYPE_SIZE_T
+-
+-dnl Checks for library functions.
+-AC_FUNC_VPRINTF
+-
+-AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
+-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+-AC_CHECK_FUNC(sigaction)
+-AC_CHECK_FUNC(syslog)
+-
+-dnl This generates warnings from autoconf...
+-AC_C_BIGENDIAN
+-
+-
+-dnl
+-dnl So many people with broken linking setups asked about this
+-dnl it turned out to be necessary to check for this.
+-dnl
+-dofus_save_libs="$LIBS"
+-LIBS="$ORBIT_LIBS $LIBS"
+-AC_TRY_RUN([ #include <stdio.h>
+- main ()
+- {
+- return 0;
+- } ],,
+- AC_MSG_ERROR([
+-Linking is badly borked on your system. Please ensure your library path is correct
+-Check config.log for details - check near the end of the log above 'failed program was'
+-Alternatively ensure that your /etc/ld.so.conf (and/or LD_LIBRARY_PATH) includes the
+-prefix you're compiling on: '${prefix}' ]),
+-AC_MSG_WARN([Could not check for borked linking while cross-compiling]))
+-LIBS="$dofus_save_libs"
+-
+-orig_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$CPPFLAGS $ORBIT_CFLAGS"
+-AC_CHECK_ALIGNOF(CORBA_octet)
+-AC_CHECK_ALIGNOF(CORBA_boolean)
+-AC_CHECK_ALIGNOF(CORBA_char)
+-AC_CHECK_ALIGNOF(CORBA_wchar)
+-AC_CHECK_ALIGNOF(CORBA_short)
+-AC_CHECK_ALIGNOF(CORBA_long)
+-AC_CHECK_ALIGNOF(CORBA_long_long)
+-AC_CHECK_ALIGNOF(CORBA_float)
+-AC_CHECK_ALIGNOF(CORBA_double)
+-AC_CHECK_ALIGNOF(CORBA_long_double)
+-AC_CHECK_ALIGNOF(CORBA_struct)
+-AC_CHECK_ALIGNOF(CORBA_pointer)
+-CPPFLAGS=$orig_CPPFLAGS
+-
+-if test "x$GCC" = "xyes" -a "x$enable_compile_warnings" != "xno"; then
+- WARN_CFLAGS="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations"
+-else
+- WARN_CFLAGS=
+-fi
+-
+-AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+-AC_MSG_RESULT($WARN_CFLAGS)
+-AC_SUBST(WARN_CFLAGS)
+-
+-AC_SUBST(pkglibdir)
+-
+-if test "$enable_maintainer_mode" = "yes"; then
+- DISABLE_DEPRECATED_CFLAGS=" \
+- -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
+- AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+-fi
+-
+-dnl
+-dnl --------- start linc bits ---------
+-dnl
+-
+-dnl Checks for libraries.
+-PKG_CHECK_MODULES(LINC, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED)
+-AC_SUBST(LINC_LIBS)
+-AC_SUBST(LINC_CFLAGS)
+-
+-dnl Checks for header files.
+-AC_HEADER_STDC
+-AC_CHECK_HEADERS(fcntl.h unistd.h sys/endian.h endian.h machine/endian.h sys/machine.h sys/isa_defs.h sys/poll.h)
+-AC_CHECK_HEADERS(stddef.h wchar.h wcstr.h wctype.h machine/types.h)
+-AC_CHECK_HEADERS(netinet/in.h netinet/tcp.h sys/un.h)
+-AC_CHECK_HEADERS(arpa/nameser.h resolv.h)
+-dnl AC_CHECK_HEADERS(linux/irda.h)
+-
+-dnl Checks for library functions.
+-AC_CHECK_FUNCS(poll basename)
+-AC_CHECK_FUNC(res_init,,[AC_CHECK_LIB(resolv,res_init)])
+-AC_CHECK_LIB(resolv,res_9_init)
+-AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
+-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+-AC_CHECK_FUNC(getaddrinfo,,[AC_CHECK_LIB(nsl,getaddrinfo)])
+-if test x"$ac_cv_func_getaddrinfo" = "xyes" ; then
+- AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if getaddrinfo() is available])
+-fi
+-AC_CHECK_FUNC(getnameinfo,,[AC_CHECK_LIB(nsl,getnameinfo)])
+-if test x"$ac_cv_func_getnameinfo" = "xyes" ; then
+- AC_DEFINE(HAVE_GETNAMEINFO, 1, [Define if getnameinfo() is available])
+-fi
+-have_inet_pton=no
+-AC_CHECK_FUNC(inet_pton,,)
+-if test x"$ac_cv_func_inet_pton" = "xyes" ; then
+- have_inet_pton=yes
+- AC_DEFINE(HAVE_INET_PTON, 1, [Define if inet_pton() is available])
+-fi
+-
+-# AC_CHECK_TYPE doesn't work here.
+-AC_MSG_CHECKING([for socklen_t])
+-AC_TRY_COMPILE(
+- [#ifdef _WIN32
+-#include <ws2tcpip.h>
+-#else
+-#include <sys/types.h>
+-#include <sys/socket.h>
+-#endif],
+- [socklen_t len;],
+- [AC_MSG_RESULT(yes)],
+- [AC_DEFINE(socklen_t, size_t, [Define socklen_t to be of type size_t])
+- AC_MSG_RESULT(no)])
+-
+-# Blatantly stolen from configure.in in the sample code from
+-# "UNIX Network Programming, Volume 1" by W. Richard Stevens
+-AC_CACHE_CHECK(if sockaddr has sa_len member,
+-ac_cv_sockaddr_has_sa_len,
+- AC_TRY_COMPILE([
+-# include <sys/types.h>
+-# include <sys/socket.h>],
+- [unsigned int i = sizeof(((struct sockaddr *)0)->sa_len)],
+- ac_cv_sockaddr_has_sa_len=yes,
+- ac_cv_sockaddr_has_sa_len=no))
+-if test x"$ac_cv_sockaddr_has_sa_len" = "xyes" ; then
+- AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Define if sockaddr has sa_len member])
+-fi
+-
+-dnl
+-dnl --------- end linc bits ---------
+-dnl
+-
+-dnl
+-dnl --------- set additional gcc flags to catch errors ---------
+-dnl
+-AX_CFLAGS_GCC_OPTION(-Werror-implicit-function-declaration)
+-CFLAGS="$CFLAGS $ORBIT_DEBUG_CFLAGS"
+-AC_SUBST(CFLAGS)
+-
+-
+-dnl ----- gtk-doc ------
+-GTK_DOC_CHECK([1.0])
+-
+-
+-AC_CONFIG_FILES([
+-Makefile
+-orbit2-config
+-ORBit-2.0.pc
+-ORBit-2.0-uninstalled.pc
+-ORBit-CosNaming-2.0.pc
+-ORBit-CosNaming-2.0-uninstalled.pc
+-ORBit-imodule-2.0.pc
+-ORBit-imodule-2.0-uninstalled.pc
+-ORBit.spec
+-orbit2-zip
+-src/Makefile
+-src/idl-compiler/Makefile
+-src/idl-compiler/ORBit-idl-2.0.pc
+-src/idl/Makefile
+-src/idl/CORBA/Makefile
+-src/idl/CORBA_PIDL/Makefile
+-src/idl/interop/Makefile
+-src/idl/misc/Makefile
+-src/orb/Makefile
+-src/orb/include/Makefile
+-src/orb/util/Makefile
+-src/orb/GIOP/Makefile
+-src/orb/orb-core/Makefile
+-src/orb/dynamic/Makefile
+-src/orb/poa/Makefile
+-src/services/Makefile
+-src/services/name/Makefile
+-src/services/imodule/Makefile
+-include/Makefile
+-include/orbit/Makefile
+-include/orbit/orbit-config.h
+-include/orbit/GIOP/Makefile
+-include/orbit/util/Makefile
+-include/orbit/orb-core/Makefile
+-include/orbit/poa/Makefile
+-include/orbit/dynamic/Makefile
+-test/Makefile
+-test/everything/Makefile
+-test/inhibit/Makefile
+-test/poa/Makefile
+-docs/Makefile
+-docs/devel/Makefile
+-docs/internals/Makefile
+-docs/api/Makefile
+-
+-linc2/Makefile
+-linc2/src/Makefile
+-linc2/test/Makefile
+-linc2/include/Makefile
+-linc2/include/linc/Makefile
+-linc2/include/linc/linc-config.h
+-])
+-
+-AC_OUTPUT
+-
+-echo "ORBit configuration:
+-
+- Source code location: ${srcdir}
+- Compiler: ${CC}
+-
+- Purify cleanliness: ${enable_purify}
+-"
+diff --git a/include/orbit/GIOP/giop.h b/include/orbit/GIOP/giop.h
+index 20a3a32..8d1dd7a 100644
+--- a/include/orbit/GIOP/giop.h
++++ b/include/orbit/GIOP/giop.h
+@@ -14,6 +14,7 @@ G_BEGIN_DECLS
+
+ #ifdef ORBIT2_INTERNAL_API
+
++void giop_set_main_context (GMainContext *context);
+ void giop_init (gboolean thread_safe,
+ gboolean blank_wire_data);
+ void giop_main_run (void);
+diff --git a/include/orbit/orb-core/corba-orb.h b/include/orbit/orb-core/corba-orb.h
+index 2fc409b..3cc5087 100644
+--- a/include/orbit/orb-core/corba-orb.h
++++ b/include/orbit/orb-core/corba-orb.h
+@@ -32,6 +32,8 @@ gboolean ORBit_proto_use (const char *name);
+ */
+ glong ORBit_get_giop_recv_limit (void);
+
++void ORBit_set_giop_main_context (GMainContext *context);
++
+ #ifdef ORBIT2_INTERNAL_API
+
+ void ORBit_ORB_forw_bind (CORBA_ORB orb,
+diff --git a/include/orbit/util/basic_types.h b/include/orbit/util/basic_types.h
+index 8702276..c8562ca 100644
+--- a/include/orbit/util/basic_types.h
++++ b/include/orbit/util/basic_types.h
+@@ -34,7 +34,6 @@ typedef CORBA_wchar *CORBA_wstring;
+ typedef struct CORBA_Object_type *CORBA_Object;
+ #endif
+
+-#ifdef G_HAVE_GINT64
+ #define HAVE_CORBA_LONG_LONG
+
+ /*
+@@ -44,13 +43,6 @@ typedef struct CORBA_Object_type *CORBA_Object;
+ typedef gint64 CORBA_long_long;
+ typedef guint64 CORBA_unsigned_long_long;
+
+-#else
+-#error ""
+-#error "You don't G_HAVE_GINT64 defined in glib."
+-#error "Please make sure you don't have an old glibconfig.h lying around."
+-#error ""
+-#endif
+-
+ G_END_DECLS
+
+ #endif
+diff --git a/linc2/src/Makefile.am b/linc2/src/Makefile.am
+index 357a2dd..17024b5 100644
+--- a/linc2/src/Makefile.am
++++ b/linc2/src/Makefile.am
+@@ -8,16 +8,16 @@ endif
+
+ # -I$(top_builddir)/include
+ # -I$(top_srcdir)/include
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_builddir)/linc2/include \
+ -I$(top_srcdir)/linc2/include \
+ $(LINC_CFLAGS) \
+ $(WARN_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(DISABLE_DEPRECATED_CFLAGS)
+
+ if OS_WIN32
+ else
+-INCLUDES += -D_GNU_SOURCE
++AM_CPPFLAGS += -D_GNU_SOURCE
+ endif
+
+ liblinc_la_SOURCES = \
+diff --git a/linc2/src/linc-connection.c b/linc2/src/linc-connection.c
+index 77bab0f..88169f9 100644
+--- a/linc2/src/linc-connection.c
++++ b/linc2/src/linc-connection.c
+@@ -651,8 +651,12 @@ link_connection_do_initiate (LinkConnection *cnx,
+ fix_permissions (service);
+ }
+ #endif
+-
++retry:
+ LINK_TEMP_FAILURE_RETRY_SOCKET (connect (fd, saddr, saddr_len), rv);
++ if (rv == -1L && errno == EAGAIN) {
++ g_usleep (10000);
++ goto retry;
++ }
+ #ifdef HAVE_WINSOCK2_H
+ if (rv == SOCKET_ERROR) {
+ if ((options & LINK_CONNECTION_NONBLOCKING) &&
+diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c
+index e6895f4..22a77aa 100644
+--- a/linc2/src/linc-protocols.c
++++ b/linc2/src/linc-protocols.c
+@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto,
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_CANONNAME;
++ hints.ai_family = proto->family;
+
+ if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) {
+ if (!warned++)
+diff --git a/linc2/test/Makefile.am b/linc2/test/Makefile.am
+index 1979b9a..c6532fe 100644
+--- a/linc2/test/Makefile.am
++++ b/linc2/test/Makefile.am
+@@ -2,7 +2,7 @@ noinst_PROGRAMS = test-linc
+
+ # -I$(top_srcdir)/include
+ # -I$(top_builddir)/include
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/linc2/include \
+ -I$(top_builddir)/linc2/include \
+ -I$(top_srcdir)/linc2/src \
+diff --git a/src/idl-compiler/Makefile.am b/src/idl-compiler/Makefile.am
+index b45cae2..44b600b 100644
+--- a/src/idl-compiler/Makefile.am
++++ b/src/idl-compiler/Makefile.am
+@@ -2,7 +2,7 @@ bin_PROGRAMS = orbit-idl-2
+
+ orbit_backends_dir = $(libdir)/orbit-2.0/idl-backends
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_builddir) \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir) \
+diff --git a/src/orb/GIOP/Makefile.am b/src/orb/GIOP/Makefile.am
+index 189f9f8..08b3be3 100644
+--- a/src/orb/GIOP/Makefile.am
++++ b/src/orb/GIOP/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -DORBIT2_INTERNAL_API \
+diff --git a/src/orb/GIOP/giop.c b/src/orb/GIOP/giop.c
+index f287733..3109d1f 100644
+--- a/src/orb/GIOP/giop.c
++++ b/src/orb/GIOP/giop.c
+@@ -21,6 +21,7 @@
+ static int corba_wakeup_fds[2];
+ #define WAKEUP_POLL corba_wakeup_fds [0]
+ #define WAKEUP_WRITE corba_wakeup_fds [1]
++static GMainContext *giop_main_context = NULL;
+ static GSource *giop_main_source = NULL;
+ static GIOPThread *giop_main_thread = NULL;
+
+@@ -530,19 +531,26 @@ ORBit_get_safe_tmp (void)
+ }
+
+ void
++giop_set_main_context (GMainContext *context)
++{
++ giop_main_context = context;
++}
++
++void
+ giop_init (gboolean thread_safe, gboolean blank_wire_data)
+ {
+ link_init (thread_safe);
+
+ if (giop_thread_safe ()) {
+ GIOPThread *tdata;
++ if (!giop_main_context)
++ giop_main_context = g_main_context_default();
+
+ /* We need a destructor to clean up if giopthreads are used
+ * outside of ORBit controlled threads */
+ giop_tdata_private = g_private_new ((GDestroyNotify)giop_thread_free);
+
+- giop_main_thread = tdata = giop_thread_new (
+- g_main_context_default ()); /* main thread */
++ giop_main_thread = tdata = giop_thread_new (giop_main_context); /* main thread */
+
+ if (link_pipe (corba_wakeup_fds) < 0) /* cf. g_main_context_init_pipe */
+ g_error ("Can't create CORBA main-thread wakeup pipe");
+@@ -556,7 +564,7 @@ giop_init (gboolean thread_safe, gboolean blank_wire_data)
+ fcntl (WAKEUP_WRITE, F_SETFL, O_NONBLOCK);
+ #endif
+ giop_main_source = link_source_create_watch (
+- g_main_context_default (), WAKEUP_POLL,
++ giop_main_context, WAKEUP_POLL,
+ NULL, (G_IO_IN | G_IO_PRI),
+ giop_mainloop_handle_input, NULL);
+
+diff --git a/src/orb/Makefile.am b/src/orb/Makefile.am
+index 2b443ba..f82227e 100644
+--- a/src/orb/Makefile.am
++++ b/src/orb/Makefile.am
+@@ -2,7 +2,7 @@ SUBDIRS=include orb-core util GIOP poa dynamic
+
+ lib_LTLIBRARIES=libORBit-2.la
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ -I$(top_srcdir)/include \
+diff --git a/src/orb/dynamic/Makefile.am b/src/orb/dynamic/Makefile.am
+index 330bf53..11e5785 100644
+--- a/src/orb/dynamic/Makefile.am
++++ b/src/orb/dynamic/Makefile.am
+@@ -5,7 +5,7 @@ liborb_dynamic_la_SOURCES= \
+ $(DYNAMIC_IDLOUT) \
+ dynany.c
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/orb \
+ -I$(top_builddir)/include \
+diff --git a/src/orb/orb-core/Makefile.am b/src/orb/orb-core/Makefile.am
+index 7cbed96..43b54ac 100644
+--- a/src/orb/orb-core/Makefile.am
++++ b/src/orb/orb-core/Makefile.am
+@@ -2,7 +2,7 @@ noinst_LTLIBRARIES=liborb-core.la
+
+ TYPELIB_DIR=$(libdir)/orbit-2.0
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I. \
+ -I$(srcdir) \
+ -I$(top_builddir)/include \
+diff --git a/src/orb/orb-core/corba-orb.c b/src/orb/orb-core/corba-orb.c
+index 908535d..2b2229a 100644
+--- a/src/orb/orb-core/corba-orb.c
++++ b/src/orb/orb-core/corba-orb.c
+@@ -1442,6 +1442,12 @@ ORBit_get_giop_recv_limit (void)
+ return giop_recv_get_limit ();
+ }
+
++void
++ORBit_set_giop_main_context (GMainContext *context)
++{
++ giop_set_main_context (context);
++}
++
+ const ORBit_option orbit_supported_options[] = {
+ { "ORBid", ORBIT_OPTION_STRING, NULL }, /* FIXME: unimplemented */
+ { "ORBImplRepoIOR", ORBIT_OPTION_STRING, NULL }, /* FIXME: unimplemented */
+diff --git a/src/orb/poa/Makefile.am b/src/orb/poa/Makefile.am
+index c42ae31..f47069c 100644
+--- a/src/orb/poa/Makefile.am
++++ b/src/orb/poa/Makefile.am
+@@ -2,7 +2,7 @@ noinst_LTLIBRARIES=liborb-poa.la
+
+ IDL = $(top_builddir)/src/idl-compiler/orbit-idl-2
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/src/orb/orb-core \
+diff --git a/src/orb/util/Makefile.am b/src/orb/util/Makefile.am
+index b391cd7..412be1f 100644
+--- a/src/orb/util/Makefile.am
++++ b/src/orb/util/Makefile.am
+@@ -1,6 +1,6 @@
+ noinst_LTLIBRARIES=liborb-util.la
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\" \
+diff --git a/src/services/imodule/Makefile.am b/src/services/imodule/Makefile.am
+index e0731a4..f63c920 100644
+--- a/src/services/imodule/Makefile.am
++++ b/src/services/imodule/Makefile.am
+@@ -2,7 +2,7 @@ NULL =
+
+ lib_LTLIBRARIES = libORBit-imodule-2.la
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -DORBIT2_INTERNAL_API \
+diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
+index 7212557..deda1ed 100644
+--- a/src/services/name/Makefile.am
++++ b/src/services/name/Makefile.am
+@@ -26,7 +26,7 @@ libORBitCosNaming_2_la_LDFLAGS = \
+ $(ORBIT_NAME_LIBS) \
+ $(top_builddir)/src/orb/libORBit-2.la
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I. \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/include \
+diff --git a/test/Makefile.am b/test/Makefile.am
+index a48d38e..87f35af 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = everything inhibit poa
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/orb \
+ -I$(top_builddir)/include \
+diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
+index 32beb36..cb4b1d6 100644
+--- a/test/everything/Makefile.am
++++ b/test/everything/Makefile.am
+@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT = \
+ $(EVERYTHING_BUILT) \
+ everything-imodule.c
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/src \
+@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared
+ BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
+ CLEANFILES = ${BUILT_SOURCES} iorfile
+
+-TESTS = $(srcdir)/test.sh
++TESTS = $(top_builddir)/test/everything/test.sh
+
+ EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
+
+diff --git a/test/inhibit/Makefile.am b/test/inhibit/Makefile.am
+index 3974d0d..ef26a21 100644
+--- a/test/inhibit/Makefile.am
++++ b/test/inhibit/Makefile.am
+@@ -1,7 +1,7 @@
+ noinst_PROGRAMS= \
+ test-inhibit
+
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ $(WARN_CFLAGS) \
+diff --git a/test/poa/Makefile.am b/test/poa/Makefile.am
+index becfcfa..6cf9c38 100644
+--- a/test/poa/Makefile.am
++++ b/test/poa/Makefile.am
+@@ -1,4 +1,4 @@
+-INCLUDES = \
++AM_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ $(WARN_CFLAGS) \
+diff --git a/test/test-mem.c b/test/test-mem.c
+index 94d82f4..c194f30 100644
+--- a/test/test-mem.c
++++ b/test/test-mem.c
+@@ -236,9 +236,9 @@ main_func(int argc, char *argv[]) {
+ PortableServer_POAManager_activate(poa_manager, ev);
+ g_assert (!ORBIT_EX (ev));
+
+- LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_alloc (), 50);
+- LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_sequence (), 50);
+- LEAK_DETECT_WITH_TOLERANCE (1000, test_activate_deactivate (poa, ev), 50);
++ LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_alloc (), 200);
++ LEAK_DETECT_WITH_TOLERANCE (1000, test_ORBit_sequence (), 200);
++ LEAK_DETECT_WITH_TOLERANCE (1000, test_activate_deactivate (poa, ev), 200);
+
+ /* tear down the ORB */
+ CORBA_Object_release ((CORBA_Object) poa_manager, ev);
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index a189b314b..ba2a909e7 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179069 2013-03-02 22:41:59Z andrea $
+# $Id: PKGBUILD 206676 2014-03-04 17:57:45Z andrea $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=qt-assistant-compat
@@ -25,7 +25,7 @@ build() {
qmake-qt4 CONFIG+=create_prl
make
- cd ../translations; lrelease assistant_adp_*.ts
+ cd ../translations; lrelease-qt4 assistant_adp_*.ts
cd ..
qmake-qt4 CONFIG+=create_prl
make
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 6f21c9d27..34fcd81c4 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 192126 2013-08-06 06:45:24Z tpowa $
+# $Id: PKGBUILD 206644 2014-03-04 02:29:34Z bisson $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Michal Krenek <mikos@sg1.cz>
pkgname=testdisk
pkgver=6.14
-pkgrel=1
+pkgrel=2
pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
arch=('i686' 'x86_64')
url="http://www.cgsecurity.org/index.html?testdisk.html"
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 67602c919..0bb0c157b 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 204457 2014-01-20 06:42:42Z andyrtr $
+# $Id: PKGBUILD 206667 2014-03-04 15:17:09Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xterm
-pkgver=301
+pkgver=302
pkgrel=1
pkgdesc="X Terminal Emulator"
arch=('i686' 'x86_64')
url="http://invisible-island.net/xterm/"
license=('custom')
depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
+source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
LICENSE)
-md5sums=('50ba12a4decca06213203bff1b35ef19'
+md5sums=('494e2f3988d22fe7266410c862042250'
+ 'SKIP'
'10ecc3f8ee91e3189863a172f68282d2')
build() {
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-06 17:27:14 +0000