Merge lp:~midori/midori/release0.5.6 into lp:midori
- release0.5.6
- Merge into trunk
Proposed by
Cris Dywan
Status: | Merged |
---|---|
Approved by: | Paweł Forysiuk |
Approved revision: | 6491 |
Merged at revision: | 6489 |
Proposed branch: | lp:~midori/midori/release0.5.6 |
Merge into: | lp:midori |
Diff against target: |
519 lines (+180/-61) 6 files modified
CMakeLists.txt (+1/-1) ChangeLog (+97/-0) HACKING (+26/-19) data/faq.html (+52/-38) tools/release (+3/-2) win32/makedist/midori.nsi (+1/-1) |
To merge this branch: | bzr merge lp:~midori/midori/release0.5.6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Paweł Forysiuk | Approve | ||
André Stösel | Approve | ||
Review via email: mp+195881@code.launchpad.net |
Commit message
Bump version to 0.5.6
Description of the change
To post a comment you must log in.
Revision history for this message
André Stösel (ivaldi) : | # |
review:
Approve
lp:~midori/midori/release0.5.6
updated
- 6491. By Cris Dywan
-
Include wiki changes and one more merged change
Revision history for this message
Paweł Forysiuk (tuxator) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CMakeLists.txt' | |||
2 | --- CMakeLists.txt 2013-11-12 21:01:59 +0000 | |||
3 | +++ CMakeLists.txt 2013-11-20 00:14:10 +0000 | |||
4 | @@ -11,7 +11,7 @@ | |||
5 | 11 | add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"") | 11 | add_definitions("-DPACKAGE_NAME=\"${CMAKE_PROJECT_NAME}\"") |
6 | 12 | add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"") | 12 | add_definitions("-DPACKAGE_BUGREPORT=\"https://bugs.launchpad.net/midori\"") |
7 | 13 | 13 | ||
9 | 14 | set(VERSION 0.5.5) | 14 | set(VERSION 0.5.6) |
10 | 15 | add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"") | 15 | add_definitions("-DMIDORI_VERSION_SUFFIX=\"${VERSION}\"") |
11 | 16 | 16 | ||
12 | 17 | string(REPLACE "." ";" VERSION_LIST ${VERSION}) | 17 | string(REPLACE "." ";" VERSION_LIST ${VERSION}) |
13 | 18 | 18 | ||
14 | === modified file 'ChangeLog' | |||
15 | --- ChangeLog 2013-08-14 17:57:02 +0000 | |||
16 | +++ ChangeLog 2013-11-20 00:14:10 +0000 | |||
17 | @@ -1,5 +1,102 @@ | |||
18 | 1 | This file is licensed under the terms of the expat license, see the file EXPAT. | 1 | This file is licensed under the terms of the expat license, see the file EXPAT. |
19 | 2 | 2 | ||
20 | 3 | v0.5.6: | ||
21 | 4 | instead of creating devpet status icon on extension load, create it only to show new messages | ||
22 | 5 | Open speed dial or homepage according to preference | ||
23 | 6 | handle tab duplication | ||
24 | 7 | Add copyright note to appdata file | ||
25 | 8 | Tweak searching for resources when running from build folder | ||
26 | 9 | Swap NULL-check with main frame check | ||
27 | 10 | Use correct signal when clearing the trash | ||
28 | 11 | Hide WEbGL preference if it is unavailable | ||
29 | 12 | Remove stored popup sessions from the database | ||
30 | 13 | Check all browsers for opened sessions and whether they're popups | ||
31 | 14 | removed unused preference dialog and related code | ||
32 | 15 | Fix check for found valac and mention VALAC variable | ||
33 | 16 | Fix autoscrolling if page contains a frame with our custom error page | ||
34 | 17 | Don't use context-menu signal in WebKitGTK+ < 1.10.0 | ||
35 | 18 | Fix building on Ubuntu 12.04 | ||
36 | 19 | Reset item ids when re-importing bookmarks | ||
37 | 20 | Check path being NULL in export before trying to inspect it | ||
38 | 21 | restore the last closed sessions if no session is opened | ||
39 | 22 | Cast WebKitDOMHtmlElement for getting source content | ||
40 | 23 | Use font-set signal and font family for GTK+ 3.2 font chooser | ||
41 | 24 | add function to view dom source | ||
42 | 25 | remove unused variable | ||
43 | 26 | Resolve compiler warnings in current trunk | ||
44 | 27 | Update win32-release script for cmake, move unused docs/scripts to old folder | ||
45 | 28 | Try to handle previous runs of cmake in configure wrapper | ||
46 | 29 | Correct view source assertions in tab unit test | ||
47 | 30 | Build fix: found undeclared in midori_bookmarks_db_remove_item_recursive | ||
48 | 31 | Cache bookmark items to avoid their recreation on database reads | ||
49 | 32 | allow "view source" on about pages | ||
50 | 33 | Enable old target policy on cmake < 2.8.8 | ||
51 | 34 | Re-arrange data file installing to be more explicit | ||
52 | 35 | option to modify the number of tabs which will be restored in each idle callback | ||
53 | 36 | Implement MidoriBookmarksDatabase class by inheritence from MidoriDatabase | ||
54 | 37 | Ensure tab spinners update as often as the menubar spinner to avoid desync | ||
55 | 38 | Use tabby sorting increment when importing session.xbel tabs | ||
56 | 39 | Only install config files to /etc if prefix equals /usr | ||
57 | 40 | handle urls as argument when starting midori | ||
58 | 41 | Make tabby compile with Webkit2 | ||
59 | 42 | Drop waf build system and provide cmake-based "configure" script | ||
60 | 43 | midori_panel_action_activate_cb forgot to update the action group | ||
61 | 44 | Fixes bug where certificate Security overlay failed to close | ||
62 | 45 | handle tab movement | ||
63 | 46 | add tab sorting | ||
64 | 47 | Untangle implicit GTK+3 for Granite and WebKit2 | ||
65 | 48 | Allow running test under debug tools with cmake | ||
66 | 49 | Install config files to /etc when install prefix is /usr | ||
67 | 50 | Add missing PO_FILES argument to GETTEXT_PROCESS_PO_FILES | ||
68 | 51 | Add USE_APIDOCS to build API docs with CMake | ||
69 | 52 | Rasterize SVG to PNG with rsvg-convert | ||
70 | 53 | fix bookmarks test regression after fix-1179200-4 | ||
71 | 54 | Add CMakeLists.txt for config directory | ||
72 | 55 | Install mo files in locale dir | ||
73 | 56 | don't change uri/title if the tab isn't loaded | ||
74 | 57 | use a separate signal to store the tab title | ||
75 | 58 | Check if execinfo.h header exists on BSD | ||
76 | 59 | fix endless loop in Midori.Database.init | ||
77 | 60 | Use destructive-action style class in ClearPrivateData | ||
78 | 61 | Initialize priv->element to avoid crash when freeing | ||
79 | 62 | Introduces KatzeArray::update-item to handle metadata changes | ||
80 | 63 | Refactor excuting schema from file into a function | ||
81 | 64 | Use stock as string in liststore | ||
82 | 65 | Drop needless (and wrong) HAVE_LIBNOTIFY in preferences | ||
83 | 66 | Flip horizontal position of the overlay when hit by the mouse | ||
84 | 67 | Add Midori.URI.get_base_domain and use it in NoJS | ||
85 | 68 | Introduce Midori.Database and use for history and tabby | ||
86 | 69 | ctrl+shift+w should trigger a delete-event | ||
87 | 70 | Implement dialog windows opened via javascript | ||
88 | 71 | Make get_res_filename work with different hierarchies | ||
89 | 72 | fix check for new database | ||
90 | 73 | Speed up session import | ||
91 | 74 | Import tab title from old sessions | ||
92 | 75 | Separate CFLAGS for C and add missing HAVE_ | ||
93 | 76 | Install top-level text files and FAQ html/ css to doc dir | ||
94 | 77 | Provide and install .appdata.xml file for app stores | ||
95 | 78 | Move bookmarks db handling to midori-bookmarks-db | ||
96 | 79 | Add XSS to OPTS_LIBRARIES | ||
97 | 80 | Update condition for UBUNTU_MENUPROXY to work on Saucy | ||
98 | 81 | Introduce tabby, the new session manager | ||
99 | 82 | Fix typo in katze_item_set_meta_integer call | ||
100 | 83 | Allow bookmark bar update on additions resulting from imports | ||
101 | 84 | Re-work midori_array_query_recursive to not include folder items twice | ||
102 | 85 | Fix syntax of icon sizes passed to foreach | ||
103 | 86 | Add bzr revision number to version if available | ||
104 | 87 | Unify nojs and cookie policy dialogs, make policy changeable within the list | ||
105 | 88 | Drop all G_ENABLE_DEBUG guards | ||
106 | 89 | Add -g to CFLAGS to enable debugging symbols | ||
107 | 90 | Adjust cmake build for Win32 | ||
108 | 91 | Implement CMake build setup | ||
109 | 92 | Port MidoriApp from Unique/ sockets to GApplication | ||
110 | 93 | New signal about-content to provide content for about uris | ||
111 | 94 | Check if browser is NULL in midori_view_get_tab_menu to prevent a crash. Fixes bug #1215652. | ||
112 | 95 | Ensure proxy setting widgets callbacks don't outlive the widgets themselves | ||
113 | 96 | Fix webkit2 build error | ||
114 | 97 | Show the bookmarks import location combobox. | ||
115 | 98 | Rename internal completion URLs to avoid confusion | ||
116 | 99 | |||
117 | 3 | v0.5.5: | 100 | v0.5.5: |
118 | 4 | Fix name and text fields inversion in XBEL folder import | 101 | Fix name and text fields inversion in XBEL folder import |
119 | 5 | Correct packing of cookie and nojs permission dialog. | 102 | Correct packing of cookie and nojs permission dialog. |
120 | 6 | 103 | ||
121 | === modified file 'HACKING' | |||
122 | --- HACKING 2013-08-14 17:57:02 +0000 | |||
123 | +++ HACKING 2013-11-20 00:14:10 +0000 | |||
124 | @@ -22,38 +22,45 @@ | |||
125 | 22 | * https://www.bountysource.com/#trackers/130181-midori Add a bounty for a feature or bug you'd like to support | 22 | * https://www.bountysource.com/#trackers/130181-midori Add a bounty for a feature or bug you'd like to support |
126 | 23 | * https://translations.launchpad.net/midori/trunk/+pots/trunk Translate to your own language | 23 | * https://translations.launchpad.net/midori/trunk/+pots/trunk Translate to your own language |
127 | 24 | * https://github.com/eustasy/midori-browser.org/issues Report website bugs | 24 | * https://github.com/eustasy/midori-browser.org/issues Report website bugs |
128 | 25 | * Write tutorial your own extension - granted that's code, too, but maybe a little easier than hacking the core. | ||
129 | 25 | ====== Build the code ====== | 26 | ====== Build the code ====== |
130 | 26 | 27 | ||
134 | 27 | ./waf configure --prefix=/usr | 28 | mkdir _build |
135 | 28 | ./waf build | 29 | cd _build |
136 | 29 | sudo ./waf install | 30 | cmake -DCMAKE_INSTALL_PREFIX=/usr .. |
137 | 31 | make | ||
138 | 32 | sudo make install | ||
139 | 33 | |||
140 | 34 | //Advanced Tip: Pass "-G Ninja" to cmake to use http://martine.github.io/ninja/ Ninja instead of make (usually packaged as ninja or ninja-build).// | ||
141 | 35 | |||
142 | 36 | If using GTK+3 you'll want to add -DUSE_GTK3=1 to the cmake command line. | ||
143 | 30 | 37 | ||
144 | 31 | Midori can be **run without being installed**. | 38 | Midori can be **run without being installed**. |
145 | 32 | 39 | ||
147 | 33 | _build/default/midori/midori | 40 | _build/midori/midori |
148 | 34 | 41 | ||
149 | 35 | You can use a **temporary folder for testing** without affecting normal settings | 42 | You can use a **temporary folder for testing** without affecting normal settings |
150 | 36 | 43 | ||
152 | 37 | _build/default/midori/midori -c /tmp/midoridev | 44 | _build/midori/midori -c /tmp/midoridev |
153 | 38 | 45 | ||
154 | 39 | You'll want to **unit test** the code if you're testing a new version or contributed your own changes: | 46 | You'll want to **unit test** the code if you're testing a new version or contributed your own changes: |
155 | 40 | 47 | ||
157 | 41 | xvfb-run ./waf check | 48 | xvfb-run make check |
158 | 42 | 49 | ||
159 | 43 | Automated daily builds in Launchpad (https://launchpad.net/~elementary-os/+archive/daily ppa:elementary-os/daily and https://launchpad.net/~midori/+archive/midori-dev ppa:midori/midori-dev) run these tests as well. | 50 | Automated daily builds in Launchpad (https://launchpad.net/~elementary-os/+archive/daily ppa:elementary-os/daily and https://launchpad.net/~midori/+archive/midori-dev ppa:midori/midori-dev) run these tests as well. |
160 | 44 | ====== Debugging issues ====== | 51 | ====== Debugging issues ====== |
161 | 45 | 52 | ||
162 | 46 | Testing an installed release may reveal crashers or memory corruption which require investigating from a local build and obtaining a stacktrace (backtrace, crash log). | 53 | Testing an installed release may reveal crashers or memory corruption which require investigating from a local build and obtaining a stacktrace (backtrace, crash log). |
163 | 47 | 54 | ||
165 | 48 | _build/default/midori/midori -g [OPTIONAL ARGUMENTS] | 55 | _build/midori/midori -g [OPTIONAL ARGUMENTS] |
166 | 49 | 56 | ||
167 | 50 | If the problem is a warning, not a crash GLib has a handy feature | 57 | If the problem is a warning, not a crash GLib has a handy feature |
168 | 51 | 58 | ||
170 | 52 | env G_DEBUG=all _build/default/midori/midori -g | 59 | env G_DEBUG=all _build/midori/midori -g |
171 | 53 | 60 | ||
172 | 54 | For more specific debugging output, depending on the feature in question you may use | 61 | For more specific debugging output, depending on the feature in question you may use |
173 | 55 | 62 | ||
175 | 56 | env MIDORI_DEBUG=help _build/default/midori/midori | 63 | env MIDORI_DEBUG=help _build/midori/midori |
176 | 57 | 64 | ||
177 | 58 | To verify a regression you might need to revert a particular change: | 65 | To verify a regression you might need to revert a particular change: |
178 | 59 | 66 | ||
179 | @@ -188,7 +195,7 @@ | |||
180 | 188 | | soup | 2.38.1 | 2.40 | | 195 | | soup | 2.38.1 | 2.40 | |
181 | 189 | | webkit | 1.8.3-1.fc17 | 1.10.0-0ubuntu1 | | 196 | | webkit | 1.8.3-1.fc17 | 1.10.0-0ubuntu1 | |
182 | 190 | ====== Midori with(out) Granite ====== | 197 | ====== Midori with(out) Granite ====== |
184 | 191 | When built with Granite (--enable-granite) there're a few key differences: | 198 | When built with Granite (-DUSE_GRANITE=1 or --enable-granite) there're a few key differences: |
185 | 192 | * Preferences uses a http://valadoc.elementaryos.org/Granite/Granite.Widgets.StaticNotebook.html Granite.Widgets.StaticNotebook | 199 | * Preferences uses a http://valadoc.elementaryos.org/Granite/Granite.Widgets.StaticNotebook.html Granite.Widgets.StaticNotebook |
186 | 193 | * URL completion styling is slightly different | 200 | * URL completion styling is slightly different |
187 | 194 | * Clear Private Data uses **Granite.Widgets.LightWindow** | 201 | * Clear Private Data uses **Granite.Widgets.LightWindow** |
188 | @@ -204,25 +211,26 @@ | |||
189 | 204 | yum install libsoup-devel webkitgtk3-devel sqlite-devel | 211 | yum install libsoup-devel webkitgtk3-devel sqlite-devel |
190 | 205 | 212 | ||
191 | 206 | For cross-compilation | 213 | For cross-compilation |
193 | 207 | yum install mingw{32,64}-webkitgtk3 mingw{32,64}-glib-networking mingw{32,64}-gdb | 214 | yum install mingw{32,64}-webkitgtk3 mingw{32,64}-glib-networking mingw{32,64}-gdb mingw{32,64}-gstreamer-plugins-good |
194 | 208 | 215 | ||
195 | 209 | Packages needed when assembling the archive | 216 | Packages needed when assembling the archive |
197 | 210 | yum install faenza-icon-theme p7zip mingw32-nsis | 217 | yum install faenza-icon-theme p7zip mingw32-nsis greybird-gtk3-theme |
198 | 211 | 218 | ||
199 | 212 | Installing those should get you the packages needed to successfully build and develop Midori for Win32. | 219 | Installing those should get you the packages needed to successfully build and develop Midori for Win32. |
200 | 213 | |||
201 | 214 | ===== Building ===== | 220 | ===== Building ===== |
202 | 215 | For 32-bit builds: | 221 | For 32-bit builds: |
203 | 216 | 222 | ||
206 | 217 | mingw32-env | 223 | mkdir _mingw32 |
207 | 218 | ./configure --enable-gtk3 --prefix=/usr/i686-w64-mingw32/sys-root/mingw/ | 224 | cd _mingw32 |
208 | 225 | mingw32-cmake .. -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=/usr/i686-w64-mingw32/sys-root/mingw -DCMAKE_VERBOSE_MAKEFILE=0 | ||
209 | 219 | make | 226 | make |
210 | 220 | sudo make install | 227 | sudo make install |
211 | 221 | 228 | ||
212 | 222 | For 64-bit builds: | 229 | For 64-bit builds: |
213 | 223 | 230 | ||
216 | 224 | mingw64-env | 231 | mkdir _mingw64 |
217 | 225 | ./configure --enable-gtk3 --prefix=/usr/x86_64-w64-mingw32/sys-root/mingw/ | 232 | cd _mingw64 |
218 | 233 | mingw64-cmake .. -DUSE_ZEITGEIST=0 -DUSE_GTK3=1 -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/sys-root/mingw -DCMAKE_VERBOSE_MAKEFILE=0 | ||
219 | 226 | make | 234 | make |
220 | 227 | sudo make install | 235 | sudo make install |
221 | 228 | 236 | ||
222 | @@ -231,14 +239,13 @@ | |||
223 | 231 | env MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw" ./win32/makedist/makedist.midori | 239 | env MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw" ./win32/makedist/makedist.midori |
224 | 232 | 64-bit build: | 240 | 64-bit build: |
225 | 233 | env MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw/" ./win32/makedist/makedist.midori x64 | 241 | env MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw/" ./win32/makedist/makedist.midori x64 |
226 | 234 | |||
227 | 235 | ===== Testing ===== | 242 | ===== Testing ===== |
228 | 236 | For testing your changes unfortuantely a real system is needed because Midori and WebKitGTK+ don't work properly under Wine. Even if it works some problems are not visible when using Wine, but are present when running under a real Windows system and vice versa. | 243 | For testing your changes unfortuantely a real system is needed because Midori and WebKitGTK+ don't work properly under Wine. Even if it works some problems are not visible when using Wine, but are present when running under a real Windows system and vice versa. |
229 | 237 | 244 | ||
230 | 238 | One way around it is to virtualize Windows on a Linux host and mount your MinGW directories as a network drive or shared folder. | 245 | One way around it is to virtualize Windows on a Linux host and mount your MinGW directories as a network drive or shared folder. |
231 | 239 | 246 | ||
232 | 240 | ====== Jargon ====== | 247 | ====== Jargon ====== |
234 | 241 | * freeze: the 4th week of a 4 week release cycle, bug fixes only | 248 | * freeze: a period of bug fixes only eg. 4/2 cycle means 4 weeks of features and 2 weeks to focus on resolving existing problems |
235 | 242 | * MR: merge request, a branch proposed for review | 249 | * MR: merge request, a branch proposed for review |
236 | 243 | * ninja: an internal tab, usually empty label, used for taking screenshots | 250 | * ninja: an internal tab, usually empty label, used for taking screenshots |
237 | 244 | * fortress: user of an ancient release like 0.4.3 as found on Raspberry Pie, Debian, Ubuntu | 251 | * fortress: user of an ancient release like 0.4.3 as found on Raspberry Pie, Debian, Ubuntu |
238 | 245 | 252 | ||
239 | === modified file 'data/faq.html' | |||
240 | --- data/faq.html 2013-08-14 17:57:02 +0000 | |||
241 | +++ data/faq.html 2013-11-20 00:14:10 +0000 | |||
242 | @@ -4,8 +4,8 @@ | |||
243 | 4 | <meta charset="utf-8" /> | 4 | <meta charset="utf-8" /> |
244 | 5 | <title>midori:faq</title> | 5 | <title>midori:faq</title> |
245 | 6 | <meta name="generator" content="DokuWiki"/> | 6 | <meta name="generator" content="DokuWiki"/> |
248 | 7 | <meta name="robots" content="noindex,nofollow"/> | 7 | <meta name="robots" content="index,follow"/> |
249 | 8 | <meta name="date" content="2013-08-13T17:48:26+0200"/> | 8 | <meta name="date" content="2013-10-18T05:46:11+0200"/> |
250 | 9 | <meta name="keywords" content="midori,faq"/> | 9 | <meta name="keywords" content="midori,faq"/> |
251 | 10 | <link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki"/> | 10 | <link rel="search" type="application/opensearchdescription+xml" href="/lib/exe/opensearch.php" title="Xfce Wiki"/> |
252 | 11 | <link rel="start" href="/"/> | 11 | <link rel="start" href="/"/> |
253 | @@ -169,6 +169,18 @@ | |||
254 | 169 | The set of themed icons Midori can use is very limited. For instance icons for a new tab or the throbber are not guaranteed to be available. To fix this, install a Freedesktop.org <abbr title="specification">spec</abbr> compliant icon theme, such as Elementary, Faenza, Buuf or GNOME. | 169 | The set of themed icons Midori can use is very limited. For instance icons for a new tab or the throbber are not guaranteed to be available. To fix this, install a Freedesktop.org <abbr title="specification">spec</abbr> compliant icon theme, such as Elementary, Faenza, Buuf or GNOME. |
255 | 170 | </p> | 170 | </p> |
256 | 171 | 171 | ||
257 | 172 | <p> | ||
258 | 173 | if you need to set a custom path for these to be “searched in” (Kiosks and embedded devices for example): | ||
259 | 174 | </p> | ||
260 | 175 | |||
261 | 176 | <p> | ||
262 | 177 | XDG_DATA_HOME=/path/to/location | ||
263 | 178 | </p> | ||
264 | 179 | |||
265 | 180 | <p> | ||
266 | 181 | will add an extra path for the icons/.. directory | ||
267 | 182 | </p> | ||
268 | 183 | |||
269 | 172 | </div> | 184 | </div> |
270 | 173 | 185 | ||
271 | 174 | <h4 id="tweaking_midori_on_the_gtk_level">Tweaking Midori on the Gtk level</h4> | 186 | <h4 id="tweaking_midori_on_the_gtk_level">Tweaking Midori on the Gtk level</h4> |
272 | @@ -238,7 +250,7 @@ | |||
273 | 238 | </p> | 250 | </p> |
274 | 239 | 251 | ||
275 | 240 | </div> | 252 | </div> |
277 | 241 | <!-- EDIT3 SECTION "Common problems" [1189-3545] --> | 253 | <!-- EDIT3 SECTION "Common problems" [1189-3737] --> |
278 | 242 | <h2 class="sectionedit4" id="security_features">Security features</h2> | 254 | <h2 class="sectionedit4" id="security_features">Security features</h2> |
279 | 243 | <div class="level2"> | 255 | <div class="level2"> |
280 | 244 | 256 | ||
281 | @@ -283,7 +295,7 @@ | |||
282 | 283 | </p> | 295 | </p> |
283 | 284 | 296 | ||
284 | 285 | </div> | 297 | </div> |
286 | 286 | <!-- EDIT4 SECTION "Security features" [3546-4763] --> | 298 | <!-- EDIT4 SECTION "Security features" [3738-4955] --> |
287 | 287 | <h2 class="sectionedit5" id="flash_doesn_t_work">Flash doesn't work</h2> | 299 | <h2 class="sectionedit5" id="flash_doesn_t_work">Flash doesn't work</h2> |
288 | 288 | <div class="level2"> | 300 | <div class="level2"> |
289 | 289 | 301 | ||
290 | @@ -322,9 +334,11 @@ | |||
291 | 322 | <p> | 334 | <p> |
292 | 323 | nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can't crash the whole browser and Flash, which is GTK+2 can run in GTK+3. | 335 | nspluginwrapper is a program that runs Flash and other Netscape plugins in a separate process. So a crash can't crash the whole browser and Flash, which is GTK+2 can run in GTK+3. |
293 | 324 | </p> | 336 | </p> |
297 | 325 | <pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer nspluginwrapper | 337 | <pre class="code bash"><span class="kw2">sudo</span> <span class="kw2">apt-get install</span> nspluginwrapper |
298 | 326 | <span class="kw2">sudo</span> nspluginwrapper <span class="re5">-i</span> <span class="sy0">/</span>usr<span class="sy0">/</span>lib<span class="sy0">/</span>flashplugin-installer<span class="sy0">/</span>libflashplayer.so | 338 | <span class="co0"># On Debian/ Ubuntu - on other systems http://get.adobe.com/de/flashplayer/</span> |
299 | 327 | nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span></pre> | 339 | <span class="kw2">sudo</span> <span class="kw2">apt-get install</span> flashplugin-installer |
300 | 340 | <span class="co0"># cd into the folder where the plugin was installed</span> | ||
301 | 341 | nspluginwrapper <span class="re5">-v</span> <span class="re5">-a</span> <span class="re5">-n</span> <span class="re5">-i</span> libflashplayer.so</pre> | ||
302 | 328 | 342 | ||
303 | 329 | <p> | 343 | <p> |
304 | 330 | ~/.mozilla can also be used with Adobe's tarball if system-wide install is not an option. The approach is confirmed to work with x86-64 as well. | 344 | ~/.mozilla can also be used with Adobe's tarball if system-wide install is not an option. The approach is confirmed to work with x86-64 as well. |
305 | @@ -612,12 +626,12 @@ | |||
306 | 612 | </p> | 626 | </p> |
307 | 613 | 627 | ||
308 | 614 | </div> | 628 | </div> |
310 | 615 | <!-- EDIT5 SECTION "Flash doesn't work" [4764-13226] --> | 629 | <!-- EDIT5 SECTION "Flash doesn't work" [4956-13512] --> |
311 | 616 | <h1 class="sectionedit6" id="privacy">Privacy</h1> | 630 | <h1 class="sectionedit6" id="privacy">Privacy</h1> |
312 | 617 | <div class="level1"> | 631 | <div class="level1"> |
313 | 618 | 632 | ||
314 | 619 | </div> | 633 | </div> |
316 | 620 | <!-- EDIT6 SECTION "Privacy" [13227-13249] --> | 634 | <!-- EDIT6 SECTION "Privacy" [13513-13535] --> |
317 | 621 | <h2 class="sectionedit7" id="blacklist_cookies">Blacklist cookies</h2> | 635 | <h2 class="sectionedit7" id="blacklist_cookies">Blacklist cookies</h2> |
318 | 622 | <div class="level2"> | 636 | <div class="level2"> |
319 | 623 | 637 | ||
320 | @@ -643,7 +657,7 @@ | |||
321 | 643 | </p> | 657 | </p> |
322 | 644 | 658 | ||
323 | 645 | </div> | 659 | </div> |
325 | 646 | <!-- EDIT7 SECTION "Blacklist cookies" [13250-13786] --> | 660 | <!-- EDIT7 SECTION "Blacklist cookies" [13536-14072] --> |
326 | 647 | <h2 class="sectionedit8" id="adblock">Adblock</h2> | 661 | <h2 class="sectionedit8" id="adblock">Adblock</h2> |
327 | 648 | <div class="level2"> | 662 | <div class="level2"> |
328 | 649 | 663 | ||
329 | @@ -652,12 +666,12 @@ | |||
330 | 652 | </p> | 666 | </p> |
331 | 653 | 667 | ||
332 | 654 | </div> | 668 | </div> |
334 | 655 | <!-- EDIT8 SECTION "Adblock" [13787-14042] --> | 669 | <!-- EDIT8 SECTION "Adblock" [14073-14328] --> |
335 | 656 | <h1 class="sectionedit9" id="modes">Modes</h1> | 670 | <h1 class="sectionedit9" id="modes">Modes</h1> |
336 | 657 | <div class="level1"> | 671 | <div class="level1"> |
337 | 658 | 672 | ||
338 | 659 | </div> | 673 | </div> |
340 | 660 | <!-- EDIT9 SECTION "Modes" [14043-14063] --> | 674 | <!-- EDIT9 SECTION "Modes" [14329-14349] --> |
341 | 661 | <h2 class="sectionedit10" id="web_applications">Web Applications</h2> | 675 | <h2 class="sectionedit10" id="web_applications">Web Applications</h2> |
342 | 662 | <div class="level2"> | 676 | <div class="level2"> |
343 | 663 | 677 | ||
344 | @@ -678,7 +692,7 @@ | |||
345 | 678 | </p> | 692 | </p> |
346 | 679 | 693 | ||
347 | 680 | </div> | 694 | </div> |
349 | 681 | <!-- EDIT10 SECTION "Web Applications" [14064-14580] --> | 695 | <!-- EDIT10 SECTION "Web Applications" [14350-14866] --> |
350 | 682 | <h2 class="sectionedit11" id="private_browsing">Private Browsing</h2> | 696 | <h2 class="sectionedit11" id="private_browsing">Private Browsing</h2> |
351 | 683 | <div class="level2"> | 697 | <div class="level2"> |
352 | 684 | 698 | ||
353 | @@ -704,7 +718,7 @@ | |||
354 | 704 | </p> | 718 | </p> |
355 | 705 | 719 | ||
356 | 706 | </div> | 720 | </div> |
358 | 707 | <!-- EDIT11 SECTION "Private Browsing" [14581-15500] --> | 721 | <!-- EDIT11 SECTION "Private Browsing" [14867-15786] --> |
359 | 708 | <h2 class="sectionedit12" id="portable_modewin32">Portable mode/ Win32</h2> | 722 | <h2 class="sectionedit12" id="portable_modewin32">Portable mode/ Win32</h2> |
360 | 709 | <div class="level2"> | 723 | <div class="level2"> |
361 | 710 | 724 | ||
362 | @@ -713,7 +727,7 @@ | |||
363 | 713 | </p> | 727 | </p> |
364 | 714 | 728 | ||
365 | 715 | </div> | 729 | </div> |
367 | 716 | <!-- EDIT12 SECTION "Portable mode/ Win32" [15501-15814] --> | 730 | <!-- EDIT12 SECTION "Portable mode/ Win32" [15787-16100] --> |
368 | 717 | <h2 class="sectionedit13" id="kiosk_mode">Kiosk mode</h2> | 731 | <h2 class="sectionedit13" id="kiosk_mode">Kiosk mode</h2> |
369 | 718 | <div class="level2"> | 732 | <div class="level2"> |
370 | 719 | 733 | ||
371 | @@ -745,7 +759,7 @@ | |||
372 | 745 | </p> | 759 | </p> |
373 | 746 | 760 | ||
374 | 747 | </div> | 761 | </div> |
376 | 748 | <!-- EDIT13 SECTION "Kiosk mode" [15815-16852] --> | 762 | <!-- EDIT13 SECTION "Kiosk mode" [16101-17138] --> |
377 | 749 | <h2 class="sectionedit14" id="always_open_midori_in_fullscreen">Always open Midori in Fullscreen</h2> | 763 | <h2 class="sectionedit14" id="always_open_midori_in_fullscreen">Always open Midori in Fullscreen</h2> |
378 | 750 | <div class="level2"> | 764 | <div class="level2"> |
379 | 751 | 765 | ||
380 | @@ -778,7 +792,7 @@ | |||
381 | 778 | </p> | 792 | </p> |
382 | 779 | 793 | ||
383 | 780 | </div> | 794 | </div> |
385 | 781 | <!-- EDIT14 SECTION "Always open Midori in Fullscreen" [16853-17380] --> | 795 | <!-- EDIT14 SECTION "Always open Midori in Fullscreen" [17139-17666] --> |
386 | 782 | <h2 class="sectionedit15" id="overriding_settings_and_loading_extensions">Overriding settings and loading extensions</h2> | 796 | <h2 class="sectionedit15" id="overriding_settings_and_loading_extensions">Overriding settings and loading extensions</h2> |
387 | 783 | <div class="level2"> | 797 | <div class="level2"> |
388 | 784 | 798 | ||
389 | @@ -795,7 +809,7 @@ | |||
390 | 795 | </p> | 809 | </p> |
391 | 796 | 810 | ||
392 | 797 | </div> | 811 | </div> |
394 | 798 | <!-- EDIT15 SECTION "Overriding settings and loading extensions" [17381-17588] --> | 812 | <!-- EDIT15 SECTION "Overriding settings and loading extensions" [17667-17874] --> |
395 | 799 | <h1 class="sectionedit16" id="proxy_servers">Proxy servers</h1> | 813 | <h1 class="sectionedit16" id="proxy_servers">Proxy servers</h1> |
396 | 800 | <div class="level1"> | 814 | <div class="level1"> |
397 | 801 | 815 | ||
398 | @@ -879,7 +893,7 @@ | |||
399 | 879 | </ol> | 893 | </ol> |
400 | 880 | 894 | ||
401 | 881 | </div> | 895 | </div> |
403 | 882 | <!-- EDIT16 SECTION "Proxy servers" [17589-19410] --> | 896 | <!-- EDIT16 SECTION "Proxy servers" [17875-19696] --> |
404 | 883 | <h1 class="sectionedit17" id="keyboard_hotkeys">Keyboard Hotkeys</h1> | 897 | <h1 class="sectionedit17" id="keyboard_hotkeys">Keyboard Hotkeys</h1> |
405 | 884 | <div class="level1"> | 898 | <div class="level1"> |
406 | 885 | 899 | ||
407 | @@ -961,7 +975,7 @@ | |||
408 | 961 | </p> | 975 | </p> |
409 | 962 | 976 | ||
410 | 963 | </div> | 977 | </div> |
412 | 964 | <!-- EDIT17 SECTION "Keyboard Hotkeys" [19411-20743] --> | 978 | <!-- EDIT17 SECTION "Keyboard Hotkeys" [19697-21029] --> |
413 | 965 | <h1 class="sectionedit18" id="mouse_gestures">Mouse Gestures</h1> | 979 | <h1 class="sectionedit18" id="mouse_gestures">Mouse Gestures</h1> |
414 | 966 | <div class="level1"> | 980 | <div class="level1"> |
415 | 967 | 981 | ||
416 | @@ -995,7 +1009,7 @@ | |||
417 | 995 | </p> | 1009 | </p> |
418 | 996 | 1010 | ||
419 | 997 | </div> | 1011 | </div> |
421 | 998 | <!-- EDIT18 SECTION "Mouse Gestures" [20744-21676] --> | 1012 | <!-- EDIT18 SECTION "Mouse Gestures" [21030-21962] --> |
422 | 999 | <h1 class="sectionedit19" id="user_scripts_and_styles">User scripts and styles</h1> | 1013 | <h1 class="sectionedit19" id="user_scripts_and_styles">User scripts and styles</h1> |
423 | 1000 | <div class="level1"> | 1014 | <div class="level1"> |
424 | 1001 | 1015 | ||
425 | @@ -1056,7 +1070,7 @@ | |||
426 | 1056 | </p> | 1070 | </p> |
427 | 1057 | 1071 | ||
428 | 1058 | </div> | 1072 | </div> |
430 | 1059 | <!-- EDIT19 SECTION "User scripts and styles" [21677-24231] --> | 1073 | <!-- EDIT19 SECTION "User scripts and styles" [21963-24517] --> |
431 | 1060 | <h2 class="sectionedit20" id="user_styles">User styles</h2> | 1074 | <h2 class="sectionedit20" id="user_styles">User styles</h2> |
432 | 1061 | <div class="level2"> | 1075 | <div class="level2"> |
433 | 1062 | 1076 | ||
434 | @@ -1102,23 +1116,23 @@ | |||
435 | 1102 | <p> | 1116 | <p> |
436 | 1103 | Customize as needed: | 1117 | Customize as needed: |
437 | 1104 | </p> | 1118 | </p> |
452 | 1105 | <pre class="code">a[href]:hover { | 1119 | <pre class="code css">a<span class="br0">[</span>href<span class="br0">]</span><span class="re2">:hover </span><span class="br0">{</span> |
453 | 1106 | text-decoration: none !important; | 1120 | <span class="kw1">text-decoration</span><span class="sy0">:</span> <span class="kw2">none</span> !important<span class="sy0">;</span> |
454 | 1107 | } | 1121 | <span class="br0">}</span> |
455 | 1108 | a[href]:hover:after { | 1122 | a<span class="br0">[</span>href<span class="br0">]</span><span class="re2">:hover</span><span class="re2">:after </span><span class="br0">{</span> |
456 | 1109 | content: attr(href); | 1123 | <span class="kw1">content</span><span class="sy0">:</span> attr<span class="br0">(</span>href<span class="br0">)</span><span class="sy0">;</span> |
457 | 1110 | position: fixed; left: 4px; bottom: 4px; | 1124 | <span class="kw1">position</span><span class="sy0">:</span> <span class="kw2">fixed</span><span class="sy0">;</span> <span class="kw1">left</span><span class="sy0">:</span> <span class="re3">4px</span><span class="sy0">;</span> <span class="kw1">bottom</span><span class="sy0">:</span> <span class="re3">4px</span><span class="sy0">;</span> |
458 | 1111 | padding: 0 6px !important; | 1125 | <span class="kw1">padding</span><span class="sy0">:</span> <span class="nu0">0</span> <span class="re3">6px</span> !important<span class="sy0">;</span> |
459 | 1112 | max-width: 95%; overflow: hidden; | 1126 | <span class="kw1">max-width</span><span class="sy0">:</span> <span class="re3">95%</span><span class="sy0">;</span> <span class="kw1">overflow</span><span class="sy0">:</span> <span class="kw2">hidden</span><span class="sy0">;</span> |
460 | 1113 | white-space: nowrap; text-overflow: ellipsis; | 1127 | <span class="kw1">white-space</span><span class="sy0">:</span> <span class="kw2">nowrap</span><span class="sy0">;</span> text-overflow<span class="sy0">:</span> ellipsis<span class="sy0">;</span> |
461 | 1114 | font:10pt sans-serif !important; text-shadow: 0 0 12px white; | 1128 | <span class="kw1">font</span><span class="sy0">:</span><span class="re3">10pt</span> <span class="kw2">sans-serif</span> !important<span class="sy0">;</span> <span class="kw1">text-shadow</span><span class="sy0">:</span> <span class="nu0">0</span> <span class="nu0">0</span> <span class="re3">12px</span> <span class="kw2">white</span><span class="sy0">;</span> |
462 | 1115 | background-color: ButtonFace !important; color: ButtonText !important; | 1129 | <span class="kw1">background-color</span><span class="sy0">:</span> ButtonFace !important<span class="sy0">;</span> <span class="kw1">color</span><span class="sy0">:</span> ButtonText !important<span class="sy0">;</span> |
463 | 1116 | opacity: 0.8; outline: ButtonFace solid thick; | 1130 | opacity<span class="sy0">:</span> <span class="nu0">0.8</span><span class="sy0">;</span> <span class="kw1">outline</span><span class="sy0">:</span> ButtonFace <span class="kw2">solid</span> <span class="kw2">thick</span><span class="sy0">;</span> |
464 | 1117 | z-index: 9999; | 1131 | <span class="kw1">z-index</span><span class="sy0">:</span> <span class="nu0">9999</span><span class="sy0">;</span> |
465 | 1118 | }</pre> | 1132 | <span class="br0">}</span></pre> |
466 | 1119 | 1133 | ||
467 | 1120 | </div> | 1134 | </div> |
469 | 1121 | <!-- EDIT20 SECTION "User styles" [24232-26469] --> | 1135 | <!-- EDIT20 SECTION "User styles" [24518-26759] --> |
470 | 1122 | <h2 class="sectionedit21" id="understanding_webkit_version_numbers">Understanding WebKit Version Numbers</h2> | 1136 | <h2 class="sectionedit21" id="understanding_webkit_version_numbers">Understanding WebKit Version Numbers</h2> |
471 | 1123 | <div class="level2"> | 1137 | <div class="level2"> |
472 | 1124 | 1138 | ||
473 | @@ -1156,6 +1170,6 @@ | |||
474 | 1156 | </p> | 1170 | </p> |
475 | 1157 | 1171 | ||
476 | 1158 | </div> | 1172 | </div> |
478 | 1159 | <!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [26470-] --></div> | 1173 | <!-- EDIT21 SECTION "Understanding WebKit Version Numbers" [26760-] --></div> |
479 | 1160 | </body> | 1174 | </body> |
480 | 1161 | </html> | 1175 | </html> |
481 | 1162 | 1176 | ||
482 | === modified file 'tools/release' | |||
483 | --- tools/release 2013-08-14 17:56:33 +0000 | |||
484 | +++ tools/release 2013-11-20 00:14:10 +0000 | |||
485 | @@ -9,11 +9,11 @@ | |||
486 | 9 | # | 9 | # |
487 | 10 | # See the file COPYING for the full license text. | 10 | # See the file COPYING for the full license text. |
488 | 11 | 11 | ||
490 | 12 | OLDVER=$(grep --color=no 'VERSION = VERSION_FULL = ' wscript | sed -r "s@.+ = '(.+)'@\1@") | 12 | OLDVER=$(grep -r --color=no '^set(VERSION' CMakeLists.txt | sed -r "s@.+ ([0-9.]+)\)@\1@") |
491 | 13 | NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))") | 13 | NEWVER=$(python -c "print('0.'+str(float('$OLDVER'[2:])+.1))") |
492 | 14 | if [ "x$1" = "xbefore" ]; then | 14 | if [ "x$1" = "xbefore" ]; then |
493 | 15 | echo Bumping from $OLDVER to $NEWVER | 15 | echo Bumping from $OLDVER to $NEWVER |
495 | 16 | sed -i "s@$OLDVER@$NEWVER@g" wscript win32/makedist/midori.nsi | 16 | sed -i "s@$OLDVER@$NEWVER@g" CMakeLists.txt win32/makedist/midori.nsi |
496 | 17 | echo; echo v$NEWVER:; bzr log --line -rtag:$OLDVER.. | sed -r 's@.+2013-[0-9]+-[0-9]+ @@' | sed 's@\[merge\] @@' | grep -v -E 'l10n|makedist|tools(/release)?: |nsi|translation|Bump version to|Merge lp:midori|POTFILES.in'; echo | 17 | echo; echo v$NEWVER:; bzr log --line -rtag:$OLDVER.. | sed -r 's@.+2013-[0-9]+-[0-9]+ @@' | sed 's@\[merge\] @@' | grep -v -E 'l10n|makedist|tools(/release)?: |nsi|translation|Bump version to|Merge lp:midori|POTFILES.in'; echo |
497 | 18 | curl http://wiki.xfce.org/_export/raw/midori/contribute | \ | 18 | curl http://wiki.xfce.org/_export/raw/midori/contribute | \ |
498 | 19 | sed -r 's@\[\[([^|]+)\|([^]]+)\]\]@\1 \2@g' | \ | 19 | sed -r 's@\[\[([^|]+)\|([^]]+)\]\]@\1 \2@g' | \ |
499 | @@ -22,6 +22,7 @@ | |||
500 | 22 | 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' | \ | 22 | 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' | \ |
501 | 23 | sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html | 23 | sed 's@<link rel="style.*>@<link rel="stylesheet" href="faq.css" />@g' > data/faq.html |
502 | 24 | elif [ "x$1" = "xafter" ]; then | 24 | elif [ "x$1" = "xafter" ]; then |
503 | 25 | NEWVER=$OLDVER | ||
504 | 25 | echo -n bzr commit -p -m "'Bump version to $NEWVER'" | 26 | echo -n bzr commit -p -m "'Bump version to $NEWVER'" |
505 | 26 | case $SHELL in | 27 | case $SHELL in |
506 | 27 | *fish*) | 28 | *fish*) |
507 | 28 | 29 | ||
508 | === modified file 'win32/makedist/midori.nsi' | |||
509 | --- win32/makedist/midori.nsi 2013-11-19 19:55:28 +0000 | |||
510 | +++ win32/makedist/midori.nsi 2013-11-20 00:14:10 +0000 | |||
511 | @@ -21,7 +21,7 @@ | |||
512 | 21 | ; helper defines ; | 21 | ; helper defines ; |
513 | 22 | ;;;;;;;;;;;;;;;;;;; | 22 | ;;;;;;;;;;;;;;;;;;; |
514 | 23 | !define PRODUCT_NAME "Midori" | 23 | !define PRODUCT_NAME "Midori" |
516 | 24 | !define PRODUCT_VERSION "0.5.5" | 24 | !define PRODUCT_VERSION "0.5.6" |
517 | 25 | !define PRODUCT_BUILD "0" | 25 | !define PRODUCT_BUILD "0" |
518 | 26 | !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" | 26 | !define PRODUCT_VERSION_ID "${PRODUCT_VERSION}.${PRODUCT_BUILD}" |
519 | 27 | !define PRODUCT_PUBLISHER "Christian Dywan" | 27 | !define PRODUCT_PUBLISHER "Christian Dywan" |