diff options
95 files changed, 3410 insertions, 249 deletions
diff --git a/community-staging/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD new file mode 100644 index 000000000..1beb9c0c7 --- /dev/null +++ b/community-staging/freeradius/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 60681 2011-12-16 21:36:34Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jason R Begley (jayray@digitalgoat.com> + +pkgname=freeradius +pkgver=2.1.12 +pkgrel=3 +pkgdesc="The premier open source RADIUS server" +arch=('i686' 'x86_64') +url="http://www.freeradius.org/" +license=("GPL") +depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' + 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') +makedepends=('libpcap' 'unixodbc' 'python2') +optdepends=('libpcap' 'unixodbc' 'python2') +options=('!libtool' 'emptydirs' '!makeflags') +install=$pkgname.install +source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 + radiusd + krb5-build-fix.patch) +md5sums=('862d3a2c11011e61890ba84fa636ed8c' + 'f1a6530b1b69d2fa793aa45b2de379bb' + 'c6a61de7576933f59154a53bfc12a2d2') + +build() { + cd $srcdir/freeradius-server-$pkgver + export CFLAGS="$CFLAGS -fno-strict-aliasing" + sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in + patch -p1 <$srcdir/krb5-build-fix.patch + ./configure --with-system-libtool --with-system-libltdl \ + --prefix=/usr --enable-heimdal-krb5 \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --libdir=/usr/lib/freeradius + make +} + +package() { + cd $srcdir/freeradius-server-$pkgver + make install R=$pkgdir + install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd + chmod o+r $pkgdir/etc/raddb/* + mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default + rm -rf $pkgdir/var/run +} diff --git a/community-staging/freeradius/freeradius.install b/community-staging/freeradius/freeradius.install new file mode 100644 index 000000000..c3b9f9415 --- /dev/null +++ b/community-staging/freeradius/freeradius.install @@ -0,0 +1,22 @@ +post_install() { + groupadd -r radiusd + useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd + + touch /var/log/radius/radius.log + chown -R radiusd.radiusd /var/log/radius/radius.log + + [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb + + /bin/true +} + +pre_remove() { + /etc/rc.d/radiusd stop + /bin/true +} + +post_remove() { + userdel radiusd + groupdel radiusd + /bin/true +} diff --git a/community-staging/freeradius/krb5-build-fix.patch b/community-staging/freeradius/krb5-build-fix.patch new file mode 100644 index 000000000..11dae7090 --- /dev/null +++ b/community-staging/freeradius/krb5-build-fix.patch @@ -0,0 +1,21 @@ +diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c +--- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 ++++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 +@@ -375,7 +375,7 @@ + * Heimdal krb5 verification + */ + radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val*/, + userP->realm); + + krb5_cc_default(context, &id); +@@ -390,7 +390,7 @@ + + radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", + error_message(ret), +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val */, + userP->realm); + + return RLM_MODULE_REJECT; diff --git a/community-staging/freeradius/radiusd b/community-staging/freeradius/radiusd new file mode 100644 index 000000000..bf872b6f2 --- /dev/null +++ b/community-staging/freeradius/radiusd @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/radiusd` +case "$1" in + start) + stat_busy "Starting radiusd Server" + + [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd + [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid + chown -R radiusd.radiusd /var/run/radiusd + + [ -z "$PID" ] && /usr/sbin/radiusd + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/radiusd.pid + add_daemon radiusd + stat_done + fi + ;; + stop) + stat_busy "Stopping radiusd Server" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/radiusd.pid + rm_daemon radiusd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/kadu/PKGBUILD b/community-staging/kadu/PKGBUILD new file mode 100644 index 000000000..4b07a239f --- /dev/null +++ b/community-staging/kadu/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 60706 2011-12-17 07:44:28Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Mateusz Herych +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> + +pkgname=kadu +pkgver=0.10.1 +pkgrel=2 +pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" +arch=('i686' 'x86_64') +url="http://www.kadu.net/" +license=('GPL') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'xdg-utils') +makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') +source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) +md5sums=('6211a9a9e02d645268cbf055892601a0') + +build() { + cd "$srcdir" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}" + rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}" +} diff --git a/community-staging/libgda3/PKGBUILD b/community-staging/libgda3/PKGBUILD new file mode 100644 index 000000000..76cf26187 --- /dev/null +++ b/community-staging/libgda3/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 60683 2011-12-16 21:37:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=libgda3 +pkgver=3.1.5 +pkgrel=10 +pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers" +arch=('i686' 'x86_64') +url="http://www.gnome-db.org/Download" +license=('GPL') +depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs' + 'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng') +options=('!libtool' '!distcc') +source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2) +md5sums=('eb7da5286a112e7cff3111c89fba4456') + +build() { + cd "$srcdir/libgda-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + make +} +package(){ + cd "$srcdir/libgda-$pkgver" + make DESTDIR=$pkgdir install + cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \; +} diff --git a/community-staging/myodbc/PKGBUILD b/community-staging/myodbc/PKGBUILD new file mode 100644 index 000000000..1a9738827 --- /dev/null +++ b/community-staging/myodbc/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 60685 2011-12-16 21:38:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=myodbc +pkgver=5.1.9 +pkgrel=2 +pkgdesc="ODBC driver/connector for MySQL" +arch=(i686 x86_64) +url="http://dev.mysql.com/downloads/connector/odbc/" +depends=('unixodbc' 'libmysqlclient') +license=('GPL') +options=('libtool') +source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz" + myconf.h.in) +md5sums=('80f146bd384a9011d968aa67df27e68e' + '6c99c83e309b18d15ef0f07f0b461241') + +build() { + cd $srcdir/mysql-connector-odbc-${pkgver} + cp $srcdir/myconf.h.in driver/myconf.h.in + [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; } + [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \ + ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \ + --with-mysql-path=/usr --without-x --disable-gui --disable-test + make +} + +package() { + cd $srcdir/mysql-connector-odbc-${pkgver} + make DESTDIR=$pkgdir install +} diff --git a/community-staging/myodbc/myconf.h.in b/community-staging/myodbc/myconf.h.in new file mode 100644 index 000000000..2a04eebba --- /dev/null +++ b/community-staging/myodbc/myconf.h.in @@ -0,0 +1,165 @@ +/* driver/myconf.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the <dlfcn.h> header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <iodbcinst.h> header file. */ +#undef HAVE_IODBCINST_H + +/* Define to 1 if you have the <isqlext.h> header file. */ +#undef HAVE_ISQLEXT_H + +/* Define to 1 if you have the <isqltypes.h> header file. */ +#undef HAVE_ISQLTYPES_H + +/* Define to 1 if you have the <isql.h> header file. */ +#undef HAVE_ISQL_H + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <odbcinst.h> header file. */ +#undef HAVE_ODBCINST_H + +/* Define to 1 if you have the <sqlext.h> header file. */ +#undef HAVE_SQLEXT_H + +/* Define if SQLGetPrivateProfileString is defined */ +#undef HAVE_SQLGETPRIVATEPROFILESTRING + +/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */ +#undef HAVE_SQLGETPRIVATEPROFILESTRINGW + +/* Define to 1 if you have the <sqltypes.h> header file. */ +#undef HAVE_SQLTYPES_H + +/* Define to 1 if you have the <sql.h> header file. */ +#undef HAVE_SQL_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define if SQLCHAR is undefined */ +#undef SQLCHAR + +/* Define if SQLHDBC is undefined */ +#undef SQLHDBC + +/* Define if SQLHENV is undefined */ +#undef SQLHENV + +/* Define if SQLHSTMT is undefined */ +#undef SQLHSTMT + +/* Define if SQLHWND is undefined */ +#undef SQLHWND + +/* Define if SQLINTEGER is undefined */ +#undef SQLINTEGER + +/* Define if SQLPOINTER is undefined */ +#undef SQLPOINTER + +/* Define if SQLRETURN is undefined */ +#undef SQLRETURN + +/* Define if SQLSMALLINT is undefined */ +#undef SQLSMALLINT + +/* Define if SQLUINTEGER is undefined */ +#undef SQLUINTEGER + +/* Define if SQLUSMALLINT is undefined */ +#undef SQLUSMALLINT + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define path to system ODBC.INI file */ +#undef SYSTEM_ODBC_INI + +/* Define if compiler defines C99 __func__ macro */ +#undef USE_C99_FUNC_MACRO + +/* Define if compiler defines __FUNCTION__ */ +#undef USE_GNU_FUNC_MACRO + +/* use iODBC */ +#undef USE_IODBC + +/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */ +#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR + +/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */ +#undef USE_SQLCOLATTRIBUTE_SQLPOINTER + +/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER + */ +#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR + +/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */ +#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR + +/* use unixODBC */ +#undef USE_UNIXODBC + +/* Version number of package */ +#undef VERSION + +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + +/* Define if we are using unix build environment */ +#undef _UNIX_ diff --git a/community-staging/myodbc/myodbc-64bit.patch b/community-staging/myodbc/myodbc-64bit.patch new file mode 100644 index 000000000..ac62d816a --- /dev/null +++ b/community-staging/myodbc/myodbc-64bit.patch @@ -0,0 +1,85 @@ +Fix some 64-bitness issues arising from unixODBC 2.2.14 changes. + + +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c +--- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:15:37.516602586 -0500 +@@ -1205,7 +1205,7 @@ + { + /* See comment for fill_transfer_oct_len_buff()*/ + SQLLEN size= get_display_size(stmt, field); +- sprintf(buff,size == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), size); ++ sprintf(buff, (size == SQL_NO_TOTAL ? "%ld" : "%lu"), size); + + return size; + } +@@ -1228,7 +1228,7 @@ + */ + SQLLEN len= get_transfer_octet_length(stmt, field); + +- sprintf(buff, len == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), len ); ++ sprintf(buff, (len == SQL_NO_TOTAL ? "%ld" : "%lu"), len ); + + return len; + } +@@ -1245,8 +1245,7 @@ + SQLULEN fill_column_size_buff(char *buff, STMT *stmt, MYSQL_FIELD *field) + { + SQLULEN size= get_column_size(stmt, field); +- sprintf(buff, (size== SQL_NO_TOTAL ? "%d" : +- (sizeof(SQLULEN) == 4 ? "%lu" : "%llu")), size); ++ sprintf(buff, (size== SQL_NO_TOTAL ? "%ld" : "%lu"), size); + return size; + } + +diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_catalog.c mysql-connector-odbc-5.1.8/test/my_catalog.c +--- mysql-connector-odbc-5.1.8.orig/test/my_catalog.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/test/my_catalog.c 2010-12-23 17:16:26.284605944 -0500 +@@ -599,7 +599,7 @@ + fprintf(stdout, "# Column Name : %s\n", szColName); + fprintf(stdout, "# NameLengh : %d\n", pcbColName); + fprintf(stdout, "# DataType : %d\n", pfSqlType); +- fprintf(stdout, "# ColumnSize : %d\n", pcbColDef); ++ fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef); + fprintf(stdout, "# DecimalDigits : %d\n", pibScale); + fprintf(stdout, "# Nullable : %d\n", pfNullable); + +@@ -632,7 +632,7 @@ + + rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, sizeof(db), &len); + mycon(hdbc,rc); +- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); ++ fprintf(stdout,"current_catalog: %s (%d)\n", db, len); + is_num(len, 4); + is_str(db, "test", 5); + +@@ -653,7 +653,7 @@ + + rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, 255, &len); + mycon(hdbc,rc); +- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); ++ fprintf(stdout,"current_catalog: %s (%d)\n", db, len); + is_num(len, 17); + is_str(db, cur_db, 18); + +diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_cursor.c mysql-connector-odbc-5.1.8/test/my_cursor.c +--- mysql-connector-odbc-5.1.8.orig/test/my_cursor.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/test/my_cursor.c 2010-12-23 17:12:16.632676933 -0500 +@@ -711,7 +711,7 @@ + + rc = SQLRowCount(hstmt1,&row_count); + mystmt(hstmt1,rc); +- fprintf(stdout, "rows affected: %d\n", row_count); ++ fprintf(stdout, "rows affected: %ld\n", row_count); + myassert(row_count == 1); + + rc = SQLExtendedFetch(hstmt,SQL_FETCH_NEXT,1,NULL,&rgfRowStatus); +@@ -732,7 +732,7 @@ + + rc = SQLRowCount(hstmt1,&row_count); + mystmt(hstmt1,rc); +- fprintf(stdout, "rows affected: %d\n", row_count); ++ fprintf(stdout, "rows affected: %ld\n", row_count); + myassert(row_count == 1); + + SQLFreeStmt(hstmt,SQL_UNBIND); diff --git a/community-staging/myodbc/myodbc-add-mysys.patch b/community-staging/myodbc/myodbc-add-mysys.patch new file mode 100644 index 000000000..a30466114 --- /dev/null +++ b/community-staging/myodbc/myodbc-add-mysys.patch @@ -0,0 +1,29 @@ +Add files extracted from mysql into the driver build script. + + +diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc-5.1.8/util/Makefile.am +--- mysql-connector-odbc-5.1.8.orig/util/Makefile.am 2010-10-28 14:33:17.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/util/Makefile.am 2010-12-23 18:09:00.359695597 -0500 +@@ -10,6 +10,22 @@ + installer.c \ + odbcinstw.c \ + unicode_transcode.c \ ++ array.c \ ++ list.c \ ++ my_alloc.c \ ++ my_malloc.c \ ++ string.c \ ++ int2str.c \ ++ is_prefix.c \ ++ longlong2str.c \ ++ strcend.c \ ++ strend.c \ ++ strfill.c \ ++ strmake.c \ ++ strmov.c \ ++ strxmov.c \ ++ mysys_err.h \ ++ mysys_priv.h \ + MYODBCUtil.h \ + MYODBCUtilAllocDataSource.c \ + MYODBCUtilAllocDriver.c \ diff --git a/community-staging/myodbc/myodbc-my-free.patch b/community-staging/myodbc/myodbc-my-free.patch new file mode 100644 index 000000000..cf7730a59 --- /dev/null +++ b/community-staging/myodbc/myodbc-my-free.patch @@ -0,0 +1,253 @@ +Once again, mysql can't manage to ship a mysql-connector-odbc release +on time ... mysql 5.5 changed the my_free() function and the released +connector version is not up to speed. Can't use NEAR anymore, either. + + +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog.c mysql-connector-odbc-5.1.8/driver/catalog.c +--- mysql-connector-odbc-5.1.8.orig/driver/catalog.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/catalog.c 2010-12-23 17:50:52.916552525 -0500 +@@ -94,11 +94,11 @@ + { + if (stmt->result) + { +- my_free((char *)stmt->result, MYF(0)); ++ my_free((char *)stmt->result); + } + if (stmt->result_array) + { +- my_free((char *)stmt->result_array, MYF(0)); ++ my_free((char *)stmt->result_array); + } + set_mem_error(&stmt->dbc->mysql); + return handle_connection_error(stmt); +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c +--- mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c 2010-12-23 17:51:41.493551970 -0500 +@@ -269,13 +269,13 @@ + pthread_mutex_lock(&dbc->lock); + if (mysql_query(mysql, select)) + { +- my_free(select, MYF(0)); ++ my_free(select); + pthread_mutex_unlock(&dbc->lock); + return NULL; + } + result= mysql_store_result(&dbc->mysql); + pthread_mutex_unlock(&dbc->lock); +- my_free(select, MYF(0)); ++ my_free(select); + + return result; + } +@@ -1094,7 +1094,7 @@ + SQLFORE_KEYS_FIELDS * + row_count, + MYF(0)); +- my_free((char *)tempdata, MYF(0)); ++ my_free((char *)tempdata); + + if (!stmt->result_array) + { +@@ -1323,12 +1323,12 @@ + && (j != mypcREMARKS) + && (j != mypcCOLUMN_DEF) + && (j != mypcIS_NULLABLE)) +- my_free(((char**)cur_params->data)[j], MYF(0)); ++ my_free(((char**)cur_params->data)[j]); + } + /* cleanup the list */ + params= list_delete_forward(params); +- my_free(cur_params->data, MYF(0)); +- my_free(cur_params, MYF(0)); ++ my_free(cur_params->data); ++ my_free(cur_params); + } + } + } +@@ -1675,7 +1675,7 @@ + } + + dynstr_free(&dynQuery); +- my_free(params_r, MYF(0)); ++ my_free(params_r); + + return nReturn; + } +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/desc.c mysql-connector-odbc-5.1.8/driver/desc.c +--- mysql-connector-odbc-5.1.8.orig/driver/desc.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/desc.c 2010-12-23 17:51:06.532607921 -0500 +@@ -65,7 +65,7 @@ + */ + if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) + { +- my_free((char *)desc, MYF(0)); ++ my_free((char *)desc); + return NULL; + } + desc->desc_type= desc_type; +@@ -111,7 +111,7 @@ + if (aprec->par.alloced) + { + aprec->par.alloced= FALSE; +- my_free(aprec->par.value, MYF(0)); ++ my_free(aprec->par.value); + } + } + } +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/driver.h mysql-connector-odbc-5.1.8/driver/driver.h +--- mysql-connector-odbc-5.1.8.orig/driver/driver.h 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/driver.h 2010-12-23 17:50:43.017608761 -0500 +@@ -113,7 +113,7 @@ + /* Max Primary keys in a cursor * WHERE clause */ + #define MY_MAX_PK_PARTS 32 + +-#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } ++#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } + + + /* We don't make any assumption about what the default may be. */ +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/execute.c mysql-connector-odbc-5.1.8/driver/execute.c +--- mysql-connector-odbc-5.1.8.orig/driver/execute.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/execute.c 2010-12-23 17:49:52.799552481 -0500 +@@ -96,7 +96,7 @@ + exit: + pthread_mutex_unlock(&stmt->dbc->lock); + if ( query != stmt->query ) +- my_free(query,MYF(0)); ++ my_free(query); + + /* + If the original query was modified, we reset stmt->query so that the +@@ -104,7 +104,7 @@ + */ + if (stmt->orig_query) + { +- my_free(stmt->query,MYF(0)); ++ my_free(stmt->query); + stmt->query= stmt->orig_query; + stmt->query_end= stmt->orig_query_end; + stmt->orig_query= NULL; +@@ -625,7 +625,7 @@ + + out: + if (free_data) +- my_free(data, MYF(0)); ++ my_free(data); + + *toptr= to; + return SQL_SUCCESS; +@@ -1060,7 +1060,7 @@ + if ( cbValue == SQL_NULL_DATA ) + { + if ( aprec->par.alloced ) +- my_free(aprec->par.value,MYF(0)); ++ my_free(aprec->par.value); + aprec->par.alloced= FALSE; + aprec->par.value= NULL; + return SQL_SUCCESS; +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/handle.c mysql-connector-odbc-5.1.8/driver/handle.c +--- mysql-connector-odbc-5.1.8.orig/driver/handle.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/handle.c 2010-12-23 17:50:17.425586339 -0500 +@@ -112,7 +112,7 @@ + GlobalUnlock(GlobalHandle((HGLOBAL) henv)); + GlobalFree(GlobalHandle((HGLOBAL) henv)); + #else +- if (henv) my_free((char*) henv,MYF(0)); ++ if (henv) my_free((char*) henv); + myodbc_end(); + #endif /* _UNIX_ */ + return(SQL_SUCCESS); +@@ -251,7 +251,8 @@ + LIST *next; + + dbc->env->connections= list_delete(dbc->env->connections,&dbc->list); +- my_free(dbc->database,MYF(MY_ALLOW_ZERO_PTR)); ++ if (dbc->database) ++ my_free(dbc->database); + if (dbc->ds) + ds_delete(dbc->ds); + pthread_mutex_destroy(&dbc->lock); +@@ -268,7 +269,7 @@ + GlobalUnlock(GlobalHandle((HGLOBAL) hdbc)); + GlobalFree(GlobalHandle((HGLOBAL) hdbc)); + #else +- my_free((char*) hdbc,MYF(0)); ++ my_free((char*) hdbc); + #endif + return SQL_SUCCESS; + } +@@ -513,7 +514,7 @@ + GlobalUnlock(GlobalHandle ((HGLOBAL) hstmt)); + GlobalFree(GlobalHandle((HGLOBAL) hstmt)); + #else +- my_free((char*) hstmt,MYF(0)); ++ my_free((char*) hstmt); + #endif /* _UNIX_*/ + return SQL_SUCCESS; + } +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/options.c mysql-connector-odbc-5.1.8/driver/options.c +--- mysql-connector-odbc-5.1.8.orig/driver/options.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/options.c 2010-12-23 17:50:28.864604596 -0500 +@@ -301,7 +301,7 @@ + return SQL_ERROR; + } + } +- my_free(dbc->database,MYF(0)); ++ my_free(dbc->database); + dbc->database= my_strdup(db,MYF(MY_WME)); + pthread_mutex_unlock(&dbc->lock); + } +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/prepare.c mysql-connector-odbc-5.1.8/driver/prepare.c +--- mysql-connector-odbc-5.1.8.orig/driver/prepare.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/prepare.c 2010-12-23 17:51:17.175676805 -0500 +@@ -93,7 +93,7 @@ + CLEAR_STMT_ERROR(stmt); + + if (stmt->query) +- my_free(stmt->query, MYF(0)); ++ my_free(stmt->query); + + if (dupe && szSqlStr) + stmt->query= (char *)szSqlStr; +@@ -223,7 +223,7 @@ + { + aprec->par.alloced= FALSE; + assert(aprec->par.value); +- my_free(aprec->par.value,MYF(0)); ++ my_free(aprec->par.value); + aprec->par.value = NULL; + } + +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c +--- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:49:05.498552376 -0500 +@@ -930,7 +930,7 @@ + ulong max_length= stmt->stmt_options.max_length; + ulong *offset= &stmt->getdata.src_offset; + #if MYSQL_VERSION_ID >= 40100 +- char NEAR _dig_vec[] = ++ char _dig_vec[] = + "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + #endif + +@@ -2154,7 +2154,7 @@ + + my_bool reget_current_catalog(DBC FAR *dbc) + { +- my_free(dbc->database,MYF(0)); ++ my_free(dbc->database); + dbc->database= NULL; + + if ( odbc_stmt(dbc, "select database()") ) +diff -Naur mysql-connector-odbc-5.1.8.orig/util/stringutil.h mysql-connector-odbc-5.1.8/util/stringutil.h +--- mysql-connector-odbc-5.1.8.orig/util/stringutil.h 2010-10-28 14:33:17.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/util/stringutil.h 2010-12-23 17:51:51.848676475 -0500 +@@ -41,7 +41,7 @@ + #include <sqlext.h> + + #ifndef x_free +-#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } ++#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } + #endif + + #define myodbc_min(a, b) ((a) < (b) ? (a) : (b)) diff --git a/community-staging/myodbc/myodbc-shutdown.patch b/community-staging/myodbc/myodbc-shutdown.patch new file mode 100644 index 000000000..ec0cf3d36 --- /dev/null +++ b/community-staging/myodbc/myodbc-shutdown.patch @@ -0,0 +1,27 @@ +myodbc_end is really only usable during Windows DLL unload, since it's not +connection-specific and not thread-safe either. This bit of brain fade +accounts for our bug #185343 and several bugs filed at mysql.com. + +Furthermore, my_end() isn't exported from libmysqlclient anymore. +Hence, best fix is to turn the function into a no-op. + + +diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c +--- mysql-connector-odbc-5.1.8.orig/driver/dll.c 2010-10-28 14:33:18.000000000 -0400 ++++ mysql-connector-odbc-5.1.8/driver/dll.c 2010-12-23 15:05:49.394608226 -0500 +@@ -94,6 +94,7 @@ + */ + void myodbc_end() + { ++#if 0 + if (!--myodbc_inited) + { + my_free(decimal_point,MYF(0)); +@@ -121,6 +122,7 @@ + my_end(0); + #endif + } ++#endif + } + + diff --git a/community-staging/opensips/PKGBUILD b/community-staging/opensips/PKGBUILD new file mode 100644 index 000000000..f39c698be --- /dev/null +++ b/community-staging/opensips/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 60687 2011-12-16 21:39:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=opensips +pkgver=1.6.4 +pkgrel=2 +pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." +url="http://www.opensips.org" +depends=('gcc-libs' 'openssl' 'db' 'attr' 'kernel-headers' 'libxml2') +makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' 'lynx') +optdepends=('postgresql-libs' + 'unixodbc' + 'libldap' + 'libmysqlclient' + 'libsasl' + 'python2' + 'pcre') +backup=("etc/opensips/opensips.cfg" + "etc/opensips/dictionary.radius" + "etc/opensips/opensipsctlrc") +arch=('i686' 'x86_64') +license=('GPL') +install=opensips.install +options=('!emptydirs' 'zipman' '!makeflags' 'docs') +source=(#http://switch.dl.sourceforge.net/sourceforge/opensips/opensips-$pkgver-tls_src.tar.gz + http://opensips.org/pub/opensips/$pkgver/src/opensips-$pkgver-2-tls_src.tar.gz + opensips.init) +md5sums=('e9869d9a726d70f83de4a1e77cd24d40' + '685fbe00826df1285b410d4610dcbb0c') + +build() +{ + cd $srcdir/$pkgname-$pkgver-2-tls/ + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + make \ + include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ + TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install + + # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) + mkdir -p $pkgdir/etc/ + mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ + sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg + + # Install starting script + mkdir -p $pkgdir/etc/rc.d/ + cp ../opensips.init $pkgdir/etc/rc.d/opensips + chmod 755 $pkgdir/etc/rc.d/opensips + + # fix bad paths + cd $pkgdir/usr/share + find -type f -exec sed -i "s#$pkgdir##" {} \; + + cd $pkgdir/usr/lib/opensips/opensipsctl + find -type f -exec sed -i "s#$pkgdir##" {} \; + + cd $pkgdir/usr/sbin + sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole + + cd $pkgdir/etc + find -type f -exec sed -i "s#$pkgdir##" {} \; +} diff --git a/community-staging/opensips/opensips.init b/community-staging/opensips/opensips.init new file mode 100644 index 000000000..1c883c4c2 --- /dev/null +++ b/community-staging/opensips/opensips.init @@ -0,0 +1,50 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +BINNAME=opensips +OSRDIR=/usr/sbin +OPENSIPS=$OSRDIR/$BINNAME + +TMPDIR=/var/tmp +CORE=$TMPDIR/core + +ETC=/etc/opensips/opensips.cfg +PIDFILE=/var/run/opensips.pid + +case "$1" in + start) + stat_busy "Starting OpenSIPS server" + cd $TMPDIR + $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon opensips + stat_done + fi + ;; + stop) + stat_busy "Stopping OpenSIPS server" + if [ -r $PIDFILE ] + then + cat $PIDFILE | xargs kill + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon opensips + stat_done + fi + else + stat_fail + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community-staging/opensips/opensips.install b/community-staging/opensips/opensips.install new file mode 100644 index 000000000..9e8f2a47b --- /dev/null +++ b/community-staging/opensips/opensips.install @@ -0,0 +1,5 @@ +post_install() +{ + echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'" + /bin/true +} diff --git a/community-staging/perl-dbd-odbc/PKGBUILD b/community-staging/perl-dbd-odbc/PKGBUILD new file mode 100644 index 000000000..12eaf6370 --- /dev/null +++ b/community-staging/perl-dbd-odbc/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 60689 2011-12-16 21:39:55Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-odbc +pkgver=1.33 +pkgrel=2 +pkgdesc="ODBC Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-ODBC/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi' 'perl' 'unixodbc') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") +md5sums=('3e44ea4eb4b0bb711eea93632b76de17') + +build() { + cd DBD-ODBC-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd DBD-ODBC-${pkgver} + make install DESTDIR=${pkgdir} + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/psqlodbc/PKGBUILD b/community-staging/psqlodbc/PKGBUILD new file mode 100644 index 000000000..67de1cefe --- /dev/null +++ b/community-staging/psqlodbc/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 60691 2011-12-16 21:40:31Z spupykin $ +# Maintainer: +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org> +# Contributor: Rick Rein <jeebusroxors@gmail.com> + +pkgname=psqlodbc +pkgver=09.00.0310 +pkgrel=2 +pkgdesc="PostgreSQL ODBC driver" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.postgresql.org" +depends=('unixodbc' 'postgresql-libs') +makedepends=('postgresql') +options=('!libtool') +source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz + fix-function-declarations.patch) +md5sums=('78144d9ea6c40f0a0a0b92128e6b0e05' + 'f1189f9c6ae0b5bfb5ee8423eaa4076f') + +build() { + cd "$srcdir/$pkgname-$pkgver" +# patch -p1 -i "$srcdir/fix-function-declarations.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/psqlodbc/fix-function-declarations.patch b/community-staging/psqlodbc/fix-function-declarations.patch new file mode 100644 index 000000000..4504661b0 --- /dev/null +++ b/community-staging/psqlodbc/fix-function-declarations.patch @@ -0,0 +1,47 @@ +diff -upr psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c +--- psqlodbc-08.04.0100.orig/odbcapi30.c 2008-10-07 00:46:09.000000000 +0300 ++++ psqlodbc-08.04.0100/odbcapi30.c 2009-09-19 20:13:57.000000000 +0300 +@@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle + SQLPOINTER CharacterAttribute, + SQLSMALLINT BufferLength, + SQLSMALLINT *StringLength, +-#if defined(_WIN64) + SQLLEN *NumericAttribute +-#elif defined(WITH_UNIXODBC) || defined(WIN32) +- SQLPOINTER NumericAttribute +-#else +- SQLLEN *NumericAttribute +-#endif + ) + { + CSTR func = "SQLColAttribute"; +diff -upr psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c +--- psqlodbc-08.04.0100.orig/odbcapi30w.c 2009-03-22 16:17:10.000000000 +0200 ++++ psqlodbc-08.04.0100/odbcapi30w.c 2009-09-19 20:22:17.000000000 +0300 +@@ -262,11 +262,7 @@ SQLRETURN SQL_API SQLColAttributeW( + SQLPOINTER pCharAttr, + SQLSMALLINT cbCharAttrMax, + SQLSMALLINT *pcbCharAttr, +-#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64)) +- SQLPOINTER pNumAttr +-#else + SQLLEN *pNumAttr +-#endif + ) + { + CSTR func = "SQLColAttributeW"; +diff -upr psqlodbc-08.04.0100.orig/odbcapi.c psqlodbc-08.04.0100/odbcapi.c +--- psqlodbc-08.04.0100.orig/odbcapi.c 2008-11-23 03:00:53.000000000 +0200 ++++ psqlodbc-08.04.0100/odbcapi.c 2009-09-19 20:13:56.000000000 +0300 +@@ -1111,11 +1111,7 @@ SQLExtendedFetch( + HSTMT hstmt, + SQLUSMALLINT fFetchType, + SQLLEN irow, +-#ifdef WITH_UNIXODBC +- SQLROWSETSIZE *pcrow, +-#else + SQLULEN *pcrow, +-#endif /* WITH_UNIXODBC */ + SQLUSMALLINT *rgfRowStatus) + { + RETCODE ret; diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD new file mode 100644 index 000000000..e26f76684 --- /dev/null +++ b/community-staging/qbittorrent/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + +pkgname=qbittorrent +pkgver=2.9.2 +pkgrel=7 +pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" +arch=('i686' 'x86_64') +url="http://www.qbittorrent.org/" +license=('GPL') +depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') +makedepends=('boost' 'geoip') +optdepends=('python: needed for search' + 'geoip: improves peer country resolution') +install='qbittorrent.install' +source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") +md5sums=('0c2188e0065be57e50c06f5934d5f7a2') + +build() { + cd qbittorrent-${pkgver} + + ./configure \ + --prefix=/usr + + make +} + +package() { + cd qbittorrent-${pkgver} + + make INSTALL_ROOT=${pkgdir} install +} diff --git a/community-staging/qbittorrent/qbittorrent.install b/community-staging/qbittorrent/qbittorrent.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/community-staging/qbittorrent/qbittorrent.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/texmaker/PKGBUILD b/community-staging/texmaker/PKGBUILD new file mode 100644 index 000000000..fef91aa12 --- /dev/null +++ b/community-staging/texmaker/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 60704 2011-12-17 04:26:21Z tdziedzic $ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: furester <xfurester@hotmail.com> +# Contributor: Firmicus <firmicus gmx net> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> + +pkgname=texmaker +pkgver=3.1 +pkgrel=2 +pkgdesc='Free cross-platform latex editor' +arch=('i686' 'x86_64') +url="http://www.xm1math.net/texmaker/index.html" +license=('GPL') +depends=('poppler-qt' 'ghostscript' 'qtwebkit') +source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2") +md5sums=('10a14c75abbb7234d4e5e58a7c85b110') + +build() { + cd ${pkgname}-${pkgver} + + export INSTALL_ROOT=${pkgdir} + + qmake -unix PREFIX=//usr texmaker.pro + + make +} + +package() { + cd ${pkgname}-${pkgver} + + export INSTALL_PATH=${pkgdir} + + make install +} diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 760f8c429..ad7ea8e30 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60299 2011-12-09 17:18:34Z giovanni $ +# $Id: PKGBUILD 60656 2011-12-16 15:19:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.30 +pkgver=0.8.31 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('0af59b942b6184ce7b9c4247555b68dd' +md5sums=('c2373e34d83b81a321cebea043d5f160' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') @@ -35,7 +35,7 @@ build() { $(find . -regex ".*.py\|.*.recipe") python2 setup.py build - python2 setup.py resources +# python2 setup.py resources python2 setup.py translations } diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index b94a1b1ae..6019768a5 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 60373 2011-12-12 11:44:22Z stephane $ +# $Id: PKGBUILD 60664 2011-12-16 16:51:24Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=cppcheck pkgver=1.52 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64') url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') +makedepends=('docbook-xsl') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) sha1sums=('56cc54f9d0af41dcfee5560e897fd3e1357712bc') build() { cd "${srcdir}/${pkgname}-${pkgver}" make + make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl man } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -D -p -m 644 cppcheck.1 ${pkgdir}/usr/share/man/man1/cppcheck.1 } diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD index f4cbee592..f3400453c 100644 --- a/community/ebtables/PKGBUILD +++ b/community/ebtables/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 60137 2011-12-05 21:42:40Z seblu $ +# $Id: PKGBUILD 60674 2011-12-16 19:18:54Z seblu $ # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=ebtables -pkgver='2.0.10_3' +pkgver=2.0.10_4 pkgrel=1 pkgdesc='Ethernet bridge filtering utilities' arch=('i686' 'x86_64') backup=('etc/conf.d/ebtables') url='http://ebtables.sourceforge.net/' license=('GPL2') +# ebtables segfault with --as-needed options=('!buildflags') source=( "http://downloads.sourceforge.net/${pkgname}/${pkgname}-v${pkgver/_/-}.tar.gz" 'ebtables.rc' 'ebtables.conf' ) -md5sums=('6df055d6476d3ce6bd7eed302a39c40c' +md5sums=('506742a3d44b9925955425a659c1a8d0' '368825c83a2b1180d2223e61b9f3bd07' '86fc3622e6fc0a7a7920c90ff576cc38') @@ -40,8 +41,8 @@ package() { rm "${pkgdir}/etc/ebtables/ebtables-config" # install custom ebtables rc.d scripts - install -D -m 0755 "${srcdir}/ebtables.rc" "${pkgdir}/etc/rc.d/ebtables" - install -D -m 0644 "${srcdir}/ebtables.conf" "${pkgdir}/etc/conf.d/ebtables" + install -D -m 0755 "${srcdir}/$pkgname.rc" "${pkgdir}/etc/rc.d/$pkgname" + install -D -m 0644 "${srcdir}/$pkgname.conf" "${pkgdir}/etc/conf.d/$pkgname" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/mingetty/PKGBUILD b/community/mingetty/PKGBUILD new file mode 100644 index 000000000..12836d08c --- /dev/null +++ b/community/mingetty/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: stonecrest <stonecrestATgmailDOTcom> + +pkgname=mingetty +pkgver=1.08 +pkgrel=3 +pkgdesc="A minimal getty which allows automatic logins." +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/mingetty" +license=('GPL') +depends=('glibc') +md5sums=('2a75ad6487ff271424ffc00a64420990' + 'b1bcb0668c34d4981e3acddc3990dfdb') +source=(http://downloads.sourceforge.net/sourceforge/mingetty/$pkgname-$pkgver.tar.gz + $pkgname-utf8.patch) + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch $pkgname.c ../$pkgname-utf8.patch + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -Dm755 $pkgname "$pkgdir/sbin/$pkgname" + install -Dm644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8" +} diff --git a/community/mingetty/mingetty-utf8.patch b/community/mingetty/mingetty-utf8.patch new file mode 100644 index 000000000..c269039ac --- /dev/null +++ b/community/mingetty/mingetty-utf8.patch @@ -0,0 +1,158 @@ +diff -Nru mingetty-1.07.orig/mingetty.c mingetty-1.07/mingetty.c +--- mingetty-1.07.orig/mingetty.c 2004-01-03 15:15:56.000000000 +0200 ++++ mingetty-1.07/mingetty.c 2006-11-22 22:13:26.967910100 +0200 +@@ -16,10 +16,15 @@ + * - autologin only at first login + * - /etc/mingetty.conf that can be used instead of /etc/inittab for + * command line options +- * - Can UTF-8 setup be done within mingetty? ++ * - Can UTF-8 setup be done within mingetty? Let's try now :-) (VinzC) + * - Also add /bin/login-type functionality in here? + */ + ++/* Additional comments: Vincent Cadet <vcadet@hotmail.com> (2006-11-21) ++ * - Attempt to make mingetty support UTF-8. Modifications were imported ++ * from Suse migetty.c 0.9.6s. ++ */ ++ + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> +@@ -39,6 +44,19 @@ + #include <syslog.h> + #include <sys/utsname.h> + #include <time.h> ++#include <locale.h> ++#include <iconv.h> ++#include <wctype.h> ++#include <sys/kd.h> ++#include <sys/ttydefaults.h> ++ ++#ifndef IUTF8 ++# ifndef ASM_IUTF8 ++# error ASM_IUTF8 input flag not defined - Cannot define IUTF8 ++# else ++# define IUTF8 ASM_IUTF8 ++# endif ++#endif + + /* name of this program (argv[0]) */ + static char *progname; +@@ -74,6 +92,8 @@ + static char *autologin = NULL; + /* try to read a char before dropping to login prompt */ + static int loginpause = 0; ++/* terminal mode */ ++static int mode = K_RAW; + + /* error() - output error messages */ + static void error (const char *fmt, ...) +@@ -187,10 +207,21 @@ + if (fd > 2) + close (fd); + ++ /* Detect mode of current keyboard setup, e.g. for UTF-8 */ ++ if (ioctl(0, KDGKBMODE, &mode) < 0) ++ mode = K_RAW; ++ + /* Write a reset string to the terminal. This is very linux-specific + and should be checked for other systems. */ + if (noclear == 0) +- write (0, "\033c", 2); ++ /* don't write a full reset (ESC c) because this leaves the ++ unicode mode again if the terminal was in unicode mode ++ and also undos the ESC sequences in CONSOLE_MAGIC which ++ are needed for some languages/console-fonts. ++ Just put the cursor to the home position (ESC [ H), ++ erase everything below the cursor (ESC [ J), and set the ++ scrolling region to the full window (ESC [ r) */ ++ write (0, "\033[r\033[H\033[J", 9); + + sigaction (SIGHUP, &sa_old, NULL); + } +@@ -292,32 +323,75 @@ + + static char *get_logname (void) + { +- static char logname[40]; ++ static char logname[4*UT_NAMESIZE]; + char *bp; + unsigned char c; ++ int ascii; ++ iconv_t ic; + + tcflush (0, TCIFLUSH); /* flush pending input */ ++ ++ /* Check for UTF-8 mode */ ++ switch(mode) { ++ case K_UNICODE: ++ ascii = 0; ++ setlocale(LC_CTYPE, "en_US.UTF-8"); ++ break; ++ case K_RAW: ++ case K_MEDIUMRAW: ++ case K_XLATE: ++ default: ++ ascii = 1; ++ setlocale(LC_CTYPE, "POSIX"); ++ break; ++ } ++ + for (*logname = 0; *logname == 0;) { + do_prompt (1); + for (bp = logname;;) { + if (read (0, &c, 1) < 1) { +- if (errno == EINTR || errno == EIO +- || errno == ENOENT) ++ if (errno == EINTR || errno == EAGAIN) { ++ usleep(1000); ++ continue; ++ } ++ if (errno == EIO || errno == ENOENT) + exit (EXIT_SUCCESS); + error ("%s: read: %s", tty, strerror (errno)); + } + if (c == '\n' || c == '\r') { + *bp = 0; + break; +- } else if (!isprint (c)) +- error ("%s: invalid character 0x%x in login" +- " name", tty, c); ++ } ++ ++ if (ascii && !isprint (c)) ++ error ("%s: invalid character 0x%x in login name", tty, c); + else if ((size_t)(bp - logname) >= sizeof (logname) - 1) + error ("%s: too long login name", tty); +- else +- *bp++ = c; ++ ++ *bp++ = c; + } + } ++ ++ if (!ascii && (ic = iconv_open("WCHAR_T", "UTF-8"))) { ++ char tmpbuf[4*sizeof(logname)], *op, *lp; ++ size_t len = bp - logname; ++ size_t out = sizeof(tmpbuf) - 1; ++ size_t wcl; ++ wint_t *wcp; ++ ++ op = tmpbuf; ++ lp = logname; ++ if ((wcl = iconv(ic , &lp, &len, &op, &out)) == (size_t)-1) ++ error ("%s: invalid character conversion for login name", tty); ++ iconv_close(ic); ++ ++ wcp = (wint_t*)tmpbuf; ++ wcp[wcl] = (wint_t)0; ++ while (*wcp) { ++ if (!iswprint(*wcp++)) ++ error ("%s: invalid character for login name found", tty); ++ } ++ } + return logname; + } + + + diff --git a/community/netselect/PKGBUILD b/community/netselect/PKGBUILD new file mode 100644 index 000000000..14aab1bbe --- /dev/null +++ b/community/netselect/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 60659 2011-12-16 15:40:36Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=netselect +pkgver=0.3 +pkgrel=2 +pkgdesc="An ultrafast intelligent parallelizing binary-search implementation of ping" +arch=('i686' 'x86_64') +url="http://alumnit.ca/~apenwarr/netselect/index.html" +license=('custom') +depends=('glibc') +source=("http://apenwarr.ca/netselect/$pkgname-$pkgver.tar.gz" + "license.txt") +md5sums=('3a3714946db2458e5db3d55373057ef2' + '741ea171051c5cbac5ff18326c11d65e') + +build() { + cd "$srcdir/$pkgname" + + sed -i '/sudo /d' Makefile + + make +} + +package() { + + install -D -m4755 "$srcdir/$pkgname"/netselect "$pkgdir"/usr/bin/netselect + install -D -m644 "$srcdir"/license.txt \ + "$pkgdir"/usr/share/licenses/netselect/LICENSE +} diff --git a/community/netselect/license.txt b/community/netselect/license.txt new file mode 100644 index 000000000..ff9ba9c48 --- /dev/null +++ b/community/netselect/license.txt @@ -0,0 +1,35 @@ +/* + * Netselect: + * Copyright (c) 1998-2001 by Avery Pennarun <apenwarr@worldvisions.ca> + * + * Traceroute: + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Van Jacobson. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 1247d1b66..8ea545187 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.5 -pkgrel=1 +pkgver=0.6.6 +pkgrel=3 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') url='http://nodejs.org/' @@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('0aaae7ebf357b4a67dcf1916dfc250fa') +md5sums=('43836ebd6e8e9059c4584e3b5ab50009') build() { cd node-v${pkgver} @@ -37,7 +37,7 @@ build() { check() { cd node-v${pkgver} - # test failures in 0.6.0 are known + # test failures in 0.6 are known make test || true } @@ -46,6 +46,11 @@ package() { make DESTDIR=${pkgdir} install + # install docs as per user request + install -d ${pkgdir}/usr/share/doc/nodejs + cp -r doc/api/api/* \ + ${pkgdir}/usr/share/doc/nodejs + install -D -m644 LICENSE \ ${pkgdir}/usr/share/licenses/nodejs/LICENSE } diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD new file mode 100644 index 000000000..889755cbc --- /dev/null +++ b/community/openocd/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Matthias Bauch <matthias.bauch@gmail.com> +# Contributor: Laszlo Papp <djszapi2 at gmail com> +# Contributor: Samuel Tardieu <sam@rfc1149.net> + +pkgname=openocd +pkgver=0.5.0 +pkgrel=2 +pkgdesc="Debugging, in-system programming and boundary-scan testing for embedded target devices" +arch=('i686' 'x86_64') +url="http://openocd.berlios.de" +license=('GPL') +depends=('libftdi') +options=(!strip !libtool) +install=openocd.install +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('43434c2b5353c9b853278b8bff22cb1a') + +# what features should be enabled on build +# 'ecos','zy1000' seams not to be supported on linux + +_features=(parport ft2232_libftdi amtjtagaccel ep93xx at91rm9200 gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/openocd/openocd.install b/community/openocd/openocd.install new file mode 100644 index 000000000..ac561dd8c --- /dev/null +++ b/community/openocd/openocd.install @@ -0,0 +1,22 @@ +infodir=usr/share/info +filelist=(openocd.info openocd.info-1 openocd.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +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 +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD index ee333c93a..87473ca88 100644 --- a/community/python2-pymongo/PKGBUILD +++ b/community/python2-pymongo/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: lp76 <l.peduto@gmail.com> pkgname=python2-pymongo -pkgver=2.0.1 +pkgver=2.1 pkgrel=1 pkgdesc="Python driver for MongoDB" license=("APACHE") @@ -12,10 +12,9 @@ depends=('python2') makedepends=('python2-distribute') source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz) arch=('i686' 'x86_64') -md5sums=('9e94096991285c384adfa8cafaf39c88') +md5sums=('40f8c8be0edcea398ba41d5d3ba5e8b0') package() { cd $srcdir/pymongo-$pkgver python2 setup.py install --root=$pkgdir --optimize=1 } -md5sums=('36300a5c3568707f6c5f1692f42ca008') diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD index a09e3fc73..637179fe1 100644 --- a/community/quilt/PKGBUILD +++ b/community/quilt/PKGBUILD @@ -1,21 +1,29 @@ -# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> +# $Id: PKGBUILD 60696 2011-12-17 00:36:28Z seblu $ +# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> pkgname=quilt -pkgver=0.48 -pkgrel=2 -pkgdesc="Manage a series of patches by keeping track of the changes each patch makes." +pkgver=0.50 +pkgrel=1 +pkgdesc='Manage a series of patches by keeping track of the changes each patch makes' arch=('i686' 'x86_64') -url="http://savannah.nongnu.org/projects/quilt" -license=('GPL') -depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'gettext') -source=(http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz) -md5sums=('f77adda60039ffa753f3c584a286f12b') +url='http://savannah.nongnu.org/projects/quilt' +license=('GPL2') +depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext') +source=("http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz") +md5sums=('ff5e1e041363c3af3c8fda4b968c9d1d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=/usr/share/man make - make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install } + +package() { + cd ${pkgname}-${pkgver} + make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index e20205c58..394ee7835 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57095 2011-10-21 06:30:14Z lfleischer $ +# $Id: PKGBUILD 60676 2011-12-16 19:35:40Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.1.2 +pkgver=2.9.2 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64') @@ -21,10 +21,10 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1207' +source=('http://www.snort.org/downloads/1347' 'snort' 'snort.conf.d') -md5sums=('9e94f20b934566469c239966e1b41eba' +md5sums=('22fa07ba915535b151329056439ae194' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index dad132874..91422a36c 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57572 2011-10-30 21:39:28Z lfleischer $ +# $Id: PKGBUILD 60672 2011-12-16 19:10:49Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.34 +pkgver=0.2.2.35 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64') @@ -16,11 +16,12 @@ backup=('etc/tor/torrc' 'etc/tor/tor-tsocks.conf' 'etc/conf.d/tor') install='tor.install' -source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz" +source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' 'tor' 'tor.conf.d') -md5sums=('0f1bbb8e086ea2aba41ff7f898fcf3bd' +md5sums=('dcecf699c4b929319d5f1ce0358d4835' + '73472ede84e22f8e3589baf47b0f4427' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa') diff --git a/community/upx/PKGBUILD b/community/upx/PKGBUILD index 68f61ba3b..b6242a652 100644 --- a/community/upx/PKGBUILD +++ b/community/upx/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=upx -pkgver=3.07 -pkgrel=2 +pkgver=3.08 +pkgrel=1 pkgdesc='Ultimate executable compressor.' arch=('i686' 'x86_64') url='http://upx.sourceforge.net/' @@ -14,7 +14,7 @@ depends=('zlib') makedepends=('ucl') source=("http://upx.sourceforge.net/download/${pkgname}-${pkgver}-src.tar.bz2" 'http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2') -md5sums=('8186ab103288242f7e8ecad1acd4af03' +md5sums=('54c76fa52cad578ff23ef98aee91e3f5' '29d5ffd03a5a3e51aef6a74e9eafb759') build() { diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD index 004bb7207..18f179961 100644 --- a/community/wine/PKGBUILD +++ b/community/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 59923 2011-12-02 20:03:51Z svenstaro $ +# $Id: PKGBUILD 60678 2011-12-16 21:03:03Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.34 +pkgver=1.3.35 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('ae7be1767e95e27360fc86f573649c19') +md5sums=('5833787fcd7fee5a2299fade10a2760d') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -119,7 +119,8 @@ build() { --with-x \ "${_wine32opts[@]}" - make + # These additional CFLAGS solve FS#27560 + make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign" } package() { diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index c3ead5dc1..d8f0ce047 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 145092 2011-12-16 20:04:34Z ronald $ +# Maintainer: Ronald van Haren <ronald@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.4.3 -pkgrel=3 +pkgver=2.5.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64") url="http://amarok.kde.org" @@ -21,7 +22,7 @@ optdepends=("libgpod: support for Apple iPod audio devices" "libmygpo-qt: gpodder.net Internet Service") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('24e8141bcbd065448911fa872c50197d') +sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2') build() { cd "${srcdir}" diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index cee554750..c6f92be84 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 140665 2011-10-17 22:40:35Z bisson $ +# $Id: PKGBUILD 145066 2011-12-16 09:17:40Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.3 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' -arch=('i686' 'x86_64') -depends=('bzip2' 'zlib' 'libtool') -options=('!libtool') +url='http://www.clamav.net/' license=('GPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('bzip2' 'libltdl') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') -url='http://www.clamav.net/' source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'rc.d' 'conf.d' 'logrotate' 'config.patch') sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655' - '7f15f0b13a1c11235bc99ef0add01efd8a442f07' + '50cfe02c97e4297a0efd25b23142408380305d30' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' '701a61571788d10ff7af01597785835c6bfea918') diff --git a/extra/clamav/install b/extra/clamav/install index 9116dc394..144134dde 100644 --- a/extra/clamav/install +++ b/extra/clamav/install @@ -2,8 +2,8 @@ post_install() { getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - install -d /var/{log,run}/clamav - chown clamav:root /var/{log,run}/clamav + install -d /var/log/clamav + chown clamav:root /var/log/clamav chown -R clamav:clamav /var/lib/clamav } diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d index 8e9c6afa9..04e959903 100644 --- a/extra/clamav/rc.d +++ b/extra/clamav/rc.d @@ -3,70 +3,65 @@ . /etc/rc.conf . /etc/rc.d/functions -# source application-specific settings -[ -f /etc/conf.d/clamav ] && . /etc/conf.d/clamav +[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav +[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/clamav -PID_FC=`pidof -o %PPID /usr/bin/freshclam` -PID_CD=`pidof -o %PPID /usr/sbin/clamd` +PID_FC=$(pidof -o %PPID /usr/bin/freshclam) +PID_CD=$(pidof -o %PPID /usr/sbin/clamd) case "$1" in - start) - # if clamd isn't started first, notifyclamd fails at times - if [ "$START_CLAMD" == "yes" ]; then - stat_busy "Starting ClamD" - [ -z "$PID_CD" ] && /usr/sbin/clamd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi + start) + if [[ $START_CLAMD = yes ]]; then + stat_busy "Starting ClamD" + [[ -z $PID_CD ]] && /usr/sbin/clamd + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + sleep 1 + if [[ $START_FRESHCLAM = yes ]]; then + stat_busy "Starting FreshClam" + [[ -z $PID_FC ]] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon clamav + stat_done + fi + fi + ;; + stop) + if [[ $START_CLAMD = yes ]]; then + stat_busy "Stopping ClamD" + [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi - # give clamd enough time to start - sleep 1 - - if [ "$START_FRESHCLAM" == "yes" ]; then - stat_busy "Starting FreshClam" - [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [ "$START_CLAMD" == "yes" ]; then - stat_busy "Stopping ClamD" - [ -n "$PID_CD" ] && kill $PID_CD &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [ "$START_FRESHCLAM" == "yes" ]; then - stat_busy "Stopping FreshClam" - [ -n "$PID_FC" ] && kill $PID_FC &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - # will not start if not fully stopped, so sleep - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + if [[ $START_FRESHCLAM = yes ]]; then + stat_busy "Stopping FreshClam" + [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon clamav + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD index e252bbe96..e2c87804e 100644 --- a/extra/claws-mail-extra-plugins/PKGBUILD +++ b/extra/claws-mail-extra-plugins/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 139484 2011-10-02 07:11:06Z andyrtr $ +# $Id: PKGBUILD 145087 2011-12-16 15:46:57Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Mildred <mildred593 at online dot fr> pkgname=claws-mail-extra-plugins -pkgver=3.7.10 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Extra plugins for claws-mail" url="http://www.claws-mail.org/plugins.php?branch=EXT" license=('GPL3') arch=('i686' 'x86_64') -depends=('claws-mail>=3.7.10') +depends=('claws-mail>=3.8.0') makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') @@ -32,26 +32,17 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') replaces=('sylpheed-claws-extra-plugins') options=('!libtool' '!strip') -source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2 - webkit1.6.1.patch) -md5sums=('fe782b2d4762c9727e22c1bb7979f7d6' - '8b94fa44072331b9c3926607eb42ba26') -sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf' - '8efd800617406dfe58a14422f243a678c582a90d') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) +md5sums=('0783008baff9e09cb21ffc8947e9f2ee') build() { cd "$srcdir/claws-mail-extra-plugins-$pkgver" - # fix for new webkit api - pushd fancy* - patch -Np0 -i ${srcdir}/webkit1.6.1.patch - popd - # fix for python2 export PYTHON="/usr/bin/python2" # fix gdata plugin build - sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure for dir in */; do [[ $dir != geolocation_plugin-* ]] && ( diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 500ba4c05..6d6fd0683 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $ +# $Id: PKGBUILD 145085 2011-12-16 15:46:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail -pkgver=3.7.10 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -19,16 +19,11 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 - gnutls_buildfix.patch) -md5sums=('fcf58dcff52f0908ff3bc368d820408b' - '372bf7a9da58ae49d9da50f79db69fb6') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) +md5sums=('df9f1657d7f34959a2205344d952c2e3') build() { cd ${srcdir}/${pkgname}-${pkgver} - - # fix build with latest gnutls - patch -Np1 -i ${srcdir}/gnutls_buildfix.patch sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 6f72cc5c5..bd344fc5a 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145012 2011-12-14 10:17:16Z bisson $ +# $Id: PKGBUILD 145112 2011-12-17 04:54:41Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=2.5.4 +pkgver=2.6.0 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('4c0d3582eb370b4e295268801806c3bdd47a6940' +sha1sums=('4abef8d37492b68d54ba40420f65d04779ee2ec5' '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 9c5b48ec0..c72b7e7ea 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 142880 2011-11-17 18:34:39Z ibiru $ +#$Id: PKGBUILD 145081 2011-12-16 15:41:26Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install index e899ab5a2..9635ee505 100644 --- a/extra/gnome-keyring/gnome-keyring.install +++ b/extra/gnome-keyring/gnome-keyring.install @@ -11,5 +11,8 @@ post_upgrade() { } post_remove() { - post_install $1 + glib-compile-schemas /usr/share/glib-2.0/schemas + update-mime-database /usr/share/mime 1> /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q } diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 84488e042..ae3f7e808 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -20,7 +20,7 @@ _LANGTOOLS_CHANGESET=9b85f1265346 _OPENJDK_CHANGESET=0a76e5390e68 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -92,7 +92,7 @@ build() { unset JAVA_HOME unset CLASSPATH # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh + [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh unset MAKEFLAGS export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" @@ -120,11 +120,8 @@ build() { --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ --enable-pulse-java \ -# --with-rhino #--help - #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ - #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ - #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ +# --with-rhino #--help # --enable-systemtap Enable inclusion of SystemTap trace support # --enable-nss Enable inclusion of NSS security provider @@ -140,15 +137,16 @@ check() { package_jre7-openjdk() { pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" - depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' + depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libcups' 'gtk2' 'lcms2' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas') optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' 'alsa-lib: for sound' - 'giflib: for gif format support') + 'giflib: for gif format support' + 'libpulse: for advanced sound') provides=('java-runtime=7') conflicts=('java-runtime') # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos - backup=(etc/profile.d/jre7.sh) + backup=(etc/profile.d/jre.sh etc/profile.d/jre.csh) install=jre7-openjdk.install _jvmdir=/usr/lib/jvm/java-7-openjdk @@ -208,7 +206,7 @@ package_jdk7-openjdk() { provides=('java-environment=7') conflicts=('java-environment') # replaces=('openjdk6') - backup=(etc/profile.d/jdk7.sh) + backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh) _jvmdir=/usr/lib/jvm/java-7-openjdk diff --git a/extra/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install index d311e6e44..d19979bf6 100644 --- a/extra/java7-openjdk/jre7-openjdk.install +++ b/extra/java7-openjdk/jre7-openjdk.install @@ -5,7 +5,7 @@ post_install() { fi echo "when you use a non-reparenting window manager" echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre7.sh" + echo "/etc/profile.d/jre.sh" # update-desktop-database -q } diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index 7cdcf8bfa..0ac1474d8 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 127369 2011-06-13 20:26:40Z eric $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 145076 2011-12-16 15:20:33Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=lcms2 -pkgver=2.2 +pkgver=2.3 pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('MIT') -depends=('libtiff>=3.9.4') +depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/lcms/$pkgname-$pkgver.tar.gz) -md5sums=('aaf33c7c25675e6163189ba488ae20f5') +source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) +sha1sums=('67d5fabda2f5777ca8387766539b9c871d993133') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm 644 COPYING \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 26c64dbc0..05897b97f 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 130682 2011-07-07 17:24:45Z andyrtr $ +# $Id: PKGBUILD 145122 2011-12-17 08:47:23Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'xorg-util-macros') options=(!libtool) license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('c66cfdee74e8d169a7992b5f257395e653ca761b') +sha1sums=('e4ca1b45368214ba246bfad398ea087125c79f31') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 22d412f9b..e934f7b2f 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 141295 2011-10-28 08:03:30Z tpowa $ +# $Id: PKGBUILD 145070 2011-12-16 11:39:16Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.15.1 +pkgver=1.0 pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) license=('GPL2' 'LGPL2.1') url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'libpulse') makedepends=('texi2html' 'perl' 'python2') backup=('etc/qemu/target-x86_64.conf') install=qemu-kvm.install @@ -25,7 +25,7 @@ build() ./configure --prefix=/usr \ --python=/usr/bin/python2 \ --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss \ + --audio-drv-list=alsa,sdl,oss,pa \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make @@ -54,5 +54,5 @@ package() esac done } -md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320' +md5sums=('00a825db46a70ba8ef9fc95da9cc7c1e' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index ba3890ab2..2852fe278 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 141293 2011-10-28 08:03:28Z tpowa $ +# $Id: PKGBUILD 145072 2011-12-16 12:11:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.15.1 +pkgver=1.0 pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl' 'libpulse') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz @@ -19,7 +19,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs @@ -40,5 +40,5 @@ package() { done } -md5sums=('34f17737baaf1b3495c89cd6d4a607ed' +md5sums=('a64b36067a191451323b0d34ebb44954' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 1fcc15fb7..e5c25695b 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 143537 2011-11-26 00:25:40Z heftig $ +# $Id: PKGBUILD 145110 2011-12-17 04:30:48Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.8 +pkgver=0.12.9 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('92b18cc381a80d87d52e386f51ca1475b94f82cf5adf668424669c5b63474473') +sha256sums=('ccd61c8f79905f7e09af3a4a863772256601dcd3213b0f9a3f76add04e553b5c') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 17dc83588..ab58cdaad 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87311 2010-08-12 11:45:43Z tpowa $ +# $Id: PKGBUILD 145068 2011-12-16 10:55:34Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=vde2 -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" @@ -18,13 +18,17 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 vde.conf vde.rc) install=vde2.install -options=(!libtool) +options=(!libtool !makeflags) build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ --enable-experimental - make + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde @@ -35,7 +39,8 @@ build() { # install slirp license install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde } -md5sums=('22a7913beb50d6706155fc502ff3cbbe' + +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' '7d9bc56d2e561d849e915000d1c0f269' 'a920123fc620bcedbccb703a8d1bdc55' 'cb8ace28e8efd4dad128be4be71b3b07' diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install index 5005fb448..74e1710ff 100644 --- a/extra/vde2/vde2.install +++ b/extra/vde2/vde2.install @@ -8,7 +8,3 @@ post_install() { post_upgrade() { post_install $1 } - -op=$1 -shift -$op $* diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 1ab882ce8..d106536da 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -5,7 +5,7 @@ pkgname=wxmaxima pkgver=11.08.0 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') url="http://wxmaxima.sourceforge.net/" diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index a55107e61..09463e789 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142918 2011-11-18 09:17:26Z jgc $ +# $Id: PKGBUILD 145131 2011-12-17 09:42:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.2 -pkgrel=2 +pkgver=1.11.3 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -14,19 +14,16 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch revert-trapezoids.patch - git-fixes.patch + #git-fixes.patch xserver-1.11.2-record-crasher.patch - Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch xvfb-run xvfb-run.1 10-quirks.conf) -md5sums=('8796fff441e5435ee36a72579008af24' +md5sums=('a7194c437963627e1db0dd2d6c1a1984' '6c7e87d63ac4b535e19a80c89d0cf091' 'f8194638ca4872c2b0a67862a70bcebf' 'f6c84f4936f8e00abdfbd9fb4eda83fb' - '6fb42ec979ecd6125b6599f54dc00d14' '3f9de4dbfee2da90167192d8ca9eb2b4' - '47f9b979fe38043b42ff86eeee6fd0d0' '52fd3effd80d7bc6c1660d4ecf23d31c' '376c70308715cd2643f7bff936d9934b' 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') @@ -44,16 +41,12 @@ build() { patch -Np1 -i "${srcdir}/revert-trapezoids.patch" # Add post-release patches from 1.11 branch - patch -Np1 -i "${srcdir}/git-fixes.patch" +# patch -Np1 -i "${srcdir}/git-fixes.patch" # From Fedora. # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" - # From Fedora. - # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 - patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" - autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 1676c5a0a..13ca6ef04 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 59924 2011-12-02 20:08:04Z svenstaro $ +# $Id: PKGBUILD 60679 2011-12-16 21:33:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.34 +pkgver=1.3.35 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('ae7be1767e95e27360fc86f573649c19') +md5sums=('5833787fcd7fee5a2299fade10a2760d') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -119,7 +119,8 @@ build() { --with-x \ "${_wine32opts[@]}" - make + # These additional CFLAGS solve FS#27560 + make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign" } package() { diff --git a/staging/arora/PKGBUILD b/staging/arora/PKGBUILD new file mode 100644 index 000000000..6ca245e39 --- /dev/null +++ b/staging/arora/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 145108 2011-12-17 04:20:31Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=arora +pkgver=0.11.0 +pkgrel=3 +pkgdesc='Lightweight cross-platform Web browser' +url='http://www.arora-browser.org/' +license=('GPL') +arch=('i686' 'x86_64') +depends=('qtwebkit' 'desktop-file-utils') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake PREFIX='/usr' 'CONFIG-=debug' -r + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/staging/arora/install b/staging/arora/install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/staging/arora/install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/freetds/PKGBUILD b/staging/freetds/PKGBUILD new file mode 100644 index 000000000..c91427f2c --- /dev/null +++ b/staging/freetds/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 11362 2010-02-09 23:57:26Z dgriffiths $ +# Contributor: Aaron Malone <aaron@munge.net> + +pkgname=freetds +pkgver=0.91 +pkgrel=2 +pkgdesc='Library for accessing Sybase and MS SQL Server databases' +url='http://www.freetds.org' +arch=('i686' 'x86_64') +license=('LGPL') +depends=('unixodbc') +options=('!libtool') +backup=('etc/freetds/freetds.conf' + 'etc/freetds/locales.conf' + 'etc/freetds/pool.conf') +source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz") +md5sums=('b14db5823980a32f0643d1a84d3ec3ad') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD new file mode 100644 index 000000000..43a5a069b --- /dev/null +++ b/staging/php/PKGBUILD @@ -0,0 +1,365 @@ +# $Id: PKGBUILD 145096 2011-12-16 21:32:24Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.8 +_suhosinver=5.3.7-0.9.10 +pkgrel=6 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('704cd414a0565d905e1074ffdc1fadfb' + '08582e502fed8221c6577042ca45ddb8' + '5bf4473f658404aa9a97bf026ecef8e9' + '65606c606df97a0760dfe5aaf9893afc' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + '09005dabd90c48ddd392b3dbf05f8a82' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/staging/php/apache.conf b/staging/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/staging/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/staging/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..b4dd32f96 --- /dev/null +++ b/staging/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -102,7 +102,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -121,9 +122,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -163,23 +164,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -333,7 +334,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch new file mode 100644 index 000000000..46c842921 --- /dev/null +++ b/staging/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/staging/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD new file mode 100644 index 000000000..2f25ac7ed --- /dev/null +++ b/staging/pyqt/PKGBUILD @@ -0,0 +1,79 @@ +# $Id: PKGBUILD 145129 2011-12-17 09:34:44Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> + +pkgbase=pyqt +pkgname=('pyqt' 'python2-pyqt') +pkgver=4.8.6 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://riverbankcomputing.co.uk/software/pyqt/intro" +license=('GPL') +makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' + 'python-opengl' 'qt-assistant-compat' 'qtwebkit') +source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') + +build() { + cd "${srcdir}" + cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + python configure.py \ + --confirm-license \ + --qsci-api + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make + + ### Python2 version ### + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + python2 configure.py \ + --confirm-license \ + -v /usr/share/sip \ + --qsci-api + + # Thanks Gerardo for the rpath fix + find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' + + make +} + +package_pyqt(){ + pkgdesc="A set of Python 3.x bindings for the Qt toolkit" + depends=('qtwebkit' 'python-sip') + optdepends=('phonon: enable audio and video in PyQt applications' + 'qscintilla: QScintilla API' + 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('python-qt') + provides=('python-qt') + + cd "${srcdir}/PyQt-x11-gpl-${pkgver}" + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install +} + +package_python2-pyqt(){ + pkgdesc="A set of Python 2.x bindings for the Qt toolkit" + depends=('pyqt' 'python2-sip' 'dbus-python') + optdepends=('phonon: enable audio and video in PyQt applications' + 'python-opengl: enable OpenGL 3D graphics in PyQt applications' + 'qscintilla: QScintilla API' + 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('python2-qt') + provides=('python2-qt') + options=('!emptydirs') + + cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}" + # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR + make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Provided by pyqt + rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} + rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so + rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api +} diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD new file mode 100644 index 000000000..095469bd0 --- /dev/null +++ b/staging/qt/PKGBUILD @@ -0,0 +1,127 @@ +# $Id: PKGBUILD 145101 2011-12-17 02:20:56Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=qt +pkgname=('qt' 'qt-private-headers') +pkgver=4.8.0 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://qt-project.org/' +license=('GPL3' 'LGPL') +makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs' + 'mysql' 'unixodbc' 'cups' 'gtk2') +options=('!libtool') +_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" +source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" + 'assistant.desktop' 'designer.desktop' 'linguist.desktop' + 'qtconfig.desktop') +md5sums=('e8a5fdbeba2927c948d9f477a6abe904' + 'fc211414130ab2764132e7370f8e5caa' + '85179f5e0437514f8639957e1d8baf62' + 'f11852b97583610f3dbb669ebc3e21bc' + '6b771c8a81dd90b45e8a79afa0e5bbfd') + +build() { + cd "${srcdir}"/${_pkgfqn} + + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf + sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf + sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf + + ./configure -confirm-license -opensource \ + -prefix /usr \ + -docdir /usr/share/doc/qt \ + -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ + -datadir /usr/share/qt \ + -translationdir /usr/share/qt/translations \ + -sysconfdir /etc \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -plugin-sql-{psql,mysql,sqlite,odbc} \ + -system-sqlite \ + -no-phonon \ + -no-phonon-backend \ + -no-webkit \ + -no-declarative-debug \ + -graphicssystem raster \ + -openssl-linked \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -silent \ + -no-rpath \ + -optimized-qmake \ + -reduce-relocations \ + -dbus-linked \ + -no-openvg + make +} + +package_qt() { + pkgdesc='A cross-platform application and UI framework' + depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus' + 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' + 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') + optdepends=('postgresql-libs: PostgreSQL driver' + 'libmysqlclient: MySQL driver' + 'unixodbc: ODBC driver' + 'libxinerama: Xinerama support' + 'libxcursor: Xcursor support' + 'libxfixes: Xfixes support') + install='qt.install' + + cd "${srcdir}"/${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install + + # install missing icons and desktop files + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -D -m644 ${icon} \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" + done + install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" + install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" + install -p -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" + install -d "${pkgdir}/usr/share/applications" + install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ + "${pkgdir}/usr/share/applications/" + + # install license addition + install -D -m644 LGPL_EXCEPTION.txt \ + ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt + + # Fix wrong path in pkgconfig files + find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \ + -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; + + # Fix wrong path in prl files + find "${pkgdir}/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; +} + +package_qt-private-headers(){ + pkgdesc="Qt private headers for development" + depends=("qt=${pkgver}") + + install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script} + + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \ + "${pkgdir}"/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/ + done +} diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop new file mode 100644 index 000000000..a9e98c44b --- /dev/null +++ b/staging/qt/assistant.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Qt Assistant +Comment=Shows Qt documentation and examples +Exec=/usr/bin/assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop new file mode 100644 index 000000000..9b7b6e9aa --- /dev/null +++ b/staging/qt/designer.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=Qt Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt applications +Exec=/usr/bin/designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop new file mode 100644 index 000000000..8cbe86599 --- /dev/null +++ b/staging/qt/linguist.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Linguist +Comment=Add translations to Qt applications +Exec=/usr/bin/linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; diff --git a/staging/qt/qt.install b/staging/qt/qt.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/qt/qt.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop new file mode 100644 index 000000000..46dcf9e3d --- /dev/null +++ b/staging/qt/qtconfig.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt Config +Comment=Configure Qt behavior, styles, fonts +Exec=/usr/bin/qtconfig +Icon=qtlogo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +NoDisplay=true diff --git a/staging/qt3/PKGBUILD b/staging/qt3/PKGBUILD new file mode 100644 index 000000000..a10f5f15f --- /dev/null +++ b/staging/qt3/PKGBUILD @@ -0,0 +1,133 @@ +# $Id: PKGBUILD 145099 2011-12-17 01:36:17Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=qt3 +pkgver=3.3.8 +pkgrel=21 +pkgdesc="The QT3 gui toolkit" +arch=('i686' 'x86_64') +url="http://www.trolltech.com/products/qt/index.html" +license=('GPL') +depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft' + 'libxrandr' 'libmng') +makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3') +optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') +options=('!libtool') +install=qt.install +source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2 + qt.profile qt3-png14.patch qt-copy-kde-patches.tar.bz2 + qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff + mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) +sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7' + 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' + 'c8ea644266f4d6d6be9adf894f03138b8eca3fc2' + '9cb2e5bec782069692ee337cfa171539d9d73753' + '116afa0e737bdf27ea27f9b3653aeb56db9ec151' + 'ca5ecb29c7f1c826d48703339a3371038e306bb7' + 'd928ff55adb52c4bab2fb268df022651551cd70c' + 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04' + '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17' + '1346320614f6f86fbeb10b9fbad721dea29f5b61' + 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f') + +# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ +# other qt-patches come from fedora and gentoo + +build() { + unset QMAKESPEC + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + cd "${srcdir}"/qt-x11-free-${pkgver} + # apply qt patches from kde.org + for i in ../qt-copy-kde-patches/*; do + patch -Np0 -i $i + done + # apply other qt patches and one security fix from debian/gentoo + for i in ../qt-patches/*; do + patch -Np1 -i $i + done + # fix utf8 bug + patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff + # fix asia fonts + patch -p0 -i "${srcdir}"/qt-font-default-subst.diff + # fix segfaults on exit when using mysql DB driver + patch -p0 -i "${srcdir}"/mysql.patch + # fix CJK font/chars select error (FS#11245) + patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff + # fix build problem against new unixODBC + patch -p1 -i "${srcdir}"/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i "${srcdir}"/gcc-4.6.patch + + patch -p0 -i "${srcdir}"/qt3-png14.patch + # start compiling qt + sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix + rm -rf doc/html examples tutorial + sed -i "s|sub-tutorial sub-examples||" Makefile + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix + sed -i "s|read acceptance|acceptance=yes|" configure + + # remove unwanted mkspecs + rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} + + if [ "$CARCH" = "x86_64" ]; then + export ARCH="-64" + else unset ARCH + fi + + ./configure -prefix /opt/qt \ + -platform linux-g++$ARCH \ + -system-zlib \ + -qt-gif \ + -release \ + -shared \ + -sm \ + -nis \ + -thread \ + -stl \ + -system-lib{png,jpeg,mng} \ + -no-g++-exceptions \ + -plugin-sql-{mysql,psql,sqlite,odbc} + + # fix /opt/qt/lib path + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile + [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile + + cd "${srcdir}"/qt-x11-free-${pkgver} + make -C qmake + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro + cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql + "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro + + cd "${srcdir}"/qt-x11-free-${pkgver} + # fix the broken makefiles + #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile + make +} + +package() { + cd "${srcdir}"/qt-x11-free-${pkgver} + make INSTALL_ROOT="${pkgdir}" install + rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} + sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl + install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake + install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh + ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config + rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH + + # install man pages + install -d -m755 "${pkgdir}"/opt/qt/man + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ + + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf +} diff --git a/staging/qt3/eastern_asian_languagues.diff b/staging/qt3/eastern_asian_languagues.diff new file mode 100644 index 000000000..7c25eef7d --- /dev/null +++ b/staging/qt3/eastern_asian_languagues.diff @@ -0,0 +1,39 @@ +--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200 ++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200 +@@ -966,20 +966,22 @@ + + #ifdef Q_WS_X11 + if (script == QFont::Han) { +- // modify script according to locale +- static QFont::Script defaultHan = QFont::UnknownScript; +- if (defaultHan == QFont::UnknownScript) { +- QCString locale = setlocale(LC_ALL, NULL); +- if (locale.contains("ko")) +- defaultHan = QFont::Han_Korean; +- else if (locale.contains("zh_TW") || locale.contains("zh_HK")) +- defaultHan = QFont::Han_TraditionalChinese; +- else if (locale.contains("zh")) +- defaultHan = QFont::Han_SimplifiedChinese; +- else +- defaultHan = QFont::Han_Japanese; +- } +- script = defaultHan; ++ // modify script according to locale ++ static QFont::Script defaultHan; ++ QCString locale = setlocale(LC_ALL, NULL); ++ ++ if (locale.contains("ko")) ++ defaultHan = QFont::Han_Korean; ++ else if (locale.contains("zh_TW") || locale.contains("zh_HK")) ++ defaultHan = QFont::Han_TraditionalChinese; ++ else if (locale.contains("zh")) ++ defaultHan = QFont::Han_SimplifiedChinese; ++ else if (locale.contains("ja")) ++ defaultHan = QFont::Han_Japanese; ++ else ++ defaultHan = QFont::Han; // don't change ++ ++ script = defaultHan; + } + #endif + diff --git a/staging/qt3/gcc-4.6.patch b/staging/qt3/gcc-4.6.patch new file mode 100644 index 000000000..bcbffcea6 --- /dev/null +++ b/staging/qt3/gcc-4.6.patch @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif diff --git a/staging/qt3/mysql.patch b/staging/qt3/mysql.patch new file mode 100644 index 000000000..5f61edc67 --- /dev/null +++ b/staging/qt3/mysql.patch @@ -0,0 +1,47 @@ +--- src/sql/drivers/mysql/qsql_mysql.cpp ++++ src/sql/drivers/mysql/qsql_mysql.cpp +@@ -37,7 +37,6 @@ + #include "qsql_mysql.h" + #include <private/qsqlextension_p.h> + +-#include <qapplication.h> + #include <qdatetime.h> + #include <qvaluevector.h> + #include <qsqlrecord.h> +@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() + } + + ///////////////////////////////////////////////////////// +-static void qServerEnd() +-{ +-#ifndef Q_NO_MYSQL_EMBEDDED +-# if MYSQL_VERSION_ID >= 40000 +- mysql_server_end(); +-# endif // MYSQL_VERSION_ID +-#endif // Q_NO_MYSQL_EMBEDDED +-} + + static void qServerInit() + { +@@ -366,9 +357,7 @@ static void qServerInit() + qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); + # endif + } +- qAddPostRoutine(qServerEnd); + init = TRUE; +- + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED + } +@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() + QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + delete ext; + } ++#ifndef Q_NO_MYSQL_EMBEDDED ++# if MYSQL_VERSION_ID > 40000 ++ mysql_server_end(); ++# endif ++#endif + } + + bool QMYSQLDriver::hasFeature( DriverFeature f ) const diff --git a/staging/qt3/qt-copy-kde-patches.tar.bz2 b/staging/qt3/qt-copy-kde-patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..19d899963 --- /dev/null +++ b/staging/qt3/qt-copy-kde-patches.tar.bz2 diff --git a/staging/qt3/qt-font-default-subst.diff b/staging/qt3/qt-font-default-subst.diff new file mode 100644 index 000000000..3e286f74e --- /dev/null +++ b/staging/qt3/qt-font-default-subst.diff @@ -0,0 +1,77 @@ +--- src/kernel/qfontdatabase_x11.cpp ++++ src/kernel/qfontdatabase_x11.cpp +@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s + if (script == QFont::Latin) + // add Euro character + FcCharSetAddChar(cs, 0x20ac); +- if (script == QFont::Han_SimplifiedChinese) +- FcCharSetAddChar(cs, 0x3400); +- if (script == QFont::Han_TraditionalChinese){ +- FcCharSetAddChar(cs, 0x3435); +- FcCharSetAddChar(cs, 0xE000); +- FcCharSetAddChar(cs, 0xF6B1); +- } +- if (script == QFont::MiscellaneousSymbols) +- FcCharSetAddChar(cs, 0x2714); + FcPatternAddCharSet(pattern, FC_CHARSET, cs); + FcCharSetDestroy(cs); + } +@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c + FcPatternPrint(pattern); + #endif + ++ // XftFontMatch calls the right ConfigSubstitute variants, but as we use ++ // FcFontMatch/Sort here we have to do it manually. + FcConfigSubstitute(0, pattern, FcMatchPattern); ++ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern); ++ + // qDebug("1: pattern contains:"); + // FcPatternPrint(pattern); + +@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c + value.u.s = (const FcChar8 *)cs.data(); + FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); + } +-#ifdef FONT_MATCH_DEBUG +- printf("final pattern contains:\n"); +- FcPatternPrint(pattern); +-#endif + } + + if (script != QFont::Unicode) { +@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c + if (script == QFont::Latin) + // add Euro character + FcCharSetAddChar(cs, 0x20ac); +- if (script == QFont::Han_SimplifiedChinese) +- FcCharSetAddChar(cs, 0x3400); +- if (script == QFont::Han_TraditionalChinese) { +- FcCharSetAddChar(cs, 0x3435); +- FcCharSetAddChar(cs, 0xE000); +- FcCharSetAddChar(cs, 0xF6B1); +- } +- if (script == QFont::MiscellaneousSymbols) +- FcCharSetAddChar(cs, 0x2714); + FcPatternAddCharSet(pattern, FC_CHARSET, cs); + FcCharSetDestroy(cs); + } + ++#ifdef FONT_MATCH_DEBUG ++ printf("final pattern contains:\n"); ++ FcPatternPrint(pattern); ++#endif ++ + QFontEngine *fe = 0; + + for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) { +--- src/kernel/qfontdatabase.cpp ++++ src/kernel/qfontdatabase.cpp +@@ -554,7 +554,7 @@ static const unsigned short sample_chars + // GeometricSymbols, + { 0x2500, 0x0 }, + // MiscellaneousSymbols, +- { 0x2640, 0x0 }, ++ { 0x2640, 0x2714, 0x0 }, + // EnclosedAndSquare, + { 0x2460, 0x0 }, + // Braille, diff --git a/staging/qt3/qt-odbc.patch b/staging/qt3/qt-odbc.patch new file mode 100644 index 000000000..6f21e3cf1 --- /dev/null +++ b/staging/qt3/qt-odbc.patch @@ -0,0 +1,19 @@ +diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100 ++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100 +@@ -57,13 +57,13 @@ + #endif + + // newer platform SDKs use SQLLEN instead of SQLINTEGER +-#ifdef SQLLEN ++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLLEN SQLLEN + #else + # define QSQLLEN SQLINTEGER + #endif + +-#ifdef SQLULEN ++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX) + # define QSQLULEN SQLULEN + #else + # define QSQLULEN SQLUINTEGER diff --git a/staging/qt3/qt-patches.tar.bz2 b/staging/qt3/qt-patches.tar.bz2 Binary files differnew file mode 100644 index 000000000..3f4aee171 --- /dev/null +++ b/staging/qt3/qt-patches.tar.bz2 diff --git a/staging/qt3/qt.install b/staging/qt3/qt.install new file mode 100644 index 000000000..6d042daae --- /dev/null +++ b/staging/qt3/qt.install @@ -0,0 +1,12 @@ +post_install() { + post_remove +} + +post_upgrade() { + post_remove +} + +post_remove() { + # this can be removed in future versions + sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf +} diff --git a/staging/qt3/qt.profile b/staging/qt3/qt.profile new file mode 100644 index 000000000..ed4d232ae --- /dev/null +++ b/staging/qt3/qt.profile @@ -0,0 +1,4 @@ +export QTDIR=/opt/qt +export QT_XFT=true +export PATH=$PATH:$QTDIR/bin +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/staging/qt3/qt3-png14.patch b/staging/qt3/qt3-png14.patch new file mode 100644 index 000000000..e8a194529 --- /dev/null +++ b/staging/qt3/qt3-png14.patch @@ -0,0 +1,33 @@ +--- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100 ++++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100 +@@ -159,7 +159,7 @@ + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr->trans_color.gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -187,7 +187,7 @@ + info_ptr->palette[i].red, + info_ptr->palette[i].green, + info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr->trans_alpha[i] + ) + ); + i++; +@@ -321,9 +321,9 @@ + png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) + if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { + QRgb trans = 0xFF000000 | qRgb( +- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, +- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, +- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); ++ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, ++ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, ++ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); + for (uint y=0; y<height; y++) { + for (uint x=0; x<info_ptr->width; x++) { + if (((uint**)jt)[y][x] == trans) { diff --git a/staging/qt3/utf8-bug-qt3.diff b/staging/qt3/utf8-bug-qt3.diff new file mode 100644 index 000000000..43e84a99f --- /dev/null +++ b/staging/qt3/utf8-bug-qt3.diff @@ -0,0 +1,101 @@ +--- src/codecs/qutfcodec.cpp ++++ src/codecs/qutfcodec.cpp +@@ -154,6 +154,7 @@ + + class QUtf8Decoder : public QTextDecoder { + uint uc; ++ uint min_uc; + int need; + bool headerDone; + public: +@@ -167,8 +168,9 @@ + result.setLength( len ); // worst case + QChar *qch = (QChar *)result.unicode(); + uchar ch; ++ int error = -1; + for (int i=0; i<len; i++) { +- ch = *chars++; ++ ch = chars[i]; + if (need) { + if ( (ch&0xc0) == 0x80 ) { + uc = (uc << 6) | (ch & 0x3f); +@@ -182,6 +184,8 @@ + *qch++ = QChar(high); + *qch++ = QChar(low); + headerDone = TRUE; ++ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { ++ *qch++ = QChar::replacement; + } else { + if (headerDone || QChar(uc) != QChar::byteOrderMark) + *qch++ = uc; +@@ -190,6 +194,7 @@ + } + } else { + // error ++ i = error; + *qch++ = QChar::replacement; + need = 0; + } +@@ -200,12 +205,21 @@ + } else if ((ch & 0xe0) == 0xc0) { + uc = ch & 0x1f; + need = 1; ++ error = i; ++ min_uc = 0x80; + } else if ((ch & 0xf0) == 0xe0) { + uc = ch & 0x0f; + need = 2; ++ error = i; ++ min_uc = 0x800; + } else if ((ch&0xf8) == 0xf0) { + uc = ch & 0x07; + need = 3; ++ error = i; ++ min_uc = 0x10000; ++ } else { ++ // error ++ *qch++ = QChar::replacement; + } + } + } +--- src/tools/qstring.cpp ++++ src/tools/qstring.cpp +@@ -5805,6 +5805,7 @@ + result.setLength( len ); // worst case + QChar *qch = (QChar *)result.unicode(); + uint uc = 0; ++ uint min_uc = 0; + int need = 0; + int error = -1; + uchar ch; +@@ -5822,6 +5823,12 @@ + unsigned short low = uc%0x400 + 0xdc00; + *qch++ = QChar(high); + *qch++ = QChar(low); ++ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { ++ // overlong seqence, UTF16 surrogate or BOM ++ i = error; ++ qch = addOne(qch, result); ++ *qch++ = QChar(0xdbff); ++ *qch++ = QChar(0xde00+((uchar)utf8[i])); + } else { + *qch++ = uc; + } +@@ -5844,14 +5851,17 @@ + uc = ch & 0x1f; + need = 1; + error = i; ++ min_uc = 0x80; + } else if ((ch & 0xf0) == 0xe0) { + uc = ch & 0x0f; + need = 2; + error = i; ++ min_uc = 0x800; + } else if ((ch&0xf8) == 0xf0) { + uc = ch & 0x07; + need = 3; + error = i; ++ min_uc = 0x10000; + } else { + // Error + qch = addOne(qch, result); diff --git a/staging/qtwebkit/PKGBUILD b/staging/qtwebkit/PKGBUILD new file mode 100644 index 000000000..53666ea00 --- /dev/null +++ b/staging/qtwebkit/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 145102 2011-12-17 02:25:25Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=qtwebkit +pkgver=2.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://trac.webkit.org/wiki/QtWebKit' +pkgdesc='An open source web browser engine (Qt port)' +license=('LGPL2.1' 'GPL3') +depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base') +makedepends=('python2' 'mesa' 'chrpath') +conflicts=('qt<4.8') +source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" + 'python2-path.patch') +sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7' + 'b0ef3d5596171e3900a685df9bcfac3068ad6330') + +build() { + cd "${srcdir}"/QtWebKit-${pkgver} + + patch -p1 -i "${srcdir}"/python2-path.patch + + cd Tools/Scripts + ./build-webkit --qt \ + --prefix=/usr \ + --makeargs="${MAKEFLAGS}" \ + --release \ + --3d-canvas +} + +package() { + cd "${srcdir}"/QtWebKit-${pkgver} + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so +} diff --git a/staging/qtwebkit/python2-path.patch b/staging/qtwebkit/python2-path.patch new file mode 100644 index 000000000..2e270e6fc --- /dev/null +++ b/staging/qtwebkit/python2-path.patch @@ -0,0 +1,29 @@ +--- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000 ++++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000 +@@ -88,5 +88,5 @@ + retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h + retgen.wkScript = $$PWD/create_regex_tables + retgen.input = retgen.wkScript +-retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT} + addExtraCompiler(retgen) +--- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000 ++++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000 +@@ -640,7 +640,7 @@ + inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl +-inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json ++inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json + inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl + inspectorJSON.wkAddOutputToSources = false + addExtraCompiler(inspectorJSON) +@@ -723,7 +723,7 @@ + entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.wkScript = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES ++entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + addExtraCompiler(entities) diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD new file mode 100644 index 000000000..cd9465524 --- /dev/null +++ b/staging/redland/PKGBUILD @@ -0,0 +1,79 @@ +# $Id: PKGBUILD 145106 2011-12-17 03:32:44Z eric $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgbase=redland +epoch=1 +pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') +pkgver=1.0.15 +pkgrel=2 +url="http://librdf.org/" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +options=('!libtool') +source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} + rpath.diff) +sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af' + '3aeef38a7247ae33db6a0a19511ef4132240164b' + 'f5db05c925b6bcd6402d5abd75c648b137f069c7') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --enable-release \ + --disable-static \ + --with-raptor=system \ + --with-rasqal=system \ + --with-sqlite=3 + + # nuke rpath + patch -Np0 -i "${srcdir}/rpath.diff" + + make +} + +package_redland() { + pkgdesc="Library that provides a high-level interface to RDF data" + depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}/usr/lib/redland" +} + +package_redland-storage-mysql() { + pkgdesc="MySQL storage support for Redland" + depends=('redland' 'libmysqlclient') + + cd "${srcdir}/${pkgbase}-${pkgver}" + install -dm755 "${pkgdir}/usr/lib/redland" + install -m755 src/.libs/librdf_storage_mysql.so "${pkgdir}/usr/lib/redland/librdf_storage_mysql.so" +} + +package_redland-storage-postgresql() { + pkgdesc="PostgreSQL storage support for Redland" + depends=('redland' 'postgresql-libs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + install -dm755 "${pkgdir}/usr/lib/redland" + install -m755 src/.libs/librdf_storage_postgresql.so "${pkgdir}/usr/lib/redland/" +} + +package_redland-storage-virtuoso() { + pkgdesc="Virtuoso storage support for Redland" + depends=('redland' 'unixodbc' 'db') + + cd "${srcdir}/${pkgbase}-${pkgver}" + install -dm755 "${pkgdir}/usr/lib/redland" + install -m755 src/.libs/librdf_storage_virtuoso.so "${pkgdir}/usr/lib/redland/" +} + +package_redland-storage-sqlite() { + pkgdesc="SQLite storage support for Redland" + depends=('redland' 'sqlite3' 'db') + + cd "${srcdir}/${pkgbase}-${pkgver}" + install -dm755 "${pkgdir}/usr/lib/redland" + install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/" +} diff --git a/staging/redland/rpath.diff b/staging/redland/rpath.diff new file mode 100644 index 000000000..831bc80ed --- /dev/null +++ b/staging/redland/rpath.diff @@ -0,0 +1,11 @@ +--- libtool 2011-02-20 10:46:47.000000000 +0100 ++++ libtool.new 2011-02-20 10:52:58.285764909 +0100 +@@ -324,7 +324,7 @@ + + # Flag to hardcode $libdir into a binary during linking. + # This must work even if $libdir does not exist +-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" ++hardcode_libdir_flag_spec=" " + + # If ld is used when linking, flag to hardcode $libdir into a binary + # during linking. This must work even if $libdir does not exist. diff --git a/staging/unixodbc/PKGBUILD b/staging/unixodbc/PKGBUILD new file mode 100644 index 000000000..263c8725b --- /dev/null +++ b/staging/unixodbc/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 145094 2011-12-16 20:06:58Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=unixodbc +pkgver=2.3.1 +pkgrel=1 +pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +url="http://www.unixodbc.org/" +backup=('etc/odbc.ini' 'etc/odbcinst.ini') +depends=('readline' 'libltdl') +options=('!libtool') +source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz") +md5sums=('86788d4006620fa1f171c13d07fdcaab') + +build() { + cd ${srcdir}/unixODBC-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd ${srcdir}/unixODBC-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/fontforge/PKGBUILD b/testing/fontforge/PKGBUILD index 91f7527d4..c5326fdd6 100644 --- a/testing/fontforge/PKGBUILD +++ b/testing/fontforge/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 145014 2011-12-14 10:50:55Z bisson $ +# $Id: PKGBUILD 145120 2011-12-17 08:00:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20111214 -pkgrel=1 +pkgrel=2 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64') url='http://fontforge.sourceforge.net/' license=('BSD') -depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2') +depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro') options=('!libtool' '!makeflags') source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b') diff --git a/testing/libdrm/PKGBUILD b/testing/libdrm/PKGBUILD index 91583d99a..3212d196e 100644 --- a/testing/libdrm/PKGBUILD +++ b/testing/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 144601 2011-12-07 17:32:22Z andyrtr $ +# $Id: PKGBUILD 145126 2011-12-17 09:08:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.28 +pkgver=2.4.29 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,23 +14,18 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING - git_fixes.diff - #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 - rbo.h list.h) -md5sums=('6488f64119c6439fa4038e9cd7b30b67' + git_fixes.diff) +md5sums=('96d5e3e9edd55f4b016fe3b5dd0a1953' 'c722c8406507b7e3a8da7a3030d1d9cf' 'ba65e71c481b94ef0fb6c23c7f21ffa1' - '671b87f9670e709e54a19cd292c6330d' - '073846ea43fb4d6130062c1897d92e40' - 'ce867d3331862c2b87d1a37461b42dbe') + 'aebd5336568090b8ec084fabcfb08071') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - # add a missing file in the release tarball + # git fixes - currently none patch -Np1 -i ${srcdir}/git_fixes.diff - cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ #libtoolize --force autoreconf --force --install diff --git a/testing/libdrm/git_fixes.diff b/testing/libdrm/git_fixes.diff index 5ebcb606a..dc80155f2 100644 --- a/testing/libdrm/git_fixes.diff +++ b/testing/libdrm/git_fixes.diff @@ -1,19 +1,13 @@ -From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Mon, 05 Dec 2011 21:24:48 +0000 -Subject: test/radeon: add missing files for dist - ---- -diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am -index 021ca72..1775669 100644 ---- a/tests/radeon/Makefile.am -+++ b/tests/radeon/Makefile.am -@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ +diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +index 19441f3..eb9dd32 100644 +--- a/intel/intel_bufmgr_gem.c ++++ b/intel/intel_bufmgr_gem.c +@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) + bufmgr_gem->vma_cache.next, + vma_list); + assert(bo_gem->map_count == 0); +- DRMLISTDEL(&bo_gem->vma_list); ++ DRMLISTDELINIT(&bo_gem->vma_list); - radeon_ttm_SOURCES = \ - rbo.c \ -+ rbo.h \ -+ list.h \ - radeon_ttm.c --- -cgit v0.9.0.2-2-gbebe + if (bo_gem->mem_virtual) { + munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/testing/libspiro/PKGBUILD b/testing/libspiro/PKGBUILD new file mode 100644 index 000000000..b3fef038a --- /dev/null +++ b/testing/libspiro/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 145118 2011-12-17 08:00:09Z bisson $ +# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=libspiro +pkgver=20071029 +pkgrel=2 +pkgdesc='Simplifies the drawing of beautiful curves' +url='http://libspiro.sourceforge.net/' +license=('GPL') +options=('!libtool') +arch=('i686' 'x86_64') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2") +sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} |