diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-10 00:51:34 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-10 00:51:34 -0800 |
| commit | 6ee08d6a9217906f2ef84f70923d3d362d4b40ad (patch) | |
| tree | dc3d842884f61485a4c01889d37d9432620d5e38 | |
| parent | 92eac63df242654434dceb000bac083f6e81a6b9 (diff) | |
Sun Mar 10 00:50:57 PST 2013
55 files changed, 1823 insertions, 368 deletions
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index ce4c8d209..9f6dd5dab 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85558 2013-03-03 05:39:31Z bgyorgy $ +# $Id: PKGBUILD 85928 2013-03-09 00:52:51Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.1 -pkgrel=4 +pkgver=1.7.2 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -28,7 +28,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "gnome-autogen.sh" "keyboard_applet.patch" "fix-control-center-check.patch") -md5sums=('13daa8fde1480bbee25eddc2e2630319' +md5sums=('d136978607d2584ea1ca29db436f96df' 'a925691c9b57a6a884dcf07da057fd1f' '2b1ece84416c3e4de030be15f1774d82' 'fd429779aa986ffb3f481149f19a0baf') diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 2d101a133..85972a329 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 79120 2012-10-30 23:06:26Z heftig $ +# $Id: PKGBUILD 85932 2013-03-09 04:07:22Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.6.0 +pkgver=3.6.2 pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions' options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('9f096ec72fb81a78c426d9747145405a8b99e1d8418978828796768c8532d676') +sha256sums=('2db1069324cb85d8704bd1ffbbea3c29d57ba7b0d710f45f6563fd963517ef40') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index f218c9121..6e7474371 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84159 2013-02-12 12:14:09Z thomas $ +# $Id: PKGBUILD 85915 2013-03-08 23:40:40Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64') url="http://w1.fi/hostapd/" diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index 16d7bc4b7..5995a13dd 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84160 2013-02-12 12:14:10Z thomas $ +# $Id: PKGBUILD 85916 2013-03-08 23:40:41Z foutrelis $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=knemo pkgver=0.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=12956" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index f4c7301ca..cbf475f88 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85657 2013-03-04 13:08:37Z spupykin $ +# $Id: PKGBUILD 85917 2013-03-08 23:40:42Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.3 -pkgrel=2rc2 +pkgrel=3rc2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -12,7 +12,7 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'audit' '') + 'iproute2' 'libnl' 'libx11' 'audit') makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD index 2f0c2b350..2657bc573 100644 --- a/community/luajit/PKGBUILD +++ b/community/luajit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84574 2013-02-20 04:52:41Z bpiotrowski $ +# $Id: PKGBUILD 85940 2013-03-09 14:50:34Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -6,17 +6,20 @@ pkgname=luajit pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1' arch=('i686' 'x86_64') url='http://luajit.org/' license=('MIT') depends=('gcc-libs') -source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz) -sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0') +source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz + http://luajit.org/download/v2.0.1_hotfix1.patch) +sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0' + '143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368') build() { cd $srcdir/LuaJIT-$pkgver + patch -Np1 -i $srcdir//v2.0.1_hotfix1.patch make amalg PREFIX=/usr } diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 7a58eb6a8..e77f3c76d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84756 2013-02-24 11:50:35Z faidoc $ +# $Id: PKGBUILD 85924 2013-03-09 00:51:47Z faidoc $ # Contributor: Adam Hani Schakaki <adam@schakaki.net> # Contributor: Ner0 pkgname=muffin -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('muffin-wm') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver") -md5sums=('688ac16937bcaa286566d47764bf33a7') +md5sums=('c39cd212959c7de8f834abe9e3fee8da') build() { cd linuxmint-muffin-* diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index 1fc896965..054391d02 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84162 2013-02-12 12:14:12Z thomas $ +# $Id: PKGBUILD 85918 2013-03-08 23:40:43Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64') license=('LGPL') diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD index 42dff9eef..51f1f9065 100644 --- a/community/powertop/PKGBUILD +++ b/community/powertop/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84163 2013-02-12 12:14:14Z thomas $ +# $Id: PKGBUILD 85919 2013-03-08 23:40:44Z foutrelis $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Xilon <xilonmu@gmail.com> pkgname=powertop pkgver=2.2 -pkgrel=2 +pkgrel=3 pkgdesc='A tool to diagnose issues with power consumption and power management' arch=('i686' 'x86_64') url='https://01.org/powertop/' diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index c8bb65611..87ec0f2d8 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85401 2013-03-01 10:39:04Z andrea $ +# $Id: PKGBUILD 85927 2013-03-09 00:52:24Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,9 +7,9 @@ # Contributor: delor <bartekpiech gmail com> pkgname=qtcreator -pkgver=2.6.2 -_pkgver=2.6.2 -pkgrel=2 +pkgver=2.7.0rc +_pkgver=2.7.0-rc +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt-project.org' @@ -29,7 +29,7 @@ install=qtcreator.install source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop' 'fix-build.patch') -md5sums=('4700deb89e8cf92239015d7d70f0dcdd' +md5sums=('5c4baef738b00cfdf53739ffd1434234' '82888d4be900e7833d768050a135cd37' '4087c00d853addf97ca329d304e9a0a5') diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 1c93abae0..feb494344 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 84732 2013-02-23 20:56:41Z seblu $ +# $Id: PKGBUILD 85920 2013-03-08 23:40:45Z foutrelis $ # Maintainer: Sébastien Luttringer pkgname=quagga pkgver=0.99.22 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' license=('GPL2') -depends=('libcap' 'net-snmp' 'readline' 'ncurses') +depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses') options=('!libtool' '!buildflags') install=quagga.install source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 4fdcb003a..497609004 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84689 2013-02-22 09:36:08Z svenstaro $ +# $Id: PKGBUILD 85914 2013-03-08 23:19:52Z svenstaro $ # 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.92.0 -_pkgver=92.0 +pkgver=0.93.0 +_pkgver=93.0 pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('6dcf665cfe7d6eaf0e287086685c6709') +md5sums=('770b2f1aefddb9752d3a5bb70ba76cca') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma @@ -27,7 +27,8 @@ build() { cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES + -DDATADIR=share/spring \ + -DCMAKE_SKIP_RPATH=YES make } diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD index b676215f2..22ea8ca2b 100644 --- a/community/xvba-video-open/PKGBUILD +++ b/community/xvba-video-open/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77096 2012-10-04 19:43:11Z lcarlier $ +# $Id: PKGBUILD 85947 2013-03-09 21:11:01Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Jesse Jaara <gmail.com: jesse.jaara> pkgname=xvba-video-open pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards" arch=('i686' 'x86_64') url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/" @@ -13,13 +13,24 @@ depends=('catalyst-utils' 'libva') makedepends=('mesa') options=(!libtool) source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz - http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz) + http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz + xvba-video-h264-level51.patch + xvba-video-0.8.0-glx-fix.patch + fix-build-with-glext.h-version-85.patch) md5sums=('d9ddec2e7f02c1fa533773918e88e311' - 'b8f56bc55aa70cb19dd12857fdc184cc') + 'b8f56bc55aa70cb19dd12857fdc184cc' + 'bce1de0a8b274049568453a53e8fce6a' + '5dc283eab46418eeef8e8be7c028a2ba') build() { cd "${srcdir}/xvba-video-${pkgver}" + # patch from opensuse (thanks vi0l0!) + patch -Np1 -i ../xvba-video-h264-level51.patch + patch -Np1 -i ../xvba-video-0.8.0-glx-fix.patch + + patch -Np1 -i ../fix-build-with-glext.h-version-85.patch + export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include" ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr @@ -31,3 +42,8 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('d9ddec2e7f02c1fa533773918e88e311' + 'b8f56bc55aa70cb19dd12857fdc184cc' + 'bce1de0a8b274049568453a53e8fce6a' + '5dc283eab46418eeef8e8be7c028a2ba' + '69e8a9027affbaf7066e35bc97b3a984') diff --git a/community/xvba-video-open/fix-build-with-glext.h-version-85.patch b/community/xvba-video-open/fix-build-with-glext.h-version-85.patch new file mode 100644 index 000000000..f3cabce50 --- /dev/null +++ b/community/xvba-video-open/fix-build-with-glext.h-version-85.patch @@ -0,0 +1,17 @@ +diff -ru xvba-video-0.8.0/src/utils_glx.h xvba-video-0.8.0.patched/src/utils_glx.h +--- xvba-video-0.8.0/src/utils_glx.h 2011-06-14 13:07:13.000000000 +0200 ++++ xvba-video-0.8.0.patched/src/utils_glx.h 2013-02-17 10:53:34.589818821 +0100 +@@ -25,6 +25,13 @@ + #include <GL/glext.h> + #include <GL/glx.h> + ++#if GL_GLEXT_VERSION >= 85 ++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED ++ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h> ++ Redefine the type here as an interim solution */ ++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); ++#endif ++ + #ifndef GL_FRAMEBUFFER_BINDING + #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT + #endif diff --git a/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch b/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch new file mode 100644 index 000000000..7cb249a16 --- /dev/null +++ b/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch @@ -0,0 +1,12 @@ +diff -ur xvba-video-0.8.0/src/xvba_image.c xvba-video-0.8.0-patched/src/xvba_image.c +--- xvba-video-0.8.0/src/xvba_image.c 2011-06-14 13:07:13.000000000 +0200 ++++ xvba-video-0.8.0-patched/src/xvba_image.c 2012-07-22 14:55:14.186667413 +0200 +@@ -423,7 +423,7 @@ + } + + #if USE_GLX +-const HWImageHooks hw_image_hooks_glx attribute_hidden; ++extern const HWImageHooks hw_image_hooks_glx attribute_hidden; + #endif + + // Commit image to the HW diff --git a/community/xvba-video-open/xvba-video-h264-level51.patch b/community/xvba-video-open/xvba-video-h264-level51.patch new file mode 100644 index 000000000..a617a90ab --- /dev/null +++ b/community/xvba-video-open/xvba-video-h264-level51.patch @@ -0,0 +1,33 @@ +diff -rup xvba-video.orig/src/xvba_buffer.c xvba-video/src/xvba_buffer.c +--- xvba-video.orig/src/xvba_buffer.c 2011-09-08 03:17:28.000000000 +0200 ++++ xvba-video/src/xvba_buffer.c 2012-07-03 21:38:04.851465348 +0200 +@@ -368,23 +368,18 @@ translate_VAPictureParameterBufferH264( + obj_context->picture_height + ); + +- /* Check for H.264 content over HP@L4.1 */ ++ /* Check for wrongly coded H264 Level 41 ++ adjust profile to Level 51 when reframes are too many ++ */ + unsigned int num_ref_frames = pic_param->num_ref_frames; +- if (profile == XVBA_H264_HIGH && level > 41) { +- if (!driver_data->warn_h264_over_hp_l41) { +- driver_data->warn_h264_over_hp_l41 = 1; +- xvba_information_message( +- "driver does not support H.264 content over HP@L4.1. " +- "Please upgrade.\n" +- ); +- } ++ if (profile == XVBA_H264_HIGH && level == 41) { + +- /* Use fail-safe values (lower ref frames) */ ++ /* Increase Level to decode pseudo Level 41 as Level 51 */ + const unsigned int mbw = pic_param->picture_width_in_mbs_minus1 + 1; + const unsigned int mbh = (obj_context->picture_height + 15) / 16; + const unsigned int max_ref_frames = 12288 * 1024 / (mbw * mbh * 384); + if (max_ref_frames < num_ref_frames) +- num_ref_frames = max_ref_frames; ++ level = 51; + } + + XVBABufferDescriptor * const xvba_buffer = obj_surface->pic_desc_buffer; diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index dd26c5deb..f31fa50a6 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177947 2013-02-12 12:13:43Z thomas $ +# $Id: PKGBUILD 179635 2013-03-08 23:40:38Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda pkgver=1.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -15,7 +15,7 @@ source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 set-wireless-regdom) md5sums=('29579185e06a75675507527243d28e5c' '65c93f2ff2eb1b29d9e9fa102ae2dd45') - + build() { cd "${srcdir}"/${pkgname}-${pkgver} sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index e51db25dc..0faf735c5 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177972 2013-02-12 18:00:18Z eric $ +# $Id: PKGBUILD 179636 2013-03-08 23:40:39Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=iw pkgver=3.8 -pkgrel=2 +pkgrel=3 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") url="http://wireless.kernel.org/en/users/Documentation/iw" diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD index 7f8f9decd..04d45c346 100644 --- a/core/libnl/PKGBUILD +++ b/core/libnl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 177950 2013-02-12 12:13:46Z thomas $ +# $Id: PKGBUILD 179637 2013-03-08 23:40:40Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libnl -pkgver=3.2.19 +pkgver=3.2.21 pkgrel=1 pkgdesc="Library for applications dealing with netlink sockets" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=(glibc) backup=(etc/libnl/classid etc/libnl/pktloc) options=(!libtool) source=("$url/files/$pkgname-$pkgver.tar.gz") -sha256sums=('37a611ad84e84a15daf2736cdd2c5191f3af4e1b12354f7d260f0264383b098b') +sha256sums=('2dc80f043116ec8610d9d418f5f5e9283f3d9a3a48b8d51a8cb0146b3f279604') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index 918f593ec..c648eda47 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177951 2013-02-12 12:13:47Z thomas $ +# $Id: PKGBUILD 179638 2013-03-08 23:40:41Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap pkgver=1.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64') url="http://www.tcpdump.org/" diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index b2732903b..8e44259c6 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 177955 2013-02-12 12:13:52Z thomas $ +# $Id: PKGBUILD 179639 2013-03-08 23:40:42Z foutrelis $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64') diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index de0a7c48f..b2ff9aeac 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 179620 2013-03-08 20:34:20Z giovanni $ +# $Id: PKGBUILD 179753 2013-03-09 17:23:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.14.1 -pkgrel=2 +pkgrel=4 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" license=('GPL') -depends=('parted' 'gtkmm' 'hicolor-icon-theme') +depends=('parted' 'gtkmm' 'hicolor-icon-theme' 'polkit-gnome') makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' - 'ntfsprogs: for ntfs partitions' + 'ntfs-3g: for ntfs partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' 'nilfs-utils: for nilfs2 support' - 'polkit-gnome: to run gparted directly from menu' 'gpart: for recovering corrupt partition tables' - 'mtools') + 'mtools: utilities to access MS-DOS disks') install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') md5sums=('1ffe859c70e102a776dffb1ff0a2164a' - '27c264cfad8fa413d75954dda7a2dd50') + 'c031d7d2b845ccb025b9f83e0ddd5653') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -42,6 +41,14 @@ package() { # Install policy file install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" + # We need rename the original script + mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf" + + # Install launcher script + echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted + echo 'pkexec "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted + chmod 755 ${pkgdir}/usr/sbin/gparted + # Modify desktop file - sed -i -e "s|^Exec=.*|Exec=pkexec --disable-internal-agent /usr/sbin/gparted|" "${pkgdir}/usr/share/applications/gparted.desktop" + sed -i -e "s|^Exec=.*|Exec=pkexec --disable-internal-agent /usr/sbin/gparted.elf|" "${pkgdir}/usr/share/applications/gparted.desktop" } diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install index 21b79d2d4..e8f6bed8f 100644 --- a/extra/gparted/gparted.install +++ b/extra/gparted/gparted.install @@ -1,9 +1,12 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo 'If you use a lightweight windowmanager, remember to run' + echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' + echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { - post_install $1 + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_remove() { diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy index 561cd7d1e..65894a0cc 100644 --- a/extra/gparted/org.archlinux.pkexec.gparted.policy +++ b/extra/gparted/org.archlinux.pkexec.gparted.policy @@ -12,7 +12,7 @@ <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index a6bf59a3b..4bf3fb358 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179616 2013-03-08 19:33:49Z andyrtr $ +# $Id: PKGBUILD 179822 2013-03-09 21:04:13Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.1.2 pkgver=4.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -218,7 +218,6 @@ build() { --with-system-mysql \ --without-fonts\ --without-afms\ - --without-ppds\ --without-system-libwps\ --without-system-libcdr \ --without-system-mdds\ @@ -254,6 +253,8 @@ build() { --with-system-clucene\ --without-system-servlet-api +# --without-ppds\ + #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool touch src.downloaded @@ -274,19 +275,18 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' 'poppler>=0.20.5' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.20.5" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' 'dbus-glib: adds dbus support' - 'nss: adds support for signed files/macros' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping /macros' 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' - 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' + 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' 'sane: for scanner access' 'unixodbc: adds ODBC database support' 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' @@ -434,8 +434,7 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gtk3' 'gconf') - optdepends=() + depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 backup=() groups=('libreoffice') diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index 1dcd39f3f..e220c98f2 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsecret -pkgver=0.12 -pkgrel=2 +pkgver=0.14 +pkgrel=1 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ depends=('glib2' 'libgcrypt') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01') +sha256sums=('58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5') build() { cd "$pkgname-$pkgver" diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 7eaa19def..ea0060806 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179120 2013-03-03 20:01:04Z bpiotrowski $ +# $Id: PKGBUILD 179729 2013-03-09 15:29:21Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.29 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') license=('GPL') url='http://mariadb.org/' @@ -107,9 +107,10 @@ package_mariadb() { backup=('etc/mysql/my.cnf') install=mariadb.install depends=('mariadb-clients') - conflicts=('mysql') - provides=("mysql=$pkgver") - optdepends=('perl-dbi' 'perl-dbd-mysql') + conflicts=('mysql' 'mytop') + provides=("mysql=$pkgver" 'mytop') + optdepends=('perl-dbd-mysql: mytop dependency' + 'perl-term-readkey: mytop dependency') options=('emptydirs') cd "$srcdir"/build diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 25e51b873..354e3f56a 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 177956 2013-02-12 12:13:57Z thomas $ -# Maintainer: +# $Id: PKGBUILD 179640 2013-03-08 23:40:45Z foutrelis $ +# Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.2 -pkgrel=2 +pkgrel=3 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64') url="http://www.net-snmp.org/" license=('BSD') depends=('openssl' 'libnl' 'pciutils') makedepends=('python2-distribute') -optdepends=('perl-term-readkey: for snmpcheck application' +optdepends=('perl-term-readkey: for snmpcheck application' 'perl-tk: for snmpcheck and tkmib applications' 'python2: for the python modules') provides=('ucd-snmp') diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index f5964f01f..6de807013 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179568 2013-03-07 11:54:26Z foutrelis $ +# $Id: PKGBUILD 179641 2013-03-08 23:40:46Z foutrelis $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index 9a1c07bfc..10582bb78 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179044 2013-03-01 21:25:10Z andrea $ +# $Id: PKGBUILD 179762 2013-03-09 17:47:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon pkgver=4.6.0 -pkgrel=7 +pkgrel=8 epoch=1 arch=('i686' 'x86_64') url='http://phonon.kde.org/' @@ -40,4 +40,11 @@ build() { package(){ cd build make DESTDIR="${pkgdir}" install + + # Install headers into the Qt4 dir + install -d "${pkgdir}"/usr/include/qt4 + mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/ + + sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \ + "${pkgdir}"/usr/lib/pkgconfig/phonon.pc } diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD index bb96b719b..d798fb0e5 100644 --- a/extra/speech-dispatcher/PKGBUILD +++ b/extra/speech-dispatcher/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $ +# $Id: PKGBUILD 179645 2013-03-09 01:49:56Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Steve Holmes <steve.holmes88@gmail.com> @@ -7,14 +7,14 @@ # Contributor: Andreas Messer <andi@bupfen.de> pkgname=speech-dispatcher -pkgver=0.7.1 -pkgrel=7 +pkgver=0.8 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="High-level device independent layer for speech synthesis interface" url="http://www.freebsoft.org/speechd" license=('GPL2' 'FDL') -depends=('glib2' 'python2' 'dotconf' 'texinfo' 'libpulse') -makedepends=('pkgconfig' 'espeak') +depends=('glib2' 'libltdl' 'python-xdg' 'dotconf' 'libpulse') +makedepends=('intltool' 'espeak') optdepends=('festival: Speech output using Festival' 'espeak: Speech output using ESpeak' 'pulseaudio: PulseAudio support') @@ -37,10 +37,9 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf etc/speech-dispatcher/speechd.conf) install="${pkgname}.install" source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz" - 'speechd.sh' 'speech-dispatcherd.service') -md5sums=('ccfc30ac006673d36b4223eb760ed696' - '858293f464b83f03f3b6bb796291c71d' - 'd26f52e2e95a30eaa83560f0e63faca5') + 'speech-dispatcherd.service') +md5sums=('d88691a64c676122f996230c107c392f' + 'd26f52e2e95a30eaa83560f0e63faca5') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -53,20 +52,8 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd - install -d "${pkgdir}/usr/lib/systemd/system/" - install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/" - install -d ${pkgdir}/var/log/speech-dispatcher - - # Fix spd-conf to use python 2.7 - sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgdir}/usr/bin/spd-conf - sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/lib/python2.7/site-packages/speechd/_test.py - - rm -f ${pkgdir}/usr/share/info/dir - gzip -9nf ${pkgdir}/usr/share/info/* - - # Remove conflicts with erlang (FS#21674) - rm -r ${pkgdir}/usr/bin/run_test + install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service" + install -d "${pkgdir}/var/log/speech-dispatcher" } diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install index 93f4f9363..1565d3a31 100644 --- a/extra/speech-dispatcher/speech-dispatcher.install +++ b/extra/speech-dispatcher/speech-dispatcher.install @@ -1,10 +1,10 @@ info_dir=usr/share/info info_files=('speech-dispatcher.info' - 'speech-dispatcher-cs.info' 'ssip.info' 'spd-say.info') post_install() { + [[ -x usr/bin/install-info ]] || return 0 for f in ${info_files[@]}; do install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done @@ -15,6 +15,7 @@ post_upgrade() { } pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 for f in ${info_files[@]}; do install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null done diff --git a/extra/speech-dispatcher/speechd.sh b/extra/speech-dispatcher/speechd.sh deleted file mode 100644 index eb44198cb..000000000 --- a/extra/speech-dispatcher/speechd.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/speech-dispatcher) -case "$1" in - start) - stat_busy "Starting speech dispatcher Daemon" - [ -z "$PID" ] && /usr/bin/speech-dispatcher -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon speechd - stat_done - fi - ;; - stop) - stat_busy "Stopping speech dispatcher Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon speechd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD index 848d58aac..a1a1501bb 100644 --- a/extra/telepathy-qt/PKGBUILD +++ b/extra/telepathy-qt/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 179000 2013-03-01 10:26:12Z andrea $ +# $Id: PKGBUILD 179819 2013-03-09 18:32:21Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt pkgver=0.9.3 -pkgrel=5 +pkgrel=6 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') -depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base') -makedepends=('libxslt' 'python2' 'cmake' 'doxygen') +depends=('qt4') +makedepends=('libxslt' 'python2' 'cmake' 'doxygen' 'telepathy-glib') conflicts=('telepathy-qt4') replaces=('telepathy-qt4') provides=('telepathy-qt4') @@ -20,8 +20,6 @@ md5sums=('94ac93aedf5f6fff49837bc8368e5a37' 'e1b851b08b159fca39596ff8395ca53a') build() { - . /etc/profile.d/qt4.sh - mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 61748e62a..dc31b1283 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 176946 2013-02-02 21:34:52Z guillaume $ +# $Id: PKGBUILD 179713 2013-03-09 12:31:30Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -14,13 +14,14 @@ options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 01_patch-automake-1.13.diff 02_enable-version.diff) -sha256sums=('d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372' +sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea' '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80' 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" +# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 patch -p0 < ${srcdir}/01_patch-automake-1.13.diff patch -p0 < ${srcdir}/02_enable-version.diff diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index b68adef36..6b1b9684a 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 178143 2013-02-16 22:49:01Z ioni $ +# $Id: PKGBUILD 179685 2013-03-09 11:09:53Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=6 +pkgrel=7 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" license=('LGPL' 'GPL') depends=('libxvmc' 'ffmpeg' 'libxinerama') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug' - 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' + 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu') optdepends=('imagemagick: for using the imagemagick plugin' \ 'jack: for using the jack plugin' \ @@ -30,11 +30,18 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'gnome-vfs: for using the gnome-vfs plugin' \ 'libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) -sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz + xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch) +sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c' + '45500eca2aa40c133e1a6e8b23dbadc4b921b11f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix audio decoding with newest FFmpeg + # https://bugs.archlinux.org/task/33818 + patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch" + ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations make } diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch new file mode 100644 index 000000000..255f56d0d --- /dev/null +++ b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch @@ -0,0 +1,277 @@ +From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001 +From: Torsten Jager <t.jager@gmx.de> +Date: Thu, 21 Feb 2013 22:35:00 +0200 +Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 () + +--- + src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------ + src/combined/ffmpeg/ffmpeg_compat.h | 4 +- + 2 files changed, 131 insertions(+), 26 deletions(-) + +diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c +index 4e64378..34a7a9e 100644 +--- a/src/combined/ffmpeg/ff_audio_decoder.c ++++ b/src/combined/ffmpeg/ff_audio_decoder.c +@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s { + int decoder_ok; + + AVCodecParserContext *parser_context; +- ++#if AVAUDIO > 3 ++ AVFrame *av_frame; ++#endif + } ff_audio_decoder_t; + + +@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ + return; + } + ++ /* Try to make the following true */ ++ this->context->request_sample_fmt = AV_SAMPLE_FMT_S16; ++ + /* Current ffmpeg audio decoders usually use 16 bits/sample + * buf->decoder_info[2] can't be used as it doesn't refer to the output + * bits/sample for some codecs (e.g. MS ADPCM) */ +@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this) + this->audio_channels = 0; + } + +-static int ff_audio_decode(xine_t *xine, +- AVCodecContext *ctx, +- AVCodecParserContext *parser_ctx, +- int16_t *decode_buffer, int *decode_buffer_size, +- uint8_t *buf, int size) +-{ ++static int ff_audio_decode (ff_audio_decoder_t *this, ++ int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) { + int consumed; + int parser_consumed = 0; + + #if AVPARSE > 1 +- if (parser_ctx) { ++ if (this->parser_context) { + uint8_t *outbuf; + int outsize; + + do { +- int ret = av_parser_parse2(parser_ctx, ctx, +- &outbuf, &outsize, +- buf, size, +- 0, 0, 0); ++ int ret = av_parser_parse2 (this->parser_context, this->context, ++ &outbuf, &outsize, buf, size, 0, 0, 0); + parser_consumed += ret; + buf += ret; + size -= ret; +@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine, + /* nothing to decode ? */ + if (outsize <= 0) { + *decode_buffer_size = 0; +- xprintf (xine, XINE_VERBOSITY_DEBUG, ++ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "ffmpeg_audio_dec: not enough data to decode\n"); + return parser_consumed; + } +@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine, + avpkt.data = buf; + avpkt.size = size; + avpkt.flags = AV_PKT_FLAG_KEY; +- consumed = avcodec_decode_audio3 (ctx, +- decode_buffer, decode_buffer_size, +- &avpkt); ++# if AVAUDIO > 3 ++ int got_frame; ++ if (!this->av_frame) ++ this->av_frame = avcodec_alloc_frame (); ++ ++ consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); ++ if ((consumed >= 0) && got_frame) { ++ int16_t *q = decode_buffer; ++ int samples = this->av_frame->nb_samples; ++ int channels = this->context->channels; ++ int bytes, i, j; ++ /* limit buffer */ ++ if (channels > 12) ++ channels = 12; ++ if (*decode_buffer_size < samples * channels * 2) ++ samples = *decode_buffer_size / (channels * 2); ++ bytes = samples * channels * 2; ++ *decode_buffer_size = bytes; ++ /* convert to packed int16_t. I guess there is something ++ in libavfilter but also another dependency... */ ++ switch (this->context->sample_fmt) { ++ case AV_SAMPLE_FMT_U8P: ++ if (channels > 1) { ++ uint8_t *p[12]; ++ for (i = 0; i < channels; i++) ++ p[i] = (uint8_t *)this->av_frame->extended_data[i]; ++ for (i = samples; i; i--) { ++ for (j = 0; j < channels; j++) ++ *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000; ++ } ++ break; ++ } ++ case AV_SAMPLE_FMT_U8: ++ { ++ uint8_t *p = (uint8_t *)this->av_frame->extended_data[0]; ++ for (i = samples * channels; i; i--) ++ *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000; ++ } ++ break; ++ case AV_SAMPLE_FMT_S16P: ++ if (channels > 1) { ++ int16_t *p[12]; ++ for (i = 0; i < channels; i++) ++ p[i] = (int16_t *)this->av_frame->extended_data[i]; ++ for (i = samples; i; i--) { ++ for (j = 0; j < channels; j++) ++ *q++ = *p[j]++; ++ } ++ break; ++ } ++ case AV_SAMPLE_FMT_S16: ++ xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes); ++ break; ++ case AV_SAMPLE_FMT_S32P: ++ if (channels > 1) { ++ int32_t *p[12]; ++ for (i = 0; i < channels; i++) ++ p[i] = (int32_t *)this->av_frame->extended_data[i]; ++ for (i = samples; i; i--) { ++ for (j = 0; j < channels; j++) ++ *q++ = *p[j]++ >> 16; ++ } ++ break; ++ } ++ case AV_SAMPLE_FMT_S32: ++ { ++ int32_t *p = (int32_t *)this->av_frame->extended_data[0]; ++ for (i = samples * channels; i; i--) ++ *q++ = *p++ >> 16; ++ } ++ break; ++ case AV_SAMPLE_FMT_FLTP: /* the most popular one */ ++ if (channels > 1) { ++ float *p[12]; ++ for (i = 0; i < channels; i++) ++ p[i] = (float *)this->av_frame->extended_data[i]; ++ for (i = samples; i; i--) { ++ for (j = 0; j < channels; j++) { ++ int v = *p[j]++ * (float)0x7fff; ++ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; ++ } ++ } ++ break; ++ } ++ case AV_SAMPLE_FMT_FLT: ++ { ++ float *p = (float *)this->av_frame->extended_data[0]; ++ for (i = samples * channels; i; i--) { ++ int v = *p++ * (float)0x7fff; ++ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; ++ } ++ } ++ break; ++ default: ; ++ } ++ } else *decode_buffer_size = 0; ++# else ++ consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt); ++# endif + #else +- consumed = avcodec_decode_audio2 (ctx, +- decode_buffer, decode_buffer_size, +- buf, size); ++ consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size); + #endif + + if (consumed < 0) { +- xprintf (xine, XINE_VERBOSITY_DEBUG, ++ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed); + } else if (parser_consumed && consumed != size) { + +- xprintf (xine, XINE_VERBOSITY_DEBUG, ++ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + "ffmpeg_audio_dec: decoder didn't consume all data\n"); + } + +@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) + decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; + + bytes_consumed = +- ff_audio_decode(this->stream->xine, this->context, +- this->parser_context, ++ ff_audio_decode(this, + (int16_t *)this->decode_buffer, &decode_buffer_size, + &this->buf[offset], this->size); + +@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) + } + + /* fill up this buffer */ ++#if AVAUDIO < 4 + if (codec_type == BUF_AUDIO_WMAPRO) { + /* the above codecs output float samples, not 16-bit integers */ + int bytes_per_sample = sizeof(float); +@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) + bytes_to_send = bytes_to_send * 2 / bytes_per_sample; + xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send); + free(int_buffer); +- } else { ++ } else ++#endif ++ { + if ((decode_buffer_size - out) > audio_buffer->mem_size) + bytes_to_send = audio_buffer->mem_size; + else +@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) { + + /* try to reset the wma decoder */ + if( this->decoder_ok ) { ++#if AVAUDIO > 3 ++ avcodec_free_frame (&this->av_frame); ++#endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); + if (avcodec_open (this->context, this->codec) < 0) +@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) { + } + + if( this->context && this->decoder_ok ) { ++#if AVAUDIO > 3 ++ avcodec_free_frame (&this->av_frame); ++#endif + pthread_mutex_lock (&ffmpeg_lock); + avcodec_close (this->context); + pthread_mutex_unlock (&ffmpeg_lock); +@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, + + this->context = avcodec_alloc_context(); + this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE); +- ++#if AVAUDIO > 3 ++ this->av_frame = NULL; ++#endif + return &this->audio_decoder; + } + +diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h +index 0acead8..b567dc1 100644 +--- a/src/combined/ffmpeg/ffmpeg_compat.h ++++ b/src/combined/ffmpeg/ffmpeg_compat.h +@@ -94,7 +94,9 @@ + #endif + + /* avcodec_decode_audio() */ +-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) ++#if LIBAVCODEC_VERSION_MAJOR >= 54 ++# define AVAUDIO 4 ++#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) + # define AVAUDIO 3 + #else + # define AVAUDIO 2 +-- +1.8.1.5 + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index ee2a949f0..5f5ca2c30 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 178463 2013-02-23 11:12:22Z andyrtr $ +# $Id: PKGBUILD 179653 2013-03-09 07:55:34Z 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.13.2.901 +pkgver=1.13.3 pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' +makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') + 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch @@ -22,7 +22,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run.1 10-quirks.conf use-pixman-glyph-cache.patch) -sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c' +sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index f6b818fdd..83427aeed 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ +# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd5ad2ecc865a32378517c3c07ca99173' + '61b8b43e04065556b2b173d34111674d' '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 946736248..88ec434c7 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.1-1-LIBRE-PAE +KERNEL_VERSION=3.8.2-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 5ddfcd122..f2bb2f1a7 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ +# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd5ad2ecc865a32378517c3c07ca99173' + '61b8b43e04065556b2b173d34111674d' 'c13961a22d8c742fb31b59a1e27a0e7b' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 32673ba50..88803e55b 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.1-1-LIBRE-XEN +KERNEL_VERSION=3.8.2-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 597b2f855..939410301 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 174970 2013-01-09 16:29:59Z andyrtr $ +# $Id: PKGBUILD 179657 2013-03-09 09:03:03Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.29 -pkgrel=3 -pkgdesc="OpenPrinting CUPS Filters" +pkgver=1.0.30 +pkgrel=1 +pkgdesc="OpenPrinting CUPS Filters (without foomatic-db-nonfree recommendation)" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') @@ -14,28 +14,24 @@ makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly') -backup=(etc/fonts/conf.d/99pdftoopvp.conf) +backup=(etc/fonts/conf.d/99pdftoopvp.conf + etc/cups/cups-browsed.conf) options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz - cups-browsed.service - poppler_buildfix.diff) -md5sums=('0640a02a3fb88d3dbdb224e3becd400d' - '4c9f97eae201798000483c4e7109e690' - 'bd97d1d9dbd4feec3a0330fd9fb7a03c') + cups-browsed.service) +md5sums=('0d338e63f445e98d29c963620e5b1420' + '4c9f97eae201798000483c4e7109e690') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") build() { cd "$srcdir/$_pkgname-$pkgver" - - # fix build with poppler 0.22 - patch -Np0 -i ${srcdir}/poppler_buildfix.diff - ./configure --prefix=/usr \ --sysconfdir=/etc \ --with-rcdir=no \ --enable-avahi \ + --with-browseremoteprotocols=DNSSD,CUPS \ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf make } diff --git a/libre/cups-filters-libre/poppler_buildfix.diff b/libre/cups-filters-libre/poppler_buildfix.diff deleted file mode 100644 index b646efd6b..000000000 --- a/libre/cups-filters-libre/poppler_buildfix.diff +++ /dev/null @@ -1,61 +0,0 @@ -=== modified file 'NEWS' ---- NEWS 2013-01-02 18:23:25 +0000 -+++ NEWS 2013-01-09 10:42:32 +0000 -@@ -1,6 +1,11 @@ - NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02 - ----------------------------------------------------- - -+CHANGES IN V1.0.30 -+ -+ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani -+ from BBR Inc. (Bug #1089). -+ - CHANGES IN V1.0.29 - - - Fixed ./configure option "--with-rcdir=no". Thanks to Jiri - -=== modified file 'filter/pdftoopvp/OPVPOutputDev.cxx' ---- filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 08:32:55 +0000 -+++ filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-09 10:42:32 +0000 -@@ -1804,8 +1804,14 @@ - maskSplash = new Splash(maskBitmap, gFalse); - maskColor[0] = 0; - maskSplash->clear(maskColor); -+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - maskSplash->drawImage(&imageSrc, &imgMaskData, - splashModeMono8, gFalse, maskWidth, maskHeight, mat); -+#else -+ maskSplash->drawImage(&imageSrc, &imgMaskData, -+ splashModeMono8, gFalse, maskWidth, maskHeight, -+ mat,gFalse); -+#endif - delete imgMaskData.imgStr; - maskStr->close(); - gfree(imgMaskData.lookup); - -=== modified file 'filter/pdftoopvp/oprs/OPRS.cxx' ---- filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 19:56:59 +0000 -+++ filter/pdftoopvp/oprs/OPRS.cxx 2013-01-09 10:42:32 +0000 -@@ -5,6 +5,9 @@ - //======================================================================== - - #include <config.h> -+#ifdef HAVE_CPP_POPPLER_VERSION_H -+#include "cpp/poppler-version.h" -+#endif - - #ifdef USE_GCC_PRAGMAS - #pragma implementation -@@ -235,7 +238,11 @@ - SplashColorMode srcMode, GBool srcAlpha, - int w, int h, SplashCoord *mat) { - if (rasterMode) { -+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2)) - return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); -+#else -+ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse); -+#endif - } else { - return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat); - } - diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index 066adb07f..cb58c0357 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -5,13 +5,13 @@ _pkgname=file-roller pkgname=file-roller-libre pkgver=3.6.3 -pkgrel=2 -pkgdesc="Archive manipulator for GNOME" -arch=('i686' 'x86_64') +pkgrel=2.1 +pkgdesc="Archive manipulator for GNOME (with unar recommendation and nonfree unace recommendation removed)" +arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'libarchive' 'file' 'json-glib' 'libnotify') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'itstool' 'docbook-xsl') -optdepends=('ununrar: interface to unarchiver, the free RAR uncompression program' +optdepends=('unar: the free RAR uncompression utility' 'zip: creates PKZIP-compatible .zip files' 'p7zip: 7zip compression utility' 'arj: ARJ archiver') diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 37c9fae8f..65a644c9c 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178145 2013-02-16 23:09:01Z tomegun $ +# $Id: PKGBUILD 179659 2013-03-09 09:20:06Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,7 +6,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.2 +pkgver=3.13.3 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64') @@ -31,6 +31,9 @@ options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} cups-1.6-buildfix.diff) +md5sums=('4a378cc08f7a4f131968c0966c1ceb8c' + 'f37ad6d95a36d7547a2c60374fc4d1ec' + 'ef64578c6cb3ce252dbdcb0f1c2f4a47') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -41,7 +44,7 @@ build() { export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py logcapture.py base/magic.py + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.py base/magic.py sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py @@ -92,6 +95,3 @@ package() { # remove rc script rm -rf "$pkgdir"/etc/init.d } -md5sums=('cd7edef6b2df2cdb468b145cd2127e1b' - 'cc3fc6de33ccf8bfce0bc890e30bd4e1' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47') diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD new file mode 100644 index 000000000..1f80dfd7c --- /dev/null +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=firefox-adblock-plus +pkgname=icecat-adblock-plus +pkgver=2.2.3 +_addons_file=192004 +pkgrel=2 +pkgdesc="plugin for icecat which block ads and banners" +arch=('any') +url="http://adblockplus.org/" +license=('GPL') +depends=("icecat") +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('unzip') +noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") +source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) +md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') + +package() { +# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1-2 -d.` +# depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}") + + cd $srcdir + [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi + local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) + local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + [ -n ${emid} ] || return 1 + install -d $dstdir +# sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf + cp -R * $dstdir + rm $dstdir/*.xpi + find $pkgdir -type d -exec chmod 0755 {} \; + find $pkgdir -type f -exec chmod 0644 {} \; +} diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD new file mode 100644 index 000000000..ff3ce7c37 --- /dev/null +++ b/libre/icecat-noscript/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=firefox-noscript +pkgname=icecat-noscript +pkgver=2.6.5.7 +pkgrel=1 +pkgdesc="plugin for icecat which disables script" +arch=('any') +url="http://noscript.net/" +license=('GPL2') +depends=() +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('unzip') +source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) +md5sums=('82816e7d024c71d698dd108c0aec527d') + +package() { +# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` +# depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}") + depends=("icecat") + + cd $srcdir + local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) + local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid} + install -d $dstdir +# sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf + cp -R * $dstdir + rm $dstdir/noscript-$pkgver.xpi +} diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD new file mode 100644 index 000000000..338e059e8 --- /dev/null +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=firefox-adblock-plus +pkgname=iceweasel-adblock-plus +pkgver=2.2.3 +_addons_file=192004 +pkgrel=2 +pkgdesc="plugin for iceweasel which block ads and banners" +arch=('any') +url="http://adblockplus.org/" +license=('GPL') +depends=("iceweasel-libre") +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('unzip') +noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi") +source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi) +md5sums=('07607a3cb349eeccfc7768b5f4f2aaae') + +package() { +# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1-2 -d.` +# depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}") + + cd $srcdir + [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi + local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) + local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + [ -n ${emid} ] || return 1 + install -d $dstdir +# sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf + cp -R * $dstdir + rm $dstdir/*.xpi + find $pkgdir -type d -exec chmod 0755 {} \; + find $pkgdir -type f -exec chmod 0644 {} \; +} diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 2e4837872..d59f6dad3 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=19.0 +_debver=19.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -75,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { done md5sums=('e88728730ecf9f0f145de5f70e362b15' - '5f91205d41a4622848e61bee463f14a1' - 'e29da15887bb4ab2b569c5c4dd776a25' - '7b76f37c83a29b64749cdc22c5165631' - 'b42eef799d2a6366dd692c94a7ba51b8' - 'dfe01c69b2cbc023b68a8c25c1bf7157' - '8b6552b43d28b8350fe01211282a0229' - 'c17ca1f4717d1e146851a710a4e11274' - 'fde45fc9ad84a52a9f8d951f1962d29f' - '52c891a254642c6c57126b8466b55550' - 'bf1766232a1147d7b3568ade32072f06' - 'b19a611ee8613b7f47c4f0332e22189c' - '741639df355a097d09abae26b0ad629b' - '9f169c89de5585650f49f35d9c4c00e3' - 'd9bb7bc325a92068a4a76f69a1809bec' - 'd06e345a17c93cd5aa1374e0a003be0d' - '526c59a51339d48cab15fb15d2df64b5' - 'f2184c754da3f8e32ca787492eb9e81f' - '1c896e6053cae3dedbd9937aa756acb3' - '0d6cdeedaf9f50b8682b2d8c4f3950c1' - '517a64f66815fa0ae5fe79b78d95a8a5' - '9adeb6a16fa7f5c1d6e682a439f8d7c8' - 'c360a362b3c5f5b4dea198e8cdc58972' - '6724054975b42fa3d9ac850b435dfd69' - '7da94918a235f2fad8e3aac43cb26c03' - '36d880377ecd705a682bba4d184d29fd' - '50cc39790a2426fa1354b6a45eeb2db7' - '89551bdaf4f4c068e5e7e200541fee0e' - '5a71a10f64314d6301cde382728a41e2' - '9c771c75fd04926141c22ab283c51fb8' - '7ab22ad07dfb36ff6f4549f3c006b817' - '582e28127177c34367b1bbafcc166827' - 'd43ed904112b49a8a5b0bf822e95380f' - 'eb57146f92399128c89d36fdb4424926' - 'c0d97d469bffc37fa6fc0daeb23b1b26' - '067fc480ce411badf73a88e47681006b' - '63aaf6e27a6baf8f0b583b36c9b03d13' - '0effaa9e694c7af1a180627e5e74f8e4' - '4afeba0fa219ad7550e31f19edd4954b' - '1332c01febcfc25178832c8a787dd275' - '59763805b37328a4a35720e26b2aad3d' - 'a999f9794c15c0610cde1ca80c946b56' - 'e69f93aa1714cb299ac3fe2f757b5da3' - '4994b7840835108be65f5311f92289ff' - '74fa9ba4c7985d1c977a532b33784dfc' - 'a86f218b4ee854253c59a470e2abb1e4' - '347c714fa7ebf1cab9fa1b826e6de5ad' - '7308fdb420dc5fd1b94063f0c4f7e5a6' - '368cd804b844834dda83cfc802dd6453' - 'cbdd02277f61f778c95fd9fcc68fe878' - '5e88de028b72b6fa7c06d46a162c0861' - '26f0434e5e874e10db7afc36e7d0f63a' - '9f6d1ee3f20cea4a8e36fdb1e6276453' - '04b6e81adb4d9dfb609ebfca02c4dd86' - 'e4eb34249d58130caca84f7055f299c7' - '36122eaa69639618b8751c82a74b7201' - '2427c7e40800098fc46aad1860e42ee8' - 'f6dfbe879fbff17925795a86d1ae9a1a' - '178b26febee5f8c38cf1fee6e746f137' - '27268b250095ff1b8caa8e6d68430019' - '09f4eef9f51966142bc9d1f1ff887b5c' - '4b1398a607dec42ed99f6fae77acea57' - 'b1299e6cf360af3802a1ea3552914cc9' - 'c1baa88171934c561599f4d88739abe9' - '10f6a7fd51c0ddf3b08831fdbc307768' - '437a944516230463ce751bcfae379c6d' - 'd42385fb8538a655a181e7272f958597' - 'c12e192bc0e1b177f142bac914f422f3' - '2338bf2bc46a89f2057f2e271ed72487' - '928f1fe43d3179b83bb4219311e1b5e5' - '2b0d3bcccf7e8ebbf214248e88b3fbde' - 'bd5ed51ea0b44cc8c9034214d31eea23' - 'ee883df4c4847c34ae15e1ce9e18a160' - 'bb57f5e8bd20a5f516e8a682a1474dcf' - '6d2f66384f38318c41e19c2d9bf164b2' - '68f0d3236cdd7b6a6dda89d42330570a' - 'b181059e92f5ec62473710ad0313036b' - '602a7a4bec1702702b84d7c6aa64fc7b' - '3f4fc8c2ecd68a093f56619579ea4117' - '41cfc1edf0f4da00ee5a6e77cc49648c' - '71c9972d84bab5308c4c48ab620c82bb' - '89a12ce1e546cbf4258786b68862d8ed' - 'fc2a6dd3845adbe1c0e4e11906e7aba1' - 'c04628631d0990c622abd74012340e03' - '93d3fade386575e8c076bfa7241d4968' - '61a7451fba8a19370f0c3b2dca29c1d1' - '39259a63970379d04c0b234a9616f13d' - '16841d5e8539df48ce22ca2c812a3e0e' - 'f1c7c1f2e242f22e42cc2858a6f86bde') + '577f0913ac160c2336854ed842044b6f' + 'e96d6bbc8345b5ffb47637342b480193' + 'ed612ec7d50fcd977859f3e6f6875534' + 'd35212122110d449772202f65f8954d1' + 'fc764ee08f7aa67f69083aceab66bb81' + '06de1d263a8a4776b7e448a0ad8362a0' + '02d8e24ef36077bff080eeebc252adeb' + 'ebf1e4045843f52956a98bfc70ec3efc' + '9d8cd02d602731db2d1a02e913cc7dbc' + '287b82c04569177250b55d674269462a' + '382837da7d688057a0b69359963f93ff' + '1ccd265903b1963f6a9de8539698cbb0' + '0219f58a916c0cf0df799c2e269105c9' + '5527ac476ce1b10bb2420047edb21f24' + 'a40237df431981bfca233ef38a8df474' + '32b3599f81fb9a250d335e4a4a313def' + '0903b962eca658cf88a64095f139a809' + '3a80ded2c90fa410432d44bcd9808b9e' + 'af744ffcb375785811fbc22b814cfa82' + '0fd6576b735ac437e25ecfab730e3db3' + '694019675d5966cb7aafa662c207467e' + '05b712fc956fac57600eb6205a2341d2' + '67e11e01d236f0787d382c462fbaa0d0' + 'e07ca2aa3d1b68307b10e46b267e7bb5' + 'cf6b53eae07f1c1129a2ce3d89c78589' + 'adb43ace5104c3ff9a96a5c9cd5342b6' + '08d27decba62fef21bc0f094b7c6fb39' + '33d1886baa6cf67385f1d662b31b6bdd' + '01724da61afc4558e80e93662a96d5dd' + '7b11d548e148cb779e164aa21d781e77' + '06ec8e9346a2d8bed31e59d2ae5f06c2' + 'cee7e005f487018602b0fa6336b1e808' + 'a0550ba75b0030ed610c24a2508e0f31' + '1fc0945594cde4e165828e610fc3e0a1' + '65fb01cbaa9ec423430084d014078344' + '4d4edc8cc1d512e903e6857232ec6c04' + '60461b2b0fd0d50b7a799702880595f8' + 'b6b571eb0e2e5e7f2f68787e4aabf2bf' + '49ce5b75e49466afdf455628927d2d30' + '014b582e1d7b96ff4632cdd0ee12fd2f' + '3d28b51cf16763c5cf246e956c154ebb' + 'b8f60afa1dfe264418a7a1d74374629a' + '3743cce61567698ea95a622a58e6024f' + '3fd118453485902eeabad9083d77da0a' + '8f16503b338fa959d234af03eddcecf6' + '1cbb856b565d60933f550b589b81ed90' + '10150da51e917a5f1f084d41d9b70d75' + 'cee582980678829954cb7adfbd8bba81' + 'c0f0fe587753be359701673c8bf28c0b' + '48be85369d8a5bebf19b99143693e656' + '188dcf198b42edd3c58fe7d89881ae27' + '6d0f4cbfcab26af14b8c6d088bb99e75' + 'b0522c391e49d68bfe523de9eaff78e2' + 'e79d309ab539a3735fdbd344ee4d087c' + '3222399aa9eaa432e13391d1178fe748' + 'b412fedbf05a9faa37c3119ce8745b38' + 'fa42254a7d3304f89386ae5da13395fb' + '4507fa683d06e3a9f2bf867c7b9e1c80' + 'f18d4b25957c27a338b9440243578341' + 'ab21b048fc397f6e87929fea4ed8f49f' + 'd564a6d04df098010d706001ce07ab45' + 'e552c50840d4d6587a748f78b7180c16' + '4ebff11fd20c9d2e32a5917d13275c17' + 'e27d4af2134fe45ee332738ec333ab24' + '690a3a5187e9f9275b6ca368528856c6' + '42921abda94e6f1c960ff17197a7a203' + 'f23feb82e9e498d7b95c075d72d58f25' + '79e5fafcd4c9053d71f6b88d4ba13c19' + '5a5faae4a8339b9543f365b9bec9aaf9' + 'f6e21175aa922111e1270f845df63c6a' + '24ba1a50d34e7bd77b443184e80a4154' + 'b644aa9d757383848504104fefa8c02e' + '24e395878a542ae3e148c86ff6d7f834' + '98e1f1d4a59f8b29eba9c0d9180fff8a' + '96bfa3b03d1ff2cd6a5934c4e04b3fbd' + 'cfd277d4d8a12cea253fa163e4df4670' + '5649ab30c7856895199524359e8ee6e1' + '04acd4ea38086e95976bb98762283fb2' + 'c62bb42d6b5718b6cede126466d40d9c' + 'ce3d87441cb6a23ff2c2343e112fb265' + 'c5ac0408351585156b04a1c519851de5' + '5eb03c3ba770c3d03fbc61a01c31f89b' + 'db6fde87a056b5ba9705d3127028cfab' + 'e77956cf4cf4bbf16949bfa6fa5f815d' + '2c694332daddb6de2773f2fd4253521b' + 'dd12eaa38c8a47e05b7b87de8914dc78' + 'f37c87a13da078e6a575c36dac084fe6' + 'beaf7c4a95689735db4899780bdc1aaf') diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 1c036c545..1702a17b7 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=19.0 +_debver=19.0.2 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=('i686' 'x86_64' 'mips64el') @@ -49,8 +49,8 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" shared-libs.patch replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('b4c109e987f869f94220188a901d4425' - 'e1d6920cb49c9de88b8e00eb14b1b0e7' +md5sums=('ceda63e01012f9940542d862fd755a65' + '7fa6e0fb544d01516d3232f26023c570' 'f90c6a70d0a6d0a9e7f9a0eed6aeffd3' 'dfeb4ab2c96aae3356a4c347eee0b97b' '7ef2c05dbd5631741404f2589c4ea07e' diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD new file mode 100644 index 000000000..ddf6a18a0 --- /dev/null +++ b/libre/iceweasel-noscript/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=firefox-noscript +pkgname=iceweasel-noscript +pkgver=2.6.5.7 +pkgrel=1 +pkgdesc="plugin for iceweasel which disables script" +arch=('any') +url="http://noscript.net/" +license=('GPL2') +depends=() +conflicts=$_pkgname +provides=$_pkgname=$pkgver +makedepends=('unzip') +source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) +md5sums=('82816e7d024c71d698dd108c0aec527d') + +package() { +# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` +# depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}") + depends=("iceweasel-libre") + + cd $srcdir + local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf) + local dstdir=$pkgdir/usr/lib/iceweasel/extensions/${emid} + install -d $dstdir +# sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf + cp -R * $dstdir + rm $dstdir/noscript-$pkgver.xpi +} diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD index b552f272c..8c70bb72a 100644 --- a/pcr/openjdk6/PKGBUILD +++ b/pcr/openjdk6/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> -pkgname=('openjdk6' 'openjdk6-src') +pkgname=('openjdk6-old' 'openjdk6-old-src') pkgbase="openjdk6" _javaver=6 _icedteaver=1.12.3 @@ -15,7 +15,7 @@ arch=('i686' 'x86_64') license=('custom') makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' - 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget') + 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'java-environment' 'inetutils' 'wget') options=('!emptydirs') source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig} http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz @@ -28,7 +28,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar nonreparenting-wm.diff disable_Werror.diff openjdk6.profile - openjdk6.profile.csh) + openjdk6.profile.csh + disable-openjdk-Werror.diff + ecj-icedtea.patch) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_04.zip jdk6-jaxws2_1_6-2011_06_13.zip @@ -45,11 +47,12 @@ sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c' '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' - '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007') + '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007' + '3e20fdcd17d4adee1cb2ddc3b15a39fe56b9a7837067487eedd40733adfea9c6' + '77bafb45d67cbdac59ae27b0cc85e38d849dcf5c4c4005f5b28b33f4f5b734ab') build() { - unset JAVA_HOME unset CLASSPATH [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh @@ -62,10 +65,11 @@ build() { ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz . cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/ + cp ${srcdir}/ecj-icedtea.patch ${srcdir}/icedtea6-${_icedteaver}/patches/ecj/icedtea.patch autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff patches/disable-openjdk-Werror.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" @@ -73,16 +77,21 @@ build() { ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ --with-ant-home=/usr/share/java/apache-ant \ - --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \ + --with-pkgversion=Parabola-${pkgver}-${pkgrel}-$CARCH \ --with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \ - --disable-bootstrap \ - --with-abs-install-dir=${_jvmdir} + --enable-bootstrap \ + --with-abs-install-dir=${_jvmdir} \ + --with-jdk-home="$JAVA_HOME" + + # Java 7 compilers give more warnings. + find . -name '*.gmk' -or -name 'Makefile' | xargs sed -i 's/-Werror//' + LD_PRELOAD="" make } -package_openjdk6() { +package_openjdk6-old() { pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' backup=(etc/profile.d/openjdk6.sh) depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7') @@ -162,9 +171,9 @@ package_openjdk6() { install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -package_openjdk6-src() { +package_openjdk6-old-src() { pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle' - depends=('openjdk6') + depends=('openjdk6-old') if [ "${CARCH}" = "x86_64" ]; then _arch=amd64 diff --git a/pcr/openjdk6/disable-openjdk-Werror.diff b/pcr/openjdk6/disable-openjdk-Werror.diff new file mode 100644 index 000000000..2fbecaffe --- /dev/null +++ b/pcr/openjdk6/disable-openjdk-Werror.diff @@ -0,0 +1,147 @@ +diff -ru openjdk.orig/corba/make/common/Defs-linux.gmk openjdk/corba/make/common/Defs-linux.gmk +--- openjdk.orig/corba/make/common/Defs-linux.gmk 2013-03-09 18:42:00.271861055 +0100 ++++ openjdk/corba/make/common/Defs-linux.gmk 2013-03-09 18:42:10.322026218 +0100 +@@ -130,13 +130,6 @@ + GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT) + + # +-# Treat compiler warnings as errors, if warnings not allowed +-# +-ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror +-endif +- +-# + # Misc compiler options + # + ifeq ($(ARCH),ppc) +diff -ru openjdk.orig/corba/make/common/shared/Defs-java.gmk openjdk/corba/make/common/shared/Defs-java.gmk +--- openjdk.orig/corba/make/common/shared/Defs-java.gmk 2013-03-09 18:42:00.271861055 +0100 ++++ openjdk/corba/make/common/shared/Defs-java.gmk 2013-03-09 18:42:10.342026563 +0100 +@@ -100,9 +100,6 @@ + ifeq ($(DEBUG_CLASSFILES),true) + JAVACFLAGS += -g + endif +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- JAVACFLAGS += -Werror +-endif + + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) +@@ -173,12 +170,6 @@ + # can bootstrap itself. + # + +-# The javac options supplied to the boot javac is limited. This compiler +-# should only be used to build the 'make/tools' sources, which are not +-# class files that end up in the classes directory. +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- BOOT_JAVACFLAGS += -Werror +-endif + BOOT_SOURCE_LANGUAGE_VERSION = 5 + BOOT_TARGET_CLASS_VERSION = 5 + BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) +diff -ru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk +--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/common/Defs-linux.gmk 2013-03-09 18:42:10.342026563 +0100 +@@ -140,13 +140,6 @@ + GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT) + + # +-# Treat compiler warnings as errors, if warnings not allowed +-# +-ifeq ($(COMPILER_WARNINGS_FATAL),true) +- GCC_WARNINGS += -Werror +-endif +- +-# + # Misc compiler options + # + ifeq ($(ARCH),ppc) +diff -ru openjdk.orig/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk +--- openjdk.orig/jdk/make/common/shared/Defs-java.gmk 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/common/shared/Defs-java.gmk 2013-03-09 18:42:10.342026563 +0100 +@@ -107,9 +107,6 @@ + ifeq ($(DEBUG_CLASSFILES),true) + JAVACFLAGS += -g + endif +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- JAVACFLAGS += -Werror +-endif + + # Add the source level (currently all source is 1.5, should this be 1.6?) + LANGUAGE_VERSION = -source 1.5 +@@ -180,13 +177,6 @@ + # can bootstrap itself. + # + +-# The javac options supplied to the boot javac is limited. This compiler +-# should only be used to build the 'make/tools' sources, which are not +-# class files that end up in the classes directory. +-ifeq ($(COMPILER_WARNINGS_FATAL), true) +- BOOT_JAVACFLAGS += -Werror +-endif +- + BOOT_SOURCE_LANGUAGE_VERSION = 5 + BOOT_TARGET_CLASS_VERSION = 5 + BOOT_JAVACFLAGS += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION) +diff -ru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile +--- openjdk.orig/jdk/make/java/nio/Makefile 2013-03-09 18:42:00.881871058 +0100 ++++ openjdk/jdk/make/java/nio/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -31,7 +31,7 @@ + PACKAGE = java.nio + LIBRARY = nio + PRODUCT = java +-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + NIO_SRC = $(SHARE_SRC)/classes/java/nio +diff -ru openjdk.orig/jdk/make/java/sun_nio/Makefile openjdk/jdk/make/java/sun_nio/Makefile +--- openjdk.orig/jdk/make/java/sun_nio/Makefile 2013-03-09 18:42:00.871870894 +0100 ++++ openjdk/jdk/make/java/sun_nio/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -31,7 +31,7 @@ + PACKAGE = sun.nio + PRODUCT = sun + +-OTHER_JAVACFLAGS += -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + # +diff -ru openjdk.orig/jdk/make/sun/native2ascii/Makefile openjdk/jdk/make/sun/native2ascii/Makefile +--- openjdk.orig/jdk/make/sun/native2ascii/Makefile 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/sun/native2ascii/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -30,7 +30,7 @@ + BUILDDIR = ../.. + PACKAGE = sun.tools.native2ascii + PRODUCT = sun +-OTHER_JAVACFLAGS += -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + # +diff -ru openjdk.orig/jdk/make/sun/nio/Makefile openjdk/jdk/make/sun/nio/Makefile +--- openjdk.orig/jdk/make/sun/nio/Makefile 2013-03-09 18:42:00.891871222 +0100 ++++ openjdk/jdk/make/sun/nio/Makefile 2013-03-09 18:42:10.342026563 +0100 +@@ -35,7 +35,7 @@ + # This re-directs all the class files to a separate location + CLASSDESTDIR = $(TEMPDIR)/classes + +-OTHER_JAVACFLAGS += -Xlint:serial -Werror ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + # +diff -ru openjdk.orig/langtools/make/build.properties openjdk/langtools/make/build.properties +--- openjdk.orig/langtools/make/build.properties 2013-03-09 18:42:00.311861690 +0100 ++++ openjdk/langtools/make/build.properties 2013-03-09 18:43:04.542923328 +0100 +@@ -68,7 +68,7 @@ + # set the following to -version to verify the versions of javac being used + javac.version.opt = + # in time, there should be no exceptions to -Xlint:all +-javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial -Werror ++javac.lint.opts = -Xlint:all,-unchecked,-deprecation,-fallthrough,-cast,-serial + + # options for the <javadoc> task for javac + javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff --git a/pcr/openjdk6/ecj-icedtea.patch b/pcr/openjdk6/ecj-icedtea.patch new file mode 100644 index 000000000..1af1365bf --- /dev/null +++ b/pcr/openjdk6/ecj-icedtea.patch @@ -0,0 +1,893 @@ +diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2010-05-26 09:31:18.000000000 +0100 ++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2012-01-18 21:43:04.134185695 +0000 +@@ -42,7 +42,7 @@ + # the rmic iiop backend needs some classes that are part of the impl/util + # package. These classes use log wrappers, so they must be built after + # pept and before rmi. +-SUBDIRS = sources pept corespi core spi impl rmi ++SUBDIRS = org pept corespi core spi impl rmi + all build clean clobber:: + $(SUBDIRS-loop) + +diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2012-01-18 21:43:04.146185899 +0000 +@@ -0,0 +1,38 @@ ++# ++# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# This code is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License version 2 only, as ++# published by the Free Software Foundation. Sun designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Sun in the LICENSE file that accompanied this code. ++# ++# This code is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++# version 2 for more details (a copy is included in the LICENSE file that ++# accompanied this code). ++# ++# You should have received a copy of the GNU General Public License version ++# 2 along with this work; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, ++# CA 95054 USA or visit www.sun.com if you need additional information or ++# have any questions. ++# ++ ++BUILDDIR = ../../../../.. ++PACKAGE = com.sun.corba.se ++PRODUCT = org ++ ++include $(BUILDDIR)/common/Defs.gmk ++ ++FILES_java=\ ++ com/sun/corba/se/org/omg/CORBA/ORB.java ++ ++# ++# Include ++# ++include $(BUILDDIR)/common/Classes.gmk +diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile +--- openjdk-ecj.orig/corba/make/com/sun/corba/se/sources/Makefile 2010-05-26 09:31:18.000000000 +0100 ++++ openjdk-ecj/corba/make/com/sun/corba/se/sources/Makefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,224 +0,0 @@ +-# +-# Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. +-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +-# +-# This code is free software; you can redistribute it and/or modify it +-# under the terms of the GNU General Public License version 2 only, as +-# published by the Free Software Foundation. Oracle designates this +-# particular file as subject to the "Classpath" exception as provided +-# by Oracle in the LICENSE file that accompanied this code. +-# +-# This code is distributed in the hope that it will be useful, but WITHOUT +-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +-# version 2 for more details (a copy is included in the LICENSE file that +-# accompanied this code). +-# +-# You should have received a copy of the GNU General Public License version +-# 2 along with this work; if not, write to the Free Software Foundation, +-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +-# +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. +-# +- +-BUILDDIR = ../../../../.. +- +-PACKAGE = com.sun.corba.se +-PRODUCT = org +- +-include $(BUILDDIR)/common/Defs.gmk +- +-# +-# Rules +-# +-all: build +- +-build: portableactivation.idl.compile logwrapper.generate logresource.generate +- +-clean clobber:: portableactivation.idl.clean +- +-# +-# Files +-# +-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/ +-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk +-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk +- +-FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java +- +-# +-# Dirs +-# +- +-SRC_DIR = $(SHARE_SRC)/classes +-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer +-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor +- +-ACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/spi/activation +-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL +-LOG_GENDIRECTORY = $(GENSRCDIR)/com/sun/corba/se/impl/logging +- +-# +-# IDLs +-# +- +-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl +-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl +- +- +-# +-# .mc files +-# +-ACTIVATION.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc +-IOR.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc +-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc +-NAMING.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc +-OMG.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc +-ORBUTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc +-POA.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc +-UTIL.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc +- +-MC_GENERATE_CLASS = make-class +-MC_GENERATE_LOG_RB = make-resource +- +-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) +-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) +- +- +-# +-# Activation +-# +- +-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) +- +-$(ACTIVATIONFILES): $(ACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL) +- +-activation.idl.compile: $(ACTIVATIONFILES) +- +-activation.idl.clean: +- $(RM) -f $(ACTIVATIONFILES) +- +-# +-# PortableActivationIDL +-# +- +-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%) +- +-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR) +- +-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \ +- -pkgPrefix PortableActivationIDL com.sun.corba.se \ +- -pkgPrefix Dynamic org.omg \ +- -pkgPrefix IOP org.omg +- +-# REVISIT: remove -oldImplBase +-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL) +- +-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) +- +-portableactivation.idl.clean: +- $(RM) -f $(PORTABLEACTIVATIONFILES) +- +-# +-# Generate LogWrapper classes +-# +-logwrapper.generate: \ +- $(LOG_GENDIRECTORY)/ActivationSystemException.java \ +- $(LOG_GENDIRECTORY)/IORSystemException.java \ +- $(LOG_GENDIRECTORY)/InterceptorsSystemException.java \ +- $(LOG_GENDIRECTORY)/NamingSystemException.java \ +- $(LOG_GENDIRECTORY)/OMGSystemException.java \ +- $(LOG_GENDIRECTORY)/ORBUtilSystemException.java \ +- $(LOG_GENDIRECTORY)/POASystemException.java \ +- $(LOG_GENDIRECTORY)/UtilSystemException.java +- +-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY) +- +-logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties +- +-$(LOG_GENDIRECTORY)/LogStrings.properties: \ +- $(LOG_GENDIRECTORY)/ActivationSystemException.resource \ +- $(LOG_GENDIRECTORY)/IORSystemException.resource \ +- $(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \ +- $(LOG_GENDIRECTORY)/NamingSystemException.resource \ +- $(LOG_GENDIRECTORY)/OMGSystemException.resource \ +- $(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \ +- $(LOG_GENDIRECTORY)/POASystemException.resource \ +- $(LOG_GENDIRECTORY)/UtilSystemException.resource +- $(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties +- +-$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY) +- +-$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC) +- $(prep-target) +- $(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY) +- +- +-.PHONY: all build clean clobber \ +- activation.idl.compile activation.idl.clean \ +- portableactivation.idl.compile portableactivation.idl.clean +- +-# +-# Include +-# +-include $(BUILDDIR)/common/Rules.gmk +diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk +--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2011-01-10 21:21:55.000000000 +0000 ++++ openjdk-ecj/corba/make/common/Defs.gmk 2012-01-18 21:43:04.146185899 +0000 +@@ -53,6 +53,13 @@ + + _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) + ++ ++ifdef ALT_LANGTOOLS_DIST ++ LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST)) ++else ++ LANGTOOLS_DIST = ++endif ++ + # + # Get platform definitions + # +@@ -118,8 +125,6 @@ + # for build tool jar files + BUILDTOOLJARDIR = $(OUTPUTDIR)/btjars + ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars +-# for generated java source files +-GENSRCDIR = $(OUTPUTDIR)/gensrc + # for generated C source files (not javah) + GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc + # for imported source files +@@ -220,7 +225,7 @@ + # We define an intermediate variable for Java files because + # we use its value later to help define $SOURCEPATH + +-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes ++VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes + VPATH.java = $(VPATH0.java) + vpath %.java $(VPATH.java) + vpath %.class $(CLASSBINDIR) +diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk +--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2012-01-18 16:50:50.977002556 +0000 ++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2012-01-18 21:43:04.146185899 +0000 +@@ -271,7 +271,7 @@ + # + VM_NAME = server + JVMLIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm +-JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB) ++JAVALIB = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB) + + # + # We want to privatize JVM symbols on Solaris. This is so the user can +diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 ++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -116,35 +116,17 @@ + CLASS_VERSION = -target $(TARGET_CLASS_VERSION) + JAVACFLAGS += $(CLASS_VERSION) + JAVACFLAGS += -encoding ascii +-JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar ++JAVACFLAGS += -classpath $(LANGTOOLS_DIST)/lib/classes.jar + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR) + +-# Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile +--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2010-05-26 09:31:18.000000000 +0100 ++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -93,8 +93,6 @@ + POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) + + $(POAGENERATEDFILES):: $(POA.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -corba 3.0 -fall -pkgPrefix PortableServer org.omg $(POA.IDL) +- $(RM) -r $(POAHELHOLFILES) + + poa.compile: $(POAGENERATEDFILES) + +@@ -110,10 +108,6 @@ + + # Generating and deleting unused files to reduce images size + $(DYNANYFILES): $(DYNAMIC_ANY.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(DYNANY_IDLJ_FLAGS) $(DYNAMIC_ANY.IDL) +- $(RM) $(DYNANY_DIR)/*POA* +- $(RM) $(DYNANY_DIR)/*Holder* +- $(RM) $(DYNANYDELETEFILES) + + dynany.compile: $(DYNANYFILES) + +@@ -125,12 +119,6 @@ + TR_IDLJ_FLAGS =-i "$(SRC_DIR)/org/omg/PortableInterceptor" -i "$(SRC_DIR)/org/omg/PortableServer" -i "$(SRC_DIR)/org/omg/CosTransactions" + + $(TRGENERATEDFILES):: $(COSTRANSACTIONS.IDL) $(COSTSINTEROP.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTransactions org.omg $(COSTRANSACTIONS.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg -pkgPrefix CosTSInteroperation org.omg $(COSTSINTEROP.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fall -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) +-# $(IDLJ) -td "$(GENSRCDIR)" $(TR_IDLJ_FLAGS) -D CORBA3 -corba 3.0 -fallTIE -pkgPrefix CORBA org.omg $(TRANSACTIONS.IDL) + + tr.compile: $(TRGENERATEDFILES) + +@@ -144,7 +132,6 @@ + # _NamingContextImplBase.java and _BindingIteratorImplBase.java files + # to GENSRC directory. Note that these two classes are deprecated. + $(NSGENERATEDFILES): $(NAMESERVICE.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i $(NAMESERVICEDIR) -fall -pkgPrefix CosNaming org.omg $(NAMESERVICE.IDL) + + ns.compile: $(NSGENERATEDFILES) + +@@ -156,8 +143,6 @@ + IOPDELETEFILES = $(IOP_TO_DELETE_FILES:%=$(GENSRCDIR)/%) + + $(IOPGENERATEDFILES):: $(IOP.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -D CORBA3 -pkgPrefix IOP org.omg $(IOP.IDL) +- $(RM) -r $(IOPDELETEFILES) + + iop.compile: $(IOPGENERATEDFILES) + +@@ -169,8 +154,6 @@ + CORBAXDUPLICATEFILES = $(CORBA_DUPLICATE_java:%=$(GENSRCDIR)/%) + + $(CORBAXGENERATEDFILES):: $(CORBAX.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 $(CORBAX.IDL) +- $(RM) $(CORBAXDUPLICATEFILES) + + corbax.compile: $(CORBAXGENERATEDFILES) + +@@ -181,7 +164,6 @@ + MESSAGINGGENERATEDFILES = $(Messaging_java:%=$(GENSRCDIR)/%) + + $(MESSAGINGGENERATEDFILES):: $(MESSAGING.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -corba 3.0 -pkgPrefix Messaging org.omg $(MESSAGING.IDL) + + messaging.compile: $(MESSAGINGGENERATEDFILES) + +@@ -195,8 +177,6 @@ + PIHELHOLFILES = $(PI_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%) + + $(PIGENERATEDFILES):: $(INTERCEPTORS.IDL) +- $(IDLJ) -td "$(GENSRCDIR)" -i "$(SRC_DIR)/org/omg/PortableInterceptor" -i $(CORBA_IDL_DIR) -fall -pkgPrefix PortableInterceptor org.omg -pkgPrefix Dynamic org.omg -pkgPrefix IOP org.omg -corba 3.0 -D CORBA3 $(INTERCEPTORS.IDL) +- $(RM) $(PIHELHOLFILES) + + pi.compile: $(PIGENERATEDFILES) + +diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile +--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2010-05-26 09:31:18.000000000 +0100 ++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -172,7 +172,6 @@ + ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%) + + $(ACTIVATIONFILES): $(ACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL) + + activation.idl.compile: $(ACTIVATIONFILES) + +@@ -195,7 +194,6 @@ + + # REVISIT: remove -oldImplBase + $(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL) +- $(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL) + + portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES) + +diff -Nru openjdk-ecj.orig/jaxp/build.xml openjdk-ecj/jaxp/build.xml +--- openjdk-ecj.orig/jaxp/build.xml 2011-01-10 21:21:59.000000000 +0000 ++++ openjdk-ecj/jaxp/build.xml 2012-01-18 21:43:04.150185964 +0000 +@@ -131,7 +131,8 @@ + memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" + debug="${javac.debug}" +- target="${javac.target}"> ++ target="${javac.target}" ++ executable="${jdk.home}/bin/javac"> + <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/> + <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/> + <src refid="src.dir.id"/> +diff -Nru openjdk-ecj.orig/jaxws/build.xml openjdk-ecj/jaxws/build.xml +--- openjdk-ecj.orig/jaxws/build.xml 2011-01-10 21:22:02.000000000 +0000 ++++ openjdk-ecj/jaxws/build.xml 2012-01-18 21:43:04.150185964 +0000 +@@ -131,7 +131,8 @@ + memoryMaximumSize="${javac.memoryMaximumSize}" + source="${javac.source}" + debug="${javac.debug}" +- target="${javac.target}"> ++ target="${javac.target}" ++ executable="${jdk.home}/bin/javac"> + <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/> + <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/> + <src refid="src.dir.id"/> +diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk +--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -43,7 +43,8 @@ + @$(prep-target) + @$(MKDIR) -p $(BUILDTOOLCLASSDIR) + $(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \ +- -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE) ++ -sourcepath $(BUILDTOOL_SOURCE_ROOT) -classpath $(ICEDTEA_RT) \ ++ $(BUILDTOOL_MAIN_SOURCE_FILE) + $(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \ + -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \ + $(JAR_JFLAGS) || $(RM) $@ +diff -Nru openjdk-ecj.orig/jdk/make/common/Release.gmk openjdk-ecj/jdk/make/common/Release.gmk +--- openjdk-ecj.orig/jdk/make/common/Release.gmk 2012-01-18 16:51:03.177199616 +0000 ++++ openjdk-ecj/jdk/make/common/Release.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -649,10 +649,23 @@ + $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) + $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ +-$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) ++$(RESOURCES_JAR): \ ++ $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \ ++ $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) ++ (cd $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ +- @$(RES_JAR_ARGLIST) $(JAR_JFLAGS) ++ $(JAR_JFLAGS) @$(RES_JAR_FILELIST)) ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ (cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \ ++ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`) ++endif + @$(java-vm-cleanup) + + # Create jsse.jar containing SunJSSE implementation classes +@@ -708,10 +721,22 @@ + $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST) + $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ +-$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE) ++$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \ ++ $(JAR_MANIFEST_FILE) + $(prep-target) ++ifneq (,$(JAR_KNOWS_ATFILE)) ++ (cd $(CLASSBINDIR) && \ + $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ +- @$(RT_JAR_ARGLIST) $(JAR_JFLAGS) ++ $(JAR_JFLAGS) @$(RT_JAR_FILELIST)) ++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST)) ++ (cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \ ++ $(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS)) ++else ++ (cd $(CLASSBINDIR) && \ ++ $(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \ ++ $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`) ++endif + @$(java-vm-cleanup) + + # Meta-index construction to make core class loaders lazier +@@ -942,19 +967,6 @@ + @$(java-vm-cleanup) + $(CP) $(LIBDIR)/tools.jar $(JDK_IMAGE_DIR)/lib/tools.jar + @# +- @# lib/ct.sym +- @# +- $(MKDIR) -p $(OUTPUTDIR)/symbols/META-INF/sym +- $(JAVAC_CMD) -XDprocess.packages -proc:only \ +- -processor com.sun.tools.javac.sym.CreateSymbols \ +- -Acom.sun.tools.javac.sym.Jar=$(RT_JAR) \ +- -Acom.sun.tools.javac.sym.Dest=$(OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ +- $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) +- $(BOOT_JAR_CMD) c0f $(LIBDIR)/ct.sym \ +- -C $(OUTPUTDIR)/symbols META-INF $(JAR_JFLAGS) +- @$(java-vm-cleanup) +- $(CP) $(LIBDIR)/ct.sym $(JDK_IMAGE_DIR)/lib/ct.sym +- @# + @# CORBA supported orb.idl and ir.idl should be copied to lib + @# + $(CP) $(LIBDIR)/orb.idl $(JDK_IMAGE_DIR)/lib/orb.idl +@@ -1023,16 +1035,6 @@ + $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher + $(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip * + $(RM) -r $(JDK_IMAGE_DIR)/src +- @# +- @# demo, include +- @# +- $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR) +- $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR) +- $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR) +- @# +- @# Swing BeanInfo generation +- @# +- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans + ifneq ($(PLATFORM), windows) + $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) + endif # !windows +diff -Nru openjdk-ecj.orig/jdk/make/common/Rules.gmk openjdk-ecj/jdk/make/common/Rules.gmk +--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/Rules.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -235,8 +235,9 @@ + $(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \ + $(CAT) $(JAVA_SOURCE_LIST); \ + $(ECHO) "# Running javac:"; \ +- $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ +- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" \ ++ -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ ++ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -bootclasspath "$(ICEDTEA_RT):$(ICEDTEA_JCE):$(CLASSDESTDIR)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \ + fi + @$(java-vm-cleanup) + +@@ -302,6 +303,8 @@ + $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ + $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) + @$(java-vm-cleanup) ++ -mv $(CLASSHDRDIR)/java_lang_ClassLoader\$$NativeLibrary.h \ ++ $(CLASSHDRDIR)/java_lang_ClassLoader_NativeLibrary.h + @$(TOUCH) $@ + + classheaders.clean: +diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk +--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk 2012-01-18 16:50:57.569109033 +0000 ++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk 2012-01-18 21:43:04.150185964 +0000 +@@ -124,34 +124,18 @@ + JAVACFLAGS += $(OTHER_JAVACFLAGS) + + # Needed for javah +-JAVAHFLAGS += -bootclasspath $(CLASSBINDIR) ++JAVAHFLAGS += -bootclasspath $(CLASSBINDIR):$(ICEDTEA_RT):$(CLASSDESTDIR) + + # Needed for JAVADOC and BOOT_JAVACFLAGS + NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true + + # Langtools +-ifdef LANGTOOLS_DIST +- JAVAC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar +- JAVAH_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javah.jar +- JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar +- DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar +- JAVAC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAC_JAR)" \ +- -jar $(JAVAC_JAR) $(JAVACFLAGS) +- JAVAH_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVAH_JAR)$(CLASSPATH_SEPARATOR)$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)" \ +- -jar $(JAVAH_JAR) $(JAVAHFLAGS) +- JAVADOC_CMD = $(BOOT_JAVA_CMD) \ +- "-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \ +- -jar $(JAVADOC_JAR) +-else +- # If no explicit tools, use boot tools (add VM flags in this case) +- JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ ++# If no explicit tools, use boot tools (add VM flags in this case) ++JAVAC_CMD = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \ + $(JAVACFLAGS) +- JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ ++JAVAH_CMD = $(JAVA_TOOLS_DIR)/javah \ + $(JAVAHFLAGS) +- JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) +-endif ++JAVADOC_CMD = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%) + + # Override of what javac to use (see deploy workspace) + ifdef JAVAC +diff -Nru openjdk-ecj.orig/jdk/make/java/nio/Makefile openjdk-ecj/jdk/make/java/nio/Makefile +--- openjdk-ecj.orig/jdk/make/java/nio/Makefile 2012-01-18 16:50:50.576996095 +0000 ++++ openjdk-ecj/jdk/make/java/nio/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -31,7 +31,7 @@ + PACKAGE = java.nio + LIBRARY = nio + PRODUCT = java +-OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial ++OTHER_JAVACFLAGS += -Xlint:serial + include $(BUILDDIR)/common/Defs.gmk + + NIO_SRC = $(SHARE_SRC)/classes/java/nio +diff -Nru openjdk-ecj.orig/jdk/make/java/text/Makefile openjdk-ecj/jdk/make/java/text/Makefile +--- openjdk-ecj.orig/jdk/make/java/text/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/java/text/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -80,8 +80,8 @@ + -sourcepath $(TEXT_SRCDIR) \ + $(TEXT_SOURCES) + $(MKDIR) -p $(TEXT_CLASSDIR) +- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ +- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ ++ $(BOOT_JAVA_CMD) -cp $(TEXT_CLASSES):$(GENERATEBREAKITERATORDATA_JARFILE):$(ICEDTEA_CLS_DIR) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(TEXT_CLASSDIR) \ + -spec $(UNICODEDATA)/UnicodeData.txt + @$(java-vm-cleanup) +diff -Nru openjdk-ecj.orig/jdk/make/Makefile openjdk-ecj/jdk/make/Makefile +--- openjdk-ecj.orig/jdk/make/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -247,7 +247,7 @@ + + all build:: sanity-all post-sanity-all + +-SUBDIRS = tools java javax org sun sunw com jpda mkdemo mksample launchers ++SUBDIRS = tools java javax org sun sunw com jpda mksample launchers + all build:: + $(SUBDIRS-loop) + +diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile +--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2012-01-18 16:50:52.313024135 +0000 ++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -438,10 +438,9 @@ + COMPILEFONTCONFIG_JARFILE = $(BUILDTOOLJARDIR)/compilefontconfig.jar + + $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ +- $(COMPILEFONTCONFIG_JARFILE) +- $(prep-target) +- $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $< $@ +- $(CHMOD) 444 $(@) ++ $(COMPILEFONTCONFIG_JARFILE) ++ $(CP) -f $(GENSRCDIR)/fontconfig/* $(LIBDIR) ++ $(CHMOD) 444 $(LIBDIR)/*.bfc + @$(java-vm-cleanup) + + fontconfigs.clean : +diff -Nru openjdk-ecj.orig/jdk/make/sun/javazic/Makefile openjdk-ecj/jdk/make/sun/javazic/Makefile +--- openjdk-ecj.orig/jdk/make/sun/javazic/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/javazic/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -62,7 +62,8 @@ + $(WORKDIR)/$(MAPFILE): $(BUILDTOOLJARDIR)/javazic.jar $(TZFILES) + $(RM) -r $(@D) + $(prep-target) +- $(BOOT_JAVA_CMD) -jar $(BUILDTOOLJARDIR)/javazic.jar -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) ++ $(BOOT_JAVA_CMD) -cp $(ICEDTEA_CLS_DIR):$(BUILDTOOLJARDIR)/javazic.jar \ ++ build.tools.javazic.Main -V "$(TZDATA_VER)" -d $(WORKDIR) $(TZFILES) + @$(java-vm-cleanup) + + $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) +diff -Nru openjdk-ecj.orig/jdk/make/sun/text/Makefile openjdk-ecj/jdk/make/sun/text/Makefile +--- openjdk-ecj.orig/jdk/make/sun/text/Makefile 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/text/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -85,8 +85,9 @@ + $(BOOT_JAVAC_CMD) -d $(TEXT_CLASSES) \ + -sourcepath $(TEXT_SRCDIR) \ + $(BIRULES) $(BIINFO) +- $(BOOT_JAVA_CMD) -Xbootclasspath/p:$(TEXT_CLASSES) \ +- -jar $(GENERATEBREAKITERATORDATA_JARFILE) \ ++ $(BOOT_JAVA_CMD) \ ++ -cp $(TEXT_CLASSES):$(ICEDTEA_CLS_DIR):$(GENERATEBREAKITERATORDATA_JARFILE) \ ++ build.tools.generatebreakiteratordata.GenerateBreakIteratorData \ + -o $(CLASSDESTDIR)/sun/text/resources \ + -spec $(UNICODEDATA)/UnicodeData.txt \ + -language th +diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile +--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2012-01-18 16:51:03.393203105 +0000 ++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2012-01-18 21:43:04.150185964 +0000 +@@ -301,11 +301,7 @@ + + TEMPDIR_CLASSES = $(TEMPDIR)/classes + +-$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java +- @$(prep-target) +- $(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $< +- +-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS) ++$(TEMPDIR)/.gen_icons: $(ICONS) + $(prep-target) + for i in $(ICONS); do \ + filename=`basename $$i`; \ +@@ -315,22 +311,14 @@ + $(ECHO) "package sun.awt.X11;" >> $$classname ; \ + $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \ + $(ECHO) "public static int[] $$name = { " >> $$classname; \ +- $(CAT) $$i | \ +- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ +- -Dawt.toolkit=sun.awt.motif.MToolkit \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ +- classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ ++ classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \ + $(RM) $$classname; \ + $(ECHO) "package sun.awt.X11;" >> $$classname ; \ + $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \ + $(ECHO) "public static long[] $$name = { " >> $$classname; \ +- $(CAT) $$i | \ +- $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES) \ +- -Dawt.toolkit=sun.awt.motif.MToolkit \ +- -Djava.awt.headless=true \ +- sun.awt.X11.ToBin >> $$classname; \ ++ $(ECHO) "0,0" >> $$classname ; \ + $(ECHO) "}; }" >> $$classname; \ + done + $(TOUCH) $@ +diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java +--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2011-01-07 21:32:51.000000000 +0000 ++++ openjdk-ecj/jdk/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java 2012-01-18 21:43:04.150185964 +0000 +@@ -647,9 +647,6 @@ + throws FileNotFoundException, IOException { + BufferedReader in = new BufferedReader(new FileReader(theTemplateFileName)); + PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(theOutputFileName))); +- out.println(commentStart + +- " This file was generated AUTOMATICALLY from a template file " + +- new java.util.Date() + commentEnd); + int marklen = commandMarker.length(); + LOOP: while(true) { + try { +@@ -876,7 +873,6 @@ + // liu : Add a comment showing the source of this table + result.append(commentStart + " The following tables and code generated using:" + + commentEnd + "\n "); +- result.append(commentStart + ' ' + commandLineDescription + commentEnd + "\n "); + + if (plane == 0 && bLatin1 == false) { + genCaseMapTableDeclaration(result); +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java openjdk-ecj/jdk/src/share/classes/java/lang/Double.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Double.java 2011-01-07 21:32:53.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Double.java 2012-01-18 21:43:04.150185964 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffffffffffP+1023} and also equal to + * {@code Double.longBitsToDouble(0x7fefffffffffffffL)}. + */ +- public static final double MAX_VALUE = 0x1.fffffffffffffP+1023; // 1.7976931348623157e+308 ++ public static final double MAX_VALUE = 1.7976931348623157e+308; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final double MIN_NORMAL = 0x1.0p-1022; // 2.2250738585072014E-308 ++ public static final double MIN_NORMAL = 2.2250738585072014E-308; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -95,7 +95,7 @@ + * {@code 0x0.0000000000001P-1022} and also equal to + * {@code Double.longBitsToDouble(0x1L)}. + */ +- public static final double MIN_VALUE = 0x0.0000000000001P-1022; // 4.9e-324 ++ public static final double MIN_VALUE = 4.9e-324; + + /** + * Maximum exponent a finite {@code double} variable may have. +diff -Nru openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java openjdk-ecj/jdk/src/share/classes/java/lang/Float.java +--- openjdk-ecj.orig/jdk/src/share/classes/java/lang/Float.java 2011-01-07 21:32:53.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/classes/java/lang/Float.java 2012-01-18 21:43:04.150185964 +0000 +@@ -76,7 +76,7 @@ + * {@code 0x1.fffffeP+127f} and also equal to + * {@code Float.intBitsToFloat(0x7f7fffff)}. + */ +- public static final float MAX_VALUE = 0x1.fffffeP+127f; // 3.4028235e+38f ++ public static final float MAX_VALUE = 3.4028235e+38f; + + /** + * A constant holding the smallest positive normal value of type +@@ -86,7 +86,7 @@ + * + * @since 1.6 + */ +- public static final float MIN_NORMAL = 0x1.0p-126f; // 1.17549435E-38f ++ public static final float MIN_NORMAL = 1.17549435E-38f; + + /** + * A constant holding the smallest positive nonzero value of type +@@ -94,7 +94,7 @@ + * hexadecimal floating-point literal {@code 0x0.000002P-126f} + * and also equal to {@code Float.intBitsToFloat(0x1)}. + */ +- public static final float MIN_VALUE = 0x0.000002P-126f; // 1.4e-45f ++ public static final float MIN_VALUE = 1.4e-45f; + + /** + * Maximum exponent a finite {@code float} variable may have. It +diff -Nru openjdk-ecj.orig/langtools/make/build.xml openjdk-ecj/langtools/make/build.xml +--- openjdk-ecj.orig/langtools/make/build.xml 2011-02-17 23:26:23.000000000 +0000 ++++ openjdk-ecj/langtools/make/build.xml 2012-01-18 21:43:04.150185964 +0000 +@@ -523,6 +523,7 @@ + includeAntRuntime="no" + source="@{javac.source}" + target="@{javac.target}"> ++ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg line="${javac.version.opt}"/> + <compilerarg line="-Xlint"/> +@@ -539,6 +540,7 @@ + target="@{javac.target}" + debug="${javac.debug}" + debuglevel="${javac.debuglevel}"> ++ <compilerarg line="-bootclasspath @{classes.dir}:${boot.java.home}/jre/lib/rt.jar"/> + <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> + <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> + <compilerarg line="${javac.no.jdk.warnings}"/> |