Archlinux.fr [Forums]

Code : Tout sélectionner

patch -p0 < le-premier-diff

Code : Tout sélectionner

# Contributor: Michal Minar <mr.mini@centrum.cz>
# Maintainer: Zsolt Udvari <udvzsolt@gmail.com>

pkgname=lua-oocairo
pkgver=1.4
pkgrel=2
pkgdesc="Module providing access to the Cairo from within Lua."
arch=(i686 x86_64)
url="http://luaforge.net/projects/oocairo/"
license=('MIT')
depends=("cairo>=1.8.0" "lua>=5.1")
makedepends=("libtool" "pkgconfig")
source=("http://oocairo.naquadah.org/dist/oocairo-${pkgver}.tar.bz2"
configure-ac.patch
oocairo-c.patch)
md5sums=('d39574cdb781a62728758553afef1d31'
         '8be5ab25d3adfa4b3c44525012f976bf'
         '9576bd35288955bff27b2c387b08db70')

build() {
  cd ${srcdir}/oocairo-${pkgver}
  patch -p0 < ${srcdir}/configure-ac.patch
  patch -p1 < ${srcdir}/oocairo-c.patch
  ./configure --prefix=/usr
  make || return 1
}

package() {
  cd ${srcdir}/oocairo-${pkgver}
  make DESTDIR="$pkgdir" install
  mkdir -p "$pkgdir/usr/share/licenses/lua-oocairo"
  cp COPYRIGHT "$pkgdir/usr/share/licenses/lua-oocairo"
}

Code : Tout sélectionner

--- configure.ac.old		     2013-01-21 11:47:32.672219957 +0100
+++ configure.ac		     2013-01-21 11:47:42.028850478 +0100
@@ -18,6 +18,6 @@
 # Lua gets different names in different distros :(
 PKG_PROG_PKG_CONFIG
 AC_MSG_CHECKING([for lua])
-for lua_name in lua lua5.1
+for lua_name in lua lua5.1 lua5.2
 do
   PKG_CHECK_EXISTS([$lua_name], [LUA_NAME=$lua_name ; break])
 done

Code : Tout sélectionner

--- a/oocairo.c
+++ b/oocairo.c
@@ -41,6 +41,18 @@
 #error "This Lua binding requires Cairo version 1.6 or better."
 #endif
 
+#if LUA_VERSION_NUM >= 502
+#define lua_objlen(a, b)      lua_rawlen(a, b)
+
+static int luaL_typerror (lua_State *L, int narg, const char *tname) {
+    const char *msg = lua_pushfstring(L, "%s expected, got %s",
+                                      tname, luaL_typename(L, narg));
+    return luaL_argerror(L, narg, msg);
+}
+#else
+#define lua_rawlen(a, b) do_not_use_lua_rawlen_use_lua_objlen_instead;
+#endif
+
 static const int ENDIANNESS_TEST_VAL = 1;
 #define IS_BIG_ENDIAN (!(*(const char *) &ENDIANNESS_TEST_VAL))
 
@@ -785,6 +797,14 @@ write_chunk_to_fh (void *closure, const unsigned char *buf,
     return CAIRO_STATUS_SUCCESS;
 }
 
+#if LUA_VERSION_NUM >= 502
+static void
+get_gtk_module_function (lua_State *L, const char *name) {
+    /* FIXME: Implement this again */
+    (void) name;
+    luaL_error(L, "cannot access gtk with lua >= 5.2, TODO: Implement this again");
+}
+#else
 static void
 get_gtk_module_function (lua_State *L, const char *name) {
     lua_getfield(L, LUA_GLOBALSINDEX, "gtk");
@@ -797,6 +817,7 @@ get_gtk_module_function (lua_State *L, const char *name) {
                    name);
     lua_remove(L, -2);
 }
+#endif
 
 static int
 push_cairo_status (lua_State *L, cairo_status_t status) {