From 94bb480c5cd265e7d0fad94bc076f290864b9241 Mon Sep 17 00:00:00 2001 From: Neophytos Date: Sun, 27 May 2012 12:46:05 +0000 Subject: [PATCH] updates for lib32 packages: alsa-lib, alsa-oss, alsa-plugins, atk, cairo, catalyst-utils, freetype2-ubuntu, kmod, libcups, libdrm, libpulse, libvorbis, sdl, sqlite, udev --- lib32-alsa-lib/PKGBUILD | 4 +- lib32-alsa-oss/PKGBUILD | 6 +- lib32-alsa-plugins/PKGBUILD | 4 +- lib32-atk/PKGBUILD | 13 +- lib32-cairo/PKGBUILD | 2 +- lib32-catalyst-utils/PKGBUILD | 2 +- lib32-freetype2-ubuntu/PKGBUILD | 53 ++++++++ lib32-freetype2-ubuntu/apple-offset.patch | 12 ++ lib32-freetype2-ubuntu/enable-valid.patch | 20 +++ .../001_all_heimdal-no_libedit.patch | 10 ++ lib32-heimdal/002_all_heimal-fPIC.patch | 12 ++ lib32-heimdal/003_all_heimdal-rxapps.patch | 22 ++++ lib32-heimdal/005_all_heimdal-suid_fix.patch | 20 +++ lib32-heimdal/012_all_heimdal-berkdb.patch | 124 ++++++++++++++++++ .../013_all_heimdal-pthread-lib.patch | 11 ++ lib32-heimdal/014_all_heimdal-path.patch | 50 +++++++ lib32-heimdal/PKGBUILD | 69 ++++++++++ lib32-kmod/PKGBUILD | 40 ++++++ lib32-libcups/PKGBUILD | 24 ++-- lib32-libdrm/PKGBUILD | 12 +- lib32-libdrm/no-pthread-stubs.patch | 21 +-- lib32-libpulse/PKGBUILD | 53 ++++---- lib32-libvorbis/PKGBUILD | 4 +- lib32-sdl/PKGBUILD | 14 +- .../sdl-1.2.14-fix-disappearing-cursor.patch | 17 --- lib32-sdl/sdl-1.2.14-joystick-crash.diff | 14 -- lib32-sqlite3/PKGBUILD | 6 +- lib32-udev/PKGBUILD | 19 ++- 28 files changed, 544 insertions(+), 114 deletions(-) create mode 100644 lib32-freetype2-ubuntu/PKGBUILD create mode 100644 lib32-freetype2-ubuntu/apple-offset.patch create mode 100644 lib32-freetype2-ubuntu/enable-valid.patch create mode 100644 lib32-heimdal/001_all_heimdal-no_libedit.patch create mode 100644 lib32-heimdal/002_all_heimal-fPIC.patch create mode 100644 lib32-heimdal/003_all_heimdal-rxapps.patch create mode 100644 lib32-heimdal/005_all_heimdal-suid_fix.patch create mode 100644 lib32-heimdal/012_all_heimdal-berkdb.patch create mode 100644 lib32-heimdal/013_all_heimdal-pthread-lib.patch create mode 100644 lib32-heimdal/014_all_heimdal-path.patch create mode 100644 lib32-heimdal/PKGBUILD create mode 100644 lib32-kmod/PKGBUILD delete mode 100644 lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch delete mode 100644 lib32-sdl/sdl-1.2.14-joystick-crash.diff diff --git a/lib32-alsa-lib/PKGBUILD b/lib32-alsa-lib/PKGBUILD index 4cb3fd3..e856cfa 100644 --- a/lib32-alsa-lib/PKGBUILD +++ b/lib32-alsa-lib/PKGBUILD @@ -5,7 +5,7 @@ _pkgbasename=alsa-lib pkgname=lib32-${_pkgbasename} -pkgver=1.0.24.1 +pkgver=1.0.25 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support (32 bit)" arch=('x86_64') @@ -15,7 +15,7 @@ depends=('lib32-glibc' 'alsa-lib') license=('GPL') options=(!libtool) source=(ftp://ftp.alsa-project.org/pub/lib/${_pkgbasename}-$pkgver.tar.bz2) -md5sums=('7cc05f25e1d5b65da8fb3fdcd540f226') +md5sums=('06fe5819020c6684b991dcffc5471304') build() { cd $srcdir/${_pkgbasename}-$pkgver diff --git a/lib32-alsa-oss/PKGBUILD b/lib32-alsa-oss/PKGBUILD index 6006080..0fa5d01 100644 --- a/lib32-alsa-oss/PKGBUILD +++ b/lib32-alsa-oss/PKGBUILD @@ -5,8 +5,8 @@ _pkgbasename=alsa-oss pkgname=lib32-${_pkgbasename} -pkgver=1.0.17 -pkgrel=2 +pkgver=1.0.25 +pkgrel=1 pkgdesc="OSS compatibility library (32 bit)" arch=(x86_64) license=('GPL') @@ -14,7 +14,7 @@ url="http://www.alsa-project.org" options=(!libtool) depends=('lib32-glibc' 'lib32-alsa-lib' 'alsa-oss') source=(ftp://ftp.alsa-project.org/pub/oss-lib/${_pkgbasename}-$pkgver.tar.bz2) -md5sums=('1b1850c2fc91476a73d50f537cbd402f') +md5sums=('922ea177db15c72f1b5037181c73f934') build() { cd $srcdir/${_pkgbasename}-$pkgver diff --git a/lib32-alsa-plugins/PKGBUILD b/lib32-alsa-plugins/PKGBUILD index dbaedcb..ce1157e 100644 --- a/lib32-alsa-plugins/PKGBUILD +++ b/lib32-alsa-plugins/PKGBUILD @@ -6,7 +6,7 @@ _pkgbasename=alsa-plugins pkgname=lib32-$_pkgbasename -pkgver=1.0.24 +pkgver=1.0.25 pkgrel=1 pkgdesc="Extra alsa plugins (32-bit)" arch=(x86_64) @@ -20,7 +20,7 @@ optdepends=('lib32-libpulse: PulseAudio plugin' 'lib32-speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2") -md5sums=('e4d4c90e11ab9d1a117afbbc1edd2b16') +md5sums=('038c023eaa51171f018fbf7141255185') build() { cd "$srcdir/$_pkgbasename-$pkgver" diff --git a/lib32-atk/PKGBUILD b/lib32-atk/PKGBUILD index ced0e4d..98e198e 100644 --- a/lib32-atk/PKGBUILD +++ b/lib32-atk/PKGBUILD @@ -5,17 +5,17 @@ _pkgbasename=atk pkgname=lib32-$_pkgbasename -pkgver=1.32.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility (32-bit)" arch=('x86_64') license=('LGPL') -depends=('lib32-glib2>=2.25.17' $_pkgbasename) +depends=('lib32-glib2' $_pkgbasename) makedepends=('gcc-multilib') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.32/${_pkgbasename}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) url='http://www.gtk.org/' -sha256sums=('e9a3e598f75c4db1af914f8b052dd9f7e89e920a96cc187c18eb06b8339cb16e') +md5sums=('87f20b78deaedef858ac54358c0786b1') build() { export CC="gcc -m32" @@ -23,8 +23,9 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --disable-introspection + ./configure --prefix=/usr \ + --libdir=/usr/lib32 \ + --disable-introspection make } diff --git a/lib32-cairo/PKGBUILD b/lib32-cairo/PKGBUILD index 6110566..d092719 100644 --- a/lib32-cairo/PKGBUILD +++ b/lib32-cairo/PKGBUILD @@ -6,7 +6,7 @@ _pkgbasename=cairo pkgname=lib32-$_pkgbasename pkgver=1.10.2 -pkgrel=1 +pkgrel=3 pkgdesc="Cairo vector graphics library (32-bit)" arch=('x86_64') url="http://cairographics.org/" diff --git a/lib32-catalyst-utils/PKGBUILD b/lib32-catalyst-utils/PKGBUILD index cf68bcf..c318e52 100644 --- a/lib32-catalyst-utils/PKGBUILD +++ b/lib32-catalyst-utils/PKGBUILD @@ -6,7 +6,7 @@ _pkgsourcename=catalyst-utils pkgname=lib32-$_pkgsourcename pkgver=12.4 -pkgrel=2 +pkgrel=3 pkgdesc="AMD/ATI catalyst driver utilities and libraries. (32-bit)" url="http://www.ati.amd.com" arch=(x86_64) diff --git a/lib32-freetype2-ubuntu/PKGBUILD b/lib32-freetype2-ubuntu/PKGBUILD new file mode 100644 index 0000000..f0defad --- /dev/null +++ b/lib32-freetype2-ubuntu/PKGBUILD @@ -0,0 +1,53 @@ +# Lib32 Packages for Chakra, part of chakra-project.org +# +# maintainer (x86_64): Giuseppe Calà +# maintainer (x86_64): Anke Boersma + +_pkgbasename=freetype2-ubuntu +pkgname=lib32-$_pkgbasename +pkgver=2.4.9 +_pkgver=2.4.4-2 +pkgrel=1 +pkgdesc="TrueType font rendering library (32-bit) with infinality patch" +arch=(x86_64) +license=('GPL') +url="http://freetype.sourceforge.net" +depends=('lib32-zlib' $_pkgbasename) +makedepends=(gcc-multilib) +conflicts=('lib32-freetype2') +provides=("lib32-freetype2=$pkgver") +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 + https://launchpad.net/ubuntu/oneiric/+source/freetype/$_pkgver/+files/freetype_$_pkgver.diff.gz + apple-offset.patch + enable-valid.patch) + +md5sums=('77a893dae81fd5b896632715ca041179' + '8a170e472c2b1d60dff0987722a290d3' + '1c964f90ae90aa391af574ceb0814cda' + '214119610444c9b02766ccee5e220680') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/freetype-${pkgver}" + + msg "applying apple-offset.patch..." + patch -Np1 -i "${srcdir}/apple-offset.patch" + + msg "applying enable-valid.patch..." + patch -Np1 -i "${srcdir}/enable-valid.patch" + + ./configure --prefix=/usr --libdir=/usr/lib32 + make +} + +package() { + cd "${srcdir}/freetype-${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/lib32-freetype2-ubuntu/apple-offset.patch b/lib32-freetype2-ubuntu/apple-offset.patch new file mode 100644 index 0000000..f6a986e --- /dev/null +++ b/lib32-freetype2-ubuntu/apple-offset.patch @@ -0,0 +1,12 @@ +diff -rupN freetype-2.3.11.orig/include/freetype/config/ftoption.h freetype-2.3.11/include/freetype/config/ftoption.h +--- freetype-2.3.11.orig/include/freetype/config/ftoption.h 2010-02-05 10:53:35.000000000 +0000 ++++ freetype-2.3.11/include/freetype/config/ftoption.h 2010-02-05 10:54:29.000000000 +0000 +@@ -574,7 +574,7 @@ FT_BEGIN_HEADER + /* http://partners.adobe.com/asn/developer/opentype/glyf.html */ + /* http://fonts.apple.com/TTRefMan/RM06/Chap6glyf.html */ + /* */ +-#undef TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED ++#define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED + + + /*************************************************************************/ diff --git a/lib32-freetype2-ubuntu/enable-valid.patch b/lib32-freetype2-ubuntu/enable-valid.patch new file mode 100644 index 0000000..c78b6b7 --- /dev/null +++ b/lib32-freetype2-ubuntu/enable-valid.patch @@ -0,0 +1,20 @@ +--- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 ++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 +@@ -110,7 +110,7 @@ + AUX_MODULES += cache + + # TrueType GX/AAT table validation. Needs ftgxval.c below. +-# AUX_MODULES += gxvalid ++AUX_MODULES += gxvalid + + # Support for streams compressed with gzip (files with suffix .gz). + # +@@ -124,7 +124,7 @@ + + # OpenType table validation. Needs ftotval.c below. + # +-# AUX_MODULES += otvalid ++AUX_MODULES += otvalid + + # Auxiliary PostScript driver component to share common code. + # diff --git a/lib32-heimdal/001_all_heimdal-no_libedit.patch b/lib32-heimdal/001_all_heimdal-no_libedit.patch new file mode 100644 index 0000000..a551bdc --- /dev/null +++ b/lib32-heimdal/001_all_heimdal-no_libedit.patch @@ -0,0 +1,10 @@ +--- cf/krb-readline.m4 2005-06-16 18:28:32.000000000 +0200 ++++ cf/krb-readline.m4 2005-06-27 23:17:06.000000000 +0200 +@@ -6,7 +6,6 @@ + dnl el_init + + AC_DEFUN([KRB_READLINE],[ +-AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) + if test "$ac_cv_func_el_init" = yes ; then + AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include diff --git a/lib32-heimdal/002_all_heimal-fPIC.patch b/lib32-heimdal/002_all_heimal-fPIC.patch new file mode 100644 index 0000000..c67dbae --- /dev/null +++ b/lib32-heimdal/002_all_heimal-fPIC.patch @@ -0,0 +1,12 @@ +--- lib/editline/Makefile.am 2005-06-16 18:28:44.000000000 +0200 ++++ lib/editline/Makefile.am 2005-06-27 23:21:02.000000000 +0200 +@@ -41,6 +41,9 @@ + + EXTRA_DIST = $(man_MANS) + ++$(libeditline_la_OBJECTS): %.lo: %.c ++ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++ + snprintf.c: + $(LN_S) $(srcdir)/../roken/snprintf.c . + strdup.c: diff --git a/lib32-heimdal/003_all_heimdal-rxapps.patch b/lib32-heimdal/003_all_heimdal-rxapps.patch new file mode 100644 index 0000000..40fc05f --- /dev/null +++ b/lib32-heimdal/003_all_heimdal-rxapps.patch @@ -0,0 +1,22 @@ +--- appl/kx/rxtelnet.in 2005-06-16 18:29:10.000000000 +0200 ++++ appl/kx/rxtelnet.in 2005-06-27 23:21:34.000000000 +0200 +@@ -2,7 +2,7 @@ + # $Id: rxtelnet.in,v 1.31 2004/03/07 17:22:06 lha Exp $ + # + usage="Usage: $0 [-l username] [-k] [-fF] [-t args_to_telnet] [-x args_to_xterm] [-K args_to_kx] [-w term_emulator] [-b telnet_binary] [-n] [-v] [-h | --help] [--version] host [port]" +-binary=telnet ++binary=ktelnet + term= + kx_args=-P + while true +--- appl/kx/rxterm.in 2005-06-16 18:29:10.000000000 +0200 ++++ appl/kx/rxterm.in 2005-06-27 23:21:55.000000000 +0200 +@@ -2,7 +2,7 @@ + # $Id: rxterm.in,v 1.23 2002/03/18 17:37:34 joda Exp $ + # + usage="Usage: $0 [-l username] [-k] [-f] [-r rsh_args] [-x xterm_args] [-K kx_args] [-w term_emulator] [-b rsh_binary][-v] [-h | --help] [--version] host" +-binary=rsh ++binary=krsh + term=xterm + while true + do diff --git a/lib32-heimdal/005_all_heimdal-suid_fix.patch b/lib32-heimdal/005_all_heimdal-suid_fix.patch new file mode 100644 index 0000000..35a9ed9 --- /dev/null +++ b/lib32-heimdal/005_all_heimdal-suid_fix.patch @@ -0,0 +1,20 @@ +--- appl/su/Makefile.am 2005-06-16 18:27:46.000000000 +0200 ++++ appl/su/Makefile.am 2005-06-27 23:25:21.000000000 +0200 +@@ -7,6 +7,7 @@ + bin_PROGRAMS = su + bin_SUIDS = su + su_SOURCES = su.c supaths.h ++su_LDFLAGS = -Wl,-z,now + man_MANS = su.1 + + LDADD = $(LIB_kafs) \ +--- appl/otp/Makefile.am 2005-06-16 18:28:46.000000000 +0200 ++++ appl/otp/Makefile.am 2005-06-27 23:25:40.000000000 +0200 +@@ -8,6 +8,7 @@ + bin_SUIDS = otp + otp_SOURCES = otp.c otp_locl.h + otpprint_SOURCES = otpprint.c otp_locl.h ++otp_LDFLAGS = -Wl,-z,now + + man_MANS = otp.1 otpprint.1 + diff --git a/lib32-heimdal/012_all_heimdal-berkdb.patch b/lib32-heimdal/012_all_heimdal-berkdb.patch new file mode 100644 index 0000000..46762c2 --- /dev/null +++ b/lib32-heimdal/012_all_heimdal-berkdb.patch @@ -0,0 +1,124 @@ +Binary files heimdal-0.7-old/cf/.find-func-no-libs2.m4.swp and heimdal-0.7/cf/.find-func-no-libs2.m4.swp differ +Index: heimdal/cf/db.m4 +=================================================================== +--- heimdal.orig/cf/db.m4 ++++ heimdal/cf/db.m4 +@@ -18,24 +18,13 @@ db_type=unknown + + if test "$enable_berkeley_db" != no; then + +- AC_CHECK_HEADERS([ \ +- db4/db.h \ +- db3/db.h \ +- db.h \ +- db_185.h \ +- ]) ++ AC_CHECK_HEADERS([db.h]) + + dnl db_create is used by db3 and db4 + +- AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [ ++ AC_FIND_FUNC_NO_LIBS(db_create, db, [ + #include +- #ifdef HAVE_DB4_DB_H +- #include +- #elif defined(HAVE_DB3_DB_H) +- #include +- #else + #include +- #endif + ],[NULL, NULL, 0]) + + if test "$ac_cv_func_db_create" = "yes"; then +@@ -50,17 +39,9 @@ dnl db_create is used by db3 and db4 + + dnl dbopen is used by db1/db2 + +- AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [ ++ AC_FIND_FUNC_NO_LIBS(dbopen, db, [ + #include +- #if defined(HAVE_DB2_DB_H) +- #include +- #elif defined(HAVE_DB_185_H) +- #include +- #elif defined(HAVE_DB_H) + #include +- #else +- #error no db.h +- #endif + ],[NULL, 0, 0, 0, NULL]) + + if test "$ac_cv_func_dbopen" = "yes"; then +Index: heimdal/lib/hdb/db.c +=================================================================== +--- heimdal.orig/lib/hdb/db.c ++++ heimdal/lib/hdb/db.c +@@ -37,11 +37,7 @@ RCSID("$Id: db.c 20215 2007-02-09 21:59: + + #if HAVE_DB1 + +-#if defined(HAVE_DB_185_H) +-#include +-#elif defined(HAVE_DB_H) + #include +-#endif + + static krb5_error_code + DB_close(krb5_context context, HDB *db) +Index: heimdal/lib/hdb/db3.c +=================================================================== +--- heimdal.orig/lib/hdb/db3.c ++++ heimdal/lib/hdb/db3.c +@@ -37,13 +37,7 @@ RCSID("$Id: db3.c 21610 2007-07-17 07:10 + + #if HAVE_DB3 + +-#ifdef HAVE_DB4_DB_H +-#include +-#elif defined(HAVE_DB3_DB_H) +-#include +-#else + #include +-#endif + + static krb5_error_code + DB_close(krb5_context context, HDB *db) +Index: heimdal/lib/roken/getcap.c +=================================================================== +--- heimdal.orig/lib/roken/getcap.c ++++ heimdal/lib/roken/getcap.c +@@ -38,11 +38,13 @@ + #include "roken.h" + RCSID("$Id: getcap.c 16561 2006-01-13 14:25:32Z lha $"); + ++#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H) ++#define USE_DB ++#endif ++ + #include + #include +-#if defined(HAVE_DB_185_H) +-#include +-#elif defined(HAVE_DB_H) ++#ifdef USE_DB + #include + #endif + #include +Index: heimdal/lib/roken/ndbm_wrap.c +=================================================================== +--- heimdal.orig/lib/roken/ndbm_wrap.c ++++ heimdal/lib/roken/ndbm_wrap.c +@@ -37,13 +37,7 @@ RCSID("$Id: ndbm_wrap.c 21634 2007-07-17 + #endif + + #include "ndbm_wrap.h" +-#if defined(HAVE_DB4_DB_H) +-#include +-#elif defined(HAVE_DB3_DB_H) +-#include +-#else + #include +-#endif + + #include + #include diff --git a/lib32-heimdal/013_all_heimdal-pthread-lib.patch b/lib32-heimdal/013_all_heimdal-pthread-lib.patch new file mode 100644 index 0000000..19f8794 --- /dev/null +++ b/lib32-heimdal/013_all_heimdal-pthread-lib.patch @@ -0,0 +1,11 @@ +--- heimdal-0.7.1/cf/pthreads.m4.old 2005-09-09 12:12:28.000000000 +0000 ++++ heimdal-0.7.1/cf/pthreads.m4 2005-09-17 22:23:23.000000000 +0000 +@@ -32,7 +32,7 @@ + 2.*) + native_pthread_support=yes + PTHREADS_CFLAGS=-pthread +- PTHREADS_LIBS=-pthread ++ PTHREADS_LIBS=-lpthread + ;; + esac + ;; diff --git a/lib32-heimdal/014_all_heimdal-path.patch b/lib32-heimdal/014_all_heimdal-path.patch new file mode 100644 index 0000000..36a86f1 --- /dev/null +++ b/lib32-heimdal/014_all_heimdal-path.patch @@ -0,0 +1,50 @@ +--- appl/rcp/rcp.c.old 2006-05-03 13:31:59.398493625 +0200 ++++ appl/rcp/rcp.c 2006-05-03 13:32:04.494485981 +0200 +@@ -34,7 +34,7 @@ + #include "rcp_locl.h" + #include + +-#define RSH_PROGRAM "rsh" ++#define RSH_PROGRAM "krsh" + + struct passwd *pwd; + uid_t userid; +--- appl/rcp/rcp_locl.h.old 2006-05-03 02:30:31.602025409 +0200 ++++ appl/rcp/rcp_locl.h 2006-05-03 02:30:35.886018983 +0200 +@@ -64,4 +64,4 @@ + #define _PATH_CP "/bin/cp" + #endif + #undef _PATH_RSH +-#define _PATH_RSH BINDIR "/rsh" ++#define _PATH_RSH BINDIR "/krsh" +--- appl/telnet/telnetd/telnetd.h.old 2006-05-03 02:23:14.582680939 +0200 ++++ appl/telnet/telnetd/telnetd.h 2006-05-03 02:23:23.746667193 +0200 +@@ -192,7 +192,7 @@ + #endif + + #undef _PATH_LOGIN +-#define _PATH_LOGIN BINDIR "/login" ++#define _PATH_LOGIN BINDIR "/klogin" + + /* fallbacks */ + +--- appl/login/shadow.c.old 2006-05-05 06:31:29.517138115 +0200 ++++ appl/login/shadow.c 2006-05-05 06:32:26.433052741 +0200 +@@ -38,7 +38,7 @@ + #ifdef HAVE_SHADOW_H + + #ifndef _PATH_CHPASS +-#define _PATH_CHPASS "/usr/bin/passwd" ++#define _PATH_CHPASS "/usr/bin/kpasswd" + #endif + + static int +@@ -52,7 +52,7 @@ + printf("fork /bin/passwd"); + exit(1); + case 0: +- execlp(_PATH_CHPASS, "passwd", who->pw_name, (char *) 0); ++ execlp(_PATH_CHPASS, "kpasswd", who->pw_name, (char *) 0); + exit(1); + default: + waitpid(pid, &status, 0); diff --git a/lib32-heimdal/PKGBUILD b/lib32-heimdal/PKGBUILD new file mode 100644 index 0000000..8afc606 --- /dev/null +++ b/lib32-heimdal/PKGBUILD @@ -0,0 +1,69 @@ +# Lib32 Packages for Chakra, part of chakra-project.org +# +# maintainer (x86_64): Giuseppe Calà +# maintainer (x86_64): Anke Boersma + +_pkgbasename=heimdal +pkgname=lib32-$_pkgbasename +pkgver=1.3.3 +pkgrel=3 +pkgdesc="Implementation of Kerberos V5 libraries (32-bit)" +arch=('x86_64') +url="http://www.h5l.org/" +license=('custom') +depends=('lib32-e2fsprogs' 'lib32-openssl' 'lib32-db' lib32-sqlite3 $_pkgbasename) +makedepends=('gcc-multilib') +options=('!libtool' '!emptydirs') +source=(http://www.h5l.org/dist/src/${_pkgbasename}-${pkgver}.tar.gz + 001_all_heimdal-no_libedit.patch + 002_all_heimal-fPIC.patch + 003_all_heimdal-rxapps.patch + 005_all_heimdal-suid_fix.patch + 012_all_heimdal-berkdb.patch + 013_all_heimdal-pthread-lib.patch + 014_all_heimdal-path.patch) +md5sums=('963c09f1b14c41660be70b55fae9f163' + '98e28f11f906c967aac22d6184102c9e' + '6d5571bdedba2e2423b90bccdbac2c0a' + '2feec3924ee5230b54175b4d4000c872' + '45aeb207f360f9f4e9e0fabc8bfeecbc' + '56f5d10d0ec40f2fda82ef144ffac1e0' + '1b8665b771c4eb6b56ea8582c96e56e3' + '8208ae8c0b6ff5ab4f64af1693e9e396') + +build() { + cd ${srcdir}/heimdal-${pkgver} + patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch + patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch + patch -Np0 -i ${srcdir}/003_all_heimdal-rxapps.patch + patch -Np0 -i ${srcdir}/005_all_heimdal-suid_fix.patch + patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch + patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch + patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + libtoolize --force + aclocal -I cf + autoconf + automake + + ./configure --prefix=/usr --enable-shared=yes --without-x \ + --libdir=/usr/lib32 \ + --with-openssl-lib=/usr/lib32 \ + --with-readline-lib=/usr/lib32 \ + --with-readline-include=/usr/include/readline \ + --with-sqlite3-lib=/usr/lib32 \ + --with-sqlite3-include=/usr/include +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{etc,bin,sbin,include,share,libexec} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/lib32-kmod/PKGBUILD b/lib32-kmod/PKGBUILD new file mode 100644 index 0000000..8b2ed8c --- /dev/null +++ b/lib32-kmod/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Neophytos Kolokotronis +# Contributor: Jesse Jaara + +pkgname=lib32-kmod +pkgver=5 +pkgrel=1 +pkgdesc="Linux kernel module handling" +arch=('x86_64') +url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary" +license=('GPL2') +depends=('lib32-zlib' 'kmod') +makedepends=('gcc-multilib') +options=('!libtool') +source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-$pkgver.tar.xz") +md5sums=('95eb4df400550ca31006f0819c8864cb') + +build() { + export CC="gcc -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/kmod-${pkgver}" + + ./configure \ + --libdir=/usr/lib32 \ + --sysconfdir=/etc \ + --disable-tools \ + --with-zlib \ + --with-rootprefix=/usr + + make +} + +package() { + cd "${srcdir}/kmod-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # nuke manpages and headers + rm -rf "${pkgdir}"/usr/{share,include,bin} +} diff --git a/lib32-libcups/PKGBUILD b/lib32-libcups/PKGBUILD index a8797a8..3d073d0 100644 --- a/lib32-libcups/PKGBUILD +++ b/lib32-libcups/PKGBUILD @@ -5,16 +5,16 @@ _pkgbasename=libcups pkgname=lib32-$_pkgbasename -pkgver=1.4.5 +pkgver=1.5.2 pkgrel=1 pkgdesc="The CUPS Printing System - client libraries (32-bit)" arch=('x86_64') license=('GPL') url="http://www.cups.org/" depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) +makedepends=(gcc-multilib cups) source=(http://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2) -md5sums=('50729f6fc46ba54223e0eaf5009f3419') +md5sums=('9471d2a7c920cfbb17133c32d2e6866f') build() { export CC="gcc -m32" @@ -22,14 +22,22 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd ${srcdir}/cups-${pkgver} - + aclocal -I config-scripts autoconf -I config-scripts - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \ - --enable-ssl=no --disable-gnutls --disable-threads \ - --with-optim="$CFLAGS" --libdir=/usr/lib32 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-ldap \ + --enable-raw-printing \ + --disable-gssapi \ + --disable-dbus \ + --enable-ssl=no \ + --disable-gnutls \ + --enable-threads \ + --with-optim="$CFLAGS" \ + --libdir=/usr/lib32 make } diff --git a/lib32-libdrm/PKGBUILD b/lib32-libdrm/PKGBUILD index 4be95a6..8e4ecdd 100644 --- a/lib32-libdrm/PKGBUILD +++ b/lib32-libdrm/PKGBUILD @@ -5,20 +5,20 @@ _pkgbasename=libdrm pkgname=lib32-$_pkgbasename -pkgver=2.4.25 -pkgrel=1 +pkgver=2.4.27 +pkgrel=2 pkgdesc="Userspace interface to kernel DRM services (32-bit)" arch=(x86_64) license=('custom') -depends=('lib32-glibc' 'lib32-cairo' $_pkgbasename) +depends=('lib32-libpciaccess' 'lib32-glibc' 'lib32-cairo' $_pkgbasename) makedepends=(gcc-multilib) options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 no-pthread-stubs.patch) -md5sums=('f53dc4c72109b17908e4113c3b8addfe' - '9b5ec3bbebe86921e2057694c42f65b8') +sha1sums=('f5b40d30a7f2bfa369ab9b3bd9a0aa844a7f1e16' + 'ea97a698fa545b8b560c64015cc45efa7fe7417b') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" @@ -28,7 +28,7 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - + autoreconf --force --install ./configure --prefix=/usr --libdir=/usr/lib32 \ --enable-udev \ diff --git a/lib32-libdrm/no-pthread-stubs.patch b/lib32-libdrm/no-pthread-stubs.patch index 6602f87..348c2a7 100644 --- a/lib32-libdrm/no-pthread-stubs.patch +++ b/lib32-libdrm/no-pthread-stubs.patch @@ -1,34 +1,35 @@ diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac --- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 +++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE +@@ -47,10 +47,6 @@ + LT_INIT([disable-static]) + -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) -AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_LIBS) - - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) + AC_SUBST(PCIACCESS_CFLAGS) + AC_SUBST(PCIACCESS_LIBS) --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,13 +26,12 @@ +@@ -26,14 +26,13 @@ $(WARN_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/intel \ - $(PTHREADSTUBS_CFLAGS) \ + $(PCIACCESS_CFLAGS) \ -I$(top_srcdir)/include/drm libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_ladir = $(libdir) libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ +-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@ ++libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@ libdrm_intel_la_SOURCES = \ - intel_atomic.h \ + intel_bufmgr.c \ --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 @@ -26,13 +26,12 @@ diff --git a/lib32-libpulse/PKGBUILD b/lib32-libpulse/PKGBUILD index f32ad48..1033201 100644 --- a/lib32-libpulse/PKGBUILD +++ b/lib32-libpulse/PKGBUILD @@ -2,11 +2,15 @@ # # maintainer (x86_64): Giuseppe Calà # maintainer (x86_64): Anke Boersma +# contributor: Jan Alexander Steffens (heftig) +# Contributor: Daniel J Griffiths +# Contributor: Corrado Primier +# Contributor: William Rea _pkgbasename=libpulse pkgname="lib32-${_pkgbasename}" pkgdesc="A featureful, general-purpose sound server. (32-bit client libraries)" -pkgver=1.1 +pkgver=2.0 pkgrel=1 arch=('x86_64') url="http://pulseaudio.org/" @@ -20,38 +24,41 @@ optdepends=('lib32-alsa-plugins: ALSA support') provides=("lib32-pulseaudio=${pkgver}") conflicts=('lib32-pulseaudio') replaces=('lib32-pulseaudio') -options=(!emptydirs !libtool !makeflags) +options=(!emptydirs !libtool) source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${pkgver}.tar.xz") -md5sums=('17d21df798cee407b769c6355fae397a') +md5sums=('9bbde657c353fe675c3b693054175a8e') + +_libs="libpulse.la libpulse-simple.la libpulse-mainloop-glib.la" +_pkglibs="libpulsecommon-$pkgver.la libpulsedsp.la" -_libs="libpulsecommon-${pkgver}.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" build() { - cd "${srcdir}/pulseaudio-${pkgver}" - - # Don't break circular dependency between libpulse and libpulsecommon - LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - + cd "$srcdir/pulseaudio-$pkgver" export CC="gcc -m32" + export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib32 \ - --libexecdir=/usr/lib32 \ - --localstatedir=/var \ - --disable-hal \ - --disable-rpath \ - --disable-default-build-tests + --sysconfdir=/etc \ + --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + --localstatedir=/var \ + --disable-hal \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests - make -C src ${_libs} + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make -C src $_libs $_pkglibs } package() { - cd "${srcdir}/pulseaudio-${pkgver}" - make -C src lib_LTLIBRARIES="${_libs}" DESTDIR="${pkgdir}" install-libLTLIBRARIES - make DESTDIR="${pkgdir}" install-pkgconfigDATA -} - -# vim:set ts=2 sw=2 et: + cd "$srcdir/pulseaudio-$pkgver" + make -j1 -C src DESTDIR="$pkgdir" \ + lib_LTLIBRARIES="$_libs" pkglib_LTLIBRARIES="$_pkglibs" \ + install-libLTLIBRARIES install-pkglibLTLIBRARIES + make -j1 DESTDIR="$pkgdir" install-pkgconfigDATA +} \ No newline at end of file diff --git a/lib32-libvorbis/PKGBUILD b/lib32-libvorbis/PKGBUILD index b0d718d..80b0114 100644 --- a/lib32-libvorbis/PKGBUILD +++ b/lib32-libvorbis/PKGBUILD @@ -5,7 +5,7 @@ _pkgbasename=libvorbis pkgname=lib32-$_pkgbasename -pkgver=1.3.1 +pkgver=1.3.3 pkgrel=1 pkgdesc="Vorbis codec library (32-bit)" arch=('x86_64') @@ -15,7 +15,7 @@ depends=('lib32-libogg' $_pkgbasename) makedepends=(gcc-multilib) options=('!libtool') source=(http://downloads.xiph.org/releases/vorbis/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('016e523fac70bdd786258a9d15fd36e9') +md5sums=('6b1a36f0d72332fae5130688e65efe1f') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/lib32-sdl/PKGBUILD b/lib32-sdl/PKGBUILD index 8a2f730..0f70b35 100644 --- a/lib32-sdl/PKGBUILD +++ b/lib32-sdl/PKGBUILD @@ -5,7 +5,7 @@ _pkgbasename=sdl pkgname=lib32-$_pkgbasename -pkgver=1.2.14 +pkgver=1.2.15 pkgrel=1 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" arch=('x86_64') @@ -15,13 +15,9 @@ depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-joystick-crash.diff - sdl-1.2.14-fix-mouse-clicking.patch - sdl-1.2.14-fix-disappearing-cursor.patch) -md5sums=('e52086d1b508fa0b76c52ee30b55bec4' - '9d8890b3817736a5d365f7497f096634' - '04d8c179f125e04bcd4c9d60e013c2d7' - 'a6cf3e71b653aa97d0d8ae6c0a789807') + sdl-1.2.14-fix-mouse-clicking.patch) +md5sums=('9d96df8417572a2afb781a7c4c811a85' + '04d8c179f125e04bcd4c9d60e013c2d7') build() { export CC="gcc -m32" @@ -29,9 +25,7 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-joystick-crash.diff patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - patch -Np1 -i $srcdir/sdl-1.2.14-fix-disappearing-cursor.patch ./configure --prefix=/usr --disable-nasm --enable-alsa \ --with-x --disable-rpath --libdir=/usr/lib32 make diff --git a/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch b/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch deleted file mode 100644 index fcd3c31..0000000 --- a/lib32-sdl/sdl-1.2.14-fix-disappearing-cursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: SDL-1.2.14/src/video/x11/SDL_x11events.c -=================================================================== ---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400 -@@ -444,8 +444,10 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( xevent.xcrossing.detail != NotifyInferior ) { -- if ( this->input_grab == SDL_GRAB_OFF ) { -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) && -+ (xevent.xcrossing.detail != NotifyInferior) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { - posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - } else { - posted = SDL_PrivateMouseMotion(0, 0, diff --git a/lib32-sdl/sdl-1.2.14-joystick-crash.diff b/lib32-sdl/sdl-1.2.14-joystick-crash.diff deleted file mode 100644 index 949e18b..0000000 --- a/lib32-sdl/sdl-1.2.14-joystick-crash.diff +++ /dev/null @@ -1,14 +0,0 @@ -Description: Fix crash with joystick detection. -Index: libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c -=================================================================== ---- libsdl1.2-1.2.14.orig/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:37:36.000000000 -0500 -+++ libsdl1.2-1.2.14/src/joystick/linux/SDL_sysjoystick.c 2010-01-12 12:38:27.000000000 -0500 -@@ -700,7 +700,7 @@ - continue; - } - if ( test_bit(i, absbit) ) { -- int values[5]; -+ int values[6]; - - if ( ioctl(fd, EVIOCGABS(i), values) < 0 ) - continue; diff --git a/lib32-sqlite3/PKGBUILD b/lib32-sqlite3/PKGBUILD index a8d1493..1e273b2 100644 --- a/lib32-sqlite3/PKGBUILD +++ b/lib32-sqlite3/PKGBUILD @@ -5,8 +5,8 @@ _pkgbasename=sqlite3 pkgname=lib32-sqlite3 -_amalgamationver=3070400 -pkgver=3.7.4 +_amalgamationver=3071100 +pkgver=3.7.11 pkgrel=1 pkgdesc="A C library that implements an SQL database engine (32-bit)" arch=('x86_64') @@ -16,7 +16,7 @@ depends=(lib32-glibc $_pkgbasename) makedepends=('tcl' 'gcc-multilib' 'lib32-readline') source=(http://www.sqlite.org/sqlite-src-${_amalgamationver}.zip) options=(!libtool) -md5sums=('2b5c53328505893599de6e2055996d7a') +md5sums=('73e2340ca2682ae914168d99c1f26e66') build() { export CC="gcc -m32" diff --git a/lib32-udev/PKGBUILD b/lib32-udev/PKGBUILD index 179e54d..7bc9969 100644 --- a/lib32-udev/PKGBUILD +++ b/lib32-udev/PKGBUILD @@ -4,7 +4,7 @@ # maintainer (x86_64): Anke Boersma pkgname=('lib32-udev') -pkgver=168 +pkgver=181 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -12,9 +12,9 @@ url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') -makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') +makedepends=('lib32-kmod' 'gcc-multilib' 'coreutils' 'lib32-util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('4a466078532ab5dd5c35acc3ea2ec9a1') +md5sums=('135c5acfd371febc5ed8326d48028922') build() { export CC="gcc -m32" @@ -22,12 +22,19 @@ build() { cd $srcdir/udev-$pkgver - ./configure --libdir=/usr/lib32 + ./configure --libdir=/usr/lib32 \ + --disable-introspection \ + --prefix=/usr \ + --with-rootprefix= \ + --sysconfdir=/etc \ + --libexecdir=/lib32 \ + --disable-introspection \ + make } - + package() { - + cd $srcdir/udev-$pkgver make DESTDIR=${pkgdir} install