From 886d3d0994eb8e9f3e797155619619e0ef1353f8 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 8 May 2011 22:33:52 +0000 Subject: Sun May 8 22:33:51 UTC 2011 --- extra/kobodeluxe/PKGBUILD | 64 +++++++++++++---------- extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch | 11 ++++ extra/kobodeluxe/kobodeluxe.install | 9 ++-- 3 files changed, 50 insertions(+), 34 deletions(-) create mode 100644 extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch (limited to 'extra/kobodeluxe') diff --git a/extra/kobodeluxe/PKGBUILD b/extra/kobodeluxe/PKGBUILD index defcb760c..228930797 100644 --- a/extra/kobodeluxe/PKGBUILD +++ b/extra/kobodeluxe/PKGBUILD @@ -1,44 +1,50 @@ -# $Id: PKGBUILD 23389 2009-01-09 00:47:54Z eric $ -# Maintainer: Eric Belanger -# Contributor: Damir Perisa +# $Id: PKGBUILD 122903 2011-05-07 08:05:30Z eric $ +# Maintainer: Eric Bélanger pkgname=kobodeluxe pkgver=0.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="An enhanced version of Akira Higuchi's game XKobo, an addictive space shoot'em up" arch=('i686' 'x86_64') url="http://www.olofson.net/kobodl/" license=('GPL' 'LGPL') -depends=('gcc-libs' 'libjpeg' 'libpng' 'sdl' 'sdl_image' 'sdl_mixer') +depends=('libjpeg' 'libpng' 'sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache') install=kobodeluxe.install -source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz kobodeluxe-gcc-4.3.patch) -md5sums=('cf765559461213d651c7be042507b767' '2b76306ec997fdc64986b4425e5b7814') -sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75' '274dc8e7909bc6f9fab31306c85d992af8b62674') +source=(http://www.olofson.net/kobodl/download/KoboDeluxe-${pkgver}.tar.gz \ + kobodeluxe-gcc-4.3.patch kobodeluxe-0.5.1-glibc2.10.patch) +md5sums=('cf765559461213d651c7be042507b767' + '2b76306ec997fdc64986b4425e5b7814' + '56115c9a1e3db1b95b731fdcb11f3f4f') +sha1sums=('12abe182ccde52050cd23077092d0424d25c3e75' + '274dc8e7909bc6f9fab31306c85d992af8b62674' + '9d1b3b8cef4a16b6a082fed9f93f1dc12b2a3be0') build() { - cd ${srcdir}/KoboDeluxe-${pkgver} + cd "${srcdir}/KoboDeluxe-${pkgver}" patch -p0 < ../kobodeluxe-gcc-4.3.patch - ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + patch -p0 < ../kobodeluxe-0.5.1-glibc2.10.patch + ./configure --prefix=/usr --localstatedir=/var --sharedstatedir=/var/games + make +} + +package() { + cd "${srcdir}/KoboDeluxe-${pkgver}" + make DESTDIR="${pkgdir}" install tar -xzf icons.tar.gz - install -D -m644 icons/KDE/kobo-deluxe.desktop ${pkgdir}/usr/share/applications/kobo-deluxe.desktop - install -D -m644 icons/KDE/icons/128x128/kobodl.png ${pkgdir}/usr/share/icons/hicolor/128x128/kobodl.png - install -D -m644 icons/KDE/icons/16x16/kobodl.png ${pkgdir}/usr/share/icons/hicolor/16x16/kobodl.png - install -D -m644 icons/KDE/icons/22x22/kobodl.png ${pkgdir}/usr/share/icons/hicolor/22x22/kobodl.png - install -D -m644 icons/KDE/icons/32x32/kobodl.png ${pkgdir}/usr/share/icons/hicolor/32x32/kobodl.png - install -D -m644 icons/KDE/icons/48x48/kobodl.png ${pkgdir}/usr/share/icons/hicolor/48x48/kobodl.png - install -D -m644 icons/KDE/icons/64x64/kobodl.png ${pkgdir}/usr/share/icons/hicolor/64x64/kobodl.png - install -D -m644 icons/Ubuntu/kobo-icon.xpm ${pkgdir}/usr/share/pixmaps/kobo-icon.xpm - ln -s /usr/share/icons/hicolor/48x48/kobodl.png ${pkgdir}/usr/share/icons/kobodl.png + install -D -m644 icons/KDE/kobo-deluxe.desktop "${pkgdir}/usr/share/applications/kobo-deluxe.desktop" + for i in 16 22 32 48 64 128 ; do + install -D -m644 icons/KDE/icons/${i}x${i}/kobodl.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/kobodl.png" + done + install -D -m644 icons/Ubuntu/kobo-icon.xpm "${pkgdir}/usr/share/pixmaps/kobo-icon.xpm" + ln -s /usr/share/icons/hicolor/48x48/kobodl.png "${pkgdir}/usr/share/icons/kobodl.png" - chown root:games ${pkgdir}/usr/bin/kobodl - chmod 2755 ${pkgdir}/usr/bin/kobodl - chown root:games ${pkgdir}/var/games - chmod 775 ${pkgdir}/var/games - chown root:games ${pkgdir}/var/games/kobo-deluxe - chmod 775 ${pkgdir}/var/games/kobo-deluxe - chown root:games ${pkgdir}/var/games/kobo-deluxe/scores - chmod 775 ${pkgdir}/var/games/kobo-deluxe/scores + chown root:games "${pkgdir}/usr/bin/kobodl" + chmod 2755 "${pkgdir}/usr/bin/kobodl" + chown root:games "${pkgdir}/var/games" + chmod 775 "${pkgdir}/var/games" + chown root:games "${pkgdir}/var/games/kobo-deluxe" + chmod 775 "${pkgdir}/var/games/kobo-deluxe" + chown root:games "${pkgdir}/var/games/kobo-deluxe/scores" + chmod 775 "${pkgdir}/var/games/kobo-deluxe/scores" } diff --git a/extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch b/extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch new file mode 100644 index 000000000..1095cc1c7 --- /dev/null +++ b/extra/kobodeluxe/kobodeluxe-0.5.1-glibc2.10.patch @@ -0,0 +1,11 @@ +--- graphics/window.cpp ++++ graphics/window.cpp +@@ -398,7 +398,7 @@ + */ + if(token) + { +- char *tok = strchr(txt, token); ++ const char *tok = strchr(txt, token); + if(tok) + tokpos = tok-txt; + else diff --git a/extra/kobodeluxe/kobodeluxe.install b/extra/kobodeluxe/kobodeluxe.install index 7136b4880..54b9f81f6 100644 --- a/extra/kobodeluxe/kobodeluxe.install +++ b/extra/kobodeluxe/kobodeluxe.install @@ -4,18 +4,17 @@ post_install() { post_upgrade() { if [ -d usr/share/kobo-deluxe/kobo-deluxe/scores ] ; then + mkdir -p var/games/kobo-deluxe/scores/ for i in usr/share/kobo-deluxe/kobo-deluxe/scores/* ; do mv $i var/games/kobo-deluxe/scores/ done rmdir usr/share/kobo-deluxe/kobo-deluxe/scores rmdir usr/share/kobo-deluxe/kobo-deluxe - chgrp -R games /var/games/kobo-deluxe/scores/ + chgrp -R games var/games/kobo-deluxe/scores/ fi - # update icon cache if gtk2 is installed. I don't want to add a gtk2 depends just for that. - [ -x usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_remove() { - # update icon cache if gtk2 is installed. I don't want to add a gtk2 depends just for that. - [ -x usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } -- cgit v1.2.3-54-g00ecf From d2f2d3b5c845807249680c275031f94047f9e762 Mon Sep 17 00:00:00 2001 From: Parabola Date: Mon, 9 May 2011 00:26:43 +0000 Subject: Mon May 9 00:26:43 UTC 2011 --- community-staging/arch/PKGBUILD | 27 - community-staging/autofs/PKGBUILD | 51 - community-staging/autofs/auto.master | 6 - community-staging/autofs/auto.misc | 7 - community-staging/autofs/autofs | 50 - community-staging/autofs/autofs.conf.d | 4 - community-staging/autofs/autofs.install | 4 - community-staging/autofs/heimdal.patch | 44 - community-staging/freeradius/PKGBUILD | 44 - community-staging/freeradius/freeradius.install | 22 - community-staging/freeradius/krb5-build-fix.patch | 21 - community-staging/freeradius/radiusd | 43 - community-staging/freerdp/PKGBUILD | 30 - community-staging/freerdp/freerdp.changelog | 2 - community-staging/gsasl/PKGBUILD | 27 - community-staging/ipsec-tools/PKGBUILD | 35 - community-staging/ipsec-tools/ipsec.rc | 35 - community-staging/ipsec-tools/racoon.rc | 35 - community-staging/pam-krb5/PKGBUILD | 28 - community-staging/perl-gssapi/PKGBUILD | 27 - community-staging/pgadmin3/ChangeLog | 28 - community-staging/pgadmin3/PKGBUILD | 41 - community-staging/pgadmin3/pgadmin3.desktop | 10 - community-staging/splix/PKGBUILD | 34 - community-staging/splix/splix.install | 19 - community/libtextcat/PKGBUILD | 31 - extra/dconf/load-enum.patch | 22 - extra/fyre/ChangeLog | 7 - extra/glsof/ChangeLog | 6 - extra/glsof/glsof.desktop | 12 - extra/gnet/ChangeLog | 5 - extra/kdebase-workspace/sensors-fix.patch | 22 - extra/kdebase-workspace/shutdown-fix.patch | 11 - extra/kdemultimedia/kmix-locale-pulseaudio.patch | 1117 --------- extra/keytouch-editor/ChangeLog | 8 - extra/kobodeluxe/ChangeLog | 8 - extra/orca/PKGBUILD | 27 - extra/orca/orca.install | 11 - extra/python-qt/PKGBUILD | 41 - extra/python-sip/PKGBUILD | 30 - extra/python2-qt/PKGBUILD | 41 - extra/python2-sip/PKGBUILD | 30 - extra/quota-tools/ChangeLog | 9 - extra/rxvt-unicode/rxvt-unicode.png | Bin 1513 -> 0 bytes extra/squid/fix-for-new-cap-headers.patch | 14 - extra/squid/squid-makefiles.patch | 53 - extra/swfdec-mozilla/PKGBUILD | 21 - extra/swfdec/PKGBUILD | 25 - extra/xfce4-xfapplet-plugin/PKGBUILD | 32 - staging/alpine/2.00-lpam.patch | 13 - staging/alpine/CVE-2008-5514.patch | 20 - staging/alpine/PKGBUILD | 44 - staging/anjuta/PKGBUILD | 35 - staging/anjuta/anjuta.install | 21 - staging/cifs-utils/PKGBUILD | 26 - staging/cups/PKGBUILD | 110 - staging/cups/cups | 38 - staging/cups/cups-avahi.patch | 1089 --------- staging/cups/cups.install | 15 - staging/cups/cups.logrotate | 8 - staging/cups/cups.pam | 3 - staging/cvs/PKGBUILD | 39 - staging/cvs/cvs-1.11.23-cve-2010-3846.patch | 167 -- staging/cvs/cvs-1.11.23-getline64.patch | 34 - staging/cvs/cvs.install | 20 - staging/cyrus-sasl-plugins/PKGBUILD | 52 - .../cyrus-sasl-2.1.22-gcc44.patch | 24 - .../cyrus-sasl-2.1.23-db5-fix.patch | 23 - staging/cyrus-sasl/PKGBUILD | 53 - staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch | 24 - staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch | 21 - staging/cyrus-sasl/saslauthd | 50 - staging/cyrus-sasl/saslauthd.conf.d | 1 - staging/dovecot/PKGBUILD | 74 - staging/dovecot/dovecot.install | 57 - staging/dovecot/dovecot.sh | 36 - staging/evolution-data-server/PKGBUILD | 29 - staging/evolution-exchange/PKGBUILD | 33 - .../evolution-exchange/evolution-exchange.install | 17 - staging/gnome-control-center/PKGBUILD | 34 - .../gnome-control-center.install | 19 - staging/gnome-settings-daemon/PKGBUILD | 33 - .../gnome-settings-daemon.install | 18 - staging/gnome-vfs/PKGBUILD | 45 - staging/gnome-vfs/gnome-vfs.install | 17 - staging/gnome-vfs/gnutls-config.patch | 25 - staging/gtk2/PKGBUILD | 50 - staging/gtk2/gtk2.install | 16 - staging/gtk2/xid-collision-debug.patch | 15 - staging/gtk3/PKGBUILD | 36 - staging/gtk3/gtk3.install | 15 - staging/gtk3/settings.ini | 2 - staging/kdelibs/PKGBUILD | 62 - staging/kdelibs/abs-syntax-highlight.patch | 12 - staging/kdelibs/archlinux-menu.patch | 22 - staging/kdelibs/kde-applications-menu.patch | 22 - staging/kdelibs/kdelibs.install | 12 - staging/krb5/CVE-2010-4022.patch | 19 - staging/krb5/CVE-2011-0281.0282.0283.patch | 126 -- staging/krb5/CVE-2011-0284.patch | 13 - staging/krb5/CVE-2011-0285.patch | 39 - staging/krb5/PKGBUILD | 64 - staging/krb5/kadmind.rc | 40 - staging/krb5/krb5-kdc.rc | 40 - staging/libgnomecups/PKGBUILD | 31 - .../libgnomecups_0.2.3-ignore-ipp-not-found.patch | 11 - staging/libgnomeprint/PKGBUILD | 28 - staging/librpcsecgss/PKGBUILD | 27 - .../librpcsecgss/librpcsecgss-0.18-heimdal.patch | 33 - staging/libtirpc/PKGBUILD | 32 - staging/libtirpc/libtirpc-0.2.1-fortify.patch | 18 - staging/mutt/PKGBUILD | 47 - staging/mutt/install | 8 - staging/neon/PKGBUILD | 29 - staging/nss_ldap/PKGBUILD | 33 - staging/openssh/PKGBUILD | 56 - staging/openssh/sshd | 48 - staging/openssh/sshd.confd | 4 - staging/openssh/sshd.pam | 10 - staging/samba/PKGBUILD | 139 -- staging/samba/fix-ipv6-mount.patch | 11 - staging/samba/samba | 54 - staging/samba/samba.conf.d | 7 - staging/samba/samba.logrotate | 9 - staging/samba/samba.pam | 3 - staging/samba/swat.xinetd | 10 - staging/subversion/PKGBUILD | 92 - staging/subversion/subversion.rpath.fix.patch | 10 - .../subversion.suppress.deprecation.warnings.patch | 22 - staging/subversion/svn | 11 - staging/subversion/svnmerge.py | 2370 -------------------- staging/subversion/svnserve | 42 - staging/subversion/svnserve.conf | 7 - staging/wireshark/PKGBUILD | 54 - staging/wireshark/wireshark-gtk.install | 11 - staging/wireshark/wireshark.install | 18 - staging/xfprint/PKGBUILD | 35 - staging/xfprint/xfprint-manager-fix.diff | 29 - staging/xfprint/xfprint.install | 11 - 139 files changed, 8589 deletions(-) delete mode 100644 community-staging/arch/PKGBUILD delete mode 100644 community-staging/autofs/PKGBUILD delete mode 100644 community-staging/autofs/auto.master delete mode 100644 community-staging/autofs/auto.misc delete mode 100644 community-staging/autofs/autofs delete mode 100644 community-staging/autofs/autofs.conf.d delete mode 100644 community-staging/autofs/autofs.install delete mode 100644 community-staging/autofs/heimdal.patch delete mode 100644 community-staging/freeradius/PKGBUILD delete mode 100644 community-staging/freeradius/freeradius.install delete mode 100644 community-staging/freeradius/krb5-build-fix.patch delete mode 100755 community-staging/freeradius/radiusd delete mode 100644 community-staging/freerdp/PKGBUILD delete mode 100644 community-staging/freerdp/freerdp.changelog delete mode 100644 community-staging/gsasl/PKGBUILD delete mode 100644 community-staging/ipsec-tools/PKGBUILD delete mode 100755 community-staging/ipsec-tools/ipsec.rc delete mode 100755 community-staging/ipsec-tools/racoon.rc delete mode 100644 community-staging/pam-krb5/PKGBUILD delete mode 100644 community-staging/perl-gssapi/PKGBUILD delete mode 100644 community-staging/pgadmin3/ChangeLog delete mode 100644 community-staging/pgadmin3/PKGBUILD delete mode 100644 community-staging/pgadmin3/pgadmin3.desktop delete mode 100644 community-staging/splix/PKGBUILD delete mode 100644 community-staging/splix/splix.install delete mode 100644 community/libtextcat/PKGBUILD delete mode 100644 extra/dconf/load-enum.patch delete mode 100644 extra/fyre/ChangeLog delete mode 100644 extra/glsof/ChangeLog delete mode 100644 extra/glsof/glsof.desktop delete mode 100644 extra/gnet/ChangeLog delete mode 100644 extra/kdebase-workspace/sensors-fix.patch delete mode 100644 extra/kdebase-workspace/shutdown-fix.patch delete mode 100644 extra/kdemultimedia/kmix-locale-pulseaudio.patch delete mode 100644 extra/keytouch-editor/ChangeLog delete mode 100644 extra/kobodeluxe/ChangeLog delete mode 100644 extra/orca/PKGBUILD delete mode 100644 extra/orca/orca.install delete mode 100644 extra/python-qt/PKGBUILD delete mode 100644 extra/python-sip/PKGBUILD delete mode 100644 extra/python2-qt/PKGBUILD delete mode 100644 extra/python2-sip/PKGBUILD delete mode 100644 extra/quota-tools/ChangeLog delete mode 100644 extra/rxvt-unicode/rxvt-unicode.png delete mode 100644 extra/squid/fix-for-new-cap-headers.patch delete mode 100644 extra/squid/squid-makefiles.patch delete mode 100644 extra/swfdec-mozilla/PKGBUILD delete mode 100644 extra/swfdec/PKGBUILD delete mode 100644 extra/xfce4-xfapplet-plugin/PKGBUILD delete mode 100644 staging/alpine/2.00-lpam.patch delete mode 100644 staging/alpine/CVE-2008-5514.patch delete mode 100644 staging/alpine/PKGBUILD delete mode 100644 staging/anjuta/PKGBUILD delete mode 100644 staging/anjuta/anjuta.install delete mode 100644 staging/cifs-utils/PKGBUILD delete mode 100644 staging/cups/PKGBUILD delete mode 100755 staging/cups/cups delete mode 100644 staging/cups/cups-avahi.patch delete mode 100644 staging/cups/cups.install delete mode 100644 staging/cups/cups.logrotate delete mode 100644 staging/cups/cups.pam delete mode 100644 staging/cvs/PKGBUILD delete mode 100644 staging/cvs/cvs-1.11.23-cve-2010-3846.patch delete mode 100644 staging/cvs/cvs-1.11.23-getline64.patch delete mode 100644 staging/cvs/cvs.install delete mode 100644 staging/cyrus-sasl-plugins/PKGBUILD delete mode 100644 staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch delete mode 100644 staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch delete mode 100644 staging/cyrus-sasl/PKGBUILD delete mode 100644 staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch delete mode 100644 staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch delete mode 100644 staging/cyrus-sasl/saslauthd delete mode 100644 staging/cyrus-sasl/saslauthd.conf.d delete mode 100644 staging/dovecot/PKGBUILD delete mode 100644 staging/dovecot/dovecot.install delete mode 100755 staging/dovecot/dovecot.sh delete mode 100644 staging/evolution-data-server/PKGBUILD delete mode 100644 staging/evolution-exchange/PKGBUILD delete mode 100644 staging/evolution-exchange/evolution-exchange.install delete mode 100644 staging/gnome-control-center/PKGBUILD delete mode 100644 staging/gnome-control-center/gnome-control-center.install delete mode 100644 staging/gnome-settings-daemon/PKGBUILD delete mode 100644 staging/gnome-settings-daemon/gnome-settings-daemon.install delete mode 100644 staging/gnome-vfs/PKGBUILD delete mode 100644 staging/gnome-vfs/gnome-vfs.install delete mode 100644 staging/gnome-vfs/gnutls-config.patch delete mode 100644 staging/gtk2/PKGBUILD delete mode 100644 staging/gtk2/gtk2.install delete mode 100644 staging/gtk2/xid-collision-debug.patch delete mode 100644 staging/gtk3/PKGBUILD delete mode 100644 staging/gtk3/gtk3.install delete mode 100644 staging/gtk3/settings.ini delete mode 100644 staging/kdelibs/PKGBUILD delete mode 100644 staging/kdelibs/abs-syntax-highlight.patch delete mode 100644 staging/kdelibs/archlinux-menu.patch delete mode 100644 staging/kdelibs/kde-applications-menu.patch delete mode 100644 staging/kdelibs/kdelibs.install delete mode 100644 staging/krb5/CVE-2010-4022.patch delete mode 100644 staging/krb5/CVE-2011-0281.0282.0283.patch delete mode 100644 staging/krb5/CVE-2011-0284.patch delete mode 100644 staging/krb5/CVE-2011-0285.patch delete mode 100644 staging/krb5/PKGBUILD delete mode 100644 staging/krb5/kadmind.rc delete mode 100644 staging/krb5/krb5-kdc.rc delete mode 100644 staging/libgnomecups/PKGBUILD delete mode 100644 staging/libgnomecups/libgnomecups_0.2.3-ignore-ipp-not-found.patch delete mode 100644 staging/libgnomeprint/PKGBUILD delete mode 100644 staging/librpcsecgss/PKGBUILD delete mode 100644 staging/librpcsecgss/librpcsecgss-0.18-heimdal.patch delete mode 100644 staging/libtirpc/PKGBUILD delete mode 100644 staging/libtirpc/libtirpc-0.2.1-fortify.patch delete mode 100644 staging/mutt/PKGBUILD delete mode 100644 staging/mutt/install delete mode 100644 staging/neon/PKGBUILD delete mode 100644 staging/nss_ldap/PKGBUILD delete mode 100644 staging/openssh/PKGBUILD delete mode 100755 staging/openssh/sshd delete mode 100644 staging/openssh/sshd.confd delete mode 100644 staging/openssh/sshd.pam delete mode 100644 staging/samba/PKGBUILD delete mode 100644 staging/samba/fix-ipv6-mount.patch delete mode 100755 staging/samba/samba delete mode 100644 staging/samba/samba.conf.d delete mode 100644 staging/samba/samba.logrotate delete mode 100644 staging/samba/samba.pam delete mode 100644 staging/samba/swat.xinetd delete mode 100644 staging/subversion/PKGBUILD delete mode 100644 staging/subversion/subversion.rpath.fix.patch delete mode 100644 staging/subversion/subversion.suppress.deprecation.warnings.patch delete mode 100644 staging/subversion/svn delete mode 100644 staging/subversion/svnmerge.py delete mode 100755 staging/subversion/svnserve delete mode 100644 staging/subversion/svnserve.conf delete mode 100644 staging/wireshark/PKGBUILD delete mode 100644 staging/wireshark/wireshark-gtk.install delete mode 100644 staging/wireshark/wireshark.install delete mode 100644 staging/xfprint/PKGBUILD delete mode 100644 staging/xfprint/xfprint-manager-fix.diff delete mode 100644 staging/xfprint/xfprint.install (limited to 'extra/kobodeluxe') diff --git a/community-staging/arch/PKGBUILD b/community-staging/arch/PKGBUILD deleted file mode 100644 index 2be3a270a..000000000 --- a/community-staging/arch/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 46342 2011-05-05 11:48:15Z spupykin $ -# Maintainer: Judd Vinet - -pkgname='arch' -pkgver=1.3.5 -pkgrel=8 -pkgdesc="a modern and remarkable revision control system" -arch=('i686' 'x86_64') -license=('GPL') -url="http://regexps.srparish.net/www/#Gnu-arch" -depends=('zlib' 'expat' 'krb5') -options=('!makeflags') -source=(ftp://ftp.gnu.org/gnu/gnu-arch/tla-$pkgver.tar.gz) -md5sums=('db31ee89bc4788eef1eba1cee6c176ef') - -build() { - cd "${srcdir}/tla-$pkgver/src" - mkdir =build - cd =build - ../configure --prefix /usr - make -} - -package() { - cd "${srcdir}/tla-$pkgver/src/=build" - make prefix="${pkgdir}/usr" install -} diff --git a/community-staging/autofs/PKGBUILD b/community-staging/autofs/PKGBUILD deleted file mode 100644 index 11ac57ec1..000000000 --- a/community-staging/autofs/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 46345 2011-05-05 11:57:37Z spupykin $ -# Maintainer: Lukas Fleischer -# Contributor: Andrea Scarpino -# Contributor: Dale Blount -# Contributor: Manolis Tzanidakis - -pkgname=autofs -pkgver=5.0.5 -pkgrel=6 -pkgdesc='A kernel-based automounter for Linux.' -arch=('i686' 'x86_64') -url='http://freshmeat.net/projects/autofs' -license=('GPL2') -depends=('libldap' 'libxml2' 'krb5') -backup=('etc/autofs/auto.master' - 'etc/autofs/auto.misc' - 'etc/conf.d/autofs') -options=(!makeflags) -install='autofs.install' -source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2" - 'autofs' - 'autofs.conf.d' - 'auto.master' - 'auto.misc') -md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' - 'e307bf6d2638e46eeb916cf42fe029b2' - '47f597c870410055e0fdb66103daf928' - 'a6cefb591e77b31b79dbb7243646c96b' - 'd8a15ec9186c5c0b36e5cea1e2739e8a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \ - Makefile.rules - - ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \ - --enable-ignore-busy - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make INSTALLROOT="${pkgdir}" install - - install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master" - install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc" - install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs" - install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs" -} diff --git a/community-staging/autofs/auto.master b/community-staging/autofs/auto.master deleted file mode 100644 index be4ea73ae..000000000 --- a/community-staging/autofs/auto.master +++ /dev/null @@ -1,6 +0,0 @@ -# Sample auto.master file -# Format of this file: -# mountpoint map options -# For details of the format look at autofs(5). - -#/media /etc/autofs/auto.media diff --git a/community-staging/autofs/auto.misc b/community-staging/autofs/auto.misc deleted file mode 100644 index 569156626..000000000 --- a/community-staging/autofs/auto.misc +++ /dev/null @@ -1,7 +0,0 @@ -# This is an automounter map and it has the following format -# key [ -mount-options-separated-by-comma ] location -# Details may be found in the autofs(5) manpage - -cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom -floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl -usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1 diff --git a/community-staging/autofs/autofs b/community-staging/autofs/autofs deleted file mode 100644 index 08bd3e133..000000000 --- a/community-staging/autofs/autofs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -daemon_name=autofs - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs - -if [ ! -z "$TIMEOUT" ]; then - daemonoptions="--timeout=$TIMEOUT $daemonoptions" -fi - -PID=`cat /var/run/autofs-running 2> /dev/null` -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon_name - stat_done - fi - ;; - stop) - stat_busy "Stopping $daemon_name daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon_name - stat_done - fi - ;; - restart) - stat_busy "Restarting $daemon_name daemon" - $0 stop - sleep 1 - $0 start - ;; - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community-staging/autofs/autofs.conf.d b/community-staging/autofs/autofs.conf.d deleted file mode 100644 index bc82491e7..000000000 --- a/community-staging/autofs/autofs.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -#localoptions='rsize=8192,wsize=8192' - -# e.g. --timeout=60 -daemonoptions='' diff --git a/community-staging/autofs/autofs.install b/community-staging/autofs/autofs.install deleted file mode 100644 index 34ae75f1e..000000000 --- a/community-staging/autofs/autofs.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install(){ - echo "> In autofs5 --ghost option isn't valid. In order to start autofs you" - echo "> must remove that option from your /etc/conf.d/autofs." -} diff --git a/community-staging/autofs/heimdal.patch b/community-staging/autofs/heimdal.patch deleted file mode 100644 index 4aa321834..000000000 --- a/community-staging/autofs/heimdal.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100 -+++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100 -@@ -66,6 +66,15 @@ - #endif - #endif - -+/** -+ * The type of a principal is different for MIT Krb5 and Heimdal. -+ * These macros are provided by Heimdal, and introduced here for MIT. -+ */ -+#ifndef krb5_realm_length -+#define krb5_realm_length(r) ((r).length) -+#define krb5_realm_data(r) ((r).data) -+#endif -+ - /* - * Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME - * environment variable so that the library knows where to find it. -@@ -452,11 +452,11 @@ - - /* setup a principal for the ticket granting service */ - ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - strlen(KRB5_TGS_NAME), KRB5_TGS_NAME, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length, -- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data, -+ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), -+ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)), - 0); - if (ret) { - error(logopt, ---- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100 -+++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100 -@@ -43,7 +43,7 @@ - ifeq ($(SASL), 1) - SASL_OBJ = cyrus-sasl.o - LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE -- LIBLDAP += $(LIBSASL) $(XML_LIBS) -+ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5 - endif - endif \ No newline at end of file diff --git a/community-staging/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD deleted file mode 100644 index 3727a8cb3..000000000 --- a/community-staging/freeradius/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 45793 2011-04-29 10:36:54Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Jason R Begley (jayray@digitalgoat.com> - -pkgname=freeradius -pkgver=2.1.10 -pkgrel=6 -pkgdesc="The premier open source RADIUS server" -arch=('i686' 'x86_64') -url="http://www.freeradius.org/" -license=("GPL") -depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' \ - 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') -optdepends=('libpcap' 'unixodbc' 'python2') -options=('!libtool' 'emptydirs' '!makeflags') -install=$pkgname.install -source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 \ - radiusd - krb5-build-fix.patch) -md5sums=('8ea2bd39460a06212decf2c14fdf3fb8' - 'f1a6530b1b69d2fa793aa45b2de379bb' - 'c6a61de7576933f59154a53bfc12a2d2') - -build() { - cd $srcdir/freeradius-server-$pkgver - export CFLAGS="$CFLAGS -fno-strict-aliasing" - sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in - patch -p1 <$srcdir/krb5-build-fix.patch - ./configure --with-system-libtool --with-system-libltdl \ - --prefix=/usr --enable-heimdal-krb5 \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --libdir=/usr/lib/freeradius - make -} - -package() { - cd $srcdir/freeradius-server-$pkgver - make install R=$pkgdir - install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd - chmod o+r $pkgdir/etc/raddb/* - mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default - rm -rf $pkgdir/var/run -} diff --git a/community-staging/freeradius/freeradius.install b/community-staging/freeradius/freeradius.install deleted file mode 100644 index e50aa403d..000000000 --- a/community-staging/freeradius/freeradius.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - groupadd radiusd - useradd -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd - - touch /var/log/radius/radius.log - chown -R radiusd.radiusd /var/log/radius/radius.log - - [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb - - /bin/true -} - -pre_remove() { - /etc/rc.d/radiusd stop - /bin/true -} - -post_remove() { - userdel radiusd - groupdel radiusd - /bin/true -} diff --git a/community-staging/freeradius/krb5-build-fix.patch b/community-staging/freeradius/krb5-build-fix.patch deleted file mode 100644 index 11dae7090..000000000 --- a/community-staging/freeradius/krb5-build-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c ---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 -+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 -@@ -375,7 +375,7 @@ - * Heimdal krb5 verification - */ - radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val*/, - userP->realm); - - krb5_cc_default(context, &id); -@@ -390,7 +390,7 @@ - - radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", - error_message(ret), -- *userP->name.name_string.val, -+ "-" /* *userP->name.name_string.val */, - userP->realm); - - return RLM_MODULE_REJECT; diff --git a/community-staging/freeradius/radiusd b/community-staging/freeradius/radiusd deleted file mode 100755 index bf872b6f2..000000000 --- a/community-staging/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/radiusd` -case "$1" in - start) - stat_busy "Starting radiusd Server" - - [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd - [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid - chown -R radiusd.radiusd /var/run/radiusd - - [ -z "$PID" ] && /usr/sbin/radiusd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/radiusd.pid - add_daemon radiusd - stat_done - fi - ;; - stop) - stat_busy "Stopping radiusd Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/radiusd.pid - rm_daemon radiusd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/freerdp/PKGBUILD b/community-staging/freerdp/PKGBUILD deleted file mode 100644 index f845453fe..000000000 --- a/community-staging/freerdp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 45796 2011-04-29 10:42:30Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Stijn Segers - -pkgname=freerdp -pkgver=0.8.2 -pkgrel=2 -pkgdesc="Free RDP client" -arch=('i686' 'x86_64') -url="http://freerdp.sourceforge.net" -license=('GPL') -depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib') -makedepends=('krb5') -conflicts=('freerdp-git') -changelog=${pkgname}.changelog -options=('!libtool') -source=(http://downloads.sourceforge.net/project/freerdp/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) -md5sums=('cde590336292c977dfc1b4b7badf24d2') - -build() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - [ -x configure ] || sh ./autogen.sh - ./configure --prefix=/usr - make -} - -package() { - cd `find ${srcdir}/ -type d -name freerdp-\*` - make DESTDIR="${pkgdir}" install -} diff --git a/community-staging/freerdp/freerdp.changelog b/community-staging/freerdp/freerdp.changelog deleted file mode 100644 index d47f165c3..000000000 --- a/community-staging/freerdp/freerdp.changelog +++ /dev/null @@ -1,2 +0,0 @@ -0.7.1-1 to 0.7.1-2 -* Added x86_64 to supported architectures (tested by figue). diff --git a/community-staging/gsasl/PKGBUILD b/community-staging/gsasl/PKGBUILD deleted file mode 100644 index 01c39c725..000000000 --- a/community-staging/gsasl/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 45799 2011-04-29 10:48:15Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Orivej Desh -# Maintainer: Orivej Desh - -pkgname=gsasl -pkgver=1.5.4 -pkgrel=2 -pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" -arch=("i686" "x86_64") -url="http://josefsson.org/gsasl/" -license=("GPL") -depends=('gnutls' 'libidn' 'krb5') -source=("ftp://alpha.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz") -md5sums=('44cf5073a6ee2d77d526605bd6ab3904') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la" -} diff --git a/community-staging/ipsec-tools/PKGBUILD b/community-staging/ipsec-tools/PKGBUILD deleted file mode 100644 index 77a72f6df..000000000 --- a/community-staging/ipsec-tools/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 45815 2011-04-29 12:08:18Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Allan Henriksen - -pkgname=ipsec-tools -pkgver=0.8.0 -pkgrel=2 -pkgdesc="KAME IPSec tools ported to Linux" -arch=('i686' 'x86_64') -url="http://ipsec-tools.sourceforge.net/" -depends=('readline' 'openssl' 'krb5') -license=('GPL') -options=('!makeflags' '!libtool') -source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 - racoon.rc - ipsec.rc) -md5sums=('b79aae3055a51f8de5c0f1b8ca6cf619' - '416b8e362d86987b8c55f7153cdafbeb' - '90d0810267cbd847383ae3101699b192') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's#-Werror##' configure - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport --enable-gssapi - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon - install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec -} diff --git a/community-staging/ipsec-tools/ipsec.rc b/community-staging/ipsec-tools/ipsec.rc deleted file mode 100755 index cff472c59..000000000 --- a/community-staging/ipsec-tools/ipsec.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Loading IPSec Security Policy Database..." - /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ipsec - stat_done - fi - ;; - stop) - stat_busy "Unloading IPSec Security Policy Database..." - /usr/sbin/setkey -F -P - /usr/sbin/setkey -F - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ipsec - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/ipsec-tools/racoon.rc b/community-staging/ipsec-tools/racoon.rc deleted file mode 100755 index 1a67dcac5..000000000 --- a/community-staging/ipsec-tools/racoon.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/racoon` -case "$1" in - start) - stat_busy "Starting Racoon IPSec daemon" - [ -z "$PID" ] && /usr/sbin/racoon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon racoon - stat_done - fi - ;; - stop) - stat_busy "Stopping Racoon IPSec daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon racoon - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/pam-krb5/PKGBUILD b/community-staging/pam-krb5/PKGBUILD deleted file mode 100644 index 5c9798514..000000000 --- a/community-staging/pam-krb5/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 46339 2011-05-05 11:43:20Z spupykin $ -# Maintainer: Kaiting Chen -# Contributor: Ryan Corder - -pkgname=pam-krb5 -pkgver=4.4 -pkgrel=2 -pkgdesc='A PAM module providing Kerberos v5 support.' -arch=('i686' 'x86_64') -url='http://www.eyrie.org/~eagle/software/pam-krb5/' -license=('custom') -options=('!libtool') -depends=('krb5' 'pam') -source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") -md5sums=('a3f9a414fef102cd815a763c965b315c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-reduced-depends - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-staging/perl-gssapi/PKGBUILD b/community-staging/perl-gssapi/PKGBUILD deleted file mode 100644 index ec1e50684..000000000 --- a/community-staging/perl-gssapi/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 45801 2011-04-29 10:49:42Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: Charles Mauch - -pkgname=perl-gssapi -pkgver=0.28 -pkgrel=3 -pkgdesc="Perl/CPAN Module GSSAPI" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/GSSAPI" -license=("GPL" "PerlArtistic") -depends=('krb5') -source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-$pkgver.tar.gz") -md5sums=('65f00a0749212af064289c8a05e59b3f') - -build() { - cd $srcdir/GSSAPI-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/GSSAPI-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/pgadmin3/ChangeLog b/community-staging/pgadmin3/ChangeLog deleted file mode 100644 index 76de01d7d..000000000 --- a/community-staging/pgadmin3/ChangeLog +++ /dev/null @@ -1,28 +0,0 @@ -2008-08-21 Douglas Soares de Andrade - - * Updated for i686: 1.8.5 - -2008-06-24 Douglas Soares de Andrade - - * Updated for i686 - 1.8.4 - -2008-02-21 Douglas Soares de Andrade - - * Updated for i686 - 1.8.2 - -2008-01-05 Douglas Soares de Andrade - - * Updated for x86_64 - 1.8.1 - * Updated for i686 - 1.8.1 - -2007-10-28 Douglas Soares de Andrade - - * Updated version - -2007-10-11 Douglas Soares de Andrade - - * Updated version - -2007-06-28 tardo - - * Built for x86_64 diff --git a/community-staging/pgadmin3/PKGBUILD b/community-staging/pgadmin3/PKGBUILD deleted file mode 100644 index 117eb7521..000000000 --- a/community-staging/pgadmin3/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 46331 2011-05-05 10:45:23Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: Douglas Soares de Andrade -# Contributor: Benjamin Andresen -# Contributor: bekks - -pkgname=pgadmin3 -pkgver=1.12.3 -_realver=1.12.3 -pkgrel=1 -pkgdesc="A comprehensive design and management interface for PostgreSQL database" -arch=('i686' 'x86_64') -url="http://www.pgadmin.org" -license=('custom') -depends=('wxgtk' 'postgresql-libs>=8.4.1' 'libxslt') -makedepends=('libpqxx' 'krb5') -source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${_realver}/src/pgadmin3-${_realver}.tar.gz - pgadmin3.desktop) -md5sums=('0ff7a970a14757ee951a4e8b1a246a70' - 'd07ba4df54baead30b66d19d7450bcad') - -build() { - cd $srcdir/pgadmin3-${_realver} - unset LDFLAGS - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/pgadmin3-${_realver} - make DESTDIR=$pkgdir/ install - - install -D -m 644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n - install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - mkdir -p $pkgdir/usr/share/pgadmin3/pixmaps/ - mkdir -p $pkgdir/usr/share/applications/ - - install -D -m 644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico - install -D -m 644 $srcdir/pgadmin3.desktop $pkgdir/usr/share/applications/ -} diff --git a/community-staging/pgadmin3/pgadmin3.desktop b/community-staging/pgadmin3/pgadmin3.desktop deleted file mode 100644 index 2e0864f60..000000000 --- a/community-staging/pgadmin3/pgadmin3.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=pgadmin3 -Comment=A comprehensive design and management interface for PostgreSQL database -Exec=pgadmin3 -Terminal=false -Type=Application -StartupNotify=true -Icon=/usr/share/pgadmin3/pixmaps/pgAdmin3.ico -Categories=Application;Development; diff --git a/community-staging/splix/PKGBUILD b/community-staging/splix/PKGBUILD deleted file mode 100644 index 9b8061ad5..000000000 --- a/community-staging/splix/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 45807 2011-04-29 11:10:15Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: Angel 'angvp' Velasquez -# Contributor: Francis Carroll (franciscarroll at gmail dot com) - -pkgname=splix -pkgver=2.0.0 -pkgrel=9 -pkgdesc="CUPS drivers for SPL (Samsung Printer Language) printers" -arch=('i686' 'x86_64') -url="http://splix.ap2c.org/" -license=('GPL') -depends=('libcups' 'gcc-libs' 'ghostscript>=9.02') -makedepends=('libcups' 'jbigkit' 'krb5') -install=splix.install -source=(http://downloads.sourceforge.net/splix/$pkgname-$pkgver.tar.bz2) -md5sums=('f3aa735c22a926818b3d8b26c9964186') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's#const PPDFile::Value::Value #const PPDFile::Value #' src/ppdfile.cpp - - make PSTORASTER=gstoraster -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -d "$pkgdir/usr/lib/cups/filter" - install -d "$pkgdir/usr/share/cups/model/samsung" - - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/splix/splix.install b/community-staging/splix/splix.install deleted file mode 100644 index ee1eb78a3..000000000 --- a/community-staging/splix/splix.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - cat < -# Contributor: William Rea - -pkgname=libtextcat -pkgver=2.2 -pkgrel=6 -pkgdesc="Library that implements N-gram-based text categorization" -arch=('i686' 'x86_64') -url="http://software.wise-guys.nl/libtextcat/" -license=('BSD') -depends=('glibc') -options=(!libtool) -source=(http://software.wise-guys.nl/download/$pkgname-$pkgver.tar.gz) -md5sums=('128cfc86ed5953e57fe0f5ae98b62c2e') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - - install -D -m644 src/textcat.h $startdir/pkg/usr/include/textcat.h - mkdir -p $startdir/pkg/usr/share/libtextcat/{LM,ShortTexts} - install -m644 langclass/conf.txt $startdir/pkg/usr/share/libtextcat - install -m644 langclass/LM/*.lm $startdir/pkg/usr/share/libtextcat/LM - install -m644 langclass/ShortTexts/*.txt $startdir/pkg/usr/share/libtextcat/ShortTexts - - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE - sed -i 's|LM|/usr/share/libtextcat/LM|' ${pkgdir}/usr/share/libtextcat/conf.txt -} diff --git a/extra/dconf/load-enum.patch b/extra/dconf/load-enum.patch deleted file mode 100644 index 949de1e00..000000000 --- a/extra/dconf/load-enum.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Tue, 29 Mar 2011 05:50:12 +0000 -Subject: editor: Load *.enums.xml as well as *.gschema.xml. This was stopping some enums from being loaded. - -Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=636880 ---- -diff --git a/editor/dconf-schema.vala b/editor/dconf-schema.vala -index 2b34e28..c2654b5 100644 ---- a/editor/dconf-schema.vala -+++ b/editor/dconf-schema.vala -@@ -371,7 +371,7 @@ public class SchemaList - while ((info = i.next_file (null)) != null) { - string name = info.get_name(); - -- if (!name.has_suffix(".gschema.xml")) -+ if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml")) - continue; - - string path = Path.build_filename(dir, name, null); --- -cgit v0.9 diff --git a/extra/fyre/ChangeLog b/extra/fyre/ChangeLog deleted file mode 100644 index edb09672c..000000000 --- a/extra/fyre/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -2008-11-03 Eric Belanger - - * fyre 1.0.1-3 - * Fixed mime file conflict - * Fixed install scriptlet - * Added shared-mime-info depends - * Added ChangeLog diff --git a/extra/glsof/ChangeLog b/extra/glsof/ChangeLog deleted file mode 100644 index e941c8b45..000000000 --- a/extra/glsof/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2009-03-14 Eric Belanger - - * glsof 0.9.16-5 - * Added license - * Added .desktop file - * Added ChangeLog diff --git a/extra/glsof/glsof.desktop b/extra/glsof/glsof.desktop deleted file mode 100644 index fb13ffd6d..000000000 --- a/extra/glsof/glsof.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=glsof -Comment=A GUI for lsof -Comment[pl]=GUI do lsof -Exec=glsof -Icon=glsof.png -StartupNotify=false -Terminal=false -Type=Application -Categories=GTK;System;Monitor; -Encoding=UTF-8 -# vi: encoding=utf-8 diff --git a/extra/gnet/ChangeLog b/extra/gnet/ChangeLog deleted file mode 100644 index b8975af31..000000000 --- a/extra/gnet/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2008-05-04 Eric Belanger - - * gnet 2.0.8-1 - * Upstream update - * Added ChangeLog diff --git a/extra/kdebase-workspace/sensors-fix.patch b/extra/kdebase-workspace/sensors-fix.patch deleted file mode 100644 index 2d9b70c52..000000000 --- a/extra/kdebase-workspace/sensors-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit 23863a99399cbb274f6756146b3c08de2efa0c7f -Author: John Tapsell -Date: Thu Apr 7 10:59:20 2011 +0100 - - Fix accidental removal of a #include, when adding freebsd support. This broke the lmsensors at minimum - - BUG: 270246 - BUG: 270246 - CCMAIL: naylor.b.david@gmail.com - -diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h -index e780be6..9aae890 100644 ---- a/ksysguard/ksysguardd/modules.h -+++ b/ksysguard/ksysguardd/modules.h -@@ -23,6 +23,7 @@ - #ifndef KSG_MODULES_H - #define KSG_MODULES_H - -+#include "config-ksysguardd.h" - #include "Command.h" - #include "conf.h" - #include "ksysguardd.h" diff --git a/extra/kdebase-workspace/shutdown-fix.patch b/extra/kdebase-workspace/shutdown-fix.patch deleted file mode 100644 index b01ab7fba..000000000 --- a/extra/kdebase-workspace/shutdown-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdebase-workspace-4.6.2/kdm/config.def~ 2011-04-08 00:29:48.291941154 -0700 -+++ kdebase-workspace-4.6.2/kdm/config.def 2011-04-08 00:32:04.738607619 -0700 -@@ -38,7 +38,7 @@ - # define HALT_CMD "/usr/sbin/shutdown -h now" - # define REBOOT_CMD "/usr/sbin/shutdown -r now" - #elif defined(BSD) || defined(__linux__) --# define HALT_CMD "/sbin/shutdown -p now" -+# define HALT_CMD "/sbin/shutdown -h now" - # define REBOOT_CMD "/sbin/shutdown -r now" - #elif defined(__SVR4) - # define HALT_CMD "/usr/sbin/halt" diff --git a/extra/kdemultimedia/kmix-locale-pulseaudio.patch b/extra/kdemultimedia/kmix-locale-pulseaudio.patch deleted file mode 100644 index 88be8dbde..000000000 --- a/extra/kdemultimedia/kmix-locale-pulseaudio.patch +++ /dev/null @@ -1,1117 +0,0 @@ -Index: kmix/apps/kmix.cpp -=================================================================== ---- kmix/apps/kmix.cpp (revision 1226955) -+++ kmix/apps/kmix.cpp (revision 1226956) -@@ -78,8 +78,6 @@ - m_dockWidget(), - m_dontSetDefaultCardOnStart (false) - { -- _cornerLabelNew = 0; -- - setObjectName( QLatin1String("KMixWindow" )); - // disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in - setAttribute(Qt::WA_DeleteOnClose, false); -@@ -184,16 +182,29 @@ - - void KMixWindow::initActionsAfterInitMixer() - { -+ bool isPulseAudio = false; - // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use - foreach( Mixer* mixer, Mixer::mixers() ) - { -- if ( mixer->getDriverName() == "PulseAudio") { -+ if ( mixer->getDriverName() == "PulseAudio") -+ { -+ isPulseAudio = true; - KAction* action = actionCollection()->addAction( "launch_pavucontrol" ); - action->setText( i18n( "Audio setup (&Pulseaudio)" ) ); - connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() )); - break; - } - } -+ -+ if (! isPulseAudio ) -+ { -+ QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall ); -+ QPushButton* _cornerLabelNew = new QPushButton(); -+ _cornerLabelNew->setIcon(cornerNewPM); -+ //cornerLabelNew->setSizePolicy(QSizePolicy()); -+ m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner); -+ connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) ); -+ } - } - - void KMixWindow::initPrefDlg() -@@ -210,15 +221,10 @@ - m_wsMixers = new KTabWidget(); - m_wsMixers->setDocumentMode(true); - setCentralWidget(m_wsMixers); -- m_wsMixers->setTabsClosable(true); -+ m_wsMixers->setTabsClosable(false); - connect (m_wsMixers, SIGNAL(tabCloseRequested(int)), SLOT(saveAndCloseView(int)) ); - - QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall ); -- _cornerLabelNew = new QPushButton(); -- _cornerLabelNew->setIcon(cornerNewPM); -- //cornerLabelNew->setSizePolicy(QSizePolicy()); -- m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner); -- connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) ); - - connect( m_wsMixers, SIGNAL( currentChanged ( int ) ), SLOT( newMixerShown(int)) ); - -@@ -516,6 +522,7 @@ - addMixerWidget(mixer->id(), guiprof, -1); - } - else { -+ // did exist => remove and insert new guiprof at old position - int indexOfTab = m_wsMixers->indexOf(kmw); - if ( indexOfTab != -1 ) m_wsMixers->removeTab(indexOfTab); - delete kmw; -@@ -676,9 +683,9 @@ - m_wsMixers->removeTab(idx); - delete kmw; - -- if ( m_wsMixers->count() < 2 ) { -- m_wsMixers->setTabsClosable(false); -- } -+ bool isPulseAudio = kmw->mixer()->getDriverName() == "PulseAudio"; -+ m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); -+ - saveViewConfig(); - } - kDebug() << "Exit"; -@@ -874,9 +881,9 @@ - if ( kmw->getGuiprof()->getId() == m_defaultCardOnStart ) { - m_wsMixers->setCurrentWidget(kmw); - } -- if ( m_wsMixers->count() > 1 ) { -- m_wsMixers->setTabsClosable(true); -- } -+ -+ bool isPulseAudio = mixer->getDriverName() == "PulseAudio"; -+ m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); - m_dontSetDefaultCardOnStart = false; - - -Index: kmix/apps/kmix.h -=================================================================== ---- kmix/apps/kmix.h (revision 1226955) -+++ kmix/apps/kmix.h (revision 1226956) -@@ -116,7 +116,6 @@ - Qt::Orientation m_toplevelOrientation; - - KTabWidget *m_wsMixers; -- QPushButton* _cornerLabelNew; - - KMixPrefDlg *m_prefDlg; - KMixDockWidget *m_dockWidget; -Index: kmix/gui/viewbase.cpp -=================================================================== ---- kmix/gui/viewbase.cpp (revision 1226956) -+++ kmix/gui/viewbase.cpp (revision 1226957) -@@ -226,34 +226,35 @@ - - // Check the guiprofile... if it is not the fallback GUIProfile, then - // make sure that we add a specific entry for any devices not present. -- if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) { -+ if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense. -+ { - kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present"; - - QList new_mix_devices; - MixSet ms = _mixer->getMixSet(); - for (int i=0; i < ms.count(); ++i) -+ { - new_mix_devices.append("^" + ms[i]->id() + "$"); -+ kDebug(67100) << "new_mix_devices.append => " << ms[i]->id(); -+ } - -+ GUIProfile::ControlSet& ctlSet = _guiprof->getControls(); -+ - // std::vector::const_iterator itEnd = _guiprof->_controls.end(); - // for ( std::vector::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it) - // new_mix_devices.removeAll((*it)->id); - // TODO Please check this change, Colin -- foreach ( ProfControl* pctl, _guiprof->getControls() ) { -+ foreach ( ProfControl* pctl, ctlSet ) { - new_mix_devices.removeAll(pctl->id); - } - - - if ( new_mix_devices.count() > 0 ) { - kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile"; -+ QString sctlMatchAll("*"); - while ( new_mix_devices.count() > 0 ) { -- QString sctlMatchAll("*"); - QString new_mix_devices0 = new_mix_devices.takeAt(0); -- ProfControl* ctl = new ProfControl(new_mix_devices0, sctlMatchAll); --// ctl->id = new_mix_devices.takeAt(0); --// ctl->setSubcontrols(QString("*")); --// ctl->tab = (_guiprof->tabs())[0]->name(); // Use the first tab... not ideal but should work most of the time; --// ctl->show = "simple"; -- _guiprof->getControls().push_back(ctl); -+ ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll)); - } - _guiprof->setDirty(); - } -Index: kmix/gui/viewbase.cpp -=================================================================== ---- kmix/gui/viewbase.cpp (revision 1226957) -+++ kmix/gui/viewbase.cpp (revision 1226958) -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - // KMix - #include "dialogviewconfiguration.h" - #include "gui/guiprofile.h" -@@ -43,7 +44,7 @@ - - - ViewBase::ViewBase(QWidget* parent, const char* id, Mixer* mixer, Qt::WFlags f, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection *actionColletion) -- : QWidget(parent, f), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof) -+ : QWidget(parent, f), _popMenu(NULL), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof) - { - setObjectName(id); - m_viewId = id; -@@ -73,9 +74,11 @@ - } - } - } -- QAction *action = _localActionColletion->addAction("toggle_channels"); -- action->setText(i18n("&Channels")); -- connect(action, SIGNAL(triggered(bool) ), SLOT(configureView())); -+ if ( !_mixer->isDynamic() ) { -+ QAction *action = _localActionColletion->addAction("toggle_channels"); -+ action->setText(i18n("&Channels")); -+ connect(action, SIGNAL(triggered(bool) ), SLOT(configureView())); -+ } - connect ( _mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) ); - connect ( _mixer, SIGNAL(controlsReconfigured(const QString&)), this, SLOT(controlsReconfigured(const QString&)) ); - } -@@ -95,7 +98,7 @@ - - bool ViewBase::isValid() const - { -- return ( _mixSet->count() > 0 || _mixer->dynamic() ); -+ return ( _mixSet->count() > 0 || _mixer->isDynamic() ); - } - - void ViewBase::setIcons (bool on) { KMixToolBox::setIcons (_mdws, on ); } -@@ -170,6 +173,8 @@ - { - QAction *a; - -+ if ( _popMenu ) -+ delete _popMenu; - _popMenu = new KMenu( this ); - _popMenu->addTitle( KIcon( QLatin1String( "kmix" ) ), i18n("Device Settings" )); - -@@ -222,44 +227,8 @@ - - void ViewBase::setMixSet() - { -- if ( _mixer->dynamic()) { -+ if ( _mixer->isDynamic() ) { - -- // Check the guiprofile... if it is not the fallback GUIProfile, then -- // make sure that we add a specific entry for any devices not present. -- if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense. -- { -- kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present"; -- -- QList new_mix_devices; -- MixSet ms = _mixer->getMixSet(); -- for (int i=0; i < ms.count(); ++i) -- { -- new_mix_devices.append("^" + ms[i]->id() + "$"); -- kDebug(67100) << "new_mix_devices.append => " << ms[i]->id(); -- } -- -- GUIProfile::ControlSet& ctlSet = _guiprof->getControls(); -- --// std::vector::const_iterator itEnd = _guiprof->_controls.end(); --// for ( std::vector::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it) --// new_mix_devices.removeAll((*it)->id); -- // TODO Please check this change, Colin -- foreach ( ProfControl* pctl, ctlSet ) { -- new_mix_devices.removeAll(pctl->id); -- } -- -- -- if ( new_mix_devices.count() > 0 ) { -- kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile"; -- QString sctlMatchAll("*"); -- while ( new_mix_devices.count() > 0 ) { -- QString new_mix_devices0 = new_mix_devices.takeAt(0); -- ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll)); -- } -- _guiprof->setDirty(); -- } -- } -- - // We need to delete the current MixDeviceWidgets so we can redraw them - while (!_mdws.isEmpty()) { - QWidget* mdw = _mdws.last(); -@@ -280,6 +249,8 @@ - */ - void ViewBase::configureView() { - -+ Q_ASSERT( !_mixer->isDynamic() ); -+ - DialogViewConfiguration* dvc = new DialogViewConfiguration(0, *this); - dvc->show(); - // !! The dialog is modal. Does it delete itself? -@@ -302,6 +273,10 @@ - kDebug(67100) << "KMixToolBox::loadView() grp=" << grp.toAscii(); - - static char guiComplexity[3][20] = { "simple", "extended", "all" }; -+ -+ // Certain bits are not saved for dynamic mixers (e.g. PulseAudio) -+ bool dynamic = _mixer->isDynamic(); -+ - for ( int tries = 0; tries < 3; tries++ ) - { - bool atLeastOneControlIsShown = false; -@@ -315,12 +290,12 @@ - Workaround: If found, write back correct group name. - */ - MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw; -- QString devgrp; -- devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); -+ MixDevice* md = mdw->mixDevice(); -+ -+ QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id()); - KConfigGroup devcg = config->group( devgrp ); - -- QString buggyDevgrp; -- buggyDevgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), view->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); -+ QString buggyDevgrp = QString("%1.%2.%3").arg(grp).arg(view->id()).arg(md->id()); - KConfigGroup buggyDevgrpCG = config->group( buggyDevgrp ); - if ( buggyDevgrpCG.exists() ) { - buggyDevgrpCG.copyTo(&devcg); -@@ -335,7 +310,7 @@ - } - - bool mdwEnabled = false; -- if ( devcg.hasKey("Show") ) -+ if ( !dynamic && devcg.hasKey("Show") ) - { - mdwEnabled = ( true == devcg.readEntry("Show", true) ); - //kDebug() << "Load devgrp" << devgrp << "show=" << mdwEnabled; -@@ -382,20 +357,23 @@ - QString grp = "View."; - grp += view->id(); - // KConfigGroup cg = config->group( grp ); -- kDebug(67100) << "KMixToolBox::saveView() grp=" << grp.toAscii(); -+ kDebug(67100) << "KMixToolBox::saveView() grp=" << grp; - -+ // Certain bits are not saved for dynamic mixers (e.g. PulseAudio) -+ bool dynamic = _mixer->isDynamic(); -+ - for (int i=0; i < view->_mdws.count(); ++i ){ - QWidget *qmdw = view->_mdws[i]; - if ( qmdw->inherits("MixDeviceWidget") ) - { - MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw; -+ MixDevice* md = mdw->mixDevice(); - - //kDebug(67100) << " grp=" << grp.toAscii(); - //kDebug(67100) << " mixer=" << view->id().toAscii(); - //kDebug(67100) << " mdwPK=" << mdw->mixDevice()->id().toAscii(); - -- QString devgrp; -- devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); -+ QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id()); - KConfigGroup devcg = config->group( devgrp ); - - if ( mdw->inherits("MDWSlider") ) -@@ -403,15 +381,19 @@ - // only sliders have the ability to split apart in mutliple channels - devcg.writeEntry( "Split", ! mdw->isStereoLinked() ); - } -- devcg.writeEntry( "Show" , mdw->isVisibleTo(view) ); --kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view); -+ if ( !dynamic ) { -+ devcg.writeEntry( "Show" , mdw->isVisibleTo(view) ); -+ kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view); -+ } - - } // inherits MixDeviceWidget - } // for all MDW's - -- kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty(); -- if ( guiProfile()->isDirty() ) { -- guiProfile()->writeProfile(); -+ if ( !dynamic ) { -+ // We do not save GUIProfiles (as they cannot be customised) for dynamic mixers (e.g. PulseAudio) -+ kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty(); -+ if ( guiProfile()->isDirty() ) -+ guiProfile()->writeProfile(); - } - } - -Index: kmix/gui/mdwslider.cpp -=================================================================== ---- kmix/gui/mdwslider.cpp (revision 1226957) -+++ kmix/gui/mdwslider.cpp (revision 1226958) -@@ -86,10 +86,14 @@ - KToggleAction *taction = _mdwActions->add( "stereo" ); - taction->setText( i18n("&Split Channels") ); - connect( taction, SIGNAL( triggered(bool) ), SLOT( toggleStereoLinked() ) ); -- KAction *action = _mdwActions->add( "hide" ); -- action->setText( i18n("&Hide") ); -- connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) ); - -+ KAction *action; -+ if ( ! m_mixdevice->mixer()->isDynamic() ) { -+ action = _mdwActions->add( "hide" ); -+ action->setText( i18n("&Hide") ); -+ connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) ); -+ } -+ - if( m_mixdevice->playbackVolume().hasSwitch() ) { - taction = _mdwActions->add( "mute" ); - taction->setText( i18n("&Muted") ); -@@ -129,8 +133,8 @@ - #ifdef __GNUC__ - #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed - #endif -- if ( ! mixDevice()->isEthereal() ) { -- // virtual / ethereal controls won't get shortcuts -+ if ( ! mixDevice()->mixer()->isDynamic() ) { -+ // virtual / dynamic controls won't get shortcuts - b->setGlobalShortcut(dummyShortcut); // -<- enableGlobalShortcut() is not there => use workaround - // b->enableGlobalShortcut(); - connect( b, SIGNAL( triggered(bool) ), SLOT( increaseVolume() ) ); -@@ -143,8 +147,8 @@ - #ifdef __GNUC__ - #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed - #endif -- if ( ! mixDevice()->isEthereal() ) { -- // virtual / ethereal controls won't get shortcuts -+ if ( ! mixDevice()->mixer()->isDynamic() ) { -+ // virtual / dynamic controls won't get shortcuts - b->setGlobalShortcut(dummyShortcut); // -<- enableGlobalShortcut() is not there => use workaround - // b->enableGlobalShortcut(); - connect( b, SIGNAL( triggered(bool) ), SLOT( decreaseVolume() ) ); -@@ -157,8 +161,8 @@ - #ifdef __GNUC__ - #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed - #endif -- if ( ! mixDevice()->isEthereal() ) { -- // virtual / ethereal controls won't get shortcuts -+ if ( ! mixDevice()->mixer()->isDynamic() ) { -+ // virtual / dynamic controls won't get shortcuts - b->setGlobalShortcut(dummyShortcut); // -<- enableGlobalShortcut() is not there => use workaround - // b->enableGlobalShortcut(); - connect( b, SIGNAL( triggered(bool) ), SLOT( toggleMuted() ) ); -Index: kmix/gui/viewdockareapopup.h -=================================================================== ---- kmix/gui/viewdockareapopup.h (revision 1226957) -+++ kmix/gui/viewdockareapopup.h (revision 1226958) -@@ -24,7 +24,6 @@ - #include "viewbase.h" - - class QGridLayout; --class QPushButton; - class QWidget; - - class Mixer; -@@ -48,8 +47,6 @@ - - protected: - KMixWindow *_dock; -- //MixDevice *_dockDevice; -- QPushButton *_showPanelBox; - - void wheelEvent ( QWheelEvent * e ); - virtual void _setMixSet(); -Index: kmix/gui/viewsliders.cpp -=================================================================== ---- kmix/gui/viewsliders.cpp (revision 1226957) -+++ kmix/gui/viewsliders.cpp (revision 1226958) -@@ -148,7 +148,7 @@ - { - const MixSet& mixset = _mixer->getMixSet(); - -- if ( _mixer->dynamic() ) { -+ if ( _mixer->isDynamic() ) { - // We will be recreating our sliders, so make sure we trash all the separators too. - qDeleteAll(_separators); - _separators.clear(); -Index: kmix/gui/guiprofile.cpp -=================================================================== ---- kmix/gui/guiprofile.cpp (revision 1226957) -+++ kmix/gui/guiprofile.cpp (revision 1226958) -@@ -158,8 +158,12 @@ - { - GUIProfile* guiprof = 0; - -- if ( mixer == 0 || profileName.isEmpty() ) { -+ if ( mixer == 0 || profileName.isEmpty() ) - return 0; -+ -+ if ( mixer->isDynamic() ) { -+ kDebug(67100) << "GUIProfile::find() Not loading GUIProfile for Dynamic Mixer (e.g. PulseAudio)"; -+ return 0; - } - - QString requestedProfileName; -Index: kmix/gui/viewbase.h -=================================================================== ---- kmix/gui/viewbase.h (revision 1226957) -+++ kmix/gui/viewbase.h (revision 1226958) -@@ -133,7 +133,7 @@ - - ViewFlags _vflags; - GUIProfile* _guiprof; -- KActionCollection *_localActionColletion; -+ KActionCollection *_localActionColletion; - - virtual void _setMixSet() = 0; - -Index: kmix/gui/viewdockareapopup.cpp -=================================================================== ---- kmix/gui/viewdockareapopup.cpp (revision 1226957) -+++ kmix/gui/viewdockareapopup.cpp (revision 1226958) -@@ -88,8 +88,8 @@ - { - // kDebug(67100) << "ViewDockAreaPopup::setMixSet()\n"; - -- if ( _mixer->dynamic() ) { -- // Our _layoutMDW now should only contain spacer widgets from the QSpacerItems's in add() below. -+ if ( _mixer->isDynamic() ) { -+ // Our _layoutMDW now should only contain spacer widgets from the QSpacerItem's in add() below. - // We need to trash those too otherwise all sliders gradually migrate away from the edge :p - QLayoutItem *li; - while ( ( li = _layoutMDW->takeAt(0) ) ) -@@ -114,9 +114,9 @@ - QString matchAllPlaybackAndTheCswitch("pvolume,pswitch,cswitch"); - ProfControl *pctl = new ProfControl( dummyMatchAll, matchAllPlaybackAndTheCswitch); - MixDeviceWidget *mdw = new MDWSlider( -- md, // only 1 device. This is actually _dockDevice -+ md, // only 1 device. - true, // Show Mute LED -- false, // Show Record LED -+ false, // Show Record LED - false, // Small - Qt::Vertical, // Direction: only 1 device, so doesn't matter - this, // parent -@@ -128,10 +128,10 @@ - _layoutMDW->addWidget( mdw, 0, 1 ); - - // Add button to show main panel -- _showPanelBox = new QPushButton( i18n("Mixer"), this ); -- _showPanelBox->setObjectName( QLatin1String("MixerPanel" )); -- connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) ); -- _layoutMDW->addWidget( _showPanelBox, 1, 0, 1, 3 ); -+ QPushButton *pb = new QPushButton( i18n("Mixer"), this ); -+ pb->setObjectName( QLatin1String("MixerPanel" )); -+ connect ( pb, SIGNAL( clicked() ), SLOT( showPanelSlot() ) ); -+ _layoutMDW->addWidget( pb, 1, 0, 1, 3 ); - - return mdw; - } -Index: kmix/core/mixdevice.h -=================================================================== ---- kmix/core/mixdevice.h (revision 1226957) -+++ kmix/core/mixdevice.h (revision 1226958) -@@ -157,15 +157,6 @@ - _artificial = artificial; - } - -- bool isEthereal() const -- { -- return _ethereal; -- } -- void setEthereal(bool _ethereal) -- { -- this->_ethereal = _ethereal; -- } -- - void setControlProfile(ProfControl* control); - ProfControl* controlProfile(); - -@@ -191,14 +182,12 @@ - int _enumCurrentId; - QList _enumValues; // A MixDevice, that is an ENUM, has these _enumValues - -- //bool _doNotRestore; - // A virtual control. It will not be saved/restored and/or doesn't get shortcuts -- // Actually we discriminate those "virtual" controls in artificial controls and ethereal controls: -+ // Actually we discriminate those "virtual" controls in artificial controls and dynamic controls: - // Type Shortcut Restore - // Artificial: yes no Virtual::GlobalMaster or Virtual::CaptureGroup_3 (controls that are constructed artificially from other controls) -- // Ethereal : no no Controls that come and go, like Pulse Stream controls -+ // Dynamic : no no Controls that come and go, like Pulse Stream controls - bool _artificial; -- bool _ethereal; - MixSet *_moveDestinationMixSet; - QString _iconName; - -Index: kmix/core/mixer.cpp -=================================================================== ---- kmix/core/mixer.cpp (revision 1226957) -+++ kmix/core/mixer.cpp (revision 1226958) -@@ -748,7 +748,7 @@ - m_dynamic = dynamic; - } - --bool Mixer::dynamic() -+bool Mixer::isDynamic() - { - return m_dynamic; - } -Index: kmix/core/mixer.h -=================================================================== ---- kmix/core/mixer.h (revision 1226957) -+++ kmix/core/mixer.h (revision 1226958) -@@ -164,7 +164,7 @@ - - /// Says if we are dynamic (e.g. widgets can come and go) - virtual void setDynamic( bool dynamic = true ); -- virtual bool dynamic(); -+ virtual bool isDynamic(); - - virtual bool moveStream( const QString id, const QString& destId ); - -Index: kmix/core/mixdevice.cpp -=================================================================== ---- kmix/core/mixdevice.cpp (revision 1226957) -+++ kmix/core/mixdevice.cpp (revision 1226958) -@@ -23,6 +23,7 @@ - #include - - #include "core/mixdevice.h" -+#include "core/mixer.h" - #include "gui/guiprofile.h" - #include "core/volume.h" - -@@ -96,14 +97,12 @@ - - MixDevice::MixDevice( Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet ) - { -- // doNotRestore is superseded by the more generic concepts isEthereal(), isArtificial() - init(mixer, id, name, iconName, moveDestinationMixSet); - } - - void MixDevice::init( Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet ) - { - _artificial = false; -- _ethereal = false; - _mixer = mixer; - _id = id; - if( name.isEmpty() ) -@@ -117,9 +116,10 @@ - _moveDestinationMixSet = moveDestinationMixSet; - if ( _id.contains(' ') ) { - // The key is used in the config file. It MUST NOT contain spaces -- kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it might not contain spaces" << endl; -+ kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it must not contain spaces" << endl; - _id.replace(' ', '_'); - } -+ kDebug(67100) << "MixDevice::init() _id=" << _id; - } - - void MixDevice::addPlaybackVolume(Volume &playbackVol) -@@ -216,11 +216,10 @@ - */ - void MixDevice::read( KConfig *config, const QString& grp ) - { -- if ( isEthereal() || isArtificial() ) { -+ if ( _mixer->isDynamic() || isArtificial() ) { - kDebug(67100) << "MixDevice::read(): This MixDevice does not permit volume restoration (i.e. because it is handled lower down in the audio stack). Ignoring."; - } else { -- QString devgrp; -- devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() ); -+ QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id); - KConfigGroup cg = config->group( devgrp ); - //kDebug(67100) << "MixDevice::read() of group devgrp=" << devgrp; - -@@ -264,11 +263,10 @@ - */ - void MixDevice::write( KConfig *config, const QString& grp ) - { -- if (isEthereal() || isArtificial()) { -+ if (_mixer->isDynamic() || isArtificial()) { - kDebug(67100) << "MixDevice::write(): This MixDevice does not permit volume saving (i.e. because it is handled lower down in the audio stack). Ignoring."; - } else { -- QString devgrp; -- devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() ); -+ QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id); - KConfigGroup cg = config->group(devgrp); - // kDebug(67100) << "MixDevice::write() of group devgrp=" << devgrp; - -Index: kmix/apps/kmix.cpp -=================================================================== ---- kmix/apps/kmix.cpp (revision 1226957) -+++ kmix/apps/kmix.cpp (revision 1226958) -@@ -182,21 +182,20 @@ - - void KMixWindow::initActionsAfterInitMixer() - { -- bool isPulseAudio = false; -- // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use -+ // Only show the new tab widget if some of the mixers are not Dynamic. -+ // The GUI that then pops up could then make a new mixer from a dynamic one, -+ // if mixed dynamic and non-dynamic mixers were allowed, but this is generally not the case. -+ bool allDynamic = true; - foreach( Mixer* mixer, Mixer::mixers() ) - { -- if ( mixer->getDriverName() == "PulseAudio") -+ if ( !mixer->isDynamic() ) - { -- isPulseAudio = true; -- KAction* action = actionCollection()->addAction( "launch_pavucontrol" ); -- action->setText( i18n( "Audio setup (&Pulseaudio)" ) ); -- connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() )); -+ allDynamic = false; - break; - } - } - -- if (! isPulseAudio ) -+ if (! allDynamic ) - { - QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall ); - QPushButton* _cornerLabelNew = new QPushButton(); -@@ -339,8 +338,11 @@ - - // The following loop is necessary for the case that the user has hidden all views for a Mixer instance. - // Otherwise we would not save the Meta information (step -2- below for that mixer. -- foreach ( Mixer* mixer, Mixer::mixers() ) -- mixerViews[mixer->id()]; // just insert a map entry -+ // We also do not save dynamic mixers (e.g. PulseAudio) -+ foreach ( Mixer* mixer, Mixer::mixers() ) { -+ if ( !mixer->isDynamic() ) -+ mixerViews[mixer->id()]; // just insert a map entry -+ } - - // -1- Save the views themselves - for ( int i=0; icount() ; ++i ) { -@@ -351,8 +353,10 @@ - // Otherwise the user will be confused afer re-plugging the card (as the config was not saved). - mw->saveConfig( KGlobal::config().data() ); - // add the view to the corresponding mixer list, so we can save a views-per-mixer list below -- QStringList& qsl = mixerViews[mw->mixer()->id()]; -- qsl.append(mw->getGuiprof()->getId()); -+ if ( !mw->mixer()->isDynamic() ) { -+ QStringList& qsl = mixerViews[mw->mixer()->id()]; -+ qsl.append(mw->getGuiprof()->getId()); -+ } - } - } - -@@ -539,22 +543,29 @@ - continue; // OK, this mixer already has a profile => skip it - } - // No TAB YET => This should mean KMix is just started, or the user has just plugged in a card -- bool profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line -- QStringList profileList = pconfig.readEntry( mixer->id(), QStringList() ); -+ bool profileListHasKey = false; -+ QStringList profileList; -+ bool aProfileWasAddedSucesufully = false; - -- bool aProfileWasAddedSucesufully = false; -- foreach ( QString profileId, profileList) -- { -- // This handles the profileList form the kmixrc -- kDebug() << "Now searching for profile: " << profileId ; -- GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ### -- if ( guiprof != 0 ) { -- addMixerWidget(mixer->id(), guiprof, -1); -- aProfileWasAddedSucesufully = true; -+ if ( !mixer->isDynamic() ) { -+ // We do not support save profiles for dynamic mixers (i.e. PulseAudio) -+ -+ profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line -+ profileList = pconfig.readEntry( mixer->id(), QStringList() ); -+ -+ foreach ( QString profileId, profileList) -+ { -+ // This handles the profileList form the kmixrc -+ kDebug() << "Now searching for profile: " << profileId ; -+ GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ### -+ if ( guiprof != 0 ) { -+ addMixerWidget(mixer->id(), guiprof, -1); -+ aProfileWasAddedSucesufully = true; -+ } -+ else { -+ kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective."; -+ } - } -- else { -- kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective."; -- } - } - - // The we_need_a_fallback case is a bit tricky. Please ask the author (cesken) before even considering to change the code. -@@ -568,11 +579,17 @@ - - // Lets try a bunch of fallback strategies: - GUIProfile* guiprof = 0; -+ if ( !mixer->isDynamic() ) { -+ // We know that GUIProfile::find() will return 0 if the mixer is dynamic, so don't bother checking. -+ kDebug() << "Attempting to find a card-specific GUI Profile for the mixer " << mixer->id(); - guiprof = GUIProfile::find(mixer, QString("default"), false, false); // ### Card specific profile ### -- if ( guiprof == 0 ) { -- guiprof = GUIProfile::find(mixer, QString("default"), false, true); // ### Card unspecific profile ### -+ if ( guiprof == 0 ) { -+ kDebug() << "Not found. Attempting to find a generic GUI Profile for the mixer " << mixer->id(); -+ guiprof = GUIProfile::find(mixer, QString("default"), false, true); // ### Card unspecific profile ### -+ } - } - if ( guiprof == 0) { -+ kDebug() << "Using fallback GUI Profile for the mixer " << mixer->id(); - // This means there is neither card specific nor card unspecific profile - // This is the case for some backends (as they don't ship profiles). - guiprof = GUIProfile::fallbackProfile(mixer); -@@ -683,8 +700,7 @@ - m_wsMixers->removeTab(idx); - delete kmw; - -- bool isPulseAudio = kmw->mixer()->getDriverName() == "PulseAudio"; -- m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); -+ m_wsMixers->setTabsClosable(!kmw->mixer()->isDynamic() && m_wsMixers->count() > 1); - - saveViewConfig(); - } -@@ -882,8 +898,7 @@ - m_wsMixers->setCurrentWidget(kmw); - } - -- bool isPulseAudio = mixer->getDriverName() == "PulseAudio"; -- m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); -+ m_wsMixers->setTabsClosable(!mixer->isDynamic() && m_wsMixers->count() > 1); - m_dontSetDefaultCardOnStart = false; - - -@@ -1071,12 +1086,6 @@ - KMessageBox::information( 0, m_hwInfoString, i18n("Mixer Hardware Information") ); - } - --void KMixWindow::slotPavucontrolExec() --{ -- QStringList args("pavucontrol"); -- forkExec(args); --} -- - void KMixWindow::slotKdeAudioSetupExec() - { - QStringList args; -@@ -1133,6 +1142,12 @@ - m_defaultCardOnStart = kmw->getGuiprof()->getId(); - // As switching the tab does NOT mean switching the master card, we do not need to update dock icon here. - // It would lead to unnecesary flickering of the (complete) dock area. -+ -+ // We only show the "Configure Channels..." menu item if the mixer is not dynamic -+ ViewBase* view = kmw->currentView(); -+ QAction* action = actionCollection()->action( "toggle_channels_currentview" ); -+ if (view && action) -+ action->setVisible( !view->getMixer()->isDynamic() ); - } - } - -Index: kmix/apps/kmix.h -=================================================================== ---- kmix/apps/kmix.h (revision 1226957) -+++ kmix/apps/kmix.h (revision 1226958) -@@ -136,7 +136,6 @@ - private slots: - void saveConfig(); - void slotHWInfo(); -- void slotPavucontrolExec(); - void slotKdeAudioSetupExec(); - void slotConfigureCurrentView(); - void slotSelectMaster(); -Index: kmix/kmixui.rc -=================================================================== ---- kmix/kmixui.rc (revision 1226957) -+++ kmix/kmixui.rc (revision 1226958) -@@ -17,7 +17,6 @@ - - - -- - - &Help - -Index: kmix/backends/mixer_backend.cpp -=================================================================== ---- kmix/backends/mixer_backend.cpp (revision 1226957) -+++ kmix/backends/mixer_backend.cpp (revision 1226958) -@@ -48,7 +48,7 @@ - bool Mixer_Backend::openIfValid() { - bool valid = false; - int ret = open(); -- if ( ret == 0 && (m_mixDevices.count() > 0 || _mixer->dynamic())) { -+ if ( ret == 0 && (m_mixDevices.count() > 0 || _mixer->isDynamic())) { - valid = true; - // A better ID is now calculated in mixertoolbox.cpp, and set via setID(), - // but we want a somehow usable fallback just in case. -@@ -139,7 +139,7 @@ - return m_mixDevices.at(0); // Backend has NOT set a recommended master. Evil backend => lets help out. - } //first device (if exists) - else { -- if ( !_mixer->dynamic()) { -+ if ( !_mixer->isDynamic()) { - // This should never ever happen, as KMix doe NOT accept soundcards without controls - kError(67100) << "Mixer_Backend::recommendedMaster(): returning invalid master. This is a bug in KMix. Please file a bug report stating how you produced this." << endl; - } -Index: kmix/backends/mixer_pulse.cpp -=================================================================== ---- kmix/backends/mixer_pulse.cpp (revision 1226957) -+++ kmix/backends/mixer_pulse.cpp (revision 1226958) -@@ -36,6 +36,8 @@ - #define KMIXPA_APP_CAPTURE 3 - #define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE - -+#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event" -+ - static unsigned int refcount = 0; - static pa_glib_mainloop *s_mainloop = NULL; - static pa_context *s_context = NULL; -@@ -189,7 +191,7 @@ - - devinfo s; - s.index = s.device_index = i->index; -- s.name = QString(i->name).replace(' ', '_'); -+ s.name = QString::fromUtf8(i->name).replace(' ', '_'); - s.description = QString::fromUtf8(i->description); - s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME)); - s.volume = i->volume; -@@ -242,7 +244,7 @@ - - devinfo s; - s.index = s.device_index = i->index; -- s.name = QString(i->name).replace(' ', '_'); -+ s.name = QString::fromUtf8(i->name).replace(' ', '_'); - s.description = QString::fromUtf8(i->description); - s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME)); - s.volume = i->volume; -@@ -307,26 +309,28 @@ - - const char *t; - if ((t = pa_proplist_gets(i->proplist, "module-stream-restore.id"))) { -- if (strcmp(t, "sink-input-by-media-role:event") == 0) { -+ if (strcmp(t, KMIXPA_EVENT_KEY) == 0) { - kWarning(67100) << "Ignoring sink-input due to it being designated as an event and thus handled by the Event slider"; - return; - } - } - -- QString prefix = QString("%1: ").arg(i18n("Unknown Application")); -+ QString appname = i18n("Unknown Application"); - if (clients.contains(i->client)) -- prefix = QString("%1: ").arg(clients[i->client]); -+ appname = clients[i->client]; - -+ QString prefix = QString("%1: ").arg(appname); -+ - devinfo s; - s.index = i->index; - s.device_index = i->sink; - s.description = prefix + QString::fromUtf8(i->name); -- s.name = QString("stream:") + i->index; -+ s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower(); - s.icon_name = getIconNameFromProplist(i->proplist); - s.volume = i->volume; - s.channel_map = i->channel_map; - s.mute = !!i->mute; -- s.stream_restore_rule = t; -+ s.stream_restore_rule = QString::fromUtf8(t); - - translateMasksAndMaps(s); - -@@ -370,22 +374,24 @@ - return; - } - -- QString prefix = QString("%1: ").arg(i18n("Unknown Application")); -+ QString appname = i18n("Unknown Application"); - if (clients.contains(i->client)) -- prefix = QString("%1: ").arg(clients[i->client]); -+ appname = clients[i->client]; - -+ QString prefix = QString("%1: ").arg(appname); -+ - devinfo s; - s.index = i->index; - s.device_index = i->source; - s.description = prefix + QString::fromUtf8(i->name); -- s.name = QString("stream:") + i->index; -+ s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower(); - s.icon_name = getIconNameFromProplist(i->proplist); - //s.volume = i->volume; - s.volume = captureDevices[i->source].volume; - s.channel_map = i->channel_map; - //s.mute = !!i->mute; - s.mute = captureDevices[i->source].mute; -- s.stream_restore_rule = pa_proplist_gets(i->proplist, "module-stream-restore.id"); -+ s.stream_restore_rule = QString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id")); - - translateMasksAndMaps(s); - -@@ -407,7 +413,7 @@ - } - - --static devinfo create_role_devinfo(const char* name) { -+static devinfo create_role_devinfo(QString name) { - - Q_ASSERT(s_RestoreRules.contains(name)); - -@@ -436,9 +442,10 @@ - - if (eol > 0) { - dec_outstanding(c); -+ - // Special case: ensure that our media events exists. - // On first login by a new users, this wont be in our database so we should create it. -- if (!outputRoles.contains(PA_INVALID_INDEX)) { -+ if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) { - // Create a fake rule - restoreRule rule; - rule.channel_map.channels = 1; -@@ -447,37 +454,56 @@ - rule.volume.values[0] = PA_VOLUME_NORM; - rule.mute = false; - rule.device = ""; -- s_RestoreRules["sink-input-by-media-role:event"] = rule; -+ s_RestoreRules[KMIXPA_EVENT_KEY] = rule; -+ kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds"); -+ } - -- devinfo s = create_role_devinfo("sink-input-by-media-role:event"); -- outputRoles[s.index] = s; -- kDebug(67100) << "Initialising restore rule for new user: " << s.description; -+ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { -+ // If we have rules, it will be created below... but if no rules -+ // then we add it here. -+ if (!outputRoles.contains(PA_INVALID_INDEX)) { -+ devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY); -+ outputRoles[s.index] = s; - -- if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) - s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); -+ } -+ -+ s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate(); - } - -- if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) -- s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate(); - return; - } - -- kDebug(67100) << "Got some info about restore rule: " << i->name << i->device; -+ -+ QString name = QString::fromUtf8(i->name); -+ kDebug(67100) << QString("Got some info about restore rule: '%1' (Device: %2)").arg(name).arg(i->device ? i->device : "None"); - restoreRule rule; - rule.channel_map = i->channel_map; - rule.volume = i->volume; - rule.mute = !!i->mute; - rule.device = i->device; -- s_RestoreRules[i->name] = rule; - -- // We only want to know about Sound Events for now... -- if (strcmp(i->name, "sink-input-by-media-role:event") == 0) { -- devinfo s = create_role_devinfo(i->name); -- bool is_new = !outputRoles.contains(s.index); -- outputRoles[s.index] = s; -+ if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) { -+ // Stream restore rules may not have valid volumes/channel maps (as these are optional) -+ // but we need a valid volume+channelmap for our events sounds so fix it up. -+ rule.channel_map.channels = 1; -+ rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; -+ rule.volume.channels = 1; -+ rule.volume.values[0] = PA_VOLUME_NORM; -+ } - -- if (is_new && s_mixers.contains(KMIXPA_APP_PLAYBACK)) -- s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); -+ s_RestoreRules[name] = rule; -+ -+ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { -+ // We only want to know about Sound Events for now... -+ if (name == KMIXPA_EVENT_KEY) { -+ devinfo s = create_role_devinfo(name); -+ bool is_new = !outputRoles.contains(s.index); -+ outputRoles[s.index] = s; -+ -+ if (is_new) -+ s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); -+ } - } - } - -@@ -788,7 +814,6 @@ - Volume v(dev.chanMask, PA_VOLUME_NORM, PA_VOLUME_MUTED, true, false); - setVolumeFromPulse(v, dev); - MixDevice* md = new MixDevice( _mixer, dev.name, dev.description, dev.icon_name, ms); -- md->setEthereal(true); - md->addPlaybackVolume(v); - md->setMuted(dev.mute); - m_mixDevices.append(md); -@@ -1095,10 +1120,10 @@ - { - restoreRule &rule = s_RestoreRules[iter->stream_restore_rule]; - pa_ext_stream_restore_info info; -- info.name = iter->stream_restore_rule.toAscii().constData(); -+ info.name = iter->stream_restore_rule.toUtf8().constData(); - info.channel_map = rule.channel_map; - info.volume = genVolumeForPulse(*iter, md->playbackVolume()); -- info.device = rule.device.isEmpty() ? NULL : rule.device.toAscii().constData(); -+ info.device = rule.device.isEmpty() ? NULL : rule.device.toUtf8().constData(); - info.mute = (md->isMuted() ? 1 : 0); - - pa_operation* o; -@@ -1153,13 +1178,13 @@ - - // Lookup the stream index. - uint32_t stream_index = PA_INVALID_INDEX; -- const char* stream_restore_rule = NULL; -+ QString stream_restore_rule = ""; - devmap::iterator iter; - devmap *map = get_widget_map(m_devnum); - for (iter = map->begin(); iter != map->end(); ++iter) { - if (iter->name == id) { - stream_index = iter->index; -- stream_restore_rule = iter->stream_restore_rule.isEmpty() ? NULL : iter->stream_restore_rule.toAscii().constData(); -+ stream_restore_rule = iter->stream_restore_rule; - break; - } - } -@@ -1171,12 +1196,12 @@ - - if (destId.isEmpty()) { - // We want to remove any specific device in the stream restore rule. -- if (!stream_restore_rule || !s_RestoreRules.contains(stream_restore_rule)) { -+ if (stream_restore_rule.isEmpty() || !s_RestoreRules.contains(stream_restore_rule)) { - kWarning(67100) << "Mixer_PULSE::moveStream(): Trying to set Automatic on a stream with no rule"; - } else { - restoreRule &rule = s_RestoreRules[stream_restore_rule]; - pa_ext_stream_restore_info info; -- info.name = stream_restore_rule; -+ info.name = stream_restore_rule.toUtf8().constData(); - info.channel_map = rule.channel_map; - info.volume = rule.volume; - info.device = NULL; -@@ -1192,12 +1217,12 @@ - } else { - pa_operation* o; - if (KMIXPA_APP_PLAYBACK == m_devnum) { -- if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) { -+ if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) { - kWarning(67100) << "pa_context_move_sink_input_by_name() failed"; - return false; - } - } else { -- if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) { -+ if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) { - kWarning(67100) << "pa_context_move_source_output_by_name() failed"; - return false; - } diff --git a/extra/keytouch-editor/ChangeLog b/extra/keytouch-editor/ChangeLog deleted file mode 100644 index 0503eb1f7..000000000 --- a/extra/keytouch-editor/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -2008-06-22 Eric Belanger - - * keytouch-editor 3.1.3-1 - * Patched for glibc 2.8 - * Added to [extra] repo - * Added ChangeLog - - diff --git a/extra/kobodeluxe/ChangeLog b/extra/kobodeluxe/ChangeLog deleted file mode 100644 index 08b4c2dec..000000000 --- a/extra/kobodeluxe/ChangeLog +++ /dev/null @@ -1,8 +0,0 @@ -2009-01-06 Eric Belanger - - * kobodeluxe 0.5.1-2 - * Fixed build issue - * Added game group support - * Added .desktop file and icons - * Improved package description - * Added ChangeLog diff --git a/extra/orca/PKGBUILD b/extra/orca/PKGBUILD deleted file mode 100644 index 6c83391d6..000000000 --- a/extra/orca/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 99644 2010-11-15 23:32:08Z ibiru $ -# Maintainer: Jan de Groot -# Contributor: William Rea - -pkgname=orca -pkgver=2.32.1 -pkgrel=1 -pkgdesc="A scriptable screen reader and magnifier" -arch=(i686 x86_64) -license=('LGPL') -url="http://www.gnome.org/projects/orca" -install=orca.install -options=('!libtool') -depends=('pygtk>=2.22.0' 'python2-gconf' 'python2-bonobo' 'python2-libgnome' 'python-wnck' 'dbus-python>=0.83.0' 'at-spi>=1.32.0' 'gnome-speech>=0.4.25' 'gnome-mag>=0.16.0' 'brltty' 'hicolor-icon-theme' 'pyxdg') -makedepends=('intltool') -replaces=('gnopernicus') -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('44da9da70c1b47bc87fda8f3b9da4cc1df9993d92388434f5707d39b5a832629') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make - make DESTDIR="${pkgdir}" install -} diff --git a/extra/orca/orca.install b/extra/orca/orca.install deleted file mode 100644 index 17ca8f78a..000000000 --- a/extra/orca/orca.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/python-qt/PKGBUILD b/extra/python-qt/PKGBUILD deleted file mode 100644 index 43a00111e..000000000 --- a/extra/python-qt/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 110673 2011-02-21 12:42:56Z andrea $ -# Maintainer: Andrea Scarpino - -pkgname=python-qt -pkgver=4.8.3 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://riverbankcomputing.co.uk/software/pyqt/intro" -license=('GPL') -pkgdesc="A set of Python 3 bindings for the Qt toolkit" -depends=('python2-qt' 'python-sip') -optdepends=('phonon: enable audio and video in PyQt applications' - 'qscintilla: QScintilla API' - 'qt-assistant-compat: add PyQt online help in Qt Assistant') -makedepends=('phonon' 'qt-assistant-compat') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('d54fd1c37a74864faf42709c8102f254') - -build() { - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - - python configure.py \ - --confirm-license \ - --qsci-api - - # Thanks Gerardo for the rpath fix - find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - - make -} - -package(){ - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - - # Provided by python2-qt package - rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4} - rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so - rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api -} diff --git a/extra/python-sip/PKGBUILD b/extra/python-sip/PKGBUILD deleted file mode 100644 index 48b2cd96f..000000000 --- a/extra/python-sip/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 110667 2011-02-21 12:01:59Z stephane $ -# Maintainer: Andrea Scarpino - -pkgname=python-sip -pkgver=4.12.1 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/sip/" -license=('custom:"sip"') -pkgdesc="A tool that makes it easy to create Python 3 bindings for C and C++ libraries" -depends=('python2-sip' 'python') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${pkgver}.tar.gz") -md5sums=('0f8e8305b14c1812191de2e0ee22fea9') - -build() { - cd "${srcdir}/sip-${pkgver}" - - python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" - make -} - -package() { - cd "${srcdir}/sip-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - # Provided by python2-sip package - rm "${pkgdir}/usr/bin/sip" -} diff --git a/extra/python2-qt/PKGBUILD b/extra/python2-qt/PKGBUILD deleted file mode 100644 index 41b2354f1..000000000 --- a/extra/python2-qt/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 107404 2011-01-24 17:30:13Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Douglas Soares de Andrade -# Contributor: riai Ben - -pkgname=python2-qt -pkgver=4.8.3 -pkgrel=1 -pkgdesc="A set of Python 2 bindings for the Qt toolkit" -arch=('i686' 'x86_64') -url="http://riverbankcomputing.co.uk/software/pyqt/intro" -license=('GPL') -depends=('qt' 'python2-sip' 'dbus-python') -makedepends=('phonon' 'python-opengl' 'qt-assistant-compat') -optdepends=('phonon: enable audio and video in PyQt applications' - 'python-opengl: enable OpenGL 3D graphics in PyQt applications' - 'qscintilla: QScintilla API' - 'qt-assistant-compat: add PyQt online help in Qt Assistant') -replaces=('pyqt') -source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('d54fd1c37a74864faf42709c8102f254') - -build() { - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - - python2 configure.py \ - --confirm-license \ - -v /usr/share/sip \ - --qsci-api - - # Thanks Gerardo for the rpath fix - find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g' - - make -} - -package(){ - cd "${srcdir}/PyQt-x11-gpl-${pkgver}" - # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR - make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -} diff --git a/extra/python2-sip/PKGBUILD b/extra/python2-sip/PKGBUILD deleted file mode 100644 index d08638428..000000000 --- a/extra/python2-sip/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 107403 2011-01-24 17:30:04Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Douglas Soares de Andrade -# Contributor: riai , Ben - -pkgname=python2-sip -pkgver=4.12.1 -pkgrel=1 -pkgdesc="A tool that makes it easy to create Python 2 bindings for C and C++ libraries" -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/sip/" -license=('custom:"sip"') -depends=('python2') -replaces=('sip') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${pkgver}.tar.gz") -md5sums=('0f8e8305b14c1812191de2e0ee22fea9') - -build() { - cd "${srcdir}/sip-${pkgver}" - - python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" - make -} - -package() { - cd "${srcdir}/sip-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/quota-tools/ChangeLog b/extra/quota-tools/ChangeLog deleted file mode 100644 index 56c760b78..000000000 --- a/extra/quota-tools/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2009-01-07 Eric Belanger - - * quota-tools 3.17-1 - * Upstream update - -2008-05-01 Eric Belanger - - * quota-tools 3.16-1 - * Upstream update diff --git a/extra/rxvt-unicode/rxvt-unicode.png b/extra/rxvt-unicode/rxvt-unicode.png deleted file mode 100644 index 0738a7840..000000000 Binary files a/extra/rxvt-unicode/rxvt-unicode.png and /dev/null differ diff --git a/extra/squid/fix-for-new-cap-headers.patch b/extra/squid/fix-for-new-cap-headers.patch deleted file mode 100644 index ce24681e8..000000000 --- a/extra/squid/fix-for-new-cap-headers.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/tools.c.orig 2009-11-02 10:54:49.000000000 -0500 -+++ src/tools.c 2009-11-02 10:55:05.000000000 -0500 -@@ -44,9 +44,9 @@ - #if HAVE_SYS_CAPABILITY_H - #undef _POSIX_SOURCE - /* Ugly glue to get around linux header madness colliding with glibc */ --#define _LINUX_TYPES_H -+/*#define _LINUX_TYPES_H*/ - #define _LINUX_FS_H --typedef uint32_t __u32; -+/*typedef uint32_t __u32;*/ - #include - #endif - #endif diff --git a/extra/squid/squid-makefiles.patch b/extra/squid/squid-makefiles.patch deleted file mode 100644 index 4cefb89a0..000000000 --- a/extra/squid/squid-makefiles.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Naur squid-2.7.STABLE2-orig/helpers/basic_auth/SMB/Makefile.in squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.in ---- squid-2.7.STABLE2-orig/helpers/basic_auth/SMB/Makefile.in 2007-11-11 20:14:01.000000000 -0500 -+++ squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.in 2008-06-09 21:32:52.000000000 -0400 -@@ -268,7 +268,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - SMB_AUTH_HELPER = smb_auth.sh --SAMBAPREFIX = /usr/local/samba -+SAMBAPREFIX = /usr - SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) - libexec_SCRIPTS = $(SMB_AUTH_HELPER) - smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\" -diff -Naur squid-2.7.STABLE2-orig/src/Makefile.in squid-2.7.STABLE2/src/Makefile.in ---- squid-2.7.STABLE2-orig/src/Makefile.in 2008-01-02 20:16:40.000000000 -0500 -+++ squid-2.7.STABLE2/src/Makefile.in 2008-06-09 21:34:39.000000000 -0400 -@@ -653,13 +653,13 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid -+DEFAULT_PID_FILE = $(localstatedir)/run/squid.pid - DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'` -diff -Naur squid-2.7.STABLE2-orig/src/cf.data.pre squid-2.7.STABLE2/src/cf.data.pre ---- squid-2.7.STABLE2-orig/src/cf.data.pre 2008-05-31 16:49:45.000000000 -0400 -+++ squid-2.7.STABLE2/src/cf.data.pre 2008-06-09 21:35:43.000000000 -0400 -@@ -3749,7 +3749,7 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: proxy - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real -@@ -3763,7 +3763,7 @@ - - NAME: cache_effective_group - TYPE: string --DEFAULT: none -+DEFAULT: proxy - LOC: Config.effectiveGroup - DOC_START - If you want Squid to run with a specific GID regardless of diff --git a/extra/swfdec-mozilla/PKGBUILD b/extra/swfdec-mozilla/PKGBUILD deleted file mode 100644 index d9503119b..000000000 --- a/extra/swfdec-mozilla/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -#$Id: PKGBUILD 17042 2008-10-24 15:55:09Z andyrtr $ -#Maintainer: Jan de Groot - -pkgname=swfdec-mozilla -pkgver=0.8.2 -pkgrel=1 -pkgdesc="free plugin for Mozilla browsers that uses the Swfdec library for playing SWF files" -arch=('i686' 'x86_64') -url="http://swfdec.freedesktop.org" -license=('LGPL') -depends=("swfdec>=$pkgver") -source=(http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/${pkgname}-${pkgver}.tar.gz) -options=('!libtool') -md5sums=('716632e0d35b3c1582c180569ba30346') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static --with-plugin-dir=/usr/lib/mozilla/plugins/ - make || return 1 - make DESTDIR=${startdir}/pkg install -} diff --git a/extra/swfdec/PKGBUILD b/extra/swfdec/PKGBUILD deleted file mode 100644 index 974c85aa9..000000000 --- a/extra/swfdec/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -#$Id: PKGBUILD 64546 2010-01-21 03:43:49Z eric $ -#Maintainer: Andreas Radke - -pkgname=swfdec -pkgver=0.8.4 -pkgrel=2 -pkgdesc="free library for decoding and rendering Flash animations" -arch=('i686' 'x86_64') -url="http://swfdec.freedesktop.org" -license=('LGPL') -depends=('alsa-lib>=1.0.18' 'liboil>=0.3.15' 'gtk2>=2.14.6' 'libsoup>=2.24.2.1-1') -makedepends=('pkgconfig' 'gstreamer0.10-ffmpeg>=0.10.6-1') -optdepends=('gstreamer0.10-base: required for various audio and video formats' - 'gstreamer0.10-ffmpeg: most common audio/video format for internet flash') -source=(http://swfdec.freedesktop.org/download/swfdec/0.8/${pkgname}-${pkgver}.tar.gz) -md5sums=('aece501d0e73f3e564200a44ec03c385') -options=('!libtool' '!emptydirs') - -build() { - cd ${startdir}/src/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static --enable-gtk \ - --enable-gstreamer --enable-soup --with-audio=alsa - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 -} diff --git a/extra/xfce4-xfapplet-plugin/PKGBUILD b/extra/xfce4-xfapplet-plugin/PKGBUILD deleted file mode 100644 index 8ff2ccebd..000000000 --- a/extra/xfce4-xfapplet-plugin/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 105796 2011-01-11 20:47:13Z andyrtr $ -# Maintainer: -# Contributor: Tobias Kieslich - -pkgname=xfce4-xfapplet-plugin -pkgver=0.1.0 -pkgrel=7 -pkgdesc="plugin that allows to use gnome applets in the Xfce4 panel" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://xfce-goodies.berlios.de/" -groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'gnome-panel' 'gnome-panel-bonobo') -makedepends=('') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6a06c44b18a97626f44a240ad3bc3244') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/ \ - --localstatedir=/var \ - --disable-static \ - --disable-debug - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/alpine/2.00-lpam.patch b/staging/alpine/2.00-lpam.patch deleted file mode 100644 index 69e66d7ef..000000000 --- a/staging/alpine/2.00-lpam.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- alpine-2.00.orig/alpine/Makefile.in -+++ alpine-2.00/alpine/Makefile.in -@@ -169,7 +169,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lpam - LIBTOOL = @LIBTOOL@ - LN = @LN@ - LN_S = @LN_S@ - LTLIBICONV = @LTLIBICONV@ - LTLIBINTL = @LTLIBINTL@ diff --git a/staging/alpine/CVE-2008-5514.patch b/staging/alpine/CVE-2008-5514.patch deleted file mode 100644 index 594bea0b2..000000000 --- a/staging/alpine/CVE-2008-5514.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- alpine-2.00/imap/src/c-client/rfc822.c -+++ alpine-2.00/imap/src/c-client/rfc822.c -@@ -1351,6 +1351,7 @@ - - static long rfc822_output_char (RFC822BUFFER *buf,int c) - { -+ if ((buf->cur == buf->end) && !rfc822_output_flush (buf)) return NIL; - *buf->cur++ = c; /* add character, soutr buffer if full */ - return (buf->cur == buf->end) ? rfc822_output_flush (buf) : LONGT; - } -@@ -1374,7 +1375,8 @@ - len -= i; - } - /* soutr buffer now if full */ -- if (len && !rfc822_output_flush (buf)) return NIL; -+ if ((len || (buf->cur == buf->end)) && !rfc822_output_flush (buf)) -+ return NIL; - } - return LONGT; - } diff --git a/staging/alpine/PKGBUILD b/staging/alpine/PKGBUILD deleted file mode 100644 index 6b2f9ee73..000000000 --- a/staging/alpine/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 121113 2011-04-29 02:56:31Z eric $ -# Maintainer: Eric Bélanger - -pkgname=alpine -pkgver=2.00 -pkgrel=13 -_patchlevel=79 -pkgdesc="The Apache-licensed PINE (a tool for reading, sending, and managing electronic messages)" -arch=('i686' 'x86_64') -url="http://www.washington.edu/alpine/" -license=('APACHE') -depends=('libldap' 'krb5' 'gettext') -optdepends=('aspell: for spell-checking support') -provides=('pine') -conflicts=('pine') -replaces=('pine') -options=('!makeflags') -source=(ftp://ftp.cac.washington.edu/${pkgname}/${pkgname}.tar.bz2 \ - http://staff.washington.edu/chappa/alpine/patches/alpine-${pkgver}/all_${_patchlevel}.patch.gz \ - 2.00-lpam.patch CVE-2008-5514.patch) -md5sums=('84e44cbf71ed674800a5d57eed9c1c52' - 'd7dffd121c9a1cac4c458c0ff71df1ce' - 'cd3911c16fc6a072e853c0ccfc35857c' - '1b52a54a656979116c09fb1d948a4325') -sha1sums=('dcbd3c5419954f484ccf706feaba31ce48cdebc4' - 'd3acbf0e46c50feb2e822ef3bdc0a0f43c007294' - '1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3' - 'bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../all_${_patchlevel}.patch - patch -p1 < ../2.00-lpam.patch - patch -p1 < ../CVE-2008-5514.patch - ./configure --prefix=/usr --without-passfile --without-tcl \ - --disable-shared --with-system-pinerc=/etc/alpine.d/pine.conf \ - --with-system-fixed-pinerc=/etc/alpine.d/pine.conf.fixed - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/anjuta/PKGBUILD b/staging/anjuta/PKGBUILD deleted file mode 100644 index 98a1c6730..000000000 --- a/staging/anjuta/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 122589 2011-05-04 18:41:26Z ibiru $ -# Maintainer: Andreas Radke -# Contributor: Harley Laue - -pkgname=anjuta -pkgver=3.0.1.0 -pkgrel=2 -pkgdesc="GNOME Integrated Development Environment (IDE)" -arch=('i686' 'x86_64') -license=('GPL') -depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda' - 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz' - 'python2' 'shared-mime-info' 'desktop-file-utils') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -url="http://anjuta.sourceforge.net/" -install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -options=('!libtool' '!emptydirs') -sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261') - -build() { - cd "${srcdir}/anjuta-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package(){ - cd "${srcdir}/anjuta-${pkgver}" - - make DESTDIR="${pkgdir}" install - - sed -i "1s|#!/usr/bin/python$|&2|" \ - $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py -} diff --git a/staging/anjuta/anjuta.install b/staging/anjuta/anjuta.install deleted file mode 100644 index c6fcfec11..000000000 --- a/staging/anjuta/anjuta.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall anjuta - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/cifs-utils/PKGBUILD b/staging/cifs-utils/PKGBUILD deleted file mode 100644 index 9c33cefba..000000000 --- a/staging/cifs-utils/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 122574 2011-05-04 17:23:19Z ibiru $ -# Maintainer: Tobias Powalowski -pkgname=cifs-utils -pkgver=4.9 -pkgrel=3 -pkgdesc="CIFS filesystem user-space tools" -arch=(i686 x86_64) -url="http://wiki.samba.org/index.php/LinuxCIFS_utils" -license=('GPL') -depends=('libcap' 'keyutils' 'krb5' 'talloc') -source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2) -md5sums=('908d904e6b9e58f09f530de151a88ef8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm -r $pkgdir/usr/bin - # set mount.cifs uid, to enable none root mounting form fstab - chmod +s $pkgdir/sbin/mount.cifs -} diff --git a/staging/cups/PKGBUILD b/staging/cups/PKGBUILD deleted file mode 100644 index 64ab5d109..000000000 --- a/staging/cups/PKGBUILD +++ /dev/null @@ -1,110 +0,0 @@ -# $Id: PKGBUILD 121078 2011-04-29 00:03:07Z stephane $ -# Maintainer: Andreas Radke - -pkgbase="cups" -pkgname=('libcups' 'cups') -pkgver=1.4.6 -pkgrel=2 -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.cups.org/" -makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' - 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme') -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2 - cups-avahi.patch - cups cups.logrotate cups.pam) -#options=('!emptydirs') -md5sums=('de8fb5a29c36554925c0c6a6e2c0dae1' - '8ebd390197501ffd709f0ee546937fd5' - '5c85b7d8d2ddd02c2c64955cebbf55ea' - 'f861b18f4446c43918c8643dcbbd7f6d' - '96f82c38f3f540b53f3e5144900acf17') - -# move client.conf man page for next update to the client pkg. - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - # Avahi support in the dnssd backend. patch from Fedora - patch -Np1 -i ${srcdir}/cups-avahi.patch || return 1 - - # Rebuild configure script for --enable-avahi. - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \ - --with-cups-user=daemon --with-cups-group=lp --enable-pam=yes \ - --disable-ldap --libdir=/usr/lib --enable-raw-printing \ - --enable-dbus --with-dbusdir=/etc/dbus-1 --enable-ssl=yes --enable-gnutls --disable-threads --enable-avahi\ - --with-php=/usr/bin/php-cgi --with-pdftops=pdftops --with-optim="$CFLAGS" - make || return 1 -} - -package_libcups() { -pkgdesc="The CUPS Printing System - client libraries and headers" -depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-headers install-libs || return 1 - # put this into the libs pkg to make other software find the libs(no pkg-config file included) - mkdir -p ${pkgdir}/usr/bin - install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config -} - -package_cups() { -pkgdesc="The CUPS Printing System - deamon package" -install=cups.install -backup=(etc/cups/cupsd.conf - etc/cups/mime.convs - etc/cups/mime.types - etc/cups/snmp.conf - etc/cups/printers.conf - etc/cups/classes.conf - etc/cups/client.conf - etc/cups/subscriptions.conf - etc/dbus-1/system.d/cups.conf - etc/logrotate.d/cups - etc/pam.d/cups - etc/xinetd.d/cups-lpd) -depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme') -optdepends=('php: for included phpcups.so module') - - cd ${srcdir}/${pkgbase}-${pkgver} - make BUILDROOT=${pkgdir} install-data install-exec || return 1 - - # this one we ship in the libcups pkg - rm -f ${pkgdir}/usr/bin/cups-config - - # kill the sysv stuff - rm -rf ${pkgdir}/etc/rc*.d - rm -rf ${pkgdir}/etc/init.d - install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups - install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups - install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups - - # fix perms on /var/spool and /etc - chmod 755 ${pkgdir}/var/spool - chmod 755 ${pkgdir}/etc - - # serial backend needs to run as root (http://bugs.archlinux.org/task/20396) - chmod 700 ${pkgdir}/usr/lib/cups/backend/serial - - # install ssl directory where to store the certs, solves some samba issues - install -dm700 -g lp ${pkgdir}/etc/cups/ssl - install -dm511 -g lp ${pkgdir}/var/run/cups/certs - - # install some more configuration files that will get filled by cupsd - touch ${pkgdir}/etc/cups/printers.conf - touch ${pkgdir}/etc/cups/classes.conf - touch ${pkgdir}/etc/cups/client.conf - echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf - echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf - touch ${pkgdir}/etc/cups/subscriptions.conf - chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf} - - # fix .desktop file - sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop - - # compress some driver files, adopted from Fedora - find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f -} diff --git a/staging/cups/cups b/staging/cups/cups deleted file mode 100755 index 4afaf5a7c..000000000 --- a/staging/cups/cups +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/cupsd` -case "$1" in - start) - stat_busy "Starting CUPS Daemon" - [ -z "$PID" ] && /usr/sbin/cupsd - if [ $? -gt 0 ]; then - stat_fail - else - echo $(pidof -o %PPID -x /usr/sbin/cupsd) > /var/run/cups.pid - add_daemon cups - stat_done - fi - ;; - stop) - stat_busy "Stopping CUPS Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/cups.pid - rm_daemon cups - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/cups/cups-avahi.patch b/staging/cups/cups-avahi.patch deleted file mode 100644 index cf1056a75..000000000 --- a/staging/cups/cups-avahi.patch +++ /dev/null @@ -1,1089 +0,0 @@ -diff -up cups-1.4.5/backend/dnssd.c.avahi cups-1.4.5/backend/dnssd.c ---- cups-1.4.5/backend/dnssd.c.avahi 2009-08-08 00:27:12.000000000 +0200 -+++ cups-1.4.5/backend/dnssd.c 2010-11-12 13:13:31.000000000 +0100 -@@ -22,6 +22,7 @@ - * exec_backend() - Execute the backend that corresponds to the - * resolved service name. - * get_device() - Create or update a device. -+* find_device() - * query_callback() - Process query data. - * sigterm_handler() - Handle termination signals... - * unquote() - Unquote a name string. -@@ -33,7 +34,18 @@ - - #include "backend-private.h" - #include --#include -+#ifdef HAVE_DNSSD -+# include -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include -+# include -+# include -+# include -+# include -+# include -+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX -+#endif /* HAVE_AVAHI */ - - - /* -@@ -52,7 +64,12 @@ typedef enum - - typedef struct - { -+#ifdef HAVE_DNSSD - DNSServiceRef ref; /* Service reference for resolve */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ int resolved; /* Did we resolve the device? */ -+#endif /* HAVE_AVAHI */ - char *name, /* Service name */ - *domain, /* Domain name */ - *fullName, /* Full name */ -@@ -64,6 +81,20 @@ typedef struct - sent; /* Did we list the device? */ - } cups_device_t; - -+typedef struct -+{ -+ char key[256]; -+ char value[256]; -+ -+#ifdef HAVE_DNSSD -+ const uint8_t *data; -+ const uint8_t *datanext; -+ const uint8_t *dataend; -+#else /* HAVE_AVAHI */ -+ AvahiStringList *txt; -+#endif /* HAVE_DNSSD */ -+} cups_txt_records_t; -+ - - /* - * Local globals... -@@ -77,6 +108,7 @@ static int job_canceled = 0; - * Local functions... - */ - -+#ifdef HAVE_DNSSD - static void browse_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -92,12 +124,6 @@ static void browse_local_callback(DNSSe - const char *regtype, - const char *replyDomain, - void *context); --static int compare_devices(cups_device_t *a, cups_device_t *b); --static void exec_backend(char **argv); --static cups_device_t *get_device(cups_array_t *devices, -- const char *serviceName, -- const char *regtype, -- const char *replyDomain); - static void query_callback(DNSServiceRef sdRef, - DNSServiceFlags flags, - uint32_t interfaceIndex, -@@ -106,9 +132,111 @@ static void query_callback(DNSServiceRe - uint16_t rrclass, uint16_t rdlen, - const void *rdata, uint32_t ttl, - void *context); -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+static void avahi_client_callback (AvahiClient *client, -+ AvahiClientState state, -+ void *context); -+static void avahi_browse_callback (AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey); -+static int compare_devices(cups_device_t *a, cups_device_t *b); -+static void exec_backend(char **argv); -+static cups_device_t *get_device(cups_array_t *devices, -+ const char *serviceName, -+ const char *regtype, -+ const char *replyDomain); - static void sigterm_handler(int sig); - static void unquote(char *dst, const char *src, size_t dstsize); - -+#ifdef HAVE_AVAHI -+static AvahiSimplePoll *simple_poll = NULL; -+static int avahi_got_callback; -+#endif /* HAVE_AVAHI */ -+ -+ -+/* -+ * cups_txt_records_t access functions -+ */ -+static cups_txt_records_t * -+next_txt_record (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ txt->data = txt->datanext; -+#else /* HAVE_AVAHI */ -+ txt->txt = avahi_string_list_get_next (txt->txt); -+ if (txt->txt == NULL) -+ return NULL; -+#endif /* HAVE_DNSSD */ -+ -+ return txt; -+} -+ -+static int -+parse_txt_record_pair (cups_txt_records_t *txt) -+{ -+#ifdef HAVE_DNSSD -+ uint8_t datalen; -+ uint8_t *data = txt->data; -+ char *ptr; -+ -+ /* -+ * Read a key/value pair starting with an 8-bit length. Since the -+ * length is 8 bits and the size of the key/value buffers is 256, we -+ * don't need to check for overflow... -+ */ -+ -+ datalen = *data++; -+ if (!datalen || (data + datalen) >= txt->dataend) -+ return NULL; -+ txt->datanext = data + datalen; -+ -+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++) -+ *ptr++ = *data; -+ *ptr = '\0'; -+ -+ if (data < txt->datanext && *data == '=') -+ { -+ data++; -+ -+ if (data < datanext) -+ memcpy (txt->value, data, txt->datanext - data); -+ value[txt->datanext - data] = '\0'; -+ } -+ else -+ return 1; -+#else /* HAVE_AVAHI */ -+ char *key, *value; -+ size_t len; -+ avahi_string_list_get_pair (txt->txt, &key, &value, &len); -+ if (len > sizeof (txt->value) - 1) -+ len = sizeof (txt->value) - 1; -+ -+ memcpy (txt->value, value, len); -+ txt->value[len] = '\0'; -+ len = strlen (key); -+ if (len > sizeof (txt->key) - 1) -+ len = sizeof (txt->key) - 1; -+ -+ memcpy (txt->key, key, len); -+ txt->key[len] = '\0'; -+ avahi_free (key); -+ avahi_free (value); -+#endif /* HAVE_AVAHI */ -+ -+ return 0; -+} - - /* - * 'main()' - Browse for printers. -@@ -119,6 +247,13 @@ main(int argc, /* I - Number of comm - char *argv[]) /* I - Command-line arguments */ - { - const char *name; /* Backend name */ -+ cups_array_t *devices; /* Device array */ -+ cups_device_t *device; /* Current device */ -+ char uriName[1024]; /* Unquoted fullName for URI */ -+#ifdef HAVE_DNSSD -+ int fd; /* Main file descriptor */ -+ fd_set input; /* Input set for select() */ -+ struct timeval timeout; /* Timeout for select() */ - DNSServiceRef main_ref, /* Main service reference */ - fax_ipp_ref, /* IPP fax service reference */ - ipp_ref, /* IPP service reference */ -@@ -130,12 +265,11 @@ main(int argc, /* I - Number of comm - pdl_datastream_ref, /* AppSocket service reference */ - printer_ref, /* LPD service reference */ - riousbprint_ref; /* Remote IO service reference */ -- int fd; /* Main file descriptor */ -- fd_set input; /* Input set for select() */ -- struct timeval timeout; /* Timeout for select() */ -- cups_array_t *devices; /* Device array */ -- cups_device_t *device; /* Current device */ -- char uriName[1024]; /* Unquoted fullName for URI */ -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ AvahiClient *client; -+ int error; -+#endif /* HAVE_AVAHI */ - #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) - struct sigaction action; /* Actions for POSIX signals */ - #endif /* HAVE_SIGACTION && !HAVE_SIGSET */ -@@ -194,6 +328,49 @@ main(int argc, /* I - Number of comm - * Browse for different kinds of printers... - */ - -+#ifdef HAVE_AVAHI -+ if ((simple_poll = avahi_simple_poll_new ()) == NULL) -+ { -+ perror ("ERROR: Unable to create avahi simple poll object"); -+ return (1); -+ } -+ -+ client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_client_callback, NULL, &error); -+ if (!client) -+ { -+ perror ("ERROR: Unable to create avahi client"); -+ return (1); -+ } -+ -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_fax-ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_ipp-tls._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_pdl-datastream._tcp", -+ NULL, 0, -+ avahi_browse_callback, -+ devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_printer._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, -+ "_riousbprint._tcp", NULL, 0, -+ avahi_browse_callback, devices); -+#endif /* HAVE_AVAHI */ -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError) - { - perror("ERROR: Unable to create service connection"); -@@ -245,6 +422,7 @@ main(int argc, /* I - Number of comm - riousbprint_ref = main_ref; - DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0, - "_riousbprint._tcp", NULL, browse_callback, devices); -+#endif /* HAVE_DNSSD */ - - /* - * Loop until we are killed... -@@ -252,6 +430,9 @@ main(int argc, /* I - Number of comm - - while (!job_canceled) - { -+ int announce = 0; -+ -+#ifdef HAVE_DNSSD - FD_ZERO(&input); - FD_SET(fd, &input); - -@@ -271,11 +452,35 @@ main(int argc, /* I - Number of comm - } - else - { -+ announce = 1; -+ } -+#else /* HAVE_AVAHI */ -+ int r; -+ avahi_got_callback = 0; -+ r = avahi_simple_poll_iterate (simple_poll, 1); -+ if (r != 0 && r != EINTR) -+ { -+ /* -+ * We've been told to exit the loop. Perhaps the connection to -+ * avahi failed. -+ */ -+ -+ break; -+ } -+ -+ if (avahi_got_callback) -+ announce = 1; -+#endif /* HAVE_DNSSD */ -+ -+ if (announce) -+ { - /* - * Announce any devices we've found... - */ - -+#ifdef HAVE_DNSSD - DNSServiceErrorType status; /* DNS query status */ -+#endif /* HAVE_DNSSD */ - cups_device_t *best; /* Best matching device */ - char device_uri[1024]; /* Device URI */ - int count; /* Number of queries */ -@@ -285,6 +490,7 @@ main(int argc, /* I - Number of comm - best = NULL, count = 0; - device; - device = (cups_device_t *)cupsArrayNext(devices)) -+#ifdef HAVE_DNSSD - if (!device->ref && !device->sent) - { - /* -@@ -313,14 +519,23 @@ main(int argc, /* I - Number of comm - count ++; - } - } -- else if (!device->sent) -+ else -+#endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+ if (!device->resolved) -+ continue; -+ else -+#endif /* HAVE_AVAHI */ -+ if (!device->sent) - { -+#ifdef HAVE_DNSSD - /* - * Got the TXT records, now report the device... - */ - - DNSServiceRefDeallocate(device->ref); - device->ref = 0; -+#endif /* HAVE_DNSSD */ - - if (!best) - best = device; -@@ -372,6 +587,7 @@ main(int argc, /* I - Number of comm - * 'browse_callback()' - Browse devices. - */ - -+#ifdef HAVE_DNSSD - static void - browse_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -405,12 +621,14 @@ browse_callback( - - get_device((cups_array_t *)context, serviceName, regtype, replyDomain); - } -+#endif /* HAVE_DNSSD */ - - - /* - * 'browse_local_callback()' - Browse local devices. - */ - -+#ifdef HAVE_DNSSD - static void - browse_local_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -456,6 +674,7 @@ browse_local_callback( - device->fullName); - device->sent = 1; - } -+#endif /* HAVE_DNSSD */ - - - /* -@@ -528,6 +747,32 @@ exec_backend(char **argv) /* I - Comman - exit(CUPS_BACKEND_STOP); - } - -+static int -+device_type (const char *regtype) -+{ -+#ifdef HAVE_AVAHI -+ if (!strcmp(regtype, "_ipp._tcp") || -+ !strcmp(regtype, "_ipp-tls._tcp")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#else -+ if (!strcmp(regtype, "_ipp._tcp.") || -+ !strcmp(regtype, "_ipp-tls._tcp.")) -+ return (CUPS_DEVICE_IPP); -+ else if (!strcmp(regtype, "_fax-ipp._tcp.")) -+ return (CUPS_DEVICE_FAX_IPP); -+ else if (!strcmp(regtype, "_printer._tcp.")) -+ return (CUPS_DEVICE_PRINTER); -+ else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -+ return (CUPS_DEVICE_PDL_DATASTREAM); -+#endif /* HAVE_AVAHI */ -+ -+ return (CUPS_DEVICE_RIOUSBPRINT); -+} -+ - - /* - * 'get_device()' - Create or update a device. -@@ -550,18 +795,7 @@ get_device(cups_array_t *devices, /* I - - */ - - key.name = (char *)serviceName; -- -- if (!strcmp(regtype, "_ipp._tcp.") || -- !strcmp(regtype, "_ipp-tls._tcp.")) -- key.type = CUPS_DEVICE_IPP; -- else if (!strcmp(regtype, "_fax-ipp._tcp.")) -- key.type = CUPS_DEVICE_FAX_IPP; -- else if (!strcmp(regtype, "_printer._tcp.")) -- key.type = CUPS_DEVICE_PRINTER; -- else if (!strcmp(regtype, "_pdl-datastream._tcp.")) -- key.type = CUPS_DEVICE_PDL_DATASTREAM; -- else -- key.type = CUPS_DEVICE_RIOUSBPRINT; -+ key.type = device_type (regtype); - - for (device = cupsArrayFind(devices, &key); - device; -@@ -581,8 +815,14 @@ get_device(cups_array_t *devices, /* I - - free(device->domain); - device->domain = strdup(replyDomain); - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, device->name, regtype, - replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - free(device->fullName); - device->fullName = strdup(fullName); - } -@@ -602,6 +842,9 @@ get_device(cups_array_t *devices, /* I - - device->domain = strdup(replyDomain); - device->type = key.type; - device->priority = 50; -+#ifdef HAVE_AVAHI -+ device->resolved = 0; -+#endif /* HAVE_AVAHI */ - - cupsArrayAdd(devices, device); - -@@ -609,7 +852,13 @@ get_device(cups_array_t *devices, /* I - - * Set the "full name" of this service, which is used for queries... - */ - -+#ifdef HAVE_DNSSD - DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain); -+#else /* HAVE_AVAHI */ -+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName, -+ serviceName, regtype, replyDomain); -+#endif /* HAVE_DNSSD */ -+ - device->fullName = strdup(fullName); - - return (device); -@@ -620,6 +869,7 @@ get_device(cups_array_t *devices, /* I - - * 'query_callback()' - Process query data. - */ - -+#ifdef HAVE_DNSSD - static void - query_callback( - DNSServiceRef sdRef, /* I - Service reference */ -@@ -639,7 +889,7 @@ query_callback( - *ptr; /* Pointer into string */ - cups_device_t dkey, /* Search key */ - *device; /* Device */ -- -+ cups_txt_records_t txt; - - fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, " - "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", " -@@ -673,84 +923,212 @@ query_callback( - if ((ptr = strstr(name, "._")) != NULL) - *ptr = '\0'; - -- if (strstr(fullName, "_ipp._tcp.") || -- strstr(fullName, "_ipp-tls._tcp.")) -- dkey.type = CUPS_DEVICE_IPP; -- else if (strstr(fullName, "_fax-ipp._tcp.")) -- dkey.type = CUPS_DEVICE_FAX_IPP; -- else if (strstr(fullName, "_printer._tcp.")) -- dkey.type = CUPS_DEVICE_PRINTER; -- else if (strstr(fullName, "_pdl-datastream._tcp.")) -- dkey.type = CUPS_DEVICE_PDL_DATASTREAM; -+ dkey.type = device_type (fullName); -+ -+ txt.data = rdata; -+ txt.dataend = rdata + rdlen; -+ device = find_device ((cups_array_t *) context, &txt, &dkey); -+ if (!device) -+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+} -+#endif /* HAVE_DNSSD */ -+ -+#ifdef HAVE_AVAHI -+static void -+avahi_client_callback(AvahiClient *client, -+ AvahiClientState state, -+ void *context) -+{ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ { -+ fprintf (stderr, "ERROR: Avahi connection failed\n"); -+ avahi_simple_poll_quit (simple_poll); -+ } -+} -+ -+static void -+avahi_query_callback(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client; -+ cups_device_t key, -+ *device; -+ char uqname[1024], -+ *ptr; -+ cups_txt_records_t txtr; -+ -+ client = avahi_service_resolver_get_client (resolver); -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ if (event == AVAHI_RESOLVER_FAILURE) -+ { -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ } -+ -+ avahi_service_resolver_free (resolver); -+ return; -+ } -+ -+ /* -+ * Set search key for device. -+ */ -+ -+ key.name = uqname; -+ unquote (uqname, name, sizeof (uqname)); -+ if ((ptr = strstr(name, "._")) != NULL) -+ *ptr = '\0'; -+ -+ key.domain = (char *) domain; -+ key.type = device_type (type); -+ -+ /* -+ * Find the device and the the TXT information. -+ */ -+ -+ txtr.txt = txt; -+ device = find_device ((cups_array_t *) context, &txtr, &key); -+ if (device) -+ { -+ /* -+ * Let the main loop know to announce the device. -+ */ -+ -+ device->resolved = 1; -+ avahi_got_callback = 1; -+ } - else -- dkey.type = CUPS_DEVICE_RIOUSBPRINT; -+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name); -+ -+ avahi_service_resolver_free (resolver); -+} -+ -+static void -+avahi_browse_callback(AvahiServiceBrowser *browser, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiBrowserEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ AvahiClient *client = avahi_service_browser_get_client (browser); -+ -+ switch (event) -+ { -+ case AVAHI_BROWSER_FAILURE: -+ fprintf (stderr, "ERROR: %s\n", -+ avahi_strerror (avahi_client_errno (client))); -+ avahi_simple_poll_quit (simple_poll); -+ return; -+ -+ case AVAHI_BROWSER_NEW: -+ /* -+ * This object is new on the network. -+ */ -+ -+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL) -+ { -+ /* -+ * This comes from the local machine so ignore it. -+ */ -+ -+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name); -+ } -+ else -+ { -+ /* -+ * Create a device entry for it if it doesn't yet exist. -+ */ -+ -+ get_device ((cups_array_t *)context, name, type, domain); -+ -+ /* -+ * Now look for a TXT entry. -+ */ -+ -+ if (avahi_service_resolver_new (client, interface, protocol, -+ name, type, domain, -+ AVAHI_PROTO_UNSPEC, 0, -+ avahi_query_callback, context) == NULL) -+ { -+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n", -+ name, avahi_strerror (avahi_client_errno (client))); -+ } -+ } -+ -+ break; - -- for (device = cupsArrayFind(devices, &dkey); -+ case AVAHI_BROWSER_REMOVE: -+ case AVAHI_BROWSER_ALL_FOR_NOW: -+ case AVAHI_BROWSER_CACHE_EXHAUSTED: -+ break; -+ } -+} -+#endif /* HAVE_AVAHI */ -+ -+static cups_device_t * -+find_device (cups_array_t *devices, -+ cups_txt_records_t *txt, -+ cups_device_t *dkey) -+{ -+ cups_device_t *device; -+ char *ptr; -+ -+ for (device = cupsArrayFind(devices, dkey); - device; - device = cupsArrayNext(devices)) - { -- if (strcasecmp(device->name, dkey.name) || -- strcasecmp(device->domain, dkey.domain)) -+ if (strcasecmp(device->name, dkey->name) || -+ strcasecmp(device->domain, dkey->domain)) - { - device = NULL; - break; - } -- else if (device->type == dkey.type) -+ else if (device->type == dkey->type) - { - /* - * Found it, pull out the priority and make and model from the TXT - * record and save it... - */ - -- const uint8_t *data, /* Pointer into data */ -- *datanext, /* Next key/value pair */ -- *dataend; /* End of entire TXT record */ -- uint8_t datalen; /* Length of current key/value pair */ -- char key[256], /* Key string */ -- value[256], /* Value string */ -- make_and_model[512], -+ char make_and_model[512], - /* Manufacturer and model */ - model[256], /* Model */ -- device_id[2048];/* 1284 device ID */ -- -+ device_id[2048]; /* 1284 device ID */ - - device_id[0] = '\0'; - make_and_model[0] = '\0'; - - strcpy(model, "Unknown"); - -- for (data = rdata, dataend = data + rdlen; -- data < dataend; -- data = datanext) -+ for (;;) - { -- /* -- * Read a key/value pair starting with an 8-bit length. Since the -- * length is 8 bits and the size of the key/value buffers is 256, we -- * don't need to check for overflow... -- */ -- -- datalen = *data++; -- -- if (!datalen || (data + datalen) >= dataend) -- break; -- -- datanext = data + datalen; -+ char *key; -+ char *value; - -- for (ptr = key; data < datanext && *data != '='; data ++) -- *ptr++ = *data; -- *ptr = '\0'; -- -- if (data < datanext && *data == '=') -- { -- data ++; -- -- if (data < datanext) -- memcpy(value, data, datanext - data); -- value[datanext - data] = '\0'; -- } -- else -- continue; -+ if (parse_txt_record_pair (txt)) -+ goto next; - -+ key = txt->key; -+ value = txt->value; - if (!strncasecmp(key, "usb_", 4)) - { - /* -@@ -805,6 +1183,10 @@ query_callback( - if (device->type == CUPS_DEVICE_PRINTER) - device->sent = 1; - } -+ -+ next: -+ if (next_txt_record (txt) == NULL) -+ break; - } - - if (device->device_id) -@@ -854,11 +1236,9 @@ query_callback( - } - } - -- if (!device) -- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName); -+ return device; - } - -- - /* - * 'sigterm_handler()' - Handle termination signals... - */ -diff -up cups-1.4.5/config.h.in.avahi cups-1.4.5/config.h.in ---- cups-1.4.5/config.h.in.avahi 2010-08-13 06:11:46.000000000 +0200 -+++ cups-1.4.5/config.h.in 2010-11-12 13:13:31.000000000 +0100 -@@ -344,6 +344,13 @@ - - - /* -+ * Do we have Avahi for DNS Service Discovery? -+ */ -+ -+#undef HAVE_AVAHI -+ -+ -+/* - * Do we have ? - */ - -diff -up cups-1.4.5/config-scripts/cups-dnssd.m4.avahi cups-1.4.5/config-scripts/cups-dnssd.m4 ---- cups-1.4.5/config-scripts/cups-dnssd.m4.avahi 2009-08-29 00:54:34.000000000 +0200 -+++ cups-1.4.5/config-scripts/cups-dnssd.m4 2010-11-12 13:13:31.000000000 +0100 -@@ -27,6 +27,21 @@ AC_ARG_WITH(dnssd-includes, [ --with-dn - DNSSDLIBS="" - DNSSD_BACKEND="" - -+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no], -+ [if test x$enable_avahi = xyes; then -+ AC_MSG_CHECKING(for Avahi) -+ if $PKGCONFIG --exists avahi-client; then -+ AC_MSG_RESULT(yes) -+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`" -+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`" -+ DNSSD_BACKEND="dnssd" -+ AC_DEFINE(HAVE_AVAHI) -+ enable_dnssd=no -+ else -+ AC_MSG_RESULT(no) -+ fi -+ fi]) -+ - if test x$enable_dnssd != xno; then - AC_CHECK_HEADER(dns_sd.h, [ - case "$uname" in -diff -up cups-1.4.5/cups/http-support.c.avahi cups-1.4.5/cups/http-support.c ---- cups-1.4.5/cups/http-support.c.avahi 2010-10-02 00:40:38.000000000 +0200 -+++ cups-1.4.5/cups/http-support.c 2010-11-12 13:28:45.000000000 +0100 -@@ -55,6 +55,11 @@ - # include - # include - #endif /* HAVE_DNSSD */ -+#ifdef HAVE_AVAHI -+# include -+# include -+# include -+#endif /* HAVE_AVAHI */ - - - /* -@@ -121,6 +126,24 @@ static void resolve_callback(DNSService - void *context); - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void avahi_resolve_uri_client_cb(AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll); -+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context); -+#endif /* HAVE_AVAHI */ - - /* - * 'httpAssembleURI()' - Assemble a uniform resource identifier from its -@@ -1351,16 +1374,27 @@ _httpResolveURI( - - if (strstr(hostname, "._tcp")) - { -+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) -+ char *regtype, /* Pointer to type in hostname */ -+ *domain; /* Pointer to domain in hostname */ - #ifdef HAVE_DNSSD - DNSServiceRef ref, /* DNS-SD master service reference */ - domainref, /* DNS-SD service reference for domain */ - localref; /* DNS-SD service reference for .local */ - int domainsent = 0, /* Send the domain resolve? */ - offline = 0; /* offline-report state set? */ -- char *regtype, /* Pointer to type in hostname */ -- *domain; /* Pointer to domain in hostname */ - _http_uribuf_t uribuf; /* URI buffer */ - struct pollfd polldata; /* Polling data */ -+#else /* HAVE_AVAHI */ -+ AvahiSimplePoll *simple_poll; -+ AvahiClient *client; -+ int error; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } user_data; -+#endif /* HAVE_DNSSD */ - - - if (logit) -@@ -1398,8 +1432,13 @@ _httpResolveURI( - if (domain) - *domain++ = '\0'; - -+#ifdef HAVE_DNSSD - uribuf.buffer = resolved_uri; - uribuf.bufsize = resolved_size; -+#else -+ user_data.uribuf.buffer = resolved_uri; -+ user_data.uribuf.bufsize = resolved_size; -+#endif - - resolved_uri[0] = '\0'; - -@@ -1414,6 +1453,7 @@ _httpResolveURI( - - uri = NULL; - -+#ifdef HAVE_DNSSD - if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) - { - localref = ref; -@@ -1500,6 +1540,36 @@ _httpResolveURI( - - DNSServiceRefDeallocate(ref); - } -+#else /* HAVE_AVAHI */ -+ if ((simple_poll = avahi_simple_poll_new ()) != NULL) -+ { -+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll), -+ 0, avahi_resolve_uri_client_cb, -+ &simple_poll, &error)) != NULL) -+ { -+ user_data.poll = simple_poll; -+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC, -+ AVAHI_PROTO_UNSPEC, hostname, -+ regtype, domain, AVAHI_PROTO_UNSPEC, 0, -+ avahi_resolve_uri_resolver_cb, -+ &user_data) != NULL) -+ { -+ avahi_simple_poll_loop (simple_poll); -+ -+ /* -+ * Collect the result. -+ */ -+ -+ if (resolved_uri[0]) -+ uri = resolved_uri; -+ } -+ -+ avahi_client_free (client); -+ } -+ -+ avahi_simple_poll_free (simple_poll); -+ } -+#endif /* HAVE_DNSSD */ - - if (logit) - { -@@ -1511,13 +1581,13 @@ _httpResolveURI( - fputs("STATE: -connecting-to-device,offline-report\n", stderr); - } - --#else -+#else /* HAVE_DNSSD || HAVE_AVAHI */ - /* - * No DNS-SD support... - */ - - uri = NULL; --#endif /* HAVE_DNSSD */ -+#endif /* HAVE_DNSSD || HAVE_AVAHI */ - - if (logit && !uri) - _cupsLangPuts(stderr, _("Unable to find printer!\n")); -@@ -1722,6 +1792,105 @@ resolve_callback( - } - #endif /* HAVE_DNSSD */ - -+#ifdef HAVE_AVAHI -+static void -+avahi_resolve_uri_client_cb (AvahiClient *client, -+ AvahiClientState state, -+ void *simple_poll) -+{ -+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, " -+ "simple_poll=%p)\n", client, state, simple_poll)); -+ -+ /* -+ * If the connection drops, quit. -+ */ -+ -+ if (state == AVAHI_CLIENT_FAILURE) -+ avahi_simple_poll_quit (simple_poll); -+} -+ -+static void -+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver, -+ AvahiIfIndex interface, -+ AvahiProtocol protocol, -+ AvahiResolverEvent event, -+ const char *name, -+ const char *type, -+ const char *domain, -+ const char *host_name, -+ const AvahiAddress *address, -+ uint16_t port, -+ AvahiStringList *txt, -+ AvahiLookupResultFlags flags, -+ void *context) -+{ -+ const char *scheme; /* URI scheme */ -+ char rp[256]; /* Remote printer */ -+ AvahiStringList *pair; -+ char *value; -+ size_t valueLen = 0; -+ char addr[AVAHI_ADDRESS_STR_MAX]; -+ struct -+ { -+ AvahiSimplePoll *poll; -+ _http_uribuf_t uribuf; -+ } *poll_uribuf = context; -+ -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, " -+ "interface=%d, protocol=%d, event=%d, name=\"%s\", " -+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, " -+ "port=%d, txt=%p, flags=%d, context=%p)\n", -+ resolver, interface, protocol, event, name, type, domain, -+ host_name, address, port, txt, flags, context)); -+ -+ if (event != AVAHI_RESOLVER_FOUND) -+ { -+ avahi_service_resolver_free (resolver); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+ return; -+ } -+ -+ /* -+ * Figure out the scheme from the full name... -+ */ -+ -+ if (strstr(type, "_ipp.")) -+ scheme = "ipp"; -+ else if (strstr(type, "_printer.")) -+ scheme = "lpd"; -+ else if (strstr(type, "_pdl-datastream.")) -+ scheme = "socket"; -+ else -+ scheme = "riousbprint"; -+ -+ /* -+ * Extract the "remote printer key from the TXT record... -+ */ -+ -+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL) -+ { -+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen); -+ rp[0] = '/'; -+ memcpy (rp + 1, value, valueLen); -+ rp[valueLen + 1] = '\0'; -+ } -+ else -+ rp[0] = '\0'; -+ -+ /* -+ * Assemble the final device URI... -+ */ -+ -+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address); -+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer, -+ poll_uribuf->uribuf.bufsize, scheme, NULL, -+ addr, port, rp); -+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n", -+ poll_uribuf->uribuf.buffer)); -+ avahi_simple_poll_quit (poll_uribuf->poll); -+} -+#endif /* HAVE_AVAHI */ -+ - - /* - * End of "$Id: http-support.c 9322 2010-10-01 22:40:38Z mike $". diff --git a/staging/cups/cups.install b/staging/cups/cups.install deleted file mode 100644 index e92e17ed3..000000000 --- a/staging/cups/cups.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - echo ">> If you use an HTTPS connection to CUPS, the first time you access" - echo ">> the interface it may take a very long time before the site comes up." - echo ">> This is because the first request triggers the generation of the CUPS" - echo ">> SSL certificates which can be a very time-consuming job." -} - -post_upgrade() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null -} diff --git a/staging/cups/cups.logrotate b/staging/cups/cups.logrotate deleted file mode 100644 index 9c49bbdaf..000000000 --- a/staging/cups/cups.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/cups/*log { - missingok - notifempty - delaycompress - postrotate - /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/staging/cups/cups.pam b/staging/cups/cups.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/staging/cups/cups.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/staging/cvs/PKGBUILD b/staging/cvs/PKGBUILD deleted file mode 100644 index 76f71a2a1..000000000 --- a/staging/cvs/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $ -# Contributor: dorphell - -pkgname=cvs -pkgver=1.11.23 -pkgrel=7 -pkgdesc="Concurrent Versions System - a source control system" -arch=(i686 x86_64) -url="http://cvs.nongnu.org" -license=('GPL') -depends=('krb5') -optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') -install=cvs.install -source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - cvs-1.11.23-getline64.patch - cvs-1.11.23-cve-2010-3846.patch) -sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9' - '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf' - 'c6506d0a5efc7b0cab6415f26e070ec214fb9781fac8d295506f4d0825431a8f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - unset EDITOR VISUAL - - patch -Np1 -i ../cvs-1.11.23-getline64.patch - - # CVE-2010-3864, see https://www.redhat.com/security/data/cve/CVE-2010-3846.html - patch -Np1 -i ../cvs-1.11.23-cve-2010-3846.patch - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm "${pkgdir}"/usr/share/info/dir -} diff --git a/staging/cvs/cvs-1.11.23-cve-2010-3846.patch b/staging/cvs/cvs-1.11.23-cve-2010-3846.patch deleted file mode 100644 index e1560cef8..000000000 --- a/staging/cvs/cvs-1.11.23-cve-2010-3846.patch +++ /dev/null @@ -1,167 +0,0 @@ -From b122edcb68ff05bb6eb22f6e50423e7f1050841b Mon Sep 17 00:00:00 2001 -From: Larry Jones -Date: Thu, 21 Oct 2010 10:08:16 +0200 -Subject: [PATCH] Fix for CVE-2010-3846 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Mallformed RCS revision (delete after the end of input file, or overlayed -deleted regions) screws output file image size computation. This leads to -write attempt after the allocated memory opening hiden memory corruption -driven by CVS server. - -Signed-off-by: Petr Písař ---- - src/rcs.c | 52 +++++++++++++++++++++++++++++----------------------- - 1 files changed, 29 insertions(+), 23 deletions(-) - -diff --git a/src/rcs.c b/src/rcs.c -index 7d0d078..2f88f85 100644 ---- a/src/rcs.c -+++ b/src/rcs.c -@@ -7128,7 +7128,7 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - struct deltafrag *dfhead; - struct deltafrag **dftail; - struct deltafrag *df; -- unsigned long numlines, lastmodline, offset; -+ unsigned long numlines, offset; - struct linevector lines; - int err; - -@@ -7202,12 +7202,12 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - - /* New temp data structure to hold new org before - copy back into original structure. */ -- lines.nlines = lines.lines_alloced = numlines; -+ lines.lines_alloced = numlines; - lines.vector = xmalloc (numlines * sizeof *lines.vector); - - /* We changed the list order to first to last -- so the - list never gets larger than the size numlines. */ -- lastmodline = 0; -+ lines.nlines = 0; - - /* offset created when adding/removing lines - between new and original structure */ -@@ -7216,25 +7216,24 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - for (df = dfhead; df != NULL; ) - { - unsigned int ln; -- unsigned long deltaend; -+ unsigned long newpos = df->pos - offset; - -- if (df->pos > orig_lines->nlines) -+ if (newpos < lines.nlines || newpos > numlines) - err = 1; - - /* On error, just free the rest of the list. */ - if (!err) - { -- /* Here we need to get to the line where the next insert will -+ /* Here we need to get to the line where the next change will - begin, which is DF->pos in ORIG_LINES. We will fill up to - DF->pos - OFFSET in LINES with original items. */ -- for (deltaend = df->pos - offset; -- lastmodline < deltaend; -- lastmodline++) -+ while (lines.nlines < newpos) - { - /* we need to copy from the orig structure into new one */ -- lines.vector[lastmodline] = -- orig_lines->vector[lastmodline + offset]; -- lines.vector[lastmodline]->refcount++; -+ lines.vector[lines.nlines] = -+ orig_lines->vector[lines.nlines + offset]; -+ lines.vector[lines.nlines]->refcount++; -+ lines.nlines++; - } - - switch (df->type) -@@ -7246,7 +7245,12 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - struct line *q; - int nextline_newline; - size_t nextline_len; -- -+ -+ if (newpos + df->nlines > numlines) -+ { -+ err = 1; -+ break; -+ } - textend = df->new_lines + df->len; - nextline_newline = 0; - nextline_text = df->new_lines; -@@ -7271,8 +7275,7 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - q->has_newline = nextline_newline; - q->refcount = 1; - memcpy (q->text, nextline_text, nextline_len); -- lines.vector[lastmodline++] = q; -- offset--; -+ lines.vector[lines.nlines++] = q; - - nextline_text = (char *)p + 1; - nextline_newline = 0; -@@ -7286,11 +7289,11 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - q->has_newline = nextline_newline; - q->refcount = 1; - memcpy (q->text, nextline_text, nextline_len); -- lines.vector[lastmodline++] = q; -+ lines.vector[lines.nlines++] = q; - - /* For each line we add the offset between the #'s - decreases. */ -- offset--; -+ offset -= df->nlines; - break; - } - -@@ -7301,7 +7304,9 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - if (df->pos + df->nlines > orig_lines->nlines) - err = 1; - else if (delvers) -+ { - for (ln = df->pos; ln < df->pos + df->nlines; ++ln) -+ { - if (orig_lines->vector[ln]->refcount > 1) - /* Annotate needs this but, since the original - * vector is disposed of before returning from -@@ -7309,6 +7314,8 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - * there are multiple references. - */ - orig_lines->vector[ln]->vers = delvers; -+ } -+ } - break; - } - } -@@ -7328,21 +7335,20 @@ apply_rcs_changes (orig_lines, diffbuf, difflen, name, addvers, delvers) - else - { - /* add the rest of the remaining lines to the data vector */ -- for (; lastmodline < numlines; lastmodline++) -+ while (lines.nlines < numlines) - { - /* we need to copy from the orig structure into new one */ -- lines.vector[lastmodline] = orig_lines->vector[lastmodline -+ lines.vector[lines.nlines] = orig_lines->vector[lines.nlines - + offset]; -- lines.vector[lastmodline]->refcount++; -+ lines.vector[lines.nlines]->refcount++; -+ lines.nlines++; - } - - /* Move the lines vector to the original structure for output, - * first deleting the old. - */ - linevector_free (orig_lines); -- orig_lines->vector = lines.vector; -- orig_lines->lines_alloced = numlines; -- orig_lines->nlines = lines.nlines; -+ *orig_lines = lines; - } - - return !err; --- -1.7.2.3 - diff --git a/staging/cvs/cvs-1.11.23-getline64.patch b/staging/cvs/cvs-1.11.23-getline64.patch deleted file mode 100644 index 99942e058..000000000 --- a/staging/cvs/cvs-1.11.23-getline64.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- cvs-1.11.23/lib/getline.c 2005-04-04 22:46:05.000000000 +0200 -+++ cvs-1.11.23/lib/getline.c.old 2008-06-03 19:06:25.000000000 +0200 -@@ -154,7 +154,7 @@ - return ret; - } - --int -+ssize_t - getline (lineptr, n, stream) - char **lineptr; - size_t *n; -@@ -163,7 +163,7 @@ - return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT); - } - --int -+ssize_t - getline_safe (lineptr, n, stream, limit) - char **lineptr; - size_t *n; ---- cvs-1.11.23/lib/getline.h 2005-04-04 22:46:05.000000000 +0200 -+++ cvs-1.11.23/lib/getline.h.old 2008-06-03 19:06:27.000000000 +0200 -@@ -11,9 +11,9 @@ - - #define GETLINE_NO_LIMIT -1 - --int -+ssize_t - getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); --int -+ssize_t - getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, - int limit)); - int diff --git a/staging/cvs/cvs.install b/staging/cvs/cvs.install deleted file mode 100644 index f1cdd1f3e..000000000 --- a/staging/cvs/cvs.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(cvs.info cvs-info-1 cvs-info-2 cvsclient.info) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/cyrus-sasl-plugins/PKGBUILD b/staging/cyrus-sasl-plugins/PKGBUILD deleted file mode 100644 index 5817bb657..000000000 --- a/staging/cyrus-sasl-plugins/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $ -# Maintainer: Jan de Groot - -pkgname=cyrus-sasl-plugins -pkgver=2.1.23 -pkgrel=5 -pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" -arch=('i686' 'x86_64') -url="http://cyrusimap.web.cmu.edu/" -license=('custom') -depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4' - 'libmysqlclient>=5.5.10') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.22-gcc44.patch - cyrus-sasl-2.1.23-db5-fix.patch) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - '5deb4d67b53ecba20c7887fc8fdebee1' - '3ae4347705141145f31cf786c38ea9ef') -options=('!libtool') - -build() { - cd ${srcdir}/cyrus-sasl-${pkgver} - patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch - # from http://bugs.gentoo.org/show_bug.cgi?id=319935 - patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-login \ - --disable-plain \ - --enable-sql \ - --disable-sqlite \ - --enable-gssapi=/usr/include/gssapi \ - --with-mysql=/usr \ - --with-pgsql=/usr \ - --enable-postgresql \ - --enable-ldapdb \ - --with-ldap=/usr - cd sasldb - make - cd ../plugins - make -} - -package () { - cd ${srcdir}/cyrus-sasl-${pkgver}/plugins - make DESTDIR=${pkgdir} install - - install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - - rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.* -} diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch deleted file mode 100644 index e2621278b..000000000 --- a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch +++ /dev/null @@ -1,24 +0,0 @@ -fix warnings with gcc-4.4 - -http://bugs.gentoo.org/248738 - ---- cyrus-sasl-2.1.22/plugins/digestmd5.c -+++ cyrus-sasl-2.1.22/plugins/digestmd5.c -@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch deleted file mode 100644 index 2ccd6cdb3..000000000 --- a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- sasldb/db_berkeley.c.orig 2010-10-04 21:11:15.044010468 -0400 -+++ sasldb/db_berkeley.c 2010-10-04 21:12:18.921998718 -0400 -@@ -100,7 +100,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); - ---- utils/dbconverter-2.c.orig 2010-10-04 21:23:39.778000256 -0400 -+++ utils/dbconverter-2.c 2010-10-04 21:24:50.384999893 -0400 -@@ -214,7 +214,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/staging/cyrus-sasl/PKGBUILD b/staging/cyrus-sasl/PKGBUILD deleted file mode 100644 index 6d42f9f75..000000000 --- a/staging/cyrus-sasl/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $ -# Maintainer: Jan de Groot - -pkgname=cyrus-sasl -pkgver=2.1.23 -pkgrel=5 -pkgdesc="SASL authentication daemon" -arch=('i686' 'x86_64') -license=('custom') -url="http://asg.web.cmu.edu/cyrus/download/" -depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0') -replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql) -conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql) -backup=(etc/conf.d/saslauthd) -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz - saslauthd - saslauthd.conf.d - cyrus-sasl-2.1.23-gcc4.patch - cyrus-sasl-2.1.23+db-5.0.patch) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - '697dfb51206c398bc976ce9f4cffe72d' - '96d8a2f6189501f8044838e04d5cae7f' - '3a71688df7d5724cd55a8de17d74f34e' - '35c189c8e93ad37e3ae3c49386fdeb2c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix building with db v5.x - patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch - - # Fix error: #elif with no expression - patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch - - ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \ - --disable-krb4 --with-gss_impl=mit --disable-otp - cd saslauthd - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/saslauthd" - make DESTDIR="${pkgdir}" install - make testsaslauthd - install -m755 testsaslauthd "${pkgdir}/usr/sbin" - - install -dm766 "${pkgdir}/var/run/saslauthd" - install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" - install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" - - install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING" -} diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch deleted file mode 100644 index 62df3e67e..000000000 --- a/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c ---- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c 2009-04-28 08:09:18.000000000 -0700 -+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2011-05-02 07:16:42.748675977 -0700 -@@ -100,7 +100,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); -diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c ---- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c 2003-02-13 11:56:17.000000000 -0800 -+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2011-05-02 07:16:42.748675977 -0700 -@@ -214,7 +214,7 @@ - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch deleted file mode 100644 index 0d8627b1f..000000000 --- a/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c ---- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c 2009-04-28 08:09:17.000000000 -0700 -+++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2011-05-02 07:56:55.375403814 -0700 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/staging/cyrus-sasl/saslauthd b/staging/cyrus-sasl/saslauthd deleted file mode 100644 index c470c801c..000000000 --- a/staging/cyrus-sasl/saslauthd +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="saslauthd" -SASLAUTHD_BIN=/usr/sbin/saslauthd -SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN` - -case "$1" in - start) - stat_busy "Starting $DAEMON_NAME" - [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid - fi - add_daemon $DAEMON_NAME - stat_done - ;; - - stop) - stat_busy "Stopping $DAEMON_NAME" - [ ! -z "$SASLAUTHD_PID" ] && kill $SASLAUTHD_PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm /var/run/$DAEMON_NAME.pid &> /dev/null - fi - rm_daemon $DAEMON_NAME - stat_done - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/cyrus-sasl/saslauthd.conf.d b/staging/cyrus-sasl/saslauthd.conf.d deleted file mode 100644 index b42b5d0b0..000000000 --- a/staging/cyrus-sasl/saslauthd.conf.d +++ /dev/null @@ -1 +0,0 @@ -SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam" diff --git a/staging/dovecot/PKGBUILD b/staging/dovecot/PKGBUILD deleted file mode 100644 index 7b9a0304c..000000000 --- a/staging/dovecot/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 121982 2011-05-01 01:05:24Z stephane $ -# Contributor: Paul Mattal -# Contributor: Federico Quagliata (quaqo) -# Contributor: GARETTE Emmanuel -# Maintainer: Andreas Radke - -pkgname=dovecot -pkgver=2.0.12 -pkgrel=2 -pkgdesc="An IMAP and POP3 server written with security primarily in mind" -arch=('i686' 'x86_64') -url="http://dovecot.org/" -license=("LGPL") -depends=('krb5' 'openssl' 'sqlite3>=3.7.5' 'libmysqlclient>=5.5.10' - 'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl') -makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22') -optdepends=('libldap: ldap plugin') -provides=('imap-server' 'pop3-server') -options=('!libtool') -backup=(etc/dovecot/dovecot.conf - etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf - etc/dovecot/conf.d/{15-lda,20-imap,20-lmtp,20-pop3}.conf - etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf - etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext - etc/ssl/dovecot-openssl.cnf) -install=$pkgname.install -source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('689e1a8863d4fb2fd252e1a6121dd181' - 'd020d43eab4ded6fb379dadc570a9490') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - # configure with openssl, mysql, and postgresql support - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ - --disable-static \ - --with-nss \ - --with-pam \ - --with-mysql \ - --with-pgsql \ - --with-sqlite \ - --with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \ - --with-gssapi \ - --with-ldap=plugin \ - --with-zlib --with-bzlib \ - --with-libcap \ - --with-solr \ - --with-docs - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - - # install the launch script - install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname - - # install example conf files and ssl.conf - install -d -m755 ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext ${pkgdir}/etc/dovecot/conf.d - install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/ - install -d -m755 ${pkgdir}/etc/ssl - install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ - - rm ${pkgdir}/etc/dovecot/README - - # install dovecot userdir - https://bugs.archlinux.org/task/20533 - install -d -m755 ${pkgdir}/var/run/dovecot/{login,empty} - chmod 755 ${pkgdir}/var/run/dovecot - chmod 750 ${pkgdir}/var/run/dovecot/login -} diff --git a/staging/dovecot/dovecot.install b/staging/dovecot/dovecot.install deleted file mode 100644 index 51d1509ee..000000000 --- a/staging/dovecot/dovecot.install +++ /dev/null @@ -1,57 +0,0 @@ -# arg 1: the new package version -post_install() { - - # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values - - # dovecot - if grep -q "^dovecot:" /etc/group &> /dev/null ; then - groupmod -g 76 -n dovecot dovecot &> /dev/null - else - groupadd -g 76 dovecot &> /dev/null - fi - - if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot dovecot &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user" -d /var/run/dovecot/login -u 76 -g dovecot -m -r dovecot &> /dev/null - fi - - # dovenull - if grep -q "^dovenull:" /etc/group &> /dev/null ; then - groupmod -g 74 -n dovenull dovenull &> /dev/null - else - groupadd -g 74 dovenull &> /dev/null - fi - - if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull dovenull &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull -m -r dovenull &> /dev/null - fi - - # harden some permissions - chgrp dovenull /var/run/dovecot/login -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 - if [ "`vercmp $2 2.0.0`" -lt 0 ]; then - # important upgrade notice - echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE" - echo "> ------------------------------------" - echo "> see http://wiki2.dovecot.org/Upgrading/2.0" - echo "> make sure, you convert the dovecot.conf file" - fi - -} - -# arg 1: the old package version -pre_remove() { - userdel dovecot &> /dev/null - userdel dovenull &> /dev/null - groupdel dovecot &> /dev/null || /bin/true - groupdel dovenull &> /dev/null || /bin/true - rm -rf /var/run/dovecot/ &> /dev/null || /bin/true -} diff --git a/staging/dovecot/dovecot.sh b/staging/dovecot/dovecot.sh deleted file mode 100755 index b7555fe50..000000000 --- a/staging/dovecot/dovecot.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/dovecot` -case "$1" in - start) - stat_busy "Starting Dovecot" - [ -z "$PID" ] && /usr/sbin/dovecot - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dovecot - stat_done - fi - ;; - stop) - stat_busy "Stopping Dovecot" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dovecot - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD deleted file mode 100644 index 195be21c6..000000000 --- a/staging/evolution-data-server/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 122571 2011-05-04 16:49:38Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=evolution-data-server -pkgver=3.0.1 -pkgrel=2 -pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" -arch=('i686' 'x86_64') -depends=('libsoup' 'nss' 'libgnome-keyring' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection') -options=('!libtool') -url="http://www.gnome.org" -license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD deleted file mode 100644 index 963b54508..000000000 --- a/staging/evolution-exchange/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 122586 2011-05-04 18:25:32Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=evolution-exchange -pkgver=3.0.1 -pkgrel=2 -pkgdesc="Ximian Connector Exchange plugin for Evolution" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.ximian.com" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3') -makedepends=('intltool' 'evolution') -options=('!libtool' '!emptydirs') -install=evolution-exchange.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static \ - --with-libdb=/usr --with-krb5=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install deleted file mode 100644 index 1179887f9..000000000 --- a/staging/evolution-exchange/evolution-exchange.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=evolution-exchange - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/gnome-control-center/PKGBUILD b/staging/gnome-control-center/PKGBUILD deleted file mode 100644 index 1031b6b1d..000000000 --- a/staging/gnome-control-center/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 122550 2011-05-04 14:36:21Z stephane $ -# Maintainer: Jan de Groot - -pkgname=gnome-control-center -pkgver=3.0.1.1 -pkgrel=2 -pkgdesc="The Control Center for GNOME" -arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'krb5') -optdepends=('mesa-demos: provides glxinfo for graphics information' - 'apg: adds password generation for user accounts') -makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') -url="http://www.gnome.org" -groups=('gnome') -install=gnome-control-center.install -license=('GPL') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-update-mimedb - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} - diff --git a/staging/gnome-control-center/gnome-control-center.install b/staging/gnome-control-center/gnome-control-center.install deleted file mode 100644 index eb703319f..000000000 --- a/staging/gnome-control-center/gnome-control-center.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gnome-control-center - -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/gnome-settings-daemon/PKGBUILD b/staging/gnome-settings-daemon/PKGBUILD deleted file mode 100644 index 06f71588b..000000000 --- a/staging/gnome-settings-daemon/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 122583 2011-05-04 18:20:31Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=gnome-settings-daemon -pkgver=3.0.1 -pkgrel=2 -pkgdesc="The GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' - 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' - 'dconf' 'pulseaudio' 'pulseaudio-alsa') -makedepends=('intltool' 'gtk-doc') -options=('!emptydirs' '!libtool') -install=gnome-settings-daemon.install -url="http://www.gnome.org" -groups=('gnome') -replaces=(gnome-settings-daemon-pulse) -conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/bin --disable-static --enable-pulse - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gnome-settings-daemon/gnome-settings-daemon.install b/staging/gnome-settings-daemon/gnome-settings-daemon.install deleted file mode 100644 index 483fb9450..000000000 --- a/staging/gnome-settings-daemon/gnome-settings-daemon.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-settings-daemon - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/gnome-vfs/PKGBUILD b/staging/gnome-vfs/PKGBUILD deleted file mode 100644 index 3474b4c22..000000000 --- a/staging/gnome-vfs/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 122580 2011-05-04 18:07:34Z ibiru $ -# Maintainer: Jan de Groot - -pkgname=gnome-vfs -pkgver=2.24.4 -pkgrel=3 -pkgdesc="The GNOME Virtual File System" -arch=(i686 x86_64) -license=('LGPL') -depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls') -makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gnome-vfs.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 - gnutls-config.patch) -sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' - '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - #Fix build with new gnutls - patch -Np1 -i "${srcdir}/gnutls-config.patch" - libtoolize --force - gtkdocize - aclocal - autoconf - automake - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --disable-hal \ - --enable-avahi --disable-howl \ - --disable-openssl --enable-gnutls - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/staging/gnome-vfs/gnome-vfs.install b/staging/gnome-vfs/gnome-vfs.install deleted file mode 100644 index 793a3e7ab..000000000 --- a/staging/gnome-vfs/gnome-vfs.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=gnome-vfs - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/staging/gnome-vfs/gnutls-config.patch b/staging/gnome-vfs/gnutls-config.patch deleted file mode 100644 index f6fa18b17..000000000 --- a/staging/gnome-vfs/gnutls-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0 -# Use pkg-config in place of gnutls own macro since it's not present anymore. ---- a/configure.in 2009-03-07 19:59:53.805507753 +0100 -+++ b/configure.in 2009-03-07 18:34:36.928169018 +0100 -@@ -686,14 +686,14 @@ - AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***]) - else - AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***])) -- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- have_ssl=true]) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ have_ssl=true]) - - if test "x${LIBGNUTLS_LIBS}" = "x"; then -- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -- have_ssl=true], -- AC_MSG_ERROR([Unable to find GNUTLS])) -+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available]) -+ AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME]) -+ have_ssl=true], -+ AC_MSG_ERROR([Unable to find GNUTLS])) - fi - fi - fi diff --git a/staging/gtk2/PKGBUILD b/staging/gtk2/PKGBUILD deleted file mode 100644 index e67d63520..000000000 --- a/staging/gtk2/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $ -# Maintainer: Jan de Groot - -pkgbase=gtk2 -pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.4 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' - 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') -options=('!libtool' '!docs') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2 - xid-collision-debug.patch) -sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xinput=yes - make -} -package_gtk2() { - pkgdesc="The GTK+ Toolkit (v2)" - install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') - backup=(etc/gtk-2.0/gtkrc) - - cd "${srcdir}/gtk+-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" - #split this out to use with gtk3 too - rm ${pkgdir}/usr/bin/gtk-update-icon-cache -} -package_gtk-update-icon-cache() { - pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2') - - cd "${srcdir}/gtk+-${pkgver}/gtk" - - install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache -} diff --git a/staging/gtk2/gtk2.install b/staging/gtk2/gtk2.install deleted file mode 100644 index 4e2b72f1b..000000000 --- a/staging/gtk2/gtk2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null -} diff --git a/staging/gtk2/xid-collision-debug.patch b/staging/gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c3b..000000000 --- a/staging/gtk2/xid-collision-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 -+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 -@@ -56,10 +56,10 @@ - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, - (GEqualFunc) gdk_xid_equal); -- -+/* - if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ - g_hash_table_insert (display_x11->xid_ht, xid, data); - } - diff --git a/staging/gtk3/PKGBUILD b/staging/gtk3/PKGBUILD deleted file mode 100644 index 5550647fc..000000000 --- a/staging/gtk3/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 122547 2011-05-04 14:30:27Z stephane $ -# Maintainer: Ionut Biru - -pkgname=gtk3 -pkgver=3.0.9 -pkgrel=2 -pkgdesc="The GTK+ Toolkit (v3)" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'krb5' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info') -makedepends=('gobject-introspection') -options=('!libtool' '!docs') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2 - settings.ini) -sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-gtk2-dependency \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini" -} diff --git a/staging/gtk3/gtk3.install b/staging/gtk3/gtk3.install deleted file mode 100644 index cd8965d1f..000000000 --- a/staging/gtk3/gtk3.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-3.0 --update-cache - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache -} -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/staging/gtk3/settings.ini b/staging/gtk3/settings.ini deleted file mode 100644 index 039000d38..000000000 --- a/staging/gtk3/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-fallback-icon-theme = gnome diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD deleted file mode 100644 index 0f4a867d4..000000000 --- a/staging/kdelibs/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $ -# Maintainer: Andrea Scarpino - -pkgname=kdelibs -pkgver=4.6.3 -pkgrel=2 -pkgdesc="KDE Core Libraries" -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' - 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' - 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' - 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' - 'docbook-xsl') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' - 'hspell') -replaces=('arts' 'kdelibs-experimental') -install='kdelibs.install' -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch') -sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'd994f262356af5b9e4e9619646e471bd98c91efb') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # avoid file conflict with gnome-menu - patch -p1 -i $srcdir/kde-applications-menu.patch - # add Archlinux menu entry - patch -p1 -i $srcdir/archlinux-menu.patch - # add syntax highlightning for PKGBUILD and .install files - patch -p1 -i $srcdir/abs-syntax-highlight.patch - - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ - -DKDE_DEFAULT_HOME='.kde4' \ - -DWITH_FAM=OFF \ - -DKAUTH_BACKEND=PolkitQt-1 - make -} - -package() { - cd $srcdir/build - make DESTDIR=$pkgdir install - - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt -} diff --git a/staging/kdelibs/abs-syntax-highlight.patch b/staging/kdelibs/abs-syntax-highlight.patch deleted file mode 100644 index 477479a9b..000000000 --- a/staging/kdelibs/abs-syntax-highlight.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml ---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200 -+++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200 -@@ -8,7 +8,7 @@ - - - ]> -- -+ - -