diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog | 49 | ||||
| -rw-r--r-- | katze/katze-arrayaction.c | 2 | ||||
| -rw-r--r-- | midori/midori-view.c | 2 | ||||
| -rwxr-xr-x | tools/release | 11 | ||||
| -rw-r--r-- | win32/makedist/midori.nsi | 2 |
6 files changed, 60 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 426d9b34..4031d56f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ project(midori C) add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"") add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"") -set(VERSION 0.5.9) +set(VERSION 0.5.10) add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"") string(REPLACE "." ";" VERSION_LIST ${VERSION}) @@ -1,5 +1,54 @@ This file is licensed under the terms of the expat license, see the file EXPAT. +v0.5.10 + use exit instead of return in license script + Fix HAVE_GCR guards after GtkPopover port + Remove example app and .desktop before creating it in the unit test + Fix cache dir path in Adblock and always mkdir tmp + Port location action from Granite.PopOver to Gtk.Popover + Match https site when user-style is using domain syntax + Always disable developer tools on Win32 + Reimplement Midori.URI.unescape and add various tests + Make the inspector resizable with GTK3 by packing into a GtkScrolledWindow + Don't build tabs2one in release builds + Don't assume GNotification works on Win32 + update copyright date in About dialog + Don't entity-escape history and bookmark results in location completion + Only set tabs' error state if errors come from the main frame + Implement Paste and Proceed as an action + No Gcr on Win for the moment + Yet another Speed Dial CSS update: + Port bookmark popover from Granite to Gtk.Popover + Make application choosers resizable with a sane default size + Use GNotification >= 2.40 and use Midori.App API in webmedia + Rework mouse button handling in KatzeArrayAction + Don't bind :day in HistoryDatabase.query + Make GCR mandatory for all builds + Update coub support in mediaHerald + history-list: Fix gtk+3 build caused by dropping "using Gtk;" + Drop all remaining usages of "using *;" + Don't open search engines menu when clearing search action + Only remove apps in the sidepanel when left-clicking the delete icon + Improve robustness of GTK3-compatibility placeholder text fallback + Clean up vapi dependency + tls_flags from webkit_web_view_get_tls_info need to be 0 + Don't add failed pages to history + Throw error for wrong paramter in Statement.bind + Replace NoJS "allow all pages" setting with "allow local pages" + Avoid bugs due to race condition in addons delete dialog + Calculate transfer progress at regular intervals to fix 0B/s bug and recalcitrant progess bars + Fix warnings occurring with EXTRA_WARNINGS + Escape parentheses in adblock_fixup_regexp() + Use File.query_exist() on win32 when checking for db to attach + Handle _NEW_WINDOW_ACTION explicitly to make _blank targets work + Fix undefined behavior uint in mouse gestures + fix JavaScript keyup event by calling inherited key-release-event handler in MidoriBrowser + Inline renaming of speed dials + Handle current_size and last_size of Download being equal + Add proper copyright headers to element_hider and autosuggestcontrol + Add X-GNOME-UsesNotifications to indicate the use of notifications + Fix typo in Bookmarks menu UI definition + v0.5.9 Remove dead code from browser and preferences Build-fix: Make PanedAction's Child.widget public diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 76103b7d..354dcd39 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -165,7 +165,7 @@ katze_array_action_class_init (KatzeArrayActionClass* class) * * An item was activated and should be opened in a new tab. * - * Since: 0.6.0 + * Since: 0.5.10 **/ signals[ACTIVATE_ITEM_NEW_TAB] = g_signal_new ("activate-item-new-tab", G_TYPE_FROM_CLASS (class), diff --git a/midori/midori-view.c b/midori/midori-view.c index 168a4773..a5cfa881 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -3561,7 +3561,7 @@ midori_view_web_inspector_attach_window_cb (gpointer inspector, * * Return value: (allow-none): the widget containing the inspector, or NULL. * - * Since: 0.6.0 + * Since: 0.5.10 */ static GtkWidget* midori_view_web_inspector_get_parent (gpointer inspector) diff --git a/tools/release b/tools/release index 41939e8b..e207aa68 100755 --- a/tools/release +++ b/tools/release @@ -10,7 +10,8 @@ # See the file COPYING for the full license text. OLDVER=$(grep -r --color=no '^set(VERSION' CMakeLists.txt | sed -r "s@.+ ([0-9.]+)\)@\1@") -NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))") +NEWVER="$2" +test -z "$NEWVER" && NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))") if [ "x$1" = "xbefore" ]; then echo Bumping from $OLDVER to $NEWVER sed -i "s@$OLDVER@$NEWVER@g" CMakeLists.txt win32/makedist/midori.nsi @@ -27,10 +28,12 @@ if [ "x$1" = "xbefore" ]; then rm ChangeLog.old curl http://wiki.xfce.org/_export/raw/midori/contribute | \ sed -r 's@\[\[([^|]+)\|([^]]+)\]\]@\1 \2@g' | \ - sed -r 's@<code( bash|)>|</code>@@g' > HACKING + sed -r 's@<code( bash|)>|</code>@@g' > HACKING.new + test -s HACKING.new && mv HACKING{.new,} || rm HACKING.new curl http://wiki.xfce.org/_export/xhtml/midori/faq | \ sed 's@This is a list of frequently asked questions@This is <a href="http://wiki.xfce.org/midori/faq">a snapshot of the online FAQ</a>@g' | \ - sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html + sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html.new + test -s data/faq.html.new && mv data/faq.html{.new,} || rm data/faq.html.new echo -n bzr commit -p -m "'Bump version to $NEWVER'" case $SHELL in *fish*) @@ -49,6 +52,6 @@ elif [ "x$1" = "xafter" ]; then echo bzr branch lp:~mgiuca/+junk/launchpad-tools fi else - echo 'Usage: ['$(basename $0)']' 'before|after' + echo 'Usage: ['$(basename $0)']' 'before|after' [NEW VERSION] exit 1 fi diff --git a/win32/makedist/midori.nsi b/win32/makedist/midori.nsi index fb7c0254..feeab278 100644 --- a/win32/makedist/midori.nsi +++ b/win32/makedist/midori.nsi @@ -21,7 +21,7 @@ RequestExecutionLevel admin ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Midori" -!define PRODUCT_VERSION "0.5.9" +!define PRODUCT_VERSION "0.5.10" !define PRODUCT_BUILD "0" !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" !define PRODUCT_PUBLISHER "Christian Dywan" |