diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-14 13:11:29 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-14 13:11:29 +0200 |
commit | 1d953269cf1d33902f0a61e4cb50ed8ed2895874 (patch) | |
tree | 5738504fa3ad42138b46f2906cf8a40b5f78afb9 /testing | |
parent | 8e5c27c1b5d01d353df2542166d50f9f456b2597 (diff) | |
parent | caa3e47071c8516ac31afaa0b654f5aaa4911939 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/php-apc/PKGBUILD
testing/glibmm/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/udisks2/PKGBUILD
Diffstat (limited to 'testing')
-rw-r--r-- | testing/lua/PKGBUILD | 42 | ||||
-rw-r--r-- | testing/lua/lua-5.1-cflags.diff | 13 | ||||
-rw-r--r-- | testing/lua/lua-arch.patch | 66 | ||||
-rw-r--r-- | testing/readline/PKGBUILD | 55 | ||||
-rw-r--r-- | testing/readline/inputrc | 36 | ||||
-rw-r--r-- | testing/readline/readline.install | 17 |
6 files changed, 0 insertions, 229 deletions
diff --git a/testing/lua/PKGBUILD b/testing/lua/PKGBUILD deleted file mode 100644 index aff34d2e3..000000000 --- a/testing/lua/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 155986 2012-04-10 19:56:22Z bluewind $ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=lua -pkgver=5.1.5 -pkgrel=2 -pkgdesc="A powerful light-weight programming language designed for extending applications" -arch=('i686' 'x86_64') -url="http://www.lua.org/" -depends=('readline') -license=('MIT') -options=('!makeflags' '!emptydirs') -source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz - lua-arch.patch lua-5.1-cflags.diff) -md5sums=('2e115fe26e435e33b0d5c022e4490567' - 'fa25feb70ef9fec975b1c20da5098b3c' - '249582bf1fd861ccf492d2c35a9fe732') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/lua-arch.patch" - patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" - export CFLAGS="$CFLAGS -fPIC" - - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \ - INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ - linux -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \ - INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ - install - install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" - - # Install the documentation - install -d "${pkgdir}/usr/share/doc/lua" - install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua" -} diff --git a/testing/lua/lua-5.1-cflags.diff b/testing/lua/lua-5.1-cflags.diff deleted file mode 100644 index db658aeca..000000000 --- a/testing/lua/lua-5.1-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/testing/lua/lua-arch.patch b/testing/lua/lua-arch.patch deleted file mode 100644 index d8650c3a2..000000000 --- a/testing/lua/lua-arch.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc ---- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 -+++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 -@@ -8,6 +8,6 @@ - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= /usr - INSTALL_BIN= ${prefix}/bin - INSTALL_INC= ${prefix}/include - INSTALL_LIB= ${prefix}/lib -diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h ---- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 -+++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 -@@ -94,7 +94,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ -diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile ---- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100 -+++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100 -@@ -23,6 +23,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 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 -@@ -36,7 +37,7 @@ - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_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) - - default: $(PLAT) -@@ -51,6 +52,11 @@ - $(AR) $@ $? - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - ---- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200 -+++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100 -@@ -53,7 +53,7 @@ - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - test: dummy - src/lua test/hello.lua diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD deleted file mode 100644 index d33d12ec8..000000000 --- a/testing/readline/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 156002 2012-04-11 05:08:06Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=readline -_basever=6.2 -_patchlevel=002 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=2 -pkgdesc="GNU readline library" -arch=('i686' 'x86_64') -url="http://tiswww.case.edu/php/chet/readline/rltop.html" -license=('GPL') -depends=('glibc' 'ncurses') -backup=('etc/inputrc') -options=('!emptydirs') -install=readline.install -source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} - inputrc) -if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) - done -fi -md5sums=('67948acb2ca081f23359d0256e9a271c' - '928f7d248320a65e43c2dc427e99582b' - '58d54966c1191db45973cb3191ac621a' - '83287d52a482f790dfb30ec0a8746669' - '8e6a51e2e0e6e45a82752e3692c111ac' - '0665020ea118e8434bd145fb71f452cc' - '285361ca6d48c51ae2428157e174e812') - -build() { - cd ${srcdir}/${pkgname}-$_basever - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) - done - - # Remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - - # build with -fPIC for x86_64 (FS#15634) - [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - - ./configure --prefix=/usr - make SHLIB_LIBS=-lncurses -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc -} diff --git a/testing/readline/inputrc b/testing/readline/inputrc deleted file mode 100644 index fd13a673b..000000000 --- a/testing/readline/inputrc +++ /dev/null @@ -1,36 +0,0 @@ -# do not bell on tab-completion -#set bell-style none - -set meta-flag on -set input-meta on -set convert-meta off -set output-meta on - -$if mode=emacs - -# for linux console and RH/Debian xterm -"\e[1~": beginning-of-line -"\e[4~": end-of-line -"\e[5~": beginning-of-history -"\e[6~": end-of-history -"\e[7~": beginning-of-line -"\e[3~": delete-char -"\e[2~": quoted-insert -"\e[5C": forward-word -"\e[5D": backward-word -"\e\e[C": forward-word -"\e\e[D": backward-word -"\e[1;5C": forward-word -"\e[1;5D": backward-word - -# for rxvt -"\e[8~": end-of-line - -# for non RH/Debian xterm, can't hurt for RH/DEbian xterm -"\eOH": beginning-of-line -"\eOF": end-of-line - -# for freebsd console -"\e[H": beginning-of-line -"\e[F": end-of-line -$endif diff --git a/testing/readline/readline.install b/testing/readline/readline.install deleted file mode 100644 index 06b646f23..000000000 --- a/testing/readline/readline.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(history.info readline.info rluserman.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - |