From b5e623669f9d93fa23637bc3beca5a1751e70ff1 Mon Sep 17 00:00:00 2001 From: Nicolas Reynolds Date: Mon, 9 May 2011 20:25:46 -0300 Subject: removed junk --- community/fcron/systab.orig | 4 - extra/cyrus-sasl-plugins/PKGBUILD | 3 + extra/cyrus-sasl/PKGBUILD | 3 + extra/gstreamer0.10-good/PKGBUILD.orig | 60 ------ extra/libmcs/PKGBUILD.orig | 34 ---- extra/libmowgli/PKGBUILD.orig | 33 ---- extra/lirc/PKGBUILD.orig | 95 --------- extra/mc/PKGBUILD.orig | 57 ------ extra/mesa/PKGBUILD.orig | 349 --------------------------------- extra/poppler/PKGBUILD | 6 +- extra/v86d/PKGBUILD.orig | 42 ---- extra/xulrunner/PKGBUILD | 19 +- libre/xchat-gnome-libre/PKGBUILD | 12 +- 13 files changed, 26 insertions(+), 691 deletions(-) delete mode 100644 community/fcron/systab.orig delete mode 100644 extra/gstreamer0.10-good/PKGBUILD.orig delete mode 100644 extra/libmcs/PKGBUILD.orig delete mode 100644 extra/libmowgli/PKGBUILD.orig delete mode 100644 extra/lirc/PKGBUILD.orig delete mode 100644 extra/mc/PKGBUILD.orig delete mode 100644 extra/mesa/PKGBUILD.orig delete mode 100644 extra/v86d/PKGBUILD.orig diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig deleted file mode 100644 index 5b0045626..000000000 --- a/community/fcron/systab.orig +++ /dev/null @@ -1,4 +0,0 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly diff --git a/extra/cyrus-sasl-plugins/PKGBUILD b/extra/cyrus-sasl-plugins/PKGBUILD index 2fbef6eb0..6dc368c43 100644 --- a/extra/cyrus-sasl-plugins/PKGBUILD +++ b/extra/cyrus-sasl-plugins/PKGBUILD @@ -24,6 +24,9 @@ build() { # 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 \ + --host=$CHOST \ + --build=$CHOST \ + --target=$CHOST \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-login \ diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index 1589e351e..e417a95b5 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -22,6 +22,9 @@ md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man \ + --host=$CHOST \ + --build=$CHOST \ + --target=$CHOST \ --with-ldap=/usr --with-saslauthd=/var/run/saslauthd cd saslauthd make || return 1 diff --git a/extra/gstreamer0.10-good/PKGBUILD.orig b/extra/gstreamer0.10-good/PKGBUILD.orig deleted file mode 100644 index 577779e7d..000000000 --- a/extra/gstreamer0.10-good/PKGBUILD.orig +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 119465 2011-04-11 17:28:14Z jgc $ -# Maintainer: Jan de Groot - -pkgbase=gstreamer0.10-good -pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -<<<<<<< HEAD -pkgver=0.10.27 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') -======= -pkgver=0.10.28 -pkgrel=1 -arch=('i686' 'x86_64') ->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912 -license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.32' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack') -url="http://gstreamer.freedesktop.org/" -options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.bz2) -md5sums=('6ef1588921f59d85c44ee2e49a3c97a0') - -build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --disable-schemas-install \ - --disable-hal \ - --with-package-name="GStreamer Good Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - - make - sed -e 's/gst sys ext/gst/' -i Makefile -} - -package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.32' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - conflicts=('gstreamer0.10-bad<=0.10.17') - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/etc/gconf" -} - -package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'esound' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - install=gstreamer0.10-good-plugins.install - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make -C sys DESTDIR="${pkgdir}" install - make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" -} diff --git a/extra/libmcs/PKGBUILD.orig b/extra/libmcs/PKGBUILD.orig deleted file mode 100644 index a00c9c10e..000000000 --- a/extra/libmcs/PKGBUILD.orig +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 119903 2011-04-16 22:57:07Z bisson $ -# Contributor: Alexander Fehr -# Contributor: Brad Gordon -# Maintainer: Gaetan Bisson - -pkgname=libmcs -pkgver=0.7.2 -<<<<<<< HEAD -pkgrel=1 -pkgdesc="Library which abstracts the storage of configuration settings" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.atheme.org/project/mcs" -======= -pkgrel=2 -pkgdesc='Library which abstracts the storage of configuration settings' -arch=('i686' 'x86_64') -url='http://www.atheme.org/project/mcs' ->>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa -license=('BSD') -depends=('libmowgli') -source=("http://distfiles.atheme.org/libmcs-${pkgver}.tbz2") -sha1sums=('20c30bf7d4b3043848b5180de4c2cb61f7e0154c') - -build() { - cd "${srcdir}/libmcs-${pkgver}" - ./configure --prefix=/usr --disable-gconf --disable-kconfig - make -} - -package() { - cd "${srcdir}/libmcs-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmcs/COPYING" -} diff --git a/extra/libmowgli/PKGBUILD.orig b/extra/libmowgli/PKGBUILD.orig deleted file mode 100644 index 49586147d..000000000 --- a/extra/libmowgli/PKGBUILD.orig +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 119898 2011-04-16 22:56:08Z bisson $ -# Contributor: Alexander Fehr -# Contributor: Brad Gordon -# Maintainer: Gaetan Bisson - -pkgname=libmowgli -pkgver=0.9.50 -pkgrel=1 -<<<<<<< HEAD -pkgdesc="Class library containing performance and usability oriented extensions to C" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.atheme.org/project/mowgli" -======= -pkgdesc='Performance and usability-oriented extensions to C' -arch=('i686' 'x86_64') -url='http://www.atheme.org/project/mowgli' ->>>>>>> 84837d89991e1e82e5aef8e297541c572ebf2efa -license=('custom') -depends=('glibc') -source=("http://distfiles.atheme.org/libmowgli-${pkgver}.tar.bz2") -sha1sums=('51cac29a5670561e63dd9346820d61e6fd409e88') - -build() { - cd "${srcdir}/libmowgli-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/libmowgli-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/libmowgli/COPYING" -} diff --git a/extra/lirc/PKGBUILD.orig b/extra/lirc/PKGBUILD.orig deleted file mode 100644 index fb7621875..000000000 --- a/extra/lirc/PKGBUILD.orig +++ /dev/null @@ -1,95 +0,0 @@ -# $Id: PKGBUILD 118049 2011-04-05 07:45:38Z jgc $ -# Maintainer: Paul Mattal - -pkgbase=lirc -pkgname=('lirc' 'lirc-utils') -pkgver=0.9.0 -pkgrel=2 -epoch=1 -<<<<<<< HEAD -_kernver=2.6.37-ARCH -arch=('i686' 'x86_64' 'mips64el') -======= -_kernver=2.6.38-ARCH -arch=('i686' 'x86_64') ->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912 -url="http://www.lirc.org/" -license=('GPL') -makedepends=('help2man' 'kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') -options=('!makeflags' '!strip') -source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) -md5sums=('b232aef26f23fe33ea8305d276637086' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' - '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb') - -build() { - cd "${srcdir}/lirc-${pkgver}" - - sed -i '/AC_PATH_XTRA/d' configure.ac - sed -e 's/@X_CFLAGS@//g' \ - -e 's/@X_LIBS@//g' \ - -e 's/@X_PRE_LIBS@//g' \ - -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am - libtoolize - autoreconf - - PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ - --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ - --with-transmitter - - # Remove drivers already in kernel - sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ - -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ - -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ - -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile - make -} - -package_lirc() { - pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39') - replaces=('lirc+pctv') - install=lirc.install - - cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" install - - # set the kernel we've built for inside the install script - sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install" - # gzip -9 modules - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; -} - -package_lirc-utils() { - pkgdesc="Linux Infrared Remote Control utils" - depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') - optdepends=('python2: pronto2lirc utility') - options=('strip' '!libtool') - - cd "${srcdir}/lirc-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" - cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" - cp -rp remotes "${pkgdir}/usr/share/lirc" - chmod -R go-w "${pkgdir}/usr/share/lirc/" - - # install the logrotate config - install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" - - # install conf.d file - install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" - - # install conf.d file - install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" - - install -d "${pkgdir}/etc/lirc" - - # remove built modules - rm -r "${pkgdir}/lib/" -} diff --git a/extra/mc/PKGBUILD.orig b/extra/mc/PKGBUILD.orig deleted file mode 100644 index de4f212dd..000000000 --- a/extra/mc/PKGBUILD.orig +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 119545 2011-04-12 03:04:01Z eric $ -# Maintainer: Daniel J Griffiths - -pkgname=mc -<<<<<<< HEAD -pkgver=4.7.5.1 -pkgrel=2 -pkgdesc="A filemanager/shell that emulates Norton Commander" -arch=('i686' 'x86_64' 'mips64el') -======= -pkgver=4.7.5.2 -pkgrel=1 -pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" -arch=('i686' 'x86_64') ->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912 -url="http://www.ibiblio.org/mc/" -license=('GPL') -depends=('e2fsprogs' 'glib2' 'pcre' 'gpm' 'slang') -makedepends=('libxt' 'libx11') -optdepends=('p7zip: support for 7zip archives') -provides=('mcedit-pkgbuild-syntax') -conflicts=('mc-utf8') -replaces=('mc-utf8') -options=('!emptydirs' '!makeflags') -source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bdae966244496cd4f6d282d80c9cf3c6') -sha1sums=('08ffcc9fd19c7d8906a454c27b7074ca35bce14a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-background --enable-charset --enable-largefile \ - --with-edit --with-gpm-mouse --with-mmap --enable-vfs-smb \ - --with-screen=slang --with-subshell --with-vfs --with-x \ - --without-debug --without-gnome --without-included-gettext \ - --libexecdir=/usr/lib - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Fix FS#15177 - sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - - # Fix FS#18312 - rm "${pkgdir}/usr/lib/mc/extfs.d/u7z" - - sed 's#/usr/bin/env python#/usr/bin/python2#' \ - -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" -} diff --git a/extra/mesa/PKGBUILD.orig b/extra/mesa/PKGBUILD.orig deleted file mode 100644 index c5fc9f4a6..000000000 --- a/extra/mesa/PKGBUILD.orig +++ /dev/null @@ -1,349 +0,0 @@ -# $Id: PKGBUILD 119075 2011-04-10 20:11:41Z ibiru $ -# Maintainer: Jan de Groot -# Maintainer: Andreas Radke - -pkgbase=mesa -pkgname=('mesa' 'libgl' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') - -#_git=true -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.0.git20110215 - else - pkgver=7.10.2 -fi -<<<<<<< HEAD -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -======= -pkgrel=2 -arch=('i686' 'x86_64') ->>>>>>> 28b5bbf3fee0627993658e096eadab71c2779912 -makedepends=('glproto>=1.4.12' 'pkgconfig' 'libdrm>=2.4.23' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.3.5' 'libxt>=1.0.8' - 'gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'imake') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) -if [ "${_git}" = "true" ]; then - # mesa git shot from 7.10 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.10&id=cc1636b6db85604510f97f8a37d7fd0ecf453866 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-cc1636b6db85604510f97f8a37d7fd0ecf453866.tar.bz2') - else - source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '3ec78f340f9387abd7a37b195e764cbf' - '67c87b77cc2236b52a3b47dad3fbb5d4' - 'f5de82852f1243f42cc004039e10b771') - -build() { -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - autoreconf -vfi - else - cd "${srcdir}/Mesa-${pkgver}" -fi - -#backport from master to fix gnome-shell shader -#https://bugs.freedesktop.org/show_bug.cgi?id=35714 -patch -Np1 -i "${srcdir}/gnome-shell-shader-fix.patch" -patch -Np1 -i "${srcdir}/nouveau-fix-header.patch" - -if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --enable-gallium-radeon \ - --enable-gallium-r600 \ - --enable-gallium-nouveau \ - --enable-gallium-swrast \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --with-state-trackers=dri,glx \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --disable-gallium-egl -fi - - make -} - -package_libgl() { - depends=('libdrm>=2.4.22' 'libxxf86vm>=1.1.0' 'libxdamage>=1.1.3' 'expat>=2.0.1') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - - cd src/mesa/drivers/dri - #make -C swrast DESTDIR="${pkgdir}" install -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install -fi - ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_libgles() { - depends=('libgl') - pkgdesc="Mesa GLES libraries and headers" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - depends=('libgl') - pkgdesc="Mesa libEGL libraries and headers" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/egl" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/include/KHR" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" - bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" - bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" -} -package_mesa() { - depends=('libgl' 'libx11>=1.3.5' 'libxt>=1.0.8' 'gcc-libs>=4.5' 'dri2proto=2.3' 'libdrm>=2.4.22' 'glproto>=1.4.12') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-* - else - cd "${srcdir}/Mesa-${pkgver}" -fi - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon" - conflicts=('xf86-video-ati<6.9.0-6') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # classic mesa driver for R300 r300_dri.so - #make -C r300 DESTDIR="${pkgdir}" install <------- deprecated - # gallium3D driver for R300 r300_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -fi - #make -C r600 DESTDIR="${pkgdir}" install -} - -package_intel-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C i810 DESTDIR="${pkgdir}" install - make -C i915 DESTDIR="${pkgdir}" install - make -C i965 DESTDIR="${pkgdir}" install -} - -package_unichrome-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C unichrome DESTDIR="${pkgdir}" install -} - -package_mach64-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Mach64" - conflicts=('xf86-video-mach64<6.8.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mach64 DESTDIR="${pkgdir}" install -} - -package_mga-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Matrox" - conflicts=('xf86-video-mga<1.4.11') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C mga DESTDIR="${pkgdir}" install -} - -package_r128-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Rage128" - conflicts=('xf86-video-r128<6.8.1') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C r128 DESTDIR="${pkgdir}" install -} - -package_savage-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage" - conflicts=('xf86-video-savage<2.3.1') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C savage DESTDIR="${pkgdir}" install -} - -package_sis-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS" - conflicts=('xf86-video-sis<0.10.2') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C sis DESTDIR="${pkgdir}" install -} - -package_tdfx-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for 3dfx" - conflicts=('xf86-video-tdfx<1.4.3') - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - make -C tdfx DESTDIR="${pkgdir}" install -} - -package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" - -if [ "${_git}" = "true" ]; then - cd ${srcdir}/mesa-*/src/mesa/drivers/dri - else - cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri" -fi - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C nouveau DESTDIR="${pkgdir}" install - - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -fi -} - diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index d28dc5481..f11499723 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -2,12 +2,12 @@ # Maintainer: Jan de Groot pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgname=('poppler' 'poppler-glib') # 'poppler-qt') pkgver=0.16.4 pkgrel=1 arch=(i686 x86_64 'mips64el') license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'pkgconfig' 'lcms' 'gobject-introspection') options=('!libtool') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz) @@ -22,7 +22,7 @@ build() { --enable-cairo-output \ --enable-xpdf-headers \ --enable-libjpeg --enable-zlib \ - --enable-poppler-qt4 \ + --disable-poppler-qt4 \ --enable-poppler-glib make sed -e 's/^glib_subdir =.*/glib_subdir =/' \ diff --git a/extra/v86d/PKGBUILD.orig b/extra/v86d/PKGBUILD.orig deleted file mode 100644 index f73fc234b..000000000 --- a/extra/v86d/PKGBUILD.orig +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 119572 2011-04-12 13:37:13Z eric $ -# Maintainer: Thomas Baechler - -pkgname=v86d -pkgver=0.1.10 -pkgrel=1 -pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" -arch=('i686' 'x86_64') -url="http://dev.gentoo.org/~spock/projects/uvesafb/" -license=('GPL2') -<<<<<<< HEAD -arch=("i686" "x86_64" 'mips64el') -======= ->>>>>>> 6dab5c46b00f624c7900ff6d11b75bcafbe251d0 -depends=('glibc') -conflicts=('mkinitcpio<0.5.99') -backup=('etc/modprobe.d/uvesafb.conf') -options=('!makeflags') -source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 - v86d - v86d_hook - modprobe.uvesafb) -md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' - '33f3131e7bf041ed6a67e92bff272f4c' - '813958b8f6c75a7063e4858f31509694' - '2d7cc8dc6a41916a13869212d0191147') - -build() { - cd "$srcdir/v86d-$pkgver" - ./configure --with-x86emu - # we only need /usr/include/video/uvesafb.h - make KDIR=/usr -} - -package() { - cd "$srcdir/v86d-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d" - install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d" - install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf" -} diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 3fb4ccab2..942e6b3ef 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -11,21 +11,16 @@ license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify') makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') url="http://wiki.mozilla.org/XUL:Xul_Runner" -source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2 +source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz mozconfig mozilla-pkgconfig.patch xulrunner-version.patch xulrunner-omnijar.patch port_gnomevfs_to_gio.patch) options=('!emptydirs') -md5sums=('9abda7d23151e97913c8555a64c13f34' - '2358a2ddd35bcdd62ff42442dfe548d9' - '639ea80e823543dd415b90c0ee804186' - 'a0236f6c3e55f60b7888d8cf137ff209' - '0bf82bc6677e3ce57fd20a147fe8d7b1' - '42f83468b296452fb754a81a4317ca64') + build() { - cd "${srcdir}/mozilla-2.0" + cd "${srcdir}/icecat-${_ffoxver}/" cp "${srcdir}/mozconfig" .mozconfig #fix libdir/sdkdir - fedora @@ -49,7 +44,7 @@ build() { } package() { - cd "${srcdir}/mozilla-2.0" + cd "${srcdir}/icecat-${_ffoxver}/" make -j1 -f client.mk DESTDIR="${pkgdir}" install #Remove included dictionaries, add symlink to system myspell path. @@ -61,3 +56,9 @@ package() { install -d ${pkgdir}/etc/ld.so.conf.d echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf } +md5sums=('1b4d44ee5badc28fd332cba564ecde0a' + '2358a2ddd35bcdd62ff42442dfe548d9' + '639ea80e823543dd415b90c0ee804186' + 'a0236f6c3e55f60b7888d8cf137ff209' + '0bf82bc6677e3ce57fd20a147fe8d7b1' + '42f83468b296452fb754a81a4317ca64') diff --git a/libre/xchat-gnome-libre/PKGBUILD b/libre/xchat-gnome-libre/PKGBUILD index 94c6b5c40..64099ba34 100644 --- a/libre/xchat-gnome-libre/PKGBUILD +++ b/libre/xchat-gnome-libre/PKGBUILD @@ -19,16 +19,18 @@ optdepends=('libnotify: notifications' options=('!libtool') install=xchat-gnome.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.26/${pkgname}-${pkgver}.tar.gz - gtk2-2.20.patch xchat-gnome-0.26.1-deprecated-symbol.patch) -md5sums=('e355d71d76cd97a0764e37bfacf09101' 'dafc2536a0c5ee3f8015af81fce69656'\ - 'f82417277f0b5e83334147c4bf63d531') -sha1sums=('303bfbf2f1bda83fbc4edab148df4764cb4b8998' 'f1bfc5af50be7c10a9db96be20185325636d8da9'\ - '9aa0abc4b7999e09cafdeb8da1ad4641552a421b') + gtk2-2.20.patch xchat-gnome-0.26.1-deprecated-symbol.patch + no-opera.patch) +md5sums=('e355d71d76cd97a0764e37bfacf09101' + 'dafc2536a0c5ee3f8015af81fce69656' + 'f82417277f0b5e83334147c4bf63d531' + 'b3e5a2e9f7ac96d36ee3567687a546bc') build() { cd "$srcdir/${pkgname}-${pkgver}" patch -Np1 -i "$srcdir/gtk2-2.20.patch" patch -Np1 -i "$srcdir/xchat-gnome-0.26.1-deprecated-symbol.patch" + patch -Np0 -i "$srcdir/no-opera.patch" sed -i 's/notify_notification_new (summary, escaped, NULL, NULL);/notify_notification_new (summary, escaped, NULL);/' plugins/notify-osd/notify-osd.c sed -i -e "s/ /\t/" src/common/dbus/Makefile.in -- cgit v1.2.3-54-g00ecf