diff options
50 files changed, 890 insertions, 98 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5f07b3ecc..0ef924973 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55681 2011-09-17 19:15:18Z giovanni $ +# $Id: PKGBUILD 55873 2011-09-24 07:43:10Z 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.19 +pkgver=0.8.20 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch') -md5sums=('156c1fb275b774ce971f4ef820b9885d' +md5sums=('1b14bd08233302e3475d9dca0e0941e7' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index c84ee1806..704b9ea0c 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48542 2011-06-01 17:05:37Z stephane $ +# $Id: PKGBUILD 55877 2011-09-24 16:48:18Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.5 -pkgrel=4 +pkgrel=5 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index eb089f8ec..9c55871e2 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 49329 2011-06-14 11:51:15Z stephane $ +# $Id: PKGBUILD 55879 2011-09-24 16:48:26Z stephane $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> #Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=clementine pkgver=0.7.1 -pkgrel=6 +pkgrel=7 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') diff --git a/community/clementine/clementine.install b/community/clementine/clementine.install index 2d71a7563..2f0338d8a 100644 --- a/community/clementine/clementine.install +++ b/community/clementine/clementine.install @@ -1,5 +1,6 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } post_upgrade() { diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD index 5529afb8d..ad91cbccd 100644 --- a/community/conkeror-git/PKGBUILD +++ b/community/conkeror-git/PKGBUILD @@ -1,10 +1,10 @@ # Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> -_commit=0b48f8c21f90f26e78f06c15e144d85683981b85 +_commit=c53588e0e42330f65e8c3be41900900da17a7eda pkgname=conkeror-git pkgver=1.0pre -pkgrel=1 +pkgrel=2 pkgdesc="A highly programmable web browser based on Mozilla XULRunner." arch=('i686' 'x86_64') url="http://conkeror.mozdev.org/" diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 8d00cdc7f..0e8da2e6c 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51056 2011-07-04 16:35:05Z spupykin $ +# $Id: PKGBUILD 55881 2011-09-24 16:48:32Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.10 -pkgrel=6 +pkgrel=7 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 97fe39330..ee33c221c 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55150 2011-09-04 08:52:45Z lcarlier $ +# $Id: PKGBUILD 55911 2011-09-24 19:25:08Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.3 +pkgver=2.99.4 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') @@ -20,14 +20,14 @@ url="http://gambas.sourceforge.net/" license=('GPL') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'zlib' 'mesa' 'libgl' 'glew>=1.7.0' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('e576fa9e72863dab0196250cb35f2a9b' +md5sums=('4f918a701a862c7755b35d6eba988dad' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index ee878996f..a8db0394c 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 53049 2011-07-30 13:32:24Z ibiru $ +# $Id: PKGBUILD 55914 2011-09-24 20:06:05Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.7.5 +pkgver=0.8.0 pkgrel=1 -pkgdesc="Experimental port of Tomboy to C++ " +pkgdesc="A note taking application." arch=('i686' 'x86_64') url="http://live.gnome.org/Gnote" -license=('GPL') -depends=('gtkmm' 'gconf' 'gtkspell' 'libxslt') +license=('GPL3') +depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ccb8a4922f167d9727fbc69f559b722004fb6bad3af329dad1fe5e2a3d3d18b8') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f009852b264fb8754575524ef2937147c4d2c25eff97ecca507624ca8730c213') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,7 +22,7 @@ build() { --localstatedir=/var \ --libexecdir=/usr/lib/gnote \ --disable-scrollkeeper \ - --disable-schemas-install \ + --disable-schemas-compile \ --disable-static make } @@ -30,7 +30,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnote ${pkgdir}/etc/gconf/schemas/*.schemas - rm -rf ${pkgdir}/etc/ } diff --git a/community/gnote/gnote.install b/community/gnote/gnote.install index 780fae868..0f8eb1012 100644 --- a/community/gnote/gnote.install +++ b/community/gnote/gnote.install @@ -1,22 +1,21 @@ pkgname=gnote post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index a0fd143a3..b3f7c9cef 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52209 2011-07-21 16:34:07Z svenstaro $ +# $Id: PKGBUILD 55887 2011-09-24 16:48:53Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.35 -pkgrel=1 +pkgrel=2 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index e7d22d77c..bebe10722 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lightspark pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64') url='http://lightspark.sourceforge.net' diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index e90a96a3a..314eac204 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54517 2011-08-19 16:16:33Z stativ $ +# $Id: PKGBUILD 55891 2011-09-24 16:49:03Z stephane $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays pkgver=0.8 _pkgver=ed424ec77571 -pkgrel=3 +pkgrel=5 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 20d072bfb..ce90dd8a5 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55515 2011-09-13 21:33:10Z ebelanger $ +# $Id: PKGBUILD 55893 2011-09-24 16:49:07Z stephane $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=8 +pkgrel=9 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" license=('GPL') -depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ +depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47') optdepends=('performous-freesongs: free songs for performous') diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 08160bda1..2b246efc2 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.30.02 -pkgrel=1 +pkgver=5.30.01 +pkgrel=2 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' @@ -17,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('8a5a5451ddaae276abc9d2e263b29b88' +md5sums=('be7443a1b243c51b3c1ec435a5a9453e' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index 097da624d..fe9298029 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55517 2011-09-13 21:33:18Z ebelanger $ +# $Id: PKGBUILD 55897 2011-09-24 16:49:31Z stephane $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 2838b76b7..4d2318966 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54051 2011-08-12 21:19:26Z svenstaro $ +# $Id: PKGBUILD 55899 2011-09-24 16:49:39Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110812 + pkgver=1.99.git20110917 fi pkgrel=1 diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 2fa563d4c..2641d1f8f 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52636 2011-07-26 15:57:38Z svenstaro $ +# $Id: PKGBUILD 55901 2011-09-24 16:49:52Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=6 +pkgrel=7 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 7c7067615..a8c95d664 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55577 2011-09-14 10:56:19Z lfleischer $ +# $Id: PKGBUILD 55918 2011-09-24 21:57:57Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.43 +pkgver=4.44 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('84174925a0f2632cc5cd52b3503cf07b' - 'bc1280f59a117f01bb037d9376f9baf6' +md5sums=('c9dd51fc02b913ce5bf7b3fc12f9cb4a' + 'e86fc2578e5304ae5a7b586ce170f843' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index dbcd690af..60606f57c 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -5,7 +5,7 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64') url="http://super-tux.sourceforge.net/" @@ -19,6 +19,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + sed -i '/types\.h/d' src/addon/addon_manager.cpp cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . make } diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 1e200c83d..6b72e48c7 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55155 2011-09-04 13:08:06Z svenstaro $ +# $Id: PKGBUILD 55905 2011-09-24 16:50:06Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.09.01 -pkgrel=1 +pkgrel=3 pkgdesc="An open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index e2a882999..011918ae6 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47900 2011-05-26 00:39:20Z svenstaro $ +# $Id: PKGBUILD 55907 2011-09-24 16:50:18Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=16 _realver=build16 -pkgrel=2 +pkgrel=3 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 452f60d96..e0d99f4de 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55376 2011-09-10 20:15:39Z dreisner $ +# $Id: PKGBUILD 55922 2011-09-25 01:01:16Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=0.200 +pkgver=0.202 pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' @@ -16,7 +16,7 @@ optdepends=('tcl: modtcl module' 'perl: modperl module' 'cyrus-sasl: saslauth module') source=("http://znc.in/releases/znc-${pkgver}.tar.gz") -md5sums=('da5b690bc31b007474a77aae70c9c049') +md5sums=('3c6ff4620e139e3d9745cd53111bab20') build() { cd "znc-$pkgver" diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 7ac817394..9d3587597 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137777 2011-09-10 22:03:07Z tomegun $ +# $Id: PKGBUILD 138467 2011-09-24 11:28:45Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.20 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64') @@ -19,14 +19,16 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${ agetty-typo.patch write-freopen.patch dmesg-non-printk.patch - dmesg-space.patch) + dmesg-space.patch + dont-close-0.patch + fix-remount.patch) optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" # patches from master - for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do + for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch dont-close-0.patch fix-remount.patch; do patch -Np1 -i "${srcdir}/${patch}" done @@ -37,7 +39,8 @@ build() { --enable-write\ --enable-raw\ --disable-wall\ - --enable-partx + --enable-partx\ + --enable-libmount-mount make } @@ -53,4 +56,6 @@ md5sums=('4dcacdbdafa116635e52b977d9d0e879' '13838c6dd8df686e0f01ad0f236d2690' '465817ff8f7c08411c8011ee91b50318' 'f3ca75a1a22a2a739c5c22d92dc07ab0' - 'd9768f0b42d36d72c02ac7797b922ba1') + 'd9768f0b42d36d72c02ac7797b922ba1' + '37eae52af90c214dda73874c701fa246' + '344c780b9e08826dd8befe4271b41ed3') diff --git a/core/util-linux/dont-close-0.patch b/core/util-linux/dont-close-0.patch new file mode 100644 index 000000000..75cfc5c5e --- /dev/null +++ b/core/util-linux/dont-close-0.patch @@ -0,0 +1,32 @@ +From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001 +From: Petr Uzel <petr.uzel@suse.cz> +Date: Tue, 13 Sep 2011 11:08:46 +0200 +Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit() + +If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt' +which hasn't been fully initialised. The 'dir_fd' is still 0, so +sysfs_deinit calls "close(0)". + +Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151 +Reported-by: Diego Ercolani <diego.ercolani@gmail.com> +Analysed-by: Neil Brown <nfbrown@suse.com> +Signed-off-by: Petr Uzel <petr.uzel@suse.cz> +--- + lib/sysfs.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/lib/sysfs.c b/lib/sysfs.c +index eec1f24..ebb3bb5 100644 +--- a/lib/sysfs.c ++++ b/lib/sysfs.c +@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent) + int fd, rc = 0; + + memset(cxt, 0, sizeof(*cxt)); ++ cxt->dir_fd = -1; + + if (!sysfs_devno_path(devno, path, sizeof(path))) + goto err; +-- +1.7.6.1 + diff --git a/core/util-linux/fix-remount.patch b/core/util-linux/fix-remount.patch new file mode 100644 index 000000000..67149ab46 --- /dev/null +++ b/core/util-linux/fix-remount.patch @@ -0,0 +1,37 @@ +From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 13 Sep 2011 22:59:39 +0200 +Subject: [PATCH 2/2] mount: check for target before source on remount + +Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091 +Reported-by: Eric Paris <eparis@redhat.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + mount/fstab.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/mount/fstab.c b/mount/fstab.c +index 8d88f68..77bf81c 100644 +--- a/mount/fstab.c ++++ b/mount/fstab.c +@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) { + mc0 = mtab_head(); + if (!mcprev) + mcprev = mc0; ++ + for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) +- if (streq(mc->m.mnt_dir, name) || +- streq(mc->m.mnt_fsname, name)) ++ if (streq(mc->m.mnt_dir, name)) + return mc; ++ ++ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) ++ if (streq(mc->m.mnt_fsname, name)) ++ return mc; ++ + return NULL; + } + +-- +1.7.6.1 + diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 14309c383..53e7d5b62 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136921 2011-09-02 23:48:57Z giovanni $ +# $Id: PKGBUILD 138463 2011-09-24 09:30:24Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10602 +pkgver=10616 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('17e61b690fa52b7ee5a4e7bf350967a0') +md5sums=('b94fa71f713e1bd3c39ad12b08ca8a2f') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 81f3d85b2..4ce3613d6 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137652 2011-09-10 10:56:27Z pierre $ +# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -13,7 +13,7 @@ _svn=false pkgname=blender pkgver=2.59 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index c352260ed..08871b559 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136398 2011-08-29 05:25:50Z bisson $ +# $Id: PKGBUILD 138478 2011-09-24 16:46:33Z stephane $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Kevin Piche <kevin@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=bzflag pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index 219240f8c..32708fb9c 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126103 2011-06-01 14:26:46Z stephane $ +# $Id: PKGBUILD 138480 2011-09-24 16:46:36Z stephane $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.0 -pkgrel=2 +pkgrel=3 pkgdesc="intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 4de473de0..d93c3b09e 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138349 2011-09-20 14:19:11Z dan $ +# $Id: PKGBUILD 138474 2011-09-24 15:33:33Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.6.3 +pkgver=1.7.6.4 _manver=1.7.6.1 pkgrel=1 pkgdesc="the fast distributed version control system" @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('c8f9390f970079495085d343671d6646' +md5sums=('e0b7afcc0e5e43bbb82f85598ae34bd8' 'cae559424a62507cb2c15252d85a158e' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('b8c7642f7e2b6638c442c0d3f907d197023b8c9a35cb03681643ed7ec619eff8' +sha256sums=('c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6' 'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index 6270e8c8f..eb08d7441 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ +# $Id: PKGBUILD 138482 2011-09-24 16:46:38Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.6.0 +pkgver=1.7.0 pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'mesa') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') +sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 05ca2c60e..f8dc362c8 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132767 2011-07-25 23:16:55Z eric $ +# $Id: PKGBUILD 138484 2011-09-24 16:46:40Z stephane $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 0e68e5e44..a690e1c8a 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137987 2011-09-13 21:30:06Z eric $ +# $Id: PKGBUILD 138489 2011-09-25 02:10:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.2.5 +pkgver=6.7.2.8 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,9 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('ce0294e6bc7ca3ece03a432518143a29' - 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' +sha1sums=('227cc36d2a82d438cfb8b34ff1c7049e43d287ea' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 87e5d2acb..3dc376292 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137656 2011-09-10 10:56:33Z pierre $ +# $Id: PKGBUILD 138486 2011-09-24 16:46:43Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,7 +37,7 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/gnome-unstable/polkit-gnome/PKGBUILD b/gnome-unstable/polkit-gnome/PKGBUILD new file mode 100644 index 000000000..20e0ccb44 --- /dev/null +++ b/gnome-unstable/polkit-gnome/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 138471 2011-09-24 15:25:13Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: onestep_ua <onestep@ukr.net> + +pkgname=polkit-gnome +pkgver=0.103 +pkgrel=1 +pkgdesc="PolicyKit integration for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/PolicyKit" +license=('LGPL') +depends=('polkit' 'gtk3') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz + polkit-gnome-authentication-agent-1.desktop) +sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b' + 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \ + "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop" +} diff --git a/gnome-unstable/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/gnome-unstable/polkit-gnome/polkit-gnome-authentication-agent-1.desktop new file mode 100644 index 000000000..fc2acc28d --- /dev/null +++ b/gnome-unstable/polkit-gnome/polkit-gnome-authentication-agent-1.desktop @@ -0,0 +1,88 @@ +[Desktop Entry] +Name=PolicyKit Authentication Agent +Name[ar]=مدير الاستيثاق PolicyKit +Name[be]=PolicyKit - аґент аўтэнтыфікацыі +Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Name[ca]=Agent d'autenticació del PolicyKit +Name[cs]=Ověřovací agent PolicyKit +Name[da]=Godkendelsesprogrammet PolicyKit +Name[de]=Legitimationsdienst von PolicyKit +Name[el]=Πράκτορας πιστοποίησης PolicyKit +Name[en_GB]=PolicyKit Authentication Agent +Name[es]=Agente de autenticación de PolicyKit +Name[eu]=PolicyKit autentifikatzeko agentea +Name[fi]=PolicytKit-tunnistautumisohjelma +Name[fr]=Agent d'authentification de PolicyKit +Name[gl]=Axente de autenticación PolicyKit +Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Name[hu]=PolicyKit hitelesítési ügynök +Name[it]=Agente di autenticazione per PolicyKit +Name[ja]=PolicyKit 認証エージェント +Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Name[lt]=PolicyKit tapatybės nustatymo agentas +Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Name[pl]=Agent uwierzytelniania PolicyKit +Name[pt]=Agente de Autenticação PolicyKit +Name[pt_BR]=Agente de autenticação PolicyKit +Name[ro]=Agent de autentificare PolicyKit +Name[sk]=Agent PolicyKit na overovanie totožnosti +Name[sl]=PolicyKit program overjanja +Name[sv]=Autentiseringsagent för PolicyKit +Name[ta]=PolicyKit அங்கீகார முகவர் +Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Name[uk]=Агент автентифікації PolicyKit +Name[zh_CN]=PolicyKit 认证代理 +Name[zh_HK]=PolicyKit 驗證代理程式 +Name[zh_TW]=PolicyKit 驗證代理程式 +Comment=PolicyKit Authentication Agent +Comment[ar]=مدير الاستيثاق PolicyKit +Comment[be]=PolicyKit - аґент аўтэнтыфікацыі +Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Comment[ca]=Agent d'autenticació del PolicyKit +Comment[cs]=Ověřovací agent PolicyKit +Comment[da]=Godkendelsesprogrammet PolicyKit +Comment[de]=Legitimationsdienst von PolicyKit +Comment[el]=Πράκτορας πιστοποίησης PolicyKit +Comment[en_GB]=PolicyKit Authentication Agent +Comment[es]=Agente de autenticación de PolicyKit +Comment[eu]=PolicyKit autentifikatzeko agentea +Comment[fi]=PolicytKit-tunnistautumisohjelma +Comment[fr]=Agent d'authentification de PolicyKit +Comment[gl]=Axente de autenticación PolicyKit +Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Comment[hu]=PolicyKit hitelesítési ügynök +Comment[it]=Agente di autenticazione per PolicyKit +Comment[ja]=PolicyKit 認証エージェント +Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Comment[lt]=PolicyKit tapatybės nustatymo agentas +Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Comment[pl]=Agent uwierzytelniania PolicyKit +Comment[pt]=Agente de Autenticação PolicyKit +Comment[pt_BR]=Agente de autenticação PolicyKit +Comment[ro]=Agent de autentificare PolicyKit +Comment[sk]=Agent PolicyKit na overovanie totožnosti +Comment[sl]=PolicyKit program overjanja +Comment[sv]=Autentiseringsagent för PolicyKit +Comment[ta]=PolicyKit அங்கீகார முகவர் +Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Comment[uk]=Агент автентифікації PolicyKit +Comment[zh_CN]=PolicyKit 认证代理 +Comment[zh_HK]=PolicyKit 驗證代理程式 +Comment[zh_TW]=PolicyKit 驗證代理程式 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +Terminal=false +Type=Application +Categories= +NoDisplay=true +NotShowIn=KDE; +AutostartCondition=GNOME3 unless-session gnome diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD new file mode 100644 index 000000000..7db99b002 --- /dev/null +++ b/testing/java7-openjdk/PKGBUILD @@ -0,0 +1,267 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Guillaume ALAUX <guillaume@archlinux.org> + +pkgname=('jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') +pkgbase=java7-openjdk +_java_ver=7 +_openjdk_build=b147 +_openjdk_date=27_jun_2011 +_icedtea_ver=2.0 +_date=20110922 + +# check "${srcdir}/icedtea7"/Makefile.am +_CORBA_CHANGESET=616c760dc288 +_HOTSPOT_CHANGESET=1dd9b3d73b22 +_JAXP_CHANGESET=c40983d6ae70 +_JAXWS_CHANGESET=83db5e316798 +_JDK_CHANGESET=0cb15650412a +_LANGTOOLS_CHANGESET=fb7fb3071b64 +_OPENJDK_CHANGESET=3defd24c2671 + +pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} +pkgrel=0.20110922.1 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org" +license=('custom') +makedepends=('eclipse-ecj' 'libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' + 'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib' + 'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2') +source=(ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz + http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + http://icedtea.classpath.org/download/drops/{jdk7-jaf-2010_08_19.zip,jdk7-jaxws2_2_4-b03-2011_05_27.zip,jaxp145_01.zip} + fontconfig-paths.diff + fix_corba_cmds_path.diff + openjdk7_fix_jdk_cmds_path.diff + openjdk7_nonreparenting-wm.diff + jdk7-openjdk.profile + jdk7-openjdk.profile.csh + jre7-openjdk.profile + jre7-openjdk.profile.csh + jconsole.desktop + policytool.desktop) +sha1sums=('e569c8a1265d30856caa646d101ce3e1e4a2a69f' + '51dafe7367732d58a5ee531f5840fe1ab9c9d2bf' + 'c246e4a01d11bdbe4fb23f1bd3819456d1446f52' + '8a286c9314f47f7bb6c59b8e8b4560db81019a83' + 'c0e7e9b99d4de220ef3346f3da942a4a39bb8b71' + '6a115a71c94b4de1ad4e9c00fe3994bc31acd943' + '29f8481fd98d709c72a81d5d742097455f38af7d' + 'a8a199fb4c908852a0afdd76937ad194191d20f7' + '63ea970dcf129fbbba39a132d8f71add19fbf1f0' + '539bcf80b9a86c97406a3c79e7d10684b213a4be' + '106db88c8e53abb1a064e83d41cc7acd16b7713c' + '00ae05d9c8679deb72c0a9008a670daafeb21565' + 'e551b40820393c4cab3a82154f51b55577644ba1' + 'fe04691f0a23f43a8d9017f7c5fccd4620bc9019' + 'ab22e135916786c181be66be39acd7954175bb9c' + 'b2dbb1a8a7264db229d6888467ed3f2799a007b0' + '344f7e911ab52e38f1ff237ed770bec362d79f79' + '683cbb342c8d3077b43b31be700864379c0aa54b' + '2a12035cc3e586131952cbb78d9885f6dc10d1b2' + '2e7827f47b9190dcc0697752b0f799caea872239' + '0bc35e5436f1663f5251b8f8c159a04088a09484') + +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +noextract=("${_OPENJDK_CHANGESET}.tar.gz" + "${_CORBA_CHANGESET}.tar.gz" + "${_JAXP_CHANGESET}.tar.gz" + "${_JAXWS_CHANGESET}.tar.gz" + "${_JDK_CHANGESET}.tar.gz" + "${_LANGTOOLS_CHANGESET}.tar.gz" + "${_HOTSPOT_CHANGESET}.tar.gz" + "jdk7-jaf-2010_08_19.zip" + "jdk7-jaxws2_2_4-b03-2011_05_27.zip" + "jaxp145_01.zip") + +# source PKGBUILD && mksource +#makedepends+=('mercurial') +mksource() { + mkdir /tmp/icedtea7-${_date} + pushd /tmp/icedtea7-${_date} + hg -v clone http://icedtea.classpath.org/hg/icedtea7 + rm -rf icedtea7/.hg* + tar -cvJf /tmp/icedtea7-${_date}/icedtea7-${_date}-hg.tar.xz * + popd +} + +build() { + cd "${srcdir}/icedtea7" + + unset JAVA_HOME + unset CLASSPATH + unset MAKEFLAGS + + export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" + + . /etc/profile.d/apache-ant.sh + + cp ${srcdir}/*.diff ${srcdir}/icedtea7/patches + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + + # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK: + autoreconf --force --install + + ./configure \ + --disable-bootstrap \ + --disable-tests \ + --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \ + --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ + --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ + --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ + --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ + --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ + --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ + --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ + --with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ + --with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ + --with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ + --enable-pulse-java #--help + +# + +# --enable-systemtap Enable inclusion of SystemTap trace support +# --enable-nss Enable inclusion of NSS security provider +# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed + + + #LD_PRELOAD="" + make +} + +check() { + cd "${srcdir}/icedtea7" + make -k check +} + +package_jre7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" + depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' + 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng') + optdepends=('icedtea-web: web browser plugin + Java Web Start' + 'alsa-lib: for sound' + 'giflib: for gif format support') + provides=('java-runtime=7') + conflicts=('java-runtime') +# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos + backup=(etc/profile.d/jre7-openjdk.sh) + install=jre7-openjdk.install + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image/jre" + + install -d -m755 ${pkgdir}/${_jvmdir}/jre/ + cp -a bin lib ${pkgdir}/${_jvmdir}/jre + + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src + + # Install man pages + pushd ../../j2re-image/man + install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ + install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 + install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 + popd + + # Install icons and menu entries + for s in 16 24 32 48 ; do + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ + install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ + ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png + done + + # Link binaries into /usr/bin + pushd ${pkgdir}/${_jvmdir}/jre/bin + install -m755 -d ${pkgdir}/usr/bin/ + for file in *; do + ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + done + popd + + # Link JKS keystore from ca-certificates-java + rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh + + # Install license + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ + install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + ${pkgdir}/usr/share/licenses/${pkgbase} +} + +package_jdk7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" + depends=('jre7-openjdk') + provides=('java-environment=7') + conflicts=('java-environment') + # replaces=('openjdk6') + backup=(etc/profile.d/jdk7-openjdk.sh) + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image" + + # Main files + install -m755 -d ${pkgdir}/${_jvmdir}/ + + cp -a demo include lib sample ${pkgdir}/${_jvmdir} + + # 'bin' files + pushd bin + install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + ${pkgdir}/usr/bin/ \ + ${pkgdir}/usr/share/man/{,ja/}man1/ + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + else + # Copy binary to jdk/bin/ + install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + # Copy man page + install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 + install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 + # Link from /bin/ + ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} + fi + done + popd + + # Handling 'java-rmi.cgi' separately + install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + + # Desktop files + install -m755 -d ${pkgdir}/usr/share/applications/ + install -m644 ${srcdir}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications/ + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh +} + +package_openjdk7-src() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" + + install -D ${srcdir}/icedtea7/openjdk.build/j2sdk-image/src.zip \ + ${pkgdir}/${_jvmdir}/src.zip +} diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff new file mode 100644 index 000000000..842657880 --- /dev/null +++ b/testing/java7-openjdk/fix_corba_cmds_path.diff @@ -0,0 +1,33 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 +@@ -86,10 +86,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -136,7 +136,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq +@@ -186,7 +186,7 @@ + # others have it in /usr/bin. + SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ + $(wildcard $(UTILS_USR_BIN_PATH)sort)) +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UTILS_COMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff new file mode 100644 index 000000000..fa08db629 --- /dev/null +++ b/testing/java7-openjdk/fontconfig-paths.diff @@ -0,0 +1,134 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 +@@ -275,73 +275,61 @@ + + # Font File Names + +-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf +-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf +-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf +-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf +- +-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf +-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf +-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf +-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf +- +-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf +-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf +-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf +-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf +- +-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf +- +-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf +- +-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf +- +-# AWT X11 font paths +-awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf ++ ++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf ++ ++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf ++ ++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf ++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf ++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf ++ diff --git a/testing/java7-openjdk/jconsole.desktop b/testing/java7-openjdk/jconsole.desktop new file mode 100644 index 000000000..ffbdd42ad --- /dev/null +++ b/testing/java7-openjdk/jconsole.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=/usr/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile new file mode 100644 index 000000000..c69fdb9b3 --- /dev/null +++ b/testing/java7-openjdk/jdk7-openjdk.profile @@ -0,0 +1,6 @@ +export J2SDKDIR=/usr/lib/jvm/java-7-openjdk +export J2REDIR=$J2SDKDIR/jre +export JAVA_HOME=/usr/lib/jvm/java-7-openjdk + +# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' +# in /etc/profile.d/jre7-openjdk.sh diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh new file mode 100644 index 000000000..cc7dc8ab1 --- /dev/null +++ b/testing/java7-openjdk/jdk7-openjdk.profile.csh @@ -0,0 +1 @@ +setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install new file mode 100644 index 000000000..8e3ff0ee0 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi + echo "when you use a non-reparenting window manager" + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" + echo "/etc/profile.d/jre7-openjdk.sh" +# update-desktop-database -q +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi +# update-desktop-database -q +} + + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +# update-desktop-database -q +} diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile new file mode 100644 index 000000000..c86ce857a --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.profile @@ -0,0 +1,5 @@ +export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre +export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} + +# enable this for non-reparenting window managers +#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh new file mode 100644 index 000000000..a9aed27d1 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.profile.csh @@ -0,0 +1,5 @@ +setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" +setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" + +# enable this for non-reparenting window managers +#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff new file mode 100644 index 000000000..c68bd4441 --- /dev/null +++ b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -0,0 +1,24 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 +@@ -91,10 +91,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -141,7 +141,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff new file mode 100644 index 000000000..ba1a588e1 --- /dev/null +++ b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -0,0 +1,58 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 +@@ -102,7 +102,8 @@ + METACITY_WM = 11, + COMPIZ_WM = 12, + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -576,7 +577,7 @@ + // TODO: according to wikipedia, compiz is now reparenting. This should + // probably be updated. + static boolean isNonReparentingWM() { +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); + } + + /* +@@ -762,9 +763,17 @@ + * supports WIN or _NET wm spec. + */ + else if (l_net_protocol.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } else if (win.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } + /* + * Check for legacy WMs. +@@ -775,6 +784,8 @@ + awt_wmgr = XWM.MOTIF_WM; + } else if (isOpenLook()) { + awt_wmgr = XWM.OPENLOOK_WM; ++ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; + } +@@ -1289,6 +1300,7 @@ + res = new Insets(28, 6, 6, 6); + break; + case NO_WM: ++ case OTHER_NONREPARENTING_WM: + case LG3D_WM: + res = zeroInsets; + break; diff --git a/testing/java7-openjdk/policytool.desktop b/testing/java7-openjdk/policytool.desktop new file mode 100644 index 000000000..702b44a6f --- /dev/null +++ b/testing/java7-openjdk/policytool.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=/usr/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD index a9121811c..ab8e8ae14 100644 --- a/testing/xorg-server/PKGBUILD +++ b/testing/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136479 2011-08-30 08:44:30Z jgc $ +# $Id: PKGBUILD 138468 2011-09-24 11:29:23Z jgc $ # 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.0 +pkgver=1.11.1 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -12,11 +12,13 @@ makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtra options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch + autoconfig-sis.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('5fa0c0a190fbe1030a14e435de2d5a3259ca70be' +sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd' '0249b892f27243d8fe6fe6d226bf4c2391cedf49' + '962fecc159c128728f14e8ba231c5b00391ff4ac' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') @@ -27,6 +29,9 @@ build() { # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + # Use unofficial imedia SiS driver for supported SiS devices + patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + autoreconf ./configure --prefix=/usr \ --enable-ipv6 \ diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch new file mode 100644 index 000000000..d936efaaa --- /dev/null +++ b/testing/xorg-server/autoconfig-sis.patch @@ -0,0 +1,19 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1140,7 +1140,15 @@ + driverList[0] = "savage"; break; + } + break; +- case 0x1039: driverList[0] = "sis"; break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: driverList[0] = "siliconmotion"; break; + case 0x121a: + if (dev->device_id < 0x0003) |