Commit 94ef2ea4 authored by Xuetian Weng's avatar Xuetian Weng

rebuild package to remove libtool file

parent 24c6915d
......@@ -4,7 +4,7 @@
pkgname=at-spi2-atk
pkgver=2.11.5
pkgrel=1
pkgrel=2
pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
arch=('x86_64')
url="http://www.gnome.org"
......
......@@ -6,7 +6,7 @@
pkgname=at-spi2-core
pkgver=2.11.5
pkgrel=1
pkgrel=2
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
arch=('x86_64')
url="http://www.gnome.org"
......
......@@ -5,7 +5,7 @@
pkgname=atk
pkgver=2.11.6
pkgrel=1
pkgrel=2
pkgdesc="A library providing a set of interfaces for accessibility"
arch=('x86_64')
license=('LGPL')
......
......@@ -5,7 +5,7 @@
# contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=colord
pkgver=1.0.6
pkgver=1.2.0
pkgrel=1
pkgdesc="System daemon for managing color devices"
arch=('x86_64')
......@@ -16,15 +16,12 @@ makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook-xsl' 'sane' 'bas
optdepends=('sane: UseSANE support [/etc/colord.conf]')
install=colord.install
backup=(etc/colord.conf)
source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc}
udev-systemd.patch)
sha1sums=('b3ad9d1cd90ff0ea4d955b253dc0491d851c2778'
'SKIP'
'3b467b9674f767c804943d191beaf6bd1ba3a606')
source=($url/releases/$pkgname-$pkgver.tar.xz{,.asc})
sha1sums=('a96619dcca24aea1527054f0117211cf7ac30dec'
'SKIP')
prepare() {
cd $pkgname-$pkgver
patch -Np1 -i ../udev-systemd.patch
}
build() {
......@@ -36,7 +33,7 @@ build() {
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/$pkgname --disable-static \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--enable-vala --enable-sane --disable-volume-search
--enable-vala --enable-sane --with-daemon-user=colord
make
}
......
post_install() {
glib-compile-schemas /usr/share/glib-2.0/schemas
getent group colord >/dev/null || groupadd -g 124 colord
getent passwd colord >/dev/null || useradd -d /var/lib/colord -u 124 -g colord -s /bin/false colord
chown colord:colord /var/lib/colord
chown colord:colord /var/lib/colord/*.db 2>/dev/null || return 0
}
post_upgrade() {
......@@ -8,4 +12,6 @@ post_upgrade() {
post_remove() {
post_install
getent passwd colord >/dev/null && userdel colord
getent group colord >/dev/null && groupdel colord
}
Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb.
Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185
--- colord-1.0.1.orig/rules/69-cd-sensors.rules.in
+++ colord-1.0.1/rules/69-cd-sensors.rules.in
@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct
# color calibration device
ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1"
-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p"
-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p"
+ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
+ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb"
# Allow the daemon to access the color devices
ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@"
......@@ -3,7 +3,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.6.3
pkgrel=3
pkgrel=4
arch=('x86_64')
license=('GPL')
url="http://www.cups.org/"
......
......@@ -6,7 +6,7 @@
pkgname=dbus-c++
pkgver=0.9.0
pkgrel=3
pkgrel=4
pkgdesc="dbus-c++ attempts to provide a C++ API for D-BUS"
url="http://sourceforge.net/projects/dbus-cplusplus/"
arch=('x86_64')
......@@ -21,7 +21,7 @@ md5sums=('e752116f523fa88ef041e63d3dee4de2'
build() {
cd "${srcdir}/libdbus-c++-${pkgver}"
patch -p0 < ${srcdir}/patch-gcc47.patch
export LDFLAGS="${LDFLAGS} -lexpat"
export LDFLAGS="${LDFLAGS} -lexpat -lpthread"
./autogen.sh --prefix=/usr --disable-static --enable-glib --disable-ecore
make
}
......
......@@ -5,8 +5,8 @@
# contributor: abveritas@chakra-project.org
pkgname=dbus-glib
pkgver=0.100.2
pkgrel=2
pkgver=0.102
pkgrel=1
pkgdesc="GLib bindings for DBUS"
arch=('x86_64')
license=('GPL')
......@@ -15,7 +15,7 @@ depends=('dbus' 'glib2')
makedepends=('pkgconfig')
options=('!emptydirs')
source=("http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('ad0920c7e3aad669163bb59171cf138e')
md5sums=('f76b8558fd575d0106c3a556eaa49184')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
From b92b17ecced6df463da73d6de566740cf5cd00d4 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 1 Feb 2013 15:19:58 +0100
Subject: [PATCH 1/2] Poll files on nfs4
Add nfs4 among polled filesystems.
https://bugzilla.gnome.org/show_bug.cgi?id=693006
---
server/gam_fs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/gam_fs.c b/server/gam_fs.c
index c8ca704..143a603 100644
--- a/server/gam_fs.c
+++ b/server/gam_fs.c
@@ -178,6 +178,7 @@ gam_fs_init (void)
gam_fs_set ("reiserfs", GFS_MT_DEFAULT, 0);
gam_fs_set ("novfs", GFS_MT_POLL, 30);
gam_fs_set ("nfs", GFS_MT_POLL, 5);
+ gam_fs_set ("nfs4", GFS_MT_POLL, 5);
if (stat("/etc/mtab", &mtab_sbuf) != 0)
{
GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n");
--
1.8.1.2
From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi@mageia.org>
Date: Wed, 4 Jan 2012 00:23:55 +0200
Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
However, ih_sub_cancel() locks it again, and locking GMutex recursively
causes undefined behaviour.
Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
is its only user. Also make the function static so that it won't
accidentally get used by other files without locking (inotify-helper.h
is an internal server header).
This should fix the intermittent deadlocks I've been experiencing
causing KDE applications to no longer start, and probably also
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=204537
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamin/+bug/926862
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
---
server/inotify-helper.c | 7 ++-----
server/inotify-helper.h | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/server/inotify-helper.c b/server/inotify-helper.c
index d77203e..0789fa4 100644
--- a/server/inotify-helper.c
+++ b/server/inotify-helper.c
@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
/**
* Cancels a subscription which was being monitored.
+ * inotify_lock must be held when calling.
*/
-gboolean
+static gboolean
ih_sub_cancel (ih_sub_t * sub)
{
- G_LOCK(inotify_lock);
-
-
if (!sub->cancelled)
{
IH_W("cancelling %s\n", sub->pathname);
@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
sub_list = g_list_remove (sub_list, sub);
}
- G_UNLOCK(inotify_lock);
return TRUE;
}
diff --git a/server/inotify-helper.h b/server/inotify-helper.h
index 5d3b6d0..d36b5fd 100644
--- a/server/inotify-helper.h
+++ b/server/inotify-helper.h
@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
found_callback_t fcb);
gboolean ih_running (void);
gboolean ih_sub_add (ih_sub_t *sub);
-gboolean ih_sub_cancel (ih_sub_t *sub);
/* Return FALSE from 'f' if the subscription should be cancelled */
void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
--
1.7.7.2
......@@ -7,7 +7,7 @@
pkgname=gamin
pkgver=0.1.10
pkgrel=2
pkgrel=3
pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor).'
url='http://www.gnome.org/~veillard/gamin'
license=('GPL2')
......@@ -17,14 +17,30 @@ makedepends=('python2')
optdepends=('python2: for the Python module.')
provides=('fam')
conflicts=('fam')
source=("http://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz")
md5sums=('b4ec549e57da470c04edd5ec2876a028')
source=("http://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz"
'fix-deprecated-const.patch'
'18_gam_server_deadlocks.patch'
'0001-Poll-files-on-nfs4.patch')
md5sums=('b4ec549e57da470c04edd5ec2876a028'
'f679aeb48fe9dd376c8828cc9b6941ab'
'4784359a3206bfa3c0dce1c23468f87f'
'6711cd0b1e8d2ad038c5761715d084a5')
build() {
prepare() {
cd $srcdir/$pkgname-$pkgver
# https://bugs.archlinux.org/task/33642
patch -Np1 -i ../18_gam_server_deadlocks.patch
patch -Np1 -i ../fix-deprecated-const.patch
patch -Np1 -i ../0001-Poll-files-on-nfs4.patch
# Python 2.
sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
}
build() {
cd $srcdir/$pkgname-$pkgver
./configure \
--disable-debug \
......
Description: Don't use deprecated G_CONST_RETURN. Fixes building with newer glib versions.
Author: Matthias Klose <doko@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/829504
Index: gamin/server/gam_node.c
===================================================================
--- gamin.orig/server/gam_node.c 2011-10-18 16:09:04.873780685 +0200
+++ gamin/server/gam_node.c 2011-10-18 16:09:01.965780543 +0200
@@ -122,7 +122,7 @@
* it has finished with the string. If it must keep it longer, it
* should makes its own copy. The returned string must not be freed.
*/
-G_CONST_RETURN char *
+const char *
gam_node_get_path(GamNode * node)
{
g_assert(node);
Index: gamin/server/gam_node.h
===================================================================
--- gamin.orig/server/gam_node.h 2011-10-18 16:09:04.729780677 +0200
+++ gamin/server/gam_node.h 2011-10-18 16:09:01.961780544 +0200
@@ -58,7 +58,7 @@
void gam_node_set_is_dir (GamNode *node,
gboolean is_dir);
-G_CONST_RETURN char *gam_node_get_path (GamNode *node);
+const char *gam_node_get_path (GamNode *node);
GList *gam_node_get_subscriptions (GamNode *node);
Index: gamin/server/gam_subscription.c
===================================================================
--- gamin.orig/server/gam_subscription.c 2011-10-18 16:09:04.817780682 +0200
+++ gamin/server/gam_subscription.c 2011-10-18 16:09:01.965780543 +0200
@@ -141,7 +141,7 @@
* @param sub the GamSubscription
* @returns The path being monitored. It should not be freed.
*/
-G_CONST_RETURN char *
+const char *
gam_subscription_get_path(GamSubscription * sub)
{
if (sub == NULL)
Index: gamin/server/gam_subscription.h
===================================================================
--- gamin.orig/server/gam_subscription.h 2011-10-18 16:09:04.929780687 +0200
+++ gamin/server/gam_subscription.h 2011-10-18 16:09:01.965780543 +0200
@@ -21,7 +21,7 @@
int gam_subscription_get_reqno (GamSubscription *sub);
-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
+const char *gam_subscription_get_path (GamSubscription *sub);
GamListener *gam_subscription_get_listener (GamSubscription *sub);
......@@ -5,13 +5,12 @@
pkgname=gavl
pkgver=1.4.0
pkgrel=2
pkgrel=3
pkgdesc="A low level library, upon which multimedia APIs can be built."
arch=('x86_64')
url="http://gmerlin.sourceforge.net/"
license=('GPL')
depends=('glibc' 'libpng')
optios=(!libtool)
source=(http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz)
md5sums=('2752013a817fbc43ddf13552215ec2c0')
......@@ -27,4 +26,4 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
}
\ No newline at end of file
}
......@@ -6,7 +6,7 @@
pkgbase=glibmm
pkgname=('glibmm' 'glibmm-docs')
pkgver=2.38.1
pkgrel=1
pkgrel=2
arch=('x86_64')
license=('LGPL')
makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
......
......@@ -5,7 +5,7 @@
pkgname=gstreamer0.10
pkgver=0.10.36
pkgrel=7
pkgrel=8
pkgdesc="GStreamer Multimedia Framework"
arch=('x86_64')
license=('LGPL')
......
......@@ -5,7 +5,7 @@
pkgname=libgusb
pkgver=0.1.6
pkgrel=1
pkgrel=2
pkgdesc="GLib wrapper around libusb1"
arch=('x86_64')
url="https://gitorious.org/gusb/"
......
......@@ -3,7 +3,7 @@
pkgname=mpg123
pkgver=1.16.0
pkgrel=1
pkgrel=2
pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
arch=('x86_64')
url="http://sourceforge.net/projects/mpg123"
......@@ -15,7 +15,6 @@ optdepends=('sdl: for sdl audio support'
conflicts=('mpg321')
provides=('mpg321')
replaces=('mpg321')
options=('libtool')
categories=('multimedia')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
sha1sums=('73105629f8d4b9426ec9fe93455a8271a96c4ae4')
......
......@@ -4,7 +4,7 @@ pkgbase=pulseaudio
pkgname=(pulseaudio libpulse)
pkgdesc="A featureful, general-purpose sound server"
pkgver=5.0
pkgrel=1
pkgrel=2
arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/PulseAudio"
license=(GPL LGPL)
......
......@@ -6,7 +6,7 @@
pkgname=qpdf
pkgver=5.1.1
pkgrel=1
pkgrel=2
pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
arch=('x86_64')
url="http://qpdf.sourceforge.net/"
......@@ -35,4 +35,4 @@ package() {
mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname}
install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/
}
\ No newline at end of file
}
......@@ -4,8 +4,8 @@
# maintainer almack@chakraos.org
pkgname=subversion
pkgver=1.8.8
pkgrel=2
pkgver=1.8.9
pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('x86_64')
license=('apache')
......@@ -26,12 +26,12 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc
svnserve.tmpfiles
svnserve.service
subversion.rpath.fix.patch)
sha1sums=('8e9f10b7a9704c90e17cfe76fd56e3fe74c01a7a'
sha1sums=('424ee12708f39a126efd905886666083dcc4eeaf'
'SKIP'
'73b36c046c09cec2093354911c89e3ba8056af6c'
'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
'00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
'9f6790d842cf3e0228b007483a43e39a42724068'
'd299e1612d5e48afb877bd3ae18338d198f89dfa'
'3d1e28408a9abb42af2e531adc0d01ce21acfad6')
prepare() {
......@@ -67,7 +67,7 @@ package() {
swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
install install-swig-py install-swig-pl install-javahl install-swig-rb
install -d "${pkgdir}"/usr/share/subversion
install -dm755 "${pkgdir}"/usr/share/subversion
cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
......
......@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=/etc/conf.d/svnserve
ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
ExecStart=/usr/bin/svnserve --daemon $SVNSERVE_ARGS
[Install]
WantedBy=multi-user.target
......@@ -5,7 +5,7 @@
pkgname=v4l-utils
pkgver=0.9.5
pkgrel=1
pkgrel=2
pkgdesc="Userspace tools and conversion library for Video 4 Linux"
arch=('i686' 'x86_64')
url="http://freshmeat.net/projects/libv4l"
......
......@@ -2,7 +2,7 @@
pkgname=vala
pkgver=0.24.0
pkgrel=1
pkgrel=2
pkgdesc="Compiler for the GObject type system."
arch=('x86_64')
url="http://live.gnome.org/Vala"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment