Version string: 2.1.0+2014~ge493501 Better :)
On Tue, Oct 25, 2016 at 6:13 PM, shlomi braitbart <sbraitb...@gmail.com> wrote: > So if I understood correctly: > shlomi@avia:~/darktable2/darktable$ git fetch --tags > shlomi@avia:~/darktable2/darktable$ git fetch --tags upstream > shlomi@avia:~/darktable2/darktable$ git fetch upstream > shlomi@avia:~/darktable2/darktable$ ./build.sh > ../cmake_output30.txt > -- multiarch triplet detected: x86_64-linux-gnu > -- Checking for -march=native support > Missing fop > Can NOT build Lua API documentation > /home/shlomi/darktable2/darktable/src/external/rawspeed/data/cameras.xml > validates > Validation of files failed > make[2]: *** [data/darktable.appdata.xml] Error 1 > make[1]: *** [data/CMakeFiles/darktable.appdata_file.dir/all] Error 2 > make[1]: *** Waiting for unfinished jobs.... > make: *** [all] Error 2 > > attached is the cmake output > > > On Tue, Oct 25, 2016 at 5:49 PM, Roman Lebedev <lebedev...@gmail.com> wrote: >> >> On Tue, Oct 25, 2016 at 5:28 PM, shlomi braitbart <sbraitb...@gmail.com> >> wrote: >> > Okay here is what I got: >> > >> > shlomi@avia:~/darktable2/darktable$ git pull --tags >> > Already up-to-date. >> > shlomi@avia:~/darktable2/darktable$ git pull --tags upstream >> > remote: Counting objects: 50, done. >> > remote: Compressing objects: 100% (50/50), done. >> > remote: Total 50 (delta 17), reused 0 (delta 0), pack-reused 0 >> > Unpacking objects: 100% (50/50), done. >> > From https://github.com/darktable-org/darktable >> > 961f311..6d3a382 master -> upstream/master >> > It doesn't make sense to pull all tags; you probably meant: >> > git fetch --tags >> >> Err, i indeed meant $ git fetch --tags >> :) >> >> > shlomi@avia:~/darktable2/darktable$ git fetch upstream >> > shlomi@avia:~/darktable2/darktable$ ./build.sh > ../cmake_output29.txt >> > -- multiarch triplet detected: x86_64-linux-gnu >> > -- Checking for -march=native support >> > Missing fop >> > Can NOT build Lua API documentation >> > /home/shlomi/darktable2/darktable/src/external/rawspeed/data/cameras.xml >> > validates >> > Validation of files failed >> > make[2]: *** [data/darktable.appdata.xml] Error 1 >> > make[1]: *** [data/CMakeFiles/darktable.appdata_file.dir/all] Error 2 >> > make[1]: *** Waiting for unfinished jobs.... >> > make: *** [all] Error 2 >> > >> > the cmake output is attached. >> > Seems the same to me. >> > >> > >> > On Tue, Oct 25, 2016 at 5:19 PM, Roman Lebedev <lebedev...@gmail.com> >> > wrote: >> >> >> >> try >> >> >> >> git pull --tags >> >> git pull --tags upstream >> >> git fetch upstream >> >> >> >> On Tue, Oct 25, 2016 at 5:11 PM, shlomi braitbart >> >> <sbraitb...@gmail.com> >> >> wrote: >> >> > Still getting the >> >> > Already up-to-date >> >> > message with no change of number: >> >> > >> >> > git describe >> >> > release-0.9.3-13734-ge493501 >> >> > git status >> >> > On branch master >> >> > Your branch is ahead of 'origin/master' by 3 commits. >> >> > (use "git push" to publish your local commits) >> >> > Untracked files: >> >> > (use "git add <file>..." to include in what will be committed) >> >> > >> >> > po/he.mo >> >> > >> >> > nothing added to commit but untracked files present (use "git add" to >> >> > track) >> >> > >> >> > >> >> > >> >> > On Tue, Oct 25, 2016 at 12:33 PM, Tobias Ellinghaus <m...@houz.org> >> >> > wrote: >> >> >> >> >> >> Am Montag, 24. Oktober 2016, 20:06:23 CEST schrieb shlomi braitbart: >> >> >> > git describe >> >> >> > release-0.9.3-13734-ge493501 >> >> >> >> >> >> That looks good. Does a "git pull" bring you any updates now? And >> >> >> change >> >> >> the >> >> >> 13734 to 13738 or something like that? >> >> >> >> >> >> > git status >> >> >> > On branch master >> >> >> > Your branch is ahead of 'origin/master' by 3 commits. >> >> >> > (use "git push" to publish your local commits) >> >> >> > Untracked files: >> >> >> > (use "git add <file>..." to include in what will be committed) >> >> >> > >> >> >> > po/he.mo >> >> >> > >> >> >> > nothing added to commit but untracked files present (use "git add" >> >> >> > to >> >> >> > track) >> >> >> > >> >> >> > Shlomi >> >> >> > >> >> >> > On Mon, Oct 24, 2016 at 7:27 PM, Tobias Ellinghaus <m...@houz.org> >> >> >> > wrote: >> >> >> > > Am Montag, 24. Oktober 2016, 15:58:32 CEST schrieb shlomi >> >> >> > > braitbart: >> >> >> > > > When I do >> >> >> > > > $ git pull >> >> >> > > > I am getting: >> >> >> > > > $ Already up-to-date. >> >> >> > > >> >> >> > > That sounds odd as I pushed changes before I wrote my last mail. >> >> >> > > >> >> >> > > What is the output of >> >> >> > > >> >> >> > > cd /home/shlomi/darktable2/darktable/ >> >> >> > > git describe >> >> >> > > git status >> >> >> > > >> >> >> > > > (I am on the master branch) >> >> >> > > > Trying to build result in an error same as before (attached >> >> >> > > > file) >> >> >> > > > I also attache CMakeCache.txt >> >> >> > > >> >> >> > > Tobias >> >> >> > > >> >> >> > > [...] >> >> >> > >> >> >> > >> >> >> > >> >> >> > >> >> >> > ___________________________________________________________________________ >> >> >> > darktable developer mailing list >> >> >> > to unsubscribe send a mail to >> >> >> > darktable-dev+unsubscr...@lists.darktable.org >> >> >> >> >> > >> >> > >> >> > >> >> > >> >> > ___________________________________________________________________________ >> >> > darktable developer mailing list to unsubscribe send a mail to >> >> > darktable-dev+unsubscr...@lists.darktable.org >> > >> > > > ___________________________________________________________________________ darktable developer mailing list to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org
