diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-18 13:39:32 +0100 |
commit | 7e6a790c47fb44426cdda8ea0aca8c247a524c5e (patch) | |
tree | a120e55f735660c1ab1e7fa6174fe28fb3108d1f /testing | |
parent | e5592a9039761a22a117469303c77a4215ad5048 (diff) | |
parent | d14a25fc4f65ae3d6e62f4668e9cb88d74834255 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gpsmanshp/PKGBUILD
community/parrot/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdegames/PKGBUILD
extra/kdesdk/PKGBUILD
extra/libmtp/PKGBUILD
extra/libreoffice/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-libx11/PKGBUILD
testing/xf86-video-mga/PKGBUILD
testing/xf86-video-mga/git-fixes.patch
Diffstat (limited to 'testing')
-rw-r--r-- | testing/neon/PKGBUILD | 35 | ||||
-rw-r--r-- | testing/nx-common/NXproto.h.64bit.diff | 66 | ||||
-rw-r--r-- | testing/nx-common/PKGBUILD | 59 | ||||
-rw-r--r-- | testing/nx-common/nx-3.5.0-libpng15.patch | 30 | ||||
-rw-r--r-- | testing/nx-common/nxcompsh-gcc43.patch | 19 | ||||
-rw-r--r-- | testing/proftpd/PKGBUILD | 51 | ||||
-rwxr-xr-x | testing/proftpd/proftpd | 41 | ||||
-rw-r--r-- | testing/proftpd/proftpd.conf.d | 4 | ||||
-rw-r--r-- | testing/proftpd/proftpd.logrotate | 5 | ||||
-rw-r--r-- | testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch | 40 |
10 files changed, 0 insertions, 350 deletions
diff --git a/testing/neon/PKGBUILD b/testing/neon/PKGBUILD deleted file mode 100644 index 7fa3af41d..000000000 --- a/testing/neon/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 153541 2012-03-15 18:19:26Z pierre $ -# Maintainer: -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=neon -pkgver=0.29.6 -pkgrel=4 -pkgdesc="HTTP and WebDAV client library with a C interface" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('krb5' 'expat' 'ca-certificates') -url="http://www.webdav.org/neon/" -source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('591e0c82e6979e7e615211b386b8f6bc') -options=('libtool') # FS#16067 - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --with-expat \ - --enable-shared \ - --disable-static \ - --with-ssl=openssl \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt - make - - # fix invalid .so links in man pages (FS#24902) - sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/* -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install -} diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/testing/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/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD deleted file mode 100644 index 8de3917c8..000000000 --- a/testing/nx-common/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 153543 2012-03-15 18:23:51Z pierre $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=4 -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' 'bash') -makedepends=('xorg-server-devel') -source=( #Compression libs and proxy sources - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz - 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 - nx-3.5.0-libpng15.patch) -options=(!libtool) -md5sums=('ad8c0f133122c6d07732ca69c8759410' - '84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c' - '2966353cabb96829eab291212ef078dc') - -build() { - # nxcomp - cd ${srcdir}/nxcomp - patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch - - ./configure --prefix=/opt/NX - make - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - - ./configure --prefix=/opt/NX - make - # nxssh - cd ${srcdir}/nxssh - ./configure --prefix=/opt/NX - make -} - -package() { - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - - # nxcomp - cd ${srcdir}/nxcomp - cp -a libXcomp.so* ${pkgdir}/opt/NX/lib - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh -} diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/testing/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/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/testing/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/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD deleted file mode 100644 index 6dfb27d2c..000000000 --- a/testing/proftpd/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 153556 2012-03-16 00:18:26Z eric $ -# Maintainer: -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=proftpd -pkgver=1.3.4a -pkgrel=4 -epoch=1 -pkgdesc="A high-performance, scalable FTP server" -arch=('i686' 'x86_64') -url="http://www.proftpd.org" -license=('GPL') -depends=('libldap' 'libmysqlclient' 'postgresql-libs') -backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' - '195b06e28e503f5e5ef355c3332884cc5e7954a9' - 'b7819d725817e55b69c73e2572c21a05db48cc86' - '83c38ec40efb7cc09d9824b98e65cd948a195cc6' - 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --libexecdir=/usr/lib \ - --disable-pam \ - --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ - --sysconfdir=/etc \ - --localstatedir=/var/run \ - --enable-ctrls \ - --enable-ipv6 \ - --with-includes=/usr/include/mysql:/usr/include/postgresql \ - --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" - - install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" - install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" - install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" - install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" -} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd deleted file mode 100755 index 357a7663d..000000000 --- a/testing/proftpd/proftpd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# source application-specific settings -PROFTPD_ARGS= -[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ProFTPd Server" - /usr/sbin/proftpd ${PROFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon proftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping ProFTPd Server" - [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/proftpd.pid - rm_daemon proftpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d deleted file mode 100644 index 1a5a8a201..000000000 --- a/testing/proftpd/proftpd.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to proftpd -# -PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate deleted file mode 100644 index 7b6d7a87b..000000000 --- a/testing/proftpd/proftpd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/xferlog { - postrotate - /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch deleted file mode 100644 index fee383855..000000000 --- a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch +++ /dev/null @@ -1,40 +0,0 @@ -From patchwork Wed Mar 14 03:27:29 2012 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [synaptics] Fix inverted circular scrolling direction -Date: Wed, 14 Mar 2012 03:27:29 -0000 -From: Peter Hutterer <peter.hutterer@who-t.net> -X-Patchwork-Id: 9512 -Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com> -To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org> -Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org> - -Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10. -In said commit, the old-style button events were changed to delta -accumulation. Alas, for circular scrolling, a positive delta is up whereas -for everything else a positive delta is down. - -Reported-by: Thomas Bächler <thomas@archlinux.org> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - ---- -src/synaptics.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/synaptics.c b/src/synaptics.c -index fa46f0d..c9609cd 100644 ---- a/src/synaptics.c -+++ b/src/synaptics.c -@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, - double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); - if (delta >= 0.005 && diff != 0.0) { - if (priv->circ_scroll_vert) -- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; -+ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; - else -- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; -+ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;; - priv->scroll.last_a = angle(priv, hw->x, hw->y); - DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a); - } |