diff --git a/.gitignore b/.gitignore index 8f359e0..bc5a3e7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ midori-0.2.6.tar.bz2 /midori-0.2.7.tar.bz2 /midori-0.2.8.tar.bz2 /midori-0.2.9.tar.bz2 +/midori-0.3.0.tar.bz2 diff --git a/midori-0.2.9-crasher.patch b/midori-0.2.9-crasher.patch deleted file mode 100644 index b894461..0000000 --- a/midori-0.2.9-crasher.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/midori/midori-view.c b/midori/midori-view.c -index 39172e2..14da6ed 100644 ---- a/midori/midori-view.c -+++ b/midori/midori-view.c -@@ -1629,8 +1629,10 @@ midori_view_ensure_link_uri (MidoriView* view, - - event.x = ex; - event.y = ey; -- katze_object_assign (view->hit_test, webkit_web_view_get_hit_test_result ( -- WEBKIT_WEB_VIEW (view->web_view), &event)); -+ katze_object_assign (view->hit_test, -+ g_object_ref ( -+ webkit_web_view_get_hit_test_result ( -+ WEBKIT_WEB_VIEW (view->web_view), &event))); - katze_assign (view->link_uri, - katze_object_get_string (view->hit_test, "link-uri")); - } diff --git a/midori-0.2.9-docdir.patch b/midori-0.2.9-docdir.patch deleted file mode 100644 index 2b69e10..0000000 --- a/midori-0.2.9-docdir.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- midori-browser.c 2010-10-31 23:20:48.000000000 +0100 -+++ midori-0.2.9/midori/midori-browser.c 2011-01-08 12:51:47.249181998 +0100 -@@ -4526,10 +4526,10 @@ - } - #else - #ifdef DOCDIR -- uri = "file://" DOCDIR "/midori/user/midori.html"; -- if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0) -+ uri = "file://" DOCDIR "/user/midori.html"; -+ if (g_access (DOCDIR "/user/midori.html", F_OK) != 0) - #endif -- uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; -+ uri = "error:nodocs " DOCDIR "/user/midori.html"; - #endif - } - else if (!strncmp ("HelpFAQ", action_name, 7)) diff --git a/midori-0.2.9-libnotify.patch b/midori-0.2.9-libnotify.patch deleted file mode 100644 index 7ade439..0000000 --- a/midori-0.2.9-libnotify.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur midori-0.2.9.orig/midori/midori-app.c midori-0.2.9/midori/midori-app.c ---- midori-0.2.9.orig/midori/midori-app.c 2010-10-31 16:20:48.000000000 -0600 -+++ midori-0.2.9/midori/midori-app.c 2010-11-05 14:00:44.421878802 -0600 -@@ -1204,7 +1204,7 @@ - { - NotifyNotification* note; - -- note = notify_notification_new (title, message, "midori", NULL); -+ note = notify_notification_new (title, message, "midori"); - notify_notification_show (note, NULL); - g_object_unref (note); - } diff --git a/midori.spec b/midori.spec index 9fb9e9b..89bf9b5 100644 --- a/midori.spec +++ b/midori.spec @@ -1,24 +1,17 @@ Name: midori -Version: 0.2.9 -Release: 4%{?dist} +Version: 0.3.0 +Release: 1%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet License: LGPLv2+ URL: http://software.twotoasts.de/?page=midori -Source0: http://archive.xfce.org/src/apps/%{name}/0.2/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/apps/%{name}/0.3/%{name}-%{version}.tar.bz2 ## Fedora-specific: Set the default homepage to start.fedoraproject.org ## instead of Google. Patch0: %{name}-fedora-homepage.patch -Patch1: midori-0.2.9-libnotify.patch -# FIXME: Remove this patch in 0.2.10 because is has recently been fixed in git -# Upstream bug: http://www.twotoasts.de/bugs/index.php?do=details&task_id=1007 -Patch2: midori-0.2.9-docdir.patch -# Already upstreamed in git -# http://git.xfce.org/apps/midori/commit/?id=97a7ae9955d4264f922452d6933f3a0e1e4b03f6 -Patch3: midori-0.2.9-crasher.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,11 +66,6 @@ developing extensions for %{name}. ## Use the system-provided waf, instead of the in-tarball copy. #rm -rf waf %patch0 -b .fedora-homepage -%if 0%{?fedora} >= 15 -%patch1 -p1 -b .libnotify-0.7.0 -%endif -%patch2 -p1 -b .docdir -%patch3 -p1 -b .crasher %build export CFLAGS="%{optflags}" @@ -149,6 +137,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Jan 30 2011 Kevin Fenzi - 0.3.0-1 +- Update to 0.3.0 + * Sun Jan 09 2011 Kevin Fenzi - 0.2.9-4 - Add patch to fix crasher on links. diff --git a/sources b/sources index c1cbd80..00886f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5821d8e31fa944374ed51c09ca4e740 midori-0.2.9.tar.bz2 +ad1cf5449331fa800001c06765341219 midori-0.3.0.tar.bz2