Merge lp:~mhr3/unity-lens-files/bump-valac-req into lp:unity-lens-files

Proposed by Michal Hruby
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 230
Merged at revision: 230
Proposed branch: lp:~mhr3/unity-lens-files/bump-valac-req
Merge into: lp:unity-lens-files
Diff against target: 40 lines (+4/-4)
3 files modified
configure.ac (+1/-1)
src/folder.vala (+1/-1)
src/utils.vala (+2/-2)
To merge this branch: bzr merge lp:~mhr3/unity-lens-files/bump-valac-req
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Paweł Stołowski (community) Approve
Review via email: mp+115902@code.launchpad.net

Commit message

Fix compilation issues with latest valac

Description of the change

Fix compilation issues with latest valac and bump the version requirement.

To post a comment you must log in.
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

Compiles now with vala 0.16 and works fine.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-lens-files/26/console reported an error when processing this lp:~mhr3/unity-lens-files/bump-valac-req branch.
Not merging it.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Distro changes pushed - we're all green here!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'configure.ac'
--- configure.ac 2012-04-12 07:53:05 +0000
+++ configure.ac 2012-07-20 07:47:22 +0000
@@ -16,7 +16,7 @@
16# Init the other things we depend on16# Init the other things we depend on
17#####################################################17#####################################################
18AM_MAINTAINER_MODE18AM_MAINTAINER_MODE
19AM_PROG_VALAC([0.14.0])19AM_PROG_VALAC([0.16.0])
20AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])20AS_IF([test -z "$VALAC"], [AC_MSG_ERROR(["No valac compiler found."])])
21AC_PROG_CC21AC_PROG_CC
22AM_PROG_CC_C_O22AM_PROG_CC_C_O
2323
=== modified file 'src/folder.vala'
--- src/folder.vala 2012-04-05 14:53:12 +0000
+++ src/folder.vala 2012-07-20 07:47:22 +0000
@@ -208,7 +208,7 @@
208 208
209 }209 }
210 210
211 private class Bookmark : Object211 public class Bookmark : Object
212 {212 {
213 public string uri { get; set construct; }213 public string uri { get; set construct; }
214 public string icon { get; set construct; }214 public string icon { get; set construct; }
215215
=== modified file 'src/utils.vala'
--- src/utils.vala 2012-03-02 16:04:21 +0000
+++ src/utils.vala 2012-07-20 07:47:22 +0000
@@ -99,8 +99,8 @@
99 public int cmp_file_info_by_mtime (FileInfo info1, FileInfo info2)99 public int cmp_file_info_by_mtime (FileInfo info1, FileInfo info2)
100 {100 {
101 TimeVal tv1, tv2;101 TimeVal tv1, tv2;
102 info1.get_modification_time (out tv1);102 tv1 = info1.get_modification_time ();
103 info2.get_modification_time (out tv2);103 tv2 = info2.get_modification_time ();
104 long cmp = tv1.tv_sec - tv2.tv_sec;104 long cmp = tv1.tv_sec - tv2.tv_sec;
105 return cmp < 0 ? 1 : ( cmp > 0 ? -1 : 0);105 return cmp < 0 ? 1 : ( cmp > 0 ? -1 : 0);
106 }106 }

Subscribers

People subscribed via source and target branches