Ok, a follow-up on this. On another computer I am facing the following issue now:

<terminaloutput>
make[1]: Verzeichnis „/home/at/git/gretl-git/cli“ wird verlassen
make -C gui
make[1]: Verzeichnis „/home/at/git/gretl-git/gui“ wird betreten
gcc -c -g -O2 -I.. -I../lib/src -pthread -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore -I/usr/include/mircookie -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include   -Wno-deprecated-declarations -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libxml2 -DLOCALEDIR=\"/usr/local/share/locale\" -DSVPREFIX=\"\"  about.c
In file included from about.c:20:0:
gretl.h:45:11: fatal error: gtksourceview/gtksource.h: Datei oder Verzeichnis nicht gefunden
 # include <gtksourceview/gtksource.h>
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Makefile:236: die Regel für Ziel „about.o“ scheiterte
make[1]: *** [about.o] Fehler 1
make[1]: Verzeichnis „/home/at/git/gretl-git/gui“ wird verlassen
Makefile:64: die Regel für Ziel „gui“ scheiterte
make: *** [gui] Fehler 2
</terminaloutput>

I am wondered as I applied the same commands for compilation as usual...

Thank you,

Artur


Am 21.02.2018 um 23:17 schrieb Allin Cottrell:
On Wed, 21 Feb 2018, Artur T. wrote:

Dear all,

I just wanted to compile a fresh version of gretl but I've obtained the following error after "git pull"

<error>
at@ati7:~/git/gretl-git$ git pull
Aktualisiere 53f234b8a..74367f589
error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden:
    lib/src/geneval.c
    lib/src/gretl_foreign.c
Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen.
Abbruch
</error>

It's saying that the 2 listed files would be overwritten by the merge command, and I should commit or stash my changes (I didn't do any!) before merging.

Any suggestions what to do?

This is probably fall-out from recent flakiness at SF. I'd recommend doing:

git checkout lib/src/geneval.c
git checkout lib/src/gretl_foreign.c
git pull

Allin 


_______________________________________________
Gretl-devel mailing list
Gretl-devel@lists.wfu.edu
http://lists.wfu.edu/mailman/listinfo/gretl-devel