[arch-commits] Commit in midori/trunk (0.4.7-private-mode.patch PKGBUILD)

[Alexander Rødseth]

    Date: Wednesday, February 6, 2013 @ 12:36:12
  Author: arodseth
Revision: 83884

upgpkg: midori 0.4.8-1

Modified:
  midori/trunk/PKGBUILD
Deleted:
  midori/trunk/0.4.7-private-mode.patch

--------------------------+
 0.4.7-private-mode.patch |   12 ------------
 PKGBUILD                 |   32 ++++++++++++++------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

Deleted: 0.4.7-private-mode.patch
===================================================================
--- 0.4.7-private-mode.patch	2013-02-06 10:40:30 UTC (rev 83883)
+++ 0.4.7-private-mode.patch	2013-02-06 11:36:12 UTC (rev 83884)
@@ -1,12 +0,0 @@
-diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala
---- midori-0.4.7/katze/midori-paths.vala	2012-09-19 23:17:43.000000000 +0200
-+++ midori-0.4.7.patch/katze/midori-paths.vala	2012-09-24 20:36:04.585209437 +0200
-@@ -74,7 +74,7 @@
-             else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
-                 /* Use mock folders in development builds */
-                 if ("." in MIDORI_VERSION_SUFFIX)
--                    config_dir = cache_dir = user_data_dir = config_base;
-+                    config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S;
-                 else
-                     config_dir = cache_dir = user_data_dir = "/";
-                 readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-06 10:40:30 UTC (rev 83883)
+++ PKGBUILD	2013-02-06 11:36:12 UTC (rev 83884)
@@ -7,41 +7,36 @@
 # Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
 
 pkgname=midori
-pkgver=0.4.7
-pkgrel=3
+pkgver=0.4.8
+pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
 license=('LGPL2.1')
 install=midori.install
-depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala')
-optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support')
+depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'gcr')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala')
+optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
+            'aria2: download utility')
 options=('!emptydirs')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        0.4.7-private-mode.patch
-        fix-copying.patch)
-md5sums=('06db7b88a41e9b2265728960d5e98f35'
-         'b2f21a853038662fd0e6c2274ed9dfb7'
-         '4bf3a0af4edc9ad6c4d46fc9676d9eb0')
+source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
+        'fix-copying.patch')
+sha256sums=('40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f'
+            'd4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # FS#31641
-  patch -s -Np1 -i ../0.4.7-private-mode.patch
-
   # FS#32229
   patch -s -Np1 -i ../fix-copying.patch > /dev/null || true
 
-  # python2 
+  # Python 2 
   export PYTHON=/usr/bin/python2
   sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
   
   ./configure --prefix=/usr \
               --jobs=${MAKEFLAGS/-j/} \
               --enable-addons \
-              --disable-hildon \
               --enable-unique \
               --enable-nls \
               --enable-docs \
@@ -50,8 +45,9 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et: