diff options
Diffstat (limited to 'extra')
152 files changed, 1704 insertions, 827 deletions
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 720073fa1..de97bc77f 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 147696 2012-01-27 07:25:15Z tpowa $ +# $Id: PKGBUILD 166377 2012-09-07 09:11:49Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.25 +pkgver=1.0.26 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('06fe5819020c6684b991dcffc5471304') +md5sums=('2dfa35d28471d721e592b616beedf965') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 59b2238d7..ae5b4f4e8 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163142 2012-07-08 09:30:27Z ibiru $ +# $Id: PKGBUILD 166381 2012-09-07 09:14:25Z tpowa $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins -pkgver=1.0.25 -pkgrel=2 +pkgver=1.0.26 +pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') url="http://www.alsa-project.org" @@ -20,18 +20,12 @@ optdepends=('libpulse: PulseAudio plugin' options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2" alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch - alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch - gcc-4.7.patch) -md5sums=('038c023eaa51171f018fbf7141255185' - '50d9adcda20756d063e676a563c201d9' - '697c6275f678d86ded2e5092d8a154c9' - '3b76ed6c9b59eccca0b33a731641350d') + alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch) build() { cd $pkgname-$pkgver patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch - patch -Np1 -i "$srcdir/gcc-4.7.patch" ./configure --prefix=/usr make } @@ -43,3 +37,6 @@ package() { install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } +md5sums=('4facd408326ef5567a7d4ceb6589e6b0' + '50d9adcda20756d063e676a563c201d9' + '697c6275f678d86ded2e5092d8a154c9') diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 00ccd79cb..c59061818 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157726 2012-04-29 04:09:24Z allan $ +# $Id: PKGBUILD 166379 2012-09-07 09:13:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.25 -pkgrel=3 +pkgver=1.0.26 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -36,7 +36,7 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('f81f9dcb9a014fd32cb3a70066a5b9a9' +md5sums=('4dcf1017fafc91603af96705c073eca9' '2ba1a1cbf653bf1a69f8a720fd6549da' '4c8ae9f976c7df5e271a4cb91ccc7767' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/avfs/PKGBUILD b/extra/avfs/PKGBUILD index 0cfa33f26..55b836a8e 100644 --- a/extra/avfs/PKGBUILD +++ b/extra/avfs/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 151581 2012-02-27 18:31:46Z giovanni $ +# $Id: PKGBUILD 166454 2012-09-08 02:48:18Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> pkgname=avfs -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="A virtual filesystem that allows browsing of compressed files" arch=('i686' 'x86_64' 'mips64el') -license=('GPL') +license=('GPL' 'LGPL') url="http://avf.sourceforge.net/" -source=("http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2" - 'avfs-1.0.0-fix_open_missing_mode.patch') -options=(!emptydirs !libtool) depends=('fuse' 'xz' 'perl') -md5sums=('c58421e4f294125895f2c6653a7366a7' - 'bdd84b179a869bc6d64529a64a640fc6') +options=('!emptydirs' '!libtool') +source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('f0f254d092e54da14bbf3ea22b76da99' + 'd71607de21819f3d67246473f0bc21f3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/avfs-1.0.0-fix_open_missing_mode.patch" - ./configure --prefix=/usr \ --enable-library \ --enable-fuse \ diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index be2512277..46e94de2e 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165274 2012-08-14 20:33:11Z andyrtr $ +# $Id: PKGBUILD 166183 2012-09-05 08:15:25Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.1 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -25,7 +25,7 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00' '9b8467a1e51d360096b70e2c3c081e6c' '3733c23e77eb503bd94cc368e02830dc' '90c30380d4c8cd48a908cfdadae1ea24' - '7d2347b6d444e223f6b7dc6e706b9ffe' + 'b4868b83f7f2d6ec24a1be76509379f0' '9657daa21760bb0b5fa3d8b51d5e01a1' 'f861b18f4446c43918c8643dcbbd7f6d' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch index 0eb5f4af1..83fabdb4f 100644 --- a/extra/cups/cups-systemd-socket.patch +++ b/extra/cups/cups-systemd-socket.patch @@ -1,7 +1,7 @@ -diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in ---- cups-1.5.0/config.h.in.systemd-socket 2011-10-18 15:32:40.741672460 +0100 -+++ cups-1.5.0/config.h.in 2011-10-18 15:32:40.843670530 +0100 -@@ -503,6 +503,13 @@ +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 @@ /* @@ -15,9 +15,9 @@ diff -up cups-1.5.0/config.h.in.systemd-socket cups-1.5.0/config.h.in * Various scripting languages... */ -diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/config-scripts/cups-systemd.m4 ---- cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket 2011-10-18 15:32:40.844670511 +0100 -+++ cups-1.5.0/config-scripts/cups-systemd.m4 2011-10-18 15:33:16.861989058 +0100 +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 @@ -0,0 +1,36 @@ +dnl +dnl "$Id$" @@ -55,18 +55,18 @@ diff -up cups-1.5.0/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.0/con +dnl +dnl "$Id$" +dnl -diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in ---- cups-1.5.0/configure.in.systemd-socket 2010-11-20 01:03:46.000000000 +0000 -+++ cups-1.5.0/configure.in 2011-10-18 15:32:40.844670511 +0100 -@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4) +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 +@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) sinclude(config-scripts/cups-launchd.m4) +sinclude(config-scripts/cups-systemd.m4) sinclude(config-scripts/cups-defaults.m4) - sinclude(config-scripts/cups-pdf.m4) sinclude(config-scripts/cups-scripting.m4) -@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs + +@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs conf/snmp.conf cups-config data/testprint @@ -76,10 +76,10 @@ diff -up cups-1.5.0/configure.in.systemd-socket cups-1.5.0/configure.in desktop/cups.desktop doc/help/ref-cupsd-conf.html doc/help/standard.html -diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c ---- cups-1.5.0/cups/usersys.c.systemd-socket 2011-10-18 15:32:40.645674277 +0100 -+++ cups-1.5.0/cups/usersys.c 2011-10-18 15:32:40.845670492 +0100 -@@ -770,7 +770,7 @@ cups_read_client_conf( +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( struct stat sockinfo; /* Domain socket information */ if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && @@ -88,9 +88,9 @@ diff -up cups-1.5.0/cups/usersys.c.systemd-socket cups-1.5.0/cups/usersys.c cups_server = CUPS_DEFAULT_DOMAINSOCKET; else #endif /* CUPS_DEFAULT_DOMAINSOCKET */ -diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.in ---- cups-1.5.0/data/cups.path.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100 -+++ cups-1.5.0/data/cups.path.in 2011-10-18 15:32:40.846670473 +0100 +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 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool @@ -100,9 +100,9 @@ diff -up cups-1.5.0/data/cups.path.in.systemd-socket cups-1.5.0/data/cups.path.i + +[Install] +WantedBy=multi-user.target -diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.service.in ---- cups-1.5.0/data/cups.service.in.systemd-socket 2011-10-18 15:32:40.846670473 +0100 -+++ cups-1.5.0/data/cups.service.in 2011-10-18 15:32:40.846670473 +0100 +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 @@ -0,0 +1,10 @@ +[Unit] +Description=CUPS Printing Service @@ -114,25 +114,22 @@ diff -up cups-1.5.0/data/cups.service.in.systemd-socket cups-1.5.0/data/cups.ser +[Install] +Also=cups.socket cups.path +WantedBy=printer.target -diff -up cups-1.5.0/data/cups.socket.in.systemd-socket cups-1.5.0/data/cups.socket.in ---- cups-1.5.0/data/cups.socket.in.systemd-socket 2011-10-18 15:32:40.847670454 +0100 -+++ cups-1.5.0/data/cups.socket.in 2011-10-18 15:32:40.847670454 +0100 -@@ -0,0 +1,11 @@ +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 +@@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printing Service Sockets + +[Socket] +ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@ -+ListenStream=631 -+ListenDatagram=0.0.0.0:631 -+BindIPv6Only=ipv6-only + +[Install] +WantedBy=sockets.target -diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile ---- cups-1.5.0/data/Makefile.systemd-socket 2011-05-12 06:21:56.000000000 +0100 -+++ cups-1.5.0/data/Makefile 2011-10-18 15:32:40.847670454 +0100 -@@ -112,6 +112,12 @@ install-data: +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 +@@ -100,6 +100,12 @@ install-data: $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ done $(INSTALL_DIR) -m 755 $(DATADIR)/profiles @@ -145,8 +142,8 @@ diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile # -@@ -159,6 +165,9 @@ uninstall: - -$(RMDIR) $(DATADIR)/charsets +@@ -143,6 +149,9 @@ uninstall: + -$(RMDIR) $(DATADIR)/data -$(RMDIR) $(DATADIR)/banners -$(RMDIR) $(DATADIR) + for file in $(SYSTEMD_UNITS); do \ @@ -155,10 +152,10 @@ diff -up cups-1.5.0/data/Makefile.systemd-socket cups-1.5.0/data/Makefile # -diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in ---- cups-1.5.0/Makedefs.in.systemd-socket 2011-10-18 15:32:40.719672876 +0100 -+++ cups-1.5.0/Makedefs.in 2011-10-18 15:32:40.848670435 +0100 -@@ -143,6 +143,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ +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@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ @@ -166,15 +163,13 @@ diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in DNSSD_BACKEND = @DNSSD_BACKEND@ DSOFLAGS = -L../cups @DSOFLAGS@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) -@@ -151,6 +152,7 @@ FONTS = @FONTS@ - IMGLIBS = @IMGLIBS@ - IMGFILTERS = @IMGFILTERS@ + DNSSDLIBS = @DNSSDLIBS@ LAUNCHDLIBS = @LAUNCHDLIBS@ +SDLIBS = @SDLIBS@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -@@ -267,6 +269,7 @@ PAMFILE = @PAMFILE@ +@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@ DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@ DBUSDIR = @DBUSDIR@ @@ -182,10 +177,10 @@ diff -up cups-1.5.0/Makedefs.in.systemd-socket cups-1.5.0/Makedefs.in # -diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/client.h ---- cups-1.5.0/scheduler/client.h.systemd-socket 2011-03-25 21:25:38.000000000 +0000 -+++ cups-1.5.0/scheduler/client.h 2011-10-18 15:32:40.848670435 +0100 -@@ -75,6 +75,9 @@ typedef struct +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 +@@ -77,6 +77,9 @@ typedef struct int fd; /* File descriptor for this server */ http_addr_t address; /* Bind address of socket */ http_encryption_t encryption; /* To encrypt or not to encrypt... */ @@ -195,9 +190,9 @@ diff -up cups-1.5.0/scheduler/client.h.systemd-socket cups-1.5.0/scheduler/clien } cupsd_listener_t; -diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/listen.c ---- cups-1.5.0/scheduler/listen.c.systemd-socket 2011-04-16 00:38:13.000000000 +0100 -+++ cups-1.5.0/scheduler/listen.c 2011-10-18 15:32:40.849670416 +0100 +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 @@ -401,7 +401,11 @@ cupsdStopListening(void) lis; lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) @@ -211,9 +206,9 @@ diff -up cups-1.5.0/scheduler/listen.c.systemd-socket cups-1.5.0/scheduler/liste { #ifdef WIN32 closesocket(lis->fd); -diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c ---- cups-1.5.0/scheduler/main.c.systemd-socket 2011-10-18 15:32:40.802671306 +0100 -+++ cups-1.5.0/scheduler/main.c 2011-10-18 15:32:40.851670379 +0100 +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 @@ -26,6 +26,8 @@ * launchd_checkin() - Check-in with launchd and collect the listening * fds. @@ -244,7 +239,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c static void parent_handler(int sig); static void process_children(void); static void sigchld_handler(int sig); -@@ -537,6 +546,13 @@ main(int argc, /* I - Number of comm +@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -258,7 +253,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c /* * Startup the server... */ -@@ -759,6 +775,15 @@ main(int argc, /* I - Number of comm +@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm } #endif /* HAVE_LAUNCHD */ @@ -274,7 +269,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c /* * Startup the server... */ -@@ -1584,6 +1609,100 @@ launchd_checkout(void) +@@ -1516,6 +1541,102 @@ launchd_checkout(void) } #endif /* HAVE_LAUNCHD */ @@ -306,14 +301,16 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c + char s[256]; + + r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1); -+ if (r < 0) { ++ if (r < 0) ++ { + cupsdLogMessage(CUPSD_LOG_ERROR, + "systemd_checkin: Unable to verify socket type - %s", + strerror(-r)); + continue; + } + -+ if (!r) { ++ if (!r) ++ { + cupsdLogMessage(CUPSD_LOG_ERROR, + "systemd_checkin: Socket not of the right type"); + continue; @@ -327,7 +324,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c + continue; + } + -+ /* ++ /* + * Try to match the systemd socket address to one of the listeners... + */ + @@ -335,7 +332,7 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c + lis; + lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) + if (httpAddrEqual(&lis->address, &addr)) -+ break; ++ break; + + if (lis) + { @@ -375,10 +372,10 @@ diff -up cups-1.5.0/scheduler/main.c.systemd-socket cups-1.5.0/scheduler/main.c /* * 'parent_handler()' - Catch USR1/CHLD signals... -diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makefile ---- cups-1.5.0/scheduler/Makefile.systemd-socket 2011-10-18 15:32:40.817671022 +0100 -+++ cups-1.5.0/scheduler/Makefile 2011-10-18 15:32:40.852670360 +0100 -@@ -382,7 +382,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu +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 $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \ @@ -387,12 +384,12 @@ diff -up cups-1.5.0/scheduler/Makefile.systemd-socket cups-1.5.0/scheduler/Makef cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... -@@ -390,7 +390,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a +@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \ $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \ - $(LIBWRAP) -+ $(LIBWRAP) $(SDLIBS) ++ $(LIBWRAP) $(SDLIBS) + tls.o: tls-darwin.c tls-gnutls.c tls-openssl.c - # diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD index f92060fe9..8522b5316 100644 --- a/extra/ebook-tools/PKGBUILD +++ b/extra/ebook-tools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143766 2011-11-29 01:07:45Z giovanni $ +# $Id: PKGBUILD 166337 2012-09-06 15:49:53Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=ebook-tools -pkgver=0.2.1 -pkgrel=4 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Tools for accessing and converting various ebook file formats" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/ebook-tools/" @@ -11,7 +11,7 @@ license=('custom') depends=('libzip' 'libxml2' 'convertlit') makedepends=('pkgconfig' 'cmake') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('cabbd2ef9148a61ca5f6e60ca63e6045') +md5sums=('67bce67ceb72dcc3578d6a81ef92b29b') build() { cd "${srcdir}" diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD index 6d48f77bd..0261aaf7d 100644 --- a/extra/facile/PKGBUILD +++ b/extra/facile/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 135660 2011-08-17 06:53:34Z tpowa $ +# $Id: PKGBUILD 166401 2012-09-07 16:46:16Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=facile pkgver=1.1 -pkgrel=13 +pkgrel=14 pkgdesc="A Functional Constraint Library" arch=(i686 x86_64 'mips64el') url="http://www.recherche.enac.fr/opti/facile/" license="LGPL" makedepends=('ocaml') depends=() -source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz) +source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz + ocaml-facile-ocaml-4.patch) + md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e') build() { cd $startdir/src/$pkgname-$pkgver + # fix ocaml4 + patch -Np1 -i ../ocaml-facile-ocaml-4.patch ./configure make || return 1 mkdir -p $startdir/pkg/usr/lib/ocaml/facile cd src install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a $startdir/pkg/usr/lib/ocaml/facile } +md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e' + '1ffc2f08c9f1db8ef0d444ec06f82b79') diff --git a/extra/facile/ocaml-facile-ocaml-4.patch b/extra/facile/ocaml-facile-ocaml-4.patch new file mode 100644 index 000000000..6006a16ba --- /dev/null +++ b/extra/facile/ocaml-facile-ocaml-4.patch @@ -0,0 +1,25 @@ +diff -ur facile-1.1.old/src/facile.mli facile-1.1/src/facile.mli +--- facile-1.1.old/src/facile.mli 2004-09-08 10:51:02.000000000 +0100 ++++ facile-1.1/src/facile.mli 2012-06-10 21:06:41.553916954 +0100 +@@ -127,7 +127,7 @@ + module Hashtbl : + sig + type ('a, 'b) t +- val create : int -> ('a, 'b) t ++ val create : ?random:bool -> int -> ('a, 'b) t + val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t + val add : ('a, 'b) t -> 'a -> 'b -> unit + val find : ('a, 'b) t -> 'a -> 'b +Binary files facile-1.1.old/src/fcl_data.cmi and facile-1.1/src/fcl_data.cmi differ +diff -ur facile-1.1.old/src/fcl_data.mli facile-1.1/src/fcl_data.mli +--- facile-1.1.old/src/fcl_data.mli 2004-09-08 10:51:02.000000000 +0100 ++++ facile-1.1/src/fcl_data.mli 2012-06-10 21:06:25.841590828 +0100 +@@ -23,7 +23,7 @@ + + module Hashtbl : sig + type ('a, 'b) t +- val create : int -> ('a, 'b) t ++ val create : ?random:bool -> int -> ('a, 'b) t + val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t + val add : ('a, 'b) t -> 'a -> 'b -> unit + val find : ('a, 'b) t -> 'a -> 'b diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 5835a6438..401338a03 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160935 2012-06-07 06:29:24Z pierre $ +# $Id: PKGBUILD 166406 2012-09-07 16:52:15Z pierre $ pkgname=fetchmail -pkgver=6.3.21 -pkgrel=4 +pkgver=6.3.22 +pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64' 'mips64el') url="http://fetchmail.berlios.de/" @@ -14,11 +14,11 @@ optdepends=('tk: for using fetchmailconf' backup=('etc/conf.d/fetchmail') options=('!makeflags') install='fetchmail.install' -source=("http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz.asc" +source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz" + "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81' - 'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059' +sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19' + '27184b75ef09c5202bede9863ae8abc3d0cdb1d2' 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' '30401729386d6f774c6c36ab8530842166de54a8' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 03bfc38b9..849426577 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $ +# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=fontconfig -pkgver=2.8.0 +pkgver=2.10.1 pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') @@ -11,27 +12,43 @@ depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz - 29-replace-bitmap-fonts.conf - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - 'f6b67e8cc79197ed6abd4701911e83da' - '51bc6cb633b50f3c28793361738aac5b') + 29-replace-bitmap-fonts.conf) +md5sums=('c94e380eea42f2f23ca9537035ef1899' + 'f6b67e8cc79197ed6abd4701911e83da') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/30-urw-aliases.patch" - # enable Position Independent Code for prelinking - export CFLAGS="$CFLAGS -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + + # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well + libtoolize -f + autoreconf -f + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-templatedir=/etc/fonts/conf.avail \ + --with-xmldir=/etc/fonts \ + --localstatedir=/var \ + --disable-static \ + --with-default-fonts=/usr/share/fonts \ + --with-add-fonts=/usr/share/fonts make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \ - "$pkgdir/etc/fonts/conf.avail" - rm -f "$pkgdir"/etc/fonts/conf.d/*.conf + + # not upstream, not in FC and not in Gentoo, this should probably go upstream + # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back + install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" + pushd $pkgdir/etc/fonts/conf.d + ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . + popd #Install license install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" diff --git a/extra/fontconfig/fontconfig.install b/extra/fontconfig/fontconfig.install index 20feb6e52..3a0ca573b 100644 --- a/extra/fontconfig/fontconfig.install +++ b/extra/fontconfig/fontconfig.install @@ -1,100 +1,39 @@ -configs=('20-fix-globaladvance.conf' - '20-unhint-small-vera.conf' - '29-replace-bitmap-fonts.conf' - '30-metric-aliases.conf' - '30-urw-aliases.conf' - '40-nonlatin.conf' - '45-latin.conf' - '49-sansserif.conf' - '50-user.conf' - '51-local.conf' - '60-latin.conf' - '65-fonts-persian.conf' - '65-nonlatin.conf' - '69-unifont.conf' - '80-delicious.conf' - '90-synthetic.conf') - post_install() { - echo -n "updating font cache... " - /sbin/ldconfig -r . - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - /usr/bin/fc-cache -f - echo "done." -} - -post_upgrade() { - rm -f /etc/fonts/conf.d/10-bitmaps.conf cat << _EOF - -===> Important Fontconfig configuration change <=== - - The way fontconfig is configured has been changed. - Configuration is done via /etc/fonts/conf.avail and conf.d. + + Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d. Read /etc/fonts/conf.d/README for more information. Configuration via /etc/fonts/local.conf is still possible, but is no longer recommended for options available in conf.avail. -_EOF - - if [ `vercmp 2.4.1-1 $2` -gt 0 ]; then - # Upgrade from old version, place all symlinks. pre-symlink package version - echo -n "Linking configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - ln -sf ../conf.avail/${config} . - done - popd > /dev/null - echo "done." - fi + Main systemwide configuration should be done by symlinks + (especially for autohinting, sub-pixel and lcdfilter): + + cd /etc/fonts/conf.d + ln -s ../conf.avail/XX-foo.conf + + Check also https://wiki.archlinux.org/index.php/Font_Configuration + and https://wiki.archlinux.org/index.php/Fonts. - if [ `vercmp 2.6.0-1 $2` -gt 0 ]; then - # pre-2.6.0 versions have missing config - echo -n "Adding missing configuration files... " - pushd /etc/fonts/conf.d > /dev/null - ln -sf ../conf.avail/30-metric-aliases.conf . - ln -sf ../conf.avail/40-nonlatin.conf . - ln -sf ../conf.avail/45-latin.conf . - popd > /dev/null - echo "done." - fi +_EOF - # Remove dead links - echo -n "Removing outdated configuration files... " - for config in /etc/fonts/conf.d/*; do - if [ ! -f ${config} ]; then - rm -f ${config} - fi - done - echo "done." - echo -n "updating font cache... " /usr/bin/fc-cache -f echo "done." } -pre_upgrade() { - # Link new config files not present on system yet - echo -n "Symlinking new configuration files... " - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - if [ ! -f ../conf.avail/${config} ]; then - ln -sf ../conf.avail/${config} . - fi - done - popd > /dev/null +post_upgrade() { + echo -n "updating font cache... " + /usr/bin/fc-cache -f echo "done." } post_remove() { - pushd /etc/fonts/conf.d > /dev/null - for config in "${configs[@]}"; do - rm -f ${config} - done - popd > /dev/null + cat << _EOF + + Check for dead symlinks and leftover files + in /etc/fonts/conf.d/ + +_EOF } diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index f6cc28265..c512c1dcd 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165451 2012-08-20 08:01:40Z giovanni $ +# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('3260bdc49e72ccc9dc63b1e2fb02eae5') +md5sums=('a4bc97804e630dbf26dfac8f28c78091') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 0929464eb..10991fe47 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163149 2012-07-08 09:31:09Z ibiru $ +# $Id: PKGBUILD 166461 2012-09-08 07:12:58Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" @@ -15,11 +15,13 @@ optdepends=('openexr: for using the openexr plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff) +sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' + 'c10fd988c634fcf0948cc91a51d6528f6f1704ba') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff new file mode 100644 index 000000000..a33ec6f7f --- /dev/null +++ b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff @@ -0,0 +1,12 @@ +diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c +--- gegl-0.2.0/operations/external/ff-load.c 2012-04-01 13:17:57.000000000 +0200 ++++ gegl-0.2.0-1/operations/external/ff-load.c 2012-07-11 12:42:05.174756560 +0200 +@@ -271,7 +271,7 @@ + gint err; + + ff_cleanup (o); +- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL); ++err = avformat_open_input (&p->ic, o->path, NULL, NULL); + if (err < 0) + { + print_error (o->path, err); diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 88eddf819..af3987c78 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 159779 2012-05-26 19:57:17Z daniel $ +# $Id: PKGBUILD 166463 2012-09-08 07:14:12Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gimp -pkgver=2.8.0 -pkgrel=2 +pkgver=2.8.2 +pkgrel=1 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gimp.org/" license=('GPL' 'LGPL') depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \ 'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl') -makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl') +makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript') optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' 'libwebkit: for the help browser' 'poppler-glib: for pdf support' 'alsa-lib: for MIDI event controller module' - 'curl: for URI support') + 'curl: for URI support' + 'ghostscript: for postscript support') options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl uri-backend-libcurl.patch) -md5sums=('28997d14055f15db063eb92e1c8a7ebb' +md5sums=('b542138820ca3a41cbd63fc331907955' 'bb27bc214261d36484093e857f015f38' 'e894f4b2ffa92c71448fdd350e9b78c6') diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 415e603af..39bd6c1cb 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,32 +3,33 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz - fix_firefox_crash.diff) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' - '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') +makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) +sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { - cd "${srcdir}"/icedtea-web* - - # fix firefox crash - https://bugs.archlinux.org/task/30969 - patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff - - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz + cd "${srcdir}"/icedtea-web* ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ - --with-jdk-home=${_jvmdir} + --with-jdk-home=${_jvmdir} \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 make } diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 3fa7d8e9e..728c30756 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 164729 2012-08-04 08:45:39Z andyrtr $ +# $Id: PKGBUILD 166335 2012-09-06 15:46:37Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') -makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - fix_firefox_crash.diff) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' - '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') +makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') +noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f') _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { - cd "$srcdir/$pkgname-$pkgver" + # extract it + cd "$srcdir" + LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz - # fix firefox crash - https://bugs.archlinux.org/task/30969 - patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff - - ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ - --datarootdir=/usr/share + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=${_jvmdir} \ + --datarootdir=/usr/share \ + --with-browser-tests \ + --with-firefox=/usr/bin/firefox \ + --with-chromium=/usr/bin/chromium \ + --with-epiphany=/usr/bin/epiphany \ + --with-gtk=2 make } diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 04fb89499..f4005ea97 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,8 +2,7 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -_realver=1.0.3 -pkgver=1.0.3.20110809 +pkgver=1.0.4 pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') @@ -12,27 +11,23 @@ license=('GPL') depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) backup=(etc/conf.d/irqbalance) -source=(http://irqbalance.googlecode.com/files/irqbalance-$_realver.tar.gz - irqbalance-2011-08-09.patch +source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.bz2 irqbalance.conf.d irqbalance.rc.d irqbalance.service) -md5sums=('6f246481d6295bcb9a79751c03207c96' - '49a5669fc3eb452a5d24abec887f0a6a' +md5sums=('f7ca283c46331db73f27e686a643dcfb' '336c1ee99818f9ecda1687e34c69fd6b' 'fb82fc5d267d39110baf720d81282a7c' '9e82dc471128117982a8dd0c4bd5f246') build() { - cd "$srcdir/$pkgname-$_realver" - patch -Np1 < ../irqbalance-2011-08-09.patch - autoreconf -fi + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$_realver" + cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 0b9db7c87..071ac83fb 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164844 2012-08-06 23:13:12Z andrea $ +# $Id: PKGBUILD 166203 2012-09-05 18:26:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d7c3b9bd2d4ec4b64e208d02571eb62f9ac4ee90') +sha1sums=('f216d37e961f46f5830fb15d65c71a9c322cebfa') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index c031b4ce3..d69aac548 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164868 2012-08-06 23:15:44Z andrea $ +# $Id: PKGBUILD 166227 2012-09-05 18:29:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('2e5218951425e32d725001f4836283a2d2ac412f') +sha1sums=('f9edb471a3245f3d2e429d5d2140954673f97a9c') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 61770576d..227122551 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 164869 2012-08-06 23:15:48Z andrea $ +# $Id: PKGBUILD 166228 2012-09-05 18:29:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Provides accessibility services like focus tracking and a screenreader' -url='http://accessibility.kde.org/' +url='https://projects.kde.org/projects/kde/kdeaccessibility/kaccessible' license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('a13180088fae411aa03ec3f2125ed766cd807160') +sha1sums=('8715188d1e3c01f204409bad2bad6d0f30a3f39a') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index 1c4a06afd..c4bbe93fc 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164870 2012-08-06 23:15:54Z andrea $ +# $Id: PKGBUILD 166229 2012-09-05 18:29:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('32a2b02c78f3f3dac33df72dbeaf0c18ddf91269') +sha1sums=('9205eba59c39f9d9e0a38c8424bdde73cb43a174') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index a986abb46..cb17a5b55 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164871 2012-08-06 23:15:59Z andrea $ +# $Id: PKGBUILD 166230 2012-09-05 18:29:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('ea14b338f3f078fdffb3f7b0f69ebbddcc4b016d') +sha1sums=('ca977db4f5cbaa6ca99adb21ce6b16306f94de6b') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index d7ca95850..7da59ef1e 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164872 2012-08-06 23:16:04Z andrea $ +# $Id: PKGBUILD 166231 2012-09-05 18:29:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('cfd00c317c5928b355ef095c3d46ed7ed581afeb') +sha1sums=('fae5e95a1d65a2e4b0a695969c159d6bb75283ef') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 2e1e4ffe9..a833aa3c6 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164959 2012-08-07 15:57:09Z andrea $ +# $Id: PKGBUILD 166232 2012-09-05 18:29:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,15 +7,15 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.9.0 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('d584265701d1fd17e98f756a21dd5a21a02df4a3' +sha1sums=('9c544f883c5116a928027944fce7a21715c421f3' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 8855b61e1..8f042a6ff 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164874 2012-08-06 23:16:15Z andrea $ +# $Id: PKGBUILD 166233 2012-09-05 18:29:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('d4531e0ba2fff19d74b1486390843da5d470117f') +sha1sums=('95a6aac7e6e39a1618de1452ef5d0bb1cb8c9956') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 5dc99584a..0c6aff6c1 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164875 2012-08-06 23:16:19Z andrea $ +# $Id: PKGBUILD 166234 2012-09-05 18:30:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('4ee3d7da93512788959f4d52e58d7a98c646e854') +sha1sums=('57af84c4fc441dfc3bcea9eef96b6283a3a8322e') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 092e48b02..3c435fcf0 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164857 2012-08-06 23:14:44Z andrea $ +# $Id: PKGBUILD 166216 2012-09-05 18:28:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.9.0 -pkgrel=1 +pkgver=4.9.1 +pkgrel=3 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -29,8 +29,9 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('fa614c7f59a43e24e09229374c4193eea86f6865' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-freeze.patch') +sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' @@ -38,13 +39,17 @@ sha1sums=('fa614c7f59a43e24e09229374c4193eea86f6865' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + '820135367cc577a8557061b9844d3ce4a5fde90f') build() { cd "${srcdir}"/${_pkgname}-${pkgver} patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG 306260 + patch -p1 -i "${srcdir}"/fix-freeze.patch cd "${srcdir}" mkdir build diff --git a/extra/kdebase-workspace/fix-freeze.patch b/extra/kdebase-workspace/fix-freeze.patch new file mode 100644 index 000000000..1926baebc --- /dev/null +++ b/extra/kdebase-workspace/fix-freeze.patch @@ -0,0 +1,56 @@ +diff --git a/kwin/tabbox/clientmodel.cpp b/kwin/tabbox/clientmodel.cpp +index 9591bab..a67d979 100644 +--- a/kwin/tabbox/clientmodel.cpp ++++ b/kwin/tabbox/clientmodel.cpp +@@ -188,7 +188,7 @@ void ClientModel::createClientList(int desktop, bool partialReset) + switch(tabBox->config().clientSwitchingMode()) { + case TabBoxConfig::FocusChainSwitching: { + TabBoxClient* c = start; +- if (!c) { ++ if (!tabBox->isInFocusChain(c)) { + QSharedPointer<TabBoxClient> firstClient = tabBox->firstClientFocusChain().toStrongRef(); + if (firstClient) { + c = firstClient.data(); +diff --git a/kwin/tabbox/tabbox.cpp b/kwin/tabbox/tabbox.cpp +index d96d0bd..7a08d37 100644 +--- a/kwin/tabbox/tabbox.cpp ++++ b/kwin/tabbox/tabbox.cpp +@@ -112,6 +112,14 @@ QWeakPointer< TabBoxClient > TabBoxHandlerImpl::firstClientFocusChain() const + } + } + ++bool TabBoxHandlerImpl::isInFocusChain(TabBoxClient *client) const ++{ ++ if (TabBoxClientImpl *c = static_cast<TabBoxClientImpl*>(client)) { ++ return Workspace::self()->globalFocusChain().contains(c->client()); ++ } ++ return false; ++} ++ + int TabBoxHandlerImpl::nextDesktopFocusChain(int desktop) const + { + return m_tabBox->nextDesktopFocusChain(desktop); +diff --git a/kwin/tabbox/tabbox.h b/kwin/tabbox/tabbox.h +index 6652f93..bba0b39 100644 +--- a/kwin/tabbox/tabbox.h ++++ b/kwin/tabbox/tabbox.h +@@ -52,6 +52,7 @@ public: + virtual QString desktopName(int desktop) const; + virtual QWeakPointer< TabBoxClient > nextClientFocusChain(TabBoxClient* client) const; + virtual QWeakPointer< TabBoxClient > firstClientFocusChain() const; ++ virtual bool isInFocusChain (TabBoxClient* client) const; + virtual int nextDesktopFocusChain(int desktop) const; + virtual int numberOfDesktops() const; + virtual TabBoxClientList stackingOrder() const; +diff --git a/kwin/tabbox/tabboxhandler.h b/kwin/tabbox/tabboxhandler.h +index 7abddfc..d9a6122 100644 +--- a/kwin/tabbox/tabboxhandler.h ++++ b/kwin/tabbox/tabboxhandler.h +@@ -119,6 +119,7 @@ public: + * @since 4.9.1 + **/ + virtual QWeakPointer<TabBoxClient> firstClientFocusChain() const = 0; ++ virtual bool isInFocusChain(TabBoxClient* client) const = 0; + /** + * @param client The client whose desktop name should be retrieved + * @return The desktop name of the given TabBoxClient. If the client is diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 20aaca793..96fae60dd 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164858 2012-08-06 23:14:55Z andrea $ +# $Id: PKGBUILD 166217 2012-09-05 18:28:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konq-plugins' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('f5c358e3c7902b15328908a9966f98774827988e') +sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 3aab0f727..1ccc6c5eb 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164876 2012-08-06 23:16:23Z andrea $ +# $Id: PKGBUILD 166235 2012-09-05 18:30:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('5c196ced2b07e58ecdc66e779f21e4c412da8b4b') +sha1sums=('08b1a43eb800de1ad1ed7a0a147e6c73b3928bd8') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index b08d5b5b1..ab0ba8902 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164877 2012-08-06 23:16:29Z andrea $ +# $Id: PKGBUILD 166236 2012-09-05 18:30:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('7c97b549bb6958223fc0b28f657fec09bb95b7e5' +sha1sums=('ea22f9bddd7450e15f6dcf3d7f243874f664bc71' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 30f772157..f18d2a699 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164878 2012-08-06 23:16:32Z andrea $ +# $Id: PKGBUILD 166237 2012-09-05 18:30:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('fb6bb9e50d9ec03a86f29f44e9433c521d29761c') +sha1sums=('d97c6ab445ab209d41a817eeebbfa42461c2511a') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 5745fb91e..2623bc1b5 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164879 2012-08-06 23:16:36Z andrea $ +# $Id: PKGBUILD 166238 2012-09-05 18:30:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('cc716e7b285efc8c90a086d8881a7e9ff0d49263') +sha1sums=('9a4e298770152a9ed903eff22048021e19e5f257') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 572903a46..eab7c5fa6 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164852 2012-08-06 23:14:00Z andrea $ +# $Id: PKGBUILD 166211 2012-09-05 18:27:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('c51a788cee16f6222e70c96361083581fad1fb51') +sha1sums=('9800056ce7e2ced8d8487776e7ecb58d3bf87370') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 74634169f..78ad6a0eb 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164853 2012-08-06 23:14:04Z andrea $ +# $Id: PKGBUILD 166212 2012-09-05 18:27:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('eb51fcadd14a184895195be822e4ed704e74d3ed') +sha1sums=('b1066dc30d59ddfb16db3f7e1ee11a2f9895dfca') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 8b4038d85..c9692a129 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164855 2012-08-06 23:14:14Z andrea $ +# $Id: PKGBUILD 166214 2012-09-05 18:27:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('04146719f7e6e2001a1f2318b5a45d47f58ac0b3') +sha1sums=('6362e3e1e65085cda1c8b2793ba7105150ec989d') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 9bfe31bb9..b856b47bd 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164854 2012-08-06 23:14:08Z andrea $ +# $Id: PKGBUILD 166213 2012-09-05 18:27:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('91e43ce4a1860e186fd93fdfec0bbe2da10133ac') +sha1sums=('a5a6b42a7c37c554fa67dcd9a9439c4d32a6c59a') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 7c205e7a1..e912d818c 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164847 2012-08-06 23:13:29Z andrea $ +# $Id: PKGBUILD 166206 2012-09-05 18:27:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('7470301b856703a365cf8bbd43d0f297ef4fff08') +sha1sums=('d73bd72550a644f073b94258591fe2c7c742360b') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index f4aae2950..c068911d9 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164851 2012-08-06 23:13:56Z andrea $ +# $Id: PKGBUILD 166210 2012-09-05 18:27:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -16,7 +16,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdegraphics-okular: Okular bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('ab796e48995560a59d1f741e9e2125eaa4263aa5') +sha1sums=('ae611a3571306fe77fba5799ac8da4017633c84e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index b800ddbd8..c17232447 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164848 2012-08-06 23:13:35Z andrea $ +# $Id: PKGBUILD 166207 2012-09-05 18:27:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('d9c0b21882263e038cdb3de9d0e99ecbf2df7986') +sha1sums=('db56b4a6b4380a61735a4dd5366af75ad4901475') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 73ed9d8d7..0ccf311b7 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164865 2012-08-06 23:15:30Z andrea $ +# $Id: PKGBUILD 166224 2012-09-05 18:29:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('942057e56709288ade435f37f9cd2d63a1496e06') +sha1sums=('b69134548d366f705b8854f8da222758f2d6a0ef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 3ce1a536a..7093e5697 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164880 2012-08-06 23:16:42Z andrea $ +# $Id: PKGBUILD 166239 2012-09-05 18:30:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('5debedb870be8d4f2ee7a129c104c193864e907e') +sha1sums=('874596bfccf8e675667c8a5ffe4d104850752c13') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index f7e3fa3ce..23f45b5b7 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164881 2012-08-06 23:16:48Z andrea $ +# $Id: PKGBUILD 166240 2012-09-05 18:30:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('2d97209780542b6d2081d2c6f855c3a3751dd0e1') +sha1sums=('03e8344bdc258412550d5617424a1fcd8a762e16') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index b39d8fa04..576c49f6b 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164882 2012-08-06 23:16:53Z andrea $ +# $Id: PKGBUILD 166241 2012-09-05 18:30:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('38a49f91dc4391868053efd1735582e86c879d01') +sha1sums=('15727b87d3951b95ef839dd6bb58dcf193f8fb5c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 8c0955a7f..09abb5c67 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164883 2012-08-06 23:16:58Z andrea $ +# $Id: PKGBUILD 166242 2012-09-05 18:30:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('da8c782a9e758a860a76204435aaeab15f5edd64') +sha1sums=('7a043108edb23a2d857622e44ffb51cf3e870530') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 8470a6dcc..f097d3d8e 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164884 2012-08-06 23:17:04Z andrea $ +# $Id: PKGBUILD 166243 2012-09-05 18:30:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('b7dba4d67a119039bf7eea1abfbcca079ff9c04c') +sha1sums=('78961fcd7ee14991be5d3e79068bf0651b86ba3d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index f25236a34..712bd9828 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164885 2012-08-06 23:17:09Z andrea $ +# $Id: PKGBUILD 166244 2012-09-05 18:30:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('177d4410ab596baf80c046caf1207b65a82944c8') +sha1sums=('a4e4ede1732838e596d1a4f2db054b21ce3bc799') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index a09112f00..934152d39 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164886 2012-08-06 23:17:15Z andrea $ +# $Id: PKGBUILD 166245 2012-09-05 18:30:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('5cedfb17606878dbc8900a11f846f6baa558bb66') +sha1sums=('a5c817949b35f8001a2489d0fabadddcbc7646df') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index a407b6387..e22b4820d 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164887 2012-08-06 23:17:20Z andrea $ +# $Id: PKGBUILD 166246 2012-09-05 18:31:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('a8a5f3250bcb73def0ddd670f27b30f2a4621b19') +sha1sums=('3b07235ff8aa419cc6971c14791e56a15c10d39a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 6edf32a14..844287097 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164888 2012-08-06 23:17:26Z andrea $ +# $Id: PKGBUILD 166247 2012-09-05 18:31:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('170616856665f4a0ca8413f6bb9185ca54ee98d4') +sha1sums=('ab4382d1b463569eba87efc7fbf9b12d08b236a7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index a9b742534..144a40d0b 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164889 2012-08-06 23:17:31Z andrea $ +# $Id: PKGBUILD 166248 2012-09-05 18:31:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('60729b6df981d6102266eb159359827a58d34c7f') +sha1sums=('0a1b4228cc05d8bf185af5a929e864c541f6e0bf') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index facc9f97b..c67ad5a16 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164890 2012-08-06 23:17:37Z andrea $ +# $Id: PKGBUILD 166249 2012-09-05 18:31:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('fef07c9bd7f0f0a7ffe96274e8d09fcddd06e691') +sha1sums=('f52621b525ba2d2598fc119cb121e96780c87f60') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 2ae18ec60..607a212a7 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164891 2012-08-06 23:17:42Z andrea $ +# $Id: PKGBUILD 166250 2012-09-05 18:31:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('fcae6ed767ea6effac98cda2f3be79c41a538ce8') +sha1sums=('7118af5ce1a66c79fd0439b9aa249169ef63b2cd') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 9ee11eb9c..e91530e4c 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164892 2012-08-06 23:17:47Z andrea $ +# $Id: PKGBUILD 166251 2012-09-05 18:31:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('ecb774bc2b946afd2fd3c4db48ae7109239272a0') +sha1sums=('ee07f3cd1141990a1c6bd9ad655413a8d74d8df9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index d3b21b9f3..4bd4f9d0a 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164893 2012-08-06 23:17:52Z andrea $ +# $Id: PKGBUILD 166252 2012-09-05 18:31:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('8a9d25044d9a33281bd982e32a3c6fd72f5d22fb') +sha1sums=('a4203a226d3b02b5619efd01291816f1b4de2b50') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index e920e08db..14a2a38dc 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164894 2012-08-06 23:17:57Z andrea $ +# $Id: PKGBUILD 166253 2012-09-05 18:31:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('013d88bfd86183138eacf3129722efdfa0742064') +sha1sums=('c3ee656a8ca0fb4b75e810453e88f5fe30466de3') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index c6e90661f..bacec1671 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164895 2012-08-06 23:18:02Z andrea $ +# $Id: PKGBUILD 166254 2012-09-05 18:31:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('026fedf11d7392d30703b127325671978d03c1d7') +sha1sums=('66d66016c7cb708aeb436861a647716fcde39028') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 4f4960233..38f571a9b 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164860 2012-08-06 23:15:07Z andrea $ +# $Id: PKGBUILD 166219 2012-09-05 18:28:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('2eb264123f487629399d807151e1ae6ea1c6c8bb') +sha1sums=('5975a99ef55b418b709279c95ff9afe01cf64264') build() { cd "${srcdir}" diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 12adb413d..0a5605bb8 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164896 2012-08-06 23:18:08Z andrea $ +# $Id: PKGBUILD 166255 2012-09-05 18:31:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('d040039b3cffc4b3375b6d5eca2e0a026187f359') +sha1sums=('f109037b7960d0e14e23726e7edbbf0bf430b764') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index f2667dd54..6d46721e4 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164897 2012-08-06 23:18:13Z andrea $ +# $Id: PKGBUILD 166256 2012-09-05 18:31:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('5f4b600939ec81557f38eb39eca07f6abee30d87') +sha1sums=('8ca16eed35b87ce2416bb715dc392207198f802c') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 651709210..d8ba0b63e 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164898 2012-08-06 23:18:16Z andrea $ +# $Id: PKGBUILD 166257 2012-09-05 18:31:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('e84667bf68c3f5d48b8153d0f15b033cac5267bc') +sha1sums=('92547f7b3402763395bef93ce43411a381694ffb') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index fac5a7952..30566e93f 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164899 2012-08-06 23:18:22Z andrea $ +# $Id: PKGBUILD 166258 2012-09-05 18:32:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('6d8c2e7e2d295418515f3e3787a4649226716cc4') +sha1sums=('87667ac074e6ac924e8b7123969796f5e61ec2d3') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index 59a3dc7a6..aa8881be8 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164900 2012-08-06 23:18:49Z andrea $ +# $Id: PKGBUILD 166259 2012-09-05 18:32:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('993c00841d9ab322e1bc1bd39b368579c62f4c45') +sha1sums=('5fc77f230cff0a9b243403affc176e4e4757a1e7') build() { cd $srcdir @@ -73,8 +73,6 @@ package_kdegames-bomber() { install='kdegames.install' cd $srcdir/build/bomber make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bomber - make DESTDIR=$pkgdir install } package_kdegames-bovo() { @@ -84,8 +82,6 @@ package_kdegames-bovo() { install='kdegames.install' cd $srcdir/build/bovo make DESTDIR=$pkgdir install - cd $srcdir/build/doc/bovo - make DESTDIR=$pkgdir install } package_kdegames-granatier() { @@ -95,8 +91,6 @@ package_kdegames-granatier() { install='kdegames.install' cd $srcdir/build/granatier make DESTDIR=$pkgdir install - cd $srcdir/build/doc/granatier - make DESTDIR=$pkgdir install } package_kdegames-kajongg() { @@ -106,8 +100,6 @@ package_kdegames-kajongg() { install='kdegames.install' cd $srcdir/build/kajongg make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kajongg - make DESTDIR=$pkgdir install # Use the python2 executable find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' @@ -120,8 +112,6 @@ package_kdegames-kapman() { install='kdegames.install' cd $srcdir/build/kapman make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kapman - make DESTDIR=$pkgdir install } package_kdegames-katomic() { @@ -131,8 +121,6 @@ package_kdegames-katomic() { install='kdegames.install' cd $srcdir/build/katomic make DESTDIR=$pkgdir install - cd $srcdir/build/doc/katomic - make DESTDIR=$pkgdir install } package_kdegames-kbattleship() { @@ -142,8 +130,6 @@ package_kdegames-kbattleship() { install='kdegames-kbattleship.install' cd $srcdir/build/kbattleship make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbattleship - make DESTDIR=$pkgdir install } package_kdegames-kblackbox() { @@ -153,8 +139,6 @@ package_kdegames-kblackbox() { install='kdegames.install' cd $srcdir/build/kblackbox make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblackbox - make DESTDIR=$pkgdir install } package_kdegames-kblocks() { @@ -164,8 +148,6 @@ package_kdegames-kblocks() { install='kdegames.install' cd $srcdir/build/kblocks make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kblocks - make DESTDIR=$pkgdir install } package_kdegames-kbounce() { @@ -175,8 +157,6 @@ package_kdegames-kbounce() { install='kdegames.install' cd $srcdir/build/kbounce make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbounce - make DESTDIR=$pkgdir install } package_kdegames-kbreakout() { @@ -186,8 +166,6 @@ package_kdegames-kbreakout() { install='kdegames.install' cd $srcdir/build/kbreakout make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbreakout - make DESTDIR=$pkgdir install } package_kdegames-kdiamond() { @@ -197,8 +175,6 @@ package_kdegames-kdiamond() { install='kdegames.install' cd $srcdir/build/kdiamond make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kdiamond - make DESTDIR=$pkgdir install } package_kdegames-kfourinline() { @@ -208,8 +184,6 @@ package_kdegames-kfourinline() { install='kdegames-kfourinline.install' cd $srcdir/build/kfourinline make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kfourinline - make DESTDIR=$pkgdir install } package_kdegames-kgoldrunner() { @@ -219,8 +193,6 @@ package_kdegames-kgoldrunner() { install='kdegames.install' cd $srcdir/build/kgoldrunner make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgoldrunner - make DESTDIR=$pkgdir install } package_kdegames-kigo() { @@ -230,8 +202,6 @@ package_kdegames-kigo() { install='kdegames-kigo.install' cd $srcdir/build/kigo make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kigo - make DESTDIR=$pkgdir install } package_kdegames-killbots() { @@ -241,8 +211,6 @@ package_kdegames-killbots() { install='kdegames.install' cd $srcdir/build/killbots make DESTDIR=$pkgdir install - cd $srcdir/build/doc/killbots - make DESTDIR=$pkgdir install } package_kdegames-kiriki() { @@ -252,8 +220,6 @@ package_kdegames-kiriki() { install='kdegames.install' cd $srcdir/build/kiriki make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiriki - make DESTDIR=$pkgdir install } package_kdegames-kjumpingcube() { @@ -263,8 +229,6 @@ package_kdegames-kjumpingcube() { install='kdegames.install' cd $srcdir/build/kjumpingcube make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kjumpingcube - make DESTDIR=$pkgdir install } package_kdegames-klickety() { @@ -276,8 +240,6 @@ package_kdegames-klickety() { install='kdegames.install' cd $srcdir/build/klickety make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klickety - make DESTDIR=$pkgdir install } package_kdegames-klines() { @@ -287,8 +249,6 @@ package_kdegames-klines() { install='kdegames.install' cd $srcdir/build/klines make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klines - make DESTDIR=$pkgdir install } package_kdegames-kmahjongg() { @@ -298,8 +258,6 @@ package_kdegames-kmahjongg() { install='kdegames.install' cd $srcdir/build/kmahjongg make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmahjongg - make DESTDIR=$pkgdir install } package_kdegames-kmines() { @@ -309,8 +267,6 @@ package_kdegames-kmines() { install='kdegames.install' cd $srcdir/build/kmines make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmines - make DESTDIR=$pkgdir install } package_kdegames-knetwalk() { @@ -320,8 +276,6 @@ package_kdegames-knetwalk() { install='kdegames.install' cd $srcdir/build/knetwalk make DESTDIR=$pkgdir install - cd $srcdir/build/doc/knetwalk - make DESTDIR=$pkgdir install } package_kdegames-kolf() { @@ -331,8 +285,6 @@ package_kdegames-kolf() { install='kdegames-kolf.install' cd $srcdir/build/kolf make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kolf - make DESTDIR=$pkgdir install } package_kdegames-kollision() { @@ -342,8 +294,6 @@ package_kdegames-kollision() { install='kdegames.install' cd $srcdir/build/kollision make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kollision - make DESTDIR=$pkgdir install } package_kdegames-konquest() { @@ -353,8 +303,6 @@ package_kdegames-konquest() { install='kdegames.install' cd $srcdir/build/konquest make DESTDIR=$pkgdir install - cd $srcdir/build/doc/konquest - make DESTDIR=$pkgdir install } package_kdegames-kpatience() { @@ -365,8 +313,6 @@ package_kdegames-kpatience() { replaces=('kdegames-kpat') cd $srcdir/build/kpat make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kpat - make DESTDIR=$pkgdir install } package_kdegames-kreversi() { @@ -376,8 +322,6 @@ package_kdegames-kreversi() { install='kdegames.install' cd $srcdir/build/kreversi make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kreversi - make DESTDIR=$pkgdir install } package_kdegames-kshisen() { @@ -387,8 +331,6 @@ package_kdegames-kshisen() { install='kdegames.install' cd $srcdir/build/kshisen make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kshisen - make DESTDIR=$pkgdir install } package_kdegames-ksirk() { @@ -398,8 +340,6 @@ package_kdegames-ksirk() { install='kdegames.install' cd $srcdir/build/ksirk make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksirk - make DESTDIR=$pkgdir install } package_kdegames-kspaceduel() { @@ -409,8 +349,6 @@ package_kdegames-kspaceduel() { install='kdegames-kspaceduel.install' cd $srcdir/build/kspaceduel make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kspaceduel - make DESTDIR=$pkgdir install } package_kdegames-ksquares() { @@ -420,8 +358,6 @@ package_kdegames-ksquares() { install='kdegames.install' cd $srcdir/build/ksquares make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksquares - make DESTDIR=$pkgdir install } package_kdegames-ksudoku() { @@ -431,8 +367,6 @@ package_kdegames-ksudoku() { install='kdegames.install' cd $srcdir/build/ksudoku make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksudoku - make DESTDIR=$pkgdir install } package_kdegames-ktron() { @@ -442,8 +376,6 @@ package_kdegames-ktron() { install='kdegames.install' cd $srcdir/build/ktron make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktron - make DESTDIR=$pkgdir install } package_kdegames-ktuberling() { @@ -453,8 +385,6 @@ package_kdegames-ktuberling() { install='kdegames-ktuberling.install' cd $srcdir/build/ktuberling make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktuberling - make DESTDIR=$pkgdir install } package_kdegames-kubrick() { @@ -464,8 +394,6 @@ package_kdegames-kubrick() { install='kdegames.install' cd $srcdir/build/kubrick make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kubrick - make DESTDIR=$pkgdir install } package_kdegames-libkdegames() { @@ -474,9 +402,6 @@ package_kdegames-libkdegames() { depends=('kdelibs' 'openal') cd $srcdir/build/libkdegames make DESTDIR=$pkgdir install - for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do - install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) - done } package_kdegames-libkmahjongg() { @@ -494,8 +419,6 @@ package_kdegames-lskat() { install='kdegames-lskat.install' cd $srcdir/build/lskat make DESTDIR=$pkgdir install - cd $srcdir/build/doc/lskat - make DESTDIR=$pkgdir install } package_kdegames-palapeli() { @@ -505,6 +428,4 @@ package_kdegames-palapeli() { install='kdegames-palapeli.install' cd $srcdir/build/palapeli make DESTDIR=$pkgdir install - cd $srcdir/build/doc/palapeli - make DESTDIR=$pkgdir install } diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index ee1cd4175..c7be5aed8 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164901 2012-08-06 23:18:55Z andrea $ +# $Id: PKGBUILD 166260 2012-09-05 18:32:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.9.0 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('df2f8cba8de3f5afbbe65ba70faee46a30945283') +sha1sums=('5bc7a7da59e17e19f7f5e52648635b5b3bf77a22') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 0196368b3..1e74b0f4f 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164902 2012-08-06 23:18:58Z andrea $ +# $Id: PKGBUILD 166261 2012-09-05 18:32:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('8f9bd832d7cb88dd6345b4c4da8e00133544c5eb') +sha1sums=('6f032fd551d68b406749e1890d8ee15993a240ac') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 330d67e39..d6897b5cc 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164903 2012-08-06 23:19:04Z andrea $ +# $Id: PKGBUILD 166262 2012-09-05 18:32:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('3b1069b69d6718f974708f59ff1295a57aa21317') +sha1sums=('ec7dd7928b72dee38455315fd15e569d11f3cf1c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 0712c7c9a..3a5863f11 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164904 2012-08-06 23:19:09Z andrea $ +# $Id: PKGBUILD 166263 2012-09-05 18:32:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('51e519a3337188313f81bd79eb7e73ed0f4f9437') +sha1sums=('b38bfb571e13dc5a6db389b2980e130b85a874c6') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 2aa728427..0607d4d80 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164905 2012-08-06 23:19:14Z andrea $ +# $Id: PKGBUILD 166264 2012-09-05 18:32:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('0110bc9c818995592589f52715eecf727979fdb0') +sha1sums=('80d14586a889bd57e522321a863ac11b990b8982') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index ee17b8de0..2639075f4 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164906 2012-08-06 23:19:19Z andrea $ +# $Id: PKGBUILD 166265 2012-09-05 18:32:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('981d221c7cdbbf6e0d716bc6a01ee4b891bff484') +sha1sums=('37855f2bae3ac92c15c4563c85e4e70a129aeb76') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index f1093b019..941b52de7 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164907 2012-08-06 23:19:22Z andrea $ +# $Id: PKGBUILD 166266 2012-09-05 18:32:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('ebd38d9b089d1e3f95733c9d53f3c3973e6be6fd') +sha1sums=('832ed50f5f858cea1984050a297fd3a9da3691aa') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 7fa0f6db7..d4dc4a17d 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164908 2012-08-06 23:19:28Z andrea $ +# $Id: PKGBUILD 166267 2012-09-05 18:33:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('5c3e26a08a43f2221ef66458b01c88ae191c0db2') +sha1sums=('e3941822f70df00aeede53481db4123aeb27e7a9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 6a618a1d4..020bd8e96 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164909 2012-08-06 23:19:34Z andrea $ +# $Id: PKGBUILD 166268 2012-09-05 18:33:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5d3b549ca12914b649096da61b96fa8568976674') +sha1sums=('7361731d3d69acba9aeab3b9d16bb2a2e4c3a547') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 5a4549d07..a47227bf8 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164849 2012-08-06 23:13:40Z andrea $ +# $Id: PKGBUILD 166208 2012-09-05 18:27:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('c2e70c106de3af3a7e2e4cc77e80da736d9abe39') +sha1sums=('d192961e5990f3bab323df77c9fed92262936279') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index e137198d0..69058004b 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164910 2012-08-06 23:19:38Z andrea $ +# $Id: PKGBUILD 166269 2012-09-05 18:33:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('ec0f4aa6600aafeb8e616765645b4bc99c8dcca8') +sha1sums=('254c64c37cc672934024475918d86184e0357895') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index d890f86ca..b1d163392 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164911 2012-08-06 23:19:42Z andrea $ +# $Id: PKGBUILD 166270 2012-09-05 18:33:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('e66323aef77e08d3d7faee0fab8a7a69a1708489') +sha1sums=('92eecdc27174f4e9032f62ef166e09f54a81fb4c') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 8ac01d9df..073ca7a6f 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164912 2012-08-06 23:19:46Z andrea $ +# $Id: PKGBUILD 166271 2012-09-05 18:33:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('8d6a7da3e34c8d9dc88465e65a5b31ecb1fd10f8') +sha1sums=('b58497a68c5524c04a25fcde2e6d3617bc50a2aa') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 724d13180..3f3dbf3ff 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164913 2012-08-06 23:19:50Z andrea $ +# $Id: PKGBUILD 166272 2012-09-05 18:33:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -10,11 +10,11 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') depends=('libkcddb' 'libkcompactdisc' 'lame') makedepends=('cmake' 'automoc4') -groups=('kdemultimedia') +groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('d6e53caf098b48f173641e64e96e035a3d83e37e') +sha1sums=('62049d902cc3b454ba4096e889482f341841240f') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 7f3cf9602..b62f86539 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 164914 2012-08-06 23:19:56Z andrea $ +# $Id: PKGBUILD 166273 2012-09-05 18:33:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" url='http://kde.org/applications/multimedia/dragonplayer/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('ea0b6f6c18daac3af2ab146c3654f500c9c4d6de') +sha1sums=('4e228d66185fbbcc8846f0d69074e9509909287e') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index c484635f5..eb73fa61e 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 164915 2012-08-06 23:19:59Z andrea $ +# $Id: PKGBUILD 166274 2012-09-05 18:33:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('c5259a80fa80a476f2cb3964401de820db067bd9') +sha1sums=('dea7f81eba98e98d040062945a25c5f6c3651c65') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 94db1736a..1af077a46 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164916 2012-08-06 23:20:04Z andrea $ +# $Id: PKGBUILD 166275 2012-09-05 18:33:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('fdd079faeb1572ed286bd2c1cfdd0de15d632c7a') +sha1sums=('9fa4ac409da7d2386c51e3d92a63ef1996562259') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 0b0fb676b..71c1fd090 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164917 2012-08-06 23:20:09Z andrea $ +# $Id: PKGBUILD 166276 2012-09-05 18:33:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('b112295964112c4fb0afa2971926939328cbc569') +sha1sums=('43f6e8b635c9662bc930f31680d84ad0e5c0dd6a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index ff0da7482..579526ad7 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164918 2012-08-06 23:20:15Z andrea $ +# $Id: PKGBUILD 166277 2012-09-05 18:33:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('f2559914081ba7b2ad9da1a4772d6e8462a21cef') +sha1sums=('9cd9feef981bcbbb6f55d606a80abd2ef5635294') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 775684b14..0eac6b0d5 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 164919 2012-08-06 23:20:19Z andrea $ +# $Id: PKGBUILD 166278 2012-09-05 18:33:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' arch=('i686' 'x86_64' 'mips64el') +groups=('kde' 'kdemultimedia') license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('7965c695a0e11ab03e8fb6ba447616d2efe18e9c') +sha1sums=('f3f8b48b5c98e47bba0ed5df26f2543dacb07b4c') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index a6b8921da..4b572c3f6 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164920 2012-08-06 23:20:34Z andrea $ +# $Id: PKGBUILD 166279 2012-09-05 18:34:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('f5963684301d6569af4cfce2a39dbef140c1dc4d') +sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index d49cc07b9..f3efe4407 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164846 2012-08-06 23:13:25Z andrea $ +# $Id: PKGBUILD 166205 2012-09-05 18:27:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.9.0 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4358e9f39e22040d617a112c8a66a7fee93a62db') +sha1sums=('bb39a81f9cf909c84807a003c77b1db9d3a1730b') build() { cd "${srcdir}" diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 2d1c1703d..8f705742e 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164965 2012-08-07 16:32:21Z andrea $ +# $Id: PKGBUILD 166280 2012-09-05 18:34:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,8 +20,8 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-build.patch') -sha1sums=('5c2f2ef3a3be118ad673ebe8b307bf7fe15bffbf' +sha1sums=('0fe7ade5d525ed60310f228570de75cbbceac46b' '974056ad2c3a00b33a8ac9403b369ab636000832') build() { @@ -240,8 +240,9 @@ package_kdepim-ktimetracker() { package_kdepim-ktnef() { pkgdesc='A viewer/extractor for TNEF files' - depends=('kdepim-libkdepim') + depends=('kdebase-runtime' 'kdepimlibs') url="https://projects.kde.org/projects/kde/kdepim/ktnef" + install=kdepim-ktnef.install cd "${srcdir}"/build/ktnef make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/doc/ktnef diff --git a/extra/kdepim/kdepim-ktnef.install b/extra/kdepim/kdepim-ktnef.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/extra/kdepim/kdepim-ktnef.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 4bf89395f..7d80f116b 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164841 2012-08-06 23:13:02Z andrea $ +# $Id: PKGBUILD 166200 2012-09-05 18:26:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a5c3d362561320832f2e796e0f167f047bab4a98') +sha1sums=('28d1fdbba5136a09445cad2b83d3a31c4e05e284') build() { cd "${srcdir}" diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 9919e5911..6f5dcb851 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164922 2012-08-06 23:21:07Z andrea $ +# $Id: PKGBUILD 166281 2012-09-05 18:34:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -84,7 +84,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('bf3f548c1a86b9aedee0ee2962b0b10aa27c9c05') +sha1sums=('2be00830e0e7e030240ca897ec1d9f9978fd8682') build() { mkdir build diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 77e9cd662..edd5e8886 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 164850 2012-08-06 23:13:52Z andrea $ +# $Id: PKGBUILD 166209 2012-09-05 18:27:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('0d093dc9e66a8b2740e2b19069ca9b763bc1eefa' +sha1sums=('a3a1e0f56e22ca87d5b65768ef4874a43ce3ae71' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 06665b6fd..1065703cb 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164923 2012-08-06 23:21:32Z andrea $ +# $Id: PKGBUILD 166282 2012-09-05 18:34:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('0e396586d49f74c5677749a762ceffbde1db4b08' +sha1sums=('319ebe0f912626b8d3539bc22d706cc2548723af' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 190207e3d..e09db4e1e 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164924 2012-08-06 23:21:37Z andrea $ +# $Id: PKGBUILD 166283 2012-09-05 18:35:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('d08249578b5f94c732156231f69b99070628ebae') +sha1sums=('caa6a3222dccfb1b12513135e2f859904e385d7f') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 72a90942f..fa1cb5aad 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164926 2012-08-06 23:21:48Z andrea $ +# $Id: PKGBUILD 166285 2012-09-05 18:35:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('1bb66e0d375d7c71abe638e3d42d14e1bd969587') +sha1sums=('498a43e08a02e41dc36f0032c8a18f7e054c6cc6') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index a6ce58123..9a18de066 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164927 2012-08-06 23:21:54Z andrea $ +# $Id: PKGBUILD 166286 2012-09-05 18:35:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('b21a8eae3eda400137397b0048b0c96c502bd077') +sha1sums=('40eacf20d6c0ba278670a6383e42ab94e78530d1') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index b73037224..a696fa361 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164928 2012-08-06 23:21:57Z andrea $ +# $Id: PKGBUILD 166287 2012-09-05 18:35:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('b14f0f6ec1fb469c9f6ecb8035ce1c25b7c32a06') +sha1sums=('1f8e70c69e63cdc9bd55b63eab5a90dcd81826ba') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index 842b8619c..6a389ba42 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164929 2012-08-06 23:22:03Z andrea $ +# $Id: PKGBUILD 166288 2012-09-05 18:35:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('691aae64d68c5f998f2bc6aad5f4ed182580ccd7') +sha1sums=('1466bbfe715ff6e7a2129fbb5c6a42affbc48b16') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 7941eb731..407fa0433 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164930 2012-08-06 23:22:09Z andrea $ +# $Id: PKGBUILD 166289 2012-09-05 18:35:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('d066f74e7513aad2121fa0222fc50eceb61bcc9d') +sha1sums=('9559d03483aaab1774dbf26fa7171f6b697774b0') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index cb2419eb2..cca2fd059 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164931 2012-08-06 23:22:14Z andrea $ +# $Id: PKGBUILD 166290 2012-09-05 18:35:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('24caeaf1837ace0b164d8ba0f0b6a3f630dd2bb1') +sha1sums=('9f1e181839c88485912beb013e0908b0e59877a3') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 76521b3da..011b2478b 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('d21512621bbdeb0bc520261b4e639cd79f74a20f') +sha1sums=('046345fe3fb01c264ac3161a376f79f851cd51f5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 4645ef15d..1651f2ec1 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164933 2012-08-06 23:22:25Z andrea $ +# $Id: PKGBUILD 166292 2012-09-05 18:35:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('fd0961124cd8a0b8bf23eef08dd72885d78be66c') +sha1sums=('6fdcea3ce24b41d04baf9ca4a244035488b01197') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index cf80ce11e..823eb99b6 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164934 2012-08-06 23:22:30Z andrea $ +# $Id: PKGBUILD 166293 2012-09-05 18:35:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('d9c48dcc35a6eae6d3c4680d1f12bc745773d6ef') +sha1sums=('da1eef2fcb729fbcd28adeac486fedfc16175be2') build() { cd "${srcdir}" diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 8fc6a8f7e..256242e8b 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164936 2012-08-06 23:22:37Z andrea $ +# $Id: PKGBUILD 166295 2012-09-05 18:36:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('3f0d2f3134cf240a588f1490e5f0c2d4b02b6aa8') +sha1sums=('0a1f43ab28cc351ab99f2aaf6cb5061c4136daa7') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 83c3e8fe7..2e61a8561 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164937 2012-08-06 23:22:41Z andrea $ +# $Id: PKGBUILD 166296 2012-09-05 18:36:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('39a2ddd22ef2afb32062f4e3bacd4ad28b86bfa5') +sha1sums=('e64550d8fc5d5b5615eb464d9542167f0b5e17f3') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index f35e938a5..ecdd268b8 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164938 2012-08-06 23:22:49Z andrea $ +# $Id: PKGBUILD 166297 2012-09-05 18:36:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('5bc5318ce7b2ef04b1c57b8f8a25bb4b8a561075') +sha1sums=('0a64286114c10c3b09c64d1829058b9ab667986b') build() { cd $srcdir diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 6d84635c8..925a7cb4e 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161994 2012-06-18 07:33:57Z ronald $ +# $Id: PKGBUILD 166483 2012-09-08 08:54:47Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=ktorrent -pkgver=4.2.1 +pkgver=4.3.0 pkgrel=1 pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('automoc4' 'cmake' 'boost') source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'httpserver.patch') install=${pkgname}.install -sha1sums=('3f52c4a10011a49d304c08a3bb1290a022e0c53f' +sha1sums=('60400c6286f58934dde7ab471f56188b68d69f7b' 'cef22b24af540e1bfcf13da60e4846ade106c303') build() { diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 0b71d5947..707d0991b 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163018 2012-07-05 19:22:35Z andrea $ +# $Id: PKGBUILD 166348 2012-09-06 20:40:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kwebkitpart -pkgver=1.2.0.20120705 +pkgver=1.3.0 pkgrel=1 pkgdesc="A WebKit browser component for KDE" url="http://opendesktop.org/content/show.php?content=127960" @@ -11,8 +11,8 @@ license=('LGPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('659f9737bcc79f0bfbd08ff37ad0e232') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +md5sums=('27f72c8044fc798add9f4cbf9c799154') build() { cd "${srcdir}" diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index 7df98fbaa..a237c4b09 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148806 2012-02-05 11:51:19Z ibiru $ +# $Id: PKGBUILD 166399 2012-09-07 16:43:18Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 -pkgver=2.14.2 -pkgrel=5 +pkgver=2.16.0 +pkgrel=1 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,9 +12,8 @@ depends=('gtk2' 'gtkspell' 'libgnomecanvas' 'librsvg' 'libgnomeui' 'gtksourcevie makedepends=('ocaml') optdepends=('ocaml: for using the tools') DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u') -source=(https://forge.ocamlcore.org/frs/download.php/561/lablgtk-${pkgver}.tar.gz) +source=(https://forge.ocamlcore.org/frs/download.php/979/lablgtk-${pkgver}.tar.gz) options=(!makeflags) -md5sums=('bad77680a72dab8b915cae99d1ec9b1f') build() { cd "${srcdir}/lablgtk-${pkgver}" @@ -25,6 +24,7 @@ build() { package() { cd "${srcdir}/lablgtk-${pkgver}" - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} old-install install -m644 META "${pkgdir}/usr/lib/ocaml/lablgtk2/" } +md5sums=('052519ce2a77d2316732bc4d565b6399') diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index f82cc5374..418af23d7 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164866 2012-08-06 23:15:34Z andrea $ +# $Id: PKGBUILD 166225 2012-09-05 18:29:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4a2639ca08cdbaf6eee28b7145c46718f685a651') +sha1sums=('7c2009bfb19a36cc5084ac450f5a2155a193da55') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index 78d38abcb..5b4a4e412 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164867 2012-08-06 23:15:38Z andrea $ +# $Id: PKGBUILD 166226 2012-09-05 18:29:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('70c10ce02960c8eb00cb126471831a50b7d6262e') +sha1sums=('5e35ecf40225c79e023c0a4eb28f94043e9a2a61') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 698c2fe0c..f05500f0c 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164861 2012-08-06 23:15:12Z andrea $ +# $Id: PKGBUILD 166220 2012-09-05 18:28:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('4f23263c1f38374fcfa482de8a79b0c85e2fb250') +sha1sums=('82911b0bf93a7762130e4a1aff4dc72ec48940c1') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 77d8b3201..f05841bf7 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164859 2012-08-06 23:15:01Z andrea $ +# $Id: PKGBUILD 166218 2012-09-05 18:28:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('cf98e194c8d7230120e15c27f72efeec392ff4f9') +sha1sums=('d472434ac86c2ca92318c9d5e24625d2a72fe654') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 88fa10a28..1d8b4c08c 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164862 2012-08-06 23:15:15Z andrea $ +# $Id: PKGBUILD 166221 2012-09-05 18:28:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.9.0 -pkgrel=3 +pkgver=4.9.1 +pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('121c63ebf328ca87e67b7cf0cf72d0f276e4ae2c') +sha1sums=('fec413daf7ad814299fb53db695c273b1c26bc3b') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 4a925b90f..9ba5106f6 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a50fe30343f720f7402b42edbe7f6b59b2add19a') +sha1sums=('8fb561ef477b6a35c264ada783f65efa2ae1d3b9') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 819ff279c..f35a1ffb9 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164864 2012-08-06 23:15:27Z andrea $ +# $Id: PKGBUILD 166223 2012-09-05 18:29:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('0a7a18454d78a5c3c4cf22696163c2383bf6e333') +sha1sums=('c44eed9ec5f998d0449369f3c1b1abfc4ad2fcfd') build() { cd "${srcdir}" diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index e585b022a..2b9b64ef0 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,31 +1,25 @@ -# $Id: PKGBUILD 164220 2012-07-27 18:35:04Z ronald $ +# $Id: PKGBUILD 166475 2012-09-08 08:21:58Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libktorrent -pkgver=1.2.1 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64' 'mips64el') url="http://ktorrent.org/" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost' 'doxygen') -source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2" - "magnet.patch") -sha1sums=('857e4227c4bba685755d66581d881f893f6311ae' - 'f0156489364e5590b0b539cfe2abc929c1922ef8') +source=("http://ktorrent.org/downloads/4.3.0/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('e7e813af36f5854237111fd550f4914b83f17102') build() { cd "${srcdir}" - pushd ${pkgname}-${pkgver}-2 - patch -Np1 -i ${srcdir}/magnet.patch - popd - mkdir build cd build - cmake ../${pkgname}-${pkgver}-2 \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 05012b954..83a13bab8 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165429 2012-08-19 07:58:11Z andyrtr $ +# $Id: PKGBUILD 166171 2012-09-05 06:03:48Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,22 +21,22 @@ pkgname=('libreoffice-common' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.6.2 -pkgver=3.5.6 -pkgrel=1 +_LOver=3.6.1.2 +pkgver=3.6.1 +pkgrel=4 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost' - 'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -48,6 +48,7 @@ makedepends=( # makedepends _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" +_additional_source_url2="http://dev-www.libreoffice.org/extern" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 @@ -75,12 +76,12 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - fix_broken_hebrew_wordwrapping.diff + ${_additional_source_url}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz + ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 + ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + buildfix.diff + git_fixes.diff libreoffice-common.sh libreoffice-common.csh) noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz @@ -91,8 +92,8 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz + 6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2 + 0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -110,10 +111,11 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip + ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' - 'ecf485e13adfe8d5d4428b68787d390f' - '41696d482cb90db0acb6c45acd9047ea' +md5sums=('3ddcf145b74daa4361e48dafe97e7d21' + '7966e66099729d23d9ee594f526a50ed' + '2555590c1b4395857fc5c469f7f1bd0c' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' '94e7f271e38c976462558b4278590178' @@ -140,14 +142,14 @@ md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' + '6097739c841f671cb21332b9cc593ae7' + '0d2dcdfbf28d6208751b33057f5361f0' + 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '025d9b17d9eb90dc282c5c1289a666aa' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') + '234e91ac65945ce1ab1e3839780e90f7' + '2445aca137bdbf0cf7526e91f768a1d0' + 'abcb1b0a7deaffe13ab3d7ca70becb49' + '72790a4103da259a55cadd66db931d00') build() { @@ -173,19 +175,11 @@ build() { ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff + patch -Np1 -i ${srcdir}/buildfix.diff + patch -Np1 -i ${srcdir}/git_fixes.diff + # Checks if --hash-style is accepted, not if --hash-style=both is accepted. [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -197,12 +191,19 @@ build() { # python2 fix export PYTHON=python2 -# autoconf -f + #autoconf -f # non-SMP test build +<<<<<<< HEAD # export MAKEFLAGS="-j1" # touch autogen.lastrun ./autogen.sh --with-build-version="${_LOver} Parabola GNU/Linux-libre build-${pkgrel}" --with-vendor="Parabola GNU/Linux-libre" \ +======= + #export MAKEFLAGS="-j1" + #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + + ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ +>>>>>>> 2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3 --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ @@ -235,12 +236,14 @@ build() { --without-afms\ --without-ppds\ --without-system-libwps\ + --without-system-libcdr \ --without-system-mdds\ --without-myspell-dicts \ --without-system-libvisio \ --without-system-libcmis \ - --without-system-sampleicc \ --without-system-libexttextcat \ + --without-system-jfreereport \ + --without-system-apache-commons \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -254,7 +257,7 @@ build() { --disable-mozilla \ --without-system-mozilla \ --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ + --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ --with-system-cairo\ --with-system-libs\ @@ -262,9 +265,8 @@ build() { --with-system-headers\ --with-system-hsqldb \ --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ + --with-system-clucene\ + --without-system-servlet-api \ --with-java-target-version=1.5 \ $extraconf $EXTRAOPTS @@ -289,7 +291,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' [ "${CARCH}" != "mips64el" ] && depends+=('libgl') @@ -304,14 +306,18 @@ package_libreoffice-common() { 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' +<<<<<<< HEAD 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') [ "${CARCH}" != "mips64el" ] && optdepends+=('java-runtime: adds java support' \ 'hsqldb-java: default database format for OpenOffice.org' \ 'beanshell: interactive java -- good for prototyping /macros' \ 'lucene: full-text search engine library for Java needed in the help section') +======= + 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress' + 'gtk2: for browser plugin') +>>>>>>> 2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3 backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) @@ -351,6 +357,11 @@ package_libreoffice-common() { install -dm755 ${pkgdir}/usr/share/bash-completion/completions mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh rm -rf ${pkgdir}/etc/bash_completion.d + + # some files would conflict + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb } package_libreoffice-base() { @@ -391,16 +402,16 @@ package_libreoffice-postgresql-connector() { install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry -# # create directories from *list.txt file + # create directories from *list.txt file # for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do # install -dm755 ${pkgdir}/${directory/\%dir/} # done -# # install files into the pkg from fakeinstall dir + # install files into the pkg from fakeinstall dir # for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do # dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages + # check if directory has been already been created - some are missing like manpages # [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir + # mv file from fakeinstall to pkgdir # mv ${srcdir}/fakeinstall${file} ${pkgdir}$file # done } @@ -638,7 +649,7 @@ package_libreoffice-extension-pdfimport() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport + unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport } package_libreoffice-extension-presenter-screen() { @@ -690,8 +701,8 @@ package_libreoffice-scripting-javascript() { groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ + mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ } package_libreoffice-extension-scripting-python() { diff --git a/extra/libreoffice/git_fixes.diff b/extra/libreoffice/git_fixes.diff new file mode 100644 index 000000000..a4cd891cb --- /dev/null +++ b/extra/libreoffice/git_fixes.diff @@ -0,0 +1,743 @@ +From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Tue, 21 Aug 2012 16:55:11 +0000 +Subject: Typo + +Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106 +(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b) + +Signed-off-by: Eike Rathke <erack@redhat.com> +--- +diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx +index d929787..55ebaca 100644 +--- a/desktop/source/app/app.cxx ++++ b/desktop/source/app/app.cxx +@@ -194,7 +194,7 @@ void removeTree(OUString const & url) { + osl::FileBase::RC rc = osl::Directory::remove(url); + SAL_WARN_IF( + rc != osl::FileBase::E_None, "desktop", +- "cannot remove directory " << url << ": " +rc); ++ "cannot remove directory " << url << ": " << +rc); + // at least on Windows XP removing some existing directories fails with + // osl::FileBase::E_ACCESS because they are read-only; but keeping those + // directories around should be harmless once they are empty +-- +cgit v0.9.0.2-2-gbebe +From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 24 Aug 2012 14:06:15 +0000 +Subject: Fix removeRdbFiles (caused extension update to fail) + +removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the +corresponding component (.so, .jar, etc.), but not the .rdb file. So removing +an .rdb file silently failed to remove the corresponding implementations, so re- +installing a similar enough .rdb (as typically happens during extension update) +would fail due to duplicate implementation names. + +Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe +Reviewed-on: https://gerrit.libreoffice.org/476 +Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> +Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> +--- +diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx +index c3bdba3..7fd1e4a 100644 +--- a/cppuhelper/source/defaultbootstrap.cxx ++++ b/cppuhelper/source/defaultbootstrap.cxx +@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable { + rtl::OUString const & theName, rtl::OUString const & theLoader, + rtl::OUString const & theUri, rtl::OUString const & thePrefix, + css::uno::Reference< css::uno::XComponentContext > const & +- theAlienContext): ++ theAlienContext, ++ rtl::OUString const & theRdbFile): + name(theName), loader(theLoader), uri(theUri), prefix(thePrefix), +- alienContext(theAlienContext) ++ alienContext(theAlienContext), rdbFile(theRdbFile) + {} + + explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {} +@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable { + rtl::OUString const uri; + rtl::OUString const prefix; + css::uno::Reference< css::uno::XComponentContext > const alienContext; ++ rtl::OUString const rdbFile; + std::vector< rtl::OUString > services; + std::vector< rtl::OUString > singletons; + }; +@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable { + struct Implementation: private boost::noncopyable { + Implementation( + rtl::OUString const & name, rtl::OUString const & loader, +- rtl::OUString const & uri, +- rtl::OUString const & prefix = rtl::OUString(), +- css::uno::Reference< css::uno::XComponentContext > const & +- alienContext +- = css::uno::Reference< css::uno::XComponentContext >()): +- info(new ImplementationInfo(name, loader, uri, prefix, alienContext)), ++ rtl::OUString const & uri, rtl::OUString const & prefix, ++ css::uno::Reference< css::uno::XComponentContext > const & alienContext, ++ rtl::OUString const & rdbFile): ++ info( ++ new ImplementationInfo( ++ name, loader, uri, prefix, alienContext, rdbFile)), + loaded(false) + {} + +@@ -466,7 +468,7 @@ void Parser::handleImplementation() { + implementation_.reset( + new Implementation( + attrImplementation_, attrLoader_, attrUri_, attrPrefix_, +- alienContext_)); ++ alienContext_, reader_.getUrl())); + if (!data_->namedImplementations.insert( + NamedImplementations::value_type( + attrImplementation_, implementation_)). +@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) { + boost::shared_ptr< Implementation > impl( + new Implementation( + name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"), +- readLegacyRdbString(uri, implKey, "UNO/LOCATION"))); ++ readLegacyRdbString(uri, implKey, "UNO/LOCATION"), ++ rtl::OUString(), ++ css::uno::Reference< css::uno::XComponentContext >(), uri)); + if (!data_.namedImplementations.insert( + NamedImplementations::value_type(name, impl)). + second) +@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector< rtl::OUString > const & uris) { + j != data_.namedImplementations.end();) + { + assert(j->second.get() != 0); +- if (j->second->info->uri == *i) { ++ if (j->second->info->rdbFile == *i) { + clear.push_back(j->second); + //TODO: The below leaves data_ in an inconsistent state upon + // exceptions: +-- +cgit v0.9.0.2-2-gbebe +From 6d261e7aac12a876acb6496085e5329632595d39 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann <sbergman@redhat.com> +Date: Fri, 24 Aug 2012 14:45:20 +0000 +Subject: fdo#53968 etc.: Fix more "doesn't start after upgrade" problems + +* fdo#53968 revealed that multiple soffice.bin instances can run removeTree in + parallel. Therefore, demoted failures from exceptions to SAL_WARNs. (And + keeping fingers crossed.) + +* a8cdce148c76c93c5d41820610d6e6ac175e03a7 "fdo#53655: Ignore failure to remove + directories (as happens on Windows XP)" was due to a forgotten + osl::Directory::close before calling osl::Directory::remove after all. + +* UserInstallations have been seen in the wild where no extensions were + installed per-user (any longer), but user/uno_packages/cache/registry/ + com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files + contained data nevertheless. To reliably clean out any old junk, + refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in + tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly + re-installs all bundled, shared, and per-user extensions after a LO upgrade. + +Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0 +Reviewed-on: https://gerrit.libreoffice.org/477 +Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> +Tested-by: Norbert Thiebaud <nthiebaud@gmail.com> +--- +diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx +index 25b6352..c830b02 100644 +--- a/desktop/inc/app.hxx ++++ b/desktop/inc/app.hxx +@@ -203,6 +203,7 @@ class Desktop : public Application + + sal_Bool m_bMinimized; + sal_Bool m_bInvisible; ++ bool m_bCleanedExtensionCache; + bool m_bServicesRegistered; + sal_uInt16 m_nAppEvents; + BootstrapError m_aBootstrapError; +diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx +index 55ebaca..5fb653b 100644 +--- a/desktop/source/app/app.cxx ++++ b/desktop/source/app/app.cxx +@@ -147,77 +147,81 @@ namespace { + + void removeTree(OUString const & url) { + osl::Directory dir(url); +- switch (dir.open()) { ++ osl::FileBase::RC rc = dir.open(); ++ switch (rc) { + case osl::FileBase::E_None: + break; + case osl::FileBase::E_NOENT: + return; //TODO: SAL_WARN if recursive + default: +- throw css::uno::RuntimeException( +- "cannot open directory " + url, +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc); ++ return; + } + for (;;) { + osl::DirectoryItem i; +- osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32); ++ rc = dir.getNextItem(i, SAL_MAX_UINT32); + if (rc == osl::FileBase::E_NOENT) { + break; + } + if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- ("cannot iterate directory " + url + ": " +- + OUString::valueOf(static_cast< sal_Int32 >(rc))), +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop","cannot iterate directory " << url << ": " << +rc); ++ break; + } + osl::FileStatus stat( + osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName | + osl_FileStatus_Mask_FileURL); + rc = i.getFileStatus(stat); + if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- ("cannot stat in directory " + url + ": " +- + OUString::valueOf(static_cast< sal_Int32 >(rc))), +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop", "cannot stat in directory " << url << ": " << +rc); ++ continue; + } + if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks + removeTree(stat.getFileURL()); + } else { + rc = osl::File::remove(stat.getFileURL()); +- if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- ("cannot remove file " + stat.getFileURL() + ": " +- + OUString::valueOf(static_cast< sal_Int32 >(rc))), +- css::uno::Reference< css::uno::XInterface >()); +- } ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None, "desktop", ++ "cannot remove file " << stat.getFileURL() << ": " << +rc); + } + } +- osl::FileBase::RC rc = osl::Directory::remove(url); ++ if (dir.isOpen()) { ++ rc = dir.close(); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None, "desktop", ++ "cannot close directory " << url << ": " << +rc); ++ } ++ rc = osl::Directory::remove(url); + SAL_WARN_IF( + rc != osl::FileBase::E_None, "desktop", + "cannot remove directory " << url << ": " << +rc); +- // at least on Windows XP removing some existing directories fails with +- // osl::FileBase::E_ACCESS because they are read-only; but keeping those +- // directories around should be harmless once they are empty + } + +-// Remove any existing UserInstallation's user/extensions/bundled cache +-// remaining from old installations. Apparently due to the old +-// share/prereg/bundled mechanism (disabled since +-// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying +-// share/prereg/bundled to avoid startup crashes"), that cache could contain +-// corrupted information (like a UNO component registered twice, which got +-// changed from active to passive registration in one LO version, but the +-// version of the corresponding bundled extension only incremented in a later LO +-// version). At least in theory, this function could be removed again once no +-// UserInstallation can be poisoned by that old share/prereg/bundled mechanism +-// any more. (But then Desktop::SynchronizeExtensionRepositories might need to +-// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force +-// ExtensionManager resync when the implementation changes" which effectively +-// got reverted again now. Now, a mismatch between a UserInstallation's +-// user/extensions/bundled and an installation's share/extensions will always be +-// detected here and lead to a removal of user/extensions/bundled, so that +-// Desktop::SynchronizeExtensionRepositories will then definitely resync +-// share/extensions.) ++// Remove any existing UserInstallation's extensions cache data remaining from ++// old installations. This addresses at least two problems: ++// ++// For one, apparently due to the old share/prereg/bundled mechanism (disabled ++// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying ++// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled ++// cache could contain corrupted information (like a UNO component registered ++// twice, which got changed from active to passive registration in one LO ++// version, but the version of the corresponding bundled extension only ++// incremented in a later LO version). ++// ++// For another, UserInstallations have been seen in the wild where no extensions ++// were installed per-user (any longer), but user/uno_packages/cache/registry/ ++// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files ++// contained data nevertheless. ++// ++// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or ++// one containing an old build ID), then user/extensions/bundled, ++// user/extensions/shared, and user/uno_packages/cache/registry/ ++// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are ++// removed. That should prevent any problems starting the service manager due ++// to old junk. Later on in Desktop::SynchronizeExtensionRepositories, the ++// removed cache data is recreated. ++// + // As a special case, if you create a UserInstallation with LO >= 3.6.1, then + // run an old LO <= 3.5.x using share/prereg/bundled on the same + // UserInstallation (so that it partially overwrites user/extensions/bundled, +@@ -230,33 +234,50 @@ void removeTree(OUString const & url) { + // <= 3.5.x messed with user/extensions/bundled in the meantime, then it would + // have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect + // that. +-void refreshBundledExtensionsDir() { ++// ++// Multiple instances of soffice.bin can execute this code in parallel for a ++// single UserInstallation, as it is called before OfficeIPCThread is set up. ++// Therefore, any errors here only lead to SAL_WARNs. ++// ++// At least in theory, this function could be removed again once no ++// UserInstallation can be poisoned by old junk any more. ++bool cleanExtensionCache() { + OUString buildId( + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); + rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure +- OUString dir("$BUNDLED_EXTENSIONS_USER"); +- rtl::Bootstrap::expandMacros(dir); //TODO: detect failure +- OUString url(dir + "/buildid"); +- OUString nonPrereg( +- "${$BUNDLED_EXTENSIONS_USER/registry/" +- "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:" +- "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}"); +- rtl::Bootstrap::expandMacros(nonPrereg); +- if (nonPrereg == "TRUE") { +- osl::File f(url); +- switch (f.open(osl_File_OpenFlag_Read)) { ++ OUString extDir( ++ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ++ ":UserInstallation}/user/extensions"); ++ rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure ++ OUString bundledDir = extDir + "/bundled"; ++ OUString buildIdFile(bundledDir + "/buildid"); ++ OUString bundledRcFile( ++ "$BUNDLED_EXTENSIONS_USER/registry/" ++ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"); ++ rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure ++ rtl::Bootstrap bundledRc(bundledRcFile); ++ OUString nonPrereg; ++ if (bundledRc.getHandle() == 0 ++ || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg) ++ && nonPrereg == "TRUE")) ++ { ++ osl::File f(buildIdFile); ++ osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read); ++ switch (rc) { + case osl::FileBase::E_None: + { + rtl::ByteSequence s1; +- osl::FileBase::RC rc = f.readLine(s1); +- if (f.close() != osl::FileBase::E_None) { +- SAL_WARN( +- "desktop", "cannot close " + url + " after reading"); +- } ++ rc = f.readLine(s1); ++ osl::FileBase::RC rc2 = f.close(); ++ SAL_WARN_IF( ++ rc2 != osl::FileBase::E_None, "desktop", ++ "cannot close " << buildIdFile << " after reading: " ++ << +rc2); + if (rc != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- "cannot read from " + url, +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop", ++ "cannot read from " << buildIdFile << ": " << +rc); ++ break; + } + OUString s2( + reinterpret_cast< char const * >(s1.getConstArray()), +@@ -264,53 +285,56 @@ void refreshBundledExtensionsDir() { + // using ISO 8859-1 avoids any and all conversion errors; + // the content should only be a subset of ASCII, anyway + if (s2 == buildId) { +- return; ++ return false; + } + break; + } + case osl::FileBase::E_NOENT: + break; + default: +- throw css::uno::RuntimeException( +- "cannot open " + url + " for reading", +- css::uno::Reference< css::uno::XInterface >()); ++ SAL_WARN( ++ "desktop", ++ "cannot open " << buildIdFile << " for reading: " << +rc); ++ break; + } + } +- removeTree(dir); +- switch (osl::Directory::createPath(dir)) { +- case osl::FileBase::E_None: +- case osl::FileBase::E_EXIST: +- break; +- default: +- throw css::uno::RuntimeException( +- "cannot create path " + dir, +- css::uno::Reference< css::uno::XInterface >()); +- } +- osl::File f(url); +- if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) != +- osl::FileBase::E_None) +- { +- throw css::uno::RuntimeException( +- "cannot open " + url + " for writing", +- css::uno::Reference< css::uno::XInterface >()); ++ removeTree(extDir); ++ OUString userRcFile( ++ "$UNO_USER_PACKAGES_CACHE/registry/" ++ "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc"); ++ rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure ++ osl::FileBase::RC rc = osl::File::remove(userRcFile); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop", ++ "cannot remove file " << userRcFile << ": " << +rc); ++ rc = osl::Directory::createPath(bundledDir); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop", ++ "cannot create path " << bundledDir << ": " << +rc); ++ osl::File f(buildIdFile); ++ rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); ++ if (rc != osl::FileBase::E_None) { ++ SAL_WARN( ++ "desktop", ++ "cannot open " << buildIdFile << " for writing: " << +rc); ++ return true; + } + rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8)); + // using UTF-8 avoids almost all conversion errors (and buildid + // containing single surrogate halves should never happen, anyway); the + // content should only be a subset of ASCII, anyway +- sal_uInt64 n; +- if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None +- || n != static_cast< sal_uInt32 >(buf.getLength())) +- { +- throw css::uno::RuntimeException( +- "cannot write to " + url, +- css::uno::Reference< css::uno::XInterface >()); +- } +- if (f.close() != osl::FileBase::E_None) { +- throw css::uno::RuntimeException( +- "cannot close " + url + " after writing", +- css::uno::Reference< css::uno::XInterface >()); +- } ++ sal_uInt64 n = 0; ++ rc = f.write(buf.getStr(), buf.getLength(), n); ++ SAL_WARN_IF( ++ (rc != osl::FileBase::E_None ++ || n != static_cast< sal_uInt32 >(buf.getLength())), ++ "desktop", ++ "cannot write to " << buildIdFile << ": " << +rc << ", " << n); ++ rc = f.close(); ++ SAL_WARN_IF( ++ rc != osl::FileBase::E_None, "desktop", ++ "cannot close " << buildIdFile << " after writing: " << +rc); ++ return true; + } + + } +@@ -538,7 +562,8 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) + } + + Desktop::Desktop() +-: m_bServicesRegistered( false ) ++: m_bCleanedExtensionCache( false ) ++, m_bServicesRegistered( false ) + , m_aBootstrapError( BE_OK ) + { + RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" ); +@@ -553,7 +578,7 @@ void Desktop::Init() + RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" ); + SetBootstrapStatus(BS_OK); + +- refreshBundledExtensionsDir(); ++ m_bCleanedExtensionCache = cleanExtensionCache(); + + // We need to have service factory before going further, but see fdo#37195. + // Doing this will mmap common.rdb, making it not overwritable on windows, +diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx +index dd01d9b..a6221a9 100644 +--- a/desktop/source/app/check_ext_deps.cxx ++++ b/desktop/source/app/check_ext_deps.cxx +@@ -51,6 +51,7 @@ + #include "com/sun/star/deployment/ExtensionManager.hpp" + #include "com/sun/star/deployment/LicenseException.hpp" + #include "com/sun/star/deployment/ui/LicenseDialog.hpp" ++#include <com/sun/star/task/OfficeRestartManager.hpp> + #include <com/sun/star/task/XJob.hpp> + #include <com/sun/star/task/XJobExecutor.hpp> + #include <com/sun/star/task/XInteractionApprove.hpp> +@@ -77,12 +78,15 @@ class SilentCommandEnv + task::XInteractionHandler, + ucb::XProgressHandler > + { ++ uno::Reference<uno::XComponentContext> mxContext; + Desktop *mpDesktop; + sal_Int32 mnLevel; + sal_Int32 mnProgress; + + public: +- SilentCommandEnv( Desktop* pDesktop ); ++ SilentCommandEnv( ++ uno::Reference<uno::XComponentContext> const & xContext, ++ Desktop* pDesktop ); + virtual ~SilentCommandEnv(); + + // XCommandEnvironment +@@ -105,12 +109,14 @@ public: + }; + + //----------------------------------------------------------------------------- +-SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop ) +-{ +- mpDesktop = pDesktop; +- mnLevel = 0; +- mnProgress = 25; +-} ++SilentCommandEnv::SilentCommandEnv( ++ uno::Reference<uno::XComponentContext> const & xContext, ++ Desktop* pDesktop ): ++ mxContext( xContext ), ++ mpDesktop( pDesktop ), ++ mnLevel( 0 ), ++ mnProgress( 25 ) ++{} + + //----------------------------------------------------------------------------- + SilentCommandEnv::~SilentCommandEnv() +@@ -144,10 +150,9 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe + + if ( request >>= licExc ) + { +- uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext(); + uno::Reference< ui::dialogs::XExecutableDialog > xDialog( + deployment::ui::LicenseDialog::create( +- xContext, VCLUnoHelper::GetInterface( NULL ), ++ mxContext, VCLUnoHelper::GetInterface( NULL ), + licExc.ExtensionName, licExc.Text ) ); + sal_Int16 res = xDialog->execute(); + if ( res == ui::dialogs::ExecutableDialogResults::CANCEL ) +@@ -416,7 +421,20 @@ sal_Bool Desktop::CheckExtensionDependencies() + void Desktop::SynchronizeExtensionRepositories() + { + RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories"); +- dp_misc::syncRepositories( new SilentCommandEnv( this ) ); ++ uno::Reference< uno::XComponentContext > context( ++ comphelper_getProcessComponentContext()); ++ uno::Reference< ucb::XCommandEnvironment > silent( ++ new SilentCommandEnv(context, this)); ++ if (m_bCleanedExtensionCache) { ++ deployment::ExtensionManager::get(context)->reinstallDeployedExtensions( ++ true, "user", Reference<task::XAbortChannel>(), silent); ++ task::OfficeRestartManager::get(context)->requestRestart( ++ silent->getInteractionHandler()); ++ } else { ++ // reinstallDeployedExtensions above already calls syncRepositories ++ // internally: ++ dp_misc::syncRepositories(m_bCleanedExtensionCache, silent); ++ } + } + + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +index 29ded17..7795e309 100644 +--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx ++++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +@@ -1124,7 +1124,7 @@ void ExtensionCmdQueue::acceptLicense( const uno::Reference< deployment::XPackag + + void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext ) + { +- dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); ++ dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) ); + } + + void ExtensionCmdQueue::stop() +diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h +index 29fd140..06e67aa 100644 +--- a/desktop/source/deployment/inc/dp_misc.h ++++ b/desktop/source/deployment/inc/dp_misc.h +@@ -154,8 +154,10 @@ void TRACE(::rtl::OUString const & sText); + recently added or removed. + */ + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC +-void syncRepositories(::com::sun::star::uno::Reference< +- ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); ++void syncRepositories( ++ bool force, ++ ::com::sun::star::uno::Reference< ++ ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv); + + } + +diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx +index 68403f1..b3c21b4 100644 +--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx ++++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx +@@ -1205,9 +1205,10 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > > + } + } + +-//only to be called from unopkg!!! ++// Only to be called from unopkg or soffice bootstrap (with force=true in the ++// latter case): + void ExtensionManager::reinstallDeployedExtensions( +- OUString const & repository, ++ sal_Bool force, OUString const & repository, + Reference<task::XAbortChannel> const & xAbortChannel, + Reference<ucb::XCommandEnvironment> const & xCmdEnv ) + throw (deploy::DeploymentException, +@@ -1220,10 +1221,11 @@ void ExtensionManager::reinstallDeployedExtensions( + xPackageManager = getPackageManager(repository); + + ::osl::MutexGuard guard(getMutex()); +- xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv); ++ xPackageManager->reinstallDeployedPackages( ++ force, xAbortChannel, xCmdEnv); + //We must sync here, otherwise we will get exceptions when extensions + //are removed. +- dp_misc::syncRepositories(xCmdEnv); ++ dp_misc::syncRepositories(force, xCmdEnv); + const uno::Sequence< Reference<deploy::XPackage> > extensions( + xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv)); + +diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx +index 22e2d41..ec1edbc 100644 +--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx ++++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx +@@ -182,7 +182,7 @@ public: + css::uno::RuntimeException); + + virtual void SAL_CALL reinstallDeployedExtensions( +- ::rtl::OUString const & repository, ++ sal_Bool force, ::rtl::OUString const & repository, + css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel, + css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) + throw ( +diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx +index 8a08320c..8e3d109 100644 +--- a/desktop/source/deployment/manager/dp_manager.cxx ++++ b/desktop/source/deployment/manager/dp_manager.cxx +@@ -1164,14 +1164,14 @@ PackageManagerImpl::getDeployedPackages( + //ToDo: the function must not call registerPackage, do this in + //XExtensionManager.reinstallDeployedExtensions + void PackageManagerImpl::reinstallDeployedPackages( +- Reference<task::XAbortChannel> const & /*xAbortChannel*/, ++ sal_Bool force, Reference<task::XAbortChannel> const & /*xAbortChannel*/, + Reference<XCommandEnvironment> const & xCmdEnv_ ) + throw (deployment::DeploymentException, + CommandFailedException, CommandAbortedException, + lang::IllegalArgumentException, RuntimeException) + { + check(); +- if (office_is_running()) ++ if (!force && office_is_running()) + throw RuntimeException( + OUSTR("You must close any running Office process before " + "reinstalling packages!"), static_cast<OWeakObject *>(this) ); +diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h +index 3b335d7..3c7f8d9 100644 +--- a/desktop/source/deployment/manager/dp_manager.h ++++ b/desktop/source/deployment/manager/dp_manager.h +@@ -236,6 +236,7 @@ public: + css::uno::RuntimeException); + + virtual void SAL_CALL reinstallDeployedPackages( ++ sal_Bool force, + css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, + css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) + throw (css::deployment::DeploymentException, +diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx +index b225db6..9ed579f 100644 +--- a/desktop/source/deployment/misc/dp_misc.cxx ++++ b/desktop/source/deployment/misc/dp_misc.cxx +@@ -591,7 +591,7 @@ void TRACE(::rtl::OString const & sText) + } + + void syncRepositories( +- Reference<ucb::XCommandEnvironment> const & xCmdEnv) ++ bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv) + { + OUString sDisable; + ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() ); +@@ -602,7 +602,8 @@ void syncRepositories( + //synchronize shared before bundled otherewise there are + //more revoke and registration calls. + sal_Bool bModified = false; +- if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) ++ if (force ++ || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared"))) + || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled")))) + { + xExtensionManager = +diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx +index 43faed5..ef16ea1 100644 +--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx ++++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx +@@ -392,7 +392,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() + //synching is done in XExtensionManager.reinstall + if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall")) + && ! dp_misc::office_is_running()) +- dp_misc::syncRepositories(xCmdEnv); ++ dp_misc::syncRepositories(false, xCmdEnv); + + if ( subcmd_add || subCommand == "remove" ) + { +@@ -436,7 +436,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main() + RTL_CONSTASCII_STRINGPARAM("reinstall") )) + { + xExtensionManager->reinstallDeployedExtensions( +- repository, Reference<task::XAbortChannel>(), xCmdEnv); ++ false, repository, Reference<task::XAbortChannel>(), xCmdEnv); + } + else if ( subCommand == "list" ) + { +diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl +index b68ab20..2912e45 100644 +--- a/offapi/com/sun/star/deployment/XExtensionManager.idl ++++ b/offapi/com/sun/star/deployment/XExtensionManager.idl +@@ -260,6 +260,9 @@ interface XExtensionManager + <p> + Please use this in case of suspected cache inconsistencies only. + </p> ++ @param force ++ set to true when called during soffice bootstrap after cleaning ++ old extension cache + @param repositroy + the name of the repository + @param xAbortChannel +@@ -268,6 +271,7 @@ interface XExtensionManager + command environment for error and progress handling + */ + void reinstallDeployedExtensions( ++ [in] boolean force, + [in] string repository, + [in] com::sun::star::task::XAbortChannel xAbortChannel, + [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) +diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl +index 12e7e0e..39ff04a 100644 +--- a/offapi/com/sun/star/deployment/XPackageManager.idl ++++ b/offapi/com/sun/star/deployment/XPackageManager.idl +@@ -225,12 +225,16 @@ interface XPackageManager + Please use this in case of suspected cache inconsistencies only. + </p> + ++ @param force ++ set to true when called during soffice bootstrap after cleaning ++ old extension cache + @param xAbortChannel + abort channel to asynchronously abort the adding process + @param xCmdEnv + command environment for error and progress handling + */ + void reinstallDeployedPackages( ++ [in] boolean force, + [in] com::sun::star::task::XAbortChannel xAbortChannel, + [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv ) + raises (DeploymentException, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh index af31d4432..5efa39404 100644 --- a/extra/libreoffice/libreoffice-common.csh +++ b/extra/libreoffice/libreoffice-common.csh @@ -1 +1,8 @@ #setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program + +# to force a certain look'n feel + +#setenv SAL_USE_VCLPLUGIN gen +#setenv SAL_USE_VCLPLUGIN kde4 +#setenv SAL_USE_VCLPLUGIN gtk +#setenv SAL_USE_VCLPLUGIN gtk3 diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh index ee405b1aa..795867125 100644 --- a/extra/libreoffice/libreoffice-common.sh +++ b/extra/libreoffice/libreoffice-common.sh @@ -1 +1,8 @@ #export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" + +# to force a certain look'n feel + +#export SAL_USE_VCLPLUGIN=gen +#export SAL_USE_VCLPLUGIN=kde4 +#export SAL_USE_VCLPLUGIN=gtk +#export SAL_USE_VCLPLUGIN=gtk3 diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index bb012a83f..2bc1767ad 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143891 2011-11-30 19:04:39Z andrea $ +# $Id: PKGBUILD 166179 2012-09-05 07:50:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau -pkgver=0.4.1 -pkgrel=2 +pkgver=0.5 +pkgrel=1 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64) url='http://cgit.freedesktop.org/~aplattner/libvdpau' @@ -13,11 +13,11 @@ options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) makedepends=('libx11') -sha256sums=('061b6f86c64912f79851bfefcac4f77b401e9a939dbbb7b1ec795bc7d5aaf59b') +sha1sums=('1b18b8f75eea52740af84881313d860ad5c27d0b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 6ef1aab97..0c39c8543 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 151320 2012-02-25 13:44:08Z allan $ +# $Id: PKGBUILD 166173 2012-09-05 06:04:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Robert McCathie <archaur at rmcc dot com dot au> pkgname=libwps -pkgver=0.2.2 -pkgrel=2 +pkgver=0.2.7 +pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64' 'mips64el') url="http://libwps.sourceforge.net/" license=('LGPL') -depends=('libwpd>=0.9.2') +depends=('libwpd>=0.9.4') +makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('29721a16f25967d59969d5f0ae485b4a') +md5sums=('d197bd6211669a2fa4ca648faf04bcb1') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i -e 's: -Wall -Werror -pedantic::' configure.in - touch NEWS AUTHORS ChangeLog - autoreconf -fi - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --disable-static \ + --disable-werror make } diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index 99de5523b..8bc12095c 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165312 2012-08-15 11:35:19Z juergen $ +# $Id: PKGBUILD 166487 2012-09-08 10:00:42Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.27.0 -pkgrel=3 +pkgver=5.28.0 +pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('8d8d0b3db27f002986cff5429dea96ada46a0576' +sha1sums=('52d7dad4681711a6ead73b72835b177107363b9c' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 0ed5a8b24..d929a0d5c 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164340 2012-07-31 00:50:49Z dan $ +# $Id: PKGBUILD 166159 2012-09-04 23:45:23Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.14 +pkgver=1.4.15 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64 'mips64el') @@ -12,13 +12,15 @@ license=('GPL') depends=('libevent') optdepends=('perl: for memcached-tool usage') backup=('etc/conf.d/memcached') +install=memcached.install source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz memcached.conf - memcached.sh) -changelog=ChangeLog -sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef' - '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' - '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') + memcached.sh + memcached.service) +sha256sums=('169721ab7a7531add6ae9f6b14b6b5641725fe0b1f0bdf5c3a4327725901e2b4' + '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47' + '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb' + '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,9 +32,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool - # This POS is entirely RedHat specific, so not including it now - #install -D -m 755 scripts/memcached.service "$pkgdir"/lib/systemd/system/memcached.service - #sed -i -e 's#^EnvironmentFile.*#EnvironmentFile=/etc/conf.d/memcached#' "$pkgdir"/lib/systemd/system/memcached.service - install -D -m 644 "$srcdir/memcached.conf" "$pkgdir"/etc/conf.d/memcached - install -D -m 755 "$srcdir/memcached.sh" "$pkgdir"/etc/rc.d/memcached + install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached + install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached + install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service } diff --git a/extra/memcached/memcached.conf b/extra/memcached/memcached.conf index bf120b059..4415e1a55 100644 --- a/extra/memcached/memcached.conf +++ b/extra/memcached/memcached.conf @@ -1,4 +1,4 @@ # user to run memcached as; also used for pid file ownership -MEMCACHED_USER="nobody" +MEMCACHED_USER="memcached" # see 'memcached -h' for available options MEMCACHED_ARGS="-l 127.0.0.1 -t 1" diff --git a/extra/memcached/memcached.install b/extra/memcached/memcached.install new file mode 100644 index 000000000..d6dca8d23 --- /dev/null +++ b/extra/memcached/memcached.install @@ -0,0 +1,21 @@ +post_install() { + if ! getent group memcached >/dev/null; then + groupadd --system memcached + fi + if ! getent passwd memcached >/dev/null; then + useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd memcached >/dev/null; then + userdel memcached + fi + if getent group memcached >/dev/null; then + groupdel memcached + fi +} diff --git a/extra/memcached/memcached.service b/extra/memcached/memcached.service new file mode 100644 index 000000000..c6e15fb7c --- /dev/null +++ b/extra/memcached/memcached.service @@ -0,0 +1,11 @@ +[Unit] +Description=Memcached Daemon +After=network.target + +[Service] +User=memcached +# Remove '-l 127.0.0.1' to listen on all addresses +ExecStart=/usr/bin/memcached -l 127.0.0.1 + +[Install] +WantedBy=multi-user.target diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 9756d3d44..0e7f62b07 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164703 2012-08-03 16:21:32Z giovanni $ +# $Id: PKGBUILD 166022 2012-09-04 11:54:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('8d9f776e432239571dfab2b5f88b3675' +md5sums=('22a46a3ae64a5d625f068e588b4d6ec2' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 91b939c31..117641c20 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 158094 2012-05-02 20:46:41Z eric $ +# $Id: PKGBUILD 166148 2012-09-04 22:30:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Ben Mazer <blm@groknil.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') -pkgver=1.4.28 +pkgver=1.4.29 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('3fd44b30e8f4ae071b2a5a205d6007f3465fa970') +sha1sums=('6db88d6c5093b3958b0285b5010f2677b05e0348') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 571910a29..7b61e3dff 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165439 2012-08-19 15:29:10Z andrea $ +# $Id: PKGBUILD 166364 2012-09-06 22:13:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.27 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://www.mysql.com/products/community/" @@ -37,7 +37,7 @@ build() { -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/mysql/docs \ -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ + -DINSTALL_PLUGINDIR=lib/mysql/plugin \ -DINSTALL_SCRIPTDIR=bin \ -DINSTALL_INCLUDEDIR=include/mysql \ -DINSTALL_DOCREADMEDIR=share/mysql \ diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 2f528e1d8..7f0fb0ddc 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164757 2012-08-04 18:04:50Z stephane $ +# $Id: PKGBUILD 166317 2012-09-06 01:14:06Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=nasm -pkgver=2.10.03 +pkgver=2.10.04 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" url="http://www.nasm.us" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('glibc') makedepends=('ghostscript') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('78a8de9ba02da7c2ba8c583a57901ff6856ad6c6') +sha1sums=('d80b5ea8f59a4929efddcb8e90d00b8a0fc00cb5') install=nasm.install build() { diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 74b64350d..625e8e41a 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164843 2012-08-06 23:13:08Z andrea $ +# $Id: PKGBUILD 166202 2012-09-05 18:26:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.9.0 +pkgver=4.9.1 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('55dc228d5155220052c4a5d38984092a90a9cae7') +sha1sums=('1dbb4467b7d4ec50133e5ce86c3837b57b95794d') build() { cd "${srcdir}" diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index b431666a5..ca2ac44f4 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 143814 2011-11-29 13:33:35Z stephane $ +# $Id: PKGBUILD 166395 2012-09-07 16:07:57Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml') # Needs optimized build. [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs') -pkgver=3.12.1 -pkgrel=3 +pkgver=4.00.0 +pkgrel=1 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2' 'custom: QPL-1.0') @@ -14,10 +14,9 @@ url="http://caml.inria.fr/" depends=('gdbm') makedepends=('tk' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz +source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz) fix-caml_int64_float_of_bits-n32.patch) -md5sums=('814a047085f0f901ab7d8e3a4b7a9e65' - 'e2c8bc316efe40532c5b9d7f9a1d8d62') +options=('!makeflags' '!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -63,3 +62,5 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } +md5sums=('fa11560a45793bd9fa45c1295a6f4a91' + 'e2c8bc316efe40532c5b9d7f9a1d8d62') diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index b8de218c1..839e369a6 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159287 2012-05-20 22:11:21Z stephane $ +# $Id: PKGBUILD 166149 2012-09-04 22:56:21Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi -pkgver=1.6 -pkgrel=2 +pkgver=1.6.1 +pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" @@ -11,10 +11,8 @@ depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc') [ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2 - openmpi-hostfile.patch) -sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367' - 'a76da03418a106d57cfd020d0f8d887d7ec9225b') +source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('1ccff71e3775c80c5a553f30104d663e1226baab') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,9 +25,6 @@ build() { # Make sure we use the system ltdl librariry rather than the ones in the tarball rm -r opal/libltdl - # Search for openmpi-default-hostfile in /etc/openmpi - patch -Np1 -i ../openmpi-hostfile.patch - ./configure --prefix=/usr \ --sysconfdir=/etc/${pkgname} \ --mandir=/usr/share/man \ diff --git a/extra/php-apc/PKGBUILD b/extra/php-apc/PKGBUILD index c72063e03..ef8da365c 100644 --- a/extra/php-apc/PKGBUILD +++ b/extra/php-apc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165375 2012-08-16 20:55:01Z pierre $ +# $Id: PKGBUILD 166404 2012-09-07 16:52:02Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=php-apc -pkgver=3.1.12 +pkgver=3.1.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' @@ -11,7 +11,7 @@ depends=('php') license=('PHP') source=("http://pecl.php.net/get/APC-${pkgver}.tgz") backup=('etc/php/conf.d/apc.ini') -md5sums=('b0ab91726717f410dfa284d5d1723b60') +md5sums=('c9e47002e3a67ebde3a6f81437c7b6e0') build() { cd $srcdir/APC-$pkgver diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 565acfb04..adef636f2 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 163504 2012-07-13 16:36:15Z tpowa $ +# $Id: PKGBUILD 166385 2012-09-07 12:55:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,13 @@ depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'blue backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 - 65-kvm.rules - qemu-glibc-2.16-build.patch) + 65-kvm.rules) options=(!strip) build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's/lib64/lib/g' x86_64.ld - # patch from fedora git: http://pkgs.fedoraproject.org/gitweb/?p=qemu.git - # fix changes from glibc-2.16 - patch -Np1 -i ../qemu-glibc-2.16-build.patch ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -46,6 +42,8 @@ package() { done } -md5sums=('f691baa30e8fb40f37f2797fba892e12' +md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61' 'b316a066d2f1bb57d8f5b7ea1d0d1caf' '8687179e77ab954c4a43017d030f7349') +md5sums=('78eb1e984f4532aa9f2bdd3c127b5b61' + 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD new file mode 100644 index 000000000..6ba997c51 --- /dev/null +++ b/extra/qpdf/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 166374 2012-09-07 06:46:11Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Miguel Revilla <yo at miguelrevilla.com> +# Contributor: David Sotelo <dvsotelo at gmail.com> +# Contributor: Nuno Araujo <nuno.araujo@russo79.com> + +pkgname=qpdf +pkgver=3.0.2 +pkgrel=1 +pkgdesc="QPDF: A Content-Preserving PDF Transformation System" +arch=('i686' 'x86_64') +url="http://qpdf.sourceforge.net/" +license=('custom:Artistic-2.0') +depends=('pcre' 'perl') +makedepends=('make') +options=('!libtool') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('af6f6f964481295a6ca0766185bfa274') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix rpath errors (from Fedora spec) + autoreconf -vfi + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + + mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname} + install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/ +} diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 8f1e4f199..d0464cec0 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 162741 2012-06-29 11:34:22Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 166361 2012-09-06 21:54:10Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') pkgver=2.6.2 -pkgrel=1 +pkgrel=2 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" @@ -52,7 +51,7 @@ package_qscintilla() { } package_python-qscintilla-common() { - pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" + pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla" depends=('qscintilla') cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD new file mode 100644 index 000000000..70a61c17b --- /dev/null +++ b/extra/sbc/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 166341 2012-09-06 18:04:29Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=sbc +pkgver=1.0 +pkgrel=1 +pkgdesc="Bluetooth Subband Codec (SBC) library" +arch=('i686' 'x86_64') +url="http://www.bluez.org/" +license=('GPL' 'LGPL') +depends=('glibc') +options=(!libtool) +source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz) +md5sums=('aa2bc39c4a09aade064efea4bbbc4b2d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-tester + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index d7fdee331..cf6cf6781 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 161621 2012-06-12 15:12:59Z andyrtr $ +# $Id: PKGBUILD 166020 2012-09-04 10:20:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071300 +_amalgamationver=3071400 _amalgamationver2=${_amalgamationver/00/} #pkgver=${_amalgamationver2//0/.} -pkgver=3.7.13 +pkgver=3.7.14 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -md5sums=('c97df403e8a3d5b67bb408fcd6aabd8e' +md5sums=('6464d429b1396a8db35864e791673b65' 'c1cdbc5544034d9012e421e75a5e4890') build() { diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index 8ab32de45..ab2f90bc3 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161975 2012-06-17 20:22:44Z ronald $ +# $Id: PKGBUILD 166485 2012-09-08 09:30:15Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium -pkgver=0.11.3 +pkgver=0.11.4 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64" 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('8ee73f5ddde320f5912243b6353b1d92ca52562c' +sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD index 332cb5a36..a27856a13 100644 --- a/extra/swt/PKGBUILD +++ b/extra/swt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161779 2012-06-13 21:37:16Z guillaume $ +# $Id: PKGBUILD 166495 2012-09-08 11:23:32Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=swt -pkgver=3.7.2 +pkgver=4.2 pkgrel=1 -_date=201202080800 +_date=201206081400 pkgdesc="An open source widget toolkit for Java" arch=('i686' 'x86_64') url="http://www.eclipse.org/swt/" @@ -13,24 +13,21 @@ optdepends=('libgnomeui' 'mesa' 'libwebkit') makedepends=('java-environment' 'libxtst' 'mesa' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant') if [ "${CARCH}" = "i686" ]; then _carch=x86 - md5sums=('9a858b11e66de8af41786eaf09fc9ee2' - 'f5e548bc26a0f1f3c18131be76face40') + md5sums=('3efe0404f6129183abae46f7620fe14f' + '2f556ab534fc2488c6e8c0ee6c02825c') fi if [ "${CARCH}" = "x86_64" ]; then _carch=x86_64 - md5sums=('b16ab5c9d274b9488432ebeae6e4af5a' - 'f5e548bc26a0f1f3c18131be76face40') + md5sums=('9e06b576116ff409f395571603582827' + '2f556ab534fc2488c6e8c0ee6c02825c') fi -source=(http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip +source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip build-swt.xml) -noextract=(swt-${pkgver}-gtk-linux-${_carch}.zip) # To test this pkg: # http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse -# http://download.eclipse.org/eclipse/downloads/drops/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip build() { cd ${srcdir} - unzip -oq swt-${pkgver}-gtk-linux-${_carch}.zip src.zip unzip -oq src.zip -d src . /etc/profile.d/jdk.sh diff --git a/extra/swt/build-swt.xml b/extra/swt/build-swt.xml index ea775871b..a161204f8 100644 --- a/extra/swt/build-swt.xml +++ b/extra/swt/build-swt.xml @@ -8,7 +8,7 @@ </target> <target name="compile" depends="init" description="Compile the SWT toolset"> - <javac srcdir="${src}" destdir="${build}"/> + <javac srcdir="${src}" destdir="${build}" target="1.6" /> </target> <target name="jar"> diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD index 37869770f..1eb9ed819 100644 --- a/extra/tomcat-native/PKGBUILD +++ b/extra/tomcat-native/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua pkgname=tomcat-native -pkgver=1.1.23 +pkgver=1.1.24 pkgrel=1 pkgdesc="The Apache Tomcat Native Library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=("Apache") depends=('apr' 'openssl') makedepends=('java-environment') source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz) -md5sums=('f2a55b5a19adbe491edc98e0c11d9028') +md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21') build() { cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native" diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD index c798669a2..88a6d04d8 100644 --- a/extra/unison/PKGBUILD +++ b/extra/unison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161432 2012-06-11 13:29:15Z tpowa $ +# $Id: PKGBUILD 166409 2012-09-07 16:52:52Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=unison -pkgver=2.40.63 -pkgrel=4 +pkgver=2.40.65 +pkgrel=1 pkgdesc="Unison is a file-synchronization tool" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -11,10 +11,9 @@ url="http://www.cis.upenn.edu/~bcpierce/unison" depends=('glibc') makedepends=('ocaml' 'lablgtk2' 'imagemagick') optdepends=('gtk2: for gtk2 support') -source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/$pkgname-$pkgver.tar.gz +source=(http://www.cis.upenn.edu/~bcpierce/unison/download/releases/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz $pkgname.desktop) -md5sums=('3281207850cf6f0a17fe73f371893bd3' - '2daecba7705455a8e4b769e48b059872') + options=(!makeflags) build() { @@ -51,3 +50,5 @@ package() { # make versioned symlink #29827 ln -s unison unison-2.40 } +md5sums=('ade42565aa0f94834664040108119f5e' + '2daecba7705455a8e4b769e48b059872') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index fc79496e7..1097daa5c 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163486 2012-07-13 05:33:54Z tdziedzic $ +# $Id: PKGBUILD 166321 2012-09-06 07:34:07Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=600 -__hgrev=11d40fc82f11 +_patchlevel=659 +__hgrev=1052677493be _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,8 +21,8 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('a1c54bde75476ace5d24d4c17f7a81818e80dfda' - '14d62fe89d8292a6d2f7c46e8c61bd59bbd01083' +sha1sums=('5f9bc51f6935368edda0aab6251d2c5cd5350acd' + 'cb2b2c50a9582e27fe71ac77fc9191122adf0a44' '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' '3494baf53a63581ba69f86a81293640ff681c5c5' '25dd3c2ce436e73a367c8f73b68f7f6889682437' @@ -55,7 +55,11 @@ mksource() { } build() { - cd "${srcdir}" + # remove -O2 because there is a crash with python because of it + # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196 + #export CFLAGS="${CFLAGS/-O2 /}" + + #cd "${srcdir}" cp -a ${pkgname}-${pkgver} vim-build diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD index 569da6710..4896f9951 100644 --- a/extra/xchm/PKGBUILD +++ b/extra/xchm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 144000 2011-12-01 15:58:58Z giovanni $ +# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=xchm -pkgver=1.20 -pkgrel=2 +pkgver=1.21 +pkgrel=1 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64' 'mips64el') url="http://xchm.sourceforge.net/" @@ -13,7 +13,7 @@ install=xchm.install source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" 'xchm.desktop' 'xchm.xml') -md5sums=('85943645d20af536704a20b58ebd5849' +md5sums=('9bfe439ce94554ebae95d84f7a1db8e7' '31fb9692b9ee9f2a205f58b9ff4bc4fe' '4102b0a393f5c60236143cc034664dd0') diff --git a/extra/xchm/xchm.install b/extra/xchm/xchm.install index 1ad77f9aa..df90cb5ac 100644 --- a/extra/xchm/xchm.install +++ b/extra/xchm/xchm.install @@ -1,5 +1,5 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null } @@ -9,7 +9,7 @@ post_upgrade() { } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q update-mime-database usr/share/mime > /dev/null } diff --git a/extra/xcompmgr/PKGBUILD b/extra/xcompmgr/PKGBUILD index 132f43605..1160d1a04 100644 --- a/extra/xcompmgr/PKGBUILD +++ b/extra/xcompmgr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150240 2012-02-15 16:46:01Z andyrtr $ +# $Id: PKGBUILD 166176 2012-09-05 07:11:03Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Leslie P. Polzer <leslie.polzer@gmx.net> pkgname=xcompmgr pkgver=1.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Composite Window-effects manager for X.org" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,11 +12,15 @@ license=('custom') depends=('libxcomposite' 'libxdamage' 'libxrender' 'libxext') conflicts=('xapps') replaces=('xapps') -source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a9cf78ea32bac51ff584115381f195566b164fe3') +source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2 + fix_broken_shadows.diff) +sha1sums=('a9cf78ea32bac51ff584115381f195566b164fe3' + '435f9f0ad652bdd759f822514bf1559abf119ffe') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix broken shadows in openbox - patch takern from https://bugs.freedesktop.org/show_bug.cgi?id=46285 + patch -Np0 -i ${srcdir}/fix_broken_shadows.diff ./configure --prefix=/usr make } diff --git a/extra/xcompmgr/fix_broken_shadows.diff b/extra/xcompmgr/fix_broken_shadows.diff new file mode 100644 index 000000000..39b8ac725 --- /dev/null +++ b/extra/xcompmgr/fix_broken_shadows.diff @@ -0,0 +1,28 @@ +--- xcompmgr.c 2011-11-19 01:49:52.000000000 -0600 ++++ xcompmgr.c 2012-08-11 21:58:58.000000000 -0500 +@@ -1028,7 +1028,6 @@ + { + w->borderClip = XFixesCreateRegion (dpy, NULL, 0); + XFixesCopyRegion (dpy, w->borderClip, region); +- XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); + } + w->prev_trans = t; + t = w; +@@ -1080,6 +1079,8 @@ + if (w->mode == WINDOW_TRANS) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; +@@ -1099,6 +1100,8 @@ + else if (w->mode == WINDOW_ARGB) + { + int x, y, wid, hei; ++ XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize); ++ XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip); + #if HAS_NAME_WINDOW_PIXMAP + x = w->a.x; + y = w->a.y; diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 62bbad9bc..15a88f597 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164022 2012-07-24 15:38:49Z andyrtr $ +# $Id: PKGBUILD 166181 2012-09-05 07:54:00Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) @@ -15,7 +15,7 @@ replaces=('openchrome' 'xf86-video-via') options=('!libtool' '!emptydirs' '!makeflags') conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.99.902' 'unichrome-dri') source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('6916be0deaff4a07974590dcef1bc37a1a59e5df') +sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83') build() { cd "${srcdir}/${pkgname}-${pkgver}" |