Hello community, here is the log from the commit of package midori for openSUSE:Factory checked in at Thu Sep 22 10:47:49 CEST 2011.
-------- --- midori/midori.changes 2011-05-02 16:27:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/midori/midori.changes 2011-09-22 01:19:37.000000000 +0200 @@ -1,0 +2,50 @@ +Wed Sep 21 22:35:01 UTC 2011 - [email protected] + +- added midori-0.4.0-use-dom-api.patch in order to use DOM API + instead of private API for retrieving selected text, this fixes + the build with webkit >= r88621 +- added midori-0.4.0-fix-underlinking.patch in order to link + explicitly against libjavascriptcoregtk +- remove non-standard sections from the desktop file + +------------------------------------------------------------------- +Tue Aug 2 08:47:15 UTC 2011 - [email protected] + +- update to version 0.4.0 + + Provide buttons to choose how to startup after crash + + Never delay URIs given as command line arguments + + Space at the bottom of the page: Go to next page + + Initialize session in app/ private before adding URIs + + Add 'Last open tabs' option to Clear Private Data + + Show kinetic scrolling option regardless of Hildon + + Interpret Shift+Backspace as going forward + + Advertise SVG images as a supported MIME type + + Zoom in steps of 10% and support Ctr+= + + Integrate Adblock and History List options in list + + Skip empty lines, ignore subdocument rules in Adblock + + URL cache, faster JS generator, inline parsing in Adblock + + Reuse source of webview instead of redownloading + + Remove the description field from bookmark dialog + + Add --log-file/ -l switch to log to a file + + Pass through javascript: URIS from the command line + + Adjust the preferences dialog + + Bugfixes + +------------------------------------------------------------------- +Mon May 16 08:34:20 UTC 2011 - [email protected] + +- updated to version 0.3.6 + + Track selected search engine per window + + Improve preference dialogue size and alignments + + Validate URIs in Adblock, homepage and bookmarks + + Support Backspace as Go Back and F5 as Reload + + Show 'Private Browsing' in Unity Quicklist + + Ignore Network Cancelled errors + + Reduce allocations when preparing speed dial + + Implement geo URI support as per RFC 5870 + + Faster javascript-based JSON import + + Improve speed dial markup, without scripts + + Allow Escape to cancel History List + + Bugfixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- midori-0.3.5.tar.bz2 New: ---- midori-0.4.0-fix-underlinking.patch midori-0.4.0-use-dom-api.patch midori-0.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ midori.spec ++++++ --- /var/tmp/diff_new_pack.7DBQQG/_old 2011-09-22 10:47:45.000000000 +0200 +++ /var/tmp/diff_new_pack.7DBQQG/_new 2011-09-22 10:47:45.000000000 +0200 @@ -18,13 +18,17 @@ Name: midori -Version: 0.3.5 +Version: 0.4.0 Release: 1 License: LGPLv2.1 Summary: Lightweight Webkit-based Web Browser Url: http://twotoasts.de/index.php?/pages/midori_summary.html Group: Productivity/Networking/Web/Browsers Source: http://archive.xfce.org/src/apps/%{name}/0.3/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM midori-0.4.0-use-dom-api.patch lp#799603 [email protected] -- Use DOM API instead of private API for retrieving selected text, this fixes the build with webkit >= r88621 +Patch0: midori-0.4.0-use-dom-api.patch +# PATCH-FIX-UPSTREAM midori-0.4.0-fix-underlinking.patch lp#855978 [email protected] -- Link explicitly against libjavascriptcoregtk +Patch1: midori-0.4.0-fix-underlinking.patch BuildRequires: docutils BuildRequires: gtk-doc BuildRequires: intltool @@ -73,6 +77,10 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 +awk '/^\[/ && $0 != "[Desktop Entry]" { exit } { print }' data/midori.desktop.in > data/midori.desktop.in.new +mv data/midori.desktop.in.new data/midori.desktop.in %build export CFLAGS="%{optflags}" @@ -145,7 +153,7 @@ %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/%{name} %if 0%{?suse_version} >= 1140 -%{_includedir}/midori-0.3 +%{_includedir}/midori-0.4 %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi %{_datadir}/vala/vapi/history-list.* ++++++ midori-0.4.0-fix-underlinking.patch ++++++ diff -urNp midori-0.4.0.orig/midori/wscript_build midori-0.4.0/midori/wscript_build --- midori-0.4.0.orig/midori/wscript_build 2011-08-02 00:06:36.000000000 +0200 +++ midori-0.4.0/midori/wscript_build 2011-09-22 00:49:57.106000253 +0200 @@ -7,7 +7,8 @@ import platform progressive = True libs = 'M UNIQUE LIBSOUP GMODULE GTHREAD LIBIDN GIO GTK SQLITE ' \ - 'LIBNOTIFY WEBKIT LIBXML X11 XSS WS2_32 OPENSSL HILDON HILDON_FM' + 'LIBNOTIFY WEBKIT JAVASCRIPTCOREGTK LIBXML X11 XSS WS2_32 OPENSSL HILDON' \ + 'HILDON_FM' if progressive or Options.commands['check']: obj = bld.new_task_gen ('cc', 'staticlib') diff -urNp midori-0.4.0.orig/wscript midori-0.4.0/wscript --- midori-0.4.0.orig/wscript 2011-08-02 00:06:36.000000000 +0200 +++ midori-0.4.0/wscript 2011-09-22 00:41:01.874000279 +0200 @@ -197,6 +197,7 @@ def configure (conf): conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False) check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args) check_pkg ('webkit-1.0', '1.1.17', args=args) + check_pkg ('javascriptcoregtk-1.0', '1.1.17', args=args) check_pkg ('libsoup-2.4', '2.25.2') conf.define ('HAVE_LIBSOUP_2_25_2', 1) check_pkg ('libsoup-2.4', '2.27.90', False, var='LIBSOUP_2_27_90') ++++++ midori-0.4.0-use-dom-api.patch ++++++ 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 ++++++ midori-0.3.5.tar.bz2 -> midori-0.4.0.tar.bz2 ++++++ ++++ 88710 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
