Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (d2e8223536ff65c07a5e601fc84f8e0a9ea215bf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (d2e8223536ff65c07a5e601fc84f8e0a9ea215bf)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (d2e8223536ff65c07a5e601fc84f8e0a9ea215bf)
  • Date: Fri, 30 Sep 2011 21:46:52 -0500
GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

archive/lzip/DETAILS | 2 -
archive/lzip/HISTORY | 3 ++
editors/lyx/DETAILS | 2 -
editors/lyx/HISTORY | 3 ++
ftp/proftpd/DETAILS | 2 -
ftp/proftpd/HISTORY | 3 ++
gnome2-apps/gnucash/DETAILS | 8 ++---
gnome2-apps/gnucash/HISTORY | 3 ++
http/midori/HISTORY | 4 ++
http/midori/PRE_BUILD | 4 ++
http/midori/webkit-1.6.patch | 59
+++++++++++++++++++++++++++++++++++++++++++
11 files changed, 86 insertions(+), 7 deletions(-)

New commits:
commit 0bf0587f0d00272bb9a0fafad126c159b986d83c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

midori: fixed compilation with recent webkitgtk

commit a9473838656f0f511292b49a1484f8cb15309072
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

proftpd: Updated to version 1.3.3f

commit 451ce99f55a0f9b95d1309f89e19821b9882f38f
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

lzip: Updated to version 1.12

commit 9d9c98eb4626044e607f8711df3944a4b2aaf1e4
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

gnucash: Updated to version 2.4.7

commit eb5387495ace8d37fe69e9d3d94ff31edc882962
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

lyx: Updated to version 2.0.1

diff --git a/archive/lzip/DETAILS b/archive/lzip/DETAILS
index 7ffea2e..0b34991 100755
--- a/archive/lzip/DETAILS
+++ b/archive/lzip/DETAILS
@@ -1,5 +1,5 @@
SPELL=lzip
- VERSION=1.11
+ VERSION=1.12
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/archive/lzip/HISTORY b/archive/lzip/HISTORY
index 628e4e1..7b4084b 100644
--- a/archive/lzip/HISTORY
+++ b/archive/lzip/HISTORY
@@ -1,3 +1,6 @@
+2011-09-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.12
+
2011-08-23 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: use gnu.gpg insead of lzip.gpg
* lzip.gpg: removed, no longer needed
diff --git a/editors/lyx/DETAILS b/editors/lyx/DETAILS
index e04359f..841151b 100755
--- a/editors/lyx/DETAILS
+++ b/editors/lyx/DETAILS
@@ -1,5 +1,5 @@
SPELL=lyx
- VERSION=2.0.0
+ VERSION=2.0.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/editors/lyx/HISTORY b/editors/lyx/HISTORY
index fb497d5..b1833a8 100644
--- a/editors/lyx/HISTORY
+++ b/editors/lyx/HISTORY
@@ -1,3 +1,6 @@
+2011-09-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.0.1
+
2011-09-25 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* C7FB382D.gpg: added gpg keyring
diff --git a/ftp/proftpd/DETAILS b/ftp/proftpd/DETAILS
index 54a82d9..c7ed775 100755
--- a/ftp/proftpd/DETAILS
+++ b/ftp/proftpd/DETAILS
@@ -1,5 +1,5 @@
SPELL=proftpd
- VERSION=1.3.3e
+ VERSION=1.3.3f
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
diff --git a/ftp/proftpd/HISTORY b/ftp/proftpd/HISTORY
index 9f54899..b674a71 100644
--- a/ftp/proftpd/HISTORY
+++ b/ftp/proftpd/HISTORY
@@ -1,3 +1,6 @@
+2011-09-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 1.3.3f
+
2011-09-25 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* A511976A.gpg: added gpg keyring
diff --git a/gnome2-apps/gnucash/DETAILS b/gnome2-apps/gnucash/DETAILS
index bdc8d43..9ccba68 100755
--- a/gnome2-apps/gnucash/DETAILS
+++ b/gnome2-apps/gnucash/DETAILS
@@ -1,10 +1,10 @@
SPELL=gnucash
if [ "$GNUCASH_DEVEL" == "y" ]; then
- VERSION=2.4.5
-
SOURCE_HASH=sha512:0db40d0b8552e65589f9753ed15c70225e7824909be53f23a6fa745c0be2d3a89482959c3f0717a57500e6854595fd60a947cf26755f7bacfb963deade43fe3c
+ VERSION=2.4.7
+
SOURCE_HASH=sha512:e887ed9ee25e7f6f4dbd28fe63ddee1bde541c78f7a43d5f565218483e90756fa3f4e8f131778824b34ad783d08cd593e36222eade5582c81da414662b74f461
else
- VERSION=2.4.5
-
SOURCE_HASH=sha512:0db40d0b8552e65589f9753ed15c70225e7824909be53f23a6fa745c0be2d3a89482959c3f0717a57500e6854595fd60a947cf26755f7bacfb963deade43fe3c
+ VERSION=2.4.7
+
SOURCE_HASH=sha512:e887ed9ee25e7f6f4dbd28fe63ddee1bde541c78f7a43d5f565218483e90756fa3f4e8f131778824b34ad783d08cd593e36222eade5582c81da414662b74f461
fi
SOURCE=${SPELL}-$VERSION.tar.bz2
SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY
index 643eb2c..4f2cc46 100644
--- a/gnome2-apps/gnucash/HISTORY
+++ b/gnome2-apps/gnucash/HISTORY
@@ -1,3 +1,6 @@
+2011-09-30 George Sherwood <gsherwood AT sourcemage.org>
+ * DETAILS: Updated to version 2.4.7
+
2011-05-15 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.4.5

diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 7958555..6879454 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+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
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fix scm SOURCE and SOURCE_DIRECTORY
* PREPARE, DETAILS: Use prepare_select_branch
diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
new file mode 100755
index 0000000..01e5a8e
--- /dev/null
+++ b/http/midori/PRE_BUILD
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000..620cdc9
--- /dev/null
+++ b/http/midori/webkit-1.6.patch
@@ -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


  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (d2e8223536ff65c07a5e601fc84f8e0a9ea215bf), Vlad Glagolev, 09/30/2011

Archive powered by MHonArc 2.6.24.

Top of Page