diff --git a/.gitignore b/.gitignore index 0fa0487..f390077 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ midori-0.2.6.tar.bz2 /midori-0.4.5.tar.bz2 /midori-0.4.6.tar.bz2 /midori-0.4.7.tar.bz2 +/midori-0.4.8.tar.bz2 diff --git a/midori-0.4.7-desktop.patch b/midori-0.4.7-desktop.patch deleted file mode 100644 index 66be00b..0000000 --- a/midori-0.4.7-desktop.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur midori-0.4.0.orig/data/midori.desktop.in midori-0.4.0/data/midori.desktop.in ---- midori-0.4.0.orig/data/midori.desktop.in 2011-08-01 16:06:36.000000000 -0600 -+++ midori-0.4.0/data/midori.desktop.in 2011-08-01 17:34:30.965932030 -0600 -@@ -15,19 +15,3 @@ StartupNotify=true - X-Osso-Type=application/x-executable - X-Osso-Service=midori - X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private -- --[TabNew Shortcut Group] --_Name=New Tab --Exec=midori -e TabNew --TargetEnvironment=Unity -- --[WindowNew Shortcut Group] --_Name=New Window --Exec=midori -e WindowNew --TargetEnvironment=Unity -- --[Private Shortcut Group] --_Name=New Private Browsing Window --Exec=midori --private --TargetEnvironment=Unity -- diff --git a/midori-0.4.7-private.patch b/midori-0.4.7-private.patch deleted file mode 100644 index 2673264..0000000 --- a/midori-0.4.7-private.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up midori-0.4.7/katze/midori-paths.vala.private midori-0.4.7/katze/midori-paths.vala ---- midori-0.4.7/katze/midori-paths.vala.private 2012-10-18 11:19:47.000000000 +0200 -+++ midori-0.4.7/katze/midori-paths.vala 2012-10-18 12:25:48.833756721 +0200 -@@ -79,6 +79,9 @@ namespace Midori { - config_dir = cache_dir = user_data_dir = "/"; - readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_user_config_dir (), PACKAGE_NAME); -+ cache_dir = Path.build_path (Path.DIR_SEPARATOR_S, -+ Environment.get_user_cache_dir (), PACKAGE_NAME); -+ user_data_dir = Environment.get_user_data_dir (); - tmp_dir = Path.build_path (Path.DIR_SEPARATOR_S, - Environment.get_tmp_dir (), "midori-" + Environment.get_user_name ()); - } -@@ -97,15 +100,15 @@ namespace Midori { - } - } - -- public static unowned string get_config_dir () { -- assert (config_dir != null); -- return config_dir; -+ public static string get_config_dir () { -+ assert (mode != RuntimeMode.UNDEFINED); -+ return readonly_dir ?? config_dir; - } - - public static string get_config_filename (string filename) { - assert (mode != RuntimeMode.UNDEFINED); -- assert (config_dir != null); -- return Path.build_path (Path.DIR_SEPARATOR_S, config_dir, filename); -+ return Path.build_path (Path.DIR_SEPARATOR_S, -+ readonly_dir ?? config_dir, filename); - } - - public static unowned string get_cache_dir () { -@@ -226,7 +229,7 @@ namespace Midori { - } - - public static string get_preset_filename (string? folder, string filename) { -- assert (config_dir != null); -+ assert (exec_path != null); - - #if HAVE_WIN32 - return Path.build_filename (exec_path, "etc", "xdg", PACKAGE_NAME, folder ?? "", filename); diff --git a/midori.spec b/midori.spec index dca7371..d325255 100644 --- a/midori.spec +++ b/midori.spec @@ -1,6 +1,6 @@ Name: midori -Version: 0.4.7 -Release: 2%{?dist} +Version: 0.4.8 +Release: 1%{?dist} Summary: A lightweight GTK+ web browser Group: Applications/Internet @@ -11,11 +11,9 @@ Source0: http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2 ## Fedora-specific: Set the default homepage to start.fedoraproject.org ## instead of Google. -Patch0: %{name}-0.4.7-homepage.patch +Patch0: midori-0.4.7-homepage.patch # Remove the private browsing extension group. It's not up to spec -Patch1: midori-0.4.7-desktop.patch -# Fix private browsing crash. -Patch2: midori-0.4.7-private.patch +Patch1: midori-0.4.8-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,7 +67,6 @@ developing extensions for %{name}. #rm -rf waf %patch0 -b .fedora-homepage %patch1 -p1 -b .desktop -%patch2 -p1 -b .private %build export CFLAGS="%{optflags}" @@ -78,6 +75,7 @@ export CFLAGS="%{optflags}" --docdir=%{_docdir}/%{name}-%{version} \ --libdir=%{_libdir} \ --enable-apidocs \ + --disable-zeitgeist \ configure ./waf %{?_smp_mflags} build @@ -138,6 +136,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Tue Feb 05 2013 Kevin Fenzi 0.4.8-1 +- Update to 0.4.8 + * Wed Jan 09 2013 Kevin Fenzi 0.4.7-2 - Add patch to fix private browsing crash. Fixes bug #872393 diff --git a/sources b/sources index 3df4d74..125d827 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06db7b88a41e9b2265728960d5e98f35 midori-0.4.7.tar.bz2 +ce1b01fa5aa33d2ee50196df0c71e96f midori-0.4.8.tar.bz2