Sat Jan 19 00:07:12 PST 2013

8 files changed, 36 insertions, 35 deletions

diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index ac3046760..099c746b7 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.14
+pkgver=0.9.15
 pkgrel=1
 pkgdesc="Ebook management application (unar support included instead of libunrar and without nonfree fonts)"
 arch=('i686' 'x86_64') 
@@ -27,7 +27,7 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('0a809b1c1378f95a69337b9bc8207493'
+md5sums=('2e87ac93bb2006e40001a4028945cee2'
          '42c07b43d575b5e7e7524bd7b9528f0e'
          '675cd87d41342119827ef706055491e7')
 
@@ -82,4 +82,10 @@ package() {
   # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/
   rm -rf "${pkgdir}/usr/bin/calibre-mount-helper"
   install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin"
+
+  # Compiling bytecode FS33392
+  python2 -m compileall "${pkgdir}/usr/lib/calibre/"
+
+  # Compiling optimized bytecode FS33392
+  python2 -O -m compileall "${pkgdir}/usr/lib/calibre/"
 }
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 642d04d74..861e5cea0 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=58
+_sublevel=59
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.57 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.58 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '239e8b47a9760212772c3081f9a0a804'
+         '76eb6c2b6d627d00894e8980fdfb45f8'
          '34c234b48d663bd4b04b45b9789bd107'
          '7ae9267fd5e8fd8993d9e2428e808afa'
          'c072b17032e80debc6a8626299245d46'
@@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         '21f93138b6d4410b095cc9998f89e47d')
+         '748f6a283e38db639d0172153f1cf783')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index 7af5d70e7..30770c2f7 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.58-1-LIBRE-LTS
+KERNEL_VERSION=3.0.59-1-LIBRE-LTS
 
 # 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/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5cb275f5e..3b9ac29df 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.7
-_sublevel=2
+_sublevel=3
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,11 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
         'fat-3.6.x.patch'
-        'fix-watchdog-3.7.patch'
-        'drm-fix-track-free-areas-3.7.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
-         '60acd5c68e27a2b31ab8993f91ae7938'
+         'dc98d320024ef8c3be42e13be30c6673'
          '741f96278cbf12996166128a4657ce58'
          '0665c18c1ba3abbea5cd4cde91300854'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,9 +41,7 @@ md5sums=('06bf9601d859531e7378eb43d4ca7dd3'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '88d501404f172dac6fcb248978251560'
-         '3485d6c7ae3af35d16e09d6d9a7ed32a'
-         'e365972f002482a7b25cd5360467d75f'
-         'b56c33eaee920970151fffdfc7df0766')
+         '7b26fef2bd39b7f6f26b7afcbc9d570f')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -74,13 +70,6 @@ build() {
   # https://bugs.archlinux.org/task/32916
   patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
 
-  # fix watchdog enable/disable regression
-  # https://bugs.archlinux.org/task/33095
-  patch -Np1 -i "${srcdir}/fix-watchdog-3.7.patch"
-  # fix GPU hang
-  # https://bugs.archlinux.org/task/33160
-  patch -Np1 -i "${srcdir}/drm-fix-track-free-areas-3.7.patch"
-
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index e958abbf4..278894359 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.7.2-1-LIBRE
+KERNEL_VERSION=3.7.3-1-LIBRE
 
 # 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/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index c51bd04ef..c8cc9d72b 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=11
+pkgrel=11.1
 pkgdesc="A GTK+ based IRC client without non-free browser reference"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
@@ -32,8 +32,8 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
           'a053fba4e1911d1ee6a8248fe19e344797920fe3'
           '70c3cc29fc55ff35f701ef8ac23078b6e3761ce1'
           'aecaf6176a7cfd62555207b02f2793b360aa39da'
-          'ead8947ae0033735803a0353e3b9d23f40fff990'
-          'aae58e189481e336825f8b56bf6939d55b2e42f3')
+          '5a58642e7da870e1d32f7c5da4e61b5c036f76eb'
+          '20aef0ae608af6b30e1b4249f9c53830f8f514f6')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch
index f1ecd6631..60c4846ee 100644
--- a/libre/xchat-libre/no-firefox.patch
+++ b/libre/xchat-libre/no-firefox.patch
@@ -1,11 +1,16 @@
---- xchat-2.8.8/src/fe-gtk/fe-gtk.c_orig	2011-06-02 04:25:03.386077554 +0200
-+++ xchat-2.8.8/src/fe-gtk/fe-gtk.c	2011-06-02 04:25:14.959410608 +0200
-@@ -956,7 +956,7 @@
+diff -Nur xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c xchat-2.8.8/src/fe-gtk/fe-gtk.c
+--- xchat-2.8.8.orig/src/fe-gtk/fe-gtk.c	2010-05-16 00:15:42.000000000 -0300
++++ xchat-2.8.8/src/fe-gtk/fe-gtk.c		2013-01-19 02:11:00.691529212 -0200
+@@ -955,8 +955,10 @@
+ 			return;
  	}
  
- 	/* everything failed, what now? just try firefox */
+-	/* everything failed, what now? just try firefox */
 -	if (try_browser ("firefox", NULL, url))
++	/* everything failed, what now? just try iceweasel or icecat */
 +	if (try_browser ("iceweasel", NULL, url))
++		return;
++	if (try_browser ("icecat", NULL, url))
  		return;
  
  	/* fresh out of ideas... */
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat-libre/remove-non-free-suggestion.patch
index 9383db521..ab4b3dc7b 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat-libre/remove-non-free-suggestion.patch
@@ -1,12 +1,13 @@
-diff -urN xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
---- xchat-2.8.8.orig/src/common/xchat.c	2010-05-16 07:04:45.000000000 +0000
-+++ xchat-2.8.8/src/common/xchat.c	2010-11-09 15:29:23.322458751 +0000
-@@ -602,7 +602,7 @@
+diff -Nur xchat-2.8.8.orig/src/common/xchat.c xchat-2.8.8/src/common/xchat.c
+--- xchat-2.8.8.orig/src/common/xchat.c		2010-05-16 04:04:45.000000000 -0300
++++ xchat-2.8.8/src/common/xchat.c		2013-01-19 01:56:02.243813379 -0200
+@@ -602,7 +602,8 @@
  	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
  
  static char defaultconf_urlhandlers[] =
 -		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		"NAME Open Link in Web Browser\n"		"CMD !iceweasel '%s'\n\n";
++		"NAME Open Link in Iceweasel\n"			"CMD !iceweasel '%s'\n\n"\
++		"NAME Open Link in GNU IceCat\n"		"CMD !icecat '%s'\n\n";
  
  #ifdef USE_SIGACTION
  /* Close and open log files on SIGUSR1. Usefull for log rotating */