summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen D'souza2016-04-15 16:19:09 +0530
committerGlen D'souza2016-04-15 16:19:09 +0530
commita8ceb55d3db542650bff26d62b73d330a7f01dd0 (patch)
tree8d420700bde233e03de755420d98868b7a7f5955
parent15e76f4f14a801a14db45a5190d614d479e7ff3e (diff)
downloadaur-a8ceb55d3db542650bff26d62b73d330a7f01dd0.tar.gz
Fix build
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD13
-rw-r--r--getKern.patch22
3 files changed, 36 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7207cbd515bc..a0e8f35addd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Dec 11 19:45:56 UTC 2015
+# Fri Apr 15 10:47:57 UTC 2016
pkgbase = simgear-git
pkgdesc = A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications.
- pkgver = 20151212
+ pkgver = 20160415
pkgrel = 1
url = http://simgear.sourceforge.net/
arch = i686
@@ -19,7 +19,9 @@ pkgbase = simgear-git
provides = simgear-git
conflicts = simgear
source = git://git.code.sf.net/p/flightgear/simgear
+ source = getKern.patch
md5sums = SKIP
+ md5sums = b4ab9878bbb07555d7fef68b592fb2de
pkgname = simgear-git
diff --git a/PKGBUILD b/PKGBUILD
index 57add8209729..020785e4bc1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: jmf <jmf at mesecons dot net>
# Contributor: Pascal Groschwitz <p.groschwitz@googlemail.com>
pkgname=simgear-git
-pkgver=20151212
+pkgver=20160415
pkgrel=1
_gitname=simgear
pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
@@ -14,13 +14,20 @@ optdepends=()
makedepends=('boost' 'cmake' 'mesa')
provides=('simgear-git')
conflicts=('simgear')
-source=(git://git.code.sf.net/p/flightgear/simgear)
-md5sums=('SKIP')
+source=(git://git.code.sf.net/p/flightgear/simgear
+ getKern.patch)
+md5sums=('SKIP'
+ 'b4ab9878bbb07555d7fef68b592fb2de')
pkgver() {
echo "$(date +"%Y%m%d")"
}
+prepare() {
+ cd ${srcdir}
+ patch -p0 -i getKern.patch
+}
+
build() {
cd ${srcdir}/${_gitname}
git checkout next
diff --git a/getKern.patch b/getKern.patch
new file mode 100644
index 000000000000..498ac941fed4
--- /dev/null
+++ b/getKern.patch
@@ -0,0 +1,22 @@
+--- simgear/simgear/canvas/elements/CanvasText.cxx
++++ simgear/simgear/canvas/elements/CanvasText.cxx
+@@ -496,7 +496,8 @@
+ {
+ case LEFT_TO_RIGHT:
+ {
+- osg::Vec2 delta( activefont->getKerning( previous_charcode,
++ osg::Vec2 delta( activefont->getKerning( _fontSize,
++ previous_charcode,
+ charcode,
+ _kerningType ) );
+ cursor.x() += delta.x() * wr;
+@@ -505,7 +506,8 @@
+ }
+ case RIGHT_TO_LEFT:
+ {
+- osg::Vec2 delta( activefont->getKerning( charcode,
++ osg::Vec2 delta( activefont->getKerning( _fontSize,
++ charcode,
+ previous_charcode,
+ _kerningType ) );
+ cursor.x() -= delta.x() * wr;