Midori Web Browser

Merge lp:~tuxator/midori/win32-makedist-tweaks into lp:midori

  1. win32-makedist-tweaks
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6749
Merged at revision: 6752
Proposed branch: lp:~tuxator/midori/win32-makedist-tweaks
Merge into: lp:midori
Diff against target: 34 lines (+8/-2)
1 file modified
win32/makedist/makedist.midori (+8/-2)
To merge this branch: bzr merge lp:~tuxator/midori/win32-makedist-tweaks
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+227331@code.launchpad.net

Commit message

makedist: Detect gstreamer api version, handle cert bundle being a symlinks, show images in gtk3 menus

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'win32/makedist/makedist.midori'
2--- win32/makedist/makedist.midori 2014-04-03 17:41:44 +0000
3+++ win32/makedist/makedist.midori 2014-07-18 13:59:55 +0000
4@@ -26,7 +26,12 @@
5 where_am_i=$PWD
6
7 if [ "$GSTREAMER_API_VERSION" == "" ]; then
8- GSTREAMER_API_VERSION=0.10
9+ WEBKIT_VER=$(grep -E '(DEPS_GTK_webkitgtk\-)(.*)(_VERSION)' CMakeCache.txt|cut -d \= -f 2 |cut -c 1)
10+ if [ "$WEBKIT_VER" == "2" ]; then
11+ GSTREAMER_API_VERSION=1.0
12+ else
13+ GSTREAMER_API_VERSION=0.10
14+ fi
15 fi
16
17 if [ "$MINGW_PREFIX" == "" ]; then
18@@ -244,7 +249,7 @@
19 grab_icons Faenza $where_am_i/../win32/makedist/midori.nsi
20
21 # We need to ship our CA bundle for now
22-cp -a /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
23+cp -Lr /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
24
25 GREYBIRD_VER="1.3.4"
26
27@@ -303,6 +308,7 @@
28 cat > $gtk_rc_file << _EOF
29 [Settings]
30 gtk-icon-theme-name = Faenza
31+gtk-menu-images = true
32 _EOF
33
34 else

Subscribers

People subscribed via source and target branches

to all changes: