From e1c991185c594db7cc8978ed0239ebca4d37560e Mon Sep 17 00:00:00 2001 From: root Date: Wed, 16 Jan 2013 00:05:27 -0800 Subject: Wed Jan 16 00:05:27 PST 2013 --- extra/gst-plugins-ugly/PKGBUILD | 10 +- extra/gstreamer0.10-ugly/PKGBUILD | 11 +- extra/gstreamer0.10-ugly/cdio-cd-text-api.patch | 183 +++++++++++++++++++++ extra/gvfs/PKGBUILD | 15 +- extra/gvfs/fix-paranoia-include.patch | 11 ++ extra/java7-openjdk/PKGBUILD | 50 +++--- extra/libcdio-paranoia/PKGBUILD | 37 +++++ extra/libcdio-paranoia/header-fix.patch | 13 ++ extra/libcdio/PKGBUILD | 23 +-- ...f-Dont-return-freed-memory-from-udf_fopen.patch | 33 ++++ extra/pgbouncer/PKGBUILD | 40 +++++ extra/pgbouncer/pgbouncer.ini | 52 ++++++ extra/pgbouncer/pgbouncer.install | 25 +++ extra/pgbouncer/pgbouncer.service | 11 ++ extra/pgbouncer/pgbouncer.tmpfiles.conf | 1 + extra/qtwebkit/PKGBUILD | 114 ++++--------- .../qtwebkit/enable-accelerated-compositing.patch | 11 ++ extra/qtwebkit/qwebview.patch | 21 +++ extra/qtwebkit/use-python2.patch | 57 +++++++ extra/vcdimager/PKGBUILD | 11 +- extra/vlc/PKGBUILD | 4 +- extra/xine-lib/PKGBUILD | 4 +- 22 files changed, 600 insertions(+), 137 deletions(-) create mode 100644 extra/gstreamer0.10-ugly/cdio-cd-text-api.patch create mode 100644 extra/gvfs/fix-paranoia-include.patch create mode 100644 extra/libcdio-paranoia/PKGBUILD create mode 100644 extra/libcdio-paranoia/header-fix.patch create mode 100644 extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch create mode 100644 extra/pgbouncer/PKGBUILD create mode 100644 extra/pgbouncer/pgbouncer.ini create mode 100644 extra/pgbouncer/pgbouncer.install create mode 100644 extra/pgbouncer/pgbouncer.service create mode 100644 extra/pgbouncer/pgbouncer.tmpfiles.conf create mode 100644 extra/qtwebkit/enable-accelerated-compositing.patch create mode 100644 extra/qtwebkit/qwebview.patch create mode 100644 extra/qtwebkit/use-python2.patch (limited to 'extra') diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 87b425caf..92bdec481 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173512 2012-12-19 19:49:27Z heftig $ +# $Id: PKGBUILD 175143 2013-01-15 11:34:05Z jgc $ # Maintainer: Jan de Groot pkgname=gst-plugins-ugly -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') @@ -11,12 +11,14 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('509ec52b58523e6ab1f9d9facdbbf8417fb95bbcb1a90e1ec53f90019da710d8') +sha256sums=('a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331') build() { cd $pkgname-$pkgver sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 0449c5324..12cf0a4e1 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 171265 2012-11-16 23:35:43Z ibiru $ +# $Id: PKGBUILD 175144 2013-01-15 11:34:09Z jgc $ # Maintainer: Jan de Groot pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') url="http://gstreamer.freedesktop.org/" options=(!libtool) source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz - opencore-amr.patch) + opencore-amr.patch + cdio-cd-text-api.patch) md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' - 'd8feb6c99bfaff8be6b2c48ea4e98e47') + 'd8feb6c99bfaff8be6b2c48ea4e98e47' + '6c1c665f864387f3a77d32231fedeaab') build() { cd "${srcdir}/gst-plugins-ugly-${pkgver}" patch -Np0 -i "${srcdir}/opencore-amr.patch" + patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ --with-package-name="GStreamer Ugly Plugins (Archlinux)" \ diff --git a/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch b/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch new file mode 100644 index 000000000..cbd16b8e4 --- /dev/null +++ b/extra/gstreamer0.10-ugly/cdio-cd-text-api.patch @@ -0,0 +1,183 @@ +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 +From: Leon Merten Lohse +Date: Thu, 03 May 2012 22:50:30 +0000 +Subject: cdio: compensate for libcdio's recent cd-text api changes + +https://bugzilla.gnome.org/show_bug.cgi?id=675112 + +Conflicts: + + ext/cdio/gstcdiocddasrc.c +--- +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c +index 2f58d18..483ebf5 100644 +--- a/ext/cdio/gstcdio.c ++++ b/ext/cdio/gstcdio.c +@@ -30,12 +30,16 @@ + GST_DEBUG_CATEGORY (gst_cdio_debug); + + void +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) + { + const gchar *txt; + ++#if LIBCDIO_VERSION_NUM > 83 ++ txt = cdtext_get_const (cdtext, field, track); ++#else + txt = cdtext_get_const (field, cdtext); ++#endif + if (txt == NULL || *txt == '\0') { + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); + return; +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, + } + + GstTagList * ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) ++{ ++ GstTagList *tags = NULL; ++ ++#else + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + { + GstTagList *tags = NULL; +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); + return NULL; + } ++#endif + +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, ++ &tags); + + return tags; + } + + void ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, ++ GstTagList * tags) ++{ ++#else + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + { + cdtext_t *t; +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); + return; + } ++#endif + +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); +- ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ALBUM_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, ++ &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, ++ &tags); + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); + } + +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h +index ef31ed0..c6da580 100644 +--- a/ext/cdio/gstcdio.h ++++ b/ext/cdio/gstcdio.h +@@ -24,22 +24,38 @@ + #include + #include + #include ++#include ++ ++#if LIBCDIO_VERSION_NUM <= 83 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE ++#endif + + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); + #define GST_CAT_DEFAULT gst_cdio_debug + + void gst_cdio_add_cdtext_field (GstObject * src, + cdtext_t * cdtext, ++ track_t track, + cdtext_field_t field, + const gchar * gst_tag, + GstTagList ** p_tags); + + GstTagList * gst_cdio_get_cdtext (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + track_t track); + + void gst_cdio_add_cdtext_album_tags (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + GstTagList * tags); + + #endif /* __GST_CDIO_H__ */ +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c +index 615a0c8..830839e 100644 +--- a/ext/cdio/gstcdiocddasrc.c ++++ b/ext/cdio/gstcdiocddasrc.c +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + GstCdioCddaSrc *src; + discmode_t discmode; + gint first_track, num_tracks, i; ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t *cdtext; ++#endif + + src = GST_CDIO_CDDA_SRC (audiocdsrc); + +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + if (src->read_speed != -1) + cdio_set_speed (src->cdio, src->read_speed); + ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext = cdio_get_cdtext (src->cdio); ++ ++ if (NULL == cdtext) ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); ++ else ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, ++ cddabasesrc->tags); ++#else + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, + cddabasesrc->tags); ++#endif + + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); + +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + * the right thing here (for cddb id calculations etc. as well) */ + track.start = cdio_get_track_lsn (src->cdio, i + first_track); + track.end = track.start + len_sectors - 1; /* -1? */ ++#if LIBCDIO_VERSION_NUM > 83 ++ if (NULL != cdtext) ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, ++ i + first_track); ++#else + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, + i + first_track); ++#endif + + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index e1f87de77..33d7f3172 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 173130 2012-12-11 14:42:18Z jgc $ +# $Id: PKGBUILD 175145 2013-01-15 11:34:12Z jgc $ # Maintainer: Jan de Groot pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.14.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + fix-paranoia-include.patch) +sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc' + '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76') build() { cd "$pkgbase-$pkgver" + patch -Np0 -i ../fix-paranoia-include.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -24,7 +27,7 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch new file mode 100644 index 000000000..02856a06f --- /dev/null +++ b/extra/gvfs/fix-paranoia-include.patch @@ -0,0 +1,11 @@ +--- daemon/gvfsbackendcdda.c.orig 2013-01-08 11:19:52.311593338 +0000 ++++ daemon/gvfsbackendcdda.c 2013-01-08 11:20:05.778169190 +0000 +@@ -55,7 +55,7 @@ + #include "gvfsjobenumerate.h" + + #define DO_NOT_WANT_PARANOIA_COMPATIBILITY +-#include ++#include + #include + + /* TODO: diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 99c677557..b611231dc 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 169300 2012-10-18 22:41:27Z andyrtr $ +# $Id: PKGBUILD 175162 2013-01-15 18:14:28Z andyrtr $ # Maintainer: Andreas Radke # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot -pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') - # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 +pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' + 'openjdk7-src' 'openjdk7-doc') pkgbase=java7-openjdk _java_ver=7 _updatever=u9 -_icedtea_ver=2.3.3 +_icedtea_ver=2.3.4 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=9a95d714d136 -_HOTSPOT_CHANGESET=d2d0a106917c # see "${srcdir}/icedtea7"/hotspot.map -_JAXP_CHANGESET=f45296ac69be -_JAXWS_CHANGESET=03f54ef33914 -_JDK_CHANGESET=5ec94d162f05 -_LANGTOOLS_CHANGESET=ec73c6927fb7 -_OPENJDK_CHANGESET=301e79a966b4 +_CORBA_CHANGESET=dc9234e25ab0 +_JAXP_CHANGESET=aa3654afea12 +_JAXWS_CHANGESET=7182233cc27e +_JDK_CHANGESET=96d4f04f2b7c +_LANGTOOLS_CHANGESET=946195011b30 +_OPENJDK_CHANGESET=8bd8e70d4a03 + +_HOTSPOT_CHANGESET=beecf0b9e760 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -49,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('e5ac5564e00c4a8d7b3376ed6de91b18a2587c8abdad802ccc92c780765b1073' - 'dce85d9bcc6e213240b6ad49755bf57fc60a515461664890efcce2ed615ca70b' - '4ad0ab1e0ab6f1e0402fd5a5f0b388bb33cc2c553df867e4c5e6ca78a4ede9bb' - 'b088dd5d383f27b2ccd433eebcbf3f73c016b3359abdae2a5575455d56668141' - '86dfb4fda79de7459b17b6efac6b8d5d6fd7bb1175b7e4ff22ba2ce4a903c05a' - '11a77a35661b2239e73c3fb1318fb6371d0cd7130594d1405df1cb1b17040ea6' - 'c7c67f6805d05c0fa5ddd2a7e406a6adcd0823dd008005563f2b2a88d1f3e6b6' - '872e9e0c36b9fd93e81ac131e60deadb0afa22aa77447150bb45ede77ee6db8b' +sha256sums=('ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8' + '3ea7c4acd4c2f7b91588231427a8685010f8ce7eb0b9610457d6a35bf2afd6bd' + '911a049e735c1ab0dfa65426ada7a11494d51fec88126d34588b23f06ef7acf8' + 'cc9a95c09be36753f9dd5aacd961400deddbdb757f8ea547cd7073f7ab7b87b7' + '7e694d90969413972a51ad1202f3c042b1eca92591e43f1f94f4421a6be5c590' + 'afba9798a4f2407bdf2cd58d0a99d94bb76ae15aec6ad9cfa0375fb255b0032b' + 'a9f56fbd58047adc9296800cd9c534375ef052074cd40ebc0da1f7db6ce09144' + 'de7a5397a83bb7c7be2458809b576133e8a3b75dc62d62d2f2983b97c220dc4f' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -296,7 +297,7 @@ package_jdk7-openjdk() { # Main files install -m755 -d ${pkgdir}/${_jvmdir}/ - cp -a demo include lib sample ${pkgdir}/${_jvmdir} + cp -a include lib ${pkgdir}/${_jvmdir} # 'bin' files pushd bin @@ -340,3 +341,12 @@ package_openjdk7-src() { install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \ ${pkgdir}/${_jvmdir}/src.zip } + +package_openjdk7-doc() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - documentation" + + install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc + for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do + cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/ + done +} diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD new file mode 100644 index 000000000..c66286d89 --- /dev/null +++ b/extra/libcdio-paranoia/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 174870 2013-01-08 10:06:34Z jgc $ +# Maintainer: +# Contributor: damir + +pkgname=libcdio-paranoia +pkgver=10.2+0.90 +pkgrel=1 +pkgdesc="CD paranoia libraries from libcdio" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +url="http://www.gnu.org/software/libcdio/" +depends=('libcdio') +options=('!libtool') +source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig} + header-fix.patch) +md5sums=('432e9f1c5ceb645c4bca9db3f9297437' + '39766404d473ecda66c2f3a932d1c57c' + '1ebb33a1cfe00181de31138ef001e01b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np0 -i ../header-fix.patch + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + aclocal + autoconf + automake --add-missing + ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 DESTDIR="${pkgdir}" install + + #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ + # $pkgdir/usr/include/cdio/cdio_config.h +} diff --git a/extra/libcdio-paranoia/header-fix.patch b/extra/libcdio-paranoia/header-fix.patch new file mode 100644 index 000000000..15cf0e0e2 --- /dev/null +++ b/extra/libcdio-paranoia/header-fix.patch @@ -0,0 +1,13 @@ +--- include/cdio/paranoia/Makefile.am.orig 2013-01-08 10:40:32.237218755 +0000 ++++ include/cdio/paranoia/Makefile.am 2013-01-08 10:41:22.269997804 +0000 +@@ -3,8 +3,8 @@ + ######################################################## + # + +-libcdioincludedir=$(includedir)/cdio +-dist_libcdioinclude_HEADERS = cdda.h paranoia.h ++cdio_paranoia_includedir=$(includedir)/cdio/paranoia ++dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h + + EXTRA_DIST = version.h.in + BUILT_SOURCES = version.h diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD index a532e0d77..e921dbde2 100644 --- a/extra/libcdio/PKGBUILD +++ b/extra/libcdio/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $ +# $Id: PKGBUILD 175152 2013-01-15 11:44:42Z jgc $ # Maintainer: # Contributor: damir pkgname=libcdio -pkgver=0.83 -pkgrel=1 +pkgver=0.90 +pkgrel=2 pkgdesc="GNU Compact Disc Input and Control Library" arch=('i686' 'x86_64') license=('GPL3') url="http://www.gnu.org/software/libcdio/" -depends=('libcddb' 'ncurses') +depends=('libcddb' 'ncurses' 'gcc-libs') options=('!libtool') install=libcdio.install source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig} - libcdio-0.83-linking.patch) -md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb' - 'a7864a4b572a1e2a28cc0a05aa4a67d3' - '5a7f50209c03d5919d5b932f07871af7') + libcdio-0.83-linking.patch + udf-Dont-return-freed-memory-from-udf_fopen.patch) +md5sums=('1b245b023fb03a58d030fd2800db3247' + '45100d90ea49d6f8481eddf709655c0f' + '5a7f50209c03d5919d5b932f07871af7' + 'b7b50c989575e5484d3992b455c9df48') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/libcdio-0.83-linking.patch - ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs + patch -Np1 -i ../libcdio-0.83-linking.patch + patch -Np1 -i ../udf-Dont-return-freed-memory-from-udf_fopen.patch + ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static make } diff --git a/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch new file mode 100644 index 000000000..191e35341 --- /dev/null +++ b/extra/libcdio/udf-Dont-return-freed-memory-from-udf_fopen.patch @@ -0,0 +1,33 @@ +From 6c0251d145e44b7cdfeb9767c615646fb8f51320 Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Thu, 22 Nov 2012 13:53:15 +0100 +Subject: [PATCH] udf: Don't return freed memory from udf_fopen + +When trying to open a file located in the root directory of the +UDF filesystem, we call udf_ff_open with the dirent corresponding +to the root dir and the filename. In this case, udf_ff_open will +return the same dirent as the one that was passed as argument, so +we must not free it as we'll be returning it. +This causes a crash with iso-read when trying to read a file located +at the root of the image. +--- + lib/udf/udf_fs.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/lib/udf/udf_fs.c b/lib/udf/udf_fs.c +index 5f5add7..1e0601e 100644 +--- a/lib/udf/udf_fs.c ++++ b/lib/udf/udf_fs.c +@@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name) + p_udf_root->psz_name, p_udf_root->b_dir, + p_udf_root->b_parent); + p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token); +- udf_dirent_free(p_udf_dirent); ++ if (p_udf_file != p_udf_dirent) ++ udf_dirent_free(p_udf_dirent); + } + else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) { + return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf, +-- +1.7.2.5 + diff --git a/extra/pgbouncer/PKGBUILD b/extra/pgbouncer/PKGBUILD new file mode 100644 index 000000000..fb0277192 --- /dev/null +++ b/extra/pgbouncer/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Dan McGee + +pkgname=pgbouncer +_dlid=3393 +pkgver=1.5.4 +pkgrel=4 +pkgdesc="A lightweight connection pooler for PostgreSQL" +arch=('i686' 'x86_64') +url="http://pgfoundry.org/projects/pgbouncer" +license=('BSD') +depends=('libevent>=2.0' 'postgresql') +makedepends=('asciidoc' 'xmlto') +backup=('etc/pgbouncer/pgbouncer.ini') +install=$pkgname.install +source=("http://pgfoundry.org/frs/download.php/${_dlid}/${pkgname}-${pkgver}.tar.gz" + pgbouncer.ini + pgbouncer.service + pgbouncer.tmpfiles.conf) +md5sums=('9ffaf2e6232e18e676651429813732df' + '810813b9ef8891be382be9ffdd425edc' + 'eede238f5ff3709dbfeef6dad3fbefc7' + '472659f4c5de2b59a420f5ca42327ec1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -D -m644 ../pgbouncer.ini "$pkgdir/etc/pgbouncer/pgbouncer.ini" + install -D -m644 ../pgbouncer.service "$pkgdir/usr/lib/systemd/system/pgbouncer.service" + install -D -m644 ../pgbouncer.tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/pgbouncer.conf" + mkdir -p "$pkgdir/var/log/pgbouncer" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/pgbouncer/pgbouncer.ini b/extra/pgbouncer/pgbouncer.ini new file mode 100644 index 000000000..183c9c39d --- /dev/null +++ b/extra/pgbouncer/pgbouncer.ini @@ -0,0 +1,52 @@ +[pgbouncer] +logfile = /var/log/pgbouncer/pgbouncer.log +pidfile = /run/pgbouncer/pgbouncer.pid + +;; ip address or * which means all ip-s +;listen_addr = 127.0.0.1 +;listen_port = 6432 + +unix_socket_dir = /run/postgresql +unix_socket_mode = 0777 + +; any, trust, plain, crypt, md5 +auth_type = trust +auth_file = /etc/pgbouncer/userlist.txt + +; comma-separated list of users, who are allowed to change settings +admin_users = postgres + +; comma-separated list of users who are just allowed to use SHOW command +stats_users = stats, postgres + +; total number of clients that can connect +max_client_conn = 100 + +; default pool size. 20 is good number when transaction pooling +; is in use, in session pooling it needs to be the number of +; max clients you want to handle at any moment +default_pool_size = 20 + + +;; database name = connect string +;; +;; connect string params: +;; dbname= host= port= user= password= +;; client_encoding= datestyle= timezone= +;; pool_size= connect_query= +[databases] + +; foodb over unix socket +;foodb = + +; redirect bardb to bazdb on localhost +;bardb = host=localhost dbname=bazdb + +; acceess to dest database will go with single user +;forcedb = host=127.0.0.1 port=300 user=baz password=foo client_encoding=UNICODE datestyle=ISO connect_query='SELECT 1' + +; use custom pool sizes +;nondefaultdb = pool_size=50 reserve_pool=10 + +; fallback connect string +;* = host=testserver diff --git a/extra/pgbouncer/pgbouncer.install b/extra/pgbouncer/pgbouncer.install new file mode 100644 index 000000000..2f77ae50f --- /dev/null +++ b/extra/pgbouncer/pgbouncer.install @@ -0,0 +1,25 @@ +post_install() { + if ! getent group pgbouncer >/dev/null; then + groupadd -r pgbouncer + fi + if ! getent passwd pgbouncer >/dev/null; then + useradd -c 'PGBouncer user' -r -g pgbouncer -d '/etc/pgbouncer' -s /bin/bash pgbouncer + passwd -l pgbouncer >/dev/null + fi + chown pgbouncer:pgbouncer /var/log/pgbouncer + systemd-tmpfiles --create pgbouncer.conf + post_update +} + +post_update() { + gpasswd -a pgbouncer postgres +} + +post_remove() { + if getent passwd pgbouncer >/dev/null; then + userdel pgbouncer + fi + if getent group pgbouncer >/dev/null; then + groupdel pgbouncer + fi +} diff --git a/extra/pgbouncer/pgbouncer.service b/extra/pgbouncer/pgbouncer.service new file mode 100644 index 000000000..f5baad52b --- /dev/null +++ b/extra/pgbouncer/pgbouncer.service @@ -0,0 +1,11 @@ +[Unit] +Description=A lightweight connection pooler for PostgreSQL +After=network.target + +[Service] +User=pgbouncer +ExecStart=/usr/bin/pgbouncer /etc/pgbouncer/pgbouncer.ini +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/pgbouncer/pgbouncer.tmpfiles.conf b/extra/pgbouncer/pgbouncer.tmpfiles.conf new file mode 100644 index 000000000..c8f708372 --- /dev/null +++ b/extra/pgbouncer/pgbouncer.tmpfiles.conf @@ -0,0 +1 @@ +d /run/pgbouncer 0755 pgbouncer pgbouncer - diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 8c289f466..2fcb88791 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,106 +1,58 @@ -# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $ +# $Id: PKGBUILD 175166 2013-01-15 21:24:56Z andrea $ # Maintainer: Andrea Scarpino pkgname=qtwebkit -pkgver=2.2.2 +pkgver=2.3git20130115 pkgrel=1 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' 'gstreamer0.10-base') -makedepends=('python2' 'mesa' 'gperf') +depends=('qt' 'systemd' 'gstreamer0.10-base') +makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.2 -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz" - 'glibc.patch' - 'fix-build.patch') -sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4' - '33c83272ed8110180ee6e7e3733e68cc513e2802' - '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333' - 'c6dfb001b0412a8adfcb7f1f565a24314a753448') +_qtver=4.8.4 +source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-2.3" + "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + 'use-python2.patch' + 'qwebview.patch' + 'enable-accelerated-compositing.patch') +sha1sums=('8d74fdb4354d1f1b4f3df0ec7b057a7516350372' + 'f5880f11c139d7d8d01ecb8d874535f7d9553198' + '315b6ff603f35e5492a036f7082f6aa075dfb607' + 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f' + '471032229c61a0f95e142c21370aab6d3f00ff7e') build() { - cd "${srcdir}"/${pkgname}-${pkgver}-source + cd webkit-qtwebkit-23 - patch -p1 -i "${srcdir}"/glibc.patch - patch -p1 -i "${srcdir}"/fix-build.patch + patch -p1 -i "${srcdir}"/use-python2.patch - # move headers - mv include Source/ + # Fixed upstream, https://bugs.webkit.org/show_bug.cgi?id=106892 + patch -p1 -i "${srcdir}"/enable-accelerated-compositing.patch - cd Source - qmake - cd ../ + export QTDIR=/usr + Tools/Scripts/build-webkit --qt \ + --makeargs="${MAKEFLAGS}" \ + --prefix=/usr \ + --no-webkit2 - make -C Source + cd ../ # Build the QWebView plugin (FS#27914) - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview + cd qt-everywhere-opensource-src-${_qtver} + patch -p1 -i "${srcdir}"/qwebview.patch + cd tools/designer/src/plugins/qwebview qmake make } package() { - cd "${srcdir}"/${pkgname}-${pkgver}-source - make INSTALL_ROOT="${pkgdir}" -C Source install - - cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview - make INSTALL_ROOT="${pkgdir}" install -} - -_source() { - local _current_dir=$(pwd) - local _tmp=$(mktemp -d --tmpdir) - - cd _tmp - git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git - - # fetch the make-package.py script - git clone git://qt.gitorious.org/qtwebkit/tools.git - - # create the qtwebkit tarball - cd qtwebkit - git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver} - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - ../tools/make-package.py - python2 ../tools/make-package.py + cd webkit-qtwebkit-23 + make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install - mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/ - - cd .. - - # create the qwebview plugin tarball - mkdir qwebview-${_qtver} - cd qwebview-${_qtver} - wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz - tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz - mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ - - cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF" -TEMPLATE = subdirs -CONFIG += ordered - -REQUIRES = !CONFIG(static,shared|static) -contains(QT_CONFIG, webkit): SUBDIRS += qwebview -EOF - - cat > $(_tmp)/header.txt <<"EOF" -INCLUDEPATH += ../../../Source/include -LIBS += -L../../../Source/lib - -EOF - - cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \ - ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri - - tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source - - mv qwebview-${_qtver}.tar.xz ${_current_dir}/ + cd ../ - rm -rf ${_tmp} + cd qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview + make INSTALL_ROOT="${pkgdir}" install } diff --git a/extra/qtwebkit/enable-accelerated-compositing.patch b/extra/qtwebkit/enable-accelerated-compositing.patch new file mode 100644 index 000000000..13474cd6a --- /dev/null +++ b/extra/qtwebkit/enable-accelerated-compositing.patch @@ -0,0 +1,11 @@ +Index: trunk/Source/WebCore/html/HTMLCanvasElement.cpp +=================================================================== +--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139541) ++++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp (revision 139742) +@@ -190,5 +190,5 @@ + Settings* settings = document()->settings(); + if (settings && settings->webGLEnabled() +-#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) ++#if !PLATFORM(CHROMIUM) && !PLATFORM(GTK) && !PLATFORM(EFL) && !PLATFORM(QT) + && settings->acceleratedCompositingEnabled() + #endif diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch new file mode 100644 index 000000000..73d5d5032 --- /dev/null +++ b/extra/qtwebkit/qwebview.patch @@ -0,0 +1,21 @@ +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~ 2013-01-09 12:56:08.915412090 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri 2013-01-09 12:58:06.911391299 +0000 +@@ -1,3 +1,6 @@ ++INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include ++LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib ++ + CONFIG += designer + win32|mac: CONFIG+= debug_and_release + QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/designer +--- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro~ 2013-01-09 12:55:43.598892405 +0000 ++++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pro 2013-01-09 12:55:53.352169136 +0000 +@@ -2,9 +2,4 @@ + CONFIG += ordered + + REQUIRES = !CONFIG(static,shared|static) +-contains(QT_CONFIG, qt3support): SUBDIRS += widgets +-win32: SUBDIRS += activeqt +-# contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d + contains(QT_CONFIG, webkit): SUBDIRS += qwebview +-contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview diff --git a/extra/qtwebkit/use-python2.patch b/extra/qtwebkit/use-python2.patch new file mode 100644 index 000000000..b1444435b --- /dev/null +++ b/extra/qtwebkit/use-python2.patch @@ -0,0 +1,57 @@ +--- webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000 ++++ webkit-qtwebkit-23/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000 +@@ -85,14 +85,14 @@ + retgen.output = RegExpJitTables.h + retgen.script = $$PWD/create_regex_tables + retgen.input = retgen.script +-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} ++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT} + GENERATORS += retgen + + #GENERATOR: "KeywordLookup.h": decision tree used by the lexer + klgen.output = KeywordLookup.h + klgen.script = $$PWD/KeywordLookupGenerator.py + klgen.input = KEYWORDLUT_FILES +-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} ++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT} + GENERATORS += klgen + + EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION +@@ -117,7 +117,7 @@ + disassembler.input = DISASSEMBLER_FILES + disassembler.script = $$PWD/disassembler/udis86/itab.py + disassembler.depends = $$DISASSEMBLER_DEPENDENCY +- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} ++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH} + disassembler.CONFIG += no_link + GENERATORS += disassembler + } +--- webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000 ++++ webkit-qtwebkit-23/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000 +@@ -779,7 +779,7 @@ + inspectorValidate.output = InspectorProtocolVersion.h + inspectorValidate.input = INSPECTOR_JSON + inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version +-inspectorValidate.commands = python $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} ++inspectorValidate.commands = python2 $$inspectorValidate.script -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN} + inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version + inspectorValidate.add_output_to_sources = false + GENERATORS += inspectorValidate +@@ -787,7 +787,7 @@ + inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp + inspectorJSON.input = INSPECTOR_JSON + inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py +-inspectorJSON.commands = python $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} ++inspectorJSON.commands = python2 $$inspectorJSON.script $$PWD/inspector/Inspector.json --output_h_dir ${QMAKE_FUNC_FILE_OUT_PATH} --output_cpp_dir ${QMAKE_FUNC_FILE_OUT_PATH} + inspectorJSON.depends = $$inspectorJSON.script + GENERATORS += inspectorJSON + +@@ -908,7 +908,7 @@ + entities.output = HTMLEntityTable.cpp + entities.input = HTML_ENTITIES + entities.script = $$PWD/html/parser/create-html-entity-table +-entities.commands = python $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES ++entities.commands = python2 $$entities.script -o ${QMAKE_FILE_OUT} $$HTML_ENTITIES + entities.clean = ${QMAKE_FILE_OUT} + entities.depends = $$PWD/html/parser/create-html-entity-table + GENERATORS += entities diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD index bc97912b3..9fd15ea08 100644 --- a/extra/vcdimager/PKGBUILD +++ b/extra/vcdimager/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 150884 2012-02-23 13:48:13Z allan $ +# $Id: PKGBUILD 175148 2013-01-15 11:34:24Z jgc $ # Maintainer: damir # Contributor: Tom Newsom pkgname=vcdimager pkgver=0.7.24 -pkgrel=2 +pkgrel=3 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's" arch=('i686' 'x86_64') url="http://www.vcdimager.org/" license=('GPL') -depends=('libcdio>=0.82' 'libxml2>=2.7.3' 'popt') +depends=('libcdio' 'libxml2' 'popt') options=('!libtool') install=vcdimager.install source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz @@ -24,11 +24,6 @@ build() { make } -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a451d73b0..baa8dc2fa 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173231 2012-12-14 20:30:38Z giovanni $ +# $Id: PKGBUILD 175149 2013-01-15 11:34:26Z jgc $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index e511a998f..20aec1e29 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169760 2012-10-27 23:42:28Z eric $ +# $Id: PKGBUILD 175150 2013-01-15 11:34:28Z jgc $ # Maintainer: Eric Bélanger pkgname=xine-lib pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" -- cgit v1.2.3-54-g00ecf