[arch-commits] Commit in midori/repos (10 files)

Alexander Rødseth arodseth at nymeria.archlinux.org
Sun Apr 7 13:05:17 UTC 2013


    Date: Sunday, April 7, 2013 @ 15:05:16
  Author: arodseth
Revision: 87825

archrelease: copy trunk to community-x86_64, community-i686

Added:
  midori/repos/community-i686/PKGBUILD
    (from rev 87824, midori/trunk/PKGBUILD)
  midori/repos/community-i686/midori.install
    (from rev 87824, midori/trunk/midori.install)
  midori/repos/community-x86_64/PKGBUILD
    (from rev 87824, midori/trunk/PKGBUILD)
  midori/repos/community-x86_64/midori.install
    (from rev 87824, midori/trunk/midori.install)
Deleted:
  midori/repos/community-i686/PKGBUILD
  midori/repos/community-i686/fix-copying.patch
  midori/repos/community-i686/midori.install
  midori/repos/community-x86_64/PKGBUILD
  midori/repos/community-x86_64/fix-copying.patch
  midori/repos/community-x86_64/midori.install

------------------------------------+
 /PKGBUILD                          |   88 +++++++++++++++++++++++++++++++++++
 /midori.install                    |   24 +++++++++
 community-i686/PKGBUILD            |   53 ---------------------
 community-i686/fix-copying.patch   |   63 -------------------------
 community-i686/midori.install      |   12 ----
 community-x86_64/PKGBUILD          |   53 ---------------------
 community-x86_64/fix-copying.patch |   63 -------------------------
 community-x86_64/midori.install    |   12 ----
 8 files changed, 112 insertions(+), 256 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-04-07 13:05:01 UTC (rev 87824)
+++ community-i686/PKGBUILD	2013-04-07 13:05:16 UTC (rev 87825)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer:  Alexander Rødseth <rodseth at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
-
-pkgname=midori
-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')
-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')
-
-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 \
-              --enable-unique \
-              --enable-nls \
-              --enable-docs \
-              --enable-apidocs
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: midori/repos/community-i686/PKGBUILD (from rev 87824, midori/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-04-07 13:05:16 UTC (rev 87825)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer:  Alexander Rødseth <rodseth at gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: rabyte <rabyte.at.gmail.dot.com>
+# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
+
+pkgname=midori
+pkgver=0.5.0
+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')
+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")
+sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+              --jobs=${MAKEFLAGS/-j/} \
+              --enable-addons \
+              --enable-unique \
+              --enable-nls \
+              --enable-docs \
+              --enable-apidocs
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/fix-copying.patch
===================================================================
--- community-i686/fix-copying.patch	2013-04-07 13:05:01 UTC (rev 87824)
+++ community-i686/fix-copying.patch	2013-04-07 13:05:16 UTC (rev 87825)
@@ -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);
- }

Deleted: community-i686/midori.install
===================================================================
--- community-i686/midori.install	2013-04-07 13:05:01 UTC (rev 87824)
+++ community-i686/midori.install	2013-04-07 13:05:16 UTC (rev 87825)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: midori/repos/community-i686/midori.install (from rev 87824, midori/trunk/midori.install)
===================================================================
--- community-i686/midori.install	                        (rev 0)
+++ community-i686/midori.install	2013-04-07 13:05:16 UTC (rev 87825)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-04-07 13:05:01 UTC (rev 87824)
+++ community-x86_64/PKGBUILD	2013-04-07 13:05:16 UTC (rev 87825)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer:  Alexander Rødseth <rodseth at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
-
-pkgname=midori
-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')
-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')
-
-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 \
-              --enable-unique \
-              --enable-nls \
-              --enable-docs \
-              --enable-apidocs
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: midori/repos/community-x86_64/PKGBUILD (from rev 87824, midori/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-04-07 13:05:16 UTC (rev 87825)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer:  Alexander Rødseth <rodseth at gmail.com>
+# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: rabyte <rabyte.at.gmail.dot.com>
+# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor: Bartłomiej Piotrowski <barthalion at gmail.com>
+
+pkgname=midori
+pkgver=0.5.0
+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')
+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")
+sha256sums=('d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  ./configure --prefix=/usr \
+              --jobs=${MAKEFLAGS/-j/} \
+              --enable-addons \
+              --enable-unique \
+              --enable-nls \
+              --enable-docs \
+              --enable-apidocs
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/fix-copying.patch
===================================================================
--- community-x86_64/fix-copying.patch	2013-04-07 13:05:01 UTC (rev 87824)
+++ community-x86_64/fix-copying.patch	2013-04-07 13:05:16 UTC (rev 87825)
@@ -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);
- }

Deleted: community-x86_64/midori.install
===================================================================
--- community-x86_64/midori.install	2013-04-07 13:05:01 UTC (rev 87824)
+++ community-x86_64/midori.install	2013-04-07 13:05:16 UTC (rev 87825)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: midori/repos/community-x86_64/midori.install (from rev 87824, midori/trunk/midori.install)
===================================================================
--- community-x86_64/midori.install	                        (rev 0)
+++ community-x86_64/midori.install	2013-04-07 13:05:16 UTC (rev 87825)
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}




More information about the arch-commits mailing list