spliting ryzom PKGBUILD; ryzom-hg-client doesn't build because an issue from libwww, the compiler cannot find some includes

4 files changed, 91 insertions, 21 deletions

diff --git a/.hgignore b/.hgignore
index ba9140764..9cae9ff14 100644
--- a/.hgignore
+++ b/.hgignore
@@ -12,4 +12,6 @@ pkg/*
 *.gz
 *.tar.*
 */src-libre/*
-*/pkg-libre/*
\ No newline at end of file
+*/pkg-libre/*
+*.orig
+*.bck
\ No newline at end of file
diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD
new file mode 100644
index 000000000..294e28024
--- /dev/null
+++ b/pcr/ryzom-hg-client/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <jorge@abril>
+pkgname=ryzom-hg-client
+pkgver=20130706
+pkgrel=2
+pkgdesc="An awesome free software 3D MMORPG game, Game client."
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL')
+groups=("ryzom-hg")
+depends=('ryzom-hg-nel' 'expat')
+makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel')
+provides=("ryzom-hg-client")
+conflicts=("ryzom-hg-client")
+replaces=("ryzom-hg-client")
+source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz")
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
+mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client
+
+_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
+
+build() {
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+
+  make
+}
+
+package() {
+  cd "$srcdir/build-client"
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD
new file mode 100644
index 000000000..c66aaf567
--- /dev/null
+++ b/pcr/ryzom-hg-nel/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=ryzom-hg-nel
+pkgver=20130706
+pkgrel=5
+pkgdesc="An awesome free software 3D MMORPG game, Game client."
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL')
+groups=("ryzom-hg")
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
+makedepends=('cpptest' 'cmake' 'bison')
+provides=("ryzom-hg-nel")
+conflicts=("ryzom-hg-nel")
+replaces=("ryzom-hg-nel")
+
+source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz")
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
+
+mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
+
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
+
+_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON')
+
+build() {
+  mkdir -p "$srcdir/build-nel"
+  cd "$srcdir/build-nel"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  
+  make
+}
+
+package() {
+  cd "$srcdir/build-nel"
+  make DESTDIR="$pkgdir" install
+  # WWWInit.h is in /usr/include/w3c-libwww according to libwww package!
+  sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 4146ffdb3..8277ccf17 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -10,12 +10,15 @@ arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
 groups=('ryzom-hg')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
 # ryzom-20130706-2-any.src.tar.gz
 source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz"
   'ryzom.sh'
   'ryzom.desktop')
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
+            'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
+            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
 
 mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
 
@@ -25,23 +28,13 @@ _CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRI
 
 _CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
 
-# build() {
-#   cd "$srcdir/$pkgbase-$pkgver"
-#   ./configure --prefix=/usr
-#   make
-# }
-
-# check() {
-#    cd "$srcdir/code"
-#    make -k check
-#  }
-
 package_ryzom-hg-nel() {
   # options and directives that can be overridden
   #pkgver=20130706
   #pkgrel=0
   pkgdesc="An awesome free software 3D MMORPG game. NeL library."
   #depends=()
+  
   provides=('ryzom-hg-nel')
   conflicts=('ryzom-hg-nel')
   replaces=('ryzom-hg-nel')
@@ -49,15 +42,14 @@ package_ryzom-hg-nel() {
   mkdir -p "$srcdir/build-nel"
   cd "$srcdir/build-nel"
 
-  cmake -b "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
   make
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
 package_ryzom-hg-client() {
   # options and directives overrides
   pkgdesc="An awesome free software 3D MMORPG game. Game client."
-
   provides=('ryzom-hg-client')
   conflicts=('ryzom-hg-client')
   replaces=('ryzom-hg-client')
@@ -66,10 +58,7 @@ package_ryzom-hg-client() {
   mkdir -p "$srcdir/build-client"
   cd "$srcdir/build-client"
 
-  cmake -b "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
   make
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
-sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
-            'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
-            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')