[arch-commits] Commit in midori/trunk (PKGBUILD)

2020-10-19 Thread Alexander Rødseth via arch-commits 
Date: Monday, October 19, 2020 @ 10:23:49
  Author: arodseth
Revision: 726975

use the git hash directly + rebuild with GCC 10

Also make it clear that the package us using the latest git tag from github, 
not from astian.org.

The new webpage for Midori is https://astian.org/en/midori-browser/, but they 
have no links to any
development activity and seem to have departed from the previous versioning 
scheme.

The Midori project was recently merged with the Astian Foundation. Once there 
is a link to
a source repository there, I'm planning to switch over the package URL to that 
web page.

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-10-19 10:08:54 UTC (rev 726974)
+++ PKGBUILD2020-10-19 10:23:49 UTC (rev 726975)
@@ -6,10 +6,10 @@
 
 pkgname=midori
 pkgver=9.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight web browser'
 arch=(x86_64)
-url='https://midori-browser.org/'
+url='https://github.com/midori-browser/core'
 license=(LGPL)
 depends=(aria2 gcr libarchive libpeas libxss webkit2gtk zeitgeist)
 makedepends=(bzr cmake git gobject-introspection intltool ninja vala)
@@ -17,13 +17,13 @@
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
 options=(!emptydirs)
-source=("$pkgname::git+https://github.com/midori-browser/core.git#tag=v$pkgver;)
+source=("$pkgname::git+https://github.com/midori-browser/core.git#commit=f6b3b1e030db7eb2de7faf73ec4ccc18949b668d;)
 # tag: v9.0
 md5sums=('SKIP')
 
 build() {
   mkdir -p build
   cd build
-  cmake "$srcdir/$pkgname" \
+  cmake ../$pkgname \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
@@ -37,4 +37,3 @@
 }
 
 # getver: -u 8 
raw.githubusercontent.com/midori-browser/core/master/CMakeLists.txt
-# vim: ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2020-07-07 Thread Felix Yan via arch-commits 
Date: Tuesday, July 7, 2020 @ 15:08:40
  Author: felixonmars
Revision: 658830

upgpkg: midori 9.0-2: reproducibility rebuild

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-07 15:07:57 UTC (rev 658829)
+++ PKGBUILD2020-07-07 15:08:40 UTC (rev 658830)
@@ -6,7 +6,7 @@
 
 pkgname=midori
 pkgver=9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight web browser'
 arch=(x86_64)
 url='https://midori-browser.org/'

[arch-commits] Commit in midori/trunk (PKGBUILD)

2019-07-31 Thread Alexander Rødseth via arch-commits 
Date: Wednesday, July 31, 2019 @ 11:42:05
  Author: arodseth
Revision: 495529

upgpkg: midori 9.0-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-31 11:26:02 UTC (rev 495528)
+++ PKGBUILD2019-07-31 11:42:05 UTC (rev 495529)
@@ -5,14 +5,13 @@
 # Contributor: Bartłomiej Piotrowski 
 
 pkgname=midori
-pkgver=8.0
+pkgver=9.0
 pkgrel=1
 pkgdesc='Lightweight web browser'
 arch=(x86_64)
 url='https://midori-browser.org/'
 license=(LGPL)
-depends=(aria2 gcr gobject-introspection-runtime libpeas libxss webkit2gtk
- zeitgeist)
+depends=(aria2 gcr libarchive libpeas libxss webkit2gtk zeitgeist)
 makedepends=(bzr cmake git gobject-introspection intltool ninja vala)
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'

[arch-commits] Commit in midori/trunk (PKGBUILD)

2019-03-03 Thread Alexander Rødseth via arch-commits 
Date: Sunday, March 3, 2019 @ 17:26:06
  Author: arodseth
Revision: 437476

upgpkg: midori 8.0-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-03 16:08:58 UTC (rev 437475)
+++ PKGBUILD2019-03-03 17:26:06 UTC (rev 437476)
@@ -5,28 +5,26 @@
 # Contributor: Bartłomiej Piotrowski 
 
 pkgname=midori
-pkgver=7.0
+pkgver=8.0
 pkgrel=1
 pkgdesc='Lightweight web browser'
-arch=('x86_64')
+arch=(x86_64)
 url='https://midori-browser.org/'
-license=('LGPL')
-depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss'
- 'webkit2gtk' 'zeitgeist')
-makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja'
- 'vala')
+license=(LGPL)
+depends=(aria2 gcr gobject-introspection-runtime libpeas libxss webkit2gtk
+ zeitgeist)
+makedepends=(bzr cmake git gobject-introspection intltool ninja vala)
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
-options=('!emptydirs')
-source=("$pkgname::git+https://github.com/midori-browser/core.git#\
-tag=v${pkgver%.0}")
+options=(!emptydirs)
+source=("$pkgname::git+https://github.com/midori-browser/core.git#tag=v$pkgver;)
 md5sums=('SKIP')
 
 build() {
   mkdir -p build
   cd build
-  cmake "../$pkgname" \
+  cmake "$srcdir/$pkgname" \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
@@ -39,5 +37,5 @@
   DESTDIR="$pkgdir" ninja -C build install
 }
 
-# getver: launchpad.net/midori/+download
+# getver: -u 8 
raw.githubusercontent.com/midori-browser/core/master/CMakeLists.txt
 # vim: ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2018-12-06 Thread Alexander Rødseth via arch-commits 
Date: Thursday, December 6, 2018 @ 15:26:27
  Author: arodseth
Revision: 411772

upgpkg: midori 7.0-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-06 15:02:49 UTC (rev 411771)
+++ PKGBUILD2018-12-06 15:26:27 UTC (rev 411772)
@@ -5,7 +5,7 @@
 # Contributor: Bartłomiej Piotrowski 
 
 pkgname=midori
-pkgver=6.0
+pkgver=7.0
 pkgrel=1
 pkgdesc='Lightweight web browser'
 arch=('x86_64')
@@ -19,8 +19,8 @@
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
-source=("$pkgname::git+https://github.com/\
-midori-browser/core.git#tag=v${pkgver%.0}")
+source=("$pkgname::git+https://github.com/midori-browser/core.git#\
+tag=v${pkgver%.0}")
 md5sums=('SKIP')
 
 build() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2018-11-05 Thread Alexander Rødseth via arch-commits 
Date: Monday, November 5, 2018 @ 11:16:26
  Author: arodseth
Revision: 401557

upgpkg: midori 6.0-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-05 10:56:22 UTC (rev 401556)
+++ PKGBUILD2018-11-05 11:16:26 UTC (rev 401557)
@@ -5,33 +5,30 @@
 # Contributor: Bartłomiej Piotrowski 
 
 pkgname=midori
-pkgver=0.5.11
-pkgrel=10
+pkgver=6.0
+pkgrel=1
 pkgdesc='Lightweight web browser'
 arch=('x86_64')
 url='https://midori-browser.org/'
 license=('LGPL')
-depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss' 
'webkit2gtk' 'zeitgeist')
-makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja' 
'vala')
+depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss'
+ 'webkit2gtk' 'zeitgeist')
+makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja'
+ 'vala')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
-# The latest release of Midori does not build with GTK+ > 3.10.
-# Using latest git commit while waiting for the next release.
-source=("$pkgname::git+https://github.com/midori-browser/core.git#commit=7dab517e66475929336e80840cce2351891dd4ef;)
+source=("$pkgname::git+https://github.com/\
+midori-browser/core.git#tag=v${pkgver%.0}")
 md5sums=('SKIP')
 
-# NOTE: Set GTK_CSD=1 for enabling client side decorations when running Midori
-
 build() {
   mkdir -p build
   cd build
-  # TODO: Check if VALA_CFLAGS is respected
   cmake "../$pkgname" \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
--DHALF_BRO_INCOM_WEBKIT2=ON \
 -DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
 -DVALA_CFLAGS="$CFLAGS -fPIC -w" \
 -G Ninja

[arch-commits] Commit in midori/trunk (PKGBUILD)

2018-10-22 Thread Alexander Rødseth via arch-commits 
Date: Monday, October 22, 2018 @ 12:59:27
  Author: arodseth
Revision: 398395

upgpkg: midori 0.5.11-10

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   45 +++--
 1 file changed, 11 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-22 12:46:49 UTC (rev 398394)
+++ PKGBUILD2018-10-22 12:59:27 UTC (rev 398395)
@@ -1,57 +1,34 @@
 # Maintainer: Alexander F. Rødseth 
 # Contributor: Andreas Radke 
-# Contributor: rabyte 
-# Contributor: Johannes Krampf 
+# Contributor: rabyte 
+# Contributor: Johannes Krampf 
 # Contributor: Bartłomiej Piotrowski 
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=9
+pkgrel=10
 pkgdesc='Lightweight web browser'
 arch=('x86_64')
 url='https://midori-browser.org/'
 license=('LGPL')
-provides=('midori')
-replaces=('midori-gtk3')
-depends=('aria2' 'gcr' 'libxss' 'webkit2gtk' 'zeitgeist')
-makedepends=('bzr' 'cmake' 'intltool' 'ninja' 'vala')
+depends=('aria2' 'gcr' 'gobject-introspection-runtime' 'libpeas' 'libxss' 
'webkit2gtk' 'zeitgeist')
+makedepends=('bzr' 'cmake' 'git' 'gobject-introspection' 'intltool' 'ninja' 
'vala')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
-source=("https://midori-browser.org/wp-content/uploads/2018/08/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
+# The latest release of Midori does not build with GTK+ > 3.10.
+# Using latest git commit while waiting for the next release.
+source=("$pkgname::git+https://github.com/midori-browser/core.git#commit=7dab517e66475929336e80840cce2351891dd4ef;)
+md5sums=('SKIP')
 
 # NOTE: Set GTK_CSD=1 for enabling client side decorations when running Midori
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  msg2 'Fixing issues in the Vala sources...'
-  sed 's/protected Tally/public Tally/g' -i midori/midori-notebook.vala
-  sed 's/%d other files/%u other files/g' -i extensions/transfers.vala
-  for f in transfers adblock/widgets apps history-list notes; do
-sed 's,.remove (iter,.remove (ref iter,g' -i "extensions/$f.vala"
-  done
-
-  msg2 'Fixing constants that were deprecated in Gtk 3.10...'
-  # https://lazka.github.io/pgi-docs/Gtk-3.0/constants.html
-  find . -type f -regex '.*\.\(c\|vala\)' -exec sed -i \
-
's/Gtk.STOCK_FILE/"text-x-generic"/g;s/Gtk.STOCK_CLOSE/"window-close"/g;s/Gtk.STOCK_ADD/"list-add"/g;s/Gtk.STOCK_HELP/"help-browser"/g;s/Gtk.STOCK_APPLY/""/g;s/Gtk.STOCK_CANCEL/""/g;s/Gtk.STOCK_COPY/"edit-copy"/g;s/Gtk.STOCK_DELETE/"edit-delete"/g;s/Gtk.STOCK_EDIT/""/g;s/Gtk.STOCK_OPEN/"document-open"/g;s/Gtk.STOCK_PREFERENCES/"preferences-system"/g;s/Gtk.STOCK_PROPERTIES/"document-properties"/g;s/Gtk.STOCK_SAVE/"document-save"/g;s/Gtk.STOCK_CLEAR/"edit-clear"/g;s/Gtk.STOCK_DIRECTORY/"folder"/g'
 \
-"{}" +;
-  # 
https://i-hate-farms.github.io/parrot/gio-2.0/GLib.g_dbus_generate_guid.html
-  find . -type f -regex '.*\.\(c\|vala\)' -exec sed -i \
-'s/g_dbus_generate_guid/GLib.DBus.generate_guid/g' "{}" +;
-}
-
 build() {
   mkdir -p build
   cd build
-
-  # CMake + Vala are not swayed by VALAFLAGS to build with PIC. Need to find a 
different method.
-  #-DVALAFLAGS="$(for f in $(echo $CFLAGS $CXXFLAGS $LDFLAGS | tr ' ' '\n'); 
do echo -X "\"$f\""; done | xargs echo)" \
-  #-DVALAFLAGS="-X -fPIC" \
-  cmake "../$pkgname-$pkgver" \
+  # TODO: Check if VALA_CFLAGS is respected
+  cmake "../$pkgname" \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DHALF_BRO_INCOM_WEBKIT2=ON \

[arch-commits] Commit in midori/trunk (PKGBUILD)

2018-10-20 Thread Alexander Rødseth via arch-commits 
Date: Saturday, October 20, 2018 @ 17:39:12
  Author: arodseth
Revision: 398103

upgpkg: midori 0.5.11-9

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-20 16:58:29 UTC (rev 398102)
+++ PKGBUILD2018-10-20 17:39:12 UTC (rev 398103)
@@ -51,13 +51,12 @@
   # CMake + Vala are not swayed by VALAFLAGS to build with PIC. Need to find a 
different method.
   #-DVALAFLAGS="$(for f in $(echo $CFLAGS $CXXFLAGS $LDFLAGS | tr ' ' '\n'); 
do echo -X "\"$f\""; done | xargs echo)" \
   #-DVALAFLAGS="-X -fPIC" \
-
   cmake "../$pkgname-$pkgver" \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DHALF_BRO_INCOM_WEBKIT2=ON \
--DCMAKE_C_FLAGS="$CFLAGS -w" \
--DVALA_CFLAGS="$CFLAGS -w" \
+-DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
+-DVALA_CFLAGS="$CFLAGS -fPIC -w" \
 -G Ninja
   ninja
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2018-10-08 Thread Alexander Rødseth via arch-commits 
Date: Monday, October 8, 2018 @ 11:50:41
  Author: arodseth
Revision: 391090

upgpkg: midori 0.5.11-9

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   28 ++--
 1 file changed, 22 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-08 11:22:31 UTC (rev 391089)
+++ PKGBUILD2018-10-08 11:50:41 UTC (rev 391090)
@@ -6,10 +6,10 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=8
+pkgrel=9
 pkgdesc='Lightweight web browser'
 arch=('x86_64')
-url='http://midori-browser.org/'
+url='https://midori-browser.org/'
 license=('LGPL')
 provides=('midori')
 replaces=('midori-gtk3')
@@ -19,29 +19,45 @@
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
-source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
+source=("https://midori-browser.org/wp-content/uploads/2018/08/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
 
-# NOTE: Set GTK_CSD=1 for enabling client side decorations for Midori
+# NOTE: Set GTK_CSD=1 for enabling client side decorations when running Midori
 
 prepare() {
   cd "$pkgname-$pkgver"
 
+  msg2 'Fixing issues in the Vala sources...'
   sed 's/protected Tally/public Tally/g' -i midori/midori-notebook.vala
   sed 's/%d other files/%u other files/g' -i extensions/transfers.vala
   for f in transfers adblock/widgets apps history-list notes; do
-  sed 's,.remove (iter,.remove (ref iter,g' -i "extensions/$f.vala"
+sed 's,.remove (iter,.remove (ref iter,g' -i "extensions/$f.vala"
   done
+
+  msg2 'Fixing constants that were deprecated in Gtk 3.10...'
+  # https://lazka.github.io/pgi-docs/Gtk-3.0/constants.html
+  find . -type f -regex '.*\.\(c\|vala\)' -exec sed -i \
+
's/Gtk.STOCK_FILE/"text-x-generic"/g;s/Gtk.STOCK_CLOSE/"window-close"/g;s/Gtk.STOCK_ADD/"list-add"/g;s/Gtk.STOCK_HELP/"help-browser"/g;s/Gtk.STOCK_APPLY/""/g;s/Gtk.STOCK_CANCEL/""/g;s/Gtk.STOCK_COPY/"edit-copy"/g;s/Gtk.STOCK_DELETE/"edit-delete"/g;s/Gtk.STOCK_EDIT/""/g;s/Gtk.STOCK_OPEN/"document-open"/g;s/Gtk.STOCK_PREFERENCES/"preferences-system"/g;s/Gtk.STOCK_PROPERTIES/"document-properties"/g;s/Gtk.STOCK_SAVE/"document-save"/g;s/Gtk.STOCK_CLEAR/"edit-clear"/g;s/Gtk.STOCK_DIRECTORY/"folder"/g'
 \
+"{}" +;
+  # 
https://i-hate-farms.github.io/parrot/gio-2.0/GLib.g_dbus_generate_guid.html
+  find . -type f -regex '.*\.\(c\|vala\)' -exec sed -i \
+'s/g_dbus_generate_guid/GLib.DBus.generate_guid/g' "{}" +;
 }
 
 build() {
   mkdir -p build
   cd build
+
+  # CMake + Vala are not swayed by VALAFLAGS to build with PIC. Need to find a 
different method.
+  #-DVALAFLAGS="$(for f in $(echo $CFLAGS $CXXFLAGS $LDFLAGS | tr ' ' '\n'); 
do echo -X "\"$f\""; done | xargs echo)" \
+  #-DVALAFLAGS="-X -fPIC" \
+
   cmake "../$pkgname-$pkgver" \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DHALF_BRO_INCOM_WEBKIT2=ON \
 -DCMAKE_C_FLAGS="$CFLAGS -w" \
+-DVALA_CFLAGS="$CFLAGS -w" \
 -G Ninja
   ninja
 }
@@ -50,5 +66,5 @@
   DESTDIR="$pkgdir" ninja -C build install
 }
 
-# getver: -u 2 midori-browser.org/download/source
+# getver: launchpad.net/midori/+download
 # vim: ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD midori.install)

2018-06-25 Thread Alexander Rødseth via arch-commits 
Date: Monday, June 25, 2018 @ 10:04:28
  Author: arodseth
Revision: 345847

upgpkg: midori 0.5.11-8

Modified:
  midori/trunk/PKGBUILD
Deleted:
  midori/trunk/midori.install

+
 PKGBUILD   |   20 +---
 midori.install |5 -
 2 files changed, 9 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-25 09:53:39 UTC (rev 345846)
+++ PKGBUILD2018-06-25 10:04:28 UTC (rev 345847)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Alexander F Rødseth 
+# Maintainer: Alexander F. Rødseth 
 # Contributor: Andreas Radke 
 # Contributor: rabyte 
 # Contributor: Johannes Krampf 
@@ -7,19 +7,16 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=7
-pkgdesc='Lightweight web browser (GTK3)'
+pkgrel=8
+pkgdesc='Lightweight web browser'
 arch=('x86_64')
-url='http://www.midori-browser.org/'
+url='http://midori-browser.org/'
 license=('LGPL')
-install=midori.install
-conflicts=('midori-gtk2')
 provides=('midori')
 replaces=('midori-gtk3')
-depends=('gcr' 'libxss' 'webkit2gtk' 'zeitgeist')
+depends=('aria2' 'gcr' 'libxss' 'webkit2gtk' 'zeitgeist')
 makedepends=('bzr' 'cmake' 'intltool' 'ninja' 'vala')
-optdepends=('aria2: download utility'
-'gst-plugins-base: HTML5 OGG videos support'
+optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
@@ -26,14 +23,15 @@
 
source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
 
+# NOTE: Set GTK_CSD=1 for enabling client side decorations for Midori
+
 prepare() {
   cd "$pkgname-$pkgver"
 
-  # The latest release of vala is a bit stricter than the previous one
   sed 's/protected Tally/public Tally/g' -i midori/midori-notebook.vala
   sed 's/%d other files/%u other files/g' -i extensions/transfers.vala
   for f in transfers adblock/widgets apps history-list notes; do
-  sed 's/.remove (iter/.remove (ref iter/g' -i "extensions/$f.vala"
+  sed 's,.remove (iter,.remove (ref iter,g' -i "extensions/$f.vala"
   done
 }
 

Deleted: midori.install
===
--- midori.install  2018-06-25 09:53:39 UTC (rev 345846)
+++ midori.install  2018-06-25 10:04:28 UTC (rev 345847)
@@ -1,5 +0,0 @@
-post_install() {
-  echo 'Set GTK_CSD=1 for enabling client side decorations for Midori'
-}
-
-# vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2018-04-23 Thread Alexander Rødseth via arch-commits 
Date: Monday, April 23, 2018 @ 09:51:00
  Author: arodseth
Revision: 317359

upgpkg: midori 0.5.11-7

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   24 +++-
 1 file changed, 11 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 09:38:24 UTC (rev 317358)
+++ PKGBUILD2018-04-23 09:51:00 UTC (rev 317359)
@@ -7,21 +7,21 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=6
+pkgrel=7
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64')
 url='http://www.midori-browser.org/'
-license=('LGPL2.1')
-install='midori.install'
+license=('LGPL')
+install=midori.install
 conflicts=('midori-gtk2')
 provides=('midori')
 replaces=('midori-gtk3')
-depends=('webkit2gtk' 'libxss' 'gcr' 'zeitgeist')
-makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja')
-optdepends=('gst-plugins-base: HTML5 OGG videos support'
+depends=('gcr' 'libxss' 'webkit2gtk' 'zeitgeist')
+makedepends=('bzr' 'cmake' 'intltool' 'ninja' 'vala')
+optdepends=('aria2: download utility'
+'gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
-'gst-libav: HTML5 H264 videos support'
-'aria2: download utility')
+'gst-libav: HTML5 H264 videos support')
 options=('!emptydirs')
 
source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
@@ -38,11 +38,9 @@
 }
 
 build() {
-  cd "$pkgname-$pkgver"
-
   mkdir -p build
   cd build
-  cmake .. \
+  cmake "../$pkgname-$pkgver" \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DHALF_BRO_INCOM_WEBKIT2=ON \
@@ -52,8 +50,8 @@
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install
+  DESTDIR="$pkgdir" ninja -C build install
 }
 
 # getver: -u 2 midori-browser.org/download/source
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2017-05-07 Thread Alexander Rødseth 
Date: Sunday, May 7, 2017 @ 15:12:51
  Author: arodseth
Revision: 227257

upgpkg: midori 0.5.11-6

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 13:45:43 UTC (rev 227256)
+++ PKGBUILD2017-05-07 15:12:51 UTC (rev 227257)
@@ -1,6 +1,5 @@
 # $Id$
 # Maintainer: Alexander F Rødseth 
-# Contributor: Bartłomiej Piotrowski 
 # Contributor: Andreas Radke 
 # Contributor: rabyte 
 # Contributor: Johannes Krampf 
@@ -8,7 +7,7 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=5
+pkgrel=6
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -27,15 +26,27 @@
 
source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # The latest release of vala is a bit stricter than the previous one
+  sed 's/protected Tally/public Tally/g' -i midori/midori-notebook.vala
+  sed 's/%d other files/%u other files/g' -i extensions/transfers.vala
+  for f in transfers adblock/widgets apps history-list notes; do
+  sed 's/.remove (iter/.remove (ref iter/g' -i "extensions/$f.vala"
+  done
+}
+
 build() {
   cd "$pkgname-$pkgver"
+
   mkdir -p build
   cd build
-  # HALF_BRO_INCOM_WEBKIT2=ON sets USE_GTK3=ON
   cmake .. \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DHALF_BRO_INCOM_WEBKIT2=ON \
+-DCMAKE_C_FLAGS="$CFLAGS -w" \
 -G Ninja
   ninja
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2017-01-25 Thread Alexander Rødseth 
Date: Wednesday, January 25, 2017 @ 14:27:54
  Author: arodseth
Revision: 209048

upgpkg: midori 0.5.11-5

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-25 14:01:42 UTC (rev 209047)
+++ PKGBUILD2017-01-25 14:27:54 UTC (rev 209048)
@@ -8,7 +8,7 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -17,7 +17,7 @@
 conflicts=('midori-gtk2')
 provides=('midori')
 replaces=('midori-gtk3')
-depends=('webkitgtk' 'libxss' 'gcr' 'zeitgeist') # webkit2gtk
+depends=('webkit2gtk' 'libxss' 'gcr' 'zeitgeist')
 makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
@@ -31,10 +31,11 @@
   cd "$pkgname-$pkgver"
   mkdir -p build
   cd build
+  # HALF_BRO_INCOM_WEBKIT2=ON sets USE_GTK3=ON
   cmake .. \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
--DUSE_GTK3=1 \
+-DHALF_BRO_INCOM_WEBKIT2=ON \
 -G Ninja
   ninja
 }

[arch-commits] Commit in midori/trunk (PKGBUILD midori.install)

2016-05-19 Thread Alexander Rødseth 
Date: Friday, May 20, 2016 @ 00:26:10
  Author: arodseth
Revision: 175739

upgpkg: midori 0.5.11-4

Modified:
  midori/trunk/PKGBUILD
  midori/trunk/midori.install

+
 PKGBUILD   |6 +++---
 midori.install |   12 +---
 2 files changed, 4 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-19 22:25:53 UTC (rev 175738)
+++ PKGBUILD2016-05-19 22:26:10 UTC (rev 175739)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer: Alexander Rødseth 
+# Maintainer: Alexander F Rødseth 
 # Contributor: Bartłomiej Piotrowski 
 # Contributor: Andreas Radke 
 # Contributor: rabyte 
@@ -8,7 +8,7 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -17,7 +17,7 @@
 conflicts=('midori-gtk2')
 provides=('midori')
 replaces=('midori-gtk3')
-depends=('webkitgtk' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'gcr' 
'zeitgeist') # webkit2gtk
+depends=('webkitgtk' 'libxss' 'gcr' 'zeitgeist') # webkit2gtk
 makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'

Modified: midori.install
===
--- midori.install  2016-05-19 22:25:53 UTC (rev 175738)
+++ midori.install  2016-05-19 22:26:10 UTC (rev 175739)
@@ -1,15 +1,5 @@
 post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
+  echo 'Set GTK_CSD=1 for enabling client side decorations for Midori'
 }
 
-post_upgrade() {
-  post_install $1
-  echo 'Set GTK_CSD=1 to enable client side decorations for Midori'
-}
-
-post_remove() {
-  post_install $1
-}
-
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2016-02-26 Thread Balló György 
Date: Saturday, February 27, 2016 @ 02:04:49
  Author: bgyorgy
Revision: 163529

upgpkg: midori 0.5.11-3

Remove unused dependencies

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-26 20:41:57 UTC (rev 163528)
+++ PKGBUILD2016-02-27 01:04:49 UTC (rev 163529)
@@ -8,7 +8,7 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -17,8 +17,8 @@
 conflicts=('midori-gtk2')
 provides=('midori')
 replaces=('midori-gtk3')
-depends=('webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr' 'libzeitgeist' 'zeitgeist') # webkit2gtk
-makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 
'libzeitgeist' 'zeitgeist')
+depends=('webkitgtk' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'gcr' 
'zeitgeist') # webkit2gtk
+makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'
 'gst-libav: HTML5 H264 videos support'

[arch-commits] Commit in midori/trunk (PKGBUILD midori.install)

2015-11-01 Thread Alexander Rødseth 
Date: Sunday, November 1, 2015 @ 19:45:57
  Author: arodseth
Revision: 145474

dep update

Modified:
  midori/trunk/PKGBUILD
  midori/trunk/midori.install

+
 PKGBUILD   |4 ++--
 midori.install |1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-01 18:29:58 UTC (rev 145473)
+++ PKGBUILD2015-11-01 18:45:57 UTC (rev 145474)
@@ -8,7 +8,7 @@
 
 pkgname=midori
 pkgver=0.5.11
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -17,7 +17,7 @@
 conflicts=('midori-gtk2')
 provides=('midori')
 replaces=('midori-gtk3')
-depends=('webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr' 'libzeitgeist' 'zeitgeist')
+depends=('webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr' 'libzeitgeist' 'zeitgeist') # webkit2gtk
 makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 
'libzeitgeist' 'zeitgeist')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'
 'gst-plugins-good: HTML5 H264 and WebM videos support'

Modified: midori.install
===
--- midori.install  2015-11-01 18:29:58 UTC (rev 145473)
+++ midori.install  2015-11-01 18:45:57 UTC (rev 145474)
@@ -5,6 +5,7 @@
 
 post_upgrade() {
   post_install $1
+  echo 'Set GTK_CSD=1 to enable client side decorations for Midori'
 }
 
 post_remove() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2015-09-06 Thread Alexander Rødseth 
Date: Sunday, September 6, 2015 @ 23:53:52
  Author: arodseth
Revision: 139387

upgpkg: midori 0.5.11-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-06 21:45:44 UTC (rev 139386)
+++ PKGBUILD2015-09-06 21:53:52 UTC (rev 139387)
@@ -1,22 +1,27 @@
 # $Id$
 # Maintainer: Alexander Rødseth 
+# Contributor: Bartłomiej Piotrowski 
 # Contributor: Andreas Radke 
 # Contributor: rabyte 
 # Contributor: Johannes Krampf 
-# Contributor: Bartłomiej Piotrowski 
-# Contributor: Andrew Gregory 
+# Contributor: Bartłomiej Piotrowski 
 
 pkgname=midori
 pkgver=0.5.11
 pkgrel=1
-pkgdesc='Lightweight web browser (GTK2)'
+pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique' 'gcr' 'libzeitgeist' 'zeitgeist')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 
'libzeitgeist' 'zeitgeist')
-optdepends=('aria2: download utility')
+conflicts=('midori-gtk2')
+provides=('midori-gtk2')
+depends=('webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr' 'libzeitgeist' 'zeitgeist')
+makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 
'libzeitgeist' 'zeitgeist')
+optdepends=('gst-plugins-base: HTML5 OGG videos support'
+'gst-plugins-good: HTML5 H264 and WebM videos support'
+'gst-libav: HTML5 H264 videos support'
+'aria2: download utility')
 options=('!emptydirs')
 
source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
@@ -23,10 +28,13 @@
 
 build() {
   cd "$pkgname-$pkgver"
-
   mkdir -p build
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja
+  cmake .. \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=lib \
+-DUSE_GTK3=1 \
+-G Ninja
   ninja
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2015-09-06 Thread Alexander Rødseth 
Date: Monday, September 7, 2015 @ 00:19:51
  Author: arodseth
Revision: 139406

upgpkg: midori 0.5.11-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-06 22:17:34 UTC (rev 139405)
+++ PKGBUILD2015-09-06 22:19:51 UTC (rev 139406)
@@ -15,7 +15,8 @@
 license=('LGPL2.1')
 install='midori.install'
 conflicts=('midori-gtk2')
-provides=('midori-gtk2')
+provides=('midori')
+replaces=('midori-gtk3')
 depends=('webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr' 'libzeitgeist' 'zeitgeist')
 makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 
'libzeitgeist' 'zeitgeist')
 optdepends=('gst-plugins-base: HTML5 OGG videos support'

[arch-commits] Commit in midori/trunk (PKGBUILD)

2015-09-06 Thread Alexander Rødseth 
Date: Sunday, September 6, 2015 @ 23:13:29
  Author: arodseth
Revision: 139371

upgpkg: midori 0.5.11-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-06 20:56:16 UTC (rev 139370)
+++ PKGBUILD2015-09-06 21:13:29 UTC (rev 139371)
@@ -7,7 +7,7 @@
 # Contributor: Andrew Gregory 
 
 pkgname=midori
-pkgver=0.5.10
+pkgver=0.5.11
 pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
@@ -14,15 +14,16 @@
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique' 'gcr')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr')
+depends=('webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique' 'gcr' 'libzeitgeist' 'zeitgeist')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 
'libzeitgeist' 'zeitgeist')
 optdepends=('aria2: download utility')
 options=('!emptydirs')
 
source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f')
+sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d')
 
 build() {
-  #cd "$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
+
   mkdir -p build
   cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja
@@ -30,8 +31,8 @@
 }
 
 package() {
-  #DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install
-  DESTDIR="$pkgdir" ninja -C build install
+  DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install
 }
 
+# getver: -u 2 midori-browser.org/download/source
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2015-04-22 Thread Alexander Rødseth 
Date: Wednesday, April 22, 2015 @ 11:36:13
  Author: arodseth
Revision: 131924

upgpkg: midori 0.5.10-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-22 09:36:07 UTC (rev 131923)
+++ PKGBUILD2015-04-22 09:36:13 UTC (rev 131924)
@@ -7,7 +7,7 @@
 # Contributor: Andrew Gregory andrew.gregor...@gmail.com
 
 pkgname=midori
-pkgver=0.5.9
+pkgver=0.5.10
 pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
@@ -14,15 +14,15 @@
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja')
+depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique' 'gcr')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr')
 optdepends=('aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('b1a5309d926ea4e394f4a39552023b0427cf23053793d325e3daefceed282ec0')
+sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f')
 
 build() {
-  cd $pkgname-$pkgver
+  #cd $pkgname-$pkgver
   mkdir -p build
   cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja
@@ -30,7 +30,8 @@
 }
 
 package() {
-  DESTDIR=$pkgdir ninja -C $pkgname-$pkgver/build install
+  #DESTDIR=$pkgdir ninja -C $pkgname-$pkgver/build install
+  DESTDIR=$pkgdir ninja -C build install
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2014-11-13 Thread Alexander Rødseth 
Date: Thursday, November 13, 2014 @ 10:57:02
  Author: arodseth
Revision: 122502

upgpkg: midori 0.5.9-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-13 09:03:53 UTC (rev 122501)
+++ PKGBUILD2014-11-13 09:57:02 UTC (rev 122502)
@@ -7,7 +7,7 @@
 # Contributor: Andrew Gregory andrew.gregor...@gmail.com
 
 pkgname=midori
-pkgver=0.5.8
+pkgver=0.5.9
 pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
@@ -15,21 +15,22 @@
 license=('LGPL2.1')
 install='midori.install'
 depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja')
 optdepends=('aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381')
+sha256sums=('b1a5309d926ea4e394f4a39552023b0427cf23053793d325e3daefceed282ec0')
 
 build() {
+  cd $pkgname-$pkgver
   mkdir -p build
   cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
-  make
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja
+  ninja
 }
 
 package() {
-  make -C build DESTDIR=$pkgdir install
+  DESTDIR=$pkgdir ninja -C $pkgname-$pkgver/build install
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2014-04-07 Thread Alexander Rødseth 
Date: Monday, April 7, 2014 @ 23:17:17
  Author: arodseth
Revision: 108939

upgpkg: midori 0.5.8-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-07 20:58:14 UTC (rev 108938)
+++ PKGBUILD2014-04-07 21:17:17 UTC (rev 108939)
@@ -7,8 +7,8 @@
 # Contributor: Andrew Gregory andrew.gregor...@gmail.com
 
 pkgname=midori
-pkgver=0.5.7
-pkgrel=2
+pkgver=0.5.8
+pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -19,11 +19,9 @@
 optdepends=('aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d')
+sha256sums=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381')
 
 build() {
-  cd $pkgname-$pkgver
-
   mkdir -p build
   cd build
   cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
@@ -31,7 +29,7 @@
 }
 
 package() {
-  make -C $pkgname-$pkgver/build DESTDIR=$pkgdir install
+  make -C build DESTDIR=$pkgdir install
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2014-03-15 Thread Alexander Rødseth 
Date: Saturday, March 15, 2014 @ 12:17:44
  Author: arodseth
Revision: 107240

upgpkg: midori 0.5.7-2

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-15 10:55:30 UTC (rev 107239)
+++ PKGBUILD2014-03-15 11:17:44 UTC (rev 107240)
@@ -8,7 +8,7 @@
 
 pkgname=midori
 pkgver=0.5.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -16,10 +16,7 @@
 install='midori.install'
 depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique')
 makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake')
-optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
-'gstreamer0.10-bad-plugins: HTML5 WebM videos support'
-'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
-'aria2: download utility')
+optdepends=('aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d')

[arch-commits] Commit in midori/trunk (PKGBUILD)

2014-01-16 Thread Alexander Rødseth 
Date: Thursday, January 16, 2014 @ 13:49:27
  Author: arodseth
Revision: 104157

upgpkg: midori 0.5.7-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-16 11:57:20 UTC (rev 104156)
+++ PKGBUILD2014-01-16 12:49:27 UTC (rev 104157)
@@ -1,6 +1,6 @@
 # $Id$
-# Maintainer:  Alexander Rødseth rods...@gmail.com
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Maintainer: Alexander Rødseth rods...@gmail.com
+# Maintainer: Bartłomiej Piotrowski nos...@bpiotrowski.pl
 # Contributor: Andreas Radke andy...@archlinux.org
 # Contributor: rabyte rabyte.at.gmail.dot.com
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
@@ -8,8 +8,8 @@
 # Contributor: Andrew Gregory andrew.gregor...@gmail.com
 
 pkgname=midori
-pkgver=0.5.6
-pkgrel=2
+pkgver=0.5.7
+pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -23,7 +23,7 @@
 'aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d6e51fda9ff55fd063843f24a')
+sha256sums=('2875bb2aa8a8a0cce342178f04700d4ebccd13bf1b2ad4cb3ba9fec7e2bd0b4d')
 
 build() {
   cd $pkgname-$pkgver

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-11-28 Thread Alexander Rødseth 
Date: Thursday, November 28, 2013 @ 21:22:17
  Author: arodseth
Revision: 101595

Fix for FS#37892, different libdir

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-28 16:02:19 UTC (rev 101594)
+++ PKGBUILD2013-11-28 20:22:17 UTC (rev 101595)
@@ -5,10 +5,11 @@
 # Contributor: rabyte rabyte.at.gmail.dot.com
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
+# Contributor: Andrew Gregory andrew.gregor...@gmail.com
 
 pkgname=midori
 pkgver=0.5.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -27,8 +28,10 @@
 build() {
   cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr
-  cmake .  make
+  mkdir -p build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
+  make
 }
 
 package() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-11-28 Thread Alexander Rødseth 
Date: Thursday, November 28, 2013 @ 21:54:40
  Author: arodseth
Revision: 101597

upgpkg: midori 0.5.6-2

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-28 20:22:55 UTC (rev 101596)
+++ PKGBUILD2013-11-28 20:54:40 UTC (rev 101597)
@@ -35,7 +35,7 @@
 }
 
 package() {
-  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
+  make -C $pkgname-$pkgver/build DESTDIR=$pkgdir install
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-11-20 Thread Alexander Rødseth 
Date: Wednesday, November 20, 2013 @ 14:23:16
  Author: arodseth
Revision: 101244

upgpkg: midori 0.5.6-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-20 11:52:08 UTC (rev 101243)
+++ PKGBUILD2013-11-20 13:23:16 UTC (rev 101244)
@@ -7,7 +7,7 @@
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
 pkgname=midori
-pkgver=0.5.5
+pkgver=0.5.6
 pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
@@ -15,7 +15,7 @@
 license=('LGPL2.1')
 install='midori.install'
 depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake')
 optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
 'gstreamer0.10-bad-plugins: HTML5 WebM videos support'
 'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
@@ -22,19 +22,17 @@
 'aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62')
+sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d6e51fda9ff55fd063843f24a')
 
 build() {
-  cd $srcdir/$pkgname-${pkgver}
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr
-  make
+  cmake .  make
 }
 
 package() {
-  cd $srcdir/$pkgname-${pkgver}
-
-  make DESTDIR=$pkgdir install
+  make -C $pkgname-$pkgver DESTDIR=$pkgdir install
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-08-15 Thread Alexander Rødseth 
Date: Thursday, August 15, 2013 @ 13:42:31
  Author: arodseth
Revision: 95661

upgpkg: midori 0.5.5-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-15 10:17:30 UTC (rev 95660)
+++ PKGBUILD2013-08-15 11:42:31 UTC (rev 95661)
@@ -7,8 +7,8 @@
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
 pkgname=midori
-pkgver=0.5.4
-pkgrel=4
+pkgver=0.5.5
+pkgrel=1
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
@@ -22,19 +22,19 @@
 'aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
-sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022')
+sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62')
 
 build() {
-  cd $srcdir/${pkgname}_${pkgver}_all_
+  cd $srcdir/$pkgname-${pkgver}
 
-  python2 ./waf configure --prefix=/usr
-  python2 ./waf build 
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
-  cd $srcdir/${pkgname}_${pkgver}_all_
+  cd $srcdir/$pkgname-${pkgver}
 
-  DESTDIR=$pkgdir python2 ./waf install
+  make DESTDIR=$pkgdir install
 }
 
 # vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-08-14 Thread Balló György 
Date: Thursday, August 15, 2013 @ 03:49:34
  Author: bgyorgy
Revision: 95608

Fix dependencies

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-15 00:08:07 UTC (rev 95607)
+++ PKGBUILD2013-08-15 01:49:34 UTC (rev 95608)
@@ -14,9 +14,11 @@
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique' 'gcr')
-makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg')
-optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
+depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg')
+optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
+'gstreamer0.10-bad-plugins: HTML5 WebM videos support'
+'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
 'aria2: download utility')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-08-02 Thread Alexander Rødseth 
Date: Friday, August 2, 2013 @ 12:17:35
  Author: arodseth
Revision: 94980

upgpkg: midori 0.5.4-4

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-02 07:55:30 UTC (rev 94979)
+++ PKGBUILD2013-08-02 10:17:35 UTC (rev 94980)
@@ -6,23 +6,15 @@
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
-#
-# Note:
-#
-# * Depending on and compiling with 'granite' didn't work last time I tried.
-# * To compile with gtk3 instead of gtk2, depend on 'webkitgtk' and 'gtk3' 
then --enable-gtk3.
-# * If steadyflow is moved to [community] or [extra], it can be added as an 
optdepends.
-#
-
 pkgname=midori
 pkgver=0.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr')
+depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique' 'gcr')
 makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
 'aria2: download utility')

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-08-01 Thread Alexander Rødseth 
Date: Thursday, August 1, 2013 @ 11:32:17
  Author: arodseth
Revision: 94934

Build with webkit1 (gtk2) instead of webkit2 (gtk3), ref FS#36342

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-01 07:01:30 UTC (rev 94933)
+++ PKGBUILD2013-08-01 09:32:17 UTC (rev 94934)
@@ -8,10 +8,10 @@
 
 pkgname=midori
 pkgver=0.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686')
-url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
+url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
 depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr') # 'granite'
@@ -29,8 +29,8 @@
   python2 ./waf configure \
 --prefix=/usr \
 --enable-gtk3 \
---disable-granite \
---enable-webkit2
+--disable-granite
+#--enable-webkit2
   python2 ./waf build 
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-08-01 Thread Alexander Rødseth 
Date: Thursday, August 1, 2013 @ 21:50:20
  Author: arodseth
Revision: 94962

upgpkg: midori 0.5.4-3

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-01 16:16:02 UTC (rev 94961)
+++ PKGBUILD2013-08-01 19:50:20 UTC (rev 94962)
@@ -6,19 +6,26 @@
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
+#
+# Note:
+#
+# * Depending on and compiling with 'granite' didn't work last time I tried.
+# * To compile with gtk3 instead of gtk2, depend on 'webkitgtk' and 'gtk3' 
then --enable-gtk3.
+# * If steadyflow is moved to [community] or [extra], it can be added as an 
optdepends.
+#
+
 pkgname=midori
 pkgver=0.5.4
-pkgrel=2
-pkgdesc='Lightweight web browser based on Gtk WebKit'
+pkgrel=3
+pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr') # 'granite'
-makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg')
+depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr')
+makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
 'aria2: download utility')
-#'steadyflow: download manager')
 options=('!emptydirs')
 
source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
 sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022')
@@ -26,11 +33,7 @@
 build() {
   cd $srcdir/${pkgname}_${pkgver}_all_
 
-  python2 ./waf configure \
---prefix=/usr \
---enable-gtk3 \
---disable-granite
-#--enable-webkit2
+  python2 ./waf configure --prefix=/usr
   python2 ./waf build 
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-07-16 Thread Alexander Rødseth 
Date: Tuesday, July 16, 2013 @ 19:57:27
  Author: arodseth
Revision: 94207

upgpkg: midori 0.5.4-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-16 17:32:49 UTC (rev 94206)
+++ PKGBUILD2013-07-16 17:57:27 UTC (rev 94207)
@@ -7,7 +7,7 @@
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
 pkgname=midori
-pkgver=0.5.2
+pkgver=0.5.4
 pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686')

[arch-commits] Commit in midori/trunk (PKGBUILD midori.install)

2013-07-16 Thread Alexander Rødseth 
Date: Tuesday, July 16, 2013 @ 22:10:26
  Author: arodseth
Revision: 94214

upgpkg: midori 0.5.4-1

Modified:
  midori/trunk/PKGBUILD
  midori/trunk/midori.install

+
 PKGBUILD   |   31 +++
 midori.install |2 ++
 2 files changed, 17 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-16 19:33:01 UTC (rev 94213)
+++ PKGBUILD2013-07-16 20:10:26 UTC (rev 94214)
@@ -13,32 +13,31 @@
 arch=('x86_64' 'i686')
 url='http://www.twotoasts.de/index.php?/pages/midori_summary.html'
 license=('LGPL2.1')
-install=$pkgname.install
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'libunique' 
'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr')
+install='midori.install'
+depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 
'desktop-file-utils' 'libunique3' 'gcr') # 'granite'
+makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 
'python2-docutils' 'libsoup' 'vala' 'librsvg')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
 'aria2: download utility')
+#'steadyflow: download manager')
 options=('!emptydirs')
-source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2;)
-sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c')
+source=(http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2;)
+sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/${pkgname}_${pkgver}_all_
 
-  ./configure --prefix=/usr \
-  --jobs=${MAKEFLAGS/-j/} \
-  --enable-addons \
-  --enable-unique \
-  --enable-nls \
-  --enable-docs \
-  --enable-apidocs
-  make
+  python2 ./waf configure \
+--prefix=/usr \
+--enable-gtk3 \
+--disable-granite \
+--enable-webkit2
+  python2 ./waf build 
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/${pkgname}_${pkgver}_all_
 
-  make DESTDIR=$pkgdir install
+  DESTDIR=$pkgdir python2 ./waf install
 }
 
 # vim:set ts=2 sw=2 et:

Modified: midori.install
===
--- midori.install  2013-07-16 19:33:01 UTC (rev 94213)
+++ midori.install  2013-07-16 20:10:26 UTC (rev 94214)
@@ -10,3 +10,5 @@
 post_remove() {
   post_install $1
 }
+
+# vim:set ts=2 sw=2 et:

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-05-19 Thread Alexander Rødseth 
Date: Sunday, May 19, 2013 @ 12:48:38
  Author: arodseth
Revision: 91091

upgpkg: midori 0.5.2-1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-19 08:25:17 UTC (rev 91090)
+++ PKGBUILD2013-05-19 10:48:38 UTC (rev 91091)
@@ -7,8 +7,8 @@
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
 pkgname=midori
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.2
+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'
@@ -20,7 +20,7 @@
 'aria2: download utility')
 options=('!emptydirs')
 
source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2;)
-sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
+sha256sums=('a9c5cb4606e8e4967a2b980caa9ada25623c50d927a302b6bf73eeac5815c97c')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-05-09 Thread Alexander Rødseth 
Date: Friday, May 10, 2013 @ 01:39:59
  Author: arodseth
Revision: 90242

upgpkg: midori 0.5.0-2, fixed gsettings

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-09 23:30:17 UTC (rev 90241)
+++ PKGBUILD2013-05-09 23:39:59 UTC (rev 90242)
@@ -8,13 +8,13 @@
 
 pkgname=midori
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 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=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 
'hicolor-icon-theme' 'desktop-file-utils')
+install=$pkgname.install
+depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'libunique' 
'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
 'aria2: download utility')

[arch-commits] Commit in midori/trunk (PKGBUILD fix-copying.patch)

2013-04-07 Thread Alexander Rødseth 
Date: Sunday, April 7, 2013 @ 15:05:01
  Author: arodseth
Revision: 87824

pkgupgrade

Modified:
  midori/trunk/PKGBUILD
Deleted:
  midori/trunk/fix-copying.patch

---+
 PKGBUILD  |   15 ++--
 fix-copying.patch |   63 
 2 files changed, 3 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-07 09:29:35 UTC (rev 87823)
+++ PKGBUILD2013-04-07 13:05:01 UTC (rev 87824)
@@ -7,7 +7,7 @@
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
 pkgname=midori
-pkgver=0.4.9
+pkgver=0.5.0
 pkgrel=1
 pkgdesc='Lightweight web browser based on Gtk WebKit'
 arch=('x86_64' 'i686')
@@ -19,21 +19,12 @@
 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;
-'fix-copying.patch')
-sha256sums=('f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11'
-'d4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2;)
+sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  # FS#32229
-  patch -s -Np1 -i ../fix-copying.patch  /dev/null || true
-
-  # 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 \

Deleted: fix-copying.patch
===
--- fix-copying.patch   2013-04-07 09:29:35 UTC (rev 87823)
+++ fix-copying.patch   2013-04-07 13:05:01 UTC (rev 87824)
@@ -1,63 +0,0 @@
-diff --git a/midori/midori-browser.c b/midori/midori-browser.c
-index 28aca95..b33e2e4 100644
 a/midori/midori-browser.c
-+++ b/midori/midori-browser.c
-@@ -1041,7 +1041,7 @@ midori_browser_save_uri (MidoriBrowser* browser,
- GtkWidget* dialog;
- const gchar* title = midori_view_get_display_title (view);
- gchar* filename;
--GList* resources = midori_view_get_subresources (view);
-+GList* resources = midori_view_get_resources (view);
- gboolean file_only = TRUE;
- GtkWidget* checkbox = NULL;
- 
-diff --git a/midori/midori-view.c b/midori/midori-view.c
-index 37cc78f..2c71f55 100644
 a/midori/midori-view.c
-+++ b/midori/midori-view.c
-@@ -1993,21 +1993,22 @@ midori_web_view_menu_image_new_tab_activate_cb 
(GtkWidget*  widget,
- }
- 
- GList*
--midori_view_get_subresources (MidoriView* view)
-+midori_view_get_resources (MidoriView* view)
- {
- WebKitWebView* web_view = WEBKIT_WEB_VIEW (view-web_view);
- WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
- WebKitWebDataSource* data_source = webkit_web_frame_get_data_source 
(frame);
--return webkit_web_data_source_get_subresources (data_source);
-+GList* resources = webkit_web_data_source_get_subresources (data_source);
-+return g_list_prepend (resources, 
webkit_web_data_source_get_main_resource (data_source));
- }
- 
- static GString*
- midori_view_get_data_for_uri (MidoriView*  view,
-   const gchar* uri)
- {
--GList* resources = midori_view_get_subresources (view);
-+GList* resources = midori_view_get_resources (view);
- GList* list;
--GString* result;
-+GString* result = NULL;
- 
- for (list = resources; list; list = g_list_next (list))
- {
-@@ -2032,7 +2033,8 @@ midori_view_clipboard_get_image_cb (GtkClipboard* 
clipboard,
- MidoriView* view = MIDORI_VIEW (g_object_get_data (user_data, view));
- WebKitHitTestResult* hit_test = user_data;
- gchar* uri = katze_object_get_string (hit_test, image-uri);
--/* if (gtk_selection_data_targets_include_image (selection_data, TRUE)) */
-+
-+if (gtk_targets_include_image(selection_data-target, 1, TRUE))
- {
- GString* data = midori_view_get_data_for_uri (view, uri);
- if (data != NULL)
-@@ -2052,7 +2054,7 @@ midori_view_clipboard_get_image_cb (GtkClipboard* 
clipboard,
- else
- g_warn_if_reached ();
- }
--/* if (gtk_selection_data_targets_include_text (selection_data)) */
-+if (gtk_targets_include_text(selection_data-target, 1))
- gtk_selection_data_set_text (selection_data, uri, -1);
- g_free (uri);
- }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2013-03-07 Thread Bartłomiej Piotrowski 
Date: Thursday, March 7, 2013 @ 20:54:55
  Author: bpiotrowski
Revision: 85854

upgpkg: midori 0.4.9-1

upstream release

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-07 19:25:26 UTC (rev 85853)
+++ PKGBUILD2013-03-07 19:54:55 UTC (rev 85854)
@@ -7,21 +7,21 @@
 # Contributor: Bartłomiej Piotrowski barthal...@gmail.com
 
 pkgname=midori
-pkgver=0.4.8
+pkgver=0.4.9
 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=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 
'hicolor-icon-theme' 'desktop-file-utils' 'gcr')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala')
+depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 
'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr')
 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;
 'fix-copying.patch')
-sha256sums=('40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f'
+sha256sums=('f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11'
 'd4395ac994d8d614f93ae4863bbf6289b1980e0ed84aef52ca95a678b464b959')
 
 build() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-12-18 Thread Eric Bélanger 
Date: Sunday, December 18, 2011 @ 19:21:40
  Author: eric
Revision: 145172

upgpkg: midori 0.4.3-1

Upstream update

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-18 23:33:59 UTC (rev 145171)
+++ PKGBUILD2011-12-19 00:21:40 UTC (rev 145172)
@@ -4,7 +4,7 @@
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 
 pkgname=midori
-pkgver=0.4.2
+pkgver=0.4.3
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2=2.7.1' 'vala') 
# 'git'
 optdepends=('vala: for use in extensions')
 
source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('4ec9c3daa332ebe865cba6aa8256ef63')
+md5sums=('900037557b82818d79d2dd1c5a7d7fd2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}

[arch-commits] Commit in midori/trunk (PKGBUILD midori.install)

2011-11-15 Thread Eric Bélanger 
Date: Tuesday, November 15, 2011 @ 19:01:49
  Author: eric
Revision: 142824

upgpkg: midori 0.4.2-1

Upstream update, Clean up depends and .install file

Modified:
  midori/trunk/PKGBUILD
  midori/trunk/midori.install

+
 PKGBUILD   |   14 +++---
 midori.install |8 +++-
 2 files changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-15 21:19:44 UTC (rev 142823)
+++ PKGBUILD2011-11-16 00:01:49 UTC (rev 142824)
@@ -4,21 +4,21 @@
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 
 pkgname=midori
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 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' 'sqlite3' 'glib2')
+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') 
# 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('33dde203cd71ae2b1d2adcc7f5739f65')
+source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+md5sums=('4ec9c3daa332ebe865cba6aa8256ef63')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
   
   # python2 
   export PYTHON=/usr/bin/python2
@@ -35,6 +35,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
 }

Modified: midori.install
===
--- midori.install  2011-11-15 21:19:44 UTC (rev 142823)
+++ midori.install  2011-11-16 00:01:49 UTC (rev 142824)
@@ -1,7 +1,6 @@
 post_install() {
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
 }
 
 post_upgrade() {
@@ -9,6 +8,5 @@
 }
 
 post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+  post_install $1
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-10-15 Thread andyrtr 
Date: Saturday, October 15, 2011 @ 06:32:03
  Author: andyrtr
Revision: 140479

upgpkg: midori 0.4.1-1

upstream update 0.4.1

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 4 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-15 10:11:04 UTC (rev 140478)
+++ PKGBUILD2011-10-15 10:32:03 UTC (rev 140479)
@@ -4,8 +4,8 @@
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 
 pkgname=midori
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.1
+pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
@@ -14,19 +14,12 @@
 depends=('libwebkit=1.3.13' 'libunique' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify=0.7.1' 'libxss' 'sqlite3' 'glib2')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2=2.7.1' 'vala') 
# 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
-   webkit_search.diff)
-md5sums=('14aa14ccabf3d003903f1584dab15d7a'
- '293c026e1875145e0df9584e1ff2a70e')
-sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585'
-  '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
+md5sums=('33dde203cd71ae2b1d2adcc7f5739f65')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
-  # FS#26207
-  patch -Np1 -i ${srcdir}/webkit_search.diff
-  
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| wscript waf

[arch-commits] Commit in midori/trunk (PKGBUILD webkit_search.diff)

2011-10-03 Thread andyrtr 
Date: Monday, October 3, 2011 @ 10:21:45
  Author: andyrtr
Revision: 139575

upgpkg: midori 0.4.0-2

fix text search, FS26207

Added:
  midori/trunk/webkit_search.diff
Modified:
  midori/trunk/PKGBUILD

+
 PKGBUILD   |   14 +---
 webkit_search.diff |   59 +++
 2 files changed, 70 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-03 14:01:31 UTC (rev 139574)
+++ PKGBUILD2011-10-03 14:21:45 UTC (rev 139575)
@@ -5,7 +5,7 @@
 
 pkgname=midori
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
@@ -14,11 +14,19 @@
 depends=('libwebkit=1.3.13' 'libunique' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify=0.7.1' 'libxss' 'sqlite3' 'glib2')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2=2.7.1' 'vala') 
# 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
-md5sums=('14aa14ccabf3d003903f1584dab15d7a')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
+   webkit_search.diff)
+md5sums=('14aa14ccabf3d003903f1584dab15d7a'
+ '293c026e1875145e0df9584e1ff2a70e')
+sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585'
+  '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # FS#26207
+  patch -Np1 -i ${srcdir}/webkit_search.diff
+  
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| wscript waf

Added: webkit_search.diff
===
--- webkit_search.diff  (rev 0)
+++ webkit_search.diff  2011-10-03 14:21:45 UTC (rev 139575)
@@ -0,0 +1,59 @@
+From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
+From: Christian Dywan christ...@twotoasts.de
+Date: Wed, 21 Sep 2011 21:50:51 +
+Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
+
+Fixes: https://bugs.launchpad.net/midori/+bug/799603
+---
+diff --git a/midori/midori-view.c b/midori/midori-view.c
+index 0d7a96e..e426e7f 100644
+--- a/midori/midori-view.c
 b/midori/midori-view.c
+@@ -39,9 +39,11 @@
+ #include sys/utsname.h
+ #endif
+ 
++#if !WEBKIT_CHECK_VERSION (1, 5, 1)
+ /* This is unstable API, so we need to declare it */
+ gchar*
+ webkit_web_view_get_selected_text (WebKitWebView* web_view);
++#endif
+ 
+ static void
+ midori_view_construct_web_view (MidoriView* view);
+@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
+ gboolean
+ midori_view_has_selection (MidoriView* view)
+ {
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++WebKitDOMDocument* doc;
++WebKitDOMDOMWindow* window;
++WebKitDOMDOMSelection* selection;
++WebKitDOMRange* range;
++#endif
++
+ g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
+ 
++
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view-web_view));
++window = webkit_dom_document_get_default_view (doc);
++selection = webkit_dom_dom_window_get_selection (window);
++if (selection == NULL)
++return FALSE;
++
++range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
++if (range == NULL)
++return FALSE;
++
++katze_assign (view-selected_text, webkit_dom_range_get_text (range));
++#else
+ katze_assign (view-selected_text, webkit_web_view_get_selected_text (
+ WEBKIT_WEB_VIEW (view-web_view)));
++#endif
++
+ if (view-selected_text  *view-selected_text)
+ return TRUE;
+ else
+--
+cgit

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-08-07 Thread andyrtr 
Date: Sunday, August 7, 2011 @ 07:28:53
  Author: andyrtr
Revision: 134671

upgpkg: midori 0.4.0-1
upstream update 0.4.0

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-07 10:58:50 UTC (rev 134670)
+++ PKGBUILD2011-08-07 11:28:53 UTC (rev 134671)
@@ -4,8 +4,7 @@
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
 
 pkgname=midori
-#_gitdate=20090306
-pkgver=0.3.6 #_git${_gitdate}
+pkgver=0.4.0
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -15,24 +14,11 @@
 depends=('libwebkit=1.3.13' 'libunique' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify=0.7.1' 'libxss' 'sqlite3' 'glib2')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2=2.7.1' 'vala') 
# 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
-   #midori-${_gitdate}.tar.bz2
-)
-md5sums=('c4cb0686601b1c470c317de3d3f8e8fd')
+source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2)
+md5sums=('14aa14ccabf3d003903f1584dab15d7a')
 
-# source PKGBUILD  mksource
-mksource() {
-mkdir /tmp/$pkgname-source
-pushd /tmp/$pkgname-source
-   git clone -v git://git.xfce.org/kalikiana/midori
-   cd midori
-   git archive --prefix=midori-${_gitdate}/ --format=tar HEAD | bzip2  
/tmp/$pkgname-source/midori-${_gitdate}.tar.bz2
-popd
-}
-
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-#  cd ${srcdir}/${pkgname}-${_gitdate}
   # python2 
   export PYTHON=/usr/bin/python2
   sed -i -e s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2| wscript waf

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-05-17 Thread andyrtr 
Date: Tuesday, May 17, 2011 @ 13:28:05
  Author: andyrtr
Revision: 124201

upgpkg: midori 0.3.6-1
upstream update 0.3.6

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-17 16:06:33 UTC (rev 124200)
+++ PKGBUILD2011-05-17 17:28:05 UTC (rev 124201)
@@ -5,7 +5,7 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.3.5 #_git${_gitdate}
+pkgver=0.3.6 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('f92f0f11276d63150fd321dc08d575fb')
+md5sums=('c4cb0686601b1c470c317de3d3f8e8fd')
 
 # source PKGBUILD  mksource
 mksource() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-05-04 Thread andyrtr 
Date: Wednesday, May 4, 2011 @ 02:44:02
  Author: andyrtr
Revision: 122421

upgpkg: midori 0.3.5-1
upstream update 0.3.5

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-04 06:39:56 UTC (rev 122420)
+++ PKGBUILD2011-05-04 06:44:02 UTC (rev 122421)
@@ -5,8 +5,8 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.3.3 #_git${_gitdate}
-pkgrel=2
+pkgver=0.3.5 #_git${_gitdate}
+pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
@@ -18,7 +18,7 @@
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('e1262cc7cc0c1773c331ab794480f037')
+md5sums=('f92f0f11276d63150fd321dc08d575fb')
 
 # source PKGBUILD  mksource
 mksource() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-04-07 Thread andyrtr 
Date: Thursday, April 7, 2011 @ 16:14:30
  Author: andyrtr
Revision: 118802

upgpkg: midori 0.3.3-2
rebuild for libwebkit 1.3.13

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-07 19:54:20 UTC (rev 118801)
+++ PKGBUILD2011-04-07 20:14:30 UTC (rev 118802)
@@ -6,13 +6,13 @@
 pkgname=midori
 #_gitdate=20090306
 pkgver=0.3.3 #_git${_gitdate}
-pkgrel=1
+pkgrel=2
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('LGPL2.1')
 install=midori.install
-depends=('libwebkit' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 
'libnotify=0.7.1' 'libxss' 'sqlite3' 'glib2')
+depends=('libwebkit=1.3.13' 'libunique' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify=0.7.1' 'libxss' 'sqlite3' 'glib2')
 makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2=2.7.1' 'vala') 
# 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-03-07 Thread andyrtr 
Date: Monday, March 7, 2011 @ 13:23:05
  Author: andyrtr
Revision: 112904

upgpkg: midori 0.3.2-2
libnotify rebuild

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-07 18:09:21 UTC (rev 112903)
+++ PKGBUILD2011-03-07 18:23:05 UTC (rev 112904)
@@ -6,14 +6,14 @@
 pkgname=midori
 #_gitdate=20090306
 pkgver=0.3.2 #_git${_gitdate}
-pkgrel=1
+pkgrel=2
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('LGPL2.1')
 install=midori.install
-depends=('libwebkit' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 
'libnotify' 'libxss' 'sqlite3' 'glib2')
-makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 
'vala' 'docutils') # 'git'
+depends=('libwebkit' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 
'libnotify=0.7.1' 'libxss' 'sqlite3' 'glib2')
+makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2=2.7.1' 'vala' 
'docutils') # 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
@@ -34,7 +34,7 @@
   cd ${srcdir}/${pkgname}-${pkgver}
 #  cd ${srcdir}/${pkgname}-${_gitdate}
   # python2 
-#  export PYTHON=python2
+  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/} \

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-03-01 Thread Andrea Scarpino 
Date: Tuesday, March 1, 2011 @ 08:33:01
  Author: andrea
Revision: 111865

fix svn:keywords

Modified:
  midori/trunk/PKGBUILD (contents, properties)

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-01 13:26:17 UTC (rev 111864)
+++ PKGBUILD2011-03-01 13:33:01 UTC (rev 111865)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.3 2008/08/09 00:33:04 BaSh Exp $
+# $Id$
 # Maintainer: Andreas Radke andy...@archlinux.org
 # Contributor: rabyte rabyte.at.gmail.dot.com
 # Contributor: Johannes Krampf wuischke.at.amule.dot.org
@@ -50,5 +50,5 @@
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install
 }


Property changes on: midori/trunk/PKGBUILD
___
Added: svn:keywords
   + Id

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-02-20 Thread andyrtr 
Date: Sunday, February 20, 2011 @ 04:30:31
  Author: andyrtr
Revision: 110581

upgpkg: midori 0.3.2-1
upstream update 0.3.2

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-20 07:20:19 UTC (rev 110580)
+++ PKGBUILD2011-02-20 09:30:31 UTC (rev 110581)
@@ -5,7 +5,7 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.3.0 #_git${_gitdate}
+pkgver=0.3.2 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('ad1cf5449331fa81c06765341219')
+md5sums=('99d9f0b936e7052b41c3d1e7a7d7d672')
 
 # source PKGBUILD  mksource
 mksource() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2011-01-31 Thread andyrtr 
Date: Monday, January 31, 2011 @ 11:58:29
  Author: andyrtr
Revision: 108505

upgpkg: midori 0.3.0-1
upstream update 0.3.0

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-31 16:17:00 UTC (rev 108504)
+++ PKGBUILD2011-01-31 16:58:29 UTC (rev 108505)
@@ -5,7 +5,7 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.9 #_git${_gitdate}
+pkgver=0.3.0 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -15,10 +15,10 @@
 depends=('libwebkit' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 
'libnotify' 'libxss' 'sqlite3' 'glib2')
 makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 
'vala' 'docutils') # 'git'
 optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
+source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('a5821d8e31fa944374ed51c09ca4e740')
+md5sums=('ad1cf5449331fa81c06765341219')
 
 # source PKGBUILD  mksource
 mksource() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-11-01 Thread andyrtr 
Date: Monday, November 1, 2010 @ 14:23:08
  Author: andyrtr
Revision: 97726

upgpkg: midori 0.2.9-1
new version 0.2.9

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-01 15:12:47 UTC (rev 97725)
+++ PKGBUILD2010-11-01 18:23:08 UTC (rev 97726)
@@ -5,20 +5,20 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.8 #_git${_gitdate}
-pkgrel=2
+pkgver=0.2.9 #_git${_gitdate}
+pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('LGPL2.1')
 install=midori.install
-depends=('libwebkit=1.2.1' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify' 'libxss' 'sqlite3' 'glib2')
-makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4' 'vala' 'docutils') # 'git'
+depends=('libwebkit' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 
'libnotify' 'libxss' 'sqlite3' 'glib2')
+makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 
'vala' 'docutils') # 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('56bad3b922a4a4dcfe74186ca136d818')
+md5sums=('a5821d8e31fa944374ed51c09ca4e740')
 
 # source PKGBUILD  mksource
 mksource() {
@@ -33,6 +33,10 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 #  cd ${srcdir}/${pkgname}-${_gitdate}
+  # python2 
+#  export PYTHON=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 \

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-10-13 Thread andyrtr 
Date: Wednesday, October 13, 2010 @ 14:54:38
  Author: andyrtr
Revision: 95038

upgpkg: midori 0.2.8-2
fix license

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-13 18:11:26 UTC (rev 95037)
+++ PKGBUILD2010-10-13 18:54:38 UTC (rev 95038)
@@ -6,11 +6,11 @@
 pkgname=midori
 #_gitdate=20090306
 pkgver=0.2.8 #_git${_gitdate}
-pkgrel=1
+pkgrel=2
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
-license=('GPL')
+license=('LGPL2.1')
 install=midori.install
 depends=('libwebkit=1.2.1' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify' 'libxss' 'sqlite3' 'glib2')
 makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4' 'vala' 'docutils') # 'git'

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-08-17 Thread andyrtr 
Date: Tuesday, August 17, 2010 @ 17:38:27
  Author: andyrtr
Revision: 87689

upgpkg: midori 0.2.7-1
new version 0.2.7

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   26 ++
 1 file changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 18:03:44 UTC (rev 87688)
+++ PKGBUILD2010-08-17 21:38:27 UTC (rev 87689)
@@ -5,33 +5,35 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.6 #_git${_gitdate}
+pkgver=0.2.7 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('GPL')
 install=midori.install
-depends=('libwebkit=1.2.1' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify' 'libxss')
+depends=('libwebkit=1.2.1' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify' 'libxss' 'sqlite3' 'glib2')
 makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4' 'vala' 'docutils') # 'git'
 optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('249ddb3485d8246e0fda25dd735953f0')
+md5sums=('638a16424b444837d319723de5942a33')
 
+# source PKGBUILD  mksource
+mksource() {
+mkdir /tmp/$pkgname-source
+pushd /tmp/$pkgname-source
+   git clone -v git://git.xfce.org/kalikiana/midori
+   cd midori
+   git archive --prefix=midori-${_gitdate}/ --format=tar HEAD | bzip2  
/tmp/$pkgname-source/midori-${_gitdate}.tar.bz2
+popd
+}
+
 build() {
-  # get git code
-  cd ${srcdir}
-#  git clone -v git://git.xfce.org/kalikiana/midori
-#  cd midori
-#  git archive --prefix=midori-${_gitdate}/ --format=tar HEAD | bzip2  
../../midori-${_gitdate}.tar.bz2
-#  return 1
-
   cd ${srcdir}/${pkgname}-${pkgver}
 #  cd ${srcdir}/${pkgname}-${_gitdate}
   ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-   --enable-sqlite \
--enable-addons \
--disable-hildon \
--enable-unique \
@@ -39,7 +41,7 @@
--enable-docs \
--enable-apidocs \
--enable-userdocs
-  make || return 1
+  make
 }
 
 package() {

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-05-27 Thread andyrtr 
Date: Thursday, May 27, 2010 @ 19:11:31
  Author: andyrtr
Revision: 81298

upgpkg: midori 0.2.6-1
new version 0.2.6

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-27 22:02:09 UTC (rev 81297)
+++ PKGBUILD2010-05-27 23:11:31 UTC (rev 81298)
@@ -5,7 +5,7 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.5 #_git${_gitdate}
+pkgver=0.2.6 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('3aeacd04d4d3e5c3bc16824696ff57b2')
+md5sums=('249ddb3485d8246e0fda25dd735953f0')
 
 build() {
   # get git code
@@ -37,10 +37,8 @@
--enable-unique \
--enable-nls \
--enable-docs \
-   --disable-apidocs \
+   --enable-apidocs \
--enable-userdocs
-   # - currently broken
-   #--enable-apidocs \
   make || return 1
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-05-18 Thread andyrtr 
Date: Tuesday, May 18, 2010 @ 13:01:40
  Author: andyrtr
Revision: 80532

upgpkg: midori 0.2.5-1
new version 0.2.5; apidocs won't build currently

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-18 16:55:10 UTC (rev 80531)
+++ PKGBUILD2010-05-18 17:01:40 UTC (rev 80532)
@@ -39,8 +39,8 @@
--enable-docs \
--disable-apidocs \
--enable-userdocs
-   # - currently broken 
-   # would require docutils from community
+   # - currently broken
+   #--enable-apidocs \
   make || return 1
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-05-17 Thread andyrtr 
Date: Monday, May 17, 2010 @ 12:35:25
  Author: andyrtr
Revision: 80480

prepare next build

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-17 11:41:42 UTC (rev 80479)
+++ PKGBUILD2010-05-17 16:35:25 UTC (rev 80480)
@@ -5,19 +5,20 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.4 #_git${_gitdate}
+pkgver=0.2.5 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('GPL')
 install=midori.install
-depends=('libwebkit=1.1.15.4' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify')
-makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4') # 'git'
+depends=('libwebkit=1.2.1' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify' 'libxss')
+makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4' 'vala' 'docutils') # 'git'
+optdepends=('vala: for use in extensions')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('ccd2ae162993c2c92c9e0eac7778c62d')
+md5sums=('3aeacd04d4d3e5c3bc16824696ff57b2')
 
 build() {
   # get git code
@@ -36,8 +37,14 @@
--enable-unique \
--enable-nls \
--enable-docs \
-   --enable-apidocs # - currently broken 
-   #--enable-userdocs would require docutils from community
+   --disable-apidocs \
+   --enable-userdocs
+   # - currently broken 
+   # would require docutils from community
   make || return 1
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install || return 1
 }

[arch-commits] Commit in midori/trunk (PKGBUILD)

2010-03-08 Thread andyrtr 
Date: Monday, March 8, 2010 @ 14:38:15
  Author: andyrtr
Revision: 71704

upgpkg: midori 0.2.4-1
new version 0.2.4

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-08 19:34:30 UTC (rev 71703)
+++ PKGBUILD2010-03-08 19:38:15 UTC (rev 71704)
@@ -5,7 +5,7 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.3 #_git${_gitdate}
+pkgver=0.2.4 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('7289b170ab14925c2dc889f57a0b6a70')
+md5sums=('ccd2ae162993c2c92c9e0eac7778c62d')
 
 build() {
   # get git code

[arch-commits] Commit in midori/trunk (PKGBUILD)

2009-12-17 Thread andyrtr 
Date: Thursday, December 17, 2009 @ 14:09:40
  Author: andyrtr
Revision: 61508

upgpkg: midori 0.2.2-1
new version 0.2.2; libnotify is now a runtime dependency

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-12-17 12:28:37 UTC (rev 61507)
+++ PKGBUILD2009-12-17 19:09:40 UTC (rev 61508)
@@ -5,20 +5,19 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.1 #_git${_gitdate}
+pkgver=0.2.2 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('GPL')
 install=midori.install
-depends=('libwebkit=1.1.15.3' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils')
+depends=('libwebkit=1.1.15.3' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils' 'libnotify')
 makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4') # 'git'
-optdepends=('libnotify: for finished transfers')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('3cee94c9a22316504a3ba99bc92e0245')
+md5sums=('14f81a7a10f80a173da1b5e88713400b')
 
 build() {
   # get git code

[arch-commits] Commit in midori/trunk (PKGBUILD)

2009-11-18 Thread andyrtr 
Date: Thursday, November 19, 2009 @ 01:25:34
  Author: andyrtr
Revision: 59000

upgpkg: midori 0.2.1-1
new version 0.2.1; remove unneeded dep on libidn, covered by libsoup

Modified:
  midori/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-19 02:03:21 UTC (rev 58999)
+++ PKGBUILD2009-11-19 06:25:34 UTC (rev 59000)
@@ -5,21 +5,20 @@
 
 pkgname=midori
 #_gitdate=20090306
-pkgver=0.2.0 #_git${_gitdate}
+pkgver=0.2.1 #_git${_gitdate}
 pkgrel=1
 pkgdesc=A lightweight web browser based on Gtk WebKit
 arch=('i686' 'x86_64')
 url=http://www.twotoasts.de/index.php?/pages/midori_summary.html;
 license=('GPL')
 install=midori.install
-depends=('libwebkit=1.1.10-2' 'libidn' 'libunique=1.0.8' 
-'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.2-5') # 'git'
+depends=('libwebkit=1.1.15.3' 'libunique=1.1.6' 'hicolor-icon-theme' 
'desktop-file-utils')
+makedepends=('pkgconfig' 'libxml2' 'intltool' 'gtk-doc' 'librsvg=2.26.0' 
'python=2.6.4') # 'git'
 optdepends=('libnotify: for finished transfers')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2
#midori-${_gitdate}.tar.bz2
 )
-md5sums=('805e2e59a93a0a4b7652d6547b2bd923')
+md5sums=('3cee94c9a22316504a3ba99bc92e0245')
 
 build() {
   # get git code
@@ -32,7 +31,6 @@
   cd ${srcdir}/${pkgname}-${pkgver}
 #  cd ${srcdir}/${pkgname}-${_gitdate}
   ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-   --enable-libidn \
--enable-sqlite \
--enable-addons \
--disable-hildon \