mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-03 14:57:14 +08:00
some gtk2 updates
This commit is contained in:
amnon
parent
7e4fb8fc9a
commit
034c41c8c6
10
atk/PKGBUILD
10
atk/PKGBUILD
@ -1,5 +1,11 @@
|
||||
# $Id: PKGBUILD 74174 2010-03-30 17:11:38Z ibiru $
|
||||
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=atk
|
||||
pkgver=1.32.0
|
||||
pkgrel=1
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
# $Id: PKGBUILD 71210 2010-03-05 15:30:02Z jgc $
|
||||
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
||||
# Contributor: Brice Carpentier <brice@daknet.org>
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=cairo
|
||||
pkgver=1.10.0
|
||||
@ -9,7 +13,7 @@ pkgdesc="Cairo vector graphics library"
|
||||
arch=(i686 x86_64)
|
||||
license=('LGPL' 'MPL')
|
||||
url="http://cairographics.org/"
|
||||
depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.16.6' 'xcb-util>=0.3.6')
|
||||
depends=('libpng>=1.4.0' 'libxrender' 'fontconfig>=2.8.0' 'pixman>=0.19.4' 'xcb-util>=0.3.6')
|
||||
makedepends=('pkgconfig' 'gtk-doc')
|
||||
options=('!libtool')
|
||||
source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
# $Id: PKGBUILD 75254 2010-04-01 05:00:15Z allan $
|
||||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgbase="cups"
|
||||
pkgname=('libcups' 'cups')
|
||||
@ -9,10 +14,10 @@ arch=('i686' 'x86_64')
|
||||
license=('GPL')
|
||||
url="http://www.cups.org/"
|
||||
makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'heimdal>=1.3.1' 'gnutls>=2.8.3' 'poppler>=0.12.3'
|
||||
'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme')
|
||||
'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme')
|
||||
source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
|
||||
cups-avahi.patch
|
||||
http://www.cups.org/strfiles/3595/str3595.patch
|
||||
http://www.cups.org/strfiles/3595/str3595.patch
|
||||
cups cups.logrotate cups.pam)
|
||||
#options=('!emptydirs')
|
||||
md5sums=('8776403ad60fea9e85eab9c04d88560d'
|
||||
@ -26,25 +31,26 @@ build() {
|
||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
||||
# Avahi support in the dnssd backend. patch from Fedora
|
||||
patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1
|
||||
|
||||
# Brother HL-1440 fix: from Arch (bug: 18167)
|
||||
|
||||
# fix Brother HL-1440 failing with msg "Unable to write 8192 bytes to printer!" (http://bugs.archlinux.org/task/18167)
|
||||
patch -Np0 -i ${srcdir}/str3595.patch || return 1
|
||||
|
||||
|
||||
# Rebuild configure script for --enable-avahi.
|
||||
aclocal -I config-scripts
|
||||
autoconf -I config-scripts
|
||||
|
||||
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
|
||||
--with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
|
||||
--with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \
|
||||
--disable-ldap --libdir=/usr/lib --enable-raw-printing \
|
||||
--enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --enable-avahi\
|
||||
--enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\
|
||||
--with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS"
|
||||
make || return 1
|
||||
}
|
||||
|
||||
package_libcups() {
|
||||
pkgdesc="The CUPS Printing System - client libraries and headers"
|
||||
depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi' )
|
||||
depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'heimdal>=1.3.1' 'avahi')
|
||||
|
||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
||||
make BUILDROOT=${pkgdir} install-headers install-libs || return 1
|
||||
@ -68,7 +74,7 @@ backup=(etc/cups/cupsd.conf
|
||||
etc/logrotate.d/cups
|
||||
etc/pam.d/cups
|
||||
etc/xinetd.d/cups-lpd)
|
||||
depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-glib' 'avahi' 'hicolor-icon-theme')
|
||||
depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
|
||||
optdepends=('php: for included phpcups.so module')
|
||||
|
||||
cd ${srcdir}/${pkgbase}-${pkgver}
|
||||
@ -87,6 +93,9 @@ optdepends=('php: for included phpcups.so module')
|
||||
# fix perms on /var/spool and /etc
|
||||
chmod 755 ${pkgdir}/var/spool
|
||||
chmod 755 ${pkgdir}/etc
|
||||
|
||||
# serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
|
||||
chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
|
||||
|
||||
# install ssl directory where to store the certs, solves some samba issues
|
||||
install -dm700 -g lp ${pkgdir}/etc/cups/ssl
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur cups-1.3.7/scheduler/auth.c cups-1.3.7.new/scheduler/auth.c
|
||||
--- cups-1.3.7/scheduler/auth.c 2008-03-20 21:58:16.000000000 +0100
|
||||
+++ cups-1.3.7.new/scheduler/auth.c 2008-06-09 14:53:45.535194741 +0200
|
||||
@@ -54,6 +54,7 @@
|
||||
* Include necessary headers...
|
||||
*/
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
#include "cupsd.h"
|
||||
#include <grp.h>
|
||||
#ifdef HAVE_SHADOW_H
|
||||
@ -1086,4 +1086,3 @@ diff -up cups-1.4.0/cups/http-support.c.avahi cups-1.4.0/cups/http-support.c
|
||||
|
||||
/*
|
||||
* End of "$Id: http-support.c 8705 2009-06-12 00:21:58Z mike $".
|
||||
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
diff -urNad cups-1.4.0~/backend/usb-libusb.c cups-1.4.0/backend/usb-libusb.c
|
||||
--- cups-1.4.0~/backend/usb-libusb.c 2009-08-08 00:24:14.000000000 +0200
|
||||
+++ cups-1.4.0/backend/usb-libusb.c 2009-09-02 16:37:31.000000000 +0200
|
||||
@@ -158,7 +158,7 @@
|
||||
|
||||
while (poll(pfds, 2, -1) > 0)
|
||||
{
|
||||
- if (pfds[0].revents & POLLIN)
|
||||
+ if (pfds[0].revents & (POLLIN + POLLHUP))
|
||||
{
|
||||
if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
|
||||
{
|
||||
@@ -179,7 +179,12 @@
|
||||
}
|
||||
|
||||
if (pfds[1].revents & POLLIN)
|
||||
- tbytes += side_cb(printer, print_fd);
|
||||
+ {
|
||||
+ if ((bytes = side_cb(printer, print_fd)) < 0)
|
||||
+ pfds[1].events = 0; /* Filter has gone away... */
|
||||
+ else
|
||||
+ tbytes += bytes;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -747,7 +752,7 @@
|
||||
if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
|
||||
{
|
||||
_cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
|
||||
- return (0);
|
||||
+ return (-1);
|
||||
}
|
||||
|
||||
switch (command)
|
||||
@ -1,6 +1,11 @@
|
||||
# $Id: PKGBUILD 75779 2010-04-03 14:56:21Z jgc $
|
||||
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
||||
# Contributor: Alexander Baldeck <alexander@archlinux.org>
|
||||
# Platform Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
# include global config
|
||||
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
|
||||
|
||||
pkgname=pixman
|
||||
pkgver=0.19.4
|
||||
pkgrel=1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user