From f8556f42f54505c0b52eed97bedebf12c9e9df68 Mon Sep 17 00:00:00 2001
From: Shackra Sislock <none@none>
Date: Mon, 13 Aug 2012 13:48:00 -0600
Subject: fighting with python2-pysfml and sfml-git

--HG--
rename : pcr/python2-pysfml2-git/PKGBUILD => pcr/python2-pysfml2/PKGBUILD
---
 pcr/sfml-git/PKGBUILD | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'pcr/sfml-git')

diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD
index be243d639..f848a58c1 100644
--- a/pcr/sfml-git/PKGBUILD
+++ b/pcr/sfml-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sfml-git
 pkgver=20120805
-pkgrel=1
+pkgrel=3
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.'
 arch=('i686' 'x86_64')
 url='http://www.sfml-dev.org/'
@@ -16,7 +16,6 @@ source=("arial.patch")
 
 _gitroot='https://github.com/LaurentGomila/SFML.git'
 _gitname='SFML'
-_gitchangeset='191730ac0d639cfdef8fae560cdbc7d7e8c67db1'
 
 build() {
   cd "$srcdir"
@@ -34,12 +33,10 @@ build() {
   msg "Starting make..."
 
   rm -rf "$srcdir/$_gitname-build"
-  cd "$srcdir"
-  git checkout $_gitchangeset >& /dev/null
   #Applying the patch
-  cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/"
-  cd "$srcdir/$_gitname/src/$_gitname/"
-  patch -p3 -i arial.patch
+  # cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/"
+  # cd "$srcdir/$_gitname/src/$_gitname/"
+  # patch -p3 -i arial.patch
 
   cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
-- 
cgit v1.2.3-2-g168b


From 27996ae3144b7cfec2767b548d96de644dc4d86f Mon Sep 17 00:00:00 2001
From: Shackra Sislock <none@none>
Date: Mon, 13 Aug 2012 16:37:51 -0600
Subject: adding better bindings of SFML for python2 and python3 (yes, the
 version provided by Jonathan De Wachter)

--HG--
rename : pcr/python2-pysfml2/PKGBUILD => pcr/python-sfml2/PKGBUILD
rename : pcr/python2-pysfml2/PKGBUILD => pcr/python2-sfml2/PKGBUILD
---
 pcr/sfml-git/PKGBUILD    |  5 ++---
 pcr/sfml-git/arial.patch | 10 ----------
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 pcr/sfml-git/arial.patch

(limited to 'pcr/sfml-git')

diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD
index f848a58c1..94f89f7e7 100644
--- a/pcr/sfml-git/PKGBUILD
+++ b/pcr/sfml-git/PKGBUILD
@@ -3,15 +3,14 @@
 
 pkgname=sfml-git
 pkgver=20120805
-pkgrel=3
+pkgrel=4
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.'
 arch=('i686' 'x86_64')
 url='http://www.sfml-dev.org/'
 license=('zlib')
 depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
 makedepends=('git' 'mesa' 'cmake' 'doxygen')
-conflicts=('sfml')
-provides=('sfml')
+conflicts=('sfml' 'sfml-git')
 source=("arial.patch")
 
 _gitroot='https://github.com/LaurentGomila/SFML.git'
diff --git a/pcr/sfml-git/arial.patch b/pcr/sfml-git/arial.patch
deleted file mode 100644
index a9225065b..000000000
--- a/pcr/sfml-git/arial.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SFML-a/src/SFML/Graphics/CMakeLists.txt	2012-08-03 19:41:49.885910580 -0600
-+++ SFML-b/src/SFML/Graphics/CMakeLists.txt	2012-08-03 19:42:53.578898858 -0600
-@@ -4,7 +4,6 @@
- 
- # all source files
- set(SRC
--    ${SRCROOT}/Arial.hpp
-     ${INCROOT}/BlendMode.hpp
-     ${SRCROOT}/Color.cpp
-     ${INCROOT}/Color.hpp
-- 
cgit v1.2.3-2-g168b