Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (474ab0e73bf17b87f1932f677d88f4cb95b6e00d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (474ab0e73bf17b87f1932f677d88f4cb95b6e00d)
  • Date: Mon, 10 Oct 2011 05:22:35 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/midori/DETAILS | 4 +-
http/midori/HISTORY | 4 ++
http/midori/PRE_BUILD | 4 --
http/midori/webkit-1.6.patch | 59
-------------------------------------------
mail/exim/DETAILS | 4 +-
mail/exim/HISTORY | 3 ++
6 files changed, 11 insertions(+), 67 deletions(-)

New commits:
commit 474ab0e73bf17b87f1932f677d88f4cb95b6e00d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

midori: => 0.4.1

commit 622ab6c48da7b63389d7604bd841016113de5499
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

exim: => 4.77

diff --git a/http/midori/DETAILS b/http/midori/DETAILS
index fc57c6c..93b366f 100755
--- a/http/midori/DETAILS
+++ b/http/midori/DETAILS
@@ -11,11 +11,11 @@ if [[ $MIDORI_BRANCH == scm ]]; then
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
else
- VERSION=0.4.0
+ VERSION=0.4.1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
-
SOURCE_HASH=sha512:8a48bfdfd630e85371caa7be9da56925e2bb1abfa1bcdfda59643493753d66c1b96b68e8fd8194455439b4ed85413cefdc3b14cc3738f47a1691faf0e27633bd
+
SOURCE_HASH=sha512:970bbb70cf84dc5b51be0966085335613636960ad17cbf463e9b11683d109480de0b2d45832cfe523ebc5d44bd8f855526ad8949006fcae3427ca88a33727c8a
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://software.twotoasts.de/?page=midori
diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 6879454..ce516d9 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2011-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.4.1
+ * PRE_BUILD, webkit-1.6.patch: removed, fixed by upstream
+
2011-10-01 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: added, to apply the patch
* webkit-1.6.patch: added, to fix compilation with webkit 1.6
diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
deleted file mode 100755
index 01e5a8e..0000000
--- a/http/midori/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/webkit-1.6.patch"
diff --git a/http/midori/webkit-1.6.patch b/http/midori/webkit-1.6.patch
deleted file mode 100644
index 620cdc9..0000000
--- a/http/midori/webkit-1.6.patch
+++ /dev/null
@@ -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
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 19ffa7b..5da4a8e 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,6 +1,6 @@
SPELL=exim
- VERSION=4.76
- SECURITY_PATCH=5
+ VERSION=4.77
+ SECURITY_PATCH=6
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 964b12a..9022940 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,6 @@
+2011-10-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.77; SECURITY_PATCH++
+
2011-05-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.76 (security: CVE-2011-1764)
* DEPENDS: killed xorg-libs, see #14699



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (474ab0e73bf17b87f1932f677d88f4cb95b6e00d), Vlad Glagolev, 10/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page