Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/clementine/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/redis/PKGBUILD
	community/uzbl/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/atkmm/PKGBUILD
	extra/ekiga/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/gdl/PKGBUILD
	extra/glade/PKGBUILD
	extra/glibmm/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-nettool/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/notification-daemon/PKGBUILD
	extra/pangomm/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/redland/PKGBUILD
	extra/vte/PKGBUILD
	extra/xarchiver/PKGBUILD
	extra/yelp/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/mesa/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD

1 files changed, 12 insertions, 22 deletions

diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index 901cfc071..ce48f4625 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.32
 _preset=kernel26-lts.preset
-pkgver=${_basekernel}.36
+pkgver=${_basekernel}.39
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -18,7 +18,8 @@ source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkg
         config.i686 config.x86_64
         # standard config files for mkinitcpio ramdisk
         ${_preset}
-        ${pkgname}.install)
+        ${pkgname}.install
+        buildfix-gcc46.diff)
 options=(!strip)
 
 build() {
@@ -27,8 +28,10 @@ build() {
   # fix 22343 udev crashes
   patch -Np1 -i ${srcdir}/libata-alignment.patch
 
-  cat ../config.$CARCH >./.config
+  # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1
+  patch -Np1 -i ${srcdir}/buildfix-gcc46.diff
 
+  cat ../config.$CARCH >./.config
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
@@ -118,7 +121,7 @@ package_kernel26-libre-lts-headers() {
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
 
-  for i in acpi asm-{generic,x86} config linux math-emu media net pcmcia scsi sound trace video; do
+  for i in acpi asm-{generic,x86} config crypto drm linux math-emu media net pcmcia scsi sound trace video; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
 
@@ -189,20 +192,7 @@ package_kernel26-libre-lts-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
   cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
-  # add headers vor virtualbox
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
 
-  # add headers for broadcom wl
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
-  cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for crypto modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/22081
-  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
-  
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@@ -229,10 +219,10 @@ package_kernel26-libre-lts-headers() {
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-
-md5sums=('44f553d98efbab305ec490334560b097'
+md5sums=('9502a2248b2024da4f30a5d52a90322d'
          '30851deee235a7486bd408cbe8eb2d71'
-         'c0bd6a068a32636e52bf4d887bb2b722'
-         'a5a3af2b95f9a8b3c43d1a74fa5fd82c'
+         '3298f542840c52a8b8abc1b3795e455b'
+         'cd1a62e81eb9e910779f3eb18a6e28c6'
          '2cbfeb3e2a18d45f82f613e97fc23355'
-         'fbfc7a1af3208c7b729055d91e1c149a')
+         'fbfc7a1af3208c7b729055d91e1c149a'
+         'bb7410d7b740dfad0385a07b66e6621f')