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

Eric Bélanger eric at archlinux.org
Tue Nov 15 19:02:12 EST 2011


    Date: Tuesday, November 15, 2011 @ 19:02:11
  Author: eric
Revision: 142825

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

Added:
  midori/repos/extra-i686/PKGBUILD
    (from rev 142824, midori/trunk/PKGBUILD)
  midori/repos/extra-i686/midori.install
    (from rev 142824, midori/trunk/midori.install)
  midori/repos/extra-i686/webkit_search.diff
    (from rev 142824, midori/trunk/webkit_search.diff)
  midori/repos/extra-x86_64/PKGBUILD
    (from rev 142824, midori/trunk/PKGBUILD)
  midori/repos/extra-x86_64/midori.install
    (from rev 142824, midori/trunk/midori.install)
  midori/repos/extra-x86_64/webkit_search.diff
    (from rev 142824, midori/trunk/webkit_search.diff)
Deleted:
  midori/repos/extra-i686/PKGBUILD
  midori/repos/extra-i686/midori.install
  midori/repos/extra-i686/webkit_search.diff
  midori/repos/extra-x86_64/PKGBUILD
  midori/repos/extra-x86_64/midori.install
  midori/repos/extra-x86_64/webkit_search.diff

---------------------------------+
 extra-i686/PKGBUILD             |   80 ++++++++++++-------------
 extra-i686/midori.install       |   26 +++-----
 extra-i686/webkit_search.diff   |  118 +++++++++++++++++++-------------------
 extra-x86_64/PKGBUILD           |   80 ++++++++++++-------------
 extra-x86_64/midori.install     |   26 +++-----
 extra-x86_64/webkit_search.diff |  118 +++++++++++++++++++-------------------
 6 files changed, 222 insertions(+), 226 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-16 00:01:49 UTC (rev 142824)
+++ extra-i686/PKGBUILD	2011-11-16 00:02:11 UTC (rev 142825)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-
-pkgname=midori
-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"
-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')
-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')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # 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/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: midori/repos/extra-i686/PKGBUILD (from rev 142824, midori/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-16 00:02:11 UTC (rev 142825)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: rabyte <rabyte.at.gmail.dot.com>
+# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+
+pkgname=midori
+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')
+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')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # 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/} \
+	--enable-addons \
+	--disable-hildon \
+	--enable-unique \
+	--enable-nls \
+	--enable-docs \
+	--enable-apidocs
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/midori.install
===================================================================
--- extra-i686/midori.install	2011-11-16 00:01:49 UTC (rev 142824)
+++ extra-i686/midori.install	2011-11-16 00:02:11 UTC (rev 142825)
@@ -1,14 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}

Copied: midori/repos/extra-i686/midori.install (from rev 142824, midori/trunk/midori.install)
===================================================================
--- extra-i686/midori.install	                        (rev 0)
+++ extra-i686/midori.install	2011-11-16 00:02:11 UTC (rev 142825)
@@ -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: extra-i686/webkit_search.diff
===================================================================
--- extra-i686/webkit_search.diff	2011-11-16 00:01:49 UTC (rev 142824)
+++ extra-i686/webkit_search.diff	2011-11-16 00:02:11 UTC (rev 142825)
@@ -1,59 +0,0 @@
-From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian at twotoasts.de>
-Date: Wed, 21 Sep 2011 21:50:51 +0000
-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 

Copied: midori/repos/extra-i686/webkit_search.diff (from rev 142824, midori/trunk/webkit_search.diff)
===================================================================
--- extra-i686/webkit_search.diff	                        (rev 0)
+++ extra-i686/webkit_search.diff	2011-11-16 00:02:11 UTC (rev 142825)
@@ -0,0 +1,59 @@
+From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian at twotoasts.de>
+Date: Wed, 21 Sep 2011 21:50:51 +0000
+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 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-11-16 00:01:49 UTC (rev 142824)
+++ extra-x86_64/PKGBUILD	2011-11-16 00:02:11 UTC (rev 142825)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-
-pkgname=midori
-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"
-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')
-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')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # 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/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}

Copied: midori/repos/extra-x86_64/PKGBUILD (from rev 142824, midori/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-11-16 00:02:11 UTC (rev 142825)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: rabyte <rabyte.at.gmail.dot.com>
+# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
+
+pkgname=midori
+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')
+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')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # 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/} \
+	--enable-addons \
+	--disable-hildon \
+	--enable-unique \
+	--enable-nls \
+	--enable-docs \
+	--enable-apidocs
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/midori.install
===================================================================
--- extra-x86_64/midori.install	2011-11-16 00:01:49 UTC (rev 142824)
+++ extra-x86_64/midori.install	2011-11-16 00:02:11 UTC (rev 142825)
@@ -1,14 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}

Copied: midori/repos/extra-x86_64/midori.install (from rev 142824, midori/trunk/midori.install)
===================================================================
--- extra-x86_64/midori.install	                        (rev 0)
+++ extra-x86_64/midori.install	2011-11-16 00:02:11 UTC (rev 142825)
@@ -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: extra-x86_64/webkit_search.diff
===================================================================
--- extra-x86_64/webkit_search.diff	2011-11-16 00:01:49 UTC (rev 142824)
+++ extra-x86_64/webkit_search.diff	2011-11-16 00:02:11 UTC (rev 142825)
@@ -1,59 +0,0 @@
-From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian at twotoasts.de>
-Date: Wed, 21 Sep 2011 21:50:51 +0000
-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 

Copied: midori/repos/extra-x86_64/webkit_search.diff (from rev 142824, midori/trunk/webkit_search.diff)
===================================================================
--- extra-x86_64/webkit_search.diff	                        (rev 0)
+++ extra-x86_64/webkit_search.diff	2011-11-16 00:02:11 UTC (rev 142825)
@@ -0,0 +1,59 @@
+From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian at twotoasts.de>
+Date: Wed, 21 Sep 2011 21:50:51 +0000
+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 



More information about the arch-commits mailing list