add graphviz patch

3 files changed, 13 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4af2af0d538d..e54f991b4a33 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = gazebo-git
 	pkgdesc = A multi-robot simulator for outdoor environments. Git version.
-	pkgver = r32502.5d92404905
-	pkgrel = 8
+	pkgver = r32519.e2849f96ac
+	pkgrel = 1
 	url = http://gazebosim.org/
 	install = gazebo.install
 	arch = i686
 	arch = x86_64
 	license = Apache
 	makedepends = cmake
-	makedepends = make
 	makedepends = doxygen
 	makedepends = ruby-ronn
 	makedepends = git
@@ -22,7 +21,7 @@ pkgbase = gazebo-git
 	depends = graphviz
 	depends = libtar
 	depends = libxml2
-	depends = ogre=1.9
+	depends = ogre-1.9
 	depends = protobuf
 	depends = sdformat-9
 	depends = ignition-math
@@ -44,7 +43,7 @@ pkgbase = gazebo-git
 	optdepends = urdfdom: Load URDF files
 	provides = gazebo
 	conflicts = gazebo
-	source = gazebo::https://github.com/osrf/gazebo
+	source = gazebo::git+https://github.com/osrf/gazebo
 	sha256sums = SKIP
 
 pkgname = gazebo-git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 55ec71b5a1ec..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-gazebo*
-patch
-pkg
-src
diff --git a/PKGBUILD b/PKGBUILD
index c361cb9468e4..f1ce4219f050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,15 @@
 # Contributor: Aris Synodinos <arissynod-gmail-com>
 
 pkgname=gazebo-git
-pkgver=r32502.5d92404905
-pkgrel=8
+pkgver=r32519.e2849f96ac
+pkgrel=1
 pkgdesc="A multi-robot simulator for outdoor environments. Git version."
 arch=('i686' 'x86_64')
 url="http://gazebosim.org/"
 license=('Apache')
-# See: http://www.gazebosim.org/tutorials?tut=install_from_source&cat=install
 depends=('boost' 'curl' 'freeglut' 'freeimage' 'tbb' 'libccd' 'libltdl' 'graphviz'
-         'libtar' 'libxml2' 'ogre=1.9' 'protobuf' 'sdformat-9' 'ignition-math' 'ignition-transport-8'
+         'libtar' 'libxml2' 'ogre-1.9' 'protobuf' 'sdformat-9' 'ignition-math' 'ignition-transport-8'
          'ignition-cmake' 'ignition-common-3' 'ignition-fuel_tools-4' 'ignition-msgs-5' 'tinyxml2' 'qwt')
-
 optdepends=('bullet: Bullet support'
             'cegui: Design custom graphical interfaces'
             'ffmpeg: Playback movies on textured surfaces'
@@ -22,25 +20,23 @@ optdepends=('bullet: Bullet support'
             'libusb: USB peripherals support'
             'simbody: Simbody support'
             'urdfdom: Load URDF files')
-makedepends=('cmake' 'make' 'doxygen' 'ruby-ronn' 'git')
+makedepends=('cmake' 'doxygen' 'ruby-ronn' 'git')
 install="gazebo.install"
 provides=('gazebo')
 conflicts=('gazebo')
+source=("gazebo"::"git+https://github.com/osrf/gazebo")
+sha256sums=('SKIP')
 
 _pkgname=gazebo
 
-source=("gazebo"::"git+https://github.com/osrf/gazebo") #  "patch"::"https://github.com/osrf/gazebo/pull/3180.patch")
-sha256sums=('SKIP') #  'SKIP')
-
 pkgver() {
   cd "${_pkgname}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-	cd "${srcdir}/${_pkgname}"
-	# git apply "${srcdir}/patch"
-	# patch -p1 -i "${srcdir}/patch"
+  cd "${srcdir}/${_pkgname}"
+  sed -i 's/putstr/printf/g' gazebo/gui/qgv/private/QGVCore.h
 }
 
 build() {
@@ -48,7 +44,7 @@ build() {
 
   mkdir -p build && cd build
 
-  cmake ..  -DCMAKE_BUILD_TYPE="Release" \
+  cmake .. -DCMAKE_BUILD_TYPE="Release" \
            -DCMAKE_INSTALL_PREFIX="/usr" \
            -DCMAKE_INSTALL_LIBDIR="lib"
   make