summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/brasero/PKGBUILD14
-rw-r--r--extra/brasero/use-mpegaudioparse.patch53
-rw-r--r--extra/cups/PKGBUILD40
-rw-r--r--extra/cups/avahi-missing-in-conditionals.patch118
-rwxr-xr-xextra/cups/cups68
-rw-r--r--extra/cups/cups-no-export-ssllibs.patch8
-rw-r--r--extra/cups/cups-no-gcrypt.patch8
-rw-r--r--extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch12
-rw-r--r--extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch25
-rw-r--r--extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch74
-rw-r--r--extra/gdk-pixbuf2/PKGBUILD8
-rw-r--r--extra/geoclue/PKGBUILD32
-rw-r--r--extra/geoclue/geoclue-gcc46.patch23
-rw-r--r--extra/geoclue/geoclue.install11
-rw-r--r--extra/grilo/PKGBUILD6
-rw-r--r--extra/lilv/PKGBUILD39
-rw-r--r--extra/lilv/lilvmm.patch40
-rw-r--r--extra/lv2/PKGBUILD6
-rw-r--r--extra/php/PKGBUILD8
-rw-r--r--extra/php/php-fpm.install2
-rw-r--r--extra/php/php.ini.patch2
-rw-r--r--extra/sord/PKGBUILD22
-rw-r--r--extra/sqlite/PKGBUILD16
-rw-r--r--extra/sratom/PKGBUILD19
-rw-r--r--extra/suil/PKGBUILD24
-rw-r--r--extra/xf86-video-openchrome/PKGBUILD12
-rw-r--r--extra/xf86-video-openchrome/no-mibstore.patch11
27 files changed, 245 insertions, 456 deletions
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index f94746e86..5d6c62f84 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 170846 2012-11-12 15:20:28Z heftig $
+# $Id: PKGBUILD 180254 2013-03-18 23:32:28Z jgc $
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=brasero
pkgver=3.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="A disc burning application for Gnome"
arch=('i686' 'x86_64')
url="http://www.gnome.org/projects/brasero"
license=('GPL')
options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gst-plugins-base' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
+depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
optdepends=('libburn: alternative back-end'
'libisofs: libburn back-end'
'dvdauthor: video project'
- 'gstreamer0.10-bad-plugins: video project'
'vcdimager: video project')
replaces=('nautilus-cd-burner')
install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ use-mpegaudioparse.patch)
+sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932'
+ 'c75331d130c248edeaa68211cf96f386d86905510d09b104e4e0cd0ff4c92218')
build() {
cd "$pkgname-$pkgver"
+ patch -Np1 -i ../use-mpegaudioparse.patch
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-caches \
--disable-schemas-compile
diff --git a/extra/brasero/use-mpegaudioparse.patch b/extra/brasero/use-mpegaudioparse.patch
new file mode 100644
index 000000000..79c24d6a8
--- /dev/null
+++ b/extra/brasero/use-mpegaudioparse.patch
@@ -0,0 +1,53 @@
+From 895777890485428a23f2e0da0e8ccd2edf624f6e Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Fri, 25 Jan 2013 03:26:10 +0000
+Subject: use mpegaudioparse gstreamer plugin instead of mp3parse
+
+Fix "not suitable for audio or video media" error when
+attempting to create a mp3 audio project
+The plugin was basically renamed for gstreamer 1.0.
+Thanks tuxor for identifying the problem!
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687886
+---
+diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
+index 1088121..7f10088 100644
+--- a/libbrasero-utils/brasero-metadata.c
++++ b/libbrasero-utils/brasero-metadata.c
+@@ -1200,12 +1200,12 @@ brasero_metadata_create_mp3_pipeline (BraseroMetadata *self)
+ }
+ gst_bin_add (GST_BIN (priv->pipeline_mp3), source);
+
+- parse = gst_element_factory_make ("mp3parse", NULL);
++ parse = gst_element_factory_make ("mpegaudioparse", NULL);
+ if (!parse) {
+ priv->error = g_error_new (BRASERO_UTILS_ERROR,
+ BRASERO_UTILS_ERROR_GENERAL,
+ _("%s element could not be created"),
+- "\"mp3parse\"");
++ "\"mpegaudioparse\"");
+
+ g_object_unref (priv->pipeline_mp3);
+ priv->pipeline_mp3 = NULL;
+diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c
+index a6a0f40..6861168 100644
+--- a/plugins/transcode/burn-transcode.c
++++ b/plugins/transcode/burn-transcode.c
+@@ -284,13 +284,13 @@ brasero_transcode_create_pipeline_size_mp3 (BraseroTranscode *transcode,
+
+ BRASERO_JOB_LOG (transcode, "Creating specific pipeline for MP3s");
+
+- parse = gst_element_factory_make ("mp3parse", NULL);
++ parse = gst_element_factory_make ("mpegaudioparse", NULL);
+ if (!parse) {
+ g_set_error (error,
+ BRASERO_BURN_ERROR,
+ BRASERO_BURN_ERROR_GENERAL,
+ _("%s element could not be created"),
+- "\"Mp3parse\"");
++ "\"mpegaudioparse\"");
+ g_object_unref (pipeline);
+ return FALSE;
+ }
+--
+cgit v0.9.1
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 38291f4f5..7cefbaaca 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166183 2012-09-05 08:15:25Z andyrtr $
+# $Id: PKGBUILD 180282 2013-03-19 15:32:07Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=1.6.1
-pkgrel=6
+pkgver=1.6.2
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
@@ -15,24 +15,15 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
cups-no-gcrypt.patch
cups-no-gzip-man.patch
cups-systemd-socket.patch
- cups cups.logrotate cups.pam
- cupsd-conf-remove-obsolete-browse-directives.patch
- avahi-missing-in-conditionals.patch
- recognize-remote-cups-queue-via-dnssd-uri.patch
- usb-backend-reset-after-job-only-for-specific-devices.patch)
+ cups.logrotate cups.pam)
#options=('!emptydirs')
-md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
- '9b8467a1e51d360096b70e2c3c081e6c'
- '3733c23e77eb503bd94cc368e02830dc'
+md5sums=('13c8b2b2336d42001abe4899766b62dc'
+ '3ba9e3410df1dc3015463d615ef91b3b'
+ 'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
'b4868b83f7f2d6ec24a1be76509379f0'
- '9657daa21760bb0b5fa3d8b51d5e01a1'
'f861b18f4446c43918c8643dcbbd7f6d'
- '96f82c38f3f540b53f3e5144900acf17'
- '6bef262b5081051e88cd2ae94fed1867'
- '9c91b1319f4b20dc323986cb4abbe806'
- 'dcef8dd5614461166cada8a706eebb49'
- '0779ef8ba1d724ebb3b9bf360deba52b')
+ '96f82c38f3f540b53f3e5144900acf17')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
@@ -41,23 +32,14 @@ build() {
# modified now to the changes done by Gentoo in their svn ebuild
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-
+
# Do not export SSL libs in cups-config
patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
+
# don't zip man pages in make install, let makepkg do that / Fedora
patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-
- # upstream bugtracker patches
- # http://www.cups.org/str.php?L4157 - fix broken default server config
- patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
- # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals Avahi is not considered
- patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
- # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
- patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
- # http://cups.org/str.php?L4155 / https://bugs.archlinux.org/task/30965
- patch -Np0 -i ${srcdir}/usb-backend-reset-after-job-only-for-specific-devices.patch
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
@@ -118,6 +100,7 @@ backup=(etc/cups/cupsd.conf
etc/cups/snmp.conf
etc/cups/printers.conf
etc/cups/classes.conf
+ etc/cups/cups-files.conf
etc/cups/subscriptions.conf
etc/dbus-1/system.d/cups.conf
etc/logrotate.d/cups
@@ -135,7 +118,6 @@ optdepends=('xdg-utils: xdg .desktop file support')
# kill the sysv stuff
rm -rf ${pkgdir}/etc/rc*.d
rm -rf ${pkgdir}/etc/init.d
- install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
diff --git a/extra/cups/avahi-missing-in-conditionals.patch b/extra/cups/avahi-missing-in-conditionals.patch
deleted file mode 100644
index b261f58ae..000000000
--- a/extra/cups/avahi-missing-in-conditionals.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
---- cups/scheduler/client.c 2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/client.c 2012-08-04 20:13:17.082220961 +0200
-@@ -4021,7 +4021,7 @@
- !strncmp(host, "[::1]:", 6));
- }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * Check if the hostname is something.local (Bonjour); if so, allow it.
- */
-@@ -4040,7 +4040,7 @@
- !_cups_strcasecmp(end, ".local.") ||
- !_cups_strncasecmp(end, ".local.:", 8)))
- return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- /*
- * Check if the hostname is an IP address...
-@@ -4101,7 +4101,7 @@
- }
- }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
- a;
- a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
-@@ -4126,7 +4126,7 @@
- return (1);
- }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- /*
- * Check for interface hostname matches...
-diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
---- cups/scheduler/conf.c 2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/conf.c 2012-08-04 20:15:49.830978405 +0200
-@@ -89,9 +89,9 @@
- {
- { "AccessLog", &AccessLog, CUPSD_VARTYPE_STRING },
- { "AutoPurgeJobs", &JobAutoPurge, CUPSD_VARTYPE_BOOLEAN },
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- { "BrowseDNSSDSubTypes", &DNSSDSubTypes, CUPSD_VARTYPE_STRING },
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- { "BrowseWebIF", &BrowseWebIF, CUPSD_VARTYPE_BOOLEAN },
- { "Browsing", &Browsing, CUPSD_VARTYPE_BOOLEAN },
- { "CacheDir", &CacheDir, CUPSD_VARTYPE_STRING },
-@@ -735,9 +735,9 @@
- Browsing = CUPS_DEFAULT_BROWSING;
- DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cupsdSetString(&DNSSDSubTypes, "_cups,_print");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
- cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
-diff -uraN cups/scheduler/ipp.c cups-new/scheduler/ipp.c
---- cups/scheduler/ipp.c 2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/ipp.c 2012-08-04 20:13:17.086220978 +0200
-@@ -4813,7 +4813,7 @@
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
- {
- if (printer->reg_name)
-@@ -4823,7 +4823,7 @@
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
- "printer-dns-sd-name", 0);
- }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- if (!ra || cupsArrayFind(ra, "printer-error-policy"))
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -uraN cups/scheduler/main.c cups-new/scheduler/main.c
---- cups/scheduler/main.c 2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/main.c 2012-08-04 20:13:17.090221001 +0200
-@@ -781,9 +781,9 @@
- * Got an error from select!
- */
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cupsd_printer_t *p; /* Current printer */
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
-
- if (errno == EINTR) /* Just interrupted by a signal */
-@@ -824,13 +824,13 @@
- job->print_pipes[0], job->print_pipes[1],
- job->back_pipes[0], job->back_pipes[1]);
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- p;
- p = (cupsd_printer_t *)cupsArrayNext(Printers))
- cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
- p->reg_name ? p->reg_name : "(null)");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- break;
- }
diff --git a/extra/cups/cups b/extra/cups/cups
deleted file mode 100755
index 744c8e663..000000000
--- a/extra/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
- pidof -o %PPID $daemon_name
-}
-
-case "$1" in
- start)
- stat_busy "Starting $daemon_name daemon"
-
- PID=$(get_pid)
- if [ -z "$PID" ]; then
- [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
- # RUN
- $daemon_name
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- echo $(get_pid) > /var/run/$daemon_name.pid
- add_daemon $daemon_name
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping $daemon_name daemon"
- PID=$(get_pid)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/$daemon_name.pid &> /dev/null
- rm_daemon $daemon_name
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch
index 9be3c819b..e227bd182 100644
--- a/extra/cups/cups-no-export-ssllibs.patch
+++ b/extra/cups/cups-no-export-ssllibs.patch
@@ -1,7 +1,7 @@
diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+--- cups-1.6.2/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
++++ cups-1.6.2/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
+@@ -180,7 +180,7 @@
AC_SUBST(SSLFLAGS)
AC_SUBST(SSLLIBS)
@@ -9,4 +9,4 @@ diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/conf
+EXPORT_SSLLIBS=""
AC_SUBST(EXPORT_SSLLIBS)
-
+ dnl
diff --git a/extra/cups/cups-no-gcrypt.patch b/extra/cups/cups-no-gcrypt.patch
index 42f71d0d4..4eaff67ce 100644
--- a/extra/cups/cups-no-gcrypt.patch
+++ b/extra/cups/cups-no-gcrypt.patch
@@ -9,12 +9,14 @@ diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/
if $PKGCONFIG --exists gnutls; then
have_ssl=1
SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- AC_DEFINE(HAVE_SSL)
+@@ -108,18 +107,6 @@
AC_DEFINE(HAVE_GNUTLS)
fi
--
+
- if test $have_ssl = 1; then
+- CUPS_SERVERCERT="ssl/server.crt"
+- CUPS_SERVERKEY="ssl/server.key"
+-
- if $PKGCONFIG --exists gcrypt; then
- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
diff --git a/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch b/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch
deleted file mode 100644
index 97636c7f2..000000000
--- a/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uraN cups/conf/cupsd.conf.in cups-new/conf/cupsd.conf.in
---- cups/conf/cupsd.conf.in 2012-05-25 15:28:25.000000000 +0200
-+++ cups-new/conf/cupsd.conf.in 2012-08-04 20:56:26.699062177 +0200
-@@ -19,8 +19,6 @@
-
- # Show shared printers on the local network.
- Browsing On
--BrowseOrder allow,deny
--BrowseAllow all
- BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
-
- # Default authentication type, when authentication is required...
diff --git a/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch b/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
deleted file mode 100644
index 6349bd901..000000000
--- a/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uraN cups/scheduler/printers.c cups-new/scheduler/printers.c
---- cups/scheduler/printers.c 2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/printers.c 2012-08-04 20:58:40.475725544 +0200
-@@ -4829,13 +4829,14 @@
- "printer-make-and-model", NULL,
- "Local System V Printer");
- }
-- else if (!strncmp(p->device_uri, "ipp://", 6) &&
-- (strstr(p->device_uri, "/printers/") != NULL ||
-- strstr(p->device_uri, "/classes/") != NULL ||
-- ((strstr(p->device_uri, "._ipp.") != NULL ||
-- strstr(p->device_uri, "._ipps.") != NULL) &&
-- !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-- "/cups"))))
-+ else if ((!strncmp(p->device_uri, "ipp://", 6) &&
-+ (strstr(p->device_uri, "/printers/") != NULL ||
-+ strstr(p->device_uri, "/classes/") != NULL)) ||
-+ (!strncmp(p->device_uri, "dnssd://", 8) &&
-+ (strstr(p->device_uri, "._ipp.") != NULL ||
-+ strstr(p->device_uri, "._ipps.") != NULL) &&
-+ !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-+ "/cups")))
- {
- /*
- * Tell the client this is really a hard-wired remote printer.
diff --git a/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
deleted file mode 100644
index dcf91c833..000000000
--- a/extra/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- backend/usb-libusb.c.orig 2012-07-16 19:10:55.000000000 +0200
-+++ backend/usb-libusb.c 2012-08-06 11:01:58.034150159 +0200
-@@ -70,7 +70,7 @@
- read_endp, /* Read endpoint */
- protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */
- usblp_attached, /* "usblp" kernel module attached? */
-- opened_for_job; /* Set to 1 by print_device() */
-+ reset_after_job; /* Set to 1 by print_device() */
- unsigned int quirks; /* Quirks flags */
- struct libusb_device_handle *handle; /* Open handle to device */
- } usb_printer_t;
-@@ -122,6 +122,8 @@
- #define USBLP_QUIRK_USB_INIT 0x2 /* needs vendor USB init string */
- #define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific
- Class or SubClass */
-+#define USBLP_QUIRK_RESET 0x4000 /* After printing do a reset
-+ for clean-up */
- #define USBLP_QUIRK_NO_REATTACH 0x8000 /* After printing we cannot re-attach
- the usblp kernel module */
-
-@@ -147,9 +149,11 @@
- { 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- Printer M129C */
- { 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
-- USBLP_QUIRK_NO_REATTACH },
-+ USBLP_QUIRK_NO_REATTACH |
-+ USBLP_QUIRK_RESET },
- /* Prolific Technology, Inc. PL2305 Parallel Port
- (USB -> Parallel adapter) */
-+ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
- { 0, 0 }
- };
-
-@@ -256,7 +260,12 @@
- }
-
- g.print_fd = print_fd;
-- g.printer->opened_for_job = 1;
-+
-+ /*
-+ * Some devices need a reset after finishing a job, these devices are
-+ * marked with the USBLP_QUIRK_RESET quirk.
-+ */
-+ g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
-
- /*
- * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +781,7 @@
- * Reset the device to clean up after the job
- */
-
-- if (printer->opened_for_job == 1)
-+ if (printer->reset_after_job == 1)
- {
- if ((errcode = libusb_reset_device(printer->handle)) < 0)
- fprintf(stderr,
-@@ -1288,7 +1297,7 @@
- }
-
- printer->usblp_attached = 0;
-- printer->opened_for_job = 0;
-+ printer->reset_after_job = 0;
-
- if (verbose)
- fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1595,7 @@
- for (i = 0; quirk_printers[i].vendorId; i++)
- {
- if (vendor == quirk_printers[i].vendorId &&
-- product == quirk_printers[i].productId)
-+ (product == 0x0000 || product == quirk_printers[i].productId))
- return quirk_printers[i].quirks;
- }
- return 0;
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index d1f17eb87..d587c7832 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 170725 2012-11-10 05:22:37Z heftig $
+# $Id: PKGBUILD 180259 2013-03-18 23:57:36Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gdk-pixbuf2
pkgver=2.26.5
-pkgrel=1
+pkgrel=2
pkgdesc="An image loading library"
arch=('i686' 'x86_64')
url="http://www.gtk.org/"
license=('LGPL2.1')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
+depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
makedepends=('gtk-doc' 'gobject-introspection')
options=('!libtool')
install=gdk-pixbuf2.install
@@ -19,8 +19,8 @@ build() {
cd gdk-pixbuf-$pkgver
./configure --prefix=/usr \
- --without-libjasper \
--with-x11 \
+ --with-libjasper \
--with-included-loaders=png
make
}
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD
index 851e5725f..403ef5296 100644
--- a/extra/geoclue/PKGBUILD
+++ b/extra/geoclue/PKGBUILD
@@ -1,35 +1,27 @@
-# $Id: PKGBUILD 156782 2012-04-23 09:05:31Z ibiru $
+# $Id: PKGBUILD 180261 2013-03-19 00:26:52Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=geoclue
-pkgver=0.12.0
-pkgrel=5
+pkgver=0.12.99
+pkgrel=1
pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
url="http://geoclue.freedesktop.org/"
-license=('LGPL')
-depends=('dbus-glib' 'libxml2')
+license=(LGPL)
+depends=(dbus-glib libxml2 dconf)
+makedepends=(networkmanager libsoup-gnome gtk-doc)
optdepends=('networkmanager: geolocation'
- 'gconf: geolocation'
'libsoup-gnome: Skyhook location provider')
-makedepends=('gconf' 'networkmanager' 'libsoup-gnome' 'gtk-doc')
options=('!libtool')
-source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz
- geoclue-gcc46.patch)
-md5sums=('33af8307f332e0065af056ecba65fec2'
- '0cf8ecc350be702f623ed9a9715818c5')
+install=geoclue.install
+source=(http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.gz)
+md5sums=('779245045bfeeec4853da8baaa3a18e6')
build() {
cd $pkgname-$pkgver
- patch -Np1 -i ../geoclue-gcc46.patch
-
- sed -i 's/libnm_glib/libnm-glib/g' configure.ac
- sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac
- autoreconf -f -i
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-static
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --libexecdir=/usr/lib/$pkgname --disable-static
make
}
diff --git a/extra/geoclue/geoclue-gcc46.patch b/extra/geoclue/geoclue-gcc46.patch
deleted file mode 100644
index 11bf48547..000000000
--- a/extra/geoclue/geoclue-gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Mon, 07 Mar 2011 23:46:15 +0000
-Subject: master: Fix warning with GCC 4.6
-
----
-diff --git a/src/master-provider.c b/src/master-provider.c
-index 790c043..e4ea053 100644
---- a/src/master-provider.c
-+++ b/src/master-provider.c
-@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider)
- static gboolean
- gc_master_provider_initialize (GcMasterProvider *provider)
- {
-- GcMasterProviderPrivate *priv;
--
-- priv = GET_PRIVATE (provider);
--
- if (!gc_master_provider_initialize_interfaces (provider)) {
- return FALSE;
- }
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/geoclue/geoclue.install b/extra/geoclue/geoclue.install
new file mode 100644
index 000000000..c25dff2d3
--- /dev/null
+++ b/extra/geoclue/geoclue.install
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index f08c41d60..49640bb9c 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 172922 2012-12-06 20:30:42Z heftig $
+# $Id: PKGBUILD 180276 2013-03-19 13:37:31Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=grilo
-pkgver=0.2.4
+pkgver=0.2.5
pkgrel=1
pkgdesc="Framework that provides access to various sources of multimedia content"
url="http://www.gnome.org"
@@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala')
optdepends=('grilo-plugins: Plugins for grilo')
options=('!libtool' '!emptydirs')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('20fa8a5d1b89419c44f9b590a5a793e33d43a5e959ec8686111e631a724644fe')
+sha256sums=('ff281f60bc3afcb70913e61a6447b33ab259b3d89c1441c7e307fc998c050cdc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index bcc97d988..60ac98930 100644
--- a/extra/lilv/PKGBUILD
+++ b/extra/lilv/PKGBUILD
@@ -3,37 +3,46 @@
# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=lilv
-pkgver=0.14.4
+pkgver=0.16.0
pkgrel=1
-pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications."
-arch=(i686 x86_64)
-url="http://drobilla.net/software/$pkgname/"
+pkgdesc="A library to make the use of LV2 plugins as simple as possible for applications"
+arch=('i686' 'x86_64')
+url="http://drobilla.net/software/lilv/"
license=('custom:ISC')
-depends=('python2' 'sratom' 'jack')
+depends=('python2' 'sratom>=0.4.2' 'jack')
makedepends=('swig')
optdepends=('bash-completion: auto-complete words')
-source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('891595410eeb68322cf875286f96fccf')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2"
+ 'lilvmm.patch')
+md5sums=('12eb71f2b5b8a68e15c1c816896bcb9f'
+ 'd34207f8ca3586650ad7c50284ffb3e0')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # fix UI API error
+ # backport of http://dev.drobilla.net/changeset/5092
+ patch -Np2 -i "$srcdir/lilvmm.patch"
+
+ # pick up python2 even when python3 exists
+ # (the build system has flaky support for python3)
export PYTHON="/usr/bin/python2"
- # remove ldconfig
+ # remove ldconfig --speps
sed -i "/ldconfig/d" wscript
- python2 ./waf configure --prefix=/usr \
- --mandir=/usr/share/man \
- --configdir=/etc \
- --dyn-manifest \
- --bindings
- python2 ./waf
+ python2 waf configure --prefix=/usr \
+ --configdir=/etc \
+ --dyn-manifest \
+ --bindings
+
+ python2 waf build $MAKEFLAGS
}
package() {
cd "$srcdir/$pkgname-$pkgver"
- DESTDIR="$pkgdir" python2 ./waf install
+
+ python2 waf install --destdir="$pkgdir"
# license
install -Dm644 COPYING \
diff --git a/extra/lilv/lilvmm.patch b/extra/lilv/lilvmm.patch
new file mode 100644
index 000000000..410aac5e3
--- /dev/null
+++ b/extra/lilv/lilvmm.patch
@@ -0,0 +1,40 @@
+Index: trunk/lilv/lilv/lilvmm.hpp
+===================================================================
+--- trunk/lilv/lilv/lilvmm.hpp (revision 4975)
++++ trunk/lilv/lilv/lilvmm.hpp (revision 5092)
+@@ -48,4 +48,9 @@
+ inline RT name(T1 a1, T2 a2) { \
+ return lilv_ ## prefix ## _ ## name(me, a1, a2); \
++ }
++
++#define LILV_WRAP3(RT, prefix, name, T1, a1, T2, a2, T3, a3) \
++ inline RT name(T1 a1, T2 a2, T3 a3) { \
++ return lilv_ ## prefix ## _ ## name(me, a1, a2, a3); \
+ }
+
+@@ -138,4 +143,25 @@
+ LILV_WRAP1(bool, nodes, contains, const Node, node);
+ LILV_WRAP0(Node, nodes, get_first);
++};
++
++struct UI {
++ inline UI(const LilvUI* c_obj) : me(c_obj) {}
++ LILV_WRAP_CONVERSION(const LilvUI);
++
++ LILV_WRAP0(const LilvNode*, ui, get_uri);
++ LILV_WRAP0(const LilvNode*, ui, get_bundle_uri);
++ LILV_WRAP0(const LilvNode*, ui, get_binary_uri);
++ LILV_WRAP0(const LilvNodes*, ui, get_classes);
++ /*LILV_WRAP3(bool, ui, is_supported,
++ LilvUISupportedFunc, supported_func,
++ const LilvNode*, container_type,
++ const LilvNode**, ui_type);*/
++ LILV_WRAP1(bool, ui, is_a, const LilvNode*, class_uri);
++
++ const LilvUI* me;
++};
++
++struct UIs {
++ LILV_WRAP_COLL(UIs, UI, uis);
+ };
+
diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD
index e80a4b247..2afbd2d12 100644
--- a/extra/lv2/PKGBUILD
+++ b/extra/lv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 171678 2012-11-21 07:36:28Z schiv $
+# $Id: PKGBUILD 180306 2013-03-19 21:48:21Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
pkgname=lv2
-pkgver=1.2.0
+pkgver=1.4.0
pkgrel=1
pkgdesc="Successor to the LADSPA audio plug-in standard"
url="http://lv2plug.in/"
@@ -15,7 +15,7 @@ provides=('lv2core')
conflicts=('lv2core')
replaces=('lv2core')
source=("http://lv2plug.in/spec/$pkgname-$pkgver.tar.bz2")
-md5sums=('323b851563b4da1ad2c0faf5c76f0e3a')
+md5sums=('b7fb567fbfadae14ecd4f422fa24d41e')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 50e1075ff..850dbaef6 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180086 2013-03-16 08:30:44Z pierre $
+# $Id: PKGBUILD 180290 2013-03-19 19:00:59Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -22,7 +22,7 @@ pkgname=('php'
'php-tidy'
'php-xsl')
pkgver=5.4.13
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -34,7 +34,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
md5sums=('cacd308e978b7cf9ba4993196612ccf7'
- '0b0bc7a917fc592bdf11dcd3c5c255e9'
+ '44c1bb1df346b3b9d3e092c7df9a37d0'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
'5c1f4c967b66ce3eaf819b46951dcbf5'
'e036c721e5ad927cd1613c7475a58b3a'
@@ -235,7 +235,7 @@ package_php-apache() {
package_php-fpm() {
pkgdesc='FastCGI Process Manager for PHP'
- depends=('php')
+ depends=('php' 'systemd')
backup=('etc/php/php-fpm.conf')
install='php-fpm.install'
diff --git a/extra/php/php-fpm.install b/extra/php/php-fpm.install
index 41fc37c22..3572a7653 100644
--- a/extra/php/php-fpm.install
+++ b/extra/php/php-fpm.install
@@ -1,6 +1,6 @@
post_install() {
if [[ ! -d run/php-fpm ]]; then
- usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf
+ usr/bin/systemd-tmpfiles --create php-fpm.conf
fi
}
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index bbaae2152..62555d66a 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -5,7 +5,7 @@
; *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/
++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/:/usr/share/webapps/
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
index 2f9921d89..f9895597d 100644
--- a/extra/sord/PKGBUILD
+++ b/extra/sord/PKGBUILD
@@ -3,31 +3,31 @@
# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=sord
-pkgver=0.10.4
+pkgver=0.12.0
pkgrel=1
-pkgdesc="A lightweight C library for storing RDF data in memory."
-arch=(i686 x86_64)
-url="http://drobilla.net/software/$pkgname/"
+pkgdesc="A lightweight C library for storing RDF data in memory"
+arch=('i686' 'x86_64')
+url="http://drobilla.net/software/sord/"
license=('custom:ISC')
-depends=('serd>=0.18.0' 'pcre')
+depends=('serd' 'pcre')
makedepends=('python2')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('9353e5b5e26c926c1a8c0e43fa577f31')
+md5sums=('0c045bd0a7a2d70974ed7287bb61f891')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # remove ldconfig
+ # remove ldconfig --speps
sed -i "/ldconfig/d" wscript
- python2 ./waf configure --prefix=/usr \
- --mandir=/usr/share/man
- python2 ./waf
+ python2 waf configure --prefix=/usr
+ python2 waf build $MAKEFLAGS
}
package() {
cd "$srcdir/$pkgname-$pkgver"
- DESTDIR="$pkgdir" python2 ./waf install
+
+ python2 waf install --destdir="$pkgdir"
# license
install -Dm644 COPYING \
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index b3b8d70b9..16c9eaefc 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 175005 2013-01-10 17:58:12Z andyrtr $
+# $Id: PKGBUILD 180284 2013-03-19 15:40:26Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgbase="sqlite"
pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc')
-_amalgamationver=3071502
+_amalgamationver=3071600
#_docver=${_amalgamationver}
-_docver=3071502
-pkgver=3.7.15.2
+_docver=3071600
+pkgver=3.7.16
pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
arch=('i686' 'x86_64')
@@ -15,12 +15,12 @@ license=('custom')
url="http://www.sqlite.org/"
makedepends=('tcl' 'readline')
source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
- http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
- http://www.sqlite.org/sqlite-doc-${_docver}.zip
+ http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
+ http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip
license.txt)
options=('!libtool' '!emptydirs')
-md5sums=('bcb0ab0b5b30116b2531cfeef3c861b4'
- '159594c17290291fbbb47ee190b180f9'
+md5sums=('919aedd0c84e1d8fb07129251dbe05bf'
+ 'fbf875524bd3af1cf0b0580d13cc665e'
'c1cdbc5544034d9012e421e75a5e4890')
build() {
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index bc7881bba..c36012be5 100644
--- a/extra/sratom/PKGBUILD
+++ b/extra/sratom/PKGBUILD
@@ -3,32 +3,35 @@
# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=sratom
-pkgver=0.4.0
+pkgver=0.4.2
pkgrel=1
pkgdesc="An LV2 Atom RDF serialisation library"
-arch=(i686 x86_64)
-url="http://drobilla.net/software/$pkgname/"
+arch=('i686' 'x86_64')
+url="http://drobilla.net/software/sratom/"
license=('custom:ISC')
-depends=('lv2' 'sord')
+depends=('lv2' 'sord>=0.12.0')
makedepends=('python2')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('7279faa5879949de6593945c7f924595')
+md5sums=('5bb7e4bc4198e19f388ac51239007f25')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # remove ldconfig
+ # remove ldconfig --speps
sed -i '/ldconfig/d' wscript
python2 waf configure --prefix=/usr
- python2 waf
+ python2 waf build $MAKEFLAGS
}
package() {
cd "$srcdir/$pkgname-$pkgver"
- DESTDIR="$pkgdir/" python2 waf install
+
+ python2 waf install --destdir="$pkgdir"
# license
install -Dm644 COPYING \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index 6be96e5dd..8f43b4ab7 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -3,33 +3,33 @@
# Contributor: speps <speps at aur dot archlinux dot org>
pkgname=suil
-pkgver=0.6.10
-pkgrel=2
+pkgver=0.6.12
+pkgrel=1
pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
-arch=(i686 x86_64)
-url="http://drobilla.net/software/$pkgname/"
+arch=('i686' 'x86_64')
+url="http://drobilla.net/software/suil/"
license=('custom:ISC')
depends=('lv2')
makedepends=('python2' 'qt4' 'gtk2')
-optdepends=('qt4: Qt UIs wrapping support'
- 'gtk2: Gtk2 UIs wrapping support')
+optdepends=('qt4: Qt 4.x UI wrapping support'
+ 'gtk2: GTK+ 2.x UI wrapping support')
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
-md5sums=('735e3cc4d539059cf3948d3dba75807e')
+md5sums=('528d4a0a37e6c9d5a4547ac36f7bd9e6')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # remove ldconfig
+ # remove ldconfig --speps
sed -i "/ldconfig/d" wscript
- python2 ./waf configure --prefix=/usr \
- --mandir=/usr/share/man
- python2 ./waf
+ python2 waf configure --prefix=/usr
+ python2 waf
}
package() {
cd "$srcdir/$pkgname-$pkgver"
- DESTDIR="$pkgdir" python2 ./waf install
+
+ python2 waf install --destdir="$pkgdir"
# license
install -Dm644 COPYING \
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 9c926c1b2..af8e1756c 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180208 2013-03-18 16:09:15Z andyrtr $
+# $Id: PKGBUILD 180257 2013-03-18 23:41:34Z jgc $
# Contributor: Paul Mattal <paul@mattal.com>
# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
pkgname=xf86-video-openchrome
pkgver=0.3.1
-pkgrel=4
+pkgrel=5
pkgdesc="X.Org Openchrome drivers"
arch=(i686 x86_64)
license=('custom')
@@ -16,14 +16,18 @@ replaces=('openchrome' 'xf86-video-via')
groups=('xorg-drivers' 'xorg')
options=('!libtool' '!emptydirs' '!makeflags')
source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
- fix_system_lock.diff)
+ fix_system_lock.diff
+ no-mibstore.patch)
sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83'
- '539ba65df1755af97799f49410e4091b8d222eca')
+ '539ba65df1755af97799f49410e4091b8d222eca'
+ 'af0d7cace699b105e4405e48abc2f433032a7483')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# https://bugs.freedesktop.org/show_bug.cgi?id=53307
patch -Np1 -i ${srcdir}/fix_system_lock.diff
+ # https://bugs.freedesktop.org/show_bug.cgi?id=62112
+ patch -Np1 -i ../no-mibstore.patch
./configure --prefix=/usr
make
}
diff --git a/extra/xf86-video-openchrome/no-mibstore.patch b/extra/xf86-video-openchrome/no-mibstore.patch
new file mode 100644
index 000000000..e223babb7
--- /dev/null
+++ b/extra/xf86-video-openchrome/no-mibstore.patch
@@ -0,0 +1,11 @@
+diff -rup a/src/via_driver.c b/src/via_driver.c
+--- a/src/via_driver.c 2013-03-10 16:11:57.614059200 +0100
++++ b/src/via_driver.c 2013-03-10 16:12:46.374062244 +0100
+@@ -1873,7 +1873,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
+ if (!pVia->NoAccel && !viaInitExa(pScreen))
+ return FALSE;
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ #if 0
+ xf86SetSilkenMouse(pScreen); \ No newline at end of file