diff options
59 files changed, 2393 insertions, 231 deletions
diff --git a/community-staging/calibre/PKGBUILD b/community-staging/calibre/PKGBUILD new file mode 100644 index 000000000..1bfbe0b63 --- /dev/null +++ b/community-staging/calibre/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 58167 2011-11-07 16:05:15Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Petrov Roman <nwhisper@gmail.com> +# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> + +pkgname=calibre +pkgver=0.8.25 +pkgrel=2 +pkgdesc="Ebook management application" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' + 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' + 'python-imaging' 'desktop-file-utils' 'shared-mime-info' + 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') +makedepends=('python2-pycountry') +optdepends=('ipython: to use calibre-debug') +install=calibre.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('b7b141db18912925be08ff79fd2ead3f' + '253ce4fe5d01f8ff76b63cd3825755ea' + '675cd87d41342119827ef706055491e7') + +build() { + cd "${srcdir}/${pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + python2 setup.py build + python2 setup.py resources + python2 setup.py translations +} + +package() { + cd "${srcdir}/${pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # Decompress the man pages so makepkg will do it for us. + for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do + bzip2 -d "${decom}" + done + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf ${pkgdir}/usr/bin/calibre-mount-helper + install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin" +} diff --git a/community-staging/calibre/calibre-mount-helper b/community-staging/calibre/calibre-mount-helper new file mode 100755 index 000000000..00cac4270 --- /dev/null +++ b/community-staging/calibre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt <mpitt@debian.org> + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/community-staging/calibre/calibre.install b/community-staging/calibre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/community-staging/calibre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/calibre/desktop_integration.patch b/community-staging/calibre/desktop_integration.patch new file mode 100644 index 000000000..4dbf53757 --- /dev/null +++ b/community-staging/calibre/desktop_integration.patch @@ -0,0 +1,68 @@ +--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 ++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 +@@ -339,51 +339,39 @@ + + with TemporaryDirectory() as tdir: + with CurrentDir(tdir): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('lt.png', 'calibre-gui.png') +- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- check_call(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- check_call(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes') +- check_call('xdg-mime install ./calibre-mimetypes', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/community-staging/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD new file mode 100644 index 000000000..320b2097e --- /dev/null +++ b/community-staging/gambas2/PKGBUILD @@ -0,0 +1,950 @@ +# $Id: PKGBUILD 58161 2011-11-07 13:18:23Z lcarlier $ +# Maintainer : Laurent Carlier <lordheavym@gmail.com> +# Contributor: Biru Ionut <ionut@archlinux.ro> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Toni Foerster <stonerl@skeps.de> + +pkgbase="gambas2" +pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' + 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' + 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' + 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' + 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' + 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' + 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' + 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' + 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' + 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') +pkgver=2.23.1 +pkgrel=5 +pkgdesc="A free development environment based on a Basic interpreter." +arch=('i686' 'x86_64') +url="http://gambas.sourceforge.net" +depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' + 'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' + 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' + 'libxcursor' 'libsm') +makedepends=('intltool' 'mysql' 'postgresql') +license=('GPL2') +options=('!emptydirs' '!makeflags') +groups=('gambas2') +replaces=('gambas2') +conflicts=('gambas2') +source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 + 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch' + 'poppler-0.18.patch' + 'gambas2-script.install' 'gambas2-runtime.install') +md5sums=('ff8d2c1f310222c150b114e7ce247dfd' + '9dda03a1bbfb7e7ba8b6a4ae91b6752b' + 'ac9703b390502ed3242c8d34485c9236' + 'a551b4b216bbdb3489f3c264bf73ee66' + '870ff5b4b33cd75aa9c290539e6fdd5d' + 'ab5667175c4945282d2f40a35d0e9e5b') +_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" + +_buildgbcomp() { + cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1 + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 + install $1.gambas ${pkgdir}/usr/lib/gambas2/ + install .component ${pkgdir}/usr/lib/gambas2/$1.component + chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component + install .info ${pkgdir}/usr/share/gambas2/info/$1.info + chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info + install .list ${pkgdir}/usr/share/gambas2/info/$1.list + chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list + if test -d control; then + install -d ${pkgdir}/usr/share/gambas2/control/$1 + install control/*.png ${pkgdir}/usr/share/gambas2/control/$1 + chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png + fi +} + +build() { + cd "${srcdir}/$pkgbase-$pkgver" + + ## workaround to allow package splitting + msg "Applying patches ..." + patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch" + # merged upstream + patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch" + patch -Np2 -i "${srcdir}/poppler-0.18.patch" + ./reconf-all + ## + + . /etc/profile.d/kde3.sh + . /etc/profile.d/qt3.sh + + ./configure -C --disable-qte --prefix=/usr + make bindir=${pkgdir}/usr/bin +} + +package_gambas2-meta() { + depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' + 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' + 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' + 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' + 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' + 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' + 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' + 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' + 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' + 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' + 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') + pkgdesc="Gambas2 meta package" +} + +package_gambas2-runtime() { + depends=('libffi' 'xdg-utils') + pkgdesc="Gambas2 runtime environment" + install=gambas2-runtime.install + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \ + ${pkgdir}/usr/lib/gambas2 + ln -s gbx2 ${pkgdir}/usr/bin/gbr2 + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + + ## needed for postinst with xdg-utils + install -d -m755 ${pkgdir}/usr/share/gambas2/mime + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ + ${pkgdir}/usr/share/gambas2/mime/ + install -d -m755 ${pkgdir}/usr/share/gambas2/icons + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \ + ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png +} + +package_gambas2-devel() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 development environment" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-ide() { + depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings' + 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel') + pkgdesc="Gambas2 Integrated Development Environment" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + _buildgbcomp gb.form + _buildgbcomp gb.form.dialog + _buildgbcomp gb.form.mdi + _buildgbcomp gb.settings + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2 + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 + cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 + cd ${srcdir}/${pkgbase}-${pkgver}/app/src/ + + ## cleanup the workaround + rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib + rm ${pkgdir}/usr/bin/gbx2 + ## + + install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin + install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin + ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2 + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \ + ${pkgdir}/usr/share/applications/gambas2.desktop + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \ + ${pkgdir}/usr/share/pixmaps/gambas2.png +} + +package_gambas2-examples() { + depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' + 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' + 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' + 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' + 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' + 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' + 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' + 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' + 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' + 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' + 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') + pkgdesc="Gambas2 examples" +# arch=('any') + + cd ${srcdir}/${pkgbase}-${pkgver} + make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/gambas2/{help,info} +} + +package_gambas2-help() { + depends=() + pkgdesc="Gambas2 help files" +# arch=('any') + + cd ${srcdir}/${pkgbase}-${pkgver}/help + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + #fix help + chown root:root -R ${pkgdir}/usr/share/gambas2/help/help +} + +package_gambas2-script() { + depends=('gambas2-devel') + pkgdesc="Gambas2 scripter and server programs support" + install=gambas2-script.install +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2 + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 + install -m755 gbs2.gambas ${pkgdir}/usr/bin + + ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2 + ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2 + + ## cleanup the workaround + rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib + rm ${pkgdir}/usr/bin/gbx2 + ## + + ## needed for postinst with xdg-utils + cd ${srcdir}/${pkgbase}-${pkgver}/app/mime + install -d -m755 ${pkgdir}/usr/share/gambas2/mime + install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/ + install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/ + ## +} + +package_gambas2-gb-chart() { + depends=('gambas2-gb-form') + pkgdesc="Gambas2 chart component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + _buildgbcomp gb.form + _buildgbcomp gb.chart + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-compress() { + depends=('gambas2-runtime' 'bzip2' 'zlib') + pkgdesc="Gambas2 compression support component" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-corba() { + depends=('gambas2-runtime' 'omniorb') + pkgdesc="Gambas2 corba component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-crypt() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 MD5/DES crypting component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db-firebird() { + depends=('gambas2-gb-db' 'libfbclient') + pkgdesc="Gambas2 Firebird database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db-form() { + depends=('gambas2-gb-db' 'gambas2-gb-form') + pkgdesc="Gambas2 database form component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + _buildgbcomp gb.db.form + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-db-mysql() { + depends=('gambas2-gb-db' 'libmysqlclient') + pkgdesc="Gambas2 MySQL database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db-odbc() { + depends=('gambas2-gb-db' 'unixodbc') + pkgdesc="Gambas2 ODBC database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db-postgresql() { + depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1') + pkgdesc="Gambas2 PostgreSQL database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db-sqlite2() { + depends=('gambas2-gb-db' 'sqlite2') + pkgdesc="Gambas2 Sqlite2 database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-db-sqlite3() { + depends=('gambas2-gb-db' 'sqlite3') + pkgdesc="Gambas2 Sqlite3 database access component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-desktop() { + depends=('gambas2-runtime' 'libsm' 'libxtst') + pkgdesc="Gambas2 desktop component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} + rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-form() { + depends=('gambas2-gb-gui') + pkgdesc="Gambas2 form component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + _buildgbcomp gb.form + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-form-dialog() { + depends=('gambas2-gb-form') + pkgdesc="Gambas2 form dialog component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + _buildgbcomp gb.form + _buildgbcomp gb.form.dialog + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-form-mdi() { + depends=('gambas2-gb-form') + pkgdesc="Gambas2 form MDI component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + _buildgbcomp gb.form + _buildgbcomp gb.form.mdi + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-gtk() { + depends=('gambas2-runtime' 'gtk2') + pkgdesc="Gambas2 graphical GTK+ toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-gtk-ext() { + depends=('gambas2-gb-gtk') + pkgdesc="Gambas2 graphical GTK+ toolkit extension component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-gtk-svg() { + depends=('gambas2-gb-gtk' 'librsvg') + pkgdesc="Gambas2 graphical GTK+ toolkit svg component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-gui() { + depends=('gambas2-gb-qt' 'gambas2-gb-gtk') + pkgdesc="Gambas2 automatic gui toolkit chooser" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-image() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 image processing component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.image + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-info() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 info component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + _buildgbcomp gb.info + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-net() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 networking component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-net-curl() { + depends=('gambas2-runtime' 'curl') + pkgdesc="Gambas2 advanced networking component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-net-smtp() { + depends=('gambas2-runtime' 'glib2') + pkgdesc="Gambas2 SMTP component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-opengl() { + depends=('gambas2-runtime' 'libgl' 'mesa') + pkgdesc="Gambas2 OpenGL component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-option() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 command-line options component" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-pcre() { + depends=('gambas2-runtime' 'pcre') + pkgdesc="Gambas2 PCRE component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-pdf() { + depends=('gambas2-runtime' 'poppler-glib') + pkgdesc="Gambas2 PDF component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-qt() { + depends=('gambas2-runtime' 'qt3') + pkgdesc="Gambas2 graphical QT toolkit component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-qt-ext() { + depends=('gambas2-gb-qt') + pkgdesc="Gambas2 graphical QT toolkit extension component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-qt-opengl() { + depends=('gambas2-gb-qt' 'libgl') + pkgdesc="Gambas2 graphical QT toolkit OpenGL component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-qt-kde() { + depends=('gambas2-gb-qt' 'kdelibs3') + pkgdesc="Gambas2 KDE component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html* + rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html* +} + +package_gambas2-gb-qt-kde-html() { + depends=('gambas2-gb-qt-kde') + pkgdesc="Gambas2 KHTML component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-report() { + depends=('gambas2-runtime' 'gambas2-gb-form') + pkgdesc="Gambas2 report component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + _buildgbcomp gb.form + _buildgbcomp gb.report + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*} + rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-sdl() { + depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') + pkgdesc="Gambas2 SDL component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-sdl-sound() { + depends=('gambas2-runtime' 'sdl_mixer') + pkgdesc="Gambas2 SDL sound component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-settings() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 settings management component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + _buildgbcomp gb.settings + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-v4l() { + depends=('gambas2-runtime' 'libjpeg' 'libpng') + pkgdesc="Gambas2 V4L component" + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-vb() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 VB transitional component" + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install +} + +package_gambas2-gb-web() { + depends=('gambas2-runtime') + pkgdesc="Gambas2 CGI component" +# arch=('any') + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + _buildgbcomp gb.web + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-xml() { + depends=('gambas2-runtime' 'libxml2') + pkgdesc="Gambas2 xml component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*} + rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-xml-rpc() { + depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl') + pkgdesc="Gambas2 xml-rpc component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*} + rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*} + rm -rf ${pkgdir}/usr/bin + ## +} + +package_gambas2-gb-xml-xslt() { + depends=('gambas2-gb-xml' 'libxslt') + pkgdesc="Gambas2 xml-xslt component" + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + mkdir -p ${pkgdir}/usr/share/gambas2/info + ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt + make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install + + ## cleanup the workaround + rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} + rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} + rm -rf ${pkgdir}/usr/bin + ## +} diff --git a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch new file mode 100644 index 000000000..0b6e68df3 --- /dev/null +++ b/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch @@ -0,0 +1,35 @@ +--- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864 ++++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865 +@@ -1216,7 +1216,8 @@ + GB.StoreVariant(&fantom, &buffer[i]); + } + else{ +- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]); ++ GB_VARIANT val = res->GetData(pos,i); ++ GB.StoreVariant(&val , &buffer[i]); + } + } + } +@@ -1874,6 +1875,8 @@ + static char query[SQLMAXLEN]; + int type; + std::string str1,str2; ++ GB_VARIANT varval; ++ char* charval; + snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field); + if (do_query(db, query, &res, "Unable to get the field from the table")){ + delete res; +@@ -1900,9 +1903,11 @@ + str1=res->GetData(0,3).value.value._string; + if(str1!="") + str2=str1.assign(str1,8,str1.length()-8); +- GB.FreeString(&res->GetData(0,3).value.value._string); ++ charval = res->GetData(0,3).value.value._string; ++ GB.FreeString(&charval); + res->SetData(0,3,str2); +- GB.StoreVariant(&res->GetData(0,3), &info->def); ++ varval = res->GetData(0,3); ++ GB.StoreVariant(&varval, &info->def); + } + delete res; + return FALSE; diff --git a/community-staging/gambas2/fix-gbi-gba-path.patch b/community-staging/gambas2/fix-gbi-gba-path.patch new file mode 100644 index 000000000..9be8e921e --- /dev/null +++ b/community-staging/gambas2/fix-gbi-gba-path.patch @@ -0,0 +1,24 @@ +--- component.am 2010-03-15 20:54:43.000000000 +0100 ++++ ../component.am 2010-04-30 15:00:47.218700833 +0200 +@@ -6,17 +6,17 @@ + @if test -d $(COMPONENT); then \ + echo "Compiling the $(COMPONENT) project..."; \ + ( \ +- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ ++ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ + cd $(COMPONENT); \ +- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ +- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ ++ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ ++ $(GBFILES)/gba$(GAMBAS_VERSION); \ + rm -rf .gambas; \ + $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \ + ) \ + fi + @echo + @echo "Creating the information files for $(COMPONENT) component..." +- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) ++ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) + @echo + + uninstall-hook: diff --git a/community-staging/gambas2/gambas2-runtime.install b/community-staging/gambas2/gambas2-runtime.install new file mode 100644 index 000000000..4729f7ef6 --- /dev/null +++ b/community-staging/gambas2/gambas2-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas + xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas + xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas2/gambas2-script.install b/community-staging/gambas2/gambas2-script.install new file mode 100644 index 000000000..86558e434 --- /dev/null +++ b/community-staging/gambas2/gambas2-script.install @@ -0,0 +1,15 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage + xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml + xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage + xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml + xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml +} diff --git a/community-staging/gambas2/gambas2.install b/community-staging/gambas2/gambas2.install new file mode 100644 index 000000000..4729f7ef6 --- /dev/null +++ b/community-staging/gambas2/gambas2.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource install --context mimetypes --size 64 \ + /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas + xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml +} + +pre_remove() { + xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas + xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas2/poppler-0.18.patch b/community-staging/gambas2/poppler-0.18.patch new file mode 100644 index 000000000..fbcc430bf --- /dev/null +++ b/community-staging/gambas2/poppler-0.18.patch @@ -0,0 +1,40 @@ +--- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038 ++++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997 +@@ -22,6 +22,8 @@ + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8) + pkg-config --atleast-version=0.11.3 poppler + AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) ++ pkg-config --atleast-version=0.17.0 poppler ++ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) + fi + + AC_OUTPUT( \ + +--- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870 ++++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997 +@@ -44,6 +44,7 @@ + #include <Outline.h> + #include <Link.h> + #include <Gfx.h> ++#include <glib/poppler-features.h> + + /***************************************************************************** + +@@ -956,12 +957,17 @@ + Bookmarks of a PDF page + + ******************************************************************************/ ++ + void aux_fill_links(void *_object) + { ++ #if POPPLER_VERSION_0_17 ++ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); ++ #else + Object obj; + + THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ()); + obj.free(); ++ #endif + } + + BEGIN_PROPERTY (PDFPAGELINKS_count) diff --git a/community-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD new file mode 100644 index 000000000..208f92552 --- /dev/null +++ b/community-staging/libextractor/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 58157 2011-11-07 11:14:51Z jelle $ +# Maintainer: Sergej Pupykin <pupykin.s@gmail.com> +# Contributor: damir <damir@archlinux.org> + +pkgname=libextractor +pkgver=0.6.2 +pkgrel=5 +pkgdesc="A library used to extract meta-data from files of arbitrary type" +arch=("i686" "x86_64") +license=('GPL') +url="http://gnunet.org/libextractor/" +depends=('libvorbis' 'libtool' 'gtk2' 'libgsf' 'libmpeg2' 'texinfo') +makedepends=('flac' 'poppler' 'exiv2' 'qt') +optdepends=('flac' + 'poppler' + 'exiv2' + 'qt') +options=('!libtool' '!makeflags') +install=libextractor.install +source=(http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('4b2af1167061430d58a101d5dfc6b4c7') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/share/info/dir +} diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install new file mode 100644 index 000000000..24d668af5 --- /dev/null +++ b/community-staging/libextractor/libextractor.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(extractor.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/community-staging/pdf2djvu/PKGBUILD b/community-staging/pdf2djvu/PKGBUILD new file mode 100644 index 000000000..c7ed3f7d3 --- /dev/null +++ b/community-staging/pdf2djvu/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 58155 2011-11-07 11:04:26Z jelle $ +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +pkgname=pdf2djvu +pkgver=0.7.11 +pkgrel=2 +pkgdesc="Creates DjVu files from PDF files" +arch=('i686' 'x86_64') +url="http://pdf2djvu.googlecode.com" +license=('GPL') +depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') +makedepends=('pstreams') +source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") +md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make install DESTDIR=${pkgdir} + install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 +} +md5sums=('37c3d5a31c155bc65a39912da4c6bce1') diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD index 1851f8317..5a37fa0c0 100644 --- a/community-testing/virtualbox-modules/PKGBUILD +++ b/community-testing/virtualbox-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57949 2011-11-04 18:45:15Z ibiru $ +# $Id: PKGBUILD 58175 2011-11-07 22:22:11Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') pkgver=4.1.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -12,7 +12,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('03cd0875729558a46f910483e1984316' +md5sums=('89b979d1b817242c7cdcb489898f166a' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD index cebea94bf..d03459176 100644 --- a/community-testing/virtualbox/PKGBUILD +++ b/community-testing/virtualbox/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 57944 2011-11-04 18:30:05Z ibiru $ +# $Id: PKGBUILD 58173 2011-11-07 22:10:19Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') pkgver=4.1.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt=4.7.4-3' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' 'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') #'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') @@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} change_default_driver_dir.patch vbox-service.conf vbox-service.rc) _extramodules=extramodules-3.1-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" +_kernver="$(cat /lib/modules/${_extramodules}/version || true)" build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -112,7 +112,10 @@ package_virtualbox() { package_virtualbox-source() { pkgdesc="VirtualBox kernel modules source" - depends=(linux-headers gcc make) + depends=(gcc make) + provides=(virtualbox-modules) + optdepends=('linux-headers' + 'kernel26-lts-headers') install=virtualbox-source.install source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" @@ -175,12 +178,12 @@ package_virtualbox-archlinux-additions(){ # install sample config install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } -md5sums=('03cd0875729558a46f910483e1984316' +md5sums=('89b979d1b817242c7cdcb489898f166a' 'af534f713993eb077df26ff9a44fb080' '5f85710e0b8606de967716ded7b2d351' - '88b847c3480df14139980d62597329ec' + '6ab2455c391d8cc005e2f4461ae26a3b' '78ffa67ff131680f1d2b6f06d4325c5b' 'a82d698e7868315cdf876cfb02fd2268' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' - '778d865e56e31cc592fbfa257fdcfce7') + 'e7416331d0bc331f3b5aae3e5d104642') diff --git a/community-testing/virtualbox/vbox-service.rc b/community-testing/virtualbox/vbox-service.rc index c1af2134d..6f1b8d892 100755 --- a/community-testing/virtualbox/vbox-service.rc +++ b/community-testing/virtualbox/vbox-service.rc @@ -11,13 +11,13 @@ case "$1" in start) stat_busy "Starting $name service" [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ - && { add_daemon $name; stat_done; } \ + && { add_daemon vbox-service; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name service" [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ + && { rm_daemon vbox-service; stat_done; } \ || { stat_fail; exit 1; } ;; restart) diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch index 9f4b127cd..710e2e511 100644 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ b/community-testing/virtualbox/vboxdrv-reference.patch @@ -37,7 +37,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+ load. Please recompile the kernel module virtualbox-modules or ++ load. Please reinstall the kernel module virtualbox-modules or + if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index 216069a0f..5157811c0 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55283 2011-09-08 19:32:44Z spupykin $ +# $Id: PKGBUILD 58163 2011-11-07 13:53:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A streaming media server" @@ -17,7 +17,7 @@ depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugin 'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs') makedepends=('perlxml') source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('b2fa7c2e7ce8e2a5415f9096bfce783b') +md5sums=('d7a34333346828f19f83b24886efde14') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index 3acbafcfa..adb56b50c 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57805 2011-11-03 09:25:18Z spupykin $ +# $Id: PKGBUILD 58153 2011-11-07 10:55:45Z spupykin $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64') url="http://openmovieeditor.sourceforge.net/HomePage" @@ -15,15 +15,18 @@ optdepends=('alsa-lib: for ALSA support' 'libquicktime: for movie encoding' 'pulseaudio: for PulseAudio support' 'v4l-utils: for video conversion') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) options=('!libtool') -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + libpng.patch) +md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' + 'c262023434246705296d97bc7337a212') build() { cd "$srcdir/$pkgname-$pkgver" rm -rf cpuinfo.sh + patch -p1 <$srcdir/libpng.patch ./configure --prefix=/usr --without-doxygen make } diff --git a/community/gmerlin/libpng.patch b/community/gmerlin/libpng.patch new file mode 100644 index 000000000..c01105e63 --- /dev/null +++ b/community/gmerlin/libpng.patch @@ -0,0 +1,17 @@ +diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c +--- gmerlin-1.0.0/plugins/png/ir_png.c 2011-01-07 18:37:06.000000000 +0300 ++++ gmerlin-1.0.0.my/plugins/png/ir_png.c 2011-11-07 14:46:25.000000000 +0400 +@@ -127,13 +127,8 @@ + bits = 16; + } + if(bit_depth < 8) +-#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9) +- png_set_gray_1_2_4_to_8(png->png_ptr); +-#else + png_set_expand_gray_1_2_4_to_8(png->png_ptr); +-#endif + +- png_set_gray_1_2_4_to_8(png->png_ptr); + if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS)) + { + png_set_tRNS_to_alpha(png->png_ptr); diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 70605b513..d1a2797ac 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48949 2011-06-08 09:13:19Z spupykin $ +# $Id: PKGBUILD 58159 2011-11-07 11:17:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> pkgname=lazarus -pkgver=0.9.30 -pkgrel=2 +pkgver=0.9.30.2 +pkgrel=1 pkgdesc='Delphi-like IDE for FreePascal' url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') @@ -13,7 +13,7 @@ depends=('fpc' 'fpc-src' 'gtk2') #makedepends=(rpmextract) options=('!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2) -md5sums=('5ece11700df569ebb518ccca37d93f1d') +md5sums=('0dcf54613c2f9d38a32d183431e2dfc9') build() { cd $srcdir/${pkgname} diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 1339b6ac7..f97dc3be9 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=17.3 -pkgrel=2 +pkgver=17.4 +pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('791fa4730f82da66d539c0d4e82441a9') +md5sums=('9d8b33fe0edbc54a6ebc8050dec7d56b') build() { cd ${pkgname}-${pkgver} diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index a2a11ec9e..f68636212 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129976 2011-06-30 17:57:50Z thomas $ +# $Id: PKGBUILD 142292 2011-11-08 00:30:49Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.3.1 +pkgver=1.4.0 pkgrel=2 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/" @@ -13,24 +13,26 @@ conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook - encrypt_install) -sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' - 'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' - 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') - + encrypt_install + cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch) +sha256sums=('96d682853c8019cfeae0b21250cd2d00af42e46251807e8dbda2ff8427c2e9ed' + '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573' + '6fa1d3172014ba3ba96f7a67acbcae7f26b24a61abb84b3917f526a54f81dd87') build() { - cd $srcdir/$pkgname-${pkgver} + cd "${srcdir}"/$pkgname-${pkgver} + patch -p0 -i "${srcdir}"/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib make } package() { - cd $srcdir/$pkgname-${pkgver} - make DESTDIR=$pkgdir install + cd "${srcdir}"/$pkgname-${pkgver} + make DESTDIR="${pkgdir}" install # install hook - install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt - install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt # Fix pkgconfig location - install -d -m755 $pkgdir/usr/lib - mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ + install -d -m755 "${pkgdir}"/usr/lib + mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/ } diff --git a/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch b/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch new file mode 100644 index 000000000..f35226122 --- /dev/null +++ b/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch @@ -0,0 +1,94 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (Revision 664) ++++ ChangeLog (Revision 665) +@@ -1,3 +1,6 @@ ++2011-10-27 Milan Broz <mbroz@redhat.com> ++ * Fix crypt_get_volume_key_size() for plain device. ++ + 2011-10-25 Milan Broz <mbroz@redhat.com> + * Print informative message in isLuks only in verbose mode. + * Version 1.4.0. +Index: tests/api-test.c +=================================================================== +--- tests/api-test.c (Revision 664) ++++ tests/api-test.c (Revision 665) +@@ -660,6 +660,11 @@ + + FAIL_(crypt_init_by_name_and_header(&cd, CDEVICE_1, H_DEVICE),"can't init plain device by header device"); + OK_(crypt_init_by_name(&cd, CDEVICE_1)); ++ OK_(strcmp(cipher_mode,crypt_get_cipher_mode(cd))); ++ OK_(strcmp(cipher,crypt_get_cipher(cd))); ++ EQ_((int)key_size, crypt_get_volume_key_size(cd)); ++ EQ_(params.skip, crypt_get_iv_offset(cd)); ++ EQ_(params.offset, crypt_get_data_offset(cd)); + OK_(crypt_deactivate(cd, CDEVICE_1)); + crypt_free(cd); + +Index: lib/setup.c +=================================================================== +--- lib/setup.c (Revision 664) ++++ lib/setup.c (Revision 665) +@@ -56,6 +56,7 @@ + char *plain_cipher; + char *plain_cipher_mode; + char *plain_uuid; ++ unsigned int plain_key_size; + + /* used in CRYPT_LOOPAES */ + struct crypt_params_loopaes loopaes_hdr; +@@ -677,6 +678,7 @@ + (*cd)->plain_hdr.hash = NULL; /* no way to get this */ + (*cd)->plain_hdr.offset = dmd.offset; + (*cd)->plain_hdr.skip = dmd.iv_offset; ++ (*cd)->plain_key_size = dmd.vk->keylength; + + r = crypt_parse_name_and_mode(dmd.cipher, cipher, NULL, cipher_mode); + if (!r) { +@@ -754,6 +756,7 @@ + return -EINVAL; + } + ++ cd->plain_key_size = volume_key_size; + cd->volume_key = crypt_alloc_volume_key(volume_key_size, NULL); + if (!cd->volume_key) + return -ENOMEM; +@@ -1516,7 +1519,7 @@ + } + + r = process_key(cd, cd->plain_hdr.hash, +- cd->volume_key->keylength, ++ cd->plain_key_size, + passphrase, passphrase_size, &vk); + if (r < 0) + goto out; +@@ -1586,7 +1589,7 @@ + goto out; + + r = process_key(cd, cd->plain_hdr.hash, +- cd->volume_key->keylength, ++ cd->plain_key_size, + passphrase_read, passphrase_size_read, &vk); + if (r < 0) + goto out; +@@ -1658,8 +1661,7 @@ + if (!name) + return -EINVAL; + +- if (!volume_key || !volume_key_size || !cd->volume_key || +- volume_key_size != cd->volume_key->keylength) { ++ if (!volume_key || !volume_key_size || volume_key_size != cd->plain_key_size) { + log_err(cd, _("Incorrect volume key specified for plain device.\n")); + return -EINVAL; + } +@@ -1976,8 +1978,8 @@ + + int crypt_get_volume_key_size(struct crypt_device *cd) + { +- if (isPLAIN(cd->type) && cd->volume_key) +- return cd->volume_key->keylength; ++ if (isPLAIN(cd->type)) ++ return cd->plain_key_size; + + if (isLUKS(cd->type)) + return cd->hdr.keyBytes; diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 54aaa2236..956b18023 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -41,6 +41,7 @@ run_hook () DEPRECATED_CRYPT=0 cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" + cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)" else DEPRECATED_CRYPT=1 cryptdev="${root}" @@ -52,13 +53,28 @@ run_hook () echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." } + OLDIFS="${IFS}" + IFS="," + for cryptopt in ${cryptoptions}; do + case ${cryptopt} in + allow-discards) + echo "Enabling TRIM/discard support." + cryptargs="${cryptargs} --allow-discards" + ;; + *) + echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + ;; + esac + done + IFS="${OLDIFS}" + if poll_device "${cryptdev}" ${rootdelay}; then if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then - if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then + if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -70,7 +86,7 @@ run_hook () echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password - while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do + while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -90,7 +106,7 @@ run_hook () err "Non-LUKS decryption not attempted..." return 1 fi - exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" + exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}" tmp=$(echo "${crypto}" | cut -d: -f1) [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" tmp=$(echo "${crypto}" | cut -d: -f2) diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index a644e33fa..00971c5f7 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,32 +1,42 @@ -# $Id: PKGBUILD 108145 2011-01-30 11:04:13Z andyrtr $ +# $Id: PKGBUILD 142294 2011-11-08 00:38:03Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed pkgver=1.5 -pkgrel=2 -pkgdesc="A POSIX-compliant line editor" +pkgrel=4 +pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/ed/ed.html" -install=ed.install depends=('glibc' 'sh') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) md5sums=('e66c03d7e4c67b025d5b6093ec678267') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/ \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" - make || return 1 + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + "CFLAGS=$CFLAGS" \ + "LDFLAGS=$LDFLAGS" + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make "DESTDIR=$pkgdir" install - cd ${pkgdir}/usr/share/info - ln ed.info red.info + # nuke info pages + rm -r "$pkgdir/usr/share/info" } diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index ec50d99c8..7712b6f5d 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 133067 2011-07-27 11:57:16Z stephane $ +# $Id: PKGBUILD 142277 2011-11-07 20:10:07Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64) url="http://www.kernel.org" diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index e65f419df..0459b25ab 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $ +# $Id: PKGBUILD 142296 2011-11-08 00:38:05Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=module-init-tools pkgver=3.16 -pkgrel=1 -pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" +pkgrel=2 +pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64') -url="http://kerneltools.org" +url="https://modules.wiki.kernel.org" license=('GPL') depends=('glibc') makedepends=('docbook2x') backup=('etc/modprobe.d/modprobe.conf') -source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 +source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" modprobe.conf docfix.patch) md5sums=('bc44832c6e41707b8447e2847d2019f5' - '316f1bda4c21af02b30252eb014a0a55' + '325657db471b3190f685e5a89c9b90e3' '4320d19902ded43bed55c804b065cdc7') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # fix headers in SGML manpage sources and an XML typo patch -Np0 < "$srcdir/docfix.patch" @@ -30,10 +31,13 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR=$pkgdir install + # extra modprobe.d conf dir + install -dm755 "$pkgdir/lib/modprobe.d" + # Install our custom (read: empty) modprobe.conf - install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf + install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" } diff --git a/core/module-init-tools/modprobe.conf b/core/module-init-tools/modprobe.conf index 83865a3af..551bdfbdf 100644 --- a/core/module-init-tools/modprobe.conf +++ b/core/module-init-tools/modprobe.conf @@ -1,3 +1,3 @@ # -# /etc/modprobe.d/modprobe.conf (for v2.6 kernels) +# /etc/modprobe.d/modprobe.conf # diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD index dfded5632..9903edb53 100644 --- a/extra/allegro/PKGBUILD +++ b/extra/allegro/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141200 2011-10-25 22:29:00Z eric $ +# $Id: PKGBUILD 142269 2011-11-07 18:27:05Z eric $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro -pkgver=5.0.4 -pkgrel=2 +pkgver=5.0.5 +pkgrel=1 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('i686' 'x86_64') url="http://alleg.sourceforge.net/" @@ -13,7 +13,7 @@ license=('custom') depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') makedepends=('cmake' 'mesa' 'freetype2') source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) -md5sums=('e2e314ee7116c7efddd0497d6c885e46') +md5sums=('4d879afe7062f7dc9b8913cba2e44bdf') build() { cd "${srcdir}" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 66ff38ae1..c8d527923 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140847 2011-10-20 05:41:50Z ibiru $ +# $Id: PKGBUILD 142273 2011-11-07 19:57:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter pkgver=1.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -13,16 +13,19 @@ options=('!libtool') license=('LGPL') depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fallback.patch::http://git.gnome.org/browse/clutter/patch/?id=f05432d57e5e980d0841fd6c13a7f886a46107fe) +sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f' + '30c3c1dfdf1c74e8a7dc2cc6eac305127b7441504cb7040b7cf8d46a4b67fdd9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/fallback.patch ./configure --prefix=/usr --enable-introspection make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index f81d854d0..543348b26 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141204 2011-10-26 00:39:40Z bisson $ +# $Id: PKGBUILD 142242 2011-11-07 05:35:59Z bisson $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky -pkgver=1.8.2git20111026 +pkgver=1.8.2git20111107 pkgrel=1 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' @@ -16,7 +16,7 @@ makedepends=('pkg-config' 'docbook2x') depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('735861b284ad4feb86a9febaf4e457a4fcc7b39b') +sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c') # git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz @@ -27,7 +27,7 @@ build() { sh autogen.sh - CPPFLAGS="$CXXFLAGS" LIBS="$LDFLAGS" ./configure \ + CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --enable-ibm \ diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 5e4cc8fc1..861879622 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141134 2011-10-24 16:36:03Z ibiru $ +# $Id: PKGBUILD 142286 2011-11-07 20:59:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.1.1 +pkgver=3.2.1.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2b4ce3184fcd8c2260654f925e4055a7e02513c5eefa4745bcdf82c9039b7681') +sha256sums=('44e149ecadce6269a6d31d93bbd7d4a4bda8d092d4e95de9d5ca09cf067d8ab7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 94d5475bc..6865f4fdc 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 140891 2011-10-20 05:42:38Z ibiru $ +# $Id: PKGBUILD 142279 2011-11-07 20:29:49Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-documents pkgver=0.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" license=('GPL') groups=('gnome-extra') -depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') -makedepends=('intltool' 'vala') +depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') +makedepends=('intltool') optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD index 8b8e86e0b..7adbebf17 100644 --- a/extra/gtk-sharp-2/PKGBUILD +++ b/extra/gtk-sharp-2/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 72892 2010-03-21 15:11:50Z ibiru $ +# $Id: PKGBUILD 142257 2011-11-07 12:49:15Z jgc $ # Maintainer: tobias <tobias@archlinux.org> pkgname=gtk-sharp-2 -pkgver=2.12.10 +pkgver=2.12.11 pkgrel=1 pkgdesc="gtk2 bindings for C#" arch=(i686 x86_64) license=('LGPL') url="http://gtk-sharp.sourceforge.net" -depends=('mono>=2.4' 'libglade>=2.6.4' 'gtk2>=2.18.0') +depends=('mono' 'libglade' 'gtk2') makedepends=('pkgconfig' 'monodoc') conflicts=('gtk#') options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12/gtk-sharp-${pkgver}.tar.bz2) -sha256sums=('aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770') +source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2) +md5sums=('c278da6a472c6c13b698af012f543c64') build() { # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="${srcdir}/weird" + export MONO_SHARED_DIR="${srcdir}/wapi" mkdir -p "${MONO_SHARED_DIR}" cd "${srcdir}/gtk-sharp-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \ - DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/gtk-sharp-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD index 68ac77c7f..21eca6bfb 100644 --- a/extra/libdatrie/PKGBUILD +++ b/extra/libdatrie/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 87837 2010-08-18 12:55:23Z jgc $ +# $Id: PKGBUILD 142248 2011-11-07 09:16:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libdatrie -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe." -url="http://linux.thai.net/~thep/datrie/datrie.html" +url="http://linux.thai.net/projects/datrie" license=('LGPL') arch=('i686' 'x86_64') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz) -md5sums=('7f7d592114f98db9e4c7171c3f2befc5') +md5sums=('c9b057d07198d66e1ac2eff32937d3d4') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD index 818b8611e..f61136bb1 100644 --- a/extra/libthai/PKGBUILD +++ b/extra/libthai/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 118469 2011-04-07 08:07:24Z jgc $ +# $Id: PKGBUILD 142250 2011-11-07 09:20:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libthai -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" arch=('i686' 'x86_64') license=('LGPL') -depends=('libdatrie>=0.2.3') +depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3bc6d925eae36317aac8676be49a5741') +md5sums=('631ae09f531db6c94aedcc7ce226d6a5') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index 558a3ed1a..bd8338961 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141238 2011-10-27 04:35:26Z eric $ +# $Id: PKGBUILD 142271 2011-11-07 18:53:02Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto -pkgver=0.2.1 +pkgver=0.2.3 pkgrel=1 pkgdesc="An image viewer for Xfce" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ makedepends=('intltool') options=('!libtool') groups=('xfce4-goodies') install=ristretto.install -source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2) -md5sums=('df5c2082013f4ad2fc49cd7c25965741') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('62924c8abf17a921262ea9987ff8f5db') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index edf4ef0bb..b1d9e01d6 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140378 2011-10-11 21:33:02Z jgc $ +# $Id: PKGBUILD 142261 2011-11-07 13:08:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/" @@ -28,6 +28,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch 0005-Correct-bounds-check-of-blitClip-array-access.patch xserver19.patch + fix-xv-crash.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -45,6 +46,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '5e288526bfa2c534f1feabdb571da16da8a1c7a6' 'e86d702cb0b5e9bf43ff732696229965e176db7c' 'b5f260bed7e705808ec05620316e503ed5d52ee5' + '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -64,6 +66,7 @@ build() { patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch" patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch" patch -Np1 -i "${srcdir}/xserver19.patch" + patch -Np0 -i "${srcdir}/fix-xv-crash.patch" sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h diff --git a/extra/xf86-video-sisimedia/fix-xv-crash.patch b/extra/xf86-video-sisimedia/fix-xv-crash.patch new file mode 100644 index 000000000..57e6adec5 --- /dev/null +++ b/extra/xf86-video-sisimedia/fix-xv-crash.patch @@ -0,0 +1,11 @@ +--- src/sis_video.c 2008-10-01 09:44:01.000000000 +0200 ++++ src/sis_video.c.new 2011-10-17 14:23:07.000000000 +0200 +@@ -1121,7 +1121,7 @@ + adapt->GetPortAttribute = SISGetPortAttribute; + adapt->QueryBestSize = SISQueryBestSize; + adapt->PutImage = SISPutImage; +- adapt->ReputImage = SISReputImage; ++ adapt->ReputImage = NULL; + adapt->QueryImageAttributes = SISQueryImageAttributes; + + /* gotta uninit this someplace */ diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 48f500bb4..7145bb168 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141677 2011-11-02 06:41:51Z andyrtr $ +# $Id: PKGBUILD 142252 2011-11-07 09:31:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.1.902 +pkgver=1.11.2 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -14,18 +14,18 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch revert-trapezoids.patch - #git-fixes.patch + git-fixes.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('235a5d77420df21c8a8eed34e196168bafdbb02b' - '0249b892f27243d8fe6fe6d226bf4c2391cedf49' - '962fecc159c128728f14e8ba231c5b00391ff4ac' - 'd9f7d9553e772c2682c15079019d30c658a4f83b' - #'cd9291fe1fa1b497aa74675afeeb025fe6b23b95' - 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' - '6838fc00ef4618c924a77e0fb03c05346080908a' - '993798f3d22ad672d769dae5f48d1fa068d5578f') +md5sums=('8796fff441e5435ee36a72579008af24' + '6c7e87d63ac4b535e19a80c89d0cf091' + 'f8194638ca4872c2b0a67862a70bcebf' + 'f6c84f4936f8e00abdfbd9fb4eda83fb' + 'b9cdb3855cc2b2e974a98b9a20d1ec2b' + '52fd3effd80d7bc6c1660d4ecf23d31c' + '376c70308715cd2643f7bff936d9934b' + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -40,7 +40,7 @@ build() { patch -Np1 -i "${srcdir}/revert-trapezoids.patch" # Add post-release patches from 1.11 branch - #patch -Np1 -i "${srcdir}/git-fixes.patch" + patch -Np1 -i "${srcdir}/git-fixes.patch" autoreconf -fi ./configure --prefix=/usr \ diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch index a62524bdb..9629b3040 100644 --- a/extra/xorg-server/git-fixes.patch +++ b/extra/xorg-server/git-fixes.patch @@ -1,56 +1,117 @@ -From f80d23357874db19bc124dee70239fb182977883 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Mon, 17 Oct 2011 20:26:12 +0000 -Subject: Fix CVE-2011-4028: File disclosure vulnerability. - -use O_NOFOLLOW to open the existing lock file, so symbolic links -aren't followed, thus avoid revealing if it point to an existing -file. - -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -(cherry picked from commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34) +From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Thu, 20 Oct 2011 13:43:01 +0000 +Subject: xf86Crtc: handle no outputs with no modes harder. + +If you started an X server with no connected outputs, we pick a default +1024x768 mode, however if you then ran an xvidmode using app against that +server it would segfault the server due to not finding any valid modes. + +This was due to the no output mode set code, only adding the modes to the +scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would +get called and remove all the modes and we'd end up with 0. + +This change fixes xf86SetScrnInfoModes to always report a scrn mode of at +least 1024x768, and pushes the initial configuration to just call it instead +of setting up the mode itself. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926 + +I've seen other bugs like this on other distros so it might also actually fix them. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3) --- -diff --git a/os/utils.c b/os/utils.c -index 36cb46f..9e0acb6 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -316,7 +316,7 @@ LockServer(void) - /* - * Read the pid from the existing file - */ -- lfd = open(LockFile, O_RDONLY); -+ lfd = open(LockFile, O_RDONLY|O_NOFOLLOW); - if (lfd < 0) { - unlink(tmp); - FatalError("Can't read lock file %s\n", LockFile); +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index d75cd77..8906806 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) + break; + } + +- if (scrn->modes != NULL) { +- /* For some reason, scrn->modes is circular, unlike the other mode +- * lists. How great is that? +- */ +- for (last = scrn->modes; last && last->next; last = last->next) +- ; +- last->next = scrn->modes; +- scrn->modes->prev = last; +- if (mode) { +- while (scrn->modes != mode) +- scrn->modes = scrn->modes->next; +- } ++ if (!scrn->modes) { ++ scrn->modes = xf86ModesAdd(scrn->modes, ++ xf86CVTMode(scrn->display->virtualX, ++ scrn->display->virtualY, ++ 60, 0, 0)); ++ } ++ ++ /* For some reason, scrn->modes is circular, unlike the other mode ++ * lists. How great is that? ++ */ ++ for (last = scrn->modes; last && last->next; last = last->next) ++ ; ++ last->next = scrn->modes; ++ scrn->modes->prev = last; ++ if (mode) { ++ while (scrn->modes != mode) ++ scrn->modes = scrn->modes->next; + } ++ + scrn->currentMode = scrn->modes; + #ifdef XFreeXDGA + if (scrn->pScreen) +@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + width, height); + } + +- if (have_outputs) { +- /* Mirror output modes to scrn mode list */ +- xf86SetScrnInfoModes (scrn); +- } else { +- /* Clear any existing modes from scrn->modes */ +- while (scrn->modes != NULL) +- xf86DeleteMode(&scrn->modes, scrn->modes); +- scrn->modes = xf86ModesAdd(scrn->modes, +- xf86CVTMode(width, height, 60, 0, 0)); +- } ++ xf86SetScrnInfoModes (scrn); + + success = TRUE; + bailout: -- cgit v0.9.0.2-2-gbebe -From 12f65819ffb04103f170ecd7e281348de618fc4c Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Mon, 17 Oct 2011 20:27:35 +0000 -Subject: Fix CVE-2011-4029: File permission change vulnerability. - -Use fchmod() to change permissions of the lock file instead -of chmod(), thus avoid the race that can be exploited to set -a symbolic link to any file or directory in the system. - -Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -(cherry picked from commit b67581cf825940fdf52bf2e0af4330e695d724a4) +From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001 +From: Christopher Yeleighton <giecrilj@stegny.2a.pl> +Date: Tue, 25 Oct 2011 01:47:06 +0000 +Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 + +https://bugs.freedesktop.org/show_bug.cgi?id=38420 + +Exit with fatal error message, not segfault. + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995) --- -diff --git a/os/utils.c b/os/utils.c -index 9e0acb6..d9aa65e 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -295,7 +295,7 @@ LockServer(void) - FatalError("Could not create lock file in %s\n", tmp); - (void) sprintf(pid_str, "%10ld\n", (long)getpid()); - (void) write(lfd, pid_str, 11); -- (void) chmod(tmp, 0444); -+ (void) fchmod(lfd, 0444); - (void) close(lfd); +diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c +index 31ed505..dce3f84 100644 +--- a/hw/vfb/InitOutput.c ++++ b/hw/vfb/InitOutput.c +@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) + (1 << DirectColor)), + 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); + break; ++ default: ++ return FALSE; + } - /* + miSetPixmapDepths (); -- cgit v0.9.0.2-2-gbebe diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 2d2aba652..d92a363c6 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,31 +1,45 @@ # $Id$ -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: William Rea <sillywilly@gmail.com> +# Arch Contributor: Alexander Fehr <pizzapunk gmail com> +# Arch Contributor: William Rea <sillywilly@gmail.com> +# Arch maintainer: Gaetan Bisson <bisson@archlinux.org> +# Parabola maintainer: Brendan Tildesley pkgname=audacious-plugins-libre -pkgver=2.5.1 -pkgrel=2 +pkgver=3.0.4 +pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' -arch=('i686' 'x86_64') url='http://audacious-media-player.org/' -license=('GPL') +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'custom') + +# Licensing issues: +# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice +# but I've been informed by an upstream dev, <nenolod>, that they are all GPL of some type. +# +# The plugin 'psf' is currently BSD+noncommercial, but is apparently being changed to GPL. +# However, 'psf' is apparently an emulator for running non-free code, so I'll leave it out. +# +# All the other custom licensed plugins I think are mostly modified BSD or ISC. + provides=("audacious-plugins=$pkgver") replaces=("${pkgname%-libre}") conflicts=("${pkgname%-libre}") makedepends=("audacious>=${pkgver}" - 'alsa-lib' 'pulseaudio' 'jack' 'lame' 'libvorbis' 'flac' - 'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' + 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' + 'mpg123' 'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' 'libnotify' 'lirc-utils' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') -optdepends=('alsa-lib: Advanced Linux Sound Arch. output' +optdepends=('oss: Open Sound System v4 output' + 'alsa-lib: Advanced Linux Sound Arch. output' 'pulseaudio: PulseAudio output' - 'jack: Jack Audio Connection Kit output' + 'jack2: Jack Audio Connection Kit output' 'lame: FileWriter MP3 output' 'libvorbis: Vorbis input, FileWriter Vorbis output' 'flac: FLAC input, FileWriter FLAC output' + 'mpg123: MP3 input' 'faad2: AAC input' 'ffmpeg: ffaudio input' 'fluidsynth: MIDI FluidSynth backend input' @@ -42,44 +56,79 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output' 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -source=("http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz") +# Temporary source location +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz") +sha1sums=('eaf3fa55987ed60d1c99983453d2b89a30087b7e') -# Source PKGBUILD and run this function from the shell +# Retrieve upstream & remove plugins 'psf' & 'usf' due to unfree license. Repackage as -libre mksource(){ - tmpdir=$(mktemp -d /tmp/audacious-XXXX) - pushd $tmpdir >/dev/null - wget "http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tgz" -O - -q | tar xzf - - - rm -rvf ${pkgname%-libre}-$pkgver/src/{u,p}sf/ - - mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver + [ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz + tar xzf ${pkgname%-libre}-${pkgver}.tar.gz - tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/ + rm -rvf ${pkgname%-libre}-$pkgver/src/{p,u}usf/ + sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure - echo "You can find the sources at $tmpdir" + mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver + tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/ + rm -rf ${pkgname}-${pkgver} + echo "${pkgname}-${pkgver}.tar.gz is your new -libre source package." - popd >/dev/null } build() { - cd "$srcdir/$pkgname-$pkgver" - - sed 's/libavcore >= 0.12.0//g' -i configure # FS#23549 - - [[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2' - ./configure \ - --prefix=/usr \ - --enable-chardet \ - --enable-amidiplug \ - --disable-adplug \ - --disable-psf \ - $extraopts \ - + cd "${srcdir}/${pkgname}-${pkgver}" + + # hack to enable global hotkeys with gtk3 + sed -e 's/gdk-x11-2.0/gdk-x11-3.0/g' -i configure + + # Get license notices out of custom-licensed packages + cd src + tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX) + head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart + head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa + head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum + head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor + head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade + head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer + head -n 17 daemon/daemon.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.daemon + head -n 22 dockalbumart/dockalbumart.c | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart + head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki + head -n 17 mixdown/mixdown.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mixdown + head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 + head -n 17 openal/openal.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal + head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample + head -n 18 roaraudio-vio/roaraudio-vio.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.roaraudio-vio + head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io + head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal + head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs + l=${pkgdir}/usr/share/licenses/${pkgname}/ + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + cd .. + pushd $tmpdir + install -m644 LICENSE.albumart $l + install -m644 LICENSE.alsa $l + install -m644 LICENSE.cairo-spectrum $l + install -m644 LICENSE.compressor $l + install -m644 LICENSE.crossfade $l + install -m644 LICENSE.crystalizer $l + install -m644 LICENSE.daemon $l + install -m644 LICENSE.dockalbumart $l + install -m644 LICENSE.lyricwiki $l + install -m644 LICENSE.mixdown $l + install -m644 LICENSE.mpg123 $l + install -m644 LICENSE.openal $l + install -m644 LICENSE.resample $l + install -m644 LICENSE.roaraudio-vio $l + install -m644 LICENSE.unix-io $l + install -m644 LICENSE.voice_removal $l + install -m644 LICENSE.xfs $l + popd + [[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2' + ./configure --prefix=/usr ${_extraopts} make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('510b325eb3b13621b6f0e6745f6d0961') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index cc77a04c3..b43796397 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,15 +5,15 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=2 +pkgrel=3 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib') -makedepends=('perl' 'clisp' 'ffcall') +makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam') +conflicts=('pdfjam' 'texlive-bin') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' @@ -24,7 +24,8 @@ source=('texmf.cnf' 'archlinux-build.patch' 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' - "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" + # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" + 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ @@ -46,7 +47,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147' '94ef5571a54262790ab64d6d044dd10c' '58e8ab64188eaf15897b7acf472dca9f' '9f7ae1aa24afd9e34289ac10a8f9e87b' - 'c9348d4381170204b1a1b0440d8b6918') + 'e7f0197559ef865d8c01683dab3b8526') build() { cd $srcdir @@ -55,7 +56,8 @@ build() { rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog} rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler} # Building LuaTeX - cd luatex-beta-${_luatex_ver} + # cd luatex-beta-${_luatex_ver} + cd luatex patch -p0 -i ../fix-fontforge-encoding.patch (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh) mkdir build @@ -73,6 +75,7 @@ build() { --without-system-icu \ --without-system-kpathsea \ --with-system-freetype2 \ + --with-system-xpdf \ --with-system-poppler \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ @@ -234,7 +237,7 @@ package() { rm -rf ${pkgdir}/usr/{texmf,texmf-dist} ## install luatex binary - cd $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c + cd $srcdir/luatex/build/texk/web2c ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/ cd $pkgdir/usr/bin /bin/ln -s luatex texlua diff --git a/staging/evince/PKGBUILD b/staging/evince/PKGBUILD new file mode 100644 index 000000000..e04df4b77 --- /dev/null +++ b/staging/evince/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 142265 2011-11-07 16:00:54Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=evince +pkgver=3.2.1 +pkgrel=2 +pkgdesc="Simply a document viewer" +url="http://projects.gnome.org/evince/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') +optdepends=('texlive-bin: DVI support') +groups=('gnome-extra') +install=evince.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/evince \ + --disable-static --enable-nautilus \ + --enable-pdf --enable-tiff \ + --enable-djvu --enable-dvi \ + --enable-t1lib --enable-comics \ + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/evince/evince.install b/staging/evince/evince.install new file mode 100644 index 000000000..9643a9ba0 --- /dev/null +++ b/staging/evince/evince.install @@ -0,0 +1,19 @@ +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 +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall evince + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD new file mode 100644 index 000000000..7b946ea78 --- /dev/null +++ b/staging/inkscape/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 142259 2011-11-07 12:58:22Z bisson $ +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=inkscape +pkgver=0.48.2 +pkgrel=4 +pkgdesc='Vector graphics editor using the SVG file format' +url='http://inkscape.sourceforge.net/' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +makedepends=('boost' 'pkg-config' 'intltool') +depends=('gc' 'gtkmm' 'poppler-glib' 'pyxml' 'libxslt' 'gsl' 'popt' 'python2' + 'gtkspell' 'imagemagick' 'desktop-file-utils' 'hicolor-icon-theme') +optdepends=('pstoedit: latex formulas' + 'texlive-core: latex formulas' + 'python2-numpy: some extensions' + 'python-lxml: some extensions and filters' + 'uniconvertor: reading/writing to some proprietary formats') +options=('!libtool') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py + sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py + sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp + sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py + sed -i 's|"python"|"python2"|g' src/main.cpp + + ./configure --prefix=/usr \ + --with-python \ + --with-perl \ + --without-gnome-vfs \ + --with-xft \ + --enable-lcms \ + --enable-poppler-cairo \ + --disable-dependency-tracking \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/staging/inkscape/install b/staging/inkscape/install new file mode 100644 index 000000000..6e803bf1d --- /dev/null +++ b/staging/inkscape/install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD index 9498e83fa..e500fa453 100644 --- a/staging/libreoffice/PKGBUILD +++ b/staging/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141701 2011-11-02 12:32:27Z andyrtr $ +# $Id: PKGBUILD 142267 2011-11-07 16:41:26Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -37,14 +37,14 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.4.2 pkgver=3.4.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost' #- we use internal one for now that has some gcc4.6 fixes. + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost' 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' @@ -89,7 +89,6 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - #http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt @@ -104,6 +103,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_ct2n.diff vbahelper.visibility.patch scp2-more-reasonable-file-access-rights.diff + oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 @@ -140,9 +140,7 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ) + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' 'db423cbb1cee416b718138044a5de930' '31944d2139d6d81ef1131bd513530621' @@ -202,9 +200,9 @@ md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' '37638431e7e40baf2e47966ebb9bc0e9' + '3c6c62e77c30649a3dfe73512947cc9a' 'eb35d4c715e0dfc23bbc706996033829') - build() { unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS @@ -233,6 +231,7 @@ build() { patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + patch -Np1 -i ${srcdir}/oracle-recognition.diff patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff # unset C(XX)FLAGS diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD new file mode 100644 index 000000000..a07f2f24f --- /dev/null +++ b/staging/poppler/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 142254 2011-11-07 10:16:14Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=poppler +pkgname=('poppler' 'poppler-glib' 'poppler-qt') +pkgver=0.18.1 +pkgrel=1 +arch=(i686 x86_64) +license=('GPL') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://poppler.freedesktop.org/" +_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 + git-fixes.patch) +md5sums=('d30e883a27423c936ef338ce1d967e2d' + '9dc64c254a31e570507bdd4ad4ba629a' + 'a73ba6515aa73cb20c480692da52c79e') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' configure.ac + patch -Np1 -i "${srcdir}/git-fixes.patch" + + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-cairo-output \ + --enable-xpdf-headers \ + --enable-libjpeg --enable-zlib \ + --enable-poppler-qt4 \ + --enable-poppler-glib + make +} + +check() { + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} + make check +} + +package_poppler() { + pkgdesc="PDF rendering library based on xpdf 3.0" + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + conflicts=("poppler-qt3<${pkgver}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^glib_subdir =.*/glib_subdir =/' \ + -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc +} + +package_poppler-glib() { + pkgdesc="Poppler glib bindings" + depends=("poppler=${pkgver}" 'glib2') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/glib" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* + rm -f "${pkgdir}/usr/bin/poppler-glib-demo" +} + +package_poppler-qt() { + pkgdesc="Poppler Qt bindings" + depends=("poppler=${pkgver}" 'qt') + + cd "${srcdir}/${pkgbase}-${pkgver}/poppler" + make DESTDIR="${pkgdir}" install-libLTLIBRARIES + cd "${srcdir}/${pkgbase}-${pkgver}/qt4" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/lib/pkgconfig" + install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" + rm -f "${pkgdir}"/usr/lib/libpoppler.* +} diff --git a/staging/poppler/git-fixes.patch b/staging/poppler/git-fixes.patch new file mode 100644 index 000000000..a18a31aec --- /dev/null +++ b/staging/poppler/git-fixes.patch @@ -0,0 +1,107 @@ +From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:02:19 +0000 +Subject: pdftocairo: Make sure beginDocument() is always called + +This fixes a crash when rendering only odd/even pages in a printing +format. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index e458ee5..1b67c90 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) { + lastPage = firstPage; + } + ++ // Make sure firstPage is always used so that beginDocument() is called ++ if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ firstPage++; ++ + cairoOut = new CairoOutputDev(); + cairoOut->startDoc(doc->getXRef(), doc->getCatalog()); + if (sz != 0) +-- +cgit v0.9.0.2-2-gbebe +From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:08:46 +0000 +Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable + +This fixes an error in my previous commit. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index 1b67c90..d0d1ec6 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) { + } + + // Make sure firstPage is always used so that beginDocument() is called +- if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1)) + firstPage++; + + cairoOut = new CairoOutputDev(); +-- +cgit v0.9.0.2-2-gbebe +From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Tue, 01 Nov 2011 08:40:53 +0000 +Subject: Fix pkg-config files + +We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ +--- +diff --git a/configure.ac b/configure.ac +index 3a120ca..c4f5b92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then + POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" + + GLIB_REQUIRED=2.18 ++ AC_SUBST(GLIB_REQUIRED) + AC_ARG_ENABLE(poppler-glib, + AC_HELP_STRING([--disable-poppler-glib], + [Don't compile poppler glib wrapper.]), +diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in +index 55a2278..5fcb6f2 100644 +--- a/poppler-glib-uninstalled.pc.in ++++ b/poppler-glib-uninstalled.pc.in +@@ -1,7 +1,7 @@ + Name: poppler-glib + Description: GLib wrapper for poppler - uninstalled + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + + Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/glib +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 3264ed6..e15e669 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -6,7 +6,7 @@ includedir=${prefix}/include + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @POPPLER_VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in +index 04d9bb9..9ba8978 100644 +--- a/poppler-glib.pc.in ++++ b/poppler-glib.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/tracker/PKGBUILD b/staging/tracker/PKGBUILD new file mode 100644 index 000000000..c76415b48 --- /dev/null +++ b/staging/tracker/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 142275 2011-11-07 20:05:58Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.12.7 +_tver=${pkgver%.*} +pkgrel=2 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' + 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' + 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) +sha256sums=('e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/staging/tracker/tracker.install b/staging/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/staging/tracker/tracker.install @@ -0,0 +1,13 @@ +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 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/pixman/PKGBUILD b/testing/pixman/PKGBUILD new file mode 100644 index 000000000..d0e6db20c --- /dev/null +++ b/testing/pixman/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142246 2011-11-07 09:08:59Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> + +pkgname=pixman +pkgver=0.24.0 +pkgrel=1 +pkgdesc="Pixman library" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org" +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD new file mode 100644 index 000000000..669ab698f --- /dev/null +++ b/testing/telepathy-gabble/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 142288 2011-11-07 21:16:38Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Daniel Balieiro <daniel@balieiro.com> +# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> +pkgname=telepathy-gabble +pkgver=0.14.0 +pkgrel=1 +pkgdesc="A Jabber/XMPP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL2.1') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +makedepends=('libxslt' 'python2') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) +install=telepathy-gabble.install +md5sums=('73afa5533833d176b9b82b96351efe63') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy --with-tls=openssl + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-gabble/telepathy-gabble.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD new file mode 100644 index 000000000..ddc67d884 --- /dev/null +++ b/testing/telepathy-mission-control/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 142283 2011-11-07 20:46:50Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Ju Liu <liuju86 at gmail dot com> +# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> +# Contributor: Andreas Zwinkau <beza1e1@web.de> +pkgname=telepathy-mission-control +pkgver=5.10.0 +pkgrel=1 +pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/Mission Control" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgnome-keyring') +makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) +md5sums=('d69e52faf92bab51f3e49ddf7593f3c0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-mission-control/telepathy-mission-control.install b/testing/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/testing/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} |