Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (dd3c00970d69042bb8a9a5b993f380a4b4f16d38)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (dd3c00970d69042bb8a9a5b993f380a4b4f16d38)
  • Date: Thu, 14 Nov 2013 03:44:55 -0600

GIT changes to devel-xorg-modular grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog
| 3
collab/subversion/DETAILS
| 4
collab/subversion/HISTORY
| 6
dev/null
|binary
devel/python/DETAILS
| 4
devel/python/HISTORY
| 4
devel/python/python.gpg
|binary
graphics-libs/libraw/DETAILS
| 8 -
graphics-libs/libraw/HISTORY
| 3
graphics-libs/opencv/DETAILS
| 4
graphics-libs/opencv/HISTORY
| 3
graphics/imagemagick/DETAILS
| 9 -
graphics/imagemagick/HISTORY
| 3
libs/libfm/DETAILS
| 4
libs/libfm/HISTORY
| 3
libs/libquvi-scripts/DETAILS
| 2
libs/libquvi-scripts/HISTORY
| 3
lxde/menu-cache/DETAILS
| 6
lxde/menu-cache/HISTORY
| 3
perl-cpan/dbi/DETAILS
| 4
perl-cpan/dbi/HISTORY
| 3
qt5/qbs/BUILD
| 5
qt5/qbs/DEPENDS
| 2
qt5/qbs/DETAILS
| 15 +
qt5/qbs/HISTORY
| 4
qt5/qbs/INSTALL
| 1
science/gdal/DETAILS
| 4
science/gdal/HISTORY
| 3
science/qlandkarte-gt/DETAILS
| 4
science/qlandkarte-gt/HISTORY
| 3
shell-term-fm/pcmanfm/DETAILS
| 6
shell-term-fm/pcmanfm/HISTORY
| 3
shell-term-fm/vifm/DETAILS
| 4
shell-term-fm/vifm/HISTORY
| 3
utils/eventlog/DETAILS
| 6
utils/eventlog/HISTORY
| 4
utils/syslog-ng/DETAILS
| 8 -
utils/syslog-ng/HISTORY
| 8 +
video-libs/libdvbpsi/DETAILS
| 4
video-libs/libdvbpsi/HISTORY
| 3
x11-libs/wine/BUILD
| 4
x11-libs/wine/DETAILS
| 2
x11-libs/wine/HISTORY
| 4
x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
| 28 +++
x11/merkaartor/0003-FIX-secondary-road-simple-color.patch
| 25 +++
x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
| 77 ++++++++++
x11/merkaartor/0005-FIX-openSUSE-build.patch
| 37 ++++
x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
| 33 ++++

x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch
| 27 +++
x11/merkaartor/0008-FIX-GDAL-crash.patch
| 26 +++
x11/merkaartor/HISTORY
| 9 +
x11/merkaartor/PRE_BUILD
| 9 +
x11/xautolock/BUILD
| 6
x11/xautolock/CONFIGURE
| 1
x11/xautolock/HISTORY
| 5
55 files changed, 415 insertions(+), 47 deletions(-)

New commits:
commit 0e651c36ed0f5c7e8852c499eec07eb835df4872
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Update: eventlog 2.12 -> 2.20

Naming convension for version number in filename appears to have
changed slightly, but has been accounted for in DETAILS.

Additionally, the SOURCE_HASH field has been updated from SHA512,
which I presume defaults to WORKS_FOR_ME, to SHA1:UPSTREAM_HASH.

commit f314d9c5ed30781b4f19ee3ddd5998354f158834
Author: David Haley <khoralin AT gmail.com>
Commit: David Haley <khoralin AT gmail.com>

Spell Updated: syslog-ng 3.4.5 -> 3.5.1

In addition to the version being bumped up to 3.5.1, the SOURCE_HASH
field was updated from SHA512:WORKS_FOR_ME to SHA1:UPSTREAM_HASH. My
presumption is that using an upstream hash being better than one that
is calculated by developer making the spell update.

balabit.gpg was also removed. DETAILS had some commented out
references to the gpg file in question, but this appears to have been
removed. There no longer appears to be any reference to the gpg file
and for this reason it has been removed.

commit facd0f4aa3625960d4351283210618d3d27c31c8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libquvi-scripts: => 0.4.20

commit 5f835f5ad2a90d540b9afaf35c95cf32f3c8dd2e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

subversion-1.8.4 SECURITY fix

commit 51519602070b1b3f3c15e4788a472b565cfb2eb1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

opencv: => 2.4.7

commit 063cd30f5cbcc3eb67a6e8405820ad7f14177678
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libraw: => 0.15.4

commit bfae11f61fa7fe0226e52fc0fd4c5626c4a3fc55
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dbi: => 1.630

commit e50ef54821bd414159fca848f504298593c83926
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libdvbpsi: => 1.1.2

commit f3611fa6afb2c4a175cb8d79dfbace84a6fa282b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python: => 2.7.6

commit cc7e3bab474247b0714131feb8ed3688abae40e2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qbs-1.1.0

commit f09b98cfadc287de2418144771b0ddc27be54477
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

wine: => 1.7.6

commit 0be4c51e0e6e59183f0432b3ef8c41ccc42c6dad
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

syslog-ng: => 3.4.5

commit f7483728dc9ede314eb281168d5ab32b6ac42bf0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/pcmanfm: version 1.1.2

commit d112d5364ccd4ba70c33669b96900b8d492d450d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libfm: version 1.1.2.2

commit ec793437886d3bff4278d4a45bcaf3ade8240433
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

lxde/menu-cache: version 0.5.1

commit 9eac91f768f9d41291311efff760574ac5eb0cb3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/gdal: version 1.9.2

commit a898a347ed4c375bbad996774feda2da2ddd4a2a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/merkaartor: add bug fixes from upstream

commit ed0fdbc245164ff20dafd42120cbe363acbb5106
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/qlandkarte-gt: version 1.7.5

commit f288166e509c51ebb8cbf15dbe9349f8cbde0430
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

vifm: => 0.7.6

commit 4e5057b46863147c9ed95ac88162122115360107
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

graphics/imagemagick: version 6.8.7-5

commit b15dcde1114769f2fffffd5fcd3f5e13d187a69c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xautolock: added option to read X resources file

diff --git a/ChangeLog b/ChangeLog
index 3a77d32..df53165 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * qt5/qbs: new spell, build system for qt
+
2013-11-06 Ismael Luceno <ismael AT sourcemage.org>
* crypto/sshpass: new spell, Non-interactive ssh password auth

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 549e106..f144a6c 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,6 +1,6 @@
SPELL=subversion
- VERSION=1.8.1
- SECURITY_PATCH=3
+ VERSION=1.8.4
+ SECURITY_PATCH=4
if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
SOURCE=$SPELL-$VERSION.tar.bz2
if [[ "$SVN_HEAD" == y ]]; then
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 136117b..1f46b4d 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,4 +1,8 @@
-2013-08-06Treeve Jelbert <treeve AT sourcemage.org>
+2013-11-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.8.4
+ SECURITY_PATCH++ fix CVE-2013-4246 CVE-2013-4262 CVE-2013-4246
+
+2013-08-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.1
SECURITY_PATCH++ fix CVE-2013-4131

diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index 2a3cf8b..f539ff4 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,6 +1,6 @@
SPELL=python
- VERSION=2.7.5
- SOURCE=Python-$VERSION.tar.bz2
+ VERSION=2.7.6
+ SOURCE=Python-$VERSION.tar.xz
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
SOURCE_URL[0]=http://www.python.org/ftp/$SPELL/$VERSION/$SOURCE
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 2b61eaf..1e9aa97 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,7 @@
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.7.6
+ * python.gpg: add 18ADD4FF Benjamin Peterson <benjamin AT python.org>
+
2013-08-15 Eric Sandall <sandalle AT sourcemage.org>
* UP_TRIGGERS: Trigger check_self on pygobject3

diff --git a/devel/python/python.gpg b/devel/python/python.gpg
index f3a0474..002d756 100644
Binary files a/devel/python/python.gpg and b/devel/python/python.gpg differ
diff --git a/graphics-libs/libraw/DETAILS b/graphics-libs/libraw/DETAILS
index 1137921..8a41d36 100755
--- a/graphics-libs/libraw/DETAILS
+++ b/graphics-libs/libraw/DETAILS
@@ -1,12 +1,12 @@
SPELL=libraw
SPELLX=LibRaw
- VERSION=0.14.6
+ VERSION=0.15.4
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE2=LibRaw-demosaic-pack-GPL2-$VERSION.tar.gz
SOURCE3=LibRaw-demosaic-pack-GPL3-$VERSION.tar.gz
-
SOURCE_HASH=sha512:c5db6a673e3d85f3359925f3c2ed570efb2c01a6275ef9580fc22aa90d84bbc648e70c9da07baf9d9cb7bdce3a096ceaef7d94470f2d699dd8358c319b832dae
-
SOURCE2_HASH=sha512:b4e52ea4c280bee090154f9bd96f1d646b1dd2a26a57b801cf3317b839bff4de3a29f7a4fc7ccf027b13e8547202f0c26665619d4a00b84df4e9847f9c706b55
-
SOURCE3_HASH=sha512:8ee5172eea428f4b2ce42a2df53acc40cfa3ee848a450440e72c2bdcfe246c8fba3d027aedafbad6d88c05393ca84ccf21501ee109f9575a6169bb688b63d6e6
+
SOURCE_HASH=sha512:86a0c3bd8e019b415e75ef8e505e317188d8c24fdcf1aae804234e10cc3dcfd452537cc9a25a2a94f27c3b2ee70ab503af6ab189be3449b2ace3a61353fc255e
+
SOURCE2_HASH=sha512:c75c9823f5c888a81c5e8240999d3facf9a5ed9518c6c1ec93930281cfb055d93b4a44cc80f384032bdc36abc843ed75f53c1c1ee03127221d478a17d26fa0ad
+
SOURCE3_HASH=sha512:0a369349ed11bb888d042724fe85e5c2bd3b553c68aeb6637877560f733956211201fc30940b168e06f3bfaa0f564190b1ab7b999a7a854227db4a9219874e36
WEB_SITE=http://www.libraw.org/
SOURCE_URL[0]=$WEB_SITE/data/$SOURCE
SOURCE2_URL[0]=$WEB_SITE/data/$SOURCE2
diff --git a/graphics-libs/libraw/HISTORY b/graphics-libs/libraw/HISTORY
index e198c8d..1aafcee 100644
--- a/graphics-libs/libraw/HISTORY
+++ b/graphics-libs/libraw/HISTORY
@@ -1,3 +1,6 @@
+2013-11-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.15.4
+
2012-04-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.14.6

diff --git a/graphics-libs/opencv/DETAILS b/graphics-libs/opencv/DETAILS
index fb15a3d..e90e0b6 100755
--- a/graphics-libs/opencv/DETAILS
+++ b/graphics-libs/opencv/DETAILS
@@ -1,6 +1,6 @@
SPELL=opencv
- VERSION=2.4.6.2
-
SOURCE_HASH=sha512:fe7c7ec7cab4d00cf990daeb7a2c16128987350f0a2df07b798c2bad801af7c1f07f99f024c004f94fbc7e38a4399c27fd85132a1fdadc8578385d411b21239f
+ VERSION=2.4.7
+
SOURCE_HASH=sha512:8979971f805b72e3384038acb6d555035a7f921f6b37a901c1f6b7020d076bdbcbb5385d616bb8afb5c03d447cdddbb0ad4b13e84a5fabf5c0a61cae54f49f44
SOURCE=$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-${VERSION}
SOURCE_URL[0]=https://github.com/Itseez/opencv/archive/$SOURCE
diff --git a/graphics-libs/opencv/HISTORY b/graphics-libs/opencv/HISTORY
index 769b682..cf95ac6 100644
--- a/graphics-libs/opencv/HISTORY
+++ b/graphics-libs/opencv/HISTORY
@@ -1,3 +1,6 @@
+2013-11-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.7
+
2013-10-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics-libs/opencv: version 2.4.6.2, TMPFS=off

diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 71d6772..6a2110f 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,13 +1,10 @@
SPELL=imagemagick
- VERSION=6.8.7-4
+ VERSION=6.8.7-5
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
- SOURCE_URL[0]=ftp://ftp.imagemagick.org/pub/ImageMagick/$SOURCE
- SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
- SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
- SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:2c7b4f24a9ee5433c4a82ad4af7bb414b8afa7d355d21e7f20f67f1ba5d7d78bd1e6de7fa40c099905d4b22e8867a2e961aeb5d7842a20430038921728b7c281
+ SOURCE_URL[0]=http://www.imagemagick.org/download/${SOURCE}
+
SOURCE_HASH=sha512:95c48c0bc100efc1f0dc4d18be4dae42a907d321e1990f936eb4d0a713027521660531b337a88ed6a5ce70f36f6759fa6c0652189c1aa218081c6c3dad892e68
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 46979aa..5f10fcc 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2013-11-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.8.7-5, fix source urls
+
2013-11-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 6.8.7-4

diff --git a/libs/libfm/DETAILS b/libs/libfm/DETAILS
index 1cd3153..7412946 100755
--- a/libs/libfm/DETAILS
+++ b/libs/libfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=libfm
- VERSION=1.1.0
+ VERSION=1.1.2.2
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=$SOURCEFORGE_URL/project/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/${SPELL}%20%28required%20by%20PCManFM%29/${SOURCE}
-
SOURCE_HASH=sha512:497c2c0b84022113ee1a1687f979394903b2b20415d884a99e59aea9fd86a2ed0ae404cf75c22e6cd399d7f995c3a10a6fbcf9741854bebb1a5ae7ea56028687
+
SOURCE_HASH=sha512:0c50210432a70f18033df2ce2fc20ce84f987e5efc8a4e7341aa6b7076f132407765257eeaacbc5cd7f81a11465049a2f8c460444bf54f2707b6bd04d3a34239
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
diff --git a/libs/libfm/HISTORY b/libs/libfm/HISTORY
index c6b8b05..0a1fa90 100644
--- a/libs/libfm/HISTORY
+++ b/libs/libfm/HISTORY
@@ -1,3 +1,6 @@
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.2.2
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.0

diff --git a/libs/libquvi-scripts/DETAILS b/libs/libquvi-scripts/DETAILS
index 79199dc..af337ca 100755
--- a/libs/libquvi-scripts/DETAILS
+++ b/libs/libquvi-scripts/DETAILS
@@ -1,5 +1,5 @@
SPELL=libquvi-scripts
- VERSION=0.4.18
+ VERSION=0.4.20
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=$SOURCEFORGE_URL/quvi/$SOURCE
diff --git a/libs/libquvi-scripts/HISTORY b/libs/libquvi-scripts/HISTORY
index 2d264ec..74fd0dc 100644
--- a/libs/libquvi-scripts/HISTORY
+++ b/libs/libquvi-scripts/HISTORY
@@ -1,2 +1,5 @@
+2013-11-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.20
+
2013-09-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS: spell created, version 0.4.18
diff --git a/lxde/menu-cache/DETAILS b/lxde/menu-cache/DETAILS
index cdd8f2f..4935413 100755
--- a/lxde/menu-cache/DETAILS
+++ b/lxde/menu-cache/DETAILS
@@ -1,8 +1,8 @@
SPELL=menu-cache
- VERSION=0.4.1
+ VERSION=0.5.1
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/${SOURCE}
-
SOURCE_HASH=sha512:9744765f6894462139cbb9cbeec74c915df27bfeb31179743fc6dbf2ac20e26520be6d089c8733f0a17248a2aa6687730c5ee28f26eb15195eaa16db5c73aec6
+
SOURCE_URL[0]=$SOURCEFORGE_URL/lxde/menu-cache/menu-cache%20${VERSION%.*}.x/${SOURCE}
+
SOURCE_HASH=sha512:44d55a01f5452804e77518c4a2ba400a5b65edbf4061e346a6c02356195867eaa0bb9eaa057fbf603ddf79759acb16632bf3b7ae543eebc1544e28517cd23066
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://lxde.sourceforge.net/
LICENSE[0]=GPL
diff --git a/lxde/menu-cache/HISTORY b/lxde/menu-cache/HISTORY
index 23a85ad..c0bccfc 100644
--- a/lxde/menu-cache/HISTORY
+++ b/lxde/menu-cache/HISTORY
@@ -1,3 +1,6 @@
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.5.1
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.4.1

diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 7bf4a96..5e073d8 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbi
- VERSION=1.628
-
SOURCE_HASH=sha512:34bb50ba7c0364e064fd5a05ea5415e43e40d082ed299503beccf2cba7b2ddd8f1e79e96606f35f9da279175ac16531da96d3762a71e9e63570f6db7b683f3a1
+ VERSION=1.630
+
SOURCE_HASH=sha512:e7524d46ad54e3766a035c424964d381ab9d771120382e99e4f35b422caccadf4049ec273424ee3b3ef558ff8d2125ac674c0ca23bfa4708ef78e66dbd1b4c78
SOURCE=DBI-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index 6e765f4..7470b90 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2013-11-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.630
+
2013-09-07 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.628

diff --git a/qt5/qbs/BUILD b/qt5/qbs/BUILD
new file mode 100755
index 0000000..38423e1
--- /dev/null
+++ b/qt5/qbs/BUILD
@@ -0,0 +1,5 @@
+ export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
+ PATH="$QT5DIR/bin:$PATH:$SOURCE_DIRECTORY"
+ qmake -r PREFIX=$QT5DIR $OPTS qbs.pro &&
+ make
+
diff --git a/qt5/qbs/DEPENDS b/qt5/qbs/DEPENDS
new file mode 100755
index 0000000..dda21ac
--- /dev/null
+++ b/qt5/qbs/DEPENDS
@@ -0,0 +1,2 @@
+depends qtbase &&
+depends qtscript
diff --git a/qt5/qbs/DETAILS b/qt5/qbs/DETAILS
new file mode 100755
index 0000000..42eabdd
--- /dev/null
+++ b/qt5/qbs/DETAILS
@@ -0,0 +1,15 @@
+QT_URL=http://download.qt-project.org/official_releases/
+ SPELL=qbs
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:4bf93ffdc5f459de84f5316641f279fcadacbbd7fd0635922d10911173706a4dc7e9f1a63c0f4226c063d927c4f00317d76248fd374cff83948995d1f54d8463
+ SOURCE=qbs-$VERSION.src.tar.gz
+ SOURCE_URL=$QT_URL/qbs/$VERSION/$SOURCE
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION.src
+ WEB_SITE=http://qt-project.org
+ ENTERED=20120821
+ LICENSE[0]=LGPL
+ KEYWORDS="qt5"
+ SHORT="build system for qt"
+cat << EOF
+build system for qt
+EOF
diff --git a/qt5/qbs/HISTORY b/qt5/qbs/HISTORY
new file mode 100644
index 0000000..5d763bc
--- /dev/null
+++ b/qt5/qbs/HISTORY
@@ -0,0 +1,4 @@
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+ spell created
+
diff --git a/qt5/qbs/INSTALL b/qt5/qbs/INSTALL
new file mode 100755
index 0000000..b2e3c17
--- /dev/null
+++ b/qt5/qbs/INSTALL
@@ -0,0 +1 @@
+make install INSTALL_ROOT=$QT5DIR
diff --git a/science/gdal/DETAILS b/science/gdal/DETAILS
index 9d83e9b..770a02d 100755
--- a/science/gdal/DETAILS
+++ b/science/gdal/DETAILS
@@ -1,8 +1,8 @@
SPELL=gdal
- VERSION=1.9.1
+ VERSION=1.9.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://download.osgeo.org/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:b3a2752a8bc3b0766b258438373a26e95d763e2fc18617ff88763e07e3f90ccabbc183507b23c24974fc818a16546f10439d83ef80ac7bddc22f6edee1c779a7
+
SOURCE_HASH=sha512:d93cd5fb16a3728a1f545bc6ceeb61bf41e011619b9290ed51eb5fc2d99e3c0f5733bfc6b3444ad2991e462c87c1088247e3fbb92d880701d48790125647b423
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.gdal.org/";
LICENSE[0]="MIT/X"
diff --git a/science/gdal/HISTORY b/science/gdal/HISTORY
index 23564d1..0dc9eb6 100644
--- a/science/gdal/HISTORY
+++ b/science/gdal/HISTORY
@@ -1,3 +1,6 @@
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.9.2
+
2012-06-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9.1

diff --git a/science/qlandkarte-gt/DETAILS b/science/qlandkarte-gt/DETAILS
index f1c9309..c24f003 100755
--- a/science/qlandkarte-gt/DETAILS
+++ b/science/qlandkarte-gt/DETAILS
@@ -1,8 +1,8 @@
SPELL=qlandkarte-gt
- VERSION=1.7.4
+ VERSION=1.7.5
SOURCE="qlandkartegt-${VERSION}.tar.gz"

SOURCE_URL[0]=http://garr.dl.sourceforge.net/project/qlandkartegt/qlandkartegt/QLandkarteGT%20${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:272755b54e62e699677f225c14914b92c5d5eff814c7587009bbc643c7b41fcdbdab4de19ed6bfdd3eb8af3316806ee0dc96c76d41b462581c3538405c71c735
+
SOURCE_HASH=sha512:c68e98b5cbba0fa535e3a2e32566a2451ad602da651a0dade2ba61c040f1c91f9dabad23bdac0d0fcd5cc3ef71394743a5fa10fdd9dd5865b9a32650e808c2f2
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/qlandkartegt-${VERSION}"
WEB_SITE="http://www.qlandkarte.org/";
LICENSE[0]=GPL
diff --git a/science/qlandkarte-gt/HISTORY b/science/qlandkarte-gt/HISTORY
index e191fea..3e1ca23 100644
--- a/science/qlandkarte-gt/HISTORY
+++ b/science/qlandkarte-gt/HISTORY
@@ -1,3 +1,6 @@
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.5
+
2013-10-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.4

diff --git a/shell-term-fm/pcmanfm/DETAILS b/shell-term-fm/pcmanfm/DETAILS
index 709faf1..596a00f 100755
--- a/shell-term-fm/pcmanfm/DETAILS
+++ b/shell-term-fm/pcmanfm/DETAILS
@@ -1,8 +1,8 @@
SPELL=pcmanfm
- VERSION=1.1.0
+ VERSION=1.1.2
SOURCE="${SPELL}-${VERSION}.tar.gz"
- SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:c21f1db1138f0d02e050752144ae3896be6c8e20cf9339284cc98442abdc5af238dfe2329f81612f25ed4f2f611427fee1946a96dfe2f941d3db78e7175c0cdb
+
SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/${SOURCE}
+
SOURCE_HASH=sha512:0640919477bef8a88b76eb96aaf7f261c423189b60b27f720514040b4006ab5d9d30db5f25380320efc322ca2631298c72ee52a92bebf11ebf162eaa577058e1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://wiki.lxde.org/en/PCManFM
LICENSE[0]=GPL
diff --git a/shell-term-fm/pcmanfm/HISTORY b/shell-term-fm/pcmanfm/HISTORY
index da57272..506d6c9 100644
--- a/shell-term-fm/pcmanfm/HISTORY
+++ b/shell-term-fm/pcmanfm/HISTORY
@@ -1,3 +1,6 @@
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.1.2
+
2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.1.0
* PRE_BUILD: fix includes
diff --git a/shell-term-fm/vifm/DETAILS b/shell-term-fm/vifm/DETAILS
index 74f70e3..e39b807 100755
--- a/shell-term-fm/vifm/DETAILS
+++ b/shell-term-fm/vifm/DETAILS
@@ -1,8 +1,8 @@
SPELL=vifm
- VERSION=0.7.5
+ VERSION=0.7.6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:80143be2e4b6547f823cd1e8c58b0b2ee52269f81fb38dd2efb2267ea8d3491660e71be8af54a315a38825ceb86b128f4aa6f84412f1dbd1ffc92a2ec4aa62ca
+
SOURCE_HASH=sha512:8a280d6c4cdef27b34c0865be4a26c5cb98c433a1b01418af230649e6868091fd987c5d75a77b8137fcb44b5c6178e5894f4ccc107d7c8d173146f9b605a45b6
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://vifm.sourceforge.net/
LICENSE[0]=GPL
diff --git a/shell-term-fm/vifm/HISTORY b/shell-term-fm/vifm/HISTORY
index ebb0e06..b80d2dc 100644
--- a/shell-term-fm/vifm/HISTORY
+++ b/shell-term-fm/vifm/HISTORY
@@ -1,3 +1,6 @@
+2013-11-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.6
+
2013-05-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.7.5

diff --git a/utils/eventlog/DETAILS b/utils/eventlog/DETAILS
index 95a393a..eddc4f9 100755
--- a/utils/eventlog/DETAILS
+++ b/utils/eventlog/DETAILS
@@ -1,8 +1,8 @@
SPELL=eventlog
SPELLX=syslog-ng
- VERSION=0.2.12
- VX=3.2.1
-
SOURCE_HASH=sha512:683726e7784d004c71b4b2ee89a1599da5e7b6875d2b3984f69949e9861b930a8880dafbfdeb8f4c1636c07c8a37cccb3eff15d8ffa5529cfeb25f47270996e0
+ VERSION=0.2.12+20120504+1700
+ VX=3.5.1
+ SOURCE_HASH=sha1:19bbfb44379b6c6af8e475656c5b56c038e1219a:UPSTREAM_HASH
SOURCE=${SPELL}_${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.balabit.hu/downloads/files/$SPELLX/sources/$VX/source/$SOURCE
diff --git a/utils/eventlog/HISTORY b/utils/eventlog/HISTORY
index bc623f9..beaf30a 100644
--- a/utils/eventlog/HISTORY
+++ b/utils/eventlog/HISTORY
@@ -1,3 +1,7 @@
+2013-11-13 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: version 2.20
+ Changed SOURCE_HASH SHA512:WORKS_FOR_ME -> SHA1:UPSTREAM_HASH
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/utils/syslog-ng/DETAILS b/utils/syslog-ng/DETAILS
index 3768bb4..72731bb 100755
--- a/utils/syslog-ng/DETAILS
+++ b/utils/syslog-ng/DETAILS
@@ -1,13 +1,9 @@
SPELL=syslog-ng
- VERSION=3.4.2
-
SOURCE_HASH=sha512:94d1c8008c72a7fb82c86eb4ff666cacee26e2b1d7100f58a0ea5293e4efc74ad9608a7b1e72b217f9e6ead4b6ad82f5cf9e00dfcb230a03d3243f5c51fd5305
+ VERSION=3.5.1
+ SOURCE_HASH=sha1:e7e135f64a093db6a7258e6e0bfb35ac014b6de8:UPSTREAM_HASH
SOURCE=${SPELL}_${VERSION}.tar.gz
-# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.balabit.com/downloads/files/syslog-ng/sources/$VERSION/source/$SOURCE
-# SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
-# SOURCE_GPG=balabit.gpg:$SOURCE.asc:UPSTREAM_KEY
-# SOURCE2_IGNORE=signature
WEB_SITE=http://www.balabit.hu
LICENSE[0]=GPL
ENTERED=20020203
diff --git a/utils/syslog-ng/HISTORY b/utils/syslog-ng/HISTORY
index 3ace484..f674d3f 100644
--- a/utils/syslog-ng/HISTORY
+++ b/utils/syslog-ng/HISTORY
@@ -1,3 +1,11 @@
+2013-11-13 David C. Haley <khoralin AT gmail.com>
+ * DETAILS: version 3.51
+ SOURCE_HASH SHA512:WORKS_FOR_ME -> SHA1:UPSTREAM_HASH
+ * balabit.gpg: removed
+
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.4.5
+
2013-07-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4.2

diff --git a/utils/syslog-ng/balabit.gpg b/utils/syslog-ng/balabit.gpg
deleted file mode 100644
index 68b0819..0000000
Binary files a/utils/syslog-ng/balabit.gpg and /dev/null differ
diff --git a/video-libs/libdvbpsi/DETAILS b/video-libs/libdvbpsi/DETAILS
index 00bacf3..a92f13b 100755
--- a/video-libs/libdvbpsi/DETAILS
+++ b/video-libs/libdvbpsi/DETAILS
@@ -1,6 +1,6 @@
SPELL=libdvbpsi
- VERSION=1.1.1
-
SOURCE_HASH=sha512:d758b6e2181e991e450d5bbc8d9682535ec395c8db90704125b8ec6a3975d8f0239bf5d495454c9bb81e08e924ed3c18d408bbabee1da7e7ace9a3d0460feb32
+ VERSION=1.1.2
+
SOURCE_HASH=sha512:9102157467b5b1d1cc42574ce0b6e250974a138ad402eff6707fed1656aeefc19ccff8b041cfef8dd10d8ca3914e83272c0683aa8e7cb59970e619db65eb6167
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
SOURCE_URL[0]=http://download.videolan.org/pub/$SPELL/$VERSION/$SOURCE
diff --git a/video-libs/libdvbpsi/HISTORY b/video-libs/libdvbpsi/HISTORY
index 275fb92..e73bb06 100644
--- a/video-libs/libdvbpsi/HISTORY
+++ b/video-libs/libdvbpsi/HISTORY
@@ -1,3 +1,6 @@
+2013-11-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.2
+
2013-10-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1

diff --git a/x11-libs/wine/BUILD b/x11-libs/wine/BUILD
index d5c1623..b748902 100755
--- a/x11-libs/wine/BUILD
+++ b/x11-libs/wine/BUILD
@@ -1,6 +1,10 @@
# touch non-existant file
touch programs/winetest/tests.rc &&

+
+CFLAGS=${CFLAGS/-O3/-O2} &&
+CXXFLAGS=${CXXFLAGS/-O3/-O2} &&
+
#
# Fixes http://bugs.winehq.com/show_bug.cgi?id=17406
#
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index aed84ce..d378371 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.7.2
+ VERSION=1.7.6
else
VERSION=1.6
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index 9d41f73..abbec69 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,7 @@
+2013-11-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.7.6 (devel)
+ * BUILD: build fix for gcc-4.8.x
+
2013-09-13 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated devel to 1.7.2

diff --git
a/x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
b/x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
new file mode 100644
index 0000000..8873e2e
--- /dev/null
+++ b/x11/merkaartor/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
@@ -0,0 +1,28 @@
+From 9059922e1b75c32ac78cc66e10387063790bfa91 Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Fri, 15 Jun 2012 11:11:17 +0200
+Subject: [PATCH 2/8] FIX : Assert "width > 0" with wireframe with style
+
+---
+ src/Features/Way.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/Features/Way.cpp b/src/Features/Way.cpp
+index fdbf722..7eea383 100644
+--- a/src/Features/Way.cpp
++++ b/src/Features/Way.cpp
+@@ -382,9 +382,8 @@ void Way::drawSimple(QPainter &P, MapView *theView)
+ thePen =
QPen(thePainter->BackgroundColor,thePainter->BackgroundOffset);
+ else
+ thePen =
QPen(p->SimpleColor,(qreal)p->SimpleWidth/LANEWIDTH);
+- } else
+- if (thePainter->DrawForeground)
+- thePen =
QPen(thePainter->ForegroundColor,thePainter->ForegroundOffset);
++ } else if (thePainter->DrawForeground)
++ thePen =
QPen(thePainter->ForegroundColor,thePainter->ForegroundOffset >= 1 ?
thePainter->ForegroundOffset : (qreal)p->SimpleWidth/LANEWIDTH);
+ else
+ thePen =
QPen(p->SimpleColor,(qreal)p->SimpleWidth/LANEWIDTH);
+ }
+--
+1.8.4.2
+
diff --git a/x11/merkaartor/0003-FIX-secondary-road-simple-color.patch
b/x11/merkaartor/0003-FIX-secondary-road-simple-color.patch
new file mode 100644
index 0000000..db878b5
--- /dev/null
+++ b/x11/merkaartor/0003-FIX-secondary-road-simple-color.patch
@@ -0,0 +1,25 @@
+From 6aa2974e6aba87154fa1b47935074b6b18eb431b Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Fri, 15 Jun 2012 11:24:23 +0200
+Subject: [PATCH 3/8] FIX : secondary road simple color
+
+---
+ src/Features/Way.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Features/Way.cpp b/src/Features/Way.cpp
+index 7eea383..ece774b 100644
+--- a/src/Features/Way.cpp
++++ b/src/Features/Way.cpp
+@@ -93,7 +93,7 @@ void WayPrivate::CalculateWidth()
+ SimpleColor = QColor(228, 109, 113);
+ } else if (h == "secondary") {
+ SimpleWidth = 2*LANEWIDTH; // 2 lanes
+- SimpleColor = QColor(253, 191, 252);
++ SimpleColor = QColor(253, 191, 111);
+ } else if (h == "tertiary") {
+ SimpleWidth = 1.5*LANEWIDTH; // shared middle lane
+ SimpleColor = QColor(255, 229, 33);
+--
+1.8.4.2
+
diff --git
a/x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
b/x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
new file mode 100644
index 0000000..99aae1c
--- /dev/null
+++ b/x11/merkaartor/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
@@ -0,0 +1,77 @@
+From 00fd8331de434ca4f567a81559ddd934113ebf84 Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Fri, 29 Jun 2012 12:42:27 +0200
+Subject: [PATCH 4/8] FIX : libgps20 build fix (from Dirk Stocker)
+
+---
+ src/GPS/qgpsdevice.cpp | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
+index de6b220..59d11a1 100644
+--- a/src/GPS/qgpsdevice.cpp
++++ b/src/GPS/qgpsdevice.cpp
+@@ -958,27 +958,33 @@ void QGPSDDevice::run()
+ connect(this,SIGNAL(doStopDevice()),&Forward,SLOT(onStop()));
+ // exec();
+ QEventLoop l;
+-
++#if GPSD_API_MAJOR_VERSION < 5
+ Server = new gpsmm();
+ errno = 0;
+ gpsdata =
Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
+ if (!gpsdata) {
+-#ifndef Q_OS_WIN32
++ #ifndef Q_OS_WIN32
+ QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) );
+-#else
++ #else
+ QString msg( (errno<0) ? "" : strerror(errno) );
+-#endif
++ #endif
+ qDebug() << tr("Unable to connect to
%1:%2").arg(M_PREFS->getGpsdHost()).arg(QString::number(M_PREFS->getGpsdPort()))
+ << ": " << msg;
+ return;
+ }
+-
++#else
++ Server = new
gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data());
++#endif
+ onLinkReady();
+ l.processEvents();
+
+ forever {
+ #if GPSD_API_MAJOR_VERSION > 3
++#if GPSD_API_MAJOR_VERSION < 5
+ if (Server->waiting())
++#else
++ if (Server->waiting(0))
++#endif
+ #endif
+ onDataAvailable();
+ l.processEvents();
+@@ -994,16 +1000,12 @@ void QGPSDDevice::onDataAvailable()
+ if (!gpsdata)
+ return;
+ #else
+- if ( Server->waiting() )
++ gpsdata = Server->read();
++ if (!gpsdata)
+ {
+- errno = 0;
+- gpsdata = Server->read();
+- if ( gpsdata == 0 )
+- {
+- QString msg( (errno==0) ? "socket to gpsd was closed" :
strerror(errno) );
+- qDebug() << "gpsmm::read() failed: " << msg;
+- return;
+- }
++ QString msg( (errno==0) ? "socket to gpsd was closed" :
strerror(errno) );
++ qDebug() << "gpsmm::read() failed: " << msg;
++ return;
+ }
+ #endif
+
+--
+1.8.4.2
+
diff --git a/x11/merkaartor/0005-FIX-openSUSE-build.patch
b/x11/merkaartor/0005-FIX-openSUSE-build.patch
new file mode 100644
index 0000000..dcdf111
--- /dev/null
+++ b/x11/merkaartor/0005-FIX-openSUSE-build.patch
@@ -0,0 +1,37 @@
+From 499458a5b520d8e6951e4f283a93f57c2bb3a106 Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Fri, 29 Jun 2012 12:47:51 +0200
+Subject: [PATCH 5/8] FIX : openSUSE build
+
+---
+ src/Backend/SpatialiteBackend.cpp | 1 +
+ src/Backend/SpatialiteBackend.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/Backend/SpatialiteBackend.cpp
b/src/Backend/SpatialiteBackend.cpp
+index a0ac244..85d8257 100644
+--- a/src/Backend/SpatialiteBackend.cpp
++++ b/src/Backend/SpatialiteBackend.cpp
+@@ -266,6 +266,7 @@ void
SpatialiteBackend::getFeatureSet(QMap<RenderPriority, QSet<Feature *> > &th
+
+ const QList<Feature *> & SpatialiteBackend::indexFind(const QRectF &vp)
+ {
++ return findResult;
+ }
+
+ void SpatialiteBackend::get(const QRectF &bb, QList<Feature *> &theFeatures)
+diff --git a/src/Backend/SpatialiteBackend.h
b/src/Backend/SpatialiteBackend.h
+index 55b0f63..1b120bc 100644
+--- a/src/Backend/SpatialiteBackend.h
++++ b/src/Backend/SpatialiteBackend.h
+@@ -74,6 +74,7 @@ public slots:
+ protected:
+ bool isTemp;
+ QString theFilename;
++ QList<Feature*> findResult;
+ };
+
+ #endif // SPATIALITEBACKEND_H
+--
+1.8.4.2
+
diff --git
a/x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
b/x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
new file mode 100644
index 0000000..e86e0b0
--- /dev/null
+++ b/x11/merkaartor/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
@@ -0,0 +1,33 @@
+From 950109c2fe443b3b60c8e98a0be7914be4301d5d Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Fri, 29 Jun 2012 13:24:27 +0200
+Subject: [PATCH 6/8] FIX : French cadastre parsing issue (fixes #3334)
+
+---
+ .../background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp | 3
++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git
a/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
b/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
+index 6abcab6..30e87e2 100644
+---
a/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
++++
b/plugins/background/MCadastreFranceBackground/qadastre/cadastrewrapper.cpp
+@@ -219,6 +219,7 @@ void CadastreWrapper::networkFinished(QNetworkReply
*reply)
+ m_gotCookie = true;
+ } else if (reply->url() ==
QUrl("http://www.cadastre.gouv.fr/scpc/rechercherPlan.do";)) {
+ QString pageData = reply->readAll();
++ qDebug() << pageData;
+ QWebPage parsedPage(this);
+ QWebFrame *frame = parsedPage.mainFrame();
+ frame->setHtml(pageData);
+@@ -238,7 +239,7 @@ void CadastreWrapper::networkFinished(QNetworkReply
*reply)
+ } else {
+ // We may have been successfull, who knows ?
+ QString name =
frame->findFirstElement("#ville").attribute("value");
+- QWebElementCollection links = frame->findAllElements(".resultat
> .parcelles .view a");
++ QWebElementCollection links = frame->findAllElements(".resultat
> .parcelles a");
+ QRegExp linkRE("c=(\\w+)");
+ foreach (QWebElement link, links) {
+ QString js = link.attribute("onclick");
+--
+1.8.4.2
+
diff --git
a/x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch

b/x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch
new file mode 100644
index 0000000..676d172
--- /dev/null
+++
b/x11/merkaartor/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch
@@ -0,0 +1,27 @@
+From a95b212a29d3a4d624e5d14a90605a3dd4c9e476 Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Fri, 29 Jun 2012 14:01:48 +0200
+Subject: [PATCH 7/8] FIX : Virtual nodes not highlighted on hover (fixes
+ #3333)
+
+---
+ src/Interactions/Interaction.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/Interactions/Interaction.cpp
b/src/Interactions/Interaction.cpp
+index 8d02324..0560f88 100644
+--- a/src/Interactions/Interaction.cpp
++++ b/src/Interactions/Interaction.cpp
+@@ -347,8 +347,7 @@ void FeatureSnapInteraction::paintEvent(QPaintEvent*
anEvent, QPainter& thePaint
+ theMain->properties()->highlighted(i)->drawHighlight(thePainter,
view());
+ }
+
+- //FIXME document()->exists necessary?
+- if (LastSnap && document()->exists(LastSnap)) {
++ if (LastSnap) {
+ LastSnap->drawHover(thePainter, view());
+ view()->setToolTip(LastSnap->toHtml());
+ } else {
+--
+1.8.4.2
+
diff --git a/x11/merkaartor/0008-FIX-GDAL-crash.patch
b/x11/merkaartor/0008-FIX-GDAL-crash.patch
new file mode 100644
index 0000000..ca1016c
--- /dev/null
+++ b/x11/merkaartor/0008-FIX-GDAL-crash.patch
@@ -0,0 +1,26 @@
+From 2d51cab30924999634a43b78e954d1745d5dcd28 Mon Sep 17 00:00:00 2001
+From: "Chris \"Koying\" Browet" <cbro AT semperpax.com>
+Date: Thu, 25 Apr 2013 20:10:27 +0200
+Subject: [PATCH 8/8] FIX: GDAL crash
+
+---
+ src/ImportExport/ImportExportGdal.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/ImportExport/ImportExportGdal.cpp
b/src/ImportExport/ImportExportGdal.cpp
+index 7c829f4..2005d25 100644
+--- a/src/ImportExport/ImportExportGdal.cpp
++++ b/src/ImportExport/ImportExportGdal.cpp
+@@ -331,7 +331,8 @@ bool ImportExportGdal::importGDALDataset(OGRDataSource*
poDS, Layer* aLayer, boo
+ }
+ }
+
+- theSrs->Release();
++ if (theSrs)
++ theSrs->Release();
+ theSrs = new OGRSpatialReference();
+ theSrs->importFromProj4(sPrj.toLatin1().data());
+ toWGS84 = OGRCreateCoordinateTransformation(theSrs, &wgs84srs);
+--
+1.8.4.2
+
diff --git a/x11/merkaartor/HISTORY b/x11/merkaartor/HISTORY
index 744e2d1..167f3a6 100644
--- a/x11/merkaartor/HISTORY
+++ b/x11/merkaartor/HISTORY
@@ -1,3 +1,12 @@
+2013-11-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0002-FIX-Assert-width-0-with-wireframe-with-style.patch,
+ 0003-FIX-secondary-road-simple-color.patch,
+ 0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch,
+ 0005-FIX-openSUSE-build.patch,
+ 0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch,
+ 0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch,
+ 0008-FIX-GDAL-crash.patch: add several bug fixes from upstream
+
2013-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: added dependencies on boost, gdal, proj,
desktop-file-utils,
added sub-dependency on WEBKIT for qt4, added optional dependencies
diff --git a/x11/merkaartor/PRE_BUILD b/x11/merkaartor/PRE_BUILD
new file mode 100755
index 0000000..aa79e48
--- /dev/null
+++ b/x11/merkaartor/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 <
${SPELL_DIRECTORY}/0002-FIX-Assert-width-0-with-wireframe-with-style.patch
&&
+patch -p1 < ${SPELL_DIRECTORY}/0003-FIX-secondary-road-simple-color.patch
&&
+patch -p1 <
${SPELL_DIRECTORY}/0004-FIX-libgps20-build-fix-from-Dirk-Stocker.patch
&&
+patch -p1 < ${SPELL_DIRECTORY}/0005-FIX-openSUSE-build.patch
&&
+patch -p1 <
${SPELL_DIRECTORY}/0006-FIX-French-cadastre-parsing-issue-fixes-3334.patch
&&
+patch -p1 <
${SPELL_DIRECTORY}/0007-FIX-Virtual-nodes-not-highlighted-on-hover-fixes-333.patch
&&
+patch -p1 < ${SPELL_DIRECTORY}/0008-FIX-GDAL-crash.patch
diff --git a/x11/xautolock/BUILD b/x11/xautolock/BUILD
index 3725a6f..0974f91 100755
--- a/x11/xautolock/BUILD
+++ b/x11/xautolock/BUILD
@@ -1,3 +1,7 @@
+if [[ $XAUTOLOCK_READXDEF == y ]]; then
+ CFLAGS="-DReadXdefaultsFile ${CFLAGS}"
+fi &&
+
xmkmf -a &&

-make
+make EXTRA_LDOPTIONS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}"
diff --git a/x11/xautolock/CONFIGURE b/x11/xautolock/CONFIGURE
new file mode 100755
index 0000000..cfbbf60
--- /dev/null
+++ b/x11/xautolock/CONFIGURE
@@ -0,0 +1 @@
+config_query XAUTOLOCK_READXDEF "Do you want $SPELL to read .Xdefaults file
(not recommended, otherwise you need xrdb)?" n
diff --git a/x11/xautolock/HISTORY b/x11/xautolock/HISTORY
index 05bb9e4..3c80a5c 100644
--- a/x11/xautolock/HISTORY
+++ b/x11/xautolock/HISTORY
@@ -1,3 +1,8 @@
+2013-11-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added, to add option for reading .Xdefaults file to get X
+ resources values
+ * BUILD: modify and respect C/LDFLAGS
+
2011-08-30 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: removed dirty hack




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Treeve Jelbert (dd3c00970d69042bb8a9a5b993f380a4b4f16d38), Treeve Jelbert, 11/14/2013

Archive powered by MHonArc 2.6.24.

Top of Page