lua 5.2.0-1 màj port + kdelibs ajout dep qtwebkit

7 files changed, 119 insertions, 28 deletions

diff --git a/kdelibs/Pkgfile b/kdelibs/Pkgfile
index 0faa2c248..6406e025c 100755
--- a/kdelibs/Pkgfile
+++ b/kdelibs/Pkgfile
@@ -2,8 +2,8 @@
 # URL: http://www.kde.org
 # Maintainer: KDE Project : https://projects.kde.org/projects/kde
 # Packager: lesibel at free dot fr
-# Depends on: qt,cmake,automoc4,phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates,pulseaudio
-# Run on: phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates,pulseaudio
+# Depends on: qt,cmake,automoc4,phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates,pulseaudio,qtwebkit
+# Run on: phonon,strigi,attica,libdbusmenu-qt,polkit-qt,shared-desktop-ontologies,xorg-libxscrnsaver,soprano,qca,acl,grantlee,aspell,enchant,avahi,ca-certificates,pulseaudio,qtwebkit
 
 
 name=kdelibs
diff --git a/lua/.footprint.i686 b/lua/.footprint.i686
index 222013ef6..18025de66 100644
--- a/lua/.footprint.i686
+++ b/lua/.footprint.i686
@@ -10,11 +10,15 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lualib.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liblua.a
+lrwxrwxrwx	root/root	usr/lib/liblua.so -> liblua.so.5.2
+-rw-r--r--	root/root	usr/lib/liblua.so.5.2
 drwxr-xr-x	root/root	usr/lib/lua/
-drwxr-xr-x	root/root	usr/lib/lua/5.1/
+drwxr-xr-x	root/root	usr/lib/lua/5.2/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/lua.pc
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/lua/
+drwxr-xr-x	root/root	usr/share/lua/5.2/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/lua.1.gz
diff --git a/lua/.footprint.x86_64 b/lua/.footprint.x86_64
index 222013ef6..18025de66 100644
--- a/lua/.footprint.x86_64
+++ b/lua/.footprint.x86_64
@@ -10,11 +10,15 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/lualib.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/liblua.a
+lrwxrwxrwx	root/root	usr/lib/liblua.so -> liblua.so.5.2
+-rw-r--r--	root/root	usr/lib/liblua.so.5.2
 drwxr-xr-x	root/root	usr/lib/lua/
-drwxr-xr-x	root/root	usr/lib/lua/5.1/
+drwxr-xr-x	root/root	usr/lib/lua/5.2/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/lua.pc
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/lua/
+drwxr-xr-x	root/root	usr/share/lua/5.2/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/lua.1.gz
diff --git a/lua/.md5sum.x86_64 b/lua/.md5sum.x86_64
index cda9dd598..97dda9404 100644
--- a/lua/.md5sum.x86_64
+++ b/lua/.md5sum.x86_64
@@ -1,3 +1,2 @@
-249582bf1fd861ccf492d2c35a9fe732  lua-5.1.4-cflags.diff
-1239310e0c4a581c7831e596f95cc6cd  lua-5.1.4-patch-lua.patch
-2e115fe26e435e33b0d5c022e4490567  lua-5.1.5.tar.gz
+f1ea831f397214bae8a265995ab1a93e  lua-5.2.0.tar.gz
+51a278f9386afed2ffdd1edb841db3d5  lua.diff
diff --git a/lua/Pkgfile b/lua/Pkgfile
index 80da627af..6246024b4 100644
--- a/lua/Pkgfile
+++ b/lua/Pkgfile
@@ -5,19 +5,18 @@
 # Run on:
 
 name=lua
-version=5.1.5
+#version=5.1.5
+version=5.2.0
 release=1
 source=(http://www.lua.org/ftp/$name-$version.tar.gz 
-	lua-5.1.4-cflags.diff)
+	lua.diff)
 
 build() {
 	cd $name-$version
-	[ `uname -i` == "x86_64" ] && patch -Np1 -i ../lua-5.1.4-cflags.diff
-	[ `uname -i` == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-
-	make linux
+	patch -p1 < ../lua.diff
+	[[ "`uname -m`" == "x86_64" ]] && make MYCFLAGS="-fPIC" linux || make linux
 	make INSTALL_TOP=$PKG/usr  install
 	mv $PKG/usr/{man,share/man}
-	rm -r $PKG/usr/share/lua
-	install -D -m 0644 etc/lua.pc $PKG/usr/lib/pkgconfig/lua.pc
+	make pc > lua.pc
+	install -D -m 0644 lua.pc $PKG/usr/lib/pkgconfig/lua.pc
 }
diff --git a/lua/lua-5.1.4-cflags.diff b/lua/lua-5.1.4-cflags.diff
deleted file mode 100644
index db658aeca..000000000
--- a/lua/lua-5.1.4-cflags.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile
---- lua-5.1.orig/src/Makefile	2006-02-16 16:45:09.000000000 +0100
-+++ lua-5.1/src/Makefile	2006-03-01 14:55:29.000000000 +0100
-@@ -8,7 +8,8 @@
- PLAT= none
- 
- CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
-+CFLAGS ?= -O2 -Wall
-+CFLAGS += $(MYCFLAGS)
- AR= ar rcu
- RANLIB= ranlib
- RM= rm -f
diff --git a/lua/lua.diff b/lua/lua.diff
new file mode 100644
index 000000000..c81dd045c
--- /dev/null
+++ b/lua/lua.diff
@@ -0,0 +1,98 @@
+diff -aur lua-5.2.0.orig/Makefile lua-5.2.0/Makefile
+--- lua-5.2.0.orig/Makefile	2011-11-16 00:38:12.000000000 +0100
++++ lua-5.2.0/Makefile	2012-03-14 09:00:52.823998608 +0100
+@@ -10,7 +10,7 @@
+ # so take care if INSTALL_TOP is not an absolute path. See the local target.
+ # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
+ # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
+-INSTALL_TOP= /usr/local
++INSTALL_TOP= /usr
+ INSTALL_BIN= $(INSTALL_TOP)/bin
+ INSTALL_INC= $(INSTALL_TOP)/include
+ INSTALL_LIB= $(INSTALL_TOP)/lib
+@@ -41,7 +41,7 @@
+ # What to install.
+ TO_BIN= lua luac
+ TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
+-TO_LIB= liblua.a
++TO_LIB= liblua.a liblua.so.5.2
+ TO_MAN= lua.1 luac.1
+ 
+ # Lua version and release.
+@@ -63,6 +63,7 @@
+ 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
+ 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
+ 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
++	ln -s liblua.so.5.2 $(INSTALL_LIB)/liblua.so
+ 
+ uninstall:
+ 	cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
+@@ -103,10 +104,14 @@
+ 
+ # echo pkg-config data
+ pc:
+-	@echo "version=$R"
+ 	@echo "prefix=$(INSTALL_TOP)"
+ 	@echo "libdir=$(INSTALL_LIB)"
+ 	@echo "includedir=$(INSTALL_INC)"
++	@echo "Name: Lua"
++	@echo "Description: An Extensible Extension Language"
++	@echo "Version: $R"
++	@echo "Libs: -L$(INSTALL_LIB) -llua -lm"
++	@echo "Cflags: -I$(INSTALL_INC)"
+ 
+ # list targets that do not create files (but not all makes understand .PHONY)
+ .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
+diff -aur lua-5.2.0.orig/src/Makefile lua-5.2.0/src/Makefile
+--- lua-5.2.0.orig/src/Makefile	2011-09-19 14:45:14.000000000 +0200
++++ lua-5.2.0/src/Makefile	2012-03-14 08:41:50.374000136 +0100
+@@ -7,7 +7,8 @@
+ PLAT= none
+ 
+ CC= gcc
+-CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
++CFLAGS ?= -O2 -Wall
++CFLAGS += -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+ LIBS= -lm $(SYSLIBS) $(MYLIBS)
+ 
+@@ -29,6 +30,7 @@
+ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+ 
+ LUA_A=	liblua.a
++LUA_SO= liblua.so
+ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
+ 	lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \
+ 	ltm.o lundump.o lvm.o lzio.o
+@@ -43,7 +45,7 @@
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -59,6 +61,10 @@
+ 	$(AR) $@ $?
+ 	$(RANLIB) $@
+ 
++$(LUA_SO): $(CORE_O) $(LIB_O)
++	$(CC) -shared -Wl,-soname,liblua.so -o $@.5.2 $? $(MYLDFLAGS)
++	ln -s $@.5.2 $@
++
+ $(LUA_T): $(LUA_O) $(LUA_A)
+ 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ 
+diff -aur lua-5.2.0.orig/src/luaconf.h lua-5.2.0/src/luaconf.h
+--- lua-5.2.0.orig/src/luaconf.h	2011-12-06 17:58:36.000000000 +0100
++++ lua-5.2.0/src/luaconf.h	2012-03-14 08:42:10.370999861 +0100
+@@ -100,7 +100,7 @@
+ #else			/* }{ */
+ 
+ #define LUA_VDIR	LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/"
+-#define LUA_ROOT	"/usr/local/"
++#define LUA_ROOT	"/usr/"
+ #define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR
+ #define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR
+ #define LUA_PATH_DEFAULT  \