diff options
239 files changed, 1617 insertions, 5506 deletions
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 1b1e71bbb..99a1f8681 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $ +# $Id: PKGBUILD 93409 2013-07-03 10:50:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox -pkgver=1.20.2 -pkgrel=5 +pkgver=1.21.1 +pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") url="http://www.busybox.net" @@ -13,8 +13,8 @@ makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) install=busybox.install -md5sums=('e025414bc6cd79579cc7a32a45d3ae1c' - '09d4562ee4a9ab5415be44b945bfc7e2') +md5sums=('795394f83903b5eec6567d51eebb417e' + '3fbd88dc6327ff0455c17409efdbab79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index 7bf2a83ac..04beb0630 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -10,5 +10,5 @@ pre_upgrade() { post_upgrade() { [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox busybox rm -f tmp/busybox.upgrade.script - echo "busybox is un /usr/bin now. Readjust its mode if you modified it." + echo "busybox is in /usr/bin now. Readjust its mode if you modified it." } diff --git a/community/busybox/config b/community/busybox/config index 197f11f8b..b89c59b12 100644 --- a/community/busybox/config +++ b/community/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Sun Jul 8 21:35:17 2012 +# Busybox version: 1.21.1 +# Wed Jul 3 14:35:32 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/run" CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y @@ -49,7 +50,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set CONFIG_CMP=y @@ -616,9 +618,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_HFS=y CONFIG_FEATURE_VOLUMEID_JFS=y CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_UDF=y @@ -626,6 +630,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y @@ -898,6 +903,13 @@ CONFIG_POWERTOP=y CONFIG_PSTREE=y CONFIG_PWDX=y CONFIG_SMEMCAP=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FREE=y @@ -918,13 +930,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -CONFIG_FEATURE_TOPMEM=y # CONFIG_FEATURE_SHOW_THREADS is not set CONFIG_WATCH=y @@ -1019,6 +1024,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_FEATURE_KMSG_SYSLOG=y CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# CONFIG_FEATURE_KLOGD_KLOGCTL=y CONFIG_LOGGER=y diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index 129fa3fc9..09198d579 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61256 2011-12-26 12:59:57Z spupykin $ +# $Id: PKGBUILD 93457 2013-07-03 13:50:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=calc -pkgver=2.12.4.4 +pkgver=2.12.4.8 pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=('GPL') depends=(glibc) #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) -md5sums=('1ad16a9304df7137cd8626a1f50b6aae') +md5sums=('38694f375e172f0b830d4dbf9d6f2dcc') build() { cd $srcdir/calc-$pkgver @@ -53,6 +53,10 @@ build() { EOF make -j1 +} + +package() { + cd $srcdir/calc-$pkgver make T=$pkgdir install mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ } diff --git a/community/celt0.5.1/PKGBUILD b/community/celt0.5.1/PKGBUILD new file mode 100644 index 000000000..f2a4fa2e5 --- /dev/null +++ b/community/celt0.5.1/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Lauri Niskanen <ape@ape3000.com> +# Contributor: Ray Rashif <schivmeister@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> + +pkgname=celt0.5.1 +_basename=celt +pkgver=0.5.1.3 +pkgrel=1 +pkgdesc="Low-latency audio communication codec - SPICE version" +arch=(i686 x86_64) +url="http://www.celt-codec.org" +license=('BSD') +depends=('libogg') +provides=('celt=0.5.1') +options=('!libtool') +source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz) +md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190') + +build() { + cd "$srcdir/celt-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/celt-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/BSD" +} diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index f193f2ea9..bfe8cfe44 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92241 2013-06-03 10:26:07Z spupykin $ +# $Id: PKGBUILD 93423 2013-07-03 11:48:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.3pre -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -12,7 +12,8 @@ makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8. 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git') optdepends=('libldap: for LDAP authentication' - 'libsieve: for dbmail-sieve') + 'libsieve: for dbmail-sieve' + 'python2-mysql2pgsql: migrate from MySQL to PostreSQL') url="http://www.dbmail.org" license=('GPL') options=('!libtool' 'zipman') @@ -58,6 +59,7 @@ package() { install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ + cp -a contrib $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index 7a5f4fddf..a255ab991 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 93367 2013-07-02 09:47:24Z fyan $ +# $Id: PKGBUILD 93398 2013-07-03 05:13:18Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-libpinyin pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" arch=('i686' 'x86_64') url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') depends=('fcitx' 'libpinyin' 'fcitx-qt4' 'qtwebkit') makedepends=('cmake' 'intltool' 'wget') -source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz" + "https://github.com/fcitx/fcitx-libpinyin/commit/7a68b40e36bd3425dae847a3860057a951ec5e78.patch") install=$pkgname.install build() { cd "$srcdir/${pkgname}-${pkgver}" + # Fix importdict + patch -p1 -i ../7a68b40e36bd3425dae847a3860057a951ec5e78.patch + rm -rf build mkdir build cd build @@ -32,4 +36,5 @@ package() { make DESTDIR="${pkgdir}" install } -sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762') +sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762' + '0b4776d348db9616d9bd4485fe7950a5c88f349388a4dc97e0ec62beaf0d6729ba88c645b1f83d415af8c5808cde3aae4b8306fd65e21bd404e9a8105d5bcae0') diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 050c3bc2c..9ba45c2a7 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92950 2013-06-20 08:29:35Z bluewind $ +# $Id: PKGBUILD 93466 2013-07-03 21:46:52Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.1 +pkgver=3.7.1.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('be19e8c157e81f94048ed3b1e3031b07') +md5sums=('52c6f764b2f4a94b1781da42b2bbb9b5') diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 0c64c1d6d..c046302a6 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88685 2013-04-21 22:16:59Z heftig $ +# $Id: PKGBUILD 93459 2013-07-03 14:24:20Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver pkgver=3.6.1 -pkgrel=3 +pkgrel=4 pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64') license=('GPL') @@ -13,6 +13,7 @@ url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop') makedepends=('intltool' 'gnome-common') +optdepends=('gnome-themes-standard: default background') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam move-desktop-file.patch diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD index ff888ec34..d51d4d328 100644 --- a/community/gwget/PKGBUILD +++ b/community/gwget/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70413 2012-05-05 16:24:44Z bgyorgy $ +# $Id: PKGBUILD 93450 2013-07-03 13:33:10Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org> @@ -7,7 +7,7 @@ pkgname=gwget pkgver=1.0.4 -pkgrel=5 +pkgrel=6 pkgdesc="Download manager for GNOME" arch=('i686' 'x86_64') url="http://projects.gnome.org/gwget/" @@ -22,7 +22,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f' '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76' '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8' - '72506677886deb5fc2436c667e2f79ed868ce9384cad77b9a97ec68e41ae45c3') + '465216f441271fffdd4530bc07829e733e0d3476fdc34f1f028da82cfc05373d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch index 30a121f25..7f1f551a6 100644 --- a/community/gwget/drop-libgnomeui.patch +++ b/community/gwget/drop-libgnomeui.patch @@ -1,6 +1,6 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac ---- gwget-1.0.4.orig/configure.ac 2009-10-17 22:26:09.000000000 +0200 -+++ gwget-1.0.4/configure.ac 2012-03-10 01:09:09.246869284 +0100 +--- gwget-1.0.4.orig/configure.ac 2013-07-03 14:43:02.845220000 +0200 ++++ gwget-1.0.4/configure.ac 2013-07-03 14:43:57.003180469 +0200 @@ -14,15 +14,13 @@ AM_GCONF_SOURCE_2 @@ -21,7 +21,7 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c --- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c 2009-06-16 19:58:06.000000000 +0200 -+++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2012-03-10 01:09:09.260201828 +0100 ++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2013-07-03 14:43:57.003180469 +0200 @@ -21,8 +21,8 @@ #include <config.h> @@ -35,7 +35,7 @@ diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/s diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c --- gwget-1.0.4.orig/src/gwget-application.c 2009-06-20 10:12:37.000000000 +0200 -+++ gwget-1.0.4/src/gwget-application.c 2012-03-10 01:09:09.263534966 +0100 ++++ gwget-1.0.4/src/gwget-application.c 2013-07-03 14:43:57.003180469 +0200 @@ -21,8 +21,6 @@ #include "gwget-application.h" @@ -95,7 +95,7 @@ diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-applic diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c --- gwget-1.0.4.orig/src/main.c 2009-06-20 10:12:37.000000000 +0200 -+++ gwget-1.0.4/src/main.c 2012-03-10 01:09:09.273534378 +0100 ++++ gwget-1.0.4/src/main.c 2013-07-03 14:43:57.003180469 +0200 @@ -17,11 +17,13 @@ #include <config.h> @@ -146,7 +146,7 @@ diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c } diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c --- gwget-1.0.4.orig/src/main_window.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/main_window.c 2012-03-10 01:09:09.276867514 +0100 ++++ gwget-1.0.4/src/main_window.c 2013-07-03 14:46:01.992833090 +0200 @@ -15,7 +15,9 @@ */ @@ -158,9 +158,46 @@ diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c #include <gconf/gconf-client.h> #include <glib/gstdio.h> #include <string.h> +@@ -118,20 +120,22 @@ + toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1")); + toolbar_setting = gconf_client_get_string(gconf_client,"/desktop/gnome/interface/toolbar_style",NULL); + +- if (!strcmp(toolbar_setting,"icons")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS); +- } +- +- if (!strcmp(toolbar_setting,"both")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH); +- } +- +- if (!strcmp(toolbar_setting,"both-horiz")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ); +- } +- +- if (!strcmp(toolbar_setting,"text")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT); ++ if (toolbar_setting!=NULL) { ++ if (!strcmp(toolbar_setting,"icons")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS); ++ } ++ ++ if (!strcmp(toolbar_setting,"both")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH); ++ } ++ ++ if (!strcmp(toolbar_setting,"both-horiz")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ); ++ } ++ ++ if (!strcmp(toolbar_setting,"text")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT); ++ } + } + + /* Listen to changes to the key. */ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c --- gwget-1.0.4.orig/src/main_window_cb.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/main_window_cb.c 2012-03-10 01:07:57.131122811 +0100 ++++ gwget-1.0.4/src/main_window_cb.c 2013-07-03 14:43:57.003180469 +0200 @@ -15,7 +15,9 @@ */ @@ -172,7 +209,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. #include <gconf/gconf-client.h> #include <signal.h> -@@ -217,7 +220,10 @@ +@@ -217,7 +219,10 @@ gchar *size; int width = 16, height = 16; gdouble perc; @@ -184,7 +221,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. gtk_list_store_append (GTK_LIST_STORE(model), &iter); size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024); gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url, -@@ -243,10 +249,15 @@ +@@ -243,10 +248,15 @@ theme = gtk_icon_theme_get_default (); if (!gwgetdata->recursive) { content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL); @@ -205,7 +242,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. width *= 2; diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c --- gwget-1.0.4.orig/src/new_window.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/new_window.c 2012-03-10 01:09:09.283533785 +0100 ++++ gwget-1.0.4/src/new_window.c 2013-07-03 14:43:57.003180469 +0200 @@ -24,7 +24,8 @@ */ @@ -217,8 +254,8 @@ diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c #include "new_window.h" #include "main_window.h" diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c ---- gwget-1.0.4.orig/src/systray.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/systray.c 2012-03-10 01:09:09.290200060 +0100 +--- gwget-1.0.4.orig/src/systray.c 2013-07-03 14:43:02.845220000 +0200 ++++ gwget-1.0.4/src/systray.c 2013-07-03 14:43:57.006513881 +0200 @@ -1,6 +1,7 @@ #include <config.h> @@ -230,7 +267,7 @@ diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c #include "systray.h" diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c --- gwget-1.0.4.orig/src/utils.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/utils.c 2012-03-10 01:09:09.296866335 +0100 ++++ gwget-1.0.4/src/utils.c 2013-07-03 14:43:57.006513881 +0200 @@ -14,7 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -243,7 +280,7 @@ diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c #include "gwget_data.h" diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c --- gwget-1.0.4.orig/src/wget-log.c 2009-10-04 20:29:35.000000000 +0200 -+++ gwget-1.0.4/src/wget-log.c 2012-03-10 01:09:09.306865743 +0100 ++++ gwget-1.0.4/src/wget-log.c 2013-07-03 14:43:57.006513881 +0200 @@ -25,7 +25,9 @@ #define _FILE_OFFSET_BITS 64 diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index 4eb8fb140..a60ccc44f 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87005 2013-03-25 19:16:45Z bpiotrowski $ +# $Id: PKGBUILD 93464 2013-07-03 19:08:14Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: shamrok <szamrok@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> @@ -7,14 +7,14 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64') url="http://extragear.kde.org/apps/krecipes/" license=('GPL') depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4' 'docbook-xsl') -optdepends=('matriadb' 'postgresql') +optdepends=('mariadb' 'postgresql') install=${pkgname}.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz) md5sums=('4c01ccad7ad1409cb35c824a61250fe2') diff --git a/community/libvirt-glib/PKGBUILD b/community/libvirt-glib/PKGBUILD new file mode 100644 index 000000000..f04454542 --- /dev/null +++ b/community/libvirt-glib/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 93427 2013-07-03 12:11:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Stefano Facchini <stefano.facchini@gmail.com> + +pkgname=libvirt-glib +pkgver=0.1.6 +pkgrel=1 +pkgdesc="GLib bindings for libvirt" +arch=('i686' 'x86_64') +url="http://libvirt.org" +license=('LGPL2.1') +depends=('libvirt' 'glib2' 'gobject-introspection' 'python2') +options=('!libtool') +source=(ftp://libvirt.org/libvirt/glib/$pkgname-$pkgver.tar.gz) +sha256sums=('274b88584db94bb5d404e5398d6b5ef184afad49a2e4b3f4f6c47ba940bf55bf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python2-fonttools/PKGBUILD b/community/python2-fonttools/PKGBUILD index ea307d2f5..424946513 100644 --- a/community/python2-fonttools/PKGBUILD +++ b/community/python2-fonttools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76250 2012-09-15 08:59:17Z aginiewicz $ +# $Id: PKGBUILD 93407 2013-07-03 09:46:05Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Firmicus <firmicus āt gmx dōt net> pkgname=python2-fonttools -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="Converts OpenType and TrueType fonts to and from XML" url="http://sourceforge.net/projects/fonttools/" @@ -14,7 +14,7 @@ makedepends=("python2-distribute") provides=('fonttools') # temporary compatibility because of rename replaces=('fonttools') source=(http://downloads.sourceforge.net/fonttools/fonttools-$pkgver.tar.gz) -md5sums=('502cdf6662e1d075f1902fbd995eaace') +md5sums=('41b2d2be48214d2af848e04fded54689') build() { cd "$srcdir"/fonttools-$pkgver diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD deleted file mode 100644 index 1ded32b4f..000000000 --- a/community/smc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 90091 2013-05-06 19:39:36Z foutrelis $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Kritoke <typeolinux@yahoo.com> - -pkgname=smc -pkgver=1.9 -pkgrel=21 -pkgdesc="Secret Maryo Chronicles" -arch=('i686' 'x86_64') -url="http://www.secretmaryo.org/" -license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') -makedepends=('autoconf' 'automake' 'boost') -source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 - smc-for-cegui-v0-7.diff - boost_filesystem3.diff - smc.desktop - smc.png) -md5sums=('75ab7826303c49aec25b052a8b90287f' - '51dfea21b741ad19df14e738df52f1cf' - '309a5a6d4b3c0b3dc5e1b7f4de84086f' - '80fe208132ff41dd7677a53ee429ecdb' - 'efca7580e28748625eb676c9d24ee122') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # to remove when smc will be compatible with cegui-0.7.x - patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" - # fix compilation - export CXXFLAGS="${CXXFLAGS} -fpermissive" - # fix for boost >= 1.50 - patch -Np1 -i "${srcdir}/boost_filesystem3.diff" - - ./autogen.sh - LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make install DESTDIR="$pkgdir" - # install some freedesktop.org compatibility - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - - rm -rf "$pkgdir/usr/share/smc/" -} diff --git a/community/smc/boost_filesystem3.diff b/community/smc/boost_filesystem3.diff deleted file mode 100644 index 6786b98f5..000000000 --- a/community/smc/boost_filesystem3.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp ---- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 12:11:18.000000000 +0200 -+++ smc-1.9.new/src/core/filesystem/filesystem.cpp 2012-07-12 15:36:31.361941069 +0200 -@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files( - if( fs::is_directory( *dir_itr ) ) - { - // ignore hidden directories -- if( dir_itr->path().leaf().find( "." ) == 0 ) -+ if( dir_itr->path().filename().string().find( "." ) == 0 ) - { - continue; - } - - if( with_directories ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - - // load all items from the sub-directory - if( search_in_sub_directories ) - { -- vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); -+ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories ); - valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); - } - } - // valid file -- else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) -+ else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - } - catch( const std::exception &ex ) -diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp ---- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 18:44:52.000000000 +0200 -+++ smc-1.9.new/src/overworld/world_manager.cpp 2012-07-12 15:37:13.564660591 +0200 -@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con - {
- try
- {
-- std::string current_dir = dir_itr->path().leaf();
-+ std::string current_dir = dir_itr->path().filename().string();
-
- // only directories with an existing description
- if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
diff --git a/community/smc/smc-for-cegui-v0-7.diff b/community/smc/smc-for-cegui-v0-7.diff deleted file mode 100644 index a99cbce6c..000000000 --- a/community/smc/smc-for-cegui-v0-7.diff +++ /dev/null @@ -1,437 +0,0 @@ -diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 -@@ -53,7 +53,7 @@ - AC_MSG_ERROR([SDL_ttf library not found])) - - # Check for the CEGUI library --PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) -+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) - CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" - LIBS="$LIBS $CEGUI_LIBS" - -diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 -@@ -118,16 +118,10 @@ - return tmp;
- }
-
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- // draw text
-- list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
-- // draw text
-- list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+ list_text->draw( buffer, targetRect, alpha, clipper );
- }
-
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@ - if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- {
- // Listbox dimension
-- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
-- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- // Vertical ScrollBar Position
- float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- // font height
-- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
-
- // draw items
- for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 -@@ -62,8 +62,7 @@ - */
- virtual CEGUI::Size getPixelSize( void ) const;
- // draw
-- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
-- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- // draw image
- void Draw_Image( void );
-
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 -@@ -265,7 +265,7 @@ -
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- // fixme : Can't handle multiple lines of text
- float text_width = font->getTextExtent( text ) * global_downscalex;
-
-@@ -1182,7 +1182,7 @@ - text_default->setText( gui_text );
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@ - text_default->moveToFront();
-
- // set window height
-- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
-
- while( draw )
- {
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 -@@ -444,13 +444,15 @@ - - if( pGuiSystem ) - { -- delete pGuiSystem; -+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); -+ pGuiSystem->destroy(); - pGuiSystem = NULL; -+ delete rp; - } - - if( pGuiRenderer ) - { -- delete pGuiRenderer; -+ pGuiRenderer->destroy( *pGuiRenderer ); - pGuiRenderer = NULL; - } - -@@ -507,7 +509,7 @@ - } - case SDL_VIDEORESIZE: - { -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); - break; - } - case SDL_KEYDOWN: -diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 -@@ -946,7 +946,7 @@ - m_text_debug_text->setVisible( 1 );
-
- // update position
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -432,17 +432,12 @@ -
- void cMouseCursor :: Render( void ) const
- {
-- if( !m_active )
-- {
-+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+ if ( m_active == mouse->isVisible() )
- return;
-- }
-
-- // Render CEGUI Mouse
-- pGuiRenderer->setQueueingEnabled( 0 );
-- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-- mouse->setVisible( 1 );
-- mouse->draw();
-- mouse->setVisible( 0 );
-+ mouse->setVisible( m_active );
- }
-
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 -@@ -163,8 +163,8 @@ - editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- // preview window
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
-- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
-
- Update_BG_Colors( CEGUI::EventArgs() );
-
-@@ -555,8 +555,8 @@ -
- // set default rect
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
-- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
-
- if( !File_Exists( filename ) )
- {
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -1663,7 +1663,7 @@ - window_name->setText( name );
- window_name->setTooltipText( tooltip );
- // get text width
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- // all names should have the same width
- if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 -@@ -103,15 +103,15 @@ -
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-
--cFake_Renderer :: cFake_Renderer( void )
--{
-- d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+// d_identifierString = "Fake Renderer";
-+//}
-
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
-
--}
-+//}
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
-
-@@ -158,7 +158,7 @@ - std::string log_dump_dir = "/dev/null";
- #endif
- // create fake system and renderer
-- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
-
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@ - CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
-
-- delete pGuiSystem;
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
- delete renderer;
- delete rp;
-@@ -177,7 +177,7 @@ - // create renderer
- try
- {
-- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@ - exit( EXIT_FAILURE );
- }
-
-- /* create Resource Provider
-- * no need to destroy it later since it is handled by the CEGUI renderer
-- */
-- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+ pGuiRenderer->enableExtraStateSettings(true);
-+
-+ // create Resource Provider
-+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
-
- // set Resource Provider directories
- rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@ - // create system
- try
- {
-- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@ - // load the scheme file, which auto-loads the imageset
- try
- {
-- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@ - // default mouse cursor
- pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- // force new mouse image
-- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
-- // hide CEGUI mouse always because we render it manually
-- CEGUI::MouseCursor::getSingleton().hide();
-+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- // default tooltip
- pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- // create default root window
-@@ -553,7 +551,7 @@ - pFont->Restore_Textures();
-
- // send new size to CEGUI
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-
- // check if CEGUI is initialized
- bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 -@@ -23,7 +23,7 @@ - #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
-
- namespace SMC
- {
-@@ -129,31 +129,100 @@ - EFFECT_IN_AMOUNT
- };
-
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+ void draw() const {}
-+ void setTranslation(const CEGUI::Vector3&) {}
-+ void setRotation(const CEGUI::Vector3&) {}
-+ void setPivot(const CEGUI::Vector3&) {}
-+ void setClippingRegion(const CEGUI::Rect&) {}
-+ void appendVertex(const CEGUI::Vertex&) {}
-+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+ void setActiveTexture(CEGUI::Texture*) {}
-+ void reset() {}
-+ CEGUI::Texture* getActiveTexture() const { return 0; }
-+ CEGUI::uint getVertexCount() const { return 0; }
-+ CEGUI::uint getBatchCount() const { return 0; }
-+ void setRenderEffect(CEGUI::RenderEffect*) {}
-+ CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
-
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+ cFake_Texture() :
-+ m_size(1, 1),
-+ m_scaling(1, 1) {}
-+
-+ const CEGUI::Size& getSize() const { return m_size; }
-+ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+ void saveToMemory(void*) {}
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
-- cFake_Renderer( void );
-- virtual ~cFake_Renderer( void );
-+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+ void draw(const CEGUI::GeometryBuffer&) {}
-+ void draw(const CEGUI::RenderQueue&) {}
-+ void setArea(const CEGUI::Rect&) {}
-+ const CEGUI::Rect& getArea() const { return m_area; }
-+ bool isImageryCache() const { return false; }
-+ void activate() {}
-+ void deactivate() {}
-+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+ CEGUI::Rect m_area;
-+};
-
-- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
-- virtual void doRender(void) {};
-- virtual void clearRenderList(void) {};
-- virtual void setQueueingEnabled(bool setting) {};
-- virtual CEGUI::Texture *createTexture(void) { return NULL; };
-- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
-- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
-- virtual void destroyTexture(CEGUI::Texture* texture) {};
-- virtual void destroyAllTextures(void) {};
-- virtual bool isQueueingEnabled(void) const { return 0; };
-- virtual float getWidth(void) const { return 0; };
-- virtual float getHeight(void) const { return 0; };
-- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
-- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
-- virtual unsigned int getMaxTextureSize(void) const { return 0; };
-- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
-- virtual unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+ cFake_Renderer( void ) :
-+ m_size(0, 0),
-+ m_dpi(0, 0),
-+ m_identifierString("Fake Renderer"),
-+ m_root(m_target) {}
-+ ~cFake_Renderer( void ) {}
-+
-+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+ void destroyAllGeometryBuffers() {}
-+ CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+ void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+ void destroyAllTextureTargets() {}
-+ CEGUI::Texture& createTexture() { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+ void destroyTexture(CEGUI::Texture&) {}
-+ void destroyAllTextures() {}
-+ void beginRendering() {}
-+ void endRendering() {}
-+ void setDisplaySize(const CEGUI::Size&) {}
-+ const CEGUI::Size& getDisplaySize() const { return m_size; }
-+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+ CEGUI::uint getMaxTextureSize() const { return 0; }
-+ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_dpi;
-+ CEGUI::String m_identifierString;
-+ cFake_GeometryBuffer m_geometry;
-+ cFake_Texture m_texture;
-+ cFake_RenderTarget m_target;
-+ CEGUI::RenderingRoot m_root;
- };
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community/smc/smc.desktop b/community/smc/smc.desktop deleted file mode 100644 index 6cfe5b018..000000000 --- a/community/smc/smc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false
\ No newline at end of file diff --git a/community/smc/smc.png b/community/smc/smc.png Binary files differdeleted file mode 100644 index f02af1bfc..000000000 --- a/community/smc/smc.png +++ /dev/null diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD new file mode 100644 index 000000000..803951dfc --- /dev/null +++ b/community/spice-gtk3/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 93453 2013-07-03 13:44:50Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Stefano Facchini <stefano.facchini@gmail.com> +# Contributor: Jonathan Lestrelin <zanko@daemontux.org> +# Derived from the spice-gtk PKGBUILD by +# Contributor: Lucio Zara <pennega@gmail.com> + +pkgname=spice-gtk3 +pkgver=0.20 +pkgrel=2 +pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)." +arch=('x86_64' 'i686') +url="http://spice-space.org" +license=('GPL') +makedepends=('intltool' 'vala' 'python2-pyparsing' 'python2-gobject') +depends=('libpulse' 'gtk3' 'spice' 'libusb' 'usbredir') +conflicts=('spice-gtk') +options=('!libtool') +source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") +sha256sums=('b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df') + +build() { + cd "$srcdir/spice-gtk-$pkgver" + sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py + ./configure --prefix=/usr \ + --with-gtk=3.0 \ + --with-python \ + --enable-vala \ + --enable-smartcard=no + make +} + +package() { + cd "$srcdir/spice-gtk-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/spice/PKGBUILD b/community/spice/PKGBUILD new file mode 100644 index 000000000..7f033c5a5 --- /dev/null +++ b/community/spice/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 93446 2013-07-03 13:23:11Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=spice +pkgver=0.12.3 +pkgrel=1 +pkgdesc="SPICE client and server" +arch=('i686' 'x86_64') +url="http://spice-space.org" +license=('GPL') +makedepends=(python2 python2-pyparsing qemu mesa) +depends=(pixman spice-protocol alsa-utils libxrandr libxinerama libsasl openssl celt0.5.1 libgl glu) +source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('f33a682892f6793169f20298b2296449') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=python2 ./configure --prefix=/usr --enable-opengl --enable-client + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/usbredir/PKGBUILD b/community/usbredir/PKGBUILD new file mode 100644 index 000000000..7668e5247 --- /dev/null +++ b/community/usbredir/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 93438 2013-07-03 12:56:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Stefano Facchini <stefano.facchini@gmail.com> + +pkgname=usbredir +pkgver=0.6 +pkgrel=3 +pkgdesc="USB traffic redirection protocol" +arch=('i686' 'x86_64') +url="http://spice-space.org/page/UsbRedir" +license=('GPL2' 'LGPL2.1') +depends=('libusb') +options=(!libtool) +source=(http://spice-space.org/download/usbredir/$pkgname-$pkgver.tar.bz2) +sha256sums=('028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index c5397f236..96ba7fe0e 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187025 2013-06-03 11:15:04Z allan $ +# $Id: PKGBUILD 189480 2013-07-03 11:36:49Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed -pkgver=1.8 -pkgrel=2 +pkgver=1.9 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') @@ -13,7 +13,7 @@ depends=('glibc' 'sh') options=('!emptydirs') source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) install='ed.install' -md5sums=('2268d2344b3c52d23730acb2e3c942fe' +md5sums=('565b6d1d5a9a8816b9b304fc4ed9405d' 'SKIP') build() { diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index 8a3be4a9b..45a85307b 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166683 2012-09-15 15:22:53Z allan $ +# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=5 +pkgrel=6 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" @@ -20,15 +20,14 @@ source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} make-3.82-expensive_glob.patch make-3.82-dont-prune-intermediate.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c78daf24f4ec5900c8f81e89a6e1cd5a' - 'c8f496b22191f9fb9420ab14c1a19a47' + 'SKIP' + '8714ba22911a58ab3eb42ac3f4c6c3bd' '662e6450e19a5acdaa5c9fcb8ad78dea' '7d01a99f389d8f08dec93ed479071ee4' 'bc12ad4d0c6e6c0e72d9fb61054f446b' 'e58d4211c5b29d7d927a304d082849e7' '45ac9e987f4bf16c0d7e1685db943917') - build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/make/make-3.82-bug30612.patch b/core/make/make-3.82-bug30612.patch index fb843bcd9..9867a15b2 100644 --- a/core/make/make-3.82-bug30612.patch +++ b/core/make/make-3.82-bug30612.patch @@ -1,4 +1,3 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c --- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 +++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 @@ -1,3 +1,4 @@ @@ -64,3 +63,29 @@ diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c /* Find and set the new end. Massage names if necessary. */ while (1) +diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c +index c87d4a7..b012094 100644 +--- make-3.82-orig/read.c ++++ make-3.82-fix30612/read.c +@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, + nlen -= (n + 1) - tp; + tp = n + 1; + +- /* If we have just "lib(", part of something like +- "lib( a b)", go to the next item. */ +- if (! nlen) +- continue; +- + /* We can stop looking now. */ + break; + } + } + while (*e != '\0'); ++ ++ /* If we have just "lib(", part of something like "lib( a b)", ++ go to the next item. */ ++ if (! nlen) ++ continue; + } + } + diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 37075ff99..3c4cd5a6d 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166543 2012-09-10 09:44:48Z stephane $ +# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> @@ -20,20 +20,25 @@ sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' 'fcd0ebd029b305bf030983daf151a2a1ab5294af' '8a8be7c0686c6311c1ce969ba10494e704ead48c') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch + sed -i -e 's:-Werror::g' $(find -name Makefile.in) +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} CFLAGS+=" -g" # required for test-suite success - patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch ./configure --prefix=/usr --program-prefix="eu-" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD deleted file mode 100644 index ad3660c99..000000000 --- a/extra/freenx/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 174925 2013-01-09 04:17:20Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=freenx -pkgver=0.7.3 -pkgrel=15 -pkgdesc="Free Software (GPL) Implementation of the NX Server" -arch=(i686 x86_64) -url="http://freenx.berlios.de" -license=('GPL') -depends=('nx-common' 'nx-x11>=3.5.0.17' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' - 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') -optdepends=('cups: adds printing support') -makedepends=('imake') -options=('!makeflags') -conflicts=('nxserver') -provides=('nxserver') -backup=(etc/nxserver/node.conf) -install=freenx.install -source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz - keymap.patch - nxagent-startup.patch - freenx-latest-svn.patch - remove-dialog.patch - freenx-server-0.7.3-nxipp.patch) -md5sums=('856f597e139018f7ed62713c9d6c9ed5' - 'f0867659c925f6363fb2b7661f349248' - '30dc16d8e2093ff71d5834a169ad9d00' - '788f30322783cf2c2dc833e2e4d5e8ad' - 'cae1773312506eeefe6a8de07c492bd8' - 'b3244c52a6bafc6d9b528eb4d4426e36') - -build() { - # patch and install nxserver - cd $srcdir/$pkgname-server-$pkgver - # add latest svn fixes - patch -Np3 -i ../freenx-latest-svn.patch - # patch from inside nx - patch < gentoo-nomachine.diff - # patch broken keymap remapping - patch -Np0 -i ${srcdir}/keymap.patch - # patch nxagent startup to avoid login issues - patch -Np0 -i ${srcdir}/nxagent-startup.patch - # check for cups existance and then symlinks the backend - patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch - # remove broken dialog function - patch -Np0 -i ${srcdir}/remove-dialog.patch - sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig - sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample - sed -i -e "s:NX_DIR\/lib:NX_DIR\/X11:" nxloadconfig - sed -i -e 's,netcat,nc,g' nxloadconfig - sed -i -e 's/utmp/nx/g' nxsetup - sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig - sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig - sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample - sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig - sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig - sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup - sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig - sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig - sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig - sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig - sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig - sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig - sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample - sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog - - # python2 fix - sed -i -e 's:\/usr\/bin\/env\ python:\/usr\/bin\/env\ python2:' nx-session-launcher/nx-session-launcher - - # fix key generation - sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup - - make -} - -package() { - cd $srcdir/$pkgname-server-$pkgver - - make install DESTDIR="${pkgdir}" - - # create symlinks - install -dm755 ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - for file in ${pkgdir}/usr/lib/nx/bin/*; do - ln -sv /usr/lib/nx/bin/`basename $file` . - done - - mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf - - # create some missing nxserver directories - mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db} - mkdir -m700 -p $pkgdir/usr/lib/nx/share - - # remove files that are part of nxclient - rm -f ${pkgdir}/usr/lib/nx/bin/nxprint - rm -f ${pkgdir}/usr/bin/nxprint -} diff --git a/extra/freenx/freenx-latest-svn.patch b/extra/freenx/freenx-latest-svn.patch deleted file mode 100644 index bcc8ddd17..000000000 --- a/extra/freenx/freenx-latest-svn.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur freenx-server-0.7.3//ChangeLog ../trunk/freenx-server//ChangeLog ---- freenx-server-0.7.3//ChangeLog 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//ChangeLog 2011-01-26 23:23:36.850005855 +0100 -@@ -1,3 +1,20 @@ -+xx.11.2008 FreeNX 0.7.4 -+ * Opened the 0.7.4 development. -+ * Fixed missing export of NX_ETC_DIR in Makefile, -+ so node.conf.sample is installed correctly. -+ (fabianx@bat.berlios.de) -+ * Fixed broken round-robin load balance algorithm. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ load balancing case. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ usermode case. -+ (fabianx@bat.berlios.de) -+ * Fixed non-encrypted session mode. You might need to -+ set EXTERNAL_PROXY_IP in node.conf. -+ (fabianx@bat.berlios.de) -+ - 18.08.2008 FreeNX 0.7.3 "Priscilla One Year Edition" - * Opened the 0.7.3 development. - * Added logging of failed authentication attempts -diff -ur freenx-server-0.7.3//Makefile ../trunk/freenx-server//Makefile ---- freenx-server-0.7.3//Makefile 2008-08-18 04:16:25.000000000 +0200 -+++ ../trunk/freenx-server//Makefile 2011-01-26 23:23:36.856672521 +0100 -@@ -8,7 +8,7 @@ - all: - cd nxviewer-passwd && xmkmf && make Makefiles && make depend - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - for i in $(SUBDIRS) ; \ - do\ - echo "making" all "in $$i..."; \ -@@ -44,5 +44,5 @@ - - install: - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - $(MAKE) nxenv_install -diff -ur freenx-server-0.7.3//node.conf.sample ../trunk/freenx-server//node.conf.sample ---- freenx-server-0.7.3//node.conf.sample 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//node.conf.sample 2011-01-26 23:23:36.850005855 +0100 -@@ -37,7 +37,7 @@ - # - # https://mail.kde.org/mailman/listinfo/freenx-knx - # --# SVN: $Id: node.conf.sample 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: node.conf.sample 613 2008-09-01 20:42:31Z fabianx $ - - ######################################################################### - # General FreeNX directives -@@ -47,6 +47,11 @@ - # different than the default hostname (as returned by `hostname`) - #SERVER_NAME="$(hostname)" - -+# The node ip which is used by NX Node in unecnrypted session mode. -+# Set it if you want to use a specific external ip or the autodetection -+# is not working. -+#EXTERNAL_PROXY_IP="" -+ - # The port number where local 'sshd' is listening. - #SSHD_PORT=22 - -diff -ur freenx-server-0.7.3//nxloadconfig ../trunk/freenx-server//nxloadconfig ---- freenx-server-0.7.3//nxloadconfig 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxloadconfig 2011-01-26 23:23:36.856672521 +0100 -@@ -5,7 +5,7 @@ - # - # License: GPL, version 2 - # --# SVN: $Id: nxloadconfig 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxloadconfig 613 2008-09-01 20:42:31Z fabianx $ - # - # ======================================================================== - -@@ -52,7 +52,7 @@ - # DO NOT TOUCH unless you REALLY know what you are doing - ######################################################################### - --NX_VERSION=3.2.0-73 -+NX_VERSION=3.2.0-74-SVN - NX_LICENSE="OS (GPL, using backend: %BACKEND%)" - - # Where can different nx components be found -@@ -85,6 +85,7 @@ - # General FreeNX directives - - SERVER_NAME="$(hostname)" -+EXTERNAL_PROXY_IP="" - SSHD_PORT=22 - - # Authentication / Security directives -diff -ur freenx-server-0.7.3//nxnode ../trunk/freenx-server//nxnode ---- freenx-server-0.7.3//nxnode 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxnode 2011-01-26 23:23:36.853339188 +0100 -@@ -13,7 +13,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxnode 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxnode 613 2008-09-01 20:42:31Z fabianx $ - # - # 21.06.2004: - Full reconnection support - -@@ -1184,6 +1184,17 @@ - [ -z "$userip" -a "$host" = "127.0.0.1" ] && userip="127.0.0.1" - [ -z "$userip" ] && userip="*" - fi -+ -+ # We need our own external IP -+ proxyip="$EXTERNAL_PROXY_IP" -+ -+ if [ -z "$proxyip" -a -n "$host" ] -+ then -+ [ "$host" = "127.0.0.1" ] && host=$(hostname) -+ proxyip=$(ping -c1 "$host" | grep 'PING' | cut -d'(' -f2 | cut -d')' -f1) -+ fi -+ -+ [ -z "$proxyip" ] && proxyip="127.0.0.1" - - # ok, lets make the session dir first: - -@@ -1316,7 +1327,7 @@ - NX> 705 Session display: $display - NX> 703 Session type: $type - NX> 701 Proxy cookie: $proxy_cookie --NX> 702 Proxy IP: $userip -+NX> 702 Proxy IP: $proxyip - NX> 706 Agent cookie: $cookie - NX> 704 Session cache: $type - NX> 707 SSL tunneling: $ssl_tunnel -diff -ur freenx-server-0.7.3//nxserver ../trunk/freenx-server//nxserver ---- freenx-server-0.7.3//nxserver 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxserver 2011-01-26 23:23:36.856672521 +0100 -@@ -11,7 +11,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxserver 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxserver 612 2008-08-25 03:28:15Z fabianx $ - # - - # Read the config file -@@ -1192,7 +1192,7 @@ - # Lock held - - SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null) -- let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS -+ let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS - echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin - - # Exit critical section -@@ -1961,71 +1961,71 @@ - session_history "$user" "$sessid" - } - --cmd_terminate() -+cmd_execute() - { -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- for i in $CMD_PARAMS; -+ cmd_host="$1" -+ cmd_user="$2" -+ cmd_cmd="$3" -+ -+ if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ] -+ then -+ sh -c "$cmd_cmd" -+ elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ then -+ su - "$cmd_user" -c "$cmd_cmd" -+ else -+ ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'" -+ fi -+} -+ -+cmd_terminate_or_send() -+{ -+ CMD="$1" -+ -+ if [ "$CMD" = "--broadcast" ] -+ then -+ CMD_PARAMS=$(session_find_all) -+ [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -+ else -+ CMD_PARAMS=$(cmd_parse_3_params "$2") -+ [ -z "$CMD_PARAMS" ] && exit 1 -+ shift -+ fi -+ shift -+ -+ for i in $CMD_PARAMS - do - CMDLINE=$(session_get_cmdline $i) - cmd_sessionid=$(getparam sessionId) -+ cmd_display=$(getparam display) - cmd_user=$(getparam userName) - cmd_type=$(getparam type) - cmd_status=$(getparam status) -+ cmd_host=$(getparam host) - - # is it a "good" session? -- case "$1" in -+ case "$CMD" in - --suspend) - if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend" - fi - ;; - --terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - ;; - --force-terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - session_close $cmd_sessionid - ;; -- esac -- done -- --} -- --cmd_send() --{ -- if [ "$1" = "--broadcast" ] -- then -- CMD_PARAMS=$(session_find_all) -- [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -- else -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- shift -- fi -- shift -- for i in $CMD_PARAMS; -- do -- CMDLINE=$(session_get_cmdline $i) -- cmd_display=$(getparam display) -- cmd_user=$(getparam userName) -- cmd_type=$(getparam type) -- cmd_status=$(getparam status) -- cmd_host=$(getparam host) -- -- # is it a "good" session? -- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" -- then -- if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ --send|--broadcast) -+ # is it a "good" session? -+ if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" -- else -- ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'" -+ cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" - fi -- fi -+ esac - done -- #nxnode_start --send "$CMD_PARAMS" - } - - # -@@ -2099,13 +2099,13 @@ - cmd_history "$@" - ;; - --terminate|--suspend|--force-terminate) -- cmd_terminate "$@" -+ cmd_terminate_or_send "$@" - ;; - --cleanup) -- cmd_terminate "--force-terminate" "*" -+ cmd_terminate_or_send "--force-terminate" "*" - ;; - --send|--broadcast) -- cmd_send "$@" -+ cmd_terminate_or_send "$@" - ;; - *) - cmd_abort "Error: Function $CMD not implemented yet." diff --git a/extra/freenx/freenx-server-0.7.3-nxipp.patch b/extra/freenx/freenx-server-0.7.3-nxipp.patch deleted file mode 100644 index 81b286593..000000000 --- a/extra/freenx/freenx-server-0.7.3-nxipp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup ---- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200 -+++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200 -@@ -366,11 +366,10 @@ EOF - - echo "done" - -- if [ -d "$CUPS_BACKEND" ] -+ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ] - then - echo -n "Setting up cups nxipp backend ..." -- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" -- chmod 755 "$CUPS_IPP_BACKEND" -+ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" - echo "done" - fi - } diff --git a/extra/freenx/freenx.install b/extra/freenx/freenx.install deleted file mode 100644 index 0f3260166..000000000 --- a/extra/freenx/freenx.install +++ /dev/null @@ -1,59 +0,0 @@ -post_install() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo 'Generating keys ...' - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - echo "ATTENTION FREENX:" - echo "For correct setup please take a look at the wiki:" - echo "http://wiki.archlinux.org/index.php/FreeNX" -} - -post_upgrade() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo "Rerunning nxsetup ..." - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then - # important upgrade notice - echo "*** config file location has been moved ***" - echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave" - echo "into /etc/nxserver/node.conf. A new key set is required." - echo "Please copy to your clients the new client key:" - echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\"" - echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"." - fi -} - -# arg 1: the old package version -pre_remove() { - /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null -# usr/sbin/groupdel nx &>/dev/null - userdel nx &> /dev/null - groupdel nx &> /dev/null || /bin/true -} diff --git a/extra/freenx/keymap.patch b/extra/freenx/keymap.patch deleted file mode 100644 index a0bb678e4..000000000 --- a/extra/freenx/keymap.patch +++ /dev/null @@ -1,32 +0,0 @@ -=== modified file 'nxnode' ---- nxnode 2009-01-14 04:22:40 +0000 -+++ nxnode 2009-01-14 04:24:02 +0000 -@@ -555,7 +555,8 @@ - - # Start the agent - -- PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ #PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & - fi - - # -@@ -1094,6 +1095,8 @@ - # Rootless fix from 2x nxserver 1.5.0 - realtype=$type - [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop" -+ [ "$type" = "unix-gnome" ] && realtype="gnome" -+ [ "$type" = "unix-kde" ] && realtype="kde" - - # NX 2.1.0 file-sharing port options - client=$(getparam client) -@@ -1272,7 +1275,7 @@ - umask 0077 - - cat << EOF > "$USER_FAKE_HOME/.nx/C-$sess_id/options" --${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${clipboard:+,clipboard=$clipboard}${menu:+,menu=$menu}:$display -+nx/nx,${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${geometry:+geometry=$geometry,}${client:+client=$client,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype${clipboard:+,clipboard=$clipboard}${composite:+composite=$composite},cleanup=0,product=LFE/None/LFEN/None,shmem=1,${backingstore:+backingstore=$backingstore,}shpix=1,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${menu:+,menu=$menu}:$display - EOF - umask $OLD_UMASK - #samba=$samba, - diff --git a/extra/freenx/nxagent-startup.patch b/extra/freenx/nxagent-startup.patch deleted file mode 100644 index e3c5497c1..000000000 --- a/extra/freenx/nxagent-startup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxnode~ 2010-04-30 15:42:46.000000000 +0200 -+++ nxnode 2010-04-30 15:42:46.000000000 +0200 -@@ -328,6 +328,9 @@ - NODE_WM_PID=$! - fi - -+ # Patch - delay to allow nxagent to complete launching -+ sleep 4 -+ - echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - diff --git a/extra/freenx/remove-dialog.patch b/extra/freenx/remove-dialog.patch deleted file mode 100644 index 054f1f6c4..000000000 --- a/extra/freenx/remove-dialog.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- nxdialog~ 2011-02-01 09:05:28.993333438 +0100 -+++ nxdialog 2011-02-01 09:05:29.010000106 +0100 -@@ -85,29 +85,6 @@ - then - dialog_interface="xdialog" - DIALOG=/usr/bin/Xdialog # just in case that we have no good path --elif [ -x /usr/bin/dialog ] --then -- #JJK: Added 'dialog_interface=dialog' option because Xdialog not standard -- #JJK: on some distros such as Fedora and xmessage won't handle long -- #JJK: lists of ppd files while the combination of 'dialog' and 'xterm' -- #JJK: should be present on most setups. -- -- dialog_interface="dialog" -- DIALOG=/usr/bin/dialog -- if [ -z "$NXCLIENT_FIRST_TIME" ] -- then -- # Run only once in case of subdialogs. Capture result in tempfile -- TMPFILE=$(mktemp /tmp/nxclient.XXXXX) -- export NXCLIENT_FIRST_TIME=1 -- -- xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \ -- /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1 -- -- #Need to recover the last line output (and not remove non-printing chars, because --stdout is used) -- tail -1 $TMPFILE -- rm -f $TMPFILE -- exit 0 -- fi - else - dialog_interface="xmessage" - xmessage=$(which xmessage 2>/dev/null) diff --git a/extra/gnome-alsamixer/02_change_gconf-keys_path.diff b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff new file mode 100644 index 000000000..6df8bc903 --- /dev/null +++ b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff @@ -0,0 +1,207 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_change_gconf-keys_path.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace path to gnome-alsamixer's gconf keys + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider.c +@@ -481,7 +481,7 @@ + + disp_name = g_strndup (gam_slider_get_name (gam_slider), 8); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -508,7 +508,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -533,7 +533,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -557,7 +557,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-toggle.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-toggle.c +@@ -410,7 +410,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -433,7 +433,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -458,7 +458,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -482,7 +482,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-app.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-app.c +@@ -331,7 +331,7 @@ + gam_app_load_prefs (gam_app); + + /*gconf_client_notify_add (priv->gconf_client, +- "/apps/PAW/gnomealsamixer/preferences/tab_position", ++ "/apps/gnomealsamixer/preferences/tab_position", + (GConfClientNotifyFunc) pawed_app_gconf_notify_func, + pawed_app, + NULL, +@@ -351,10 +351,10 @@ + priv = GAM_APP_GET_PRIVATE (gam_app); + + width = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + NULL); + height = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + NULL); + + if ((height != 0) && (width != 0)) +@@ -376,11 +376,11 @@ + gdk_window_get_geometry (GDK_WINDOW (GTK_WIDGET (gam_app)->window), NULL, NULL, &width, &height, NULL); + + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + height, + NULL); + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + width, + NULL); + +@@ -630,7 +630,7 @@ + gint + gam_app_get_mixer_slider_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + gint style = 0; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -646,7 +646,7 @@ + void + gam_app_set_mixer_slider_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +@@ -661,7 +661,7 @@ + gint + gam_app_get_slider_toggle_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + gint style = 1; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -677,7 +677,7 @@ + void + gam_app_set_slider_toggle_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider-dual.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider-dual.c +@@ -446,7 +446,7 @@ + + priv = GAM_SLIDER_DUAL_GET_PRIVATE (gam_slider_dual); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_locked/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_locked/%s-%s", + gam_mixer_get_config_name (gam_slider_get_mixer (GAM_SLIDER (gam_slider_dual))), + gam_slider_get_config_name (GAM_SLIDER (gam_slider_dual))); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-mixer.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-mixer.c +@@ -478,7 +478,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + name = gconf_client_get_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -500,7 +500,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -526,7 +526,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + if (gconf_client_dir_exists (gam_app_get_gconf_client (GAM_APP (priv->app)), key, NULL)) +@@ -549,7 +549,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_bool (gam_app_get_gconf_client (GAM_APP (priv->app)), diff --git a/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff new file mode 100644 index 000000000..91630a6d3 --- /dev/null +++ b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff @@ -0,0 +1,174 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_gnome-alsamixer.schemas.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Intent to guess gnome-alsamixer.schemas + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/gnome-alsamixer.schemas ++++ gnome-alsamixer-0.9.7.cvs20050822/gnome-alsamixer.schemas +@@ -0,0 +1,163 @@ ++<gconfschemafile> ++ <schemalist> ++ ++ <!-- Completion uris --> ++ ++ <!--schema> ++ <key>/schemas/apps/PAW/PAWed/preferences</key> ++ <applyto>/apps/PAW/PAWed/preferences</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type></type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnomealsamixer/preferences/tab_position</key> ++ <applyto>/apps/gnomealsamixer/preferences/tab_position</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema--> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_width</key> ++ <applyto>/apps/gnome-alsamixer/geometry/main_window_width</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default>600</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_height</key> ++ <applyto>/apps/gnome-alsamixer/geometry/main_window_height</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default>380</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_style</key> ++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_style</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default>false</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</key> ++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default>true</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <!--schema> ++ <key>/schemas/apps/gnome-alsamixer/display_names/%s</key> ++ <applyto>/apps/gnome-alsamixer/display_names/%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_mixers/%s</key> ++ <applyto>/apps/gnome-alsamixer/display_mixers/%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/slider_display_names/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/slider_display_names/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_sliders/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/display_sliders/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/slider_locked/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/slider_locked/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/toggle_display_names/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/toggle_display_names/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_toggles/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/display_toggles/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema--> ++ ++ ++ </schemalist> ++</gconfschemafile> diff --git a/extra/gnome-alsamixer/04_ignore-delimiters.diff b/extra/gnome-alsamixer/04_ignore-delimiters.diff new file mode 100644 index 000000000..3e00e9205 --- /dev/null +++ b/extra/gnome-alsamixer/04_ignore-delimiters.diff @@ -0,0 +1,15 @@ +# Fixes: #400667 + +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.h 2008-01-04 00:43:39.000000000 +0100 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h 2008-01-04 00:44:18.000000000 +0100 +@@ -26,7 +26,7 @@ + + G_BEGIN_DECLS + +-#define GAM_CONFIG_DELIMITERS " &()+/" ++#define GAM_CONFIG_DELIMITERS " &()+/," + + #define GAM_TYPE_APP (gam_app_get_type ()) + #define GAM_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAM_TYPE_APP, GamApp)) diff --git a/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch new file mode 100644 index 000000000..0a352867b --- /dev/null +++ b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch @@ -0,0 +1,111 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.c 2011-09-12 21:01:20.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c 2011-09-12 21:02:41.000000000 +0200 +@@ -439,7 +439,7 @@ + NULL); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_mixer_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +@@ -451,7 +451,7 @@ + return priv->mixer_name; + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_config_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.h 2011-09-12 21:01:43.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h 2011-09-12 21:03:36.000000000 +0200 +@@ -57,8 +57,8 @@ + GType gam_mixer_get_type (void) G_GNUC_CONST; + GtkWidget *gam_mixer_new (GamApp *gam_app, + const gchar *card_id); +-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); +-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); + gchar *gam_mixer_get_display_name (GamMixer *gam_mixer); + void gam_mixer_set_display_name (GamMixer *gam_mixer, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.c 2011-09-12 21:01:49.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c 2011-09-12 21:03:47.000000000 +0200 +@@ -440,7 +440,7 @@ + g_signal_emit (gam_slider, signals[REFRESH], 0); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +@@ -452,7 +452,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_config_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.h 2011-09-12 21:01:28.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h 2011-09-12 21:03:13.000000000 +0200 +@@ -58,8 +58,8 @@ + #include "gam-mixer.h" + + GType gam_slider_get_type (void) G_GNUC_CONST; +-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider); +-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_config_name (GamSlider *gam_slider); + gchar *gam_slider_get_display_name (GamSlider *gam_slider); + void gam_slider_set_display_name (GamSlider *gam_slider, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.c 2011-09-12 21:01:36.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c 2011-09-12 21:03:26.000000000 +0200 +@@ -371,7 +371,7 @@ + internal_state); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +@@ -383,7 +383,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_config_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.h 2011-09-12 21:01:55.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h 2011-09-12 21:04:00.000000000 +0200 +@@ -55,8 +55,8 @@ + gboolean gam_toggle_get_state (GamToggle *gam_toggle); + void gam_toggle_set_state (GamToggle *gam_toggle, + gboolean state); +-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle); +-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); + gchar *gam_toggle_get_display_name (GamToggle *gam_toggle); + void gam_toggle_set_display_name (GamToggle *gam_toggle, + const gchar *name); diff --git a/extra/gnome-alsamixer/06-use-libgnome-headers.patch b/extra/gnome-alsamixer/06-use-libgnome-headers.patch new file mode 100644 index 000000000..5c431f02b --- /dev/null +++ b/extra/gnome-alsamixer/06-use-libgnome-headers.patch @@ -0,0 +1,26 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-main.c 2005-07-06 17:14:57.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c 2011-10-26 02:47:47.000000000 +0200 +@@ -22,7 +22,7 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <libgnomeui/gnome-ui-init.h> + #include <glib/gi18n.h> + + #include "gam-app.h" +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 +@@ -27,7 +27,7 @@ + #include <gtk/gtkmenuitem.h> + #include <glib/gi18n.h> + #include <libgnomeui/gnome-about.h> +-#include <libgnomeui/gnome-app-helper.h> ++/*#include <libgnomeui/gnome-app-helper.h>*/ + #include <libgnomeui/gnome-stock-icons.h> + + #include "gam-app.h" diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD index 84698b9c1..677260758 100644 --- a/extra/gnome-alsamixer/PKGBUILD +++ b/extra/gnome-alsamixer/PKGBUILD @@ -1,33 +1,50 @@ -# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $ +# $Id: PKGBUILD 189332 2013-07-03 05:25:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnome-alsamixer -pkgver=0.9.6 -pkgrel=4 +pkgver=0.9.7 +pkgrel=1 pkgdesc="Gnome ALSA mixer" arch=('i686' 'x86_64') url="https://launchpad.net/gnome-alsamixer" license=('GPL') depends=('libgnomeui') -source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz - gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop) -md5sums=('387623cfeb079d78325eed2d6bc94251' - '82b95a0df43429da5098b4da883f6bd0' - 'c7dbc44207bede96e4fafc24a7c7beb3') -sha1sums=('faece601a4329d2b01b9efe65200021538fc066d' - 'b4e3b871676025600170ba54f59db4977b853c08' +options=('!emptydirs') +install=gnome-alsamixer.install +source=(https://launchpad.net/ubuntu/+archive/primary/+files/gnome-alsamixer_0.9.7~cvs.20060916.ds.1.orig.tar.gz + 02_change_gconf-keys_path.diff 03_gnome-alsamixer.schemas.diff 04_ignore-delimiters.diff + 05-remove-G_CONST_RETURN.patch 06-use-libgnome-headers.patch gnome-alsamixer.desktop) +sha1sums=('98e716cd14fe46cb9c77034de7558ef113da26f5' + 'ee7743abfc8d6005be6fcb0fb47b45e636db5fdc' + '6b3148bab4ed53bc9a0a123b33585cd81b138225' + 'd4a7f9a5868c5af52f9b3c7a146ae34ddc45adf7' + '6b19224d0346cf53b864333b191fa99fc8e7ebdc' + '2731a7ef249aac51eeab1717c645c995780f36a7' '31639f7932d088ca76a18c79839682be811f23d0') +prepare() { + cd ${pkgname}-${pkgver}~cvs.20060916 + patch -Np1 -i ../02_change_gconf-keys_path.diff + patch -Np1 -i ../03_gnome-alsamixer.schemas.diff + patch -Np1 -i ../04_ignore-delimiters.diff + patch -Np1 -i ../05-remove-G_CONST_RETURN.patch + patch -Np1 -i ../06-use-libgnome-headers.patch + + ln -sf /usr/share/automake-*/mkinstalldirs mkinstalldirs +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" + cd ${pkgname}-${pkgver}~cvs.20060916 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make + make MSGFMT_OPTS="-c" LIBS+="-lm" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \ - "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + cd ${pkgname}-${pkgver}~cvs.20060916 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/gnome-alsamixer.desktop" "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch b/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch deleted file mode 100644 index 9e5f4eeb1..000000000 --- a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur gnome-alsamixer-0.9.6/src/Makefile.in gnome-alsamixer-0.9.6.new/src/Makefile.in ---- gnome-alsamixer-0.9.6/src/Makefile.in 2003-09-09 12:44:25.000000000 +0100 -+++ gnome-alsamixer-0.9.6.new/src/Makefile.in 2004-04-04 18:51:36.000000000 +0100 -@@ -86,10 +86,6 @@ - -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\" \ - -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - @PACKAGE_CFLAGS@ - - -Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~ diff --git a/extra/gnome-alsamixer/gnome-alsamixer.install b/extra/gnome-alsamixer/gnome-alsamixer.install new file mode 100644 index 000000000..2787d5675 --- /dev/null +++ b/extra/gnome-alsamixer/gnome-alsamixer.install @@ -0,0 +1,19 @@ +pkgname=gnome-alsamixer + +post_install() { + gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [[ "$(vercmp $2 0.9.7)" -gt 0 ]]; then + pre_remove $1 + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ${pkgname} +} diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index 905c9e53e..26aa0c968 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187927 2013-06-08 07:59:05Z andrea $ +# $Id: PKGBUILD 189490 2013-07-03 17:00:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('a339ad9eeff20ba384a03d2dff5b4d3622f9e17d') +sha1sums=('6f0a7593ac5f7a4daf231bc403a78a658aae2db2') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 1425eacb3..49aa0448c 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187954 2013-06-08 07:59:34Z andrea $ +# $Id: PKGBUILD 189517 2013-07-03 17:01:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('3a4d718251fb8f5e66c127028dbca99607eb4b66') +sha1sums=('59d2e627b71e6ffe5c3f1f54a680522a114b74bc') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 5408a877c..7bfd34a96 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187955 2013-06-08 07:59:35Z andrea $ +# $Id: PKGBUILD 189518 2013-07-03 17:01:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('c7e6946120b34e6a5963f103430da1d3ca812ca8') +sha1sums=('b56172555573162636937587436ee30091a16f6f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index e7d71637b..a4b1f9bcb 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187956 2013-06-08 07:59:36Z andrea $ +# $Id: PKGBUILD 189519 2013-07-03 17:01:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('68e9ec4b646db7b7711a08ecf62e1011be60024e') +sha1sums=('0054927193647296448329bbdce1438e62fc57da') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index a66eb8d5b..a3f9b7352 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187957 2013-06-08 07:59:37Z andrea $ +# $Id: PKGBUILD 189520 2013-07-03 17:01:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('e3e635780254a2ac9ce94c5c1f21bfabc4b59121') +sha1sums=('ec4aac22da5499a484bd3b45a78c4a10b8ae4632') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index 9c1792e76..f4738da8a 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187958 2013-06-08 07:59:38Z andrea $ +# $Id: PKGBUILD 189521 2013-07-03 17:01:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('3236b2fcb79f95a1eb44928a2cd286243f0b128c') +sha1sums=('267079c968a59fd878eaff3e2986cfe82426513b') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 6f1c44b0f..ccb74805f 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187959 2013-06-08 07:59:40Z andrea $ +# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('422b9cd97d40191080ee4a121fda24fb19759216' +sha1sums=('0b809772effe249d1ec581902fcecb73e7761134' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { @@ -39,7 +39,7 @@ package_kdeadmin-kcron() { depends=('kdelibs') cd $srcdir/build/kcron make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron + cd $srcdir/build/kcron/doc make DESTDIR=$pkgdir install } @@ -49,7 +49,7 @@ package_kdeadmin-ksystemlog() { url="http://kde.org/applications/system/ksystemlog/" cd $srcdir/build/ksystemlog make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog + cd $srcdir/build/ksystemlog/doc make DESTDIR=$pkgdir install } @@ -60,6 +60,6 @@ package_kdeadmin-kuser() { install='kdeadmin.install' cd $srcdir/build/kuser make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser + cd $srcdir/build/kuser/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 2cf27cd5c..1cdc1c70a 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187960 2013-06-08 07:59:41Z andrea $ +# $Id: PKGBUILD 189523 2013-07-03 17:01:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b41e00708a595f4ee310a69c7326a6f956e8c6e2') +sha1sums=('a6f9244b473ec01174ba85f9375438050be76daf') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 4eaee9ad0..34f0863cc 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187961 2013-06-08 07:59:42Z andrea $ +# $Id: PKGBUILD 189524 2013-07-03 17:01:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('8fdc5965837f104ddc9923e97bb1499f6293c833') +sha1sums=('f6c08b19e2154dab6a7e86255ec254d79e305993') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 555202d13..8be7c6841 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187940 2013-06-08 07:59:19Z andrea $ +# $Id: PKGBUILD 189503 2013-07-03 17:00:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') @@ -26,8 +26,9 @@ install="${pkgname}.install" backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' - 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-plasma-memory-leak.patch') +sha1sums=('d4986c1b4e3232f74a6348116908a13aee073a93' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -35,7 +36,8 @@ sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'e453545568d20165f80b97dd270b5adc731d5f21') prepare() { cd ${_pkgname}-${pkgver} @@ -47,6 +49,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG#314919 + patch -p1 -i "${srcdir}"/fix-plasma-memory-leak.patch } build() { diff --git a/extra/kdebase-workspace/fix-plasma-memory-leak.patch b/extra/kdebase-workspace/fix-plasma-memory-leak.patch new file mode 100644 index 000000000..78ced11b7 --- /dev/null +++ b/extra/kdebase-workspace/fix-plasma-memory-leak.patch @@ -0,0 +1,53 @@ +commit ec8e405ca447ba5bc5a9f6a2a12e2fa90412a0d4 +Author: Andreas Hartmetz <ahartmetz@gmail.com> +Date: Tue Jul 2 18:35:35 2013 +0200 + + Fix pixmap leak when the tray icon changes (e.g. when it's animated). + + This could easily leak 4KB/second of X pixmap memory. + All the actual difference comes from the QPixmap::ExplicitlyShared + argument, the rest is making some wonky-looking but working code look + less wonky. + + BUG: 314919 + +diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +index 1826512..a5bc826 100644 +--- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp ++++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +@@ -194,8 +194,7 @@ void X11EmbedContainer::paintEvent(QPaintEvent *event) + + // Taking a detour via a QPixmap is unfortunately the only way we can get + // the window contents into Qt's backing store. +- QPixmap pixmap(size()); +- pixmap = toX11Pixmap(pixmap); ++ QPixmap pixmap = toX11Pixmap(QPixmap(size())); + pixmap.fill(Qt::transparent); + XRenderComposite(x11Info().display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(), + 0, 0, 0, 0, 0, 0, width(), height()); +@@ -232,16 +231,18 @@ void X11EmbedContainer::setBackgroundPixmap(QPixmap background) + // NOTE: The alpha-channel is not preserved if it exists, but for X pixmaps it generally should not be needed anyway. + QPixmap X11EmbedContainer::toX11Pixmap(const QPixmap& pix) + { +- if(pix.handle() != 0) // X11 pixmap ++ if (pix.handle() != 0) // X11 pixmap + return pix; ++ QPixmap ret; + Pixmap xpix = XCreatePixmap(pix.x11Info().display(), RootWindow(pix.x11Info().display(), pix.x11Info().screen()), + pix.width(), pix.height(), QX11Info::appDepth()); +- QPixmap wrk = QPixmap::fromX11Pixmap(xpix); +- QPainter paint(&wrk); +- paint.drawPixmap(0, 0, pix); +- paint.end(); +- QPixmap ret = wrk.copy(); +- wrk = QPixmap(); // reset, so that xpix can be freed (QPixmap does not own it) ++ { ++ QPixmap wrk = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared); ++ QPainter paint(&wrk); ++ paint.drawPixmap(0, 0, pix); ++ paint.end(); ++ ret = wrk.copy(); ++ } // free resources so that xpix can be freed (QPixmap does not own it) + XFreePixmap(pix.x11Info().display(), xpix); + return ret; + } diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index 582376bed..fa8d8bbd8 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187942 2013-06-08 07:59:21Z andrea $ +# $Id: PKGBUILD 189505 2013-07-03 17:00:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d') +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 1ae1a8126..1343f4cc0 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187962 2013-06-08 07:59:43Z andrea $ +# $Id: PKGBUILD 189525 2013-07-03 17:01:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') optdepends=('kdepimlibs: akonadi bindings') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('87fb44759e2f4ffa1fbcbebb0f15b359f02875b8') +sha1sums=('b4ecd3d9a95966c7d290b45031da4550a1c71c09') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index f9022b24c..bc2ea2e07 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187963 2013-06-08 07:59:44Z andrea $ +# $Id: PKGBUILD 189526 2013-07-03 17:01:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,18 +15,14 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' optdepends=('kdegraphics-okular: okular bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-ruby') -source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" - 'ruby19.patch') -sha1sums=('d4b2920db047a10addbd1a8818878b2f93c75648' - 'c074f027bac3b9bffe70a2c2304a6a7be12be034') +source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz") +sha1sums=('fa3e3c8dfdd4a81e49f91aa264d64f700ec4241f') prepare() { - cd korundum-${pkgver} - patch -p1 -i "${srcdir}/ruby19.patch" + mkdir build } build() { - mkdir build cd build cmake ../korundum-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebindings-korundum/ruby19.patch b/extra/kdebindings-korundum/ruby19.patch deleted file mode 100644 index c2468d9ce..000000000 --- a/extra/kdebindings-korundum/ruby19.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- korundum-4.9.0/src/krubypluginfactory.cpp~ 2012-07-27 10:44:19.544464612 +0000 -+++ korundum-4.9.0/src/krubypluginfactory.cpp 2012-07-27 10:53:15.247374749 +0000 -@@ -39,7 +39,6 @@ - extern "C" { - extern VALUE rb_load_path; - extern VALUE qt_internal_module; --void Init_prelude(void); - } - - // -@@ -165,7 +164,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); -@@ -342,7 +342,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 966cf4efc..e0aaef8f9 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187964 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189527 2013-07-03 17:01:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64') @@ -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=('04ab37ee0c6fcf0a3d7824b49f73529d4f480a0d') +sha1sums=('58bb1c9fb45d20768c59e1147aa954d14d6dd18e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 47240500a..79f7510ec 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187965 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189528 2013-07-03 17:01:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.10.4 +pkgver=4.10.5 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=('034a5f0b98cb361cad8bb684a4834f47d16efb9c') +sha1sums=('a0eb27db883b8fd8411041373140f3d6a5bcdbfc') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index c7ac5998f..018614a9e 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187936 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189499 2013-07-03 17:00:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.10.4 +pkgver=4.10.5 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=('8b72c8c53d74b2bc8f38baca6c599067a6cfaac6') +sha1sums=('e4349b27791962188e8e56bd717a2ae7aec263c3') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 244a8e47a..10ae3fbcc 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ +# $Id: PKGBUILD 189496 2013-07-03 17:00:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('4243f60d549b75ad734141ad2bfef884d12d014e') +sha1sums=('1e474e5d15756a6846902c11d6a7c95c5ca688da') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index c40a194c8..ced10bc23 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187938 2013-06-08 07:59:16Z andrea $ +# $Id: PKGBUILD 189501 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.10.4 +pkgver=4.10.5 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=('70fa8ea5ee961ece5d29cb84cb37c57923f18d85') +sha1sums=('6fc117f8d046ae4f026015475792c43f80346d29') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 59acd2122..d58fef949 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187937 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189500 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.10.4 +pkgver=4.10.5 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=('1a0503ef0117aa19cdffdddc9501fee83411d576') +sha1sums=('d79d5d67fe95aecb326edba4cf1200b6a22f394c') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index 58c1ee800..2834dc637 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187930 2013-06-08 07:59:08Z andrea $ +# $Id: PKGBUILD 189493 2013-07-03 17:00:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.10.4 +pkgver=4.10.5 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=('57c92b313bae5274b571c09f94cf599d1afd4846') +sha1sums=('d9d803c9d66d59ffc8d5a7372ee2176d355d3bb3') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 0d254ede2..415f8068c 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187935 2013-06-08 07:59:14Z andrea $ +# $Id: PKGBUILD 189498 2013-07-03 17:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('557f3a888759cb3dd397466bd16246a1ef5858f2') +sha1sums=('22b2b717a8a81e3b4d52a65afd985044b5e77e3b') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index f417e63de..fe9714dc2 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187931 2013-06-08 07:59:09Z andrea $ +# $Id: PKGBUILD 189494 2013-07-03 17:00:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.10.4 +pkgver=4.10.5 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' 'mesa') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('292285272998b096eef62812e65b5027cf2800ec') +sha1sums=('af5c3b4cf9bf82de15ddb26a5ab188e800fe7942') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index d1ae5e46f..b487f75d7 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187949 2013-06-08 07:59:29Z andrea $ +# $Id: PKGBUILD 189512 2013-07-03 17:01:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.10.4 +pkgver=4.10.5 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=('46de1f60e149f6b5a526fa62e6dcf52ade9d4eff') +sha1sums=('e8f6810516838d94bb66db01c6ef19ebc8680ca7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index ad7e9e866..722fe0d1b 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187966 2013-06-08 07:59:47Z andrea $ +# $Id: PKGBUILD 189529 2013-07-03 17:01:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.10.4 +pkgver=4.10.5 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=('ea4d9363c6bf08683a5c9733d11ec7928a358f73') +sha1sums=('45c720a6b1566d941cfae8d8354d603331c1e258') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 614b9d4cd..0acbaf3f3 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187967 2013-06-08 07:59:48Z andrea $ +# $Id: PKGBUILD 189530 2013-07-03 17:01:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -17,7 +17,7 @@ optdepends=('maxima: Maxima backend' install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" 'sage58.patch') -sha1sums=('3ecd559d6563945ed7730a524c2da5d637a340ba' +sha1sums=('b815ec8ceef27436bca46ee80d933912deb7c771' 'c02051c30ece57800d693da60280b0bdb5f45697') prepare() { diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index b15f5c544..0dbc91539 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187968 2013-06-08 07:59:49Z andrea $ +# $Id: PKGBUILD 189531 2013-07-03 17:01:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.10.4 +pkgver=4.10.5 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=('86032621d84ef5d8ea68cf9b0e7b696b96154ece') +sha1sums=('a762efe6ab7bedb5e5a1f97e7227fc48729c8b62') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index f87d0c60c..e02150548 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187969 2013-06-08 07:59:50Z andrea $ +# $Id: PKGBUILD 189532 2013-07-03 17:01:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('b8225cae39c1b27d1defabd08cd2e64e5c893602') +sha1sums=('b4429f34b85c507474cd33e2a1571de9acd70b5c') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index dc1924798..fdfec9145 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187970 2013-06-08 07:59:51Z andrea $ +# $Id: PKGBUILD 189533 2013-07-03 17:01:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.10.4 +pkgver=4.10.5 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=('fa1635720602ba02cb0064d3c01c752d208f5e09') +sha1sums=('1db931a1796a090ffefc1d922b9bf689e045581a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index b296bb812..028b79f4d 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187971 2013-06-08 07:59:53Z andrea $ +# $Id: PKGBUILD 189534 2013-07-03 17:01:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.10.4 +pkgver=4.10.5 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=('be9dd5ce3a0b8b7162faf1f78c22a7aeb5a8449c') +sha1sums=('f01c2b9f2bf1db8d5c2836fdff04862b311e3eac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 31da779e6..6bb37955e 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187972 2013-06-08 07:59:56Z andrea $ +# $Id: PKGBUILD 189535 2013-07-03 17:01:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.10.4 +pkgver=4.10.5 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=('a283d3521e853d040e7938e004fcbef6cf41aa82') +sha1sums=('22beaaada1a55aa5a5b107fa0eef9f3850aff2a1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index 075a6a57b..e8b9ed897 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187973 2013-06-08 07:59:58Z andrea $ +# $Id: PKGBUILD 189536 2013-07-03 17:01:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.10.4 +pkgver=4.10.5 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=('1d1a8d7dc99e59bcb006302d1bb7d9a8366041d9') +sha1sums=('b8347034cefa309850ac3099321179cd64ce4d2f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index 9adf36765..621e202a9 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187974 2013-06-08 07:59:59Z andrea $ +# $Id: PKGBUILD 189537 2013-07-03 17:01:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.10.4 +pkgver=4.10.5 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=('91c0880d48ed16e05481c3ce424075d30f695bf4') +sha1sums=('8eb3dae04ce6599f911fa29e5109089dd0a5ca56') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index 43b832afc..eff5e2f5b 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187975 2013-06-08 08:00:01Z andrea $ +# $Id: PKGBUILD 189538 2013-07-03 17:01:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.10.4 +pkgver=4.10.5 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=('970620fc621dd31c99c71bd3b446da4d1d3015c4') +sha1sums=('af9040043e03ef516e582c5a8d1219e358339aac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 60d4b29e3..6552b69ad 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187976 2013-06-08 08:00:03Z andrea $ +# $Id: PKGBUILD 189539 2013-07-03 17:01:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.10.4 +pkgver=4.10.5 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=('5141988a04d1a9e428c41cc751cd217a53fef13a') +sha1sums=('285ed3b40f7502fe90d319c434946a344b54246d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 87954f1a2..d361be042 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187977 2013-06-08 08:00:04Z andrea $ +# $Id: PKGBUILD 189540 2013-07-03 17:01:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.10.4 +pkgver=4.10.5 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=('e212aee5cdee0d767efd9d004a17238f043485a2') +sha1sums=('da01e941e4439223cacc03de29780c27d41455b0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 05d62a9fe..133a02230 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187978 2013-06-08 08:00:07Z andrea $ +# $Id: PKGBUILD 189541 2013-07-03 17:01:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('9a434b7e2c9b67cce4611ad443cfd1ef9a190436') +sha1sums=('724acde654d7d66ec8bf6c088c2f892eaf9d103d') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index a2da999b8..fd2fc0fde 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187979 2013-06-08 08:00:08Z andrea $ +# $Id: PKGBUILD 189542 2013-07-03 17:01:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('dfda5d6f0af6bfc2853595a5af86c7a96cd66c33') +sha1sums=('87c772a43e164a557e8fed01a5c5064823eb29c9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index e26ec8ae2..219c2cc81 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187980 2013-06-08 08:00:10Z andrea $ +# $Id: PKGBUILD 189543 2013-07-03 17:01:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.10.4 +pkgver=4.10.5 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=('82cc5e6abb7ab10bf1da247f67293d45b3d38195') +sha1sums=('ca8b46766ea8135978b7e6f3b1f7f21e5a1b6639') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index ed4f53b1a..497890afa 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187981 2013-06-08 08:00:11Z andrea $ +# $Id: PKGBUILD 189544 2013-07-03 17:01:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.10.4 +pkgver=4.10.5 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=('3c321e7f4a9a136cc29227c98d10bd3f4551f32b') +sha1sums=('3d92e066adecd77ef4de5b3ab4ecb6e06251dd55') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 5b606ed4c..57a71f1f5 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187944 2013-06-08 07:59:24Z andrea $ +# $Id: PKGBUILD 189507 2013-07-03 17:00:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.10.4 +pkgver=4.10.5 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=('664ff3564e2136566808d2ea801b42ede04d6a8d') +sha1sums=('15563a5f31bf1c655fe6afc6477bd3f8042e8a6f') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index adb1f6434..de0a82da0 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187982 2013-06-08 08:00:13Z andrea $ +# $Id: PKGBUILD 189545 2013-07-03 17:01:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.10.4 +pkgver=4.10.5 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=('20b4e8e98487bc05602a15969bac63ea64a6ac74') +sha1sums=('c42d6a0dab25e28173ab47f1e18dda40204aaf15') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 76b11b77e..70845d2b9 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187983 2013-06-08 08:00:14Z andrea $ +# $Id: PKGBUILD 189546 2013-07-03 17:01:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebindings-kross-python: scripting support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('d13d686b77a36ca488ab6f545e0871ad37f9b490') +sha1sums=('ff4361c225fe4e9530200ca169b1a0fc0f5b5852') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 69220ae37..a4037fddf 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187984 2013-06-08 08:00:15Z andrea $ +# $Id: PKGBUILD 189547 2013-07-03 17:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('c09ba436f60bf856733e50bd331e84a8b1f975fb') +sha1sums=('0f9e33b679f528918b682153447a5813d88c57ef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 708a90078..ac53f89d9 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187985 2013-06-08 08:00:17Z andrea $ +# $Id: PKGBUILD 189548 2013-07-03 17:01:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.10.4 +pkgver=4.10.5 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' 'mesa') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('3dcbd853ede5fbc6517d52faa8722395ecf0eb0b') +sha1sums=('e218cd5af527a815e222838b32bcffaaaa78e495') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 582e1dd3e..2cfc44f51 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187986 2013-06-08 08:00:18Z andrea $ +# $Id: PKGBUILD 189549 2013-07-03 17:02:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single player arcade game" url="http://kde.org/applications/games/bomber/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz") -sha1sums=('88f98c0179516cfd08952112fb6dc6ba6bb85231') +sha1sums=('9ccd0e60f5ada51aae2fd35b214a2350e7950351') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 8f2e6a1c7..831b6ceff 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187987 2013-06-08 08:00:20Z andrea $ +# $Id: PKGBUILD 189550 2013-07-03 17:02:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A Gomoku like game for two players" url="http://kde.org/applications/games/bovo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz") -sha1sums=('102ceee58b4851b24cb23bd4907449cdd63aa3d7') +sha1sums=('cf6de267949be1900b9a74eb77118ed33f8fe389') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index fb7cde1ad..6302a932c 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187988 2013-06-08 08:00:21Z andrea $ +# $Id: PKGBUILD 189551 2013-07-03 17:02:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A clone of the classic Bomberman game" url="http://kde.org/applications/games/granatier/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz") -sha1sums=('b49be2c81a8b8670bfe8f53ae09e9aab9de5134a') +sha1sums=('5ba19a929dd4812ece1c3c1658e5d0457d737cb1') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index f8894c6b5..b6cc0b376 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187990 2013-06-08 08:00:24Z andrea $ +# $Id: PKGBUILD 189553 2013-07-03 17:02:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A clone of the well known game Pac-Man" url="http://kde.org/applications/games/kapman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz") -sha1sums=('6dbb6b7f4a87aa2cd21d13330913d7a999b888e8') +sha1sums=('4da9e17243a87108bb55006a8d486d68d57f5e86') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index 22ad52563..074b23f6b 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187991 2013-06-08 08:00:26Z andrea $ +# $Id: PKGBUILD 189554 2013-07-03 17:02:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A fun and educational game built around molecular geometry" url="http://kde.org/applications/games/katomic/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz") -sha1sums=('6c4893910a11f2c1bc20492a93d6475fa397f9df') +sha1sums=('79f8e11671cd67fac0aff8ed5ebf8a845ed0e2b8') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index fe6669c21..42326cd35 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187992 2013-06-08 08:00:28Z andrea $ +# $Id: PKGBUILD 189555 2013-07-03 17:02:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A game of hide and seek played on a grid of boxes" url="http://kde.org/applications/games/kblackbox/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz") -sha1sums=('dd19f0c54740e5e0add1271ebd6595f237a670d5') +sha1sums=('3cfb90ce5810df96ab8893fd0c2da984825a3ed0') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 3244d981a..9c0f8c7c8 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187993 2013-06-08 08:00:29Z andrea $ +# $Id: PKGBUILD 189556 2013-07-03 17:02:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The classic falling blocks game" url="http://kde.org/applications/games/kblocks/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz") -sha1sums=('e6c9e5d3dc368d87afe82375d3537aeb03247edb') +sha1sums=('98965d0f09d072722d8a35a9aee982cb66b0b61e') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index ca415ed54..cbd8ea671 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187994 2013-06-08 08:00:30Z andrea $ +# $Id: PKGBUILD 189557 2013-07-03 17:02:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single player arcade game with the elements of puzzle" url="http://kde.org/applications/games/kbounce/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz") -sha1sums=('481fb1b98597ae0cceadcfb7d7b5d4b1171e1267') +sha1sums=('45ab0f6440933719d70d6f10ad091a7753100832') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index 9aa68c742..f6fa4d9ac 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187995 2013-06-08 08:00:32Z andrea $ +# $Id: PKGBUILD 189558 2013-07-03 17:02:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A Breakout-like game" url="http://kde.org/applications/games/kbreakout/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz") -sha1sums=('c8c5acdf8ca4915b37c6fa8e5cf6725e21ab97fa') +sha1sums=('38c1fb790541c01427e9cb7314e05929a25dc5d5') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index a6bcfb2b4..3af8fdbbf 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187996 2013-06-08 08:00:33Z andrea $ +# $Id: PKGBUILD 189559 2013-07-03 17:02:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single player puzzle game" url="http://kde.org/applications/games/kdiamond/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz") -sha1sums=('acb1b7cdfdc30025a4686321ab0ef226c8adb1e0') +sha1sums=('eba0692af37410bd1005d0cbb8759420169d2e7b') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 9f24ed219..baf9fa949 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187997 2013-06-08 08:00:35Z andrea $ +# $Id: PKGBUILD 189560 2013-07-03 17:02:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A four-in-a-row game" url="http://kde.org/applications/games/kfourinline/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz") -sha1sums=('263a7a641c3f48f078aebbc179ec2475558605e8') +sha1sums=('d923b3477cd7ac2e693a69cf5dcc4f0667b72670') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index 733edc66a..d89d60c58 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187998 2013-06-08 08:00:36Z andrea $ +# $Id: PKGBUILD 189561 2013-07-03 17:02:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A game of action and puzzle solving" url="http://kde.org/applications/games/kgoldrunner/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz") -sha1sums=('95fc29d606d5b491920c612e1887b1699aad4481') +sha1sums=('ade056258864f670d0e9932c07b4bec6c96589cb') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index e32191358..226d946da 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187999 2013-06-08 08:00:39Z andrea $ +# $Id: PKGBUILD 189562 2013-07-03 17:02:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An open-source implementation of the popular Go game" url="http://kde.org/applications/games/kigo/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz") -sha1sums=('caad098497bdd71184983cc22cfd23fe71bb243a') +sha1sums=('458ceb98d8704d7810539e24be708de089814b28') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index 746a0b456..0b62ca062 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188000 2013-06-08 08:00:40Z andrea $ +# $Id: PKGBUILD 189563 2013-07-03 17:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple game of evading killer robots" url="http://kde.org/applications/games/killbots/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz") -sha1sums=('5fef75ba6d3c849ce271164a532eaddde1c41cd4') +sha1sums=('fedcdb56a0daa244ded949433b591f783f9fe03b') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index c73f8d07f..f97dfc8ff 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188001 2013-06-08 08:00:41Z andrea $ +# $Id: PKGBUILD 189564 2013-07-03 17:02:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An addictive and fun dice game" url="http://kde.org/applications/games/kiriki/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz") -sha1sums=('a724586705a9bb66d4a9af684a0b56239d395e5e') +sha1sums=('459ad2ae8ed5d23f0fa49a512afe5c9100457e0c') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 10c91981c..f51df2860 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188002 2013-06-08 08:00:43Z andrea $ +# $Id: PKGBUILD 189565 2013-07-03 17:02:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple tactical game" url="http://kde.org/applications/games/kjumpingcube/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz") -sha1sums=('012a89130cb95f8ae223f1dfb8380e1316ac91be') +sha1sums=('82c175cef97149ba079c8b1520d48c60f1785903') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index 1bb16b012..77136bbbc 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188003 2013-06-08 08:00:44Z andrea $ +# $Id: PKGBUILD 189566 2013-07-03 17:02:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An adaptation of the Clickomania game" url="http://kde.org/applications/games/klickety/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz") -sha1sums=('e7540d663a36a580e68d8ac69ba229c42db724f6') +sha1sums=('4630f3f31d9ab439475420ccd54707f097630371') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index e438e284e..196f97da9 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188004 2013-06-08 08:00:46Z andrea $ +# $Id: PKGBUILD 189567 2013-07-03 17:02:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple but highly addictive, one player game" url="http://kde.org/applications/games/klines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz") -sha1sums=('6cbd46188030e3f495812a5d50e34be9936cdb08') +sha1sums=('adb8c1c1709b4dbdb733602ef29bcab6a177d494') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index cfd152ff8..d9bb79e82 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188005 2013-06-08 08:00:47Z andrea $ +# $Id: PKGBUILD 189568 2013-07-03 17:02:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A tile matching game for one or two players" url="http://kde.org/applications/games/kmahjongg/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz") -sha1sums=('ebecd24f0da87165d0b8859444d035019a7bcd5a') +sha1sums=('e020846d2252402cf51ae8bd63539774aeb775e9') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 10371b5ae..45f7de054 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188006 2013-06-08 08:00:48Z andrea $ +# $Id: PKGBUILD 189569 2013-07-03 17:02:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The classic Minesweeper game" url="http://kde.org/applications/games/kmines/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz") -sha1sums=('950f28e722db36daee4ee187f696eaa51415b752') +sha1sums=('c896f86b96f4fb380c695c0491db6d5fff0836fe') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index b2042b2ec..b1d1a2471 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188007 2013-06-08 08:00:50Z andrea $ +# $Id: PKGBUILD 189570 2013-07-03 17:02:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A ship sinking game" url="http://kde.org/applications/games/knavalbattle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz") -sha1sums=('cf55f549029647b59b082bc2ab9383a5375a416c') +sha1sums=('e939a5b5d409bf89da3ffa8cd6e4af0d0e7798a0') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index a0c49e250..59f0d21e5 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188008 2013-06-08 08:00:51Z andrea $ +# $Id: PKGBUILD 189571 2013-07-03 17:02:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Connect all the terminals to the server, in as few turns as possible" url="http://kde.org/applications/games/knetwalk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz") -sha1sums=('482d4ba187a55ba32841e141ce3717ad94306377') +sha1sums=('61fb05ab580785362b1204c8b64badc160284d02') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index f6fbea517..c50aa9073 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188009 2013-06-08 08:00:52Z andrea $ +# $Id: PKGBUILD 189572 2013-07-03 17:02:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A miniature golf game with 2d top-down view" url="http://kde.org/applications/games/kolf/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz") -sha1sums=('ec61e9d436c59cc738f340b7ca27e8ccef017b2f') +sha1sums=('ae1af46f6144adf912b3b9bf99666a178a6f78ac') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index 64801f3c5..2b849b9ae 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188010 2013-06-08 08:00:56Z andrea $ +# $Id: PKGBUILD 189573 2013-07-03 17:02:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple ball dodging game" url="http://kde.org/applications/games/kollision/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz") -sha1sums=('bd7839e85789894010a2df0171e417a008afd753') +sha1sums=('d7850701d8817dac21457ebeef78c18d0f37001f') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 489832547..37cc38e57 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188011 2013-06-08 08:00:57Z andrea $ +# $Id: PKGBUILD 189574 2013-07-03 17:02:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The KDE version of Gnu-Lactic" url="http://kde.org/applications/games/konquest/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz") -sha1sums=('a238dee4a52ad6a051d53843112f85a7a912355f') +sha1sums=('5e5c61bc3823be1dd45c87a77f404f51f5ed9b6e') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 4cad12def..26dec1fd2 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188012 2013-06-08 08:01:00Z andrea $ +# $Id: PKGBUILD 189575 2013-07-03 17:02:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Offers a selection of solitaire card games" url="http://kde.org/applications/games/kpat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz") -sha1sums=('c5ab4a1a27c4fe2f88e456af08aca3a4d2d1340e') +sha1sums=('65be653b7fa41054e3f446441365fbad65b841b0') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index 7b742fb01..78279dff8 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188013 2013-06-08 08:01:01Z andrea $ +# $Id: PKGBUILD 189576 2013-07-03 17:02:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple one player strategy game played against the computer" url="http://kde.org/applications/games/kreversi/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz") -sha1sums=('b30a93287348fd2394b9abf4e60b07f29bdccbfb') +sha1sums=('f3ea6c3c37367ca112146c4b85cb521064f1187c') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 1fc77ef7b..495c7af70 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188014 2013-06-08 08:01:02Z andrea $ +# $Id: PKGBUILD 189577 2013-07-03 17:02:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles" url="http://kde.org/applications/games/kshisen/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz") -sha1sums=('c09157433df05f409046606d890b0935c167b877') +sha1sums=('28cfe402f4a39d0902a85e8e316f40d26af17e1b') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 20c9f7367..08b8152f4 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188015 2013-06-08 08:01:04Z andrea $ +# $Id: PKGBUILD 189578 2013-07-03 17:02:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A computerized version of a well known strategy game" url="http://kde.org/applications/games/ksirk/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz") -sha1sums=('f0145f13d8ead33d37855298f8732ac82ea7dbe1') +sha1sums=('dc43176fc71a7ca45976f79eb383aa1922a8adf8') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index eb5bb0eb3..93cde5e71 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188016 2013-06-08 08:01:05Z andrea $ +# $Id: PKGBUILD 189579 2013-07-03 17:02:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple snake duel game" url="http://kde.org/applications/games/ksnakeduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz") -sha1sums=('21fec5a9e979065958ccb670a7198ecd82a334fb') +sha1sums=('a7c5416dadf66a4148e4e30c12a6dc1528793524') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 9abb5852e..61f6750d6 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188017 2013-06-08 08:01:06Z andrea $ +# $Id: PKGBUILD 189580 2013-07-03 17:02:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun" url="http://kde.org/applications/games/kspaceduel/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz") -sha1sums=('e4e8667c2961bae7a96143ccc7dc342d3c959799') +sha1sums=('1b4146c55498e1223d0cf9209c1cec45d5cb5720') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index dfa1ea7b2..1ad5c5e12 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188018 2013-06-08 08:01:08Z andrea $ +# $Id: PKGBUILD 189581 2013-07-03 17:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes" url="http://kde.org/applications/games/ksquares/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz") -sha1sums=('6553d30c4f983fd3346ad85e551afbbdb590442c') +sha1sums=('ca68405a5344481c1ed81bda0a7e37d78d0300f4') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index d1083b01a..dcfdb72a5 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188019 2013-06-08 08:01:09Z andrea $ +# $Id: PKGBUILD 189582 2013-07-03 17:02:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A logic-based symbol placement puzzle" url="http://kde.org/applications/games/ksudoku/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz") -sha1sums=('563d086f2b8fe844c7ae5b3fcecef496cb851d20') +sha1sums=('65da23cf971d77c563803f8f35794f4ff1ad4d15') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 83d7c3be3..814719a77 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188020 2013-06-08 08:01:11Z andrea $ +# $Id: PKGBUILD 189583 2013-07-03 17:02:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A simple constructor game suitable for children and adults alike" url="http://kde.org/applications/games/ktuberling/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz") -sha1sums=('209f64812e1aa9a6bd4f5ae87a83e6cb096d42f7') +sha1sums=('59128492d7f7ecb1dcde1b88f40ddc186590914d') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index e04709a55..94dc99c62 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188021 2013-06-08 08:01:13Z andrea $ +# $Id: PKGBUILD 189584 2013-07-03 17:03:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Based on the famous Rubik's Cube" url="http://kde.org/applications/games/kubrick/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz") -sha1sums=('4b40f130930594908b0764744947c9a2deb1954e') +sha1sums=('e1bc6911e549ca39725b2b093b0d33868c6cea52') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index 8faed1d36..853b1f5b2 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188022 2013-06-08 08:01:15Z andrea $ +# $Id: PKGBUILD 189585 2013-07-03 17:03:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players" url="http://kde.org/applications/games/lskat/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz") -sha1sums=('060cdb3f02655a82442b8eff9ef3d3b2be12fd9c') +sha1sums=('48465c69208786a1e642968e5097b4acedb4aba1') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index 14f39923a..8b802d470 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188023 2013-06-08 08:01:17Z andrea $ +# $Id: PKGBUILD 189586 2013-07-03 17:03:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('595572e46a0dbd31fe3bb8cb623602dadf3d8753') +sha1sums=('08dfbb9619197597094d1e543825217a9c79c4fd') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index 4ef9bf95b..65bb507fa 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188024 2013-06-08 08:01:18Z andrea $ +# $Id: PKGBUILD 189587 2013-07-03 17:03:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A nonogram logic game for KDE" url="http://kde.org/applications/games/picmi/" @@ -15,7 +15,7 @@ replaces=('picmi') conflicts=('picmi') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz") -sha1sums=('ef1a3c217432e44f4f3f146a54513b9ea56b4c96') +sha1sums=('fd2f95d39f4aeeea694a3b74949a3472783a3719') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index e81706acd..eee4c48e8 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188025 2013-06-08 08:01:19Z andrea $ +# $Id: PKGBUILD 189588 2013-07-03 17:03:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('0cd301a65f800a201a57295984374612db7d6377') +sha1sums=('14e8b214ad2aa17a3ce586ca481502a120061912') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index a88f11222..8d3787188 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188026 2013-06-08 08:01:21Z andrea $ +# $Id: PKGBUILD 189589 2013-07-03 17:03:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libgphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('022c0ab35f4a57e6bbf200caff0a8f2688f47b2a') +sha1sums=('1ff61bd5f4bc78b947451306aec899c845d0e178') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index f2065e5e9..ef6f0a912 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188027 2013-06-08 08:01:22Z andrea $ +# $Id: PKGBUILD 189590 2013-07-03 17:03:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.10.4 +pkgver=4.10.5 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=('baa625095edbee3b943a0e09287a7c2bff7c20af') +sha1sums=('0e601ca75d6d237c23a83b10b2597b1ff905ea97') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 348776031..5d4102f55 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188028 2013-06-08 08:01:24Z andrea $ +# $Id: PKGBUILD 189591 2013-07-03 17:03:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.10.4 +pkgver=4.10.5 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=('e9441c3358e2be76912a5879decedfa911809247') +sha1sums=('31d4f0e2da3475f423a8c9aa77db569d7ea698d6') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index eb0981514..667606117 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188029 2013-06-08 08:01:25Z andrea $ +# $Id: PKGBUILD 189592 2013-07-03 17:03:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.10.4 +pkgver=4.10.5 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=('8578d6e50f60955392ac7c9e6aff93696126247f') +sha1sums=('976a2093dda115b16f13603c35959b163cc4169e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 56927f8e7..8c7ba8d1c 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188030 2013-06-08 08:01:27Z andrea $ +# $Id: PKGBUILD 189593 2013-07-03 17:03:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.10.4 +pkgver=4.10.5 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=('f762162c9fcb276c6c52508c70eea95ba135e4be') +sha1sums=('c76fcd0f5fedcfd0017b3f27349e5fab8dd7bb74') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 0d2695532..d4f022a25 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188031 2013-06-08 08:01:28Z andrea $ +# $Id: PKGBUILD 189594 2013-07-03 17:03:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.10.4 +pkgver=4.10.5 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=('34a8f6c379aa2defca2441c7f2583f1d75f99441') +sha1sums=('4bae1e43e55f0aad7626c9a2fe10bca46cba1bd8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 4b04d2ce5..2d90d48b9 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188032 2013-06-08 08:01:30Z andrea $ +# $Id: PKGBUILD 189595 2013-07-03 17:03:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.10.4 +pkgver=4.10.5 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=('6550523e0270447a00b7c498fbe03f67b425626b') +sha1sums=('2a5dcb4cc7ed0f290a857d4b7a1418f31c39a25f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index c1d246c0d..0bd360bb0 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188033 2013-06-08 08:01:31Z andrea $ +# $Id: PKGBUILD 189596 2013-07-03 17:03:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.10.4 +pkgver=4.10.5 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=('f4b58972ce05a4bdfcb94c972b023f168d3172e9') +sha1sums=('80a5878f2c9f4fa490f22a22fde03003c883c8cb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 271f96fb1..60d30bebb 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187932 2013-06-08 07:59:10Z andrea $ +# $Id: PKGBUILD 189495 2013-07-03 17:00:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -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=('7659ac1e1d9832f541f605abbfc47da9d3ab2356') +sha1sums=('8009cd23f844691c18001dbfe98a8e2f5a9f30b9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index d10304aba..ecd1adb71 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188034 2013-06-08 08:01:33Z andrea $ +# $Id: PKGBUILD 189597 2013-07-03 17:03:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.4 +pkgver=4.10.5 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=('70feca363d1a5d5aa9d784d62819a34eb701054f') +sha1sums=('b7db0edf8113faa4796cd585e41e514a7218a720') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 28bc7a4a2..379e553fb 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188035 2013-06-08 08:01:34Z andrea $ +# $Id: PKGBUILD 189598 2013-07-03 17:03:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A KPart for viewing 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=('356f0bb93514b240a67b0a02edad15ac5e107fdb') +sha1sums=('fcd7759b4a92217c93188ed82e4cff7817013bb5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index 9899dfda2..86b7e82cf 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188036 2013-06-08 08:01:37Z andrea $ +# $Id: PKGBUILD 189599 2013-07-03 17:03:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.10.4 +pkgver=4.10.5 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=('e9c939d22a4dd6c17cdda9da964434e014d6b771') +sha1sums=('88631de08af153d1c745ba2cd0468e8cb7474217') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 07668c7ca..ec7cd1264 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188037 2013-06-08 08:01:38Z andrea $ +# $Id: PKGBUILD 189600 2013-07-03 17:03:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('7dbd0c6b08fe0b4223012f7332e661c9cd046697') +sha1sums=('d215fe1ec68cee0b833ed82ad34c4850400cc081') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 8dbb1014e..4063f5ce2 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188038 2013-06-08 08:01:40Z andrea $ +# $Id: PKGBUILD 189601 2013-07-03 17:03:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('c7ff43b01890318ed0c629eed64fe36cc2e15db6') +sha1sums=('58cf5d6fa420257665032c70cf8a70485af45a97') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index e13727f75..06a5ea7ea 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188039 2013-06-08 08:01:41Z andrea $ +# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('6c1e4fcb3fe8ecabca3a49718b815eda0f20c5cc') +sha1sums=('68fb56a2cb51672f250566baeb36e489cc15909c') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 21b5969d1..74e764944 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188040 2013-06-08 08:01:42Z andrea $ +# $Id: PKGBUILD 189603 2013-07-03 17:03:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('92af1645405b88aef85505649e68e3fcab4a7841') +sha1sums=('9f3aec6a41e3089c0a97feb48d94cd5d206c252a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index c80bd5971..c4461646d 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188041 2013-06-08 08:01:44Z andrea $ +# $Id: PKGBUILD 189604 2013-07-03 17:03:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('d392101358196e0b99bc15846b895dff9c88cafc') +sha1sums=('80b29d1c360dbebf1516c92de144f823012491ee') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index 68535f731..9100df02d 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188042 2013-06-08 08:01:45Z andrea $ +# $Id: PKGBUILD 189605 2013-07-03 17:03:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('e3e3c0b60897559ce3f5ff8a0f5dfe7bcd10ae98') +sha1sums=('8573e185d1e3ca05eda2f7a37ff7500859e3d0e3') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index 50d42c92c..09cf52e1d 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188043 2013-06-08 08:01:46Z andrea $ +# $Id: PKGBUILD 189606 2013-07-03 17:03:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('3b82041ae4a297c448971bb3faeb9e5492654310') +sha1sums=('dc72e06f6298647635b7490e8acff75a14aa0682') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index d0084d9fe..839aec6f8 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ +# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -22,7 +22,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -49,7 +49,7 @@ package_kdenetwork-filesharing() { pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' depends=('kdelibs' 'smbclient') install='kdenetwork.install' - cd $srcdir/build/filesharing + cd $srcdir/build/kdenetwork-filesharing make DESTDIR=$pkgdir install } @@ -67,8 +67,6 @@ package_kdenetwork-kget() { install='kdenetwork-kget.install' cd $srcdir/build/kget make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kget - make DESTDIR=$pkgdir install } package_kdenetwork-kopete() { @@ -79,7 +77,7 @@ package_kdenetwork-kopete() { install='kdenetwork-kopete.install' cd $srcdir/build/kopete make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete + cd $srcdir/build/kopete/doc make DESTDIR=$pkgdir install } @@ -90,7 +88,7 @@ package_kdenetwork-kppp() { install='kdenetwork-kppp.install' cd $srcdir/build/kppp make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kppp + cd $srcdir/build/kppp/doc make DESTDIR=$pkgdir install } @@ -103,7 +101,7 @@ package_kdenetwork-krdc() { url="http://kde.org/applications/internet/krdc/" cd $srcdir/build/krdc make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krdc + cd $srcdir/build/krdc/doc make DESTDIR=$pkgdir install } @@ -115,6 +113,6 @@ package_kdenetwork-krfb() { depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') cd $srcdir/build/krfb make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krfb + cd $srcdir/build/krfb/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 53b441d4c..ee0bdc6b3 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187929 2013-06-08 07:59:07Z andrea $ +# $Id: PKGBUILD 189492 2013-07-03 17:00:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1ef9a4b6224363db2c3b50199dd302cea57c3a27') +sha1sums=('f0b18cd320973c02d9b52cce9f4f424cb868d7fb') build() { mkdir build diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 5925dfdb3..5cfd48c93 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188045 2013-06-08 08:01:51Z andrea $ +# $Id: PKGBUILD 189608 2013-07-03 17:03:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') +sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 711a15a1c..cb3c45865 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187925 2013-06-08 07:59:03Z andrea $ +# $Id: PKGBUILD 189488 2013-07-03 17:00:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('58f785dbc07932aad01bd7beeeceacc8fefac0bd') +sha1sums=('3e5ab28312cf1f194d8b3c1999102a4de8029146') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 36ffb50b8..af65796b5 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188046 2013-06-08 08:01:54Z andrea $ +# $Id: PKGBUILD 189609 2013-07-03 17:03:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,6 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-applets-fuzzy-clock' 'kdeplasma-addons-applets-icontasks' 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' 'kdeplasma-addons-applets-kimpanel' 'kdeplasma-addons-applets-knowledgebase' 'kdeplasma-addons-applets-kolourpicker' @@ -77,7 +76,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -86,7 +85,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('bdc8f5db0253132f8007d52fc79d8aa2ea2f9e0a') +sha1sums=('d2198e25bdde0f9b4ce6ce0024c4662dc97e5fa4') build() { mkdir build @@ -224,14 +223,6 @@ package_kdeplasma-addons-applets-incomingmsg() { make DESTDIR=$pkgdir install } -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - package_kdeplasma-addons-applets-kimpanel() { pkgdesc='A generic input method panel for Oriental languages' depends=('kdeplasma-addons-libs') diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 5f01e6cf9..02038f6f7 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ +# $Id: PKGBUILD 189497 2013-07-03 17:00:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('167c7bc7f9f83f4017f006e2b4c2a3ec24eb6c9d' +sha1sums=('39cca1dad490ba9ec36b43967afc0159d7343185' 'dc70306c507083cf9b4bb1c536858742292fa1bf') prepare() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index fe9ccc28e..9438c55f0 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188047 2013-06-08 08:01:57Z andrea $ +# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-poxml' 'kdesdk-strigi-analyzers' 'kdesdk-umbrello') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -26,7 +26,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=('da886df4ddebb12e760db7469de1350feed2b338' +sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940' '07db42bbcae402c292eebf002e549b04162621c5') prepare() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 82b8283fd..983557a0b 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188048 2013-06-08 08:01:58Z andrea $ +# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z 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.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('ad148c0b8acdcc8062d832ca21bb84284bcab841') +sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 640a23dd4..595bf319f 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188050 2013-06-08 08:02:01Z andrea $ +# $Id: PKGBUILD 189613 2013-07-03 17:03:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.10.4 +pkgver=4.10.5 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=('acc3004826ae3afd3f87463b6c36661c566a8c7b') +sha1sums=('0028141091901b08b133d338e6c4ce44448b680c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index a353e8007..3a48dfe1f 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188051 2013-06-08 08:02:03Z andrea $ +# $Id: PKGBUILD 189614 2013-07-03 17:03:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.10.4 +pkgver=4.10.5 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=('8c8aa571a6e3541e276128503358c6de6bf8e20a') +sha1sums=('9c9f3219482d5a90e8c90d5fc0a3fa53c947d150') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index b9a6050b5..3c0f6a6da 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188052 2013-06-08 08:02:07Z andrea $ +# $Id: PKGBUILD 189615 2013-07-03 17:03:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.10.4 +pkgver=4.10.5 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=('bd3525ffc4fbd2e0f8fbbdd377b00ac21ae9241d') +sha1sums=('0d3ff509cd38ba290160575d7456ec17bfe00628') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index ea0a98205..e66710594 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188053 2013-06-08 08:02:10Z andrea $ +# $Id: PKGBUILD 189616 2013-07-03 17:03:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -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=('9d0c6f9a476610670cc7775b6bb5cc5f014f8536') +sha1sums=('23c17847fa52849c90920f4a4717d578aedc0cdc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index 4c2132cb3..35a0a901f 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188054 2013-06-08 08:02:11Z andrea $ +# $Id: PKGBUILD 189617 2013-07-03 17:04:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.10.4 +pkgver=4.10.5 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=('12160f2b5e7bb94cd72d090627f39b4eaa2ae03e') +sha1sums=('9758ded1ad5a664d4f22f4de16e3809549495ee5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index e65e73ee2..cabb44d86 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188055 2013-06-08 08:02:12Z andrea $ +# $Id: PKGBUILD 189618 2013-07-03 17:04:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.10.4 +pkgver=4.10.5 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=('b4d9773326dfe16f3b50b6f16b52c906b7c3180e') +sha1sums=('4875e0940e4e18d4be9c428c66aaaf204950ae3c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 0055dd061..370f8f557 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.10.4 +pkgver=4.10.5 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=('9e8ee623f83a7d909b1e4385430c9716807bfa2e') +sha1sums=('c87ff44502352ae63120991866c239544d28d3ca') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 941ce4024..bbed13ed3 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188057 2013-06-08 08:02:15Z andrea $ +# $Id: PKGBUILD 189620 2013-07-03 17:04:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.10.4 +pkgver=4.10.5 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=('f98109823013dd6ee7cff81e55f338dbd8695eab') +sha1sums=('f34c6b40a9cc581ab03bd79839276fdd9885b356') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index fe6775d69..e652cb72a 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188058 2013-06-08 08:02:17Z andrea $ +# $Id: PKGBUILD 189621 2013-07-03 17:04:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.10.4 +pkgver=4.10.5 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=('47198c116fab656279090e9461daf334381554b2') +sha1sums=('ff945ff2cee1a0e9bcccd3d526dd077028c21308') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index d1413f616..482fed6e2 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188059 2013-06-08 08:02:19Z andrea $ +# $Id: PKGBUILD 189622 2013-07-03 17:04:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A tool for managing print jobs and printers" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin conflicts=('print-manager') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz") -sha1sums=('a2adfbb31a78f1f7978997844c1d758fac53098a') +sha1sums=('fb8df7bf5f9bd6da2099e9dadf3cdf20f20a9083') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 076733688..8f45ecc82 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188060 2013-06-08 08:02:21Z andrea $ +# $Id: PKGBUILD 189623 2013-07-03 17:04:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.10.4 +pkgver=4.10.5 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=('0c5addd5093d676ba2733c7132d4a231f0e6955e') +sha1sums=('7e41f314431432b1d5b7b51432f6c80b910b3e55') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 0dca0e0e0..2483df6f8 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188061 2013-06-08 08:02:22Z andrea $ +# $Id: PKGBUILD 189624 2013-07-03 17:04:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.10.4 +pkgver=4.10.5 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=('646e60691f68bfbff9b5ecc57cf0e198a6229a53') +sha1sums=('e88a8782c33ba5ca8893c8df4826dc699de1cccb') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 0b6e21741..012021044 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188062 2013-06-08 08:02:24Z andrea $ +# $Id: PKGBUILD 189625 2013-07-03 17:04:16Z 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.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64') 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=('d54b8a154350795613080a5f28f56bbf80c10ed2') +sha1sums=('6d81be773a08fe41cbd34ac178107e3ba3a96181') build() { cd $srcdir diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index 5b170e1f8..400704ad0 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187950 2013-06-08 07:59:30Z andrea $ +# $Id: PKGBUILD 189513 2013-07-03 17:01:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.10.4 +pkgver=4.10.5 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=('a9017c1922ee56f51c16c617e9046ccb6149ccd5') +sha1sums=('125568df9a1f8e1f78f29d6e85ac7681100ed9ff') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index 54076552f..1587cfe25 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187951 2013-06-08 07:59:31Z andrea $ +# $Id: PKGBUILD 189514 2013-07-03 17:01:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.10.4 +pkgver=4.10.5 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=('d442e7d4257b68f182815f3a4330982a026b7dc3') +sha1sums=('69c63adeaa2d449a36f7cb7b9735321e7f8e3fc2') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index d002cce09..f7035e9c4 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187945 2013-06-08 07:59:25Z andrea $ +# $Id: PKGBUILD 189508 2013-07-03 17:00:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.10.4 +pkgver=4.10.5 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=('3390eb344d62f7e44fe5db65eb171d397142fa96') +sha1sums=('fc124bb21db24dea02233e26f852628e10dd11d4') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index f649ce39f..060b9df15 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187943 2013-06-08 07:59:23Z andrea $ +# $Id: PKGBUILD 189506 2013-07-03 17:00:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.10.4 +pkgver=4.10.5 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=('78b56f1388be8fcbfc0d9f4f9e395a6ae5f25d7f') +sha1sums=('40c7aa6d23f31389bb72ae9f2c25bbdfe54d34f5') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index d476fe562..dbc2b5b92 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187952 2013-06-08 07:59:32Z andrea $ +# $Id: PKGBUILD 189515 2013-07-03 17:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Common code and data for many KDE games" url="https://projects.kde.org/projects/kde/kdegames/libkdegames" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkdegames') conflicts=('kdegames-libkdegames') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5c3ff5f9ac6c7f4c80044e67cad1863631c0a7e6') +sha1sums=('d4f343d27fbc83e8b31b6bf2cb626e893b9ac515') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index 481469389..cd287d589 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187946 2013-06-08 07:59:26Z andrea $ +# $Id: PKGBUILD 189509 2013-07-03 17:01:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -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=('88db6d3eae13ac1dd0113e456cb1f6ad8f31c7b3') +sha1sums=('9521acdb66893006143bffdba81d2dbf140ce27f') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 8c33e2ffc..102ec9816 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.10.4 +pkgver=4.10.5 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=('f4d96eddaad6e160c3ca579420117ed2deec74f6') +sha1sums=('a9ead1c184938ea17b3bc0162dabb4df7ae4673b') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index 3e34fc790..870d7ac09 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187953 2013-06-08 07:59:33Z andrea $ +# $Id: PKGBUILD 189516 2013-07-03 17:01:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles" url="https://projects.kde.org/projects/kde/kdegames/libmahjongg" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegames-libkmahjongg') conflicts=('kdegames-libkmahjongg') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5bb8fbcc696702489fb12dde5f8a098aecdd9a3a') +sha1sums=('5dbed099eea3338088b61173c512dda4c92747a4') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 547d50985..825cdb9b0 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187948 2013-06-08 07:59:28Z andrea $ +# $Id: PKGBUILD 189511 2013-07-03 17:01:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.10.4 +pkgver=4.10.5 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=('6bb65bd85a9e65dfc20448a359df77c11e6aca55') +sha1sums=('5142d582390b031751dc410bdef80253dd596dfb') build() { cd "${srcdir}" diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD index faa38a667..8a8a70bd8 100644 --- a/extra/libmspack/PKGBUILD +++ b/extra/libmspack/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136796 2011-09-01 15:19:12Z andyrtr $ +# $Id: PKGBUILD 189640 2013-07-03 19:24:42Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmspack -pkgver=0.3alpha +pkgver=0.4alpha pkgrel=1 pkgdesc="A library for Microsoft compression formats" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=() options=('!libtool') source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz) -md5sums=('08d08455b6d58ea649b35febd23f6386') +md5sums=('1ab10b507259993c74b4c41a88103b59') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 9b2d22f58..8b8274c63 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188904 2013-06-24 21:48:21Z lcarlier $ +# $Id: PKGBUILD 189335 2013-07-03 08:11:31Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org" @@ -12,20 +12,8 @@ depends=('libxext' 'inputproto') makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake') options=(!libtool) license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 - git-fixes.diff) -sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5' - 'faa2f76f68e65f537062829ad45977561079ac8747bd8e24a82055e70a5bf0cc') - -prepare() { - cd "${srcdir}/libXi-${pkgver}" - - # fix CVE-2013-1998 CVE-2013-1984 CVE-2013-1995 merged upstream - patch -Np1 -i ${srcdir}/git-fixes.diff - - # a patch change configure.ac - autoreconf -fiv -} +source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) +sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/libxi/git-fixes.diff b/extra/libxi/git-fixes.diff deleted file mode 100644 index b1b4f40d9..000000000 --- a/extra/libxi/git-fixes.diff +++ /dev/null @@ -1,1386 +0,0 @@ -From bb82c72a1d69eaf60b7586570faf797df967f661 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 29 Apr 2013 18:39:34 -0700 -Subject: [PATCH 01/16] Expand comment on the memory vs. reply ordering in - XIGetSelectedEvents() - -Unpacking from the wire involves un-interleaving the structs & masks, -which wasn't obvious to me the first time I read it, so make notes -before I forget again. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XISelEv.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index fa7eb54..f871222 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -135,8 +135,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - _XRead(dpy, (char*)mask_in, reply.length * 4); - -- /* Memory layout of the XIEventMask for a 3 mask reply: -- * [struct a][struct b][struct c][masks a][masks b][masks c] -+ /* -+ * This function takes interleaved xXIEventMask structs & masks off -+ * the wire, such as this 3 mask reply: -+ * [struct a][masks a][struct b][masks b][struct c][masks c] -+ * And generates a memory buffer to be returned to callers in which -+ * they are not interleaved, so that callers can treat the returned -+ * pointer as a simple array of XIEventMask structs, such as: -+ * [struct a][struct b][struct c][masks a][masks b][masks c] - */ - len = reply.num_masks * sizeof(XIEventMask); - --- -1.8.3.1 - - -From 5d43d4914dcabb6de69859567061e99300e56ef4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH 02/16] Copy the sequence number into the target event too - (#64687) - -X.Org Bug 64687 <http://bugs.freedesktop.org/show_bug.cgi?id=64687> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> ---- - src/XExtInt.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 507573b..8e19b97 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -+ cookie->serial = ev->sequenceNumber; - } - - static Bool -@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) - out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) - out->info = (XIHierarchyInfo*)&out[1]; - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook - - out = next_block(&ptr, sizeof(XIRawEvent)); - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) - out->buttons.mask = (unsigned char*)&out[1]; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) - - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); --- -1.8.3.1 - - -From 59b8e1388a687f871831ac5a9e0ac11de75e2516 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Wed, 1 May 2013 23:58:39 -0700 -Subject: [PATCH 03/16] Use _XEatDataWords to avoid overflow of rep.length bit - shifting - -rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - configure.ac | 6 ++++++ - src/XGMotion.c | 2 +- - src/XGetDCtl.c | 2 +- - src/XGetDProp.c | 5 ++--- - src/XGetFCtl.c | 2 +- - src/XGetKMap.c | 2 +- - src/XGetMMap.c | 2 +- - src/XGetProp.c | 4 +--- - src/XGtSelect.c | 2 +- - src/XIProperties.c | 7 +++---- - src/XIint.h | 14 ++++++++++++++ - src/XListDProp.c | 2 +- - src/XListDev.c | 2 +- - src/XOpenDev.c | 2 +- - src/XQueryDv.c | 2 +- - 15 files changed, 36 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8dbca38..f5ef1e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,12 @@ PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] - # CFLAGS only for PointerBarrier typedef - PKG_CHECK_MODULES(XFIXES, [xfixes >= 5]) - -+# Check for _XEatDataWords function that may be patched into older Xlib releases -+SAVE_LIBS="$LIBS" -+LIBS="$XI_LIBS" -+AC_CHECK_FUNCS([_XEatDataWords]) -+LIBS="$SAVE_LIBS" -+ - # Check for xmlto and asciidoc for man page conversion - # (only needed by people building tarballs) - if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 99b1c44..5feac85 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -112,7 +112,7 @@ XGetDeviceMotionEvents( - Xfree(bufp); - Xfree(savp); - *nEvents = 0; -- _XEatData(dpy, (unsigned long)size); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (NULL); -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index c66212d..f73a4e8 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -95,7 +95,7 @@ XGetDeviceControl( - nbytes = (long)rep.length << 2; - d = (xDeviceState *) Xmalloc((unsigned)nbytes); - if (!d) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = d; -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index 5d44f91..f9e8f0c 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -112,14 +112,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); - } - if (! *prop) { -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 43afa00..28fab4d 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -95,7 +95,7 @@ XGetFeedbackControl( - nbytes = (long)rep.length << 2; - f = (xFeedbackState *) Xmalloc((unsigned)nbytes); - if (!f) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = f; -diff --git a/src/XGetKMap.c b/src/XGetKMap.c -index 9431fbb..00dde06 100644 ---- a/src/XGetKMap.c -+++ b/src/XGetKMap.c -@@ -99,7 +99,7 @@ XGetDeviceKeyMapping(register Display * dpy, XDevice * dev, - if (mapping) - _XRead(dpy, (char *)mapping, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGetMMap.c b/src/XGetMMap.c -index 8a1cdb2..ce10c2d 100644 ---- a/src/XGetMMap.c -+++ b/src/XGetMMap.c -@@ -92,7 +92,7 @@ XGetDeviceModifierMapping( - if (res->modifiermap) - _XReadPad(dpy, (char *)res->modifiermap, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - res->max_keypermod = rep.numKeyPerModifier; - } - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index c5d088b..34bc581 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -68,7 +68,6 @@ XGetDeviceDontPropagateList( - int *count) - { - XEventClass *list = NULL; -- int rlen; - xGetDeviceDontPropagateListReq *req; - xGetDeviceDontPropagateListReply rep; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -90,7 +89,6 @@ XGetDeviceDontPropagateList( - *count = rep.count; - - if (*count) { -- rlen = rep.length << 2; - list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { - int i; -@@ -105,7 +103,7 @@ XGetDeviceDontPropagateList( - list[i] = (XEventClass) ec; - } - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGtSelect.c b/src/XGtSelect.c -index f890db7..5c0f812 100644 ---- a/src/XGtSelect.c -+++ b/src/XGtSelect.c -@@ -104,7 +104,7 @@ XGetSelectedExtensionEvents( - (XEventClass *) Xmalloc(*this_client_count * - sizeof(XEventClass)); - if (!*this_client_list) { -- _XEatData(dpy, (unsigned long)tlen + alen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (Success); -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 83a7a68..5e58fb6 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -64,7 +64,7 @@ XIListProperties(Display* dpy, int deviceid, int *num_props_return) - props = (Atom*)Xmalloc(rep.num_properties * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.num_properties << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -@@ -203,8 +203,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); -@@ -222,7 +221,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - *data = Xmalloc(rbytes); - - if (!(*data)) { -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XIint.h b/src/XIint.h -index 571bb23..3ddc3c5 100644 ---- a/src/XIint.h -+++ b/src/XIint.h -@@ -83,4 +83,18 @@ next_block(void **ptr, int size) { - return ret; - } - -+#ifndef HAVE__XEATDATAWORDS -+#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ -+#include <limits.h> -+ -+static inline void _XEatDataWords(Display *dpy, unsigned long n) -+{ -+# ifndef LONG64 -+ if (n >= (ULONG_MAX >> 2)) -+ _XIOError(dpy); -+# endif -+ _XEatData (dpy, n << 2); -+} -+#endif -+ - #endif -diff --git a/src/XListDProp.c b/src/XListDProp.c -index 8667350..bde6cb5 100644 ---- a/src/XListDProp.c -+++ b/src/XListDProp.c -@@ -65,7 +65,7 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) - props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.nAtoms << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -diff --git a/src/XListDev.c b/src/XListDev.c -index bd6e70a..1fa4747 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -202,7 +202,7 @@ XListInputDevices( - list = (xDeviceInfo *) Xmalloc(rlen); - slist = list; - if (!slist) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (XDeviceInfo *) NULL; -diff --git a/src/XOpenDev.c b/src/XOpenDev.c -index 74f18ac..e784f8b 100644 ---- a/src/XOpenDev.c -+++ b/src/XOpenDev.c -@@ -101,7 +101,7 @@ XOpenDevice( - if (rlen - dlen > 0) - _XEatData(dpy, (unsigned long)rlen - dlen); - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - - UnlockDisplay(dpy); - SyncHandle(); -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 24d4e4e..69c285b 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -91,7 +91,7 @@ XQueryDeviceState( - if (rlen > 0) { - data = Xmalloc(rlen); - if (!data) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - _XRead(dpy, data, rlen); --- -1.8.3.1 - - -From f3e08e4fbe40016484ba795feecf1a742170ffc1 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:26:52 -0800 -Subject: [PATCH 04/16] Stack buffer overflow in XGetDeviceButtonMapping() - [CVE-2013-1998 1/3] - -We copy the entire reply sent by the server into the fixed size -mapping[] array on the stack, even if the server says it's a larger -size than the mapping array can hold. HULK SMASH STACK! - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetBMap.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/src/XGetBMap.c b/src/XGetBMap.c -index 211c9ca..002daba 100644 ---- a/src/XGetBMap.c -+++ b/src/XGetBMap.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - #ifdef MIN /* some systems define this in <sys/param.h> */ - #undef MIN -@@ -75,7 +76,6 @@ XGetDeviceButtonMapping( - { - int status = 0; - unsigned char mapping[256]; /* known fixed size */ -- long nbytes; - XExtDisplayInfo *info = XInput_find_display(dpy); - - register xGetDeviceButtonMappingReq *req; -@@ -92,13 +92,18 @@ XGetDeviceButtonMapping( - - status = _XReply(dpy, (xReply *) & rep, 0, xFalse); - if (status == 1) { -- nbytes = (long)rep.length << 2; -- _XRead(dpy, (char *)mapping, nbytes); -- -- /* don't return more data than the user asked for. */ -- if (rep.nElts) -- memcpy((char *)map, (char *)mapping, MIN((int)rep.nElts, nmap)); -- status = rep.nElts; -+ if (rep.length <= (sizeof(mapping) >> 2)) { -+ unsigned long nbytes = rep.length << 2; -+ _XRead(dpy, (char *)mapping, nbytes); -+ -+ /* don't return more data than the user asked for. */ -+ if (rep.nElts) -+ memcpy(map, mapping, MIN((int)rep.nElts, nmap)); -+ status = rep.nElts; -+ } else { -+ _XEatDataWords(dpy, rep.length); -+ status = 0; -+ } - } else - status = 0; - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 91434737f592e8f5cc1762383882a582b55fc03a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 23:37:23 -0800 -Subject: [PATCH 05/16] memory corruption in _XIPassiveGrabDevice() - [CVE-2013-1998 2/3] - -If the server returned more modifiers than the caller asked for, -we'd just keep copying past the end of the array provided by the -caller, writing over who-knows-what happened to be there. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XIPassiveGrab.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c -index ac17c01..53b4084 100644 ---- a/src/XIPassiveGrab.c -+++ b/src/XIPassiveGrab.c -@@ -88,7 +88,7 @@ _XIPassiveGrabDevice(Display* dpy, int deviceid, int grabtype, int detail, - return -1; - _XRead(dpy, (char*)failed_mods, reply.num_modifiers * sizeof(xXIGrabModifierInfo)); - -- for (i = 0; i < reply.num_modifiers; i++) -+ for (i = 0; i < reply.num_modifiers && i < num_modifiers; i++) - { - modifiers_inout[i].status = failed_mods[i].status; - modifiers_inout[i].modifiers = failed_mods[i].modifiers; --- -1.8.3.1 - - -From 5398ac0797f7516f2c9b8f2869a6c6d071437352 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 22:48:36 -0700 -Subject: [PATCH 06/16] unvalidated lengths in XQueryDeviceState() - [CVE-2013-1998 3/3] - -If the lengths given for each class state in the reply add up to more -than the rep.length, we could read past the end of the buffer allocated -to hold the data read from the server. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XQueryDv.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 69c285b..3836777 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceState * - XQueryDeviceState( -@@ -66,8 +67,8 @@ XQueryDeviceState( - XDevice *dev) - { - int i, j; -- int rlen; -- int size = 0; -+ unsigned long rlen; -+ size_t size = 0; - xQueryDeviceStateReq *req; - xQueryDeviceStateReply rep; - XDeviceState *state = NULL; -@@ -87,9 +88,11 @@ XQueryDeviceState( - if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) - goto out; - -- rlen = rep.length << 2; -- if (rlen > 0) { -- data = Xmalloc(rlen); -+ if (rep.length > 0) { -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = (unsigned long) rep.length << 2; -+ data = Xmalloc(rlen); -+ } - if (!data) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -97,6 +100,10 @@ XQueryDeviceState( - _XRead(dpy, data, rlen); - - for (i = 0, any = (XInputClass *) data; i < (int)rep.num_classes; i++) { -+ if (any->length > rlen) -+ goto out; -+ rlen -= any->length; -+ - switch (any->class) { - case KeyClass: - size += sizeof(XKeyState); --- -1.8.3.1 - - -From b0b13c12a8079a5a0e7f43b2b8983699057b2cec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 07/16] integer overflow in XGetDeviceControl() [CVE-2013-1984 - 1/8] - -If the number of valuators reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, then -memory corruption can occur when more bytes are copied from the X server -reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so -we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetDCtl.c | 31 ++++++++++++++++++++++++------- - 1 file changed, 24 insertions(+), 7 deletions(-) - -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index f73a4e8..51ed0ae 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceControl * - XGetDeviceControl( -@@ -68,8 +69,6 @@ XGetDeviceControl( - XDevice *dev, - int control) - { -- int size = 0; -- int nbytes, i; - XDeviceControl *Device = NULL; - XDeviceControl *Sav = NULL; - xDeviceState *d = NULL; -@@ -92,8 +91,12 @@ XGetDeviceControl( - goto out; - - if (rep.length > 0) { -- nbytes = (long)rep.length << 2; -- d = (xDeviceState *) Xmalloc((unsigned)nbytes); -+ unsigned long nbytes; -+ size_t size = 0; -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = (unsigned long) rep.length << 2; -+ d = Xmalloc(nbytes); -+ } - if (!d) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -111,33 +114,46 @@ XGetDeviceControl( - case DEVICE_RESOLUTION: - { - xDeviceResolutionState *r; -+ size_t val_size; - - r = (xDeviceResolutionState *) d; -- size += sizeof(XDeviceResolutionState) + -- (3 * sizeof(int) * r->num_valuators); -+ if (r->num_valuators >= (INT_MAX / (3 * sizeof(int)))) -+ goto out; -+ val_size = 3 * sizeof(int) * r->num_valuators; -+ if ((sizeof(xDeviceResolutionState) + val_size) > nbytes) -+ goto out; -+ size += sizeof(XDeviceResolutionState) + val_size; - break; - } - case DEVICE_ABS_CALIB: - { -+ if (sizeof(xDeviceAbsCalibState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsCalibState); - break; - } - case DEVICE_ABS_AREA: - { -+ if (sizeof(xDeviceAbsAreaState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsAreaState); - break; - } - case DEVICE_CORE: - { -+ if (sizeof(xDeviceCoreState) > nbytes) -+ goto out; - size += sizeof(XDeviceCoreState); - break; - } - default: -+ if (d->length > nbytes) -+ goto out; - size += d->length; - break; - } - -- Device = (XDeviceControl *) Xmalloc((unsigned)size); -+ Device = Xmalloc(size); - if (!Device) - goto out; - -@@ -150,6 +166,7 @@ XGetDeviceControl( - int *iptr, *iptr2; - xDeviceResolutionState *r; - XDeviceResolutionState *R; -+ unsigned int i; - - r = (xDeviceResolutionState *) d; - R = (XDeviceResolutionState *) Device; --- -1.8.3.1 - - -From 322ee3576789380222d4403366e4fd12fb24cb6a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 08/16] integer overflow in XGetFeedbackControl() - [CVE-2013-1984 2/8] - -If the number of feedbacks reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, or -if the total size of all the feedback structures overflows when added -together, then memory corruption can occur when more bytes are copied from -the X server reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so - we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetFCtl.c | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 28fab4d..bb50bf3 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XFeedbackState * - XGetFeedbackControl( -@@ -68,8 +69,6 @@ XGetFeedbackControl( - XDevice *dev, - int *num_feedbacks) - { -- int size = 0; -- int nbytes, i; - XFeedbackState *Feedback = NULL; - XFeedbackState *Sav = NULL; - xFeedbackState *f = NULL; -@@ -91,9 +90,16 @@ XGetFeedbackControl( - goto out; - - if (rep.length > 0) { -+ unsigned long nbytes; -+ size_t size = 0; -+ int i; -+ - *num_feedbacks = rep.num_feedbacks; -- nbytes = (long)rep.length << 2; -- f = (xFeedbackState *) Xmalloc((unsigned)nbytes); -+ -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = rep.length << 2; -+ f = Xmalloc(nbytes); -+ } - if (!f) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -102,6 +108,10 @@ XGetFeedbackControl( - _XRead(dpy, (char *)f, nbytes); - - for (i = 0; i < *num_feedbacks; i++) { -+ if (f->length > nbytes) -+ goto out; -+ nbytes -= f->length; -+ - switch (f->class) { - case KbdFeedbackClass: - size += sizeof(XKbdFeedbackState); -@@ -116,6 +126,8 @@ XGetFeedbackControl( - { - xStringFeedbackState *strf = (xStringFeedbackState *) f; - -+ if (strf->num_syms_supported >= (INT_MAX / sizeof(KeySym))) -+ goto out; - size += sizeof(XStringFeedbackState) + - (strf->num_syms_supported * sizeof(KeySym)); - } -@@ -130,10 +142,12 @@ XGetFeedbackControl( - size += f->length; - break; - } -+ if (size > INT_MAX) -+ goto out; - f = (xFeedbackState *) ((char *)f + f->length); - } - -- Feedback = (XFeedbackState *) Xmalloc((unsigned)size); -+ Feedback = Xmalloc(size); - if (!Feedback) - goto out; - --- -1.8.3.1 - - -From 6dd6dc51a2935c72774be81e5cc2ba2c30e9feff Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 09/16] integer overflow in XGetDeviceDontPropagateList() - [CVE-2013-1984 3/8] - -If the number of event classes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -V2: EatData if count is 0 but length is > 0 to avoid XIOErrors - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetProp.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index 34bc581..b49328c 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XEventClass * - XGetDeviceDontPropagateList( -@@ -88,10 +89,11 @@ XGetDeviceDontPropagateList( - } - *count = rep.count; - -- if (*count) { -- list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); -+ if (rep.length != 0) { -+ if ((rep.count != 0) && (rep.length < (INT_MAX / sizeof(XEventClass)))) -+ list = Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { -- int i; -+ unsigned int i; - CARD32 ec; - - /* read and assign each XEventClass separately because --- -1.8.3.1 - - -From bb922ed4253b35590f0369f32a917ff89ade0830 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 10/16] integer overflow in XGetDeviceMotionEvents() - [CVE-2013-1984 4/8] - -If the number of events or axes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGMotion.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 5feac85..a4c75b6 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceTimeCoord * - XGetDeviceMotionEvents( -@@ -74,7 +75,7 @@ XGetDeviceMotionEvents( - xGetDeviceMotionEventsReply rep; - XDeviceTimeCoord *tc; - int *data, *bufp, *readp, *savp; -- long size, size2; -+ unsigned long size; - int i, j; - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -104,10 +105,21 @@ XGetDeviceMotionEvents( - SyncHandle(); - return (NULL); - } -- size = rep.length << 2; -- size2 = rep.nEvents * (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -- savp = readp = (int *)Xmalloc(size); -- bufp = (int *)Xmalloc(size2); -+ if (rep.length < (INT_MAX >> 2)) { -+ size = rep.length << 2; -+ savp = readp = Xmalloc(size); -+ } else { -+ size = 0; -+ savp = readp = NULL; -+ } -+ /* rep.axes is a CARD8, so assume max number of axes for bounds check */ -+ if (rep.nEvents < -+ (INT_MAX / (sizeof(XDeviceTimeCoord) + (UCHAR_MAX * sizeof(int))))) { -+ size_t bsize = rep.nEvents * -+ (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -+ bufp = Xmalloc(bsize); -+ } else -+ bufp = NULL; - if (!bufp || !savp) { - Xfree(bufp); - Xfree(savp); --- -1.8.3.1 - - -From 242f92b490a695fbab244af5bad11b71f897c732 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 11/16] integer overflow in XIGetProperty() [CVE-2013-1984 5/8] - -If the number of items reported by the server is large enough that -it overflows when multiplied by the size of the appropriate item type, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XIProperties.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 5e58fb6..32436d1 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -38,6 +38,7 @@ - #include <X11/extensions/XInput2.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - Atom* - XIListProperties(Display* dpy, int deviceid, int *num_props_return) -@@ -170,7 +171,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - { - xXIGetPropertyReq *req; - xXIGetPropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -216,9 +217,11 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * recopy the string to make it null terminated. - */ - -- nbytes = rep.num_items * rep.format/8; -- rbytes = nbytes + 1; -- *data = Xmalloc(rbytes); -+ if (rep.num_items < (INT_MAX / (rep.format/8))) { -+ nbytes = rep.num_items * rep.format/8; -+ rbytes = nbytes + 1; -+ *data = Xmalloc(rbytes); -+ } - - if (!(*data)) { - _XEatDataWords(dpy, rep.length); --- -1.8.3.1 - - -From 528419b9ef437e7eeafb41bf45e8ff7d818bd845 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 12/16] integer overflow in XIGetSelectedEvents() - [CVE-2013-1984 6/8] - -If the number of events or masks reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -or the sizes overflow as they are totaled up, then memory corruption can -occur when more bytes are copied from the X server reply than the size -of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XISelEv.c | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index f871222..0471bef 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -42,6 +42,7 @@ in this Software without prior written authorization from the author. - #include <X11/extensions/ge.h> - #include <X11/extensions/geproto.h> - #include "XIint.h" -+#include <limits.h> - - int - XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks) -@@ -101,13 +102,14 @@ out: - XIEventMask* - XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - { -- int i, len = 0; -+ unsigned int i, len = 0; - unsigned char *mask; - XIEventMask *mask_out = NULL; - xXIEventMask *mask_in = NULL, *mi; - xXIGetSelectedEventsReq *req; - xXIGetSelectedEventsReply reply; - XExtDisplayInfo *info = XInput_find_display(dpy); -+ size_t rbytes; - - *num_masks_return = -1; - LockDisplay(dpy); -@@ -129,11 +131,16 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - goto out; - } - -- mask_in = Xmalloc(reply.length * 4); -- if (!mask_in) -+ if (reply.length < (INT_MAX >> 2)) { -+ rbytes = (unsigned long) reply.length << 2; -+ mask_in = Xmalloc(rbytes); -+ } -+ if (!mask_in) { -+ _XEatDataWords(dpy, reply.length); - goto out; -+ } - -- _XRead(dpy, (char*)mask_in, reply.length * 4); -+ _XRead(dpy, (char*)mask_in, rbytes); - - /* - * This function takes interleaved xXIEventMask structs & masks off -@@ -148,8 +155,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - for (i = 0, mi = mask_in; i < reply.num_masks; i++) - { -- len += mi->mask_len * 4; -- mi = (xXIEventMask*)((char*)mi + mi->mask_len * 4); -+ unsigned int mask_bytes = mi->mask_len * 4; -+ len += mask_bytes; -+ if (len > INT_MAX) -+ goto out; -+ if ((sizeof(xXIEventMask) + mask_bytes) > rbytes) -+ goto out; -+ rbytes -= (sizeof(xXIEventMask) + mask_bytes); -+ mi = (xXIEventMask*)((char*)mi + mask_bytes); - mi++; - } - --- -1.8.3.1 - - -From 17071c1c608247800b2ca03a35b1fcc9c4cabe6c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 13:30:55 -0700 -Subject: [PATCH 13/16] Avoid integer overflow in XGetDeviceProperties() - [CVE-2013-1984 7/8] - -If the number of items as reported by the Xserver is too large, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetDProp.c | 61 ++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 37 insertions(+), 24 deletions(-) - -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index f9e8f0c..3691122 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -38,6 +38,7 @@ in this Software without prior written authorization from the author. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - int - XGetDeviceProperty(Display* dpy, XDevice* dev, -@@ -48,7 +49,8 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - { - xGetDevicePropertyReq *req; - xGetDevicePropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; -+ int ret = Success; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -81,30 +83,43 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * data, but this last byte is null terminated and convenient for - * returning string properties, so the client doesn't then have to - * recopy the string to make it null terminated. -+ * -+ * Maximum item limits are set to both prevent integer overflow when -+ * calculating the amount of memory to malloc, and to limit how much -+ * memory will be used if a server provides an insanely high count. - */ - switch (rep.format) { - case 8: -- nbytes = rep.nItems; -- rbytes = rep.nItems + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XReadPad (dpy, (char *) *prop, nbytes); -+ if (rep.nItems < INT_MAX) { -+ nbytes = rep.nItems; -+ rbytes = rep.nItems + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XReadPad (dpy, (char *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 16: -- nbytes = rep.nItems << 1; -- rbytes = rep.nItems * sizeof (short) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead16Pad (dpy, (short *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (short))) { -+ nbytes = rep.nItems << 1; -+ rbytes = rep.nItems * sizeof (short) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead16Pad (dpy, (short *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 32: -- nbytes = rep.nItems << 2; -- rbytes = rep.nItems * sizeof (long) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead32 (dpy, (long *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (long))) { -+ nbytes = rep.nItems << 2; -+ rbytes = rep.nItems * sizeof (long) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead32 (dpy, (long *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - default: -@@ -112,16 +127,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadImplementation); -+ ret = BadImplementation; - } - if (! *prop) { - _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadAlloc); -+ if (ret == Success) -+ ret = BadAlloc; -+ goto out; - } - (*prop)[rbytes - 1] = '\0'; - } -@@ -130,9 +142,10 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - *actual_format = rep.format; - *nitems = rep.nItems; - *bytes_after = rep.bytesAfter; -+ out: - UnlockDisplay (dpy); - SyncHandle (); - -- return Success; -+ return ret; - } - --- -1.8.3.1 - - -From ef82512288d8ca36ac0beeb289f158195b0a8cae Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 00:22:14 -0800 -Subject: [PATCH 14/16] Avoid integer overflow in XListInputDevices() - [CVE-2013-1984 8/8] - -If the length of the reply as reported by the Xserver is too long, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XListDev.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1fa4747..1c14b96 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - /* Calculate length field to a multiples of sizeof(XID). XIDs are typedefs - * to ulong and thus may be 8 bytes on some platforms. This can trigger a -@@ -179,7 +180,7 @@ XListInputDevices( - XAnyClassPtr Any; - char *nptr, *Nptr; - int i; -- long rlen; -+ unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); - - LockDisplay(dpy); -@@ -198,9 +199,10 @@ XListInputDevices( - - if ((*ndevices = rep.ndevices)) { /* at least 1 input device */ - size = *ndevices * sizeof(XDeviceInfo); -- rlen = rep.length << 2; /* multiply length by 4 */ -- list = (xDeviceInfo *) Xmalloc(rlen); -- slist = list; -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = rep.length << 2; /* multiply length by 4 */ -+ slist = list = Xmalloc(rlen); -+ } - if (!slist) { - _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 81b4df8ac6aa1520c41c3526961014a6f115cc46 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 00:16:22 -0800 -Subject: [PATCH 15/16] sign extension issue in XListInputDevices() - [CVE-2013-1995] - -nptr is (signed) char, which can be negative, and will sign extend -when added to the int size, which means size can be subtracted from, -leading to allocating too small a buffer to hold the data being copied -from the X server's reply. - -v2: check that string size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XListDev.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1c14b96..b85ff3c 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -73,7 +73,7 @@ static int pad_to_xid(int base_size) - return ((base_size + padsize - 1)/padsize) * padsize; - } - --static int -+static size_t - SizeClassInfo(xAnyClassPtr *any, int num_classes) - { - int size = 0; -@@ -170,7 +170,7 @@ XListInputDevices( - register Display *dpy, - int *ndevices) - { -- int size; -+ size_t size; - xListInputDevicesReq *req; - xListInputDevicesReply rep; - xDeviceInfo *list, *slist = NULL; -@@ -178,7 +178,7 @@ XListInputDevices( - XDeviceInfo *clist = NULL; - xAnyClassPtr any, sav_any; - XAnyClassPtr Any; -- char *nptr, *Nptr; -+ unsigned char *nptr, *Nptr; - int i; - unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -217,9 +217,12 @@ XListInputDevices( - size += SizeClassInfo(&any, (int)list->num_classes); - } - -- for (i = 0, nptr = (char *)any; i < *ndevices; i++) { -+ Nptr = ((unsigned char *)list) + rlen + 1; -+ for (i = 0, nptr = (unsigned char *)any; i < *ndevices; i++) { - size += *nptr + 1; - nptr += (*nptr + 1); -+ if (nptr > Nptr) -+ goto out; - } - - clist = (XDeviceInfoPtr) Xmalloc(size); -@@ -245,8 +248,8 @@ XListInputDevices( - } - - clist = sclist; -- nptr = (char *)any; -- Nptr = (char *)Any; -+ nptr = (unsigned char *)any; -+ Nptr = (unsigned char *)Any; - for (i = 0; i < *ndevices; i++, clist++) { - clist->name = (char *)Nptr; - memcpy(Nptr, nptr + 1, *nptr); -@@ -256,6 +259,7 @@ XListInputDevices( - } - } - -+ out: - XFree((char *)slist); - UnlockDisplay(dpy); - SyncHandle(); --- -1.8.3.1 - - -From 661c45ca17c434dbd342a46fd3fb813852ae0ca9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue, 21 May 2013 12:23:05 +1000 -Subject: [PATCH 16/16] Don't overwrite the cookies serial number - -serial != sequenceNumber, see _XSetLastRequestRead() - -cookie->serial is already set at this point, setting it again directly from -the sequenceNumber of the event causes a bunch of weird issues such as -scrollbars and text drag-n-drop breaking. - -https://bugzilla.redhat.com/show_bug.cgi?id=965347 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XExtInt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 8e19b97..d3c6b7c 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,7 +915,6 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -- cookie->serial = ev->sequenceNumber; - } - - static Bool --- -1.8.3.1 - diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index a6cc5b6af..84a3f01e3 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ +# $Id: PKGBUILD 189484 2013-07-03 16:37:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.12 +pkgver=4.7.14 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') +md5sums=('2d7771d8063aec6efb27a35663d67e9f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 37bfa9dff..0acf19815 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $ +# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -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=('55f6ea5982cf87836113376174826e8c' +md5sums=('99e311b2202057a259899f67b425e087' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 6fbd898c2..4c2241182 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187924 2013-06-08 07:59:02Z andrea $ +# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.4 +pkgver=4.10.5 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' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('28d9641ffc1b877f0cd0d27343b56563ed2bc74d') +sha1sums=('416dbcc9e20d463ed8dc009a4cd7d26be6ffa6cc') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index dc3b46b3e..be62d7eb4 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187941 2013-06-08 07:59:20Z andrea $ +# $Id: PKGBUILD 189504 2013-07-03 17:00:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="The Library containing the Nepomuk Widgets" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('nepomuk-core') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fb7379a3b324b2660f220094c8273860722fe3f1') +sha1sums=('f796178217f69e211786f08ed7c40c39b96d25c9') build() { mkdir build diff --git a/extra/nx-common/NXproto.h.64bit.diff b/extra/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/extra/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD deleted file mode 100644 index f5864f238..000000000 --- a/extra/nx-common/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 157435 2012-04-28 09:58:39Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' -makedepends=('xorg-server-devel' 'nx-headers') -source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch) -options=('!libtool') -md5sums=('84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c') - -build() { - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/usr/lib/nx - make - - # nxssh - cd ${srcdir}/nxssh - sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} . - # ^ really needed? - - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh - cd ${pkgdir}/usr/bin - ln -sv /usr/lib/nx/bin/nxssh . -} diff --git a/extra/nx-common/nx-3.5.0-libpng15.patch b/extra/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/extra/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/extra/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD deleted file mode 100644 index 466077c1d..000000000 --- a/extra/opennx/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 175949 2013-01-25 09:52:43Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Armin Luntzer -# Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk - -pkgname=opennx -pkgver=0.16.0.725 -pkgrel=1 -pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser" -url="http://opennx.sf.net/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl' 'nx-common') -makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat') -#optdepends=('cups: for full local printing support') -source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz) -md5sums=('6bfe389638ac9c14fa89ca56b0c671b6') - -build() { - cd $srcdir/opennx* - ./configure --prefix=/usr \ - --enable-usbip - make -} - -package() { - cd $srcdir/opennx* - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} install-man - - # fix some file locations - install -dm755 ${pkgdir}/usr/share/applications - cp -aR ${pkgdir}/usr/share/applnk/xdg/* ${pkgdir}/usr/share/applications - rm -rf ${pkgdir}/usr/share/applnk - - sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" ${pkgdir}/usr/share/applications/*.desktop -} diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD index 283a541e8..5a9028ff4 100644 --- a/extra/xmlsec/PKGBUILD +++ b/extra/xmlsec/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 135818 2011-08-18 15:05:00Z andyrtr $ +# $Id: PKGBUILD 189642 2013-07-03 19:47:13Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=xmlsec -pkgver=1.2.18 -pkgrel=2 +pkgver=1.2.19 +pkgrel=1 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=(i686 x86_64) url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') -makedepends=('pkgconfig') +depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl') options=('!libtool') source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) -md5sums=('8694b4609aab647186607f79e1da7f1a') +md5sums=('fe664ba5f01ebfaeb0ab5deeb0b2249e') build() { cd ${srcdir}/${pkgname}1-${pkgver} diff --git a/java/not-working/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD deleted file mode 100644 index 8318379a2..000000000 --- a/java/not-working/closure-compiler/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=closure-compiler -pkgver=20120917 -_pkgrev=2180 -pkgdesc="A JavaScript optimizing compiler." -url="https://code.google.com/closure/compiler/" -license=('Apache') - -pkgrel=1 -arch=('any') -depends=('java-runtime') -makedepends=( - 'apache-ant' - 'java-args4j' # does not exist - 'google-caja' # does not exist - 'java-guava' # does not build - 'java-jarjar' - 'java-json' # does not exist - 'java-jsr305' # does not exist - 'junit' - 'java-protobuf' # does not build - # maven-ant-tasks - 'jh') -source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev") - -# For some reason, `file` detects this as a Fortran binary -_funny_js=( - lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js -) - -mksource() { - cd "$srcdir/compiler-$pkgver" - rm lib/ant.jar - rm lib/ant-launcher.jar - rm lib/args4j.jar - rm lib/caja-r4314.jar - rm lib/guava.jar - rm lib/jarjar.jar - rm lib/json.jar - rm lib/jsr305.jar - rm lib/junit.jar - rm lib/protobuf-java.jar - rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar - rm tools/maven-ant-tasks-2.1.3.jar -} - -build() { - cd "$srcdir/compiler-$pkgver" - eval `jh mksource ${_funny_js[@]}` - - ln -s /opt/apache-ant/lib/ant.jar lib/ant.jar - ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar - ln -s /usr/share/java/... lib/args4j.jar - ln -s /usr/share/java/... lib/caja-r4314.jar - ln -s /usr/share/java/... lib/guava.jar - ln -s /usr/share/java/jarjar.jar lib/jarjar.jar - ln -s /usr/share/java/... lib/json.jar - ln -s /usr/share/java/... lib/jsr305.jar - ln -s /usr/share/java/junit.jar lib/junit.jar - ln -s /usr/share/java/protobuf.jar lib/protobuf-java.jar - # I think lib/rhino/.../module.jar autogenerates - ln -s /... tools/maven-ant-tasks-2.1.3.jar - - ant jar -} - -package() { - cd "$srcdir/$pkgname" - : -} - -md5sums=('SKIP') diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO deleted file mode 100644 index 8527a4898..000000000 --- a/java/not-working/closure-compiler/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* Has plenty of missing dependencies (most of the 'not-working' folder) -* package() has not been written diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD deleted file mode 100644 index 3db06dddc..000000000 --- a/java/not-working/java-asm4/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgver=4.1 -. ../java-asm2/common.sh -depends+=('java-bnd') - -#### - -pkgrel=5 -_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz) - -mksource() { - cd "$srcdir/$_pkgname-$pkgver" - rm examples/jasmin/test/jasmin.jar -} - -md5sums=('cbfd7445edc517e0867ad410e48cb106') diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO deleted file mode 100644 index 563c88bc9..000000000 --- a/java/not-working/java-asm4/TODO +++ /dev/null @@ -1 +0,0 @@ -Depends on java-bnd, which is not packaged
\ No newline at end of file diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD deleted file mode 100644 index 0250e7183..000000000 --- a/java/not-working/java-guava/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -_pkgname=guava -pkgname=java-guava -pkgver=13.0.1 -pkgdesc="Google Core Libraries for Java." -url="https://code.google.com/p/guava-libraries/" -license=('Apache2') - -pkgrel=1 -arch=('any') -depends=('java-runtime>=5') -makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh') -conflicts=('openjdk6') # OpenJDK bug 100167 conflicts -source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver") - -mksource() { - cd "$srcdir/$pkgname" - rm guava/lib/*.jar - rm guava-test/lib/*.jar -} - -build() { - cd "$srcdir/$pkgname" - eval `jh mksource` - - ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java - - mvn package -} - -package() { - : -} diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO deleted file mode 100644 index ee0a18042..000000000 --- a/java/not-working/java-guava/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* depends on junit-truth, which does not build yet -* package() hasn't been written diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD deleted file mode 100644 index 61a0ee469..000000000 --- a/java/not-working/junit-truth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=junit-truth -pkgdesc="Assertion/Proposition framework for Java unit tests." -url="https://github.com/truth0/truth" -license=('Apache2') - -#_pkgver=0.5.0-beta1 -#pkgver=${_pkgver//-/.} -#_tag=v${_pkgver} - -#pkgver=0.7.0 -#_tag=truth-rel-${pkgver//./-} - -#pkgver=0.8 -#_tag=truth-${pkgver} - -#pkgver=0.9 -#_tag=release_${pkgver//./_} - -pkgver=0.10 -_tag=release_${pkgver//./_} - -pkgrel=1 -arch=('any') -depends=('junit') -makedepends=('maven' 'jh') -conflicts=('openjdk6') # OpenJDK bug 100167 conflicts -source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag") - -build() { - cd "${srcdir}/${pkgname}" - jh checksource - mvn package -} - -package() { - cd "${srcdir}/${pkgname}" - install -d "${pkgdir}"/usr/share/java/${pkgname} - JAR=${pkgname}-${pkgver}.jar - install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname} - ln -s ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar -} - -md5sums=('SKIP') diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO deleted file mode 100644 index d21b3e472..000000000 --- a/java/not-working/junit-truth/TODO +++ /dev/null @@ -1 +0,0 @@ -has unpackaged dependencies diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD deleted file mode 100644 index 699bde0cf..000000000 --- a/java/not-working/protobuf/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# Maintainer: Thomas S Hatch <thatch45@gmail.com> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=protobuf -pkgname=('protobuf' 'python2-protobuf' 'java-protobuf') -pkgver=2.4.1 -pkgrel=2.1 -pkgdesc="A way of encoding structured data in an efficient yet extensible format" -arch=('i686' 'x86_64') -url="http://code.google.com/p/protobuf/" -license=('APACHE') -depends=('gcc-libs' 'zlib') -makedepends=('python2' 'python2-distribute' 'java-environment') -options=(!libtool) -source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('ed436802019c9e1f40cc750eaf78f318') - -#### - -build() { - build_protobuf - build_python2-protobuf - build_java-protobuf -} - -check() { - check_protobuf - check_python2-protobuf - check_java-protobuf -} - -package() { - package_protobuf - package_python2-protobuf - package_java-protobuf -} - -#### - -build_protobuf() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-static - make -} - -check_protobuf() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package_protobuf() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} - -#### - -build_python2-protobuf() { - cd $srcdir/$pkgname-$pkgver/python - python2 setup.py build -} - -check_python2-protobuf() { - cd $srcdir/$pkgname-$pkgver/python - python2 setup.py test -} - -package_python2-protobuf() { - pkgdesc="protobuf python2 API" - replaces=('protobuf-python') - provides=("protobuf-python=${pkgver}") - depends=("python2" "protobuf=${pkgver}") - - cd $srcdir/protobuf-$pkgver/python - python2 setup.py install --prefix=/usr --root $pkgdir -} - -#### - -build_java-protobuf() { - cd $srcdir/$pkgname-$pkgver/java - mvn compile -} - -check_java-protobuf() { - cd $srcdir/$pkgname-$pkgver/java - mvn test -} - -package_java-protobuf() { - pkgdesc="protobuf Java API" - replaces=('protobuf-java') - provides=("protobuf-java=${pkgver}") - depends=("java-runtime" "protobuf=${pkgver}") - - cd $srcdir/$pkgname-$pkgver/java - : -} diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO deleted file mode 100644 index 6a126b757..000000000 --- a/java/not-working/protobuf/TODO +++ /dev/null @@ -1,5 +0,0 @@ -* Missing dependencies: - * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?) - * org.easymock:easymock:2.2 - * org.easymock:easymockclassextension:2.2.1 -* package_java-protobuf() has not been written diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 1a0e3ddd0..3f83618e0 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ +# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.6 -pkgrel=2 +pkgver=2.6.6.7 +pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a018efb1fe0f722ff307382791bf3c98') +md5sums=('10b6704f34568d226fb5fe69b7d6043d') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 7db206be9..2d5f48040 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ +# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.6 -pkgrel=2 +pkgver=2.6.6.7 +pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a018efb1fe0f722ff307382791bf3c98') +md5sums=('10b6704f34568d226fb5fe69b7d6043d') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index d5a72e95c..f1264b0c7 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d' +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 4b6f40af9..224d304e1 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1' +sha1sums=('1d472ceff3a38ff778803817b9c0eeb5b1880db6' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index ea698dfd7..8cdf5228e 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('b5db1b91bd96b44ebd1b5e71019bb95b59775237' +sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 89ed6edf3..890c2ef66 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188552 2013-06-15 11:11:13Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -56,6 +56,6 @@ package_kdenetwork-kopete-libre() { install='kdenetwork-kopete.install' cd $srcdir/build/kopete make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete + cd $srcdir/build/kopete/doc make DESTDIR=$pkgdir install } diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 007ed7f74..3f9b3ce28 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') +sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 6b7a264ae..5efee348d 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7' +sha1sums=('8c50a864af0dbf62e3df46414c7bf9cd1d8c8620' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 4b46592d0..4983604a4 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,14 +2,15 @@ # Contributor: Márcio Silva <coadde@lavabit.com> pkgname=linux-libre-firmware -pkgver=3.9 -pkgrel=2 +_pkgver=3.9 +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') url=('http://linux-libre.fsfla.org/' 'http://wireless.kernel.org/en/users/Drivers/ath9k_htc') license=('GPL2' 'BSD') -makedepends=('git' 'wget') +makedepends=('git' 'xtensa-unknown-elf-gcc') provides=('linux-firmware' 'kernel26-firmware=2.6.34.99') conflicts=('linux-firmware' @@ -37,41 +38,29 @@ replaces=('linux-firmware' 'rt2870usb-fw' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/linux-libre-$_pkgver-gnu.tar.xz" "git://github.com/qca/open-ath9k-htc-firmware") md5sums=('120df29f88622dabf7015a22c7cc8e25' 'SKIP') -prepare() { - - cd $srcdir/open-ath9k-htc-firmware - - # disable build error - sed -i 's|GMP,|GMP,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|MPFR,|MPFR,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|MPC,|MPC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|BINUTILS,|BINUTILS,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - s|GCC,|GCC,\n\t\t--disable-werror, \\\n\t\t--disable-fatal-warnings,|; - ' Makefile - - # prepare toolchain to compile ath9k-htc firmware - make toolchain - -} - build() { cd $srcdir/open-ath9k-htc-firmware # create firmware folder to put the free firmware files there - mkdir -p $pkgdir/usr/lib/firmware + install -d -m755 $pkgdir/usr/lib/firmware + + # fix path on configure file + sed -i 's|$PWD/../toolchain/inst|/usr|; + 's|xtensa-elf|xtensa-unknown-elf|; + ' target_firmware/configure # compile ath9k-htc-firmware make -C target_firmware mv htc_{7010,9271}.fw $pkgdir/usr/lib/firmware - cd $srcdir/linux-$pkgver + cd $srcdir/linux-$_pkgver # compile free firmware files of linux-libre source code make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install @@ -80,6 +69,7 @@ build() { package() { + # create licenses folder to put the licenses files there install -d -m755 $pkgdir/usr/share/licenses/$pkgname # move LICENSE.TXT from ath9k-htc firmware to linux-firmware license folder @@ -87,7 +77,7 @@ package() { mv LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE.atheros_firmware # move WHENCE file to linux-firmware license folder - cd $srcdir/linux-$pkgver + cd $srcdir/linux-$_pkgver mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname } diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index d2c38b7d6..af130b5c0 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -8,11 +8,10 @@ arch=('any') url='https://projects.parabolagnulinux.org/hackers.git/' license=('GPL') install="${pkgname}.install" -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" - "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig") +source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig}) package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-"* make PREFIX=/usr DESTDIR=${pkgdir} install } md5sums=('007c35459478f86484f66323bf90b1e0' diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD index 2e29d1ff4..be9284c45 100644 --- a/libre/xtensa-unknown-elf-binutils/PKGBUILD +++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD @@ -1,23 +1,21 @@ # $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=binutils _target="xtensa-unknown-elf" -_sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-binutils pkgver=2.23.2 -pkgrel=2.3 +pkgrel=2.4 pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" license=('GPL') groups=("${_target}-base-devel") depends=('glibc>=2.17' 'zlib') -checkdepends=('dejagnu' 'bc') -options=('!libtool' '!distcc' '!ccache') +options=('!libtool') install=${_target}-binutils.install source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} binutils-2.23.2-texinfo-5.0.patch) @@ -30,10 +28,7 @@ prepare() { # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 - patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch - - # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure + patch -Np1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch mkdir ${srcdir}/binutils-build } @@ -41,56 +36,34 @@ prepare() { build() { cd ${srcdir}/binutils-build - CFLAGS=" -pipe " \ - CXXFLAGS=" -pipe " \ ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ - --with-lib-path=/usr/lib:/usr/local/lib \ - --with-bugurl=https://labs.parabola.nu/ \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --with-pic --enable-shared \ - --disable-werror --disable-multilib \ - --target=${_target} + --target=${_target} \ + --bindir=/usr/bin --sbindir=/usr/bin \ + --disable-nls \ + --enable-shared \ + --disable-multilib \ + --with-bugurl=https://labs.parabola.nu/ +# --libdir=/usr/lib --libexecdir=/usr/lib --with-lib-path=/usr/lib \ +# --enable-ld=default --enable-gold \ +# --enable-plugins --enable-threads \ +# --with-pic \ +# --disable-werror \ # check the host environment and makes sure all the necessary tools are available make configure-host - make tooldir=/usr -} - -check() { - cd ${srcdir}/binutils-build - - # unset LDFLAGS as testsuite makes assumptions about which ones are active - # do not abort on errors - manually check log files - make LDFLAGS="" -k check || true + make } package() { cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include - - # Install PIC libiberty.a - install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib + make prefix=${pkgdir}/usr install # Remove unwanted files rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}* - rm ${pkgdir}/usr/share/info/{configure,standards}.info # Remove unnecessary files and folders - rm -f $pkgdir/usr/bin/ar - rm -f $pkgdir/usr/bin/as - rm -f $pkgdir/usr/bin/ld - rm -f $pkgdir/usr/bin/nm - rm -f $pkgdir/usr/bin/objdump - rm -f $pkgdir/usr/bin/ranlib - rm -f $pkgdir/usr/bin/strip - rm -f $pkgdir/usr/bin/objcopy - rm -f $pkgdir/usr/include - rm -f $pkgdir/usr/lib/libiberty.a - rm -rf $pkgdir/usr/share + rm $pkgdir/usr/${_target}/bin/* && rmdir $pkgdir/usr/${_target}/bin + rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include + rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info } diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD index 6081151b7..797f67f9e 100644 --- a/libre/xtensa-unknown-elf-gcc/PKGBUILD +++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD @@ -10,7 +10,6 @@ _sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-gcc pkgver=4.8.1 pkgrel=1 -#_snapshot=4.8-20130502 pkgdesc="The GNU Compiler Collection for Xtensa processors" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,15 +18,9 @@ makedepends=("binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen') checkdepends=('dejagnu' 'inetutils') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 md5sums=('3b2386c114cd74185aa3754b58a79304') - -if [ -n "${_snapshot}" ]; then - _basedir=gcc-${_snapshot} -else - _basedir=gcc-${pkgver} -fi +_basedir=gcc-${pkgver} prepare() { cd ${srcdir}/${_basedir} @@ -40,28 +33,23 @@ prepare() { echo ${pkgver} > gcc/BASE-VER - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - mkdir ${srcdir}/gcc-build } build() { cd ${srcdir}/gcc-build - # using -pipe causes spurious test-suite failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 - CFLAGS=${CFLAGS/-pipe/} - CXXFLAGS=${CXXFLAGS/-pipe/} - - LD_LIBRARY_PATH=/usr/lib ${srcdir}/${_basedir}/configure --prefix=/usr \ - --disable-shared --disable-threads --disable-multilib \ - --enable-languages=c \ - --disable-nls \ - --target=$_target -# --build=x86_64-unknown-linux-gnu \ -# --without-headers \ -# --disable-multilib --disable-libssp --disable-werror \ + ${srcdir}/${_basedir}/configure --prefix=/home/marcio/src/xtensa-elf/tools \ + --target=${_target} \ + --disable-multilib \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --enable-languages=c \ + --disable-libquadmath \ + --disable-libssp \ + --with-newlib +# --disable-werror \ # --libdir=/usr/lib --libexecdir=/usr/lib \ # --mandir=/usr/share/man --infodir=/usr/share/info \ # --with-bugurl=https://labs.parabola.nu/ \ @@ -74,30 +62,14 @@ build() { # --enable-lto --enable-gold --enable-ld=default \ # --enable-plugin --with-plugin-ld=ld.gold \ # --with-linker-hash-style=gnu --disable-install-libiberty \ -# --with-as=/usr/bin/${_target}-as --with-ld=/usr/bin/${_target}-ld \ -# --disable-multilib --disable-libssp --disable-werror \ # --enable-checking=release \ -# --target=${_target} \ -# --with-newlib - make - + make all-gcc + # make documentation cd ${_target}/libstdc++-v3 make doc-man-doxygen } -check() { - cd ${srcdir}/gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${srcdir}/${_basedir}/contrib/test_summary -} - package() { pkgdesc="The GNU Compiler Collection" @@ -107,7 +79,7 @@ package() cd ${srcdir}/gcc-build - make -j1 DESTDIR=${pkgdir} install + make -j1 DESTDIR=${pkgdir} install-gcc install -d $pkgdir/usr/share/gdb/auto-load/usr/lib mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog new file mode 100644 index 000000000..fbe55643a --- /dev/null +++ b/pcr/hiredis/ChangeLog @@ -0,0 +1,4 @@ +2013-06-07 Vladimir Tsanev <tsachev@gamil.com> + + * 0.11.0-1 : + Initial PKGBUILD. diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD new file mode 100644 index 000000000..29762e87e --- /dev/null +++ b/pcr/hiredis/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Vladimir Tsanev <tsachev@gmail.com> + +pkgname=hiredis +pkgver=0.11.0 +pkgrel=1 +pkgdesc='minimalistic C client library for Redis' +arch=('x86_64' 'i686') +url="https://github.com/redis/hiredis/" +license=('BSD') +depends=('glibc') +changelog='ChangeLog' +source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver}) +md5sums=('e2ac29509823ccc96990b6fe765b5d46') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +# +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make test check c +#} + +package() { + + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX="$pkgdir/usr" clean dep install + + install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING" + +} diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD new file mode 100644 index 000000000..3e040a495 --- /dev/null +++ b/pcr/kamailio/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> + +pkgname=kamailio +pkgver=4.0.1 +pkgrel=1 +pkgdesc="Rock solid SIP server" +url="http://www.kamailio.org/" +license=('GPL2') +arch=('i686' 'x86_64') +makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2' + 'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp' + 'libunistring' 'python2') +optdepends=('mariadb: mysql support' + 'expat: xmpp/jabber support' + 'libxml2: cpl and presence modules support' + 'radiusclient-ng: radius support' + 'postgresql: postgresql backend') +source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz) +sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin + make PYTHON="python2" all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=${pkgdir}/usr \ + PYTHON="python2" \ + cfg_prefix=${pkgdir} \ + bind_dir=${pkgdir}/usr/bin \ + bingroup_include="standard standard-dep stable experimental" \ + skip_modules="iptrtpproxy osp dbtext oracle" \ + install +} diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD new file mode 100644 index 000000000..2a6c0fac3 --- /dev/null +++ b/pcr/par/PKGBUILD @@ -0,0 +1,38 @@ +# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> +# Contributor: quantax -- contact via Arch Linux forum or AUR + +pkgname=par +pkgver=1.52 +pkgrel=3 +pkgdesc="Paragraph reformatter" +url="http://www.nicemice.net/par/" +depends=('glibc') +arch=(i686 x86_64) +license=('Custom') +source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz + http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz + http://www.nicemice.net/par/Par152.tar.gz ) +md5sums=('83e4d23a943ab07c44dd995b73195c70' + 'e79b448cb14323a39d817afce4847cdf' + '4ccacd824171ba2c2f14fb8aba78b9bf') + +prepare() { + cd $srcdir/Par152 + + patch -p1 -i $srcdir/par_1.52-i18n.3.diff +} + +build() { + cd $srcdir/Par152 + + ./configure --prefix=/usr + + make +} + +package() { + cd $srcdir/Par152 + install --mode=755 -D par "${pkgdir}/usr/bin/par" + install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1" + install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc" +} diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD index 9f77354b2..cb7d6bd45 100644 --- a/pcr/pybonjour/PKGBUILD +++ b/pcr/pybonjour/PKGBUILD @@ -16,4 +16,4 @@ md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2') package() { cd $srcdir/$pkgname-$pkgver python2 setup.py install --root=$pkgdir - } +} diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD new file mode 100644 index 000000000..437030401 --- /dev/null +++ b/pcr/radiusclient-ng/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Jonathan Liu <net147@gmail.com> +pkgname=radiusclient-ng +pkgver=0.5.6 +pkgrel=1 +pkgdesc="Client library and basic utilities for RADIUS AAA" +arch=(i686 x86_64) +url="http://wiki.freeradius.org/Radiusclient" +license=('custom:NetBSD') +depends=('bash') +conflicts=('freeradius-client') +source=(http://download.berlios.de/radiusclient-ng/$pkgname-$pkgver.tar.gz) +md5sums=('6fb7d4d0aefafaee7385831ac46a8e9c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc + make + +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + install -D -m644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" \ + "$pkgdir/usr/share/licenses/${pkgver}/COPYRIGHT" + +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ruby-haml/ruby-yard/PKGBUILD b/pcr/ruby-haml/ruby-yard/PKGBUILD deleted file mode 100644 index a686f937d..000000000 --- a/pcr/ruby-haml/ruby-yard/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Matt Harrison <matt at mistbyte dot com> -# Contributor: Renzo Carbonara <gnuk0001@gmail.com> - -pkgname=ruby-yard -_gemname=${pkgname#ruby-} -pkgver=0.8.2.1 -pkgrel=2 -pkgdesc="Documentation tool for consistent and usable documentation in Ruby." -arch=('any') -url="http://yardoc.org" -license=('MIT') -groups=() -depends=() -makedepends=('rubygems') -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=("http://gems.rubyforge.org/gems/yard-${pkgver}.gem") -noextract=("yard-${pkgver}.gem") - -build() { - cd $srcdir - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \ - -n "$pkgdir/usr/bin" ${_gemname}-$pkgver.gem - install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" \ - "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} - -md5sums=('08a48d23f8729b68945011cae7d121fe') - -# vim:set ts=2 sw=2 et: diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD index 5e3699bce..dcabaa642 100644 --- a/pcr/transmission-remote-cli/PKGBUILD +++ b/pcr/transmission-remote-cli/PKGBUILD @@ -1,29 +1,25 @@ # Maintainer: fauno <fauno@kiwwwi.com.ar> pkgname=transmission-remote-cli -pkgver=0.10.4 +pkgver=1.5.0 pkgrel=1 pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission" arch=('any') url="https://github.com/fagga/transmission-remote-cli" license=('GPL3') depends=('python2') -optdepends=('transmission-daemon>=2.40: for local transmission management' +optdepends=('transmission-daemon: for local transmission management' 'adns-python: Resolve IPs to host names' - 'python-geoip: Guess which country peers come from') + 'python2-geoip: Guess which country peers come from') conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013") replaces=('transmission-remote-cli-git') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz - python2.patch) +source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz) -build() { +package() { cd "${srcdir}/${pkgname}" msg "Starting make..." - patch -Np1 -i ${srcdir}/python2.patch - install -d ${pkgdir}/usr/bin/ install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli } -md5sums=('b85382bc2e24c5733f9c3833098da668' - '6273609fb3a7294328aeaa526b76411c') +md5sums=('4c13aa8596d35ce5793ea65affa8a6e5') diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD index 896d5bacf..fe8204d0a 100644 --- a/social/asterisk/PKGBUILD +++ b/social/asterisk/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Alessio Biancalana <dottorblaster@gmail.com> pkgname=asterisk -pkgver=10.9.0 +pkgver=11.0.1 pkgrel=1 pkgdesc="A complete PBX solution" arch=('i686' 'x86_64') @@ -15,20 +15,20 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$ asterisk \ asterisk.logrotated) install=$pkgname.install -md5sums=('2fb85dc753584ac13692c27f9749c6cb' +md5sums=('3e80a5cef7b0f8808578efcc84c39fd7' '59146273738605f1e011d8e7bed3561a' '486e07a0a1405ea25ec5b1736034653e') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make + make || return 1 } package(){ cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} samples + make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} samples || return 1 (cd ${pkgdir}/etc/asterisk # for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD deleted file mode 100755 index 885e06f0e..000000000 --- a/~lukeshu/not-working/codeanalyst/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Felipe Bugno <capent@yahoo.com> - -# A note about the oprofile fork: -# The docs claim that the fork is just for adding support for -# processors that aren't upstream yet (at the time, they are now that -# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well: -# * AMD also added a bunch of CodeAnalyst-specific code. -# * Several external variables/types have different names; the API is -# incompatible. -# * [extra]/oprofile-0.9.7-3 only includes about half of the headers. - -pkgbase=CodeAnalyst -pkgname=(codeanalyst codeanalyst-cakm) -pkgver=3.3.18.0361 -_pkgver="${pkgver//./_}" -pkgrel=4.1 -pkgdesc="AMD performance profiler. Includes a fork of oprofile." -url="http://developer.amd.com/tools/${pkgbase}/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gcc' 'qt>=4.1' 'libdwarf') -makedepends=('linux-headers' 'elfutils' 'findutils' 'file') -options=('!strip') -install=codeanalyst.install -source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz" - 'gcc47.patch' - 'skipSetup.patch' - 'kernel3.4.patch' - 'codeanalyst.sudo' - 'codeanalyst.desktop' - 'codeanalyst.svg') - -build() { - build_codeanalyst - build_codeanalyst-cakm -} - -build_codeanalyst() { - cd "${srcdir}/${pkgbase}-${_pkgver}-Public" - patch -Np1 -i "${srcdir}/gcc47.patch" - patch -Np1 -i "${srcdir}/skipSetup.patch" - rm -rf src/dwarf-* # easiest way to ensure using the system install - - ./autogen.sh - ./configure --prefix=/usr \ - --with-libdwarf-includes=/usr/include/libdwarf \ - --with-libdwarf-libraries=/usr/lib - make -} - -build_codeanalyst-cakm() { - cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm - cp -r kernel2.6.38 kernel3.4 - cd kernel3.4 - patch -Np1 -i "${srcdir}/kernel3.4.patch" - make -} - -package_codeanalyst() { - provides=('oprofile=0.9.6cvs') - conflicts=('oprofile') - - cd "${srcdir}/${pkgbase}-${_pkgver}-Public" - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial - - find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip - - cd "${srcdir}" - install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst" - install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg" - install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop" -} - -package_codeanalyst-cakm() { - pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko" - depends=(codeanalyst) - provides=() - - cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4 - install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko" -} - -md5sums=('f1e29bc7c7da259df228ce59281ee1d7' - '063d0fc9680641a92ce5e310ffe1c9c0' - 'ce549e59c4a5916fd19e8d085e863627' - '3a5d820a43a0360d561bb0c4d67d9735' - '3cc8f64fe84c5a886d0172ee8d99f690' - '3a18d3f7fb01f199a8ed5ae2908c18e4' - '1822a4157b82904b82e72fc1e9bcbd42') diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop deleted file mode 100755 index 56d54f884..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=AMD CodeAnalyst -Comment=AMD profiler and performance analyzer -Exec=/usr/bin/CodeAnalyst -Icon=codeanalyst -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Development; diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install deleted file mode 100755 index 6ed1ac841..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { - getent group amdca &>/dev/null || groupadd amdca &>/dev/null - echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group" - echo " ie: gpasswd -a USERNAME amdca" - - chown root:amdca /usr/bin/calog_report - chown root:amdca /usr/bin/capackage.sh - chown root:amdca /usr/bin/careport.sh - chown root:amdca /usr/bin/cgreport - chown root:amdca /usr/bin/CodeAnalyst - chown root:amdca /usr/bin/opannotate - chown root:amdca /usr/bin/oparchive - chown root:amdca /usr/bin/opcontrol - chown root:amdca /usr/bin/opgprof - chown root:amdca /usr/bin/ophelp - chown root:amdca /usr/bin/opimport - chown root:amdca /usr/bin/opjitconv - chown root:amdca /usr/bin/opreport - chown root:amdca /usr/bin/oprofiled - chown root:amdca /usr/sbin/ca_oprofile_controller - #chown root:amdca /usr/sbin/ca_user_manager - - update-desktop-database -q -} - -post_remove() { - getent group amdca &>/dev/null && groupdel amdca &>/dev/null - update-desktop-database -q -} diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo deleted file mode 100755 index 1c3173bdb..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo +++ /dev/null @@ -1 +0,0 @@ -%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg deleted file mode 100755 index 8febf725b..000000000 --- a/~lukeshu/not-working/codeanalyst/codeanalyst.svg +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="Layer_1" - width="286.95001" - height="286.95001" - viewBox="0 0 286.95063 286.95" - overflow="visible" - enable-background="new 0 0 1368.987 286.954" - xml:space="preserve" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="AMD_Logo.svg" - style="overflow:visible"><metadata - id="metadata17"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs - id="defs15" /><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1920" - inkscape:window-height="1028" - id="namedview13" - showgrid="false" - inkscape:zoom="2.11" - inkscape:cx="163.32315" - inkscape:cy="145.21584" - inkscape:window-x="-4" - inkscape:window-y="-3" - inkscape:window-maximized="1" - inkscape:current-layer="Layer_1" /> -<polyline - points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779" - id="polyline3" - style="fill:#009a66" - transform="translate(-1082.0371,1.8496035e-4)" /> -<polyline - points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082" - id="polyline5" - style="fill:#009a66" - transform="translate(-1082.0371,1.8496035e-4)" /> - - - -</svg>
\ No newline at end of file diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch deleted file mode 100755 index dfec4a0c4..000000000 --- a/~lukeshu/not-working/codeanalyst/gcc47.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am 2012-04-22 17:55:01.227439003 -0300 -*************** -*** 25,31 **** - cgcvt.cpp - - -! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@ - - AM_CPPFLAGS= $(INCLUDES) $(more_flags) \ - $(FLAG64) -Wno-unused -Wno-parentheses \ ---- 25,31 ---- - cgcvt.cpp - - -! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@ - - AM_CPPFLAGS= $(INCLUDES) $(more_flags) \ - $(FLAG64) -Wno-unused -Wno-parentheses \ -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp 2012-04-22 17:38:14.884058192 -0300 -*************** -*** 17,22 **** ---- 17,23 ---- - */ - - #include <qtooltip.h> -+ #include <unistd.h> - - #include "MonitorDockView.h" - -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp 2012-04-22 17:34:45.670714989 -0300 -*************** -*** 21,26 **** ---- 21,27 ---- - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+ #include <unistd.h> - - #include "dwarfengine.h" - #define DWARF_DEBUG 0 -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-22 17:32:30.780708624 -0300 -*************** -*** 29,34 **** ---- 29,35 ---- - #include <sys/stat.h> - #include <fcntl.h> - #include <time.h> -+ #include <unistd.h> - - // CodeAnalyst headers - #include "CaProfileWriter.h" -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp 2012-04-22 17:26:58.424026278 -0300 -*************** -*** 13,18 **** ---- 13,19 ---- - #include <sys/ipc.h> - #include <sys/sem.h> - #include <sys/stat.h> -+ #include <unistd.h> - - #include "slock.h" - #include "smm.h" diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch deleted file mode 100644 index 589abc800..000000000 --- a/~lukeshu/not-working/codeanalyst/kernel3.4.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -ru kernel2.6.38/Makefile kernel3.4/Makefile ---- kernel2.6.38/Makefile 2012-04-13 01:41:43.000000000 -0400 -+++ kernel3.4/Makefile 2012-07-11 11:32:27.000000000 -0400 -@@ -1,6 +1,6 @@ - TARGET = oprofile.ko - --MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile) -+MDIR = arch/x86/oprofile - - DRIVER_OBJS = oprof.o cpu_buffer.o buffer_sync.o \ - event_buffer.o oprofile_files.o \ -@@ -16,7 +16,8 @@ - CURRENT = $(shell uname -r) - ARCH = $(if $(shell uname -m | grep x86_64),64,32) - KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386) --KDIR = /lib/modules/$(CURRENT)/build -+SYS_KDIR = /lib/modules/$(CURRENT)/build -+KDIR = $(PWD)/../build - PWD = $(shell pwd) - DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR) - USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0) -@@ -39,6 +40,8 @@ - all: default - - default: -+ rm -rf $(KDIR) -+ cp -r $(SYS_KDIR)/ $(KDIR) - make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH) - - install: -@@ -52,13 +55,12 @@ - - uninstall: - @echo "... Restore original oprofile.ko." -- @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) -+ @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET) - - clean: - rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c - - prebuild: - cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko -- - ---include $(KDIR)/Rules.make -+-include $(SYS_KDIR)/Rules.make -Only in kernel3.4/: modules.order -Only in kernel3.4/: Module.symvers -diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c ---- kernel2.6.38/nmi_int.c 2012-04-13 01:41:43.000000000 -0400 -+++ kernel3.4/nmi_int.c 2012-07-11 11:32:27.000000000 -0400 -@@ -16,7 +16,6 @@ - #include <linux/notifier.h> - #include <linux/smp.h> - #include "oprofile.h" --#include <linux/sysdev.h> - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) - #include <linux/syscore_ops.h> - #endif -diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c ---- kernel2.6.38/oprofilefs.c 2012-04-13 01:41:43.000000000 -0400 -+++ kernel3.4/oprofilefs.c 2012-07-11 11:32:27.000000000 -0400 -@@ -244,7 +244,7 @@ - return -ENOMEM; - root_inode->i_op = &simple_dir_inode_operations; - root_inode->i_fop = &simple_dir_operations; -- root_dentry = d_alloc_root(root_inode); -+ root_dentry = d_make_root(root_inode); - if (!root_dentry) { - iput(root_inode); - return -ENOMEM; -Only in kernel3.4/: .tmp_versions diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch deleted file mode 100755 index fdc9bf42f..000000000 --- a/~lukeshu/not-working/codeanalyst/skipSetup.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am 2012-04-22 20:44:07.437917684 -0300 -*************** -*** 8,19 **** - # FIXME [3.0] diffgui \ - # $(CA_RELEASE_TYPE) - -! install-exec-hook: -! @if test -e "scripts/Setup.sh"; then \ -! scripts/Setup.sh $(DESTDIR)$(prefix); \ -! fi - -! uninstall-hook: -! @if test -e "scripts/Uninstall.sh"; then \ -! scripts/Uninstall.sh $(DESTDIR)$(prefix);\ -! fi ---- 8,19 ---- - # FIXME [3.0] diffgui \ - # $(CA_RELEASE_TYPE) - -! #install-exec-hook: -! # @if test -e "scripts/Setup.sh"; then \ -! # scripts/Setup.sh $(DESTDIR)$(prefix); \ -! # fi - -! #uninstall-hook: -! # @if test -e "scripts/Uninstall.sh"; then \ -! # scripts/Uninstall.sh $(DESTDIR)$(prefix);\ -! # fi -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am 2012-04-22 20:47:21.604593511 -0300 -*************** -*** 15,20 **** - libCAJVMPIA_so_SOURCES = \ - jpa.cpp - -! install-exec-hook: -! @/sbin/ldconfig - ---- 15,20 ---- - libCAJVMPIA_so_SOURCES = \ - jpa.cpp - -! #install-exec-hook: -! # @/sbin/ldconfig - -diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am -*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am 2012-04-13 02:41:43.000000000 -0300 ---- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am 2012-04-22 20:44:57.674586720 -0300 -*************** -*** 8,21 **** - install-exec-hook: - @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \ - install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \ -- /sbin/ldconfig ;\ - fi - - uninstall-hook: - @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \ - if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \ - rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \ -- /sbin/ldconfig ; \ - fi ; \ - fi - ---- 8,19 ---- diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD deleted file mode 100644 index 7ac6abb87..000000000 --- a/~lukeshu/openni-all/openni-git/PKGBUILD +++ /dev/null @@ -1,286 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-git' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=20111121 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -_gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -#_gitbranch="unstable" -_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker" - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_platform}/Build/Makefile" - - - # BUILD - cd "Platform/${_platform}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-git() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-git-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-git-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-git-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-git-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_platform}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-git-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-git-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-git-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-git-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-git-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-git-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-git/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD deleted file mode 100644 index 0ebfac2e5..000000000 --- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: pallegro from the AUR - -_pkgname=openni-module-primesensor -pkgname=${_pkgname}-git -pkgver=20111115 -pkgrel=1 -pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device" -arch=('i686') -url="http://www.primesense.com/" -license=('GPL') -depends=('openni') -makedepends=('git') -provides=($_pkgname) -conflicts=($_pkgname) -install="sensorkinect.install" -source=() -md5sums=() - -_gitroot="https://github.com/PrimeSense/Sensor.git" -_gitname="primesensor" -_gitbranch="unstable" -#_gitbranch="master" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone -b $_gitbranch $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd $srcdir/$_gitname-build - - # BUILD - cd Platform/Linux-x86/Build - make NI_CONF_DIR=/etc || return 1 -} - -package() { - install -d -m755 ${pkgdir}/usr/{lib,bin} - - cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release - install XnSensorServer ${pkgdir}/usr/bin - install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib - chmod +s ${pkgdir}/usr/bin/XnSensorServer - - cd $srcdir/$_gitname-build/Platform/Linux-x86/Install - install -d -m755 ${pkgdir}/etc/udev/rules.d - install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d - - cd $srcdir/$_gitname-build/Data - install -d -m755 ${pkgdir}/etc/primesense - install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense - - install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer -} diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD deleted file mode 100644 index 2a2abbdc5..000000000 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: pallegro from the AUR - -pkgname=openni-module-sensorkinect-git -pkgver=20111211 -pkgrel=2 -pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device" -arch=('i686' 'x86_64') -url="https://github.com/avin2/SensorKinect" -license=('GPL') -depends=('openni-unstable' 'kinect-udev') -makedepends=('git') -provides=('openni-module-sensorkinect') -conflicts=('openni-module-sensorkinect' 'openni-module-primesensor') -install="sensorkinect.install" -source=() -md5sums=() - -_gitroot="https://github.com/avin2/SensorKinect.git" -_gitname="sensorkinect" -_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd $srcdir/$_gitname-build - - # BUILD - cd Platform/${_platform}/Build - make - make redist -} - -package() { - cd $srcdir/$_gitname-build - cd Platform/${_platform}/Redist - - # This is all cloned from ./install.sh, which can't be used for a number - # of reasons. - install -d $pkgdir/usr/{lib,bin} - install -m755 Lib/* $pkgdir/usr/lib - install -m755 Bin/* $pkgdir/usr/bin - - install -d $pkgdir/etc/primesense - install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense - - chmod +s $pkgdir/usr/bin/XnSensorServer - - install -m777 -d $pkgdir/var/log/primesense/XnSensorServer -} diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install deleted file mode 100644 index d62d263d1..000000000 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so" - -post_install() { - for module in $MODULES; do - /usr/bin/niReg -r /usr/lib/$module /etc/primesense - done -} - -pre_remove() { - for module in $MODULES; do - /usr/bin/niReg -u /usr/lib/$module - done -} diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD deleted file mode 100644 index 07f276b02..000000000 --- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD +++ /dev/null @@ -1,286 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-unstable-git' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=20111121 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -_gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -_gitbranch="unstable" -#_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_os}/Build/Makefile" - - - # BUILD - cd "Platform/${_os}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-unstable-git() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni' 'openni-unstable') - conflicts=('openni' 'openni-unstable') -} - -package_openni-unstable-git-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs' 'openni-unstable-docs') - conflicts=('openni-docs' 'openni-unstable-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-unstable-git-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core' 'openni-unstable-core') - conflicts=('openni-core' 'openni-unstable-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-unstable-git-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java' 'openni-unstable-java') - conflicts=('openni-java' 'openni-unstable-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-unstable-git-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono' 'openni-unstable-mono') - conflicts=('openni-mono' 'openni-unstable-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_os}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-unstable-git-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples' 'openni-unstable-core-samples') - conflicts=('openni-core-samples' 'openni-unstable-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-unstable-git-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source' 'openni-unstable-core-samples-source') - conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-unstable-git-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples' 'openni-unstable-java-samples') - conflicts=('openni-java-samples' 'openni-unstable-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-unstable-git-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source' 'openni-unstable-java-samples-source') - conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-unstable-git-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples' 'openni-unstable-mono-samples') - conflicts=('openni-mono-samples' 'openni-unstable-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-unstable-git-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source') - conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-unstable-git/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD deleted file mode 100644 index 19d1575a1..000000000 --- a/~lukeshu/openni-all/openni-unstable/PKGBUILD +++ /dev/null @@ -1,294 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-unstable' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=1.4.0.2 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -options+=('!strip') -source=() -md5sums=() - -__gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -_gitbranch="Unstable-$pkgver" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x64;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - #if [ -d ${_gitname} ] ; then - cd ${_gitname} - # git checkout master - # git pull origin - # msg "The local files are updated." - #else - # git clone ${__gitroot} ${_gitname} - # cd ${_gitname} - #fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - #rm -rf "${srcdir}/${_gitname}-build" - #git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" - - for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do - echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile" - done - - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_os}/Build/Makefile" - - - # BUILD - cd "Platform/${_os}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples - cd "../Bin/${_arch}-Release" - ln NiViewer Sample-NiViewer - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-unstable() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-unstable-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-unstable-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni-core.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" - - install -d "${pkgdir}/var/lib/ni" -} - -package_openni-unstable-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-unstable-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - install="openni-mono.install" - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_os}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - HandTracker - RecordSynthetic - SimpleCreate - UserSelection - Viewer - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-unstable-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - for sample in $CORE_SAMPLES; do - install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-unstable-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-unstable-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-unstable-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-unstable-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-unstable-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-unstable/openni-core.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install deleted file mode 100644 index 72a6fb23d..000000000 --- a/~lukeshu/openni-all/openni-unstable/openni-mono.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr -} - -post_remove() { - gacutil -u OpenNI.net -gacdir /usr -} diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD deleted file mode 100644 index 2cdc2fd7d..000000000 --- a/~lukeshu/openni-all/openni/PKGBUILD +++ /dev/null @@ -1,288 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=1.3.3.6 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -__gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -#_gitbranch="unstable" -#_gitbranch="master" -_gitbranch="Stable-$pkgver" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${__gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker" - mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_platform}/Build/Makefile" - - - # BUILD - cd "Platform/${_platform}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_platform}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} |
