Wed Mar 13 00:05:53 PDT 2013

4 files changed, 39 insertions, 29 deletions

diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD
index 32ea75b3d..579f97b42 100644
--- a/extra/glamor-egl/PKGBUILD
+++ b/extra/glamor-egl/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=glamor-egl
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenGL based 2D rendering acceleration library	'
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -15,7 +15,7 @@ source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         glamor_utils.h glamor_priv.h glapi.h
         compat-api.h compiler.h glamor_debug.h glamor_gl_dispatch.h glamor_glext.h
         git-fixes.patch)
-conflicts=('glamir-git')
+conflicts=('glamor-git')
 options=('!libtool')
 sha256sums=('5dc8679ccb3e42bf431b6316c7907b9df2db89745d523e04721f34aee6c84991'
             'fb7db610451d8bb0baaabe3ac618794f535924ac08f62159b08a82ac90a1ed4a'
@@ -52,4 +52,11 @@ package() {
   make "DESTDIR=${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # hack for lib loading with recent Xorg-servers, see FS#34236  and
+  # http://lists.x.org/archives/xorg-devel/2013-March/035719.html
+  
+  # add glamor library path to ld.so.conf.d
+  install -d ${pkgdir}/etc/ld.so.conf.d
+  echo "/usr/lib/xorg/modules" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
 }
diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD
index 7c28a74b3..696543ccd 100644
--- a/extra/gummiboot/PKGBUILD
+++ b/extra/gummiboot/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 179523 2013-03-06 00:31:31Z tomegun $
+# $Id: PKGBUILD 179926 2013-03-12 10:51:04Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor:  Mantas Mikulėnas <grawity@gmail.com>
 
 pkgname="gummiboot"
-pkgver="24"
+pkgver="26"
 pkgrel="1"
 pkgdesc="Simple text-mode UEFI Boot Manager"
 url="http://freedesktop.org/wiki/Software/gummiboot"
 arch=('x86_64' 'i686')
 license=('LGPL2.1')
-makedepends=('gnu-efi-libs')
+makedepends=('gnu-efi-libs' 'docbook-xsl')
 depends=('util-linux')
 conflicts=('gummiboot-efi')
 provides=('gummiboot-efi')
@@ -24,6 +24,9 @@ install="gummiboot.install"
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	./autogen.sh
+	./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib
 	
 	make
 }
@@ -36,6 +39,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}/"
 	make DESTDIR="${pkgdir}" install
 }
-md5sums=('6fe2f9fb9f9a61f37612a8120ea42c1f'
+md5sums=('1ccf5c06944bd31a48eaa4b33edb5fb4'
          '6ea803e5179d623716e3be0b636de658'
          '82bda9612e3a361a74cf8de2a0134b15')
diff --git a/extra/gummiboot/gummiboot.install b/extra/gummiboot/gummiboot.install
index 8b03623b9..770087361 100644
--- a/extra/gummiboot/gummiboot.install
+++ b/extra/gummiboot/gummiboot.install
@@ -1,5 +1,5 @@
 post_install() {
-	/usr/bin/gummiboot install
+	echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot"
 }
 
 post_upgrade() {
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index b395e03a3..e937e4b61 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178897 2013-02-28 13:12:14Z guillaume $
+# $Id: PKGBUILD 179933 2013-03-12 17:11:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -7,23 +7,23 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
          'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u13
-_icedtea_ver=2.3.7
+_updatever=u17
+_icedtea_ver=2.3.8
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=82e58144c3fb
-_JAXP_CHANGESET=1d46a56eb51c
-_JAXWS_CHANGESET=b9590aa972b9
-_JDK_CHANGESET=6a3417030605
-_LANGTOOLS_CHANGESET=b5006c3285c6
-_OPENJDK_CHANGESET=506161df1c48
+_CORBA_CHANGESET=516aae5f27cf
+_JAXP_CHANGESET=1fbe99283d97
+_JAXWS_CHANGESET=3c7be82314bf
+_JDK_CHANGESET=deac45dc94f0
+_LANGTOOLS_CHANGESET=41426c72b802
+_OPENJDK_CHANGESET=ed02a059ea15
 
-_HOTSPOT_CHANGESET=104e2c65892d # see "${srcdir}/icedtea7"/hotspot.map
+_HOTSPOT_CHANGESET=a152dced63a1 # see "${srcdir}/icedtea7"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('378f67f6f84bfb6c705f600b47b68a61b18d67648dd7eaf8498b152587695940'
-            '704bdd40bc328183384272ee282310d8fc3216f3051e504141e7660fe50185a0'
-            'c438607d04e04439ca7df3d911f3cf46ac64066a5b21da98bea8070f98abdafe'
-            'fca2c95b3e60533a937e4f8d497a2934382d9f1f95cde874d926f3b4841407ce'
-            'c6ca4f98b35acdb24a81721de0bee2686bb83917bd84b108775e586c5ae81136'
-            '2a8afd9ecb53e255e436885e6fe3e9882e8657c70482a90ef39aa33e024e79b0'
-            '44d8bc14b213b7c218465a8859bd551feb6805857077ca6aa68aaa4c1b10b676'
-            '203acf2f9737032fe4bb1096e2f81417fa8a92a7016d8220b54a70efd579711a'
+sha256sums=('750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153'
+            '865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b'
+            '181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6'
+            'ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572'
+            '4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad'
+            '00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215'
+            'cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c'
+            'eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
@@ -83,10 +83,10 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz"
 build() {
   cd "${srcdir}/icedtea-${_icedtea_ver}"
 
-  unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+#  unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
   
-  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
-  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
+#  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
+#  [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"