Mon Apr 8 00:05:45 PDT 2013

2 files changed, 4 insertions, 76 deletions

diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index 7815bc180..c420ccd88 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85855 2013-03-07 19:55:29Z bpiotrowski $
+# $Id: PKGBUILD 87825 2013-04-07 13:05:16Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -7,7 +7,7 @@
 # Contributor: Bartłomiej Piotrowski <barthalion@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 @@ 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=('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 \
diff --git a/community/midori/fix-copying.patch b/community/midori/fix-copying.patch
deleted file mode 100644
index ab3581900..000000000
--- a/community/midori/fix-copying.patch
+++ /dev/null
@@ -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);
- }