Midori Web Browser

Merge lp:~tuxator/midori/win32-release into lp:midori

  1. win32-release
  2. Merge into trunk
Proposed by Paweł Forysiuk
Status: Merged
Approved by: Cris Dywan
Approved revision: 6191
Merged at revision: 6197
Proposed branch: lp:~tuxator/midori/win32-release
Merge into: lp:midori
Diff against target: 56 lines (+7/-7)
2 files modified
win32/makedist/makedist.midori (+2/-2)
win32/makedist/win32-release (+5/-5)
To merge this branch: bzr merge lp:~tuxator/midori/win32-release
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+166948@code.launchpad.net

Commit message

makedist: strip version name, copy cert attributes and fix pkg-config

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

An overview of options, such as DO_64BIT, would be useful, while reviewing I was wondering if it was an accidental change and it's basically nowhere defined.

Looks sane in any case.

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 2013-05-17 17:47:09 +0000
3+++ win32/makedist/makedist.midori 2013-06-01 22:54:27 +0000
4@@ -44,7 +44,7 @@
5
6 #strip sha from version if release
7 if [ "$RELEASE" != "" ];then
8- version=$(echo $version| awk -F \- '{print $1}')
9+ version=$(echo $version| awk -F \~ '{print $1}')
10 fi
11
12 if [ "$1" != "" ]; then
13@@ -202,7 +202,7 @@
14 grab_files share midori.mo
15
16 # We need to ship our CA bundle for now
17-cp /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
18+cp -a /etc/pki/tls/certs/ca-bundle.crt $workdir/share/midori/res/
19
20 if [ "$GTK3_BUILD" == "1" ]; then
21 grab_files share webkitgtk-3.0
22
23=== modified file 'win32/makedist/win32-release'
24--- win32/makedist/win32-release 2013-05-19 14:04:16 +0000
25+++ win32/makedist/win32-release 2013-06-01 22:54:27 +0000
26@@ -18,9 +18,9 @@
27 export MINGW_PREFIX="/usr/i686-w64-mingw32/sys-root/mingw"
28 eval `rpm --eval %{mingw32_env}`
29
30-./configure --prefix=$MINGW_PREFIX --enable-gtk3
31+PKG_CONFIG_PATH="$MINGW_PREFIX/lib/pkgconfig/" ./configure --prefix=$MINGW_PREFIX --enable-gtk3
32 make clean
33-sudo make install
34+sudo make install || exit
35
36 rpmquery -qa mingw32* > midori-${version}-deps-i686.txt
37 rm -f midori-$version.sha1
38@@ -32,15 +32,15 @@
39 dropbox puburl $dropbox_dir/midori-${version}.7z > release_links.txt
40 dropbox puburl $dropbox_dir/Midori-${version}_setup.exe >> release_links.txt
41
42-if [ "$64BIT" != "" ]; then
43+if [ "$DO_64BIT" != "" ]; then
44 # 64-bit build
45 #mingw64-env
46 export MINGW_PREFIX="/usr/x86_64-w64-mingw32/sys-root/mingw"
47 eval `rpm --eval %{mingw64_env}`
48
49- ./configure --prefix=$MINGW_PREFIX --enable-gtk3
50+ PKG_CONFIG_PATH="$MINGW_PREFIX/lib/pkgconfig/" ./configure --prefix=$MINGW_PREFIX --enable-gtk3
51 make clean
52- sudo make install
53+ sudo make install || exit
54
55 rpmquery -qa mingw64* > midori-${version}-deps-x86_64.txt
56 MINGW_PREFIX=${MINGW_PREFIX} RELEASE=1 sh ./win32/makedist/makedist.midori x86_64-portable

Subscribers

People subscribed via source and target branches

to all changes: