adopted, add a patch

4 files changed, 42 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 02cb45ac1ad1..52bf8c055522 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
+# Generated by mksrcinfo v8
+# Sat Mar  4 11:54:15 UTC 2017
 pkgbase = midori-bzr
 	pkgdesc = Lightweight web browser based on WebKit and GTK3 (development version)
-	pkgver = r6866
+	pkgver = r7162
 	pkgrel = 1
-	url = http://twotoasts.de/index.php?/pages/midori_summary.html
+	url = http://www.twotoasts.de/index.php/midori/
 	install = midori.install
 	arch = x86_64
 	arch = i686
@@ -18,15 +20,10 @@ pkgbase = midori-bzr
 	makedepends = vala
 	makedepends = librsvg
 	makedepends = cmake
-	makedepends = ninja
-	depends = desktop-file-utils
 	depends = gcr
-	depends = hicolor-icon-theme
-	depends = libnotify
-	depends = libunique3
 	depends = libxss
-	depends = libzeitgeist
-	depends = webkitgtk
+	depends = zeitgeist
+	depends = webkit2gtk
 	optdepends = aria2: download utility
 	optdepends = steadyflow: download manager
 	optdepends = gst-plugins-base: HTML5 OGG videos support
@@ -37,10 +34,11 @@ pkgbase = midori-bzr
 	conflicts = midori-gtk2-git
 	conflicts = midori-git
 	conflicts = midori-gtk2-bzr
-	replaces = midori-git
 	options = !emptydirs
 	source = midori::bzr+http://bazaar.launchpad.net/~midori/midori/trunk/
+	source = katzeitem.patch
 	md5sums = SKIP
+	md5sums = ddd357817ab1f2aec3bd10ae2662518f
 
 pkgname = midori-bzr
 
diff --git a/PKGBUILD b/PKGBUILD
index f743650618bb..5a431be98f34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,47 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: hybraries <macwolf@archlinux.de>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Navi <navitwo.at.gmail.dot.com>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 # Contributor: Andrew Mcclain <tananod@mega.zik.dj>
 
 pkgname=midori-bzr
-pkgver=r6866
+pkgver=r7162
 pkgrel=1
 pkgdesc='Lightweight web browser based on WebKit and GTK3 (development version)'
 arch=('x86_64' 'i686')
-url='http://twotoasts.de/index.php?/pages/midori_summary.html'
+url='http://www.twotoasts.de/index.php/midori/'
 license=('LGPL')
-depends=('desktop-file-utils' 'gcr' 'hicolor-icon-theme' 'libnotify'
-         'libunique3' 'libxss' 'libzeitgeist' 'webkitgtk')
+depends=('gcr' 'libxss' 'zeitgeist' 'webkit2gtk')
 makedepends=('bzr' 'pkg-config' 'python2' 'libxml2' 'gtk3' 'intltool'
-             'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja')
+             'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake')
 optdepends=('aria2: download utility'
             'steadyflow: download manager'
             'gst-plugins-base: HTML5 OGG videos support'
             'gst-plugins-good: HTML5 H264 and WebM videos support'
             'gst-libav: HTML5 H264 videos support')
 provides=('midori')
-replaces=('midori-git')
 conflicts=('midori' 'midori-gtk2-git' 'midori-git' 'midori-gtk2-bzr')
 options=('!emptydirs')
 install='midori.install'
-source=("midori::bzr+http://bazaar.launchpad.net/~midori/midori/trunk/")
-md5sums=('SKIP')
+source=("midori::bzr+http://bazaar.launchpad.net/~midori/midori/trunk/" katzeitem.patch)
+md5sums=('SKIP'
+         'ddd357817ab1f2aec3bd10ae2662518f')
 
 pkgver() {
   cd midori
-
   printf "r%s" "$(bzr revno)"
 }
 
+prepare() {
+  cd midori/midori
+  patch -Np1 < $srcdir/katzeitem.patch || true
+}
+
 build() {
   cd midori
-
   [[ -d build ]] && rm -rf build
   mkdir -p build && cd build
 
@@ -47,13 +49,12 @@ build() {
     -DCMAKE_BUILD_TYPE='Release' \
     -DCMAKE_INSTALL_PREFIX='/usr' \
     -DCMAKE_INSTALL_LIBDIR='/usr/lib' \
-    -DUSE_GTK3=1 \
-    -G Ninja
-  ninja
+    -DHALF_BRO_INCOM_WEBKIT2=ON \
+    -DUSE_GTK3=1
+  make
 }
 
 package() {
-  DESTDIR="$pkgdir" ninja -C "${pkgname/-bzr}/build" install
+  cd midori/build
+  DESTDIR="$pkgdir" make install
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/katzeitem.patch b/katzeitem.patch
new file mode 100644
index 000000000000..1844f3431d85
--- /dev/null
+++ b/katzeitem.patch
@@ -0,0 +1,13 @@
+=== modified file 'midori/midori-browser.c'
+--- midori/midori-browser.c	2016-01-23 19:21:31 +0000
++++ midori/midori-browser.c	2017-03-04 11:02:54 +0000
+@@ -4026,7 +4026,7 @@
+     {
+         const gchar* keywords = NULL;
+         const gchar* search_uri = NULL;
+-        KatzeItem* item;
++        KatzeItem* item = NULL;
+ 
+         /* Do we have a keyword and a string? */
+         if (browser->search_engines
+
diff --git a/midori.install b/midori.install
index ef816a666684..738a94df217c 100644
--- a/midori.install
+++ b/midori.install
@@ -1,14 +1,3 @@
-post_upgrade() {
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
 post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
+  echo 'Set GTK_CSD=1 for enabling client side decorations for Midori'
+}
\ No newline at end of file