diff options
Diffstat (limited to 'extra')
26 files changed, 390 insertions, 372 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 11c38fa4f..65873259e 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196352 2013-10-12 07:52:54Z andyrtr $ +# $Id: PKGBUILD 197696 2013-10-28 15:56:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') -pkgver=1.6.4 +pkgver=1.7.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -11,7 +11,7 @@ url="http://www.cups.org/" makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi' 'hicolor-icon-theme' 'systemd') source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz + http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2 cups.logrotate cups.pam # improve build and linking cups-no-export-ssllibs.patch @@ -30,19 +30,19 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch get-ppd-file-for-statically-configured-ipp-shared-queues.patch ppd-poll-with-client-conf.patch) -md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f' +md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' '3ba9e3410df1dc3015463d615ef91b3b' 'cc4101beccb5ed6deb1c92707a575925' '90c30380d4c8cd48a908cfdadae1ea24' - 'b4868b83f7f2d6ec24a1be76509379f0' + '555a1c71151ce990e176315b46e3de2f' 'a2a88b3a3257c3b5fd3edcc169e6aca4' '8fe27d4248cacbc02824e7937cab4088' 'df0c367c0022e3c7d8e01827e8a6c5e7' 'f30c2a161caaf27854581507cde8cac6' '5117f65342fcc69c6a506529e4daca9e' - '9247e218eea94ebda0aebc8ee0e77db8' + '451609db34f95209d64c38474de27ce1' 'cb58bf4e0b80eaee383712e5c84a1ab4' 'b578bcd17949a7203237ba1e31f78ef9' '0becd6ab8782b97f19a02c1dc174c75e') @@ -71,12 +71,12 @@ prepare() { patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll. - patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch +# patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch # Applications could not get the PPD file for statically-configured IPP-shared print queues patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763 - patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch +# patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch # fix permissions on some files - alternative: cups-0755.patch by FC patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch # move /var/run -> /run for pid file @@ -200,7 +200,7 @@ optdepends=('xdg-utils: xdg .desktop file support') rm -v ${pkgdir}/usr/share/cups/banners/* rm -v ${pkgdir}/usr/share/cups/data/testprint # comment out all conversion rules which use any of the removed filters - perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs + perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs # Provide native service for arch-daemons generator ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service" diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch index 3e836657d..c44ebed07 100644 --- a/extra/cups/cups-1.6.2-statedir.patch +++ b/extra/cups/cups-1.6.2-statedir.patch @@ -1,12 +1,12 @@ diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4 --- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200 +++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200 -@@ -429,7 +429,7 @@ - ;; - *) - # All others -- CUPS_STATEDIR="$localstatedir/run/cups" -+ CUPS_STATEDIR="/run/cups" - ;; - esac +@@ -420,7 +420,7 @@ + ;; + *) + # All others +- CUPS_STATEDIR="$localstatedir/run/cups" ++ CUPS_STATEDIR="/run/cups" + ;; + esac]) AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index 83fabdb4f..cfbe93354 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -1,7 +1,7 @@ -diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in ---- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 -+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 -@@ -506,6 +506,13 @@ +diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in +--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200 +@@ -451,6 +451,13 @@ /* @@ -15,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in * Various scripting languages... */ -diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 ---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 -+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 +diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4 +--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200 ++++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200 @@ -0,0 +1,36 @@ +dnl +dnl "$Id$" @@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con +dnl +dnl "$Id$" +dnl -diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in ---- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 +diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in +--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200 ++++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200 @@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) @@ -66,20 +66,20 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-scripting.m4) -@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs +@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs conf/snmp.conf cups-config data/testprint -+ data/cups.service -+ data/cups.socket -+ data/cups.path ++ data/cups.service ++ data/cups.socket ++ data/cups.path desktop/cups.desktop + doc/help/ref-cups-files-conf.html doc/help/ref-cupsd-conf.html - doc/help/standard.html -diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c ---- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 -+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 -@@ -975,7 +975,7 @@ cups_read_client_conf( +diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c +--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200 ++++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200 +@@ -1046,7 +1046,7 @@ cups_read_client_conf( struct stat sockinfo; /* Domain socket information */ if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && @@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c cups_server = CUPS_DEFAULT_DOMAINSOCKET; else #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in ---- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 +diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in +--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 ++++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool @@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i + +[Install] +WantedBy=multi-user.target -diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in ---- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 -+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 +diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in +--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200 ++++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200 @@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service @@ -114,9 +114,9 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in ---- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 -+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 +diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in +--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200 ++++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printing Service Sockets @@ -126,9 +126,9 @@ diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.sock + +[Install] +WantedBy=sockets.target -diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile ---- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 -+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 +diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile +--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200 @@ -100,6 +100,12 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ done @@ -152,10 +152,10 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile # -diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in ---- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 -+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 -@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ +diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in +--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200 ++++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200 +@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ @@ -163,13 +163,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in DNSSD_BACKEND = @DNSSD_BACKEND@ DSOFLAGS = -L../cups @DSOFLAGS@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) - DNSSDLIBS = @DNSSDLIBS@ +@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@ + IPPFIND_BIN = @IPPFIND_BIN@ + IPPFIND_MAN = @IPPFIND_MAN@ LAUNCHDLIBS = @LAUNCHDLIBS@ +SDLIBS = @SDLIBS@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ +@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@ DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DBUSDIR = @DBUSDIR@ @@ -177,9 +179,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in # -diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h ---- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 -+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 +diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h +--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200 @@ -77,6 +77,9 @@ typedef struct int fd; /* File descriptor for this server */ http_addr_t address; /* Bind address of socket */ @@ -190,9 +192,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien } cupsd_listener_t; -diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c ---- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 -+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 +diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c +--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200 @@ -401,7 +401,11 @@ cupsdStopListening(void) lis; lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) @@ -206,9 +208,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste { #ifdef WIN32 closesocket(lis->fd); -diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c ---- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 -+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 +diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c +--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200 ++++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200 @@ -26,6 +26,8 @@ * launchd_checkin() - Check-in with launchd and collect the listening * fds. @@ -229,7 +231,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) # include <malloc.h> #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ -@@ -78,6 +84,9 @@ +@@ -83,6 +89,9 @@ static void launchd_checkin(void); static void launchd_checkout(void); #endif /* HAVE_LAUNCHD */ @@ -239,7 +241,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c static void parent_handler(int sig); static void process_children(void); static void sigchld_handler(int sig); -@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm +@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -253,7 +255,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * Startup the server... */ -@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm +@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -269,7 +271,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * Startup the server... */ -@@ -1516,6 +1541,102 @@ launchd_checkout(void) +@@ -1511,6 +1536,102 @@ launchd_checkout(void) } #endif /* HAVE_LAUNCHD */ @@ -372,10 +374,10 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c /* * 'parent_handler()' - Catch USR1/CHLD signals... -diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile ---- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 -+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 -@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu +diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile +--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200 ++++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200 +@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ @@ -384,7 +386,7 @@ diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makef cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... -@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a +@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD index f77be22ec..d0ffb79d0 100644 --- a/extra/f2fs-tools/PKGBUILD +++ b/extra/f2fs-tools/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 197003 2013-10-21 12:37:50Z tpowa $ +# $Id: PKGBUILD 197684 2013-10-28 11:07:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Christian Hesse <mail@eworm.de> pkgname=f2fs-tools -pkgver=1.1.0_130404 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Tools for Flash-Friendly File System (F2FS)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/f2fs-tools/" depends=('util-linux') license=('GPL') -#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') -source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('0bb44c174a2da2a7dd1216cc46b4612c') +source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.2.0.tar.gz') +#source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") options=(!libtool) +md5sums=('d27ad7cd56f6001f7e1d508d85eef195') build() { cd "${pkgname}-${pkgver}" @@ -28,4 +28,3 @@ package() { make DESTDIR="${pkgdir}/" sbindir=/usr/bin install } - diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD index 6c6fc9594..ef582b32c 100644 --- a/extra/gnome-python-extras/PKGBUILD +++ b/extra/gnome-python-extras/PKGBUILD @@ -1,63 +1,51 @@ -# $Id: PKGBUILD 150866 2012-02-23 13:12:25Z ibiru $ +# $Id: PKGBUILD 197692 2013-10-28 14:46:28Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-python-extras -pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') +pkgname=('gnome-python-extras' 'python2-egg' 'python2-gtkspell') pkgver=2.25.3 -pkgrel=12 +pkgrel=13 arch=('i686' 'x86_64') url="http://www.daa.com.au/~james/pygtk/" license=('GPL' 'LGPL') -makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') +makedepends=('gtkspell' 'libgnomeui' 'python2' 'pygtk' 'gnome-python') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2 gnome-python-extras-2.25.3-update-for-2.27.2.patch) md5sums=('9f3b7ec5c57130b96061cb486b79c076' '0b0a4d93016d14f2306682301de3bda3') sha1sums=('e69e5288466c960ed6f985bb10c9969b21ed85a4' 'b065efb7f7f5baa7b95b63bcadb6a4623d1bc9e5') +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../gnome-python-extras-2.25.3-update-for-2.27.2.patch +} + build() { - cd "${srcdir}/gnome-python-extras-${pkgver}" - patch -Np1 -i "${srcdir}"/gnome-python-extras-2.25.3-update-for-2.27.2.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr - make + cd $pkgbase-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-gksu --disable-gtkhtml2 --disable-gksu2 --disable-gksuui + make } package_gnome-python-extras() { - pkgdesc="Gnome Python interfaces for libraries not part of the core platform" - depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell') + pkgdesc="Gnome Python interfaces for libraries not part of the core platform" + depends=('python2-egg' 'python2-gtkspell') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make install-pkgconfigDATA DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make install-pkgconfigDATA DESTDIR="${pkgdir}" } package_python2-egg(){ - pkgdesc="Python bindings for interacting with egg" - depends=('libgnomeui' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C egg install DESTDIR="${pkgdir}" -} - -package_python2-gksu2() { - pkgdesc="Python bindings for the gksu2" - depends=('libgksu' 'pygtk') - - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gksu2 install DESTDIR="${pkgdir}" -} - -package_python2-gtkhtml2() { - pkgdesc="Python bindings for the gtkhtml2" - depends=('libgtkhtml' 'pygtk') + pkgdesc="Python bindings for interacting with egg" + depends=('libgnomeui' 'pygtk') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkhtml2 install DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make -C egg install DESTDIR="${pkgdir}" } package_python2-gtkspell() { - pkgdesc="Python bindings for the gtkspell" - depends=('gtkspell' 'pygtk') + pkgdesc="Python bindings for the gtkspell" + depends=('gtkspell' 'pygtk') - cd "${srcdir}/gnome-python-extras-${pkgver}" - make -C gtkspell install DESTDIR="${pkgdir}" + cd $pkgbase-$pkgver + make -C gtkspell install DESTDIR="${pkgdir}" } diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD index 86ad80d34..fe380c773 100644 --- a/extra/libdiscid/PKGBUILD +++ b/extra/libdiscid/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $ +# $Id: PKGBUILD 197662 2013-10-28 01:29:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Eric Gillingham <sysrq@sysrq.tk> pkgname=libdiscid pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A Library for creating MusicBrainz DiscIDs" arch=('i686' 'x86_64') url="http://musicbrainz.org/doc/libdiscid" license=('LGPL') depends=('glibc') -options=('!libtool') source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz") md5sums=('98c4b281780707e6b446cc526a825e7a') diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index ac4a04c7c..d14311bd5 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 195484 2013-10-01 06:01:26Z bpiotrowski $ +# $Id: PKGBUILD 197664 2013-10-28 02:02:53Z eric $ +# Maintainer: # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss pkgver=1.2.13 -pkgrel=2 +pkgrel=3 pkgdesc="Portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -options=('!libtool' '!docs' '!emptydirs') +options=('!docs' '!emptydirs') source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD index c72cc5b5c..aaf925e09 100644 --- a/extra/libglade/PKGBUILD +++ b/extra/libglade/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197348 2013-10-25 02:47:37Z allan $ +# $Id: PKGBUILD 197694 2013-10-28 14:56:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libglade pkgver=2.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="Allows you to load glade interface files in a program at runtime" arch=(i686 x86_64) license=('LGPL') @@ -17,15 +17,19 @@ url="http://www.gnome.org" md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' '4f879c0ce550004905aa0fb24f25c353') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../libglade-2.0.1-nowarning.patch +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" - PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install install -m755 libglade-convert "${pkgdir}/usr/bin/" } diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD index dddbeb21e..c04b9767d 100644 --- a/extra/libgnomekbd/PKGBUILD +++ b/extra/libgnomekbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169950 2012-10-30 22:46:37Z heftig $ +# $Id: PKGBUILD 197690 2013-10-28 14:25:11Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomekbd pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-schemas-compile + --disable-schemas-compile --disable-static make } diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD deleted file mode 100644 index 354ced8c4..000000000 --- a/extra/libgtkhtml/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 148828 2012-02-05 11:51:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgtkhtml -pkgver=2.11.1 -pkgrel=4 -pkgdesc="An HTML library for GTK" -arch=(i686 x86_64) -license=('LGPL') -depends=('gtk2>=2.22.1' 'libxml2>=2.7.8') -makedepends=('perlxml') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a1d1a197dcff8c4571659deef5495e24') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD index 9b0537d36..d098af445 100644 --- a/extra/libieee1284/PKGBUILD +++ b/extra/libieee1284/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 150619 2012-02-18 23:03:40Z pierre $ +# $Id: PKGBUILD 197666 2013-10-28 02:14:49Z eric $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Manolis Tzanidakis <manolis@archlinux.org> pkgname=libieee1284 pkgver=0.2.11 -pkgrel=4 -pkgdesc="A library to query devices connected in parallel port." +pkgrel=5 +pkgdesc="A library to query devices connected in parallel port" arch=('i686' 'x86_64') license=('GPL2') url="http://cyberelk.net/tim/libieee1284" depends=('python2') -options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir"/ install } diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD index a268177c5..cfa4b4e4e 100644 --- a/extra/libmpd/PKGBUILD +++ b/extra/libmpd/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 136733 2011-08-31 19:31:16Z eric $ +# $Id: PKGBUILD 197668 2013-10-28 02:28:33Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: tobias <tobias@archlinux.org> pkgname=libmpd pkgver=11.8.17 -pkgrel=1 +pkgrel=2 pkgdesc="Signal based wrapper around libmpdclient" arch=('i686' 'x86_64') url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" license=('GPL') depends=('glib2') -options=('!libtool') source=(http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) md5sums=('5ae3d87467d52aef3345407adb0a2488') build() { - cd "${srcdir}/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD index 4604e91a0..76f3bd7aa 100644 --- a/extra/libofa/PKGBUILD +++ b/extra/libofa/PKGBUILD @@ -1,41 +1,46 @@ -# $Id: PKGBUILD 150605 2012-02-18 22:48:27Z pierre $ +# $Id: PKGBUILD 197670 2013-10-28 02:51:05Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libofa pkgver=0.9.3 -pkgrel=4 +pkgrel=5 pkgdesc="An open-source audio fingerprint by MusicIP" arch=('i686' 'x86_64') url="http://code.google.com/p/musicip-libofa/" license=('GPL2' 'custom') depends=('expat' 'curl' 'fftw') -makedepends=('pkgconfig') -options=('!libtool') source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz" 'gcc-4.patch' 'gcc4.3.patch' 'gcc4.5.patch' - 'libofa-0.9.3-curl-7.21.patch') + 'libofa-0.9.3-curl-7.21.patch' + 'libofa-0.9.3-gcc-4.7.patch') md5sums=('51507d2c4b432bd2755f48d58471696e' 'a6f78b90bd0f4354d022a71c3e58ef6c' 'dd57db13770b8f8d196e8a3d3a50e713' 'c245363368d0e6fa2b4676364b81b74f' - '2e1579d74613cfbb1799d0ab5f1a4cba') + '2e1579d74613cfbb1799d0ab5f1a4cba' + 'a53a0104f9b5bba220322c6d0b68bf96') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p0 -i "${srcdir}/gcc-4.patch" + patch -p1 -i "${srcdir}/gcc4.3.patch" + patch -p1 -i "${srcdir}/gcc4.5.patch" + patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch" + patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ${srcdir}/gcc-4.patch - patch -p1 -i ${srcdir}/gcc4.3.patch - patch -p1 -i ${srcdir}/gcc4.5.patch - patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libofa/libofa-0.9.3-gcc-4.7.patch b/extra/libofa/libofa-0.9.3-gcc-4.7.patch new file mode 100644 index 000000000..c5ab09876 --- /dev/null +++ b/extra/libofa/libofa-0.9.3-gcc-4.7.patch @@ -0,0 +1,22 @@ +diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp +--- libofa-0.9.3/examples/uselame.cpp.gcc47 2012-01-14 09:35:24.343146853 -0600 ++++ libofa-0.9.3/examples/uselame.cpp 2012-01-14 09:35:49.956826634 -0600 +@@ -12,6 +12,7 @@ + #else + #include <sys/wait.h> + #endif ++#include <unistd.h> + + AudioData *loadWaveFile(char *file); + +diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp +--- libofa-0.9.3/examples/wavefile.cpp.gcc47 2012-01-14 09:35:24.344146841 -0600 ++++ libofa-0.9.3/examples/wavefile.cpp 2012-01-14 16:00:54.414981160 -0600 +@@ -11,6 +11,7 @@ + #include "io.h" + #endif + #include <fcntl.h> ++#include <unistd.h> + + static bool readBytes(int fd, unsigned char *buf, int size) { + int ct = 0; diff --git a/extra/lxsplit/PKGBUILD b/extra/lxsplit/PKGBUILD deleted file mode 100644 index 86d8a1a11..000000000 --- a/extra/lxsplit/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 137625 2011-09-10 08:31:27Z pierre $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> - -pkgname=lxsplit -pkgver=0.2.4 -pkgrel=2 -pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version" -arch=('i686' 'x86_64') -url="http://lxsplit.sourceforge.net/" -license=('GPL') -depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz") -md5sums=('ed21a08c167c08d4d81c820782947cb1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -d ${pkgdir}/usr/bin - make INSTALL_PATH=${pkgdir}/usr/bin install -} diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index e7dc2ef53..b62904898 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $ +# $Id: PKGBUILD 197714 2013-10-28 19:33:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr pkgver=4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" @@ -38,7 +38,6 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - chmod 644 "$pkgdir"/usr/lib/*.a ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc" rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \ "$pkgdir/usr/include/nspr/md" diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD index 1e47872f1..eedfaa0cc 100644 --- a/extra/orbit2/PKGBUILD +++ b/extra/orbit2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151081 2012-02-24 18:27:05Z ibiru $ +# $Id: PKGBUILD 197706 2013-10-28 17:41:15Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=orbit2 @@ -8,7 +8,7 @@ pkgdesc="Thin/fast CORBA ORB" arch=('i686' 'x86_64') license=('LGPL' 'GPL') depends=('libidl2') -options=('!libtool' '!makeflags') +options=('!libtool' '!makeflags' 'staticlibs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2) sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550') diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 857fa291d..d55131804 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190813 2013-07-17 15:53:04Z heftig $ +# $Id: PKGBUILD 197716 2013-10-28 19:43:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.16 +pkgver=2.17 pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") -md5sums=('bd7afcd949023ed2f3e9d9294848ad19') +md5sums=('d8b809f6efe3edb33f81d608c932b2ef') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 3d58eeb0d..0466641d2 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $ +# $Id: PKGBUILD 197671 2013-10-28 05:19:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,24 +8,26 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=4.0 -pkgrel=2 +pkgrel=5 arch=(i686 x86_64) url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(GPL LGPL) +license=(LGPL AGPL3) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc + speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing - check) + check git) options=(!emptydirs !libtool) -source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz +source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de pulseaudio.xinit) -sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae' +sha256sums=('SKIP' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') + build() { cd $pkgbase-$pkgver - ./configure --prefix=/usr \ + ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -45,13 +47,13 @@ package_pulseaudio() { depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc libsamplerate webrtc-audio-processing sbc) optdepends=('avahi: zeroconf support' - 'bluez4: bluetooth support' + 'bluez: bluetooth support' 'bluez-libs: bluetooth support' 'gconf: configuration through gconf (paprefs)' 'jack: jack support' 'lirc-utils: infra-red support' 'openssl: RAOP support' - 'python2-pyqt: Equalizer GUI (qpaeq)') + 'python-pyqt: Equalizer GUI (qpaeq)') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install @@ -63,10 +65,9 @@ package_pulseaudio() { sed -e '/autospawn/iautospawn=no' \ -i "$pkgdir/etc/pulse/client.conf" - # Speed up pulseaudio shutdown - # Lower resample quality, saves CPU + # Speed up pulseaudio shutdown so that it exits immediately with + # the last user session (module-systemd-login keeps it alive) sed -e '/exit-idle-time/iexit-idle-time=0' \ - -e '/resample-method/iresample-method=speex-float-0' \ -i "$pkgdir/etc/pulse/daemon.conf" # Disable cork-request module, can result in e.g. media players unpausing @@ -74,20 +75,10 @@ package_pulseaudio() { sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ -i "$pkgdir/usr/bin/start-pulseaudio-x11" - # Make ConsoleKit optional - sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -i "$pkgdir/etc/pulse/default.pa" - - # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - # cap is handled in .install - chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper" - install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \ "$pkgdir/usr/share/zsh/site-functions/_pulseaudio" @@ -125,6 +116,7 @@ package_libpulse() { optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) + license=(LGPL) mv "$srcdir"/libpulse/* "$pkgdir" } diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install index 9de8b0e8f..bed542ca8 100755 --- a/extra/pulseaudio/pulseaudio.install +++ b/extra/pulseaudio/pulseaudio.install @@ -1,9 +1,4 @@ -_common() { - setcap cap_net_raw=ep usr/lib/pulse/proximity-helper 2>/dev/null || chmod +s usr/lib/pulse/proximity-helper -} - post_install() { - _common cat << MES >>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details on configuring your system for PulseAudio. @@ -13,12 +8,11 @@ MES } post_upgrade() { - _common cat << MES >>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync - with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio - may refuse to start due to configuration errors. + daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you + keep them in sync with changes to the packaged files in /etc/pulse/. + Otherwise, PulseAudio may refuse to start due to configuration errors. MES if (( $(vercmp $2 3.0-3) < 0 )); then cat << MES diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index c3d783bf9..76274656d 100755 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193422 2013-08-20 06:10:08Z angvp $ +# $Id: PKGBUILD 197708 2013-10-28 18:10:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,12 +6,13 @@ pkgbase=python-numpy pkgname=('python2-numpy' 'python-numpy') pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Scientific tools for Python" arch=('i686' 'x86_64') license=('custom') url="http://www.numpy.org/" -makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose') +makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose') +options=('staticlibs') source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz) md5sums=('0ab72b3b83528a7ae79c6df9042d61c6') @@ -33,7 +34,7 @@ build() { package_python2-numpy() { depends=('lapack' 'python2') - optdepends=('python-nose: testsuite') + optdepends=('python2-nose: testsuite') _pyver=2.7 @@ -57,6 +58,7 @@ package_python2-numpy() { package_python-numpy() { depends=('lapack' 'python') + optdepends=('python-nose: testsuite') provides=("python3-numpy=${pkgver}") replaces=('python3-numpy') conflicts=('python3-numpy') diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index b872b91ac..24db28655 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $ +# $Id: PKGBUILD 197703 2013-10-28 17:39:46Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -18,13 +18,18 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' 'saned.socket' 'saned.service' - 'network.patch') + 'network.patch' + 'segfault-avahi-fix-kodakio.patch') options=(!libtool) prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch + # fix http://anonscm.debian.org/gitweb/?p=sane/sane-backends.git;a=commit;h=37523b867d411c2f82d08128246be7e38bc9812c + # #37525 + # https://alioth.debian.org/tracker/?group_id=30186&atid=410366&func=detail&aid=314301 + patch -Np1 -i ${srcdir}/segfault-avahi-fix-kodakio.patch } build() { @@ -69,4 +74,5 @@ md5sums=('1ca68e536cd7c1852322822f5f6ac3a4' 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' '3f9fe36b0c4ff0b01b53b1cffa5d9700' - '44e77692c52db15b0f530a1d9a8e1296') + '44e77692c52db15b0f530a1d9a8e1296' + '039524a38af8721f2e97d45e889295ca') diff --git a/extra/sane/segfault-avahi-fix-kodakio.patch b/extra/sane/segfault-avahi-fix-kodakio.patch new file mode 100644 index 000000000..23f9d1ca9 --- /dev/null +++ b/extra/sane/segfault-avahi-fix-kodakio.patch @@ -0,0 +1,98 @@ +From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001 +From: Paul Newall <quandry@ntlworld.com> +Date: Mon, 14 Oct 2013 22:22:53 +0100 +Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners + return unexpected data via avahi auto discovery + +--- + backend/kodakaio.c | 43 ++++++++++++++++++++++++++++++---------- + doc/descriptions/kodakaio.desc | 2 +- + 3 files changed, 37 insertions(+), 12 deletions(-) + +diff --git a/backend/kodakaio.c b/backend/kodakaio.c +index 8c4583a..b442e50 100644 +--- a/backend/kodakaio.c ++++ b/backend/kodakaio.c +@@ -127,7 +127,7 @@ for ubuntu 12.10 + + #define KODAKAIO_VERSION 02 + #define KODAKAIO_REVISION 4 +-#define KODAKAIO_BUILD 6 ++#define KODAKAIO_BUILD 7 + + /* for usb (but also used for net though it's not required). */ + #define MAX_BLOCK_SIZE 32768 +@@ -2184,6 +2184,7 @@ static void resolve_callback( + AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void* userdata) { + ++ AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL; + char *pidkey, *pidvalue; + char *vidkey, *vidvalue; + size_t valuesize; +@@ -2204,20 +2205,40 @@ static void resolve_callback( + avahi_address_snprint(a, sizeof(a), address); + + /* Output short for Kodak ESP */ +- DBG(min(10,DBG_AUTO), "%s:%u %s ", a,port,host_name); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), +- &vidkey, &vidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); +- avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), +- &pidkey, &pidvalue, &valuesize); +- DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ DBG(min(10,DBG_AUTO), "%s:%u %s\n", a,port,host_name); + ++ vid_pair_list = avahi_string_list_find(txt, "vid"); ++ if(vid_pair_list != NULL) { ++ avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s ", vidkey, vidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key vid\n"); ++ ++ pid_pair_list = avahi_string_list_find(txt, "pid"); ++ if(pid_pair_list != NULL) { ++ avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize); ++ DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "failed to find key pid\n"); ++ ++ if(pid_pair_list != NULL && vid_pair_list != NULL) { + ProcessAvahiDevice(name, vidvalue, pidvalue, a); +- avahi_free(vidkey); avahi_free(vidvalue); +- avahi_free(pidkey); avahi_free(pidvalue); ++ } ++ else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n"); ++ ++ if(vid_pair_list != NULL) { ++ avahi_free(vidkey); ++ avahi_free(vidvalue); ++ DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n"); ++ } ++ if(pid_pair_list != NULL) { ++ avahi_free(pidkey); ++ avahi_free(pidvalue); ++ DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n"); ++ } + } + } +- ++ DBG(min(10,DBG_AUTO), "ending resolve_callback\n"); + avahi_service_resolver_free(r); + } + +diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc +index 7882513..5fb18ed 100644 +--- a/doc/descriptions/kodakaio.desc ++++ b/doc/descriptions/kodakaio.desc +@@ -1,6 +1,6 @@ + :backend "kodakaio" + :url "http://sourceforge.net/projects/cupsdriverkodak/" +-:version "2.4.6" ++:version "2.4.7" + :manpage "sane-kodakaio" + :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10" + :devicetype :scanner +-- +1.7.10.4 + diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index a3b18fe7f..1cfb22527 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196663 2013-10-16 09:25:32Z jgc $ +# $Id: PKGBUILD 197688 2013-10-28 13:45:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.22 -pkgrel=1 +pkgver=0.9.23 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" @@ -13,13 +13,13 @@ makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd') backup=('etc/UPower/UPower.conf') options=('!libtool') source=($url/releases/$pkgname-$pkgver.tar.xz - git-fixes.patch) -md5sums=('22b0b13c16ceb1516b5edf5cf0e99d6d' - 'd47377f5f8a02e38f81b6a63d8a19ef3') + linux-clamp-percentage-for-overfull-batteries.patch) +md5sums=('39cfd97bfaf7d30908f20cf937a57634' + 'cd8eeb40c2338d28df46e22529bece62') prepare() { cd $pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch + patch -Np1 -i ../linux-clamp-percentage-for-overfull-batteries.patch } build() { diff --git a/extra/upower/git-fixes.patch b/extra/upower/git-fixes.patch deleted file mode 100644 index 83c407454..000000000 --- a/extra/upower/git-fixes.patch +++ /dev/null @@ -1,112 +0,0 @@ -From e4858d94343bba2afbebcd1a4925c981a38a9579 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 10 Oct 2013 16:32:41 +0000 -Subject: up-client: Really don't overwrite retval with prop values - -db89e5a32bf2c16c0d3d00f6c8f0ef7e5e7efa8f was incomplete and -"ret" was being used instead of prop_val to set some of those -properties. It's likely your laptop would have been seen as -docked for example. ---- -diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c -index 757e4a1..2334a68 100644 ---- a/libupower-glib/up-client.c -+++ b/libupower-glib/up-client.c -@@ -360,7 +360,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - - prop_val = g_value_get_boolean (value) && allowed; - if (prop_val != client->priv->can_suspend) { -- client->priv->can_suspend = ret; -+ client->priv->can_suspend = prop_val; - g_object_notify (G_OBJECT(client), "can-suspend"); - } - -@@ -376,7 +376,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - - prop_val = g_value_get_boolean (value) && allowed; - if (prop_val != client->priv->can_hibernate) { -- client->priv->can_hibernate = ret; -+ client->priv->can_hibernate = prop_val; - g_object_notify (G_OBJECT(client), "can-hibernate"); - } - #endif /* ENABLE_DEPRECATED */ -@@ -388,7 +388,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_is_closed) { -- client->priv->lid_is_closed = ret; -+ client->priv->lid_is_closed = prop_val; - g_object_notify (G_OBJECT(client), "lid-is-closed"); - } - -@@ -399,7 +399,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->on_battery) { -- client->priv->on_battery = ret; -+ client->priv->on_battery = prop_val; - g_object_notify (G_OBJECT(client), "on-battery"); - } - -@@ -410,7 +410,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->on_low_battery) { -- client->priv->on_low_battery = ret; -+ client->priv->on_low_battery = prop_val; - g_object_notify (G_OBJECT(client), "on-low-battery"); - } - -@@ -421,7 +421,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_is_present) { -- client->priv->lid_is_present = ret; -+ client->priv->lid_is_present = prop_val; - g_object_notify (G_OBJECT(client), "lid-is-present"); - } - -@@ -431,8 +431,8 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - goto out; - } - prop_val = g_value_get_boolean (value); -- if (ret != client->priv->is_docked) { -- client->priv->is_docked = ret; -+ if (prop_val != client->priv->is_docked) { -+ client->priv->is_docked = prop_val; - g_object_notify (G_OBJECT(client), "is-docked"); - } - -@@ -443,7 +443,7 @@ up_client_get_properties_sync (UpClient *client, GCancellable *cancellable, GErr - } - prop_val = g_value_get_boolean (value); - if (prop_val != client->priv->lid_force_sleep) { -- client->priv->lid_force_sleep = ret; -+ client->priv->lid_force_sleep = prop_val; - g_object_notify (G_OBJECT(client), "lid-force-sleep"); - } - --- -cgit v0.9.0.2-2-gbebe -From d43ab28a29420a61d031908abbf1d13b2cb35796 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 10 Oct 2013 16:59:08 +0000 -Subject: lib: Fix a small memory leak - -The bus was never unreferenced in the UpWakeups object. ---- -diff --git a/libupower-glib/up-wakeups.c b/libupower-glib/up-wakeups.c -index 3729ad7..ed6bf80 100644 ---- a/libupower-glib/up-wakeups.c -+++ b/libupower-glib/up-wakeups.c -@@ -377,6 +377,8 @@ up_wakeups_finalize (GObject *object) - g_object_unref (wakeups->priv->proxy); - if (wakeups->priv->prop_proxy != NULL) - g_object_unref (wakeups->priv->prop_proxy); -+ if (wakeups->priv->bus) -+ dbus_g_connection_unref (wakeups->priv->bus); - - G_OBJECT_CLASS (up_wakeups_parent_class)->finalize (object); - } --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch new file mode 100644 index 000000000..6e643c42d --- /dev/null +++ b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch @@ -0,0 +1,72 @@ +From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martinpitt@gnome.org> +Date: Tue, 22 Oct 2013 08:02:51 +0000 +Subject: linux: Clamp percentage for overfull batteries + +Some batteries report energy > energy_full and a percentage ("capacity" +attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well +as to avoid setting an out-of-range property which would then become 0%. + +https://launchpad.net/bugs/1240673 +--- +diff --git a/src/linux/integration-test b/src/linux/integration-test +index 8489bf3..4be1922 100755 +--- a/src/linux/integration-test ++++ b/src/linux/integration-test +@@ -442,6 +442,39 @@ class Tests(unittest.TestCase): + self.assertEqual(self.get_dbus_property('OnLowBattery'), False) + self.stop_daemon() + ++ def test_battery_overfull(self): ++ '''battery which reports a > 100% percentage for a full battery''' ++ ++ self.testbed.add_device('power_supply', 'BAT0', None, ++ ['type', 'Battery', ++ 'present', '1', ++ 'status', 'Full', ++ 'current_now', '1000', ++ 'charge_now', '11000000', ++ 'charge_full', '10000000', ++ 'charge_full_design', '11000000', ++ 'capacity', '110', ++ 'voltage_now', '12000000'], []) ++ ++ self.start_daemon() ++ devs = self.proxy.EnumerateDevices() ++ self.assertEqual(len(devs), 1) ++ bat0_up = devs[0] ++ ++ # should clamp percentage ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'), ++ UP_DEVICE_STATE_FULLY_CHARGED) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0) ++ # should adjust EnergyFull to reality, not what the battery claims ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True) ++ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2) ++ self.stop_daemon() ++ + def test_battery_temperature(self): + '''battery which reports temperature''' + +diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c +index 8020277..b953d65 100644 +--- a/src/linux/up-device-supply.c ++++ b/src/linux/up-device-supply.c +@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply) + /* get a precise percentage */ + if (sysfs_file_exists (native_path, "capacity")) { + percentage = sysfs_get_double (native_path, "capacity"); ++ if (percentage < 0.0f) ++ percentage = 0.0f; ++ if (percentage > 100.0f) ++ percentage = 100.0f; + /* for devices which provide capacity, but not {energy,charge}_now */ + if (energy < 0.1f && energy_full > 0.0f) + energy = energy_full * percentage / 100; +-- +cgit v0.9.0.2-2-gbebe |