midori 0.5.10 build failure with webkit2
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Midori Web Browser |
Fix Released
|
Undecided
|
Unassigned |
Bug Description
Midori 0.5.10 is failing to build when using a webkit2-only build/target:
-----
[ 56%] Building C object midori/
[ 57%] Building C object midori/
[ 57%] [ 58%] Building C object midori/
Building C object midori/
/home/gustavoz/
/home/gustavoz/
if (web_frame == webkit_
^
/home/gustavoz/
if (web_frame == webkit_
[ 58%] Building C object midori/
[ 59%] Building C object midori/
[ 59%] Building C object midori/
[ 60%] Building C object midori/
Linking C shared library libmidori-core.so
make[3]: Leaving directory '/home/
[ 60%] Built target midori-core
make[3]: Entering directory '/home/
make[3]: Entering directory '/home/
make[3]: Entering directory '/home/
[ 60%] [ 61%] Dependee "/home/
.dir/DependInfo
Dependee "/home/
Scanning dependencies of target midori
Generating about.c;about.h
Generating adblock/
make[3]: Leaving directory '/home/
make[3]: Entering directory '/home/
[ 62%] Building C object midori/
Dependee "/home/
Dependee "/home/
Scanning dependencies of target about
Linking C executable midori
make[3]: Leaving directory '/home/
Dependee "/home/
Dependee "/home/
Scanning dependencies of target adblock
make[3]: Entering directory '/home/
[ 62%] Building C object extensions/
libmidori-
collect2: error: ld returned 1 exit status
midori/
make[3]: *** [midori/midori] Error 1
make[3]: Leaving directory '/home/
CMakeFiles/
make[2]: *** [midori/
make[2]: *** Waiting for unfinished jobs....
-----
This is because of unconditional webkit_
#ifdefing it fixes the issue, though i don't know if anything more should be done.
Related branches
- Paweł Forysiuk: Approve
-
Diff: 4004 lines (+3238/-183)10 files modifiedCMakeLists.txt (+4/-7)
extensions/CMakeLists.txt (+1/-0)
midori/midori-browser.c (+27/-30)
midori/midori-download.vala (+2/-2)
midori/midori-privatedata.c (+1/-1)
midori/midori-tab.vala (+4/-19)
midori/midori-view.c (+5/-3)
midori/webkit2gtk-4.0.vapi (+393/-102)
midori/webkit2gtk-web-extension-4.0.vapi (+2801/-0)
tests/tab.vala (+0/-19)
Changed in midori: | |
milestone: | none → 0.6.0 |
status: | New → Fix Committed |
Changed in midori: | |
milestone: | 0.6.0 → 0.5.11 |
Changed in midori: | |
status: | Fix Committed → Fix Released |