diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-01 10:50:46 -0300 |
| commit | 3aff11a8581ae7e5a8ccea02062cd92f873c44c5 (patch) | |
| tree | 05623159a5ae88f6eed2414db216bc9a0d2d71c5 /community/midori | |
| parent | d4157e6db6dd7e03802aa9c361a1902e81c2545a (diff) | |
| parent | 9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/geany/PKGBUILD
community/linux-tools/PKGBUILD
community/linux-tools/cpupower.conf
community/linux-tools/cpupower.rc
community/stk/PKGBUILD
core/patch/PKGBUILD
core/systemd/PKGBUILD
extra/lftp/PKGBUILD
extra/lftp/lftp-4.3.8-gets.patch
extra/mysql/PKGBUILD
extra/qt/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/glibmm/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/libgdata/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/pango/PKGBUILD
gnome-unstable/polkit/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
libre/linux-libre/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/wine/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/systemd/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'community/midori')
| -rw-r--r-- | community/midori/0.4.7-private-mode.patch | 12 | ||||
| -rw-r--r-- | community/midori/PKGBUILD | 15 |
2 files changed, 22 insertions, 5 deletions
diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch new file mode 100644 index 000000000..599780b78 --- /dev/null +++ b/community/midori/0.4.7-private-mode.patch @@ -0,0 +1,12 @@ +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, diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 7b58c4acc..bfab30b7c 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76505 2012-09-20 05:16:42Z bpiotrowski $ +# $Id: PKGBUILD 76712 2012-09-27 13:47:42Z bpiotrowski $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -8,7 +8,7 @@ pkgname=midori pkgver=0.4.7 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' @@ -18,12 +18,17 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support') options=('!emptydirs') -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('06db7b88a41e9b2265728960d5e98f35') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0.4.7-private-mode.patch) +md5sums=('06db7b88a41e9b2265728960d5e98f35' + 'b2f21a853038662fd0e6c2274ed9dfb7') build() { cd $srcdir/$pkgname-$pkgver - + + # fs#31641 + patch -Np1 -i $srcdir/0.4.7-private-mode.patch + # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf |