Merge branch 'master' of gparabola:abslibre

5 files changed, 15 insertions, 18 deletions

diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2-libre/PKGBUILD
index 97fc7187a..1614c8d50 100644
--- a/libre-multilib/pcsx2-libre/PKGBUILD
+++ b/libre-multilib/pcsx2-libre/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 105250 2014-02-03 11:40:28Z alucryd $
+# $Id: PKGBUILD 105336 2014-02-05 13:51:22Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: josephgbr <rafael.f.f1@gmail.com>
 # Contributor: vEX <vex@niechift.com>
 
 _pkgname=pcsx2
 pkgname=$_pkgname-libre
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support'
 arch=('i686' 'x86_64')
 url='http://www.pcsx2.net'
 license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3')
-makedepends=('cmake' 'sparsehash' 'svn')
+makedepends=('cmake' 'sparsehash')
 if [[ $CARCH == "i686" ]]; then
   depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.8')
 elif [[ $CARCH == "x86_64" ]]; then
@@ -21,8 +21,8 @@ provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
 replaces=("$_pkgname")
 options=('!emptydirs')
-source=("${_pkgname}-${pkgver}::svn+http://pcsx2.googlecode.com/svn/tags/v${pkgver%.?}")
-sha256sums=('SKIP')
+source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz")
+sha256sums=('965d0fc589dfc63934adc7214b069746b994cdcfd65ab3bb708c4ac6307b1162')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
diff --git a/libre-multilib/wine-libre/PKGBUILD b/libre-multilib/wine-libre/PKGBUILD
index abe419845..7a4e6ad62 100644
--- a/libre-multilib/wine-libre/PKGBUILD
+++ b/libre-multilib/wine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104338 2014-01-18 08:57:12Z bluewind $
+# $Id: PKGBUILD 105539 2014-02-09 21:39:06Z bluewind $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
@@ -7,14 +7,14 @@
 
 _pkgname=wine
 pkgname=wine-libre
-pkgver=1.7.11
-pkgrel=1.1
+pkgver=1.7.12
+pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(http://prdownloads.sourceforge.net/$_pkgname/$_pkgname-$_pkgbasever.tar.bz2{,.sign}
         30-win32-aliases.conf)
-md5sums=('e0e55105e5c7ba5277023bd54ac60d44'
+md5sums=('ce32c886af1c8a4e824e8dc1a01c5703'
          'SKIP'
          '1ff4e467f59409272088d92173a0f801')
 
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index f3ade8253..6d028e732 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105206 2014-02-02 19:14:41Z heftig $
+# $Id: PKGBUILD 105500 2014-02-09 11:01:04Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -8,7 +8,7 @@
 _pkgname=netsurf
 pkgname=netsurf-libre
 pkgver=3.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
@@ -24,7 +24,7 @@ source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-b
         'netsurf.sh')
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
             '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
-            '3efaf14b95c9aeb83caac488135bd5b6040d2ede382caa5589ff7ebd2bd506cc')
+            '7aef20cc7b2e2e7225237f2f94b5a0074caeb8ec07075c58429b0345ca566f8d')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -96,7 +96,7 @@ prepare() {
   addinclude image/mng.c stdio
   addinclude image/png.c stdio
 
-  gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
+  gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
     --genericname 'Web Browser' --comment 'Lightweight web browser' \
     --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
 }
@@ -108,9 +108,7 @@ build() {
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
-    NETSURF_USE_VIDEO=NO \
-    NETSURF_USE_MOZILLA_JS=YES \
-    NETSURF_USE_HARU_PDF=NO
+    NETSURF_USE_VIDEO=NO
 }
 
 package() {
diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf-libre/netsurf.install
index 98f3ea190..ad97d7bab 100644
--- a/libre/netsurf-libre/netsurf.install
+++ b/libre/netsurf-libre/netsurf.install
@@ -1,5 +1,4 @@
 post_upgrade() {
-  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
   update-desktop-database -q
 }
 
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
index 49b1e161e..b74f388af 100644
--- a/libre/netsurf-libre/netsurf.sh
+++ b/libre/netsurf-libre/netsurf.sh
@@ -3,5 +3,5 @@ shortname=`echo $LANG | cut -b1-2`
 if [[ -d /usr/share/netsurf/$shortname ]]; then
 	/usr/bin/netsurf.elf "$@"
 else
-	LANG=en_US /usr/bin/netsurf.elf "$@"
+	LANG=en /usr/bin/netsurf.elf "$@"
 fi