diff --git a/.gitignore b/.gitignore
index 416a4ef..02ee5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /VPA_Base_Texture_Io.tgz
 /VPA_Base_Texture_Jupiter_Historical.tgz
 /VPA_Base_Texture_Jupiter.tgz
+/virtualplanet-2.5-src-164-nopatents.tar.xz
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 0aad9de..d391216 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -3,8 +3,8 @@
 VERSION=$1
 REVISION=$2
 
-tar -xJvf virtualplanet-$VERSION-src.tar.xz
-#svn export -r $REVISION svn://svn.code.sf.net/p/virtualplanet/code/trunk virtualplanet-$VERSION-src
+#tar -xJvf virtualplanet-$VERSION-src.tar.xz
+svn export -r $REVISION svn://svn.code.sf.net/p/virtualplanet/code/trunk virtualplanet-$VERSION-src
 
 #Remove Mac and Windows stuff
 rm -rf virtualplanet-$VERSION-src/Installer/Mac
diff --git a/sources b/sources
index 9bf8913..2421e42 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-SHA512 (virtualplanet-2.0-src-159-nopatents.tar.xz) = 68a37ac2928f0a52349bcb4ed2839dfb51a17c34d6fc238a7716a1bee143c30c8fb93ef051c668e01f8a487b96dd9fa6c056b7970581f10ca6ffd769e508dc0f
 SHA512 (VPA_Base_JPLeph.tgz) = cddf3ba2ca62b85f0415f977a71757f06e6f11d5b6ecd47123e4506bfc2da49c85117f0c04032fcdc0df474219f08c4945b5b263985984c21cb2763b1f4989e7
 SHA512 (VPA_Base_Overlay.tgz) = 1f689a8c783b1a12241336b93a15f94f90fdb8be9d12a516df7d7cf09fd5d304ed3cafb0a8be48aa22ae9a831f08ebb7bb262dce27df0ab2a23ad64b9fee78fb
 SHA512 (VPA_Base_Texture_Callisto_Historical.tgz) = b88d8827cda37567304f3a6ba25adaf2cb9a241e4b1e558222f8d7a4a971868a9323d80549410cc904563e1030914cd087289dc6c517e28f80ca4ba1b1bb6f48
@@ -16,3 +15,4 @@ SHA512 (VPA_Base_Texture_Mars.tgz) = b39a3a0bee23e638fd761be38cb9a59fd359f95a29d
 SHA512 (VPA_Base_Texture_Mercury_Historical.tgz) = ba24332f3e0711a1051802a1b7186ffa054104a8cbb27b892a1659f465af9a18a76dbfc304f7c303342eb41ba7f04d5c401bb218233d4fc653aa434abf7140e9
 SHA512 (VPA_Base_Texture_Mercury.tgz) = bde3b586f172fad264f61ae301f1ffebb9ce50a4272e22139d6b31a8b8619cd102f4c21a211b8ce4e0f23fe10e1598c0d7f6562eaaf7e1708be7007b752f613b
 SHA512 (VPA_Base_Texture_Venus.tgz) = 72f9dbcb84a21f20a47215616235494b1b4571ce9098641c2519bfd7971fa085e4a5dd6187352e390b2f3b23c1ba4b5ab9bfb0c2c0b85e4ab59e0b31d1b2c7b3
+SHA512 (virtualplanet-2.5-src-164-nopatents.tar.xz) = 83476fa6138b640b774a005901cb816767843ce14e203c88868f1939449f61f388b62264bd3768036fd6c40ba7f9fb91463568484f57e1ac655855c39dbcdce7
diff --git a/virtualplanet-data-historical.metainfo.xml b/virtualplanet-data-historical.metainfo.xml
deleted file mode 100644
index d600975..0000000
--- a/virtualplanet-data-historical.metainfo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="addon">
-  <id>virtualplanet-data-historical</id>
-  <extends>virtualplanet.desktop</extends>
-  <name>Historical textures</name>
-  <summary>Historical addon textures for Virtual Planets Atlas.
-  </summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>Public Domain</project_license>
-</component>
diff --git a/virtualplanet-fix-debuginfo.patch b/virtualplanet-fix-debuginfo.patch
deleted file mode 100644
index 42d1778..0000000
--- a/virtualplanet-fix-debuginfo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -U 3 -dHrN -- a/component/enhedits/Makefile.in b/component/enhedits/Makefile.in
---- a/component/enhedits/Makefile.in	2015-07-27 14:43:35.000000000 +0200
-+++ b/component/enhedits/Makefile.in	2017-01-22 10:44:15.684208022 +0100
-@@ -12,7 +12,7 @@
- unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
- unitdir=$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./
- includedir=./
--options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX
-+options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl
- 
- [target]
- units=enhedit.pas
-diff -U 3 -dHrN -- a/component/glscene/Packages/Makefile.in b/component/glscene/Packages/Makefile.in
---- a/component/glscene/Packages/Makefile.in	2015-07-27 14:43:35.000000000 +0200
-+++ b/component/glscene/Packages/Makefile.in	2017-01-22 10:44:39.860251030 +0100
-@@ -12,7 +12,7 @@
- unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
- unitdir=../Source $(LAZDIR)/components/images/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)  $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
- includedir=../Source
--options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -Xs -CX -XX
-+options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -CX -XX -g -gl
- 
- [target]
- units=GLScene_RunTime.pas
-diff -U 3 -dHrN -- a/component/libsql/Makefile.in b/component/libsql/Makefile.in
---- a/component/libsql/Makefile.in	2015-07-27 14:43:35.000000000 +0200
-+++ b/component/libsql/Makefile.in	2017-01-22 10:45:05.155804896 +0100
-@@ -12,7 +12,7 @@
- unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
- unitdir=jansql/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
- includedir=./
--options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX
-+options=-dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl
- 
- [target]
- units=libsql.pas
-diff -U 3 -dHrN -- a/component/Makefile.in b/component/Makefile.in
---- a/component/Makefile.in	2015-07-27 14:43:35.000000000 +0200
-+++ b/component/Makefile.in	2017-01-22 10:43:46.610633252 +0100
-@@ -21,7 +21,7 @@
- unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
- unitdir=uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET) libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
- includedir=./
--options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX
-+options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -g -gl
- 
- [clean]
- files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
-diff -U 3 -dHrN -- a/install.sh b/install.sh
---- a/install.sh	2015-12-18 11:58:20.000000000 +0100
-+++ b/install.sh	2017-01-22 10:45:33.795904046 +0100
-@@ -23,7 +23,7 @@
- install -m 755 -d $destdir/share/icons/hicolor/48x48
- install -m 755 -d $destdir/share/icons/hicolor/48x48/apps
- 
--install -v -m 755 -s vpa/vpa  $destdir/bin/virtualplanet
-+install -v -m 755 vpa/vpa  $destdir/bin/virtualplanet
- install -v -m 644 Installer/Linux/vpa/share/applications/virtualplanet.desktop $destdir/share/applications/virtualplanet.desktop
- install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/pixmaps/virtualplanet.png
- install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/icons/hicolor/48x48/apps/virtualplanet.png
-diff -U 3 -dHrN -- a/vpa/Makefile.in b/vpa/Makefile.in
---- a/vpa/Makefile.in	2016-12-05 09:46:35.000000000 +0100
-+++ b/vpa/Makefile.in	2017-01-22 10:46:17.671417880 +0100
-@@ -17,7 +17,7 @@
- [compiler]
- unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
- includedir=./ ../component/glscene/Source/
--options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -Xs -CX -XX
-+options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -CX -XX -g -gl
- unitdir=../component/glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/  ../component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./
- 
- [clean]
diff --git a/virtualplanet.appdata.xml b/virtualplanet.appdata.xml
deleted file mode 100644
index d0409c6..0000000
--- a/virtualplanet.appdata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">virtualplanet.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-3.0+</project_license>
- <name>Virtualplanet</name>
- <summary>An atlas for planets surface formations</summary>
- <description>
-  <p>
-   Virtual Planets Atlas displays surface information for planets
-   Jupiter, Mars, Venus and Mercury and for the major moons
-   of Jupiter.
-  </p>
-  <p>
-   It is based on the interface of well known Virtual Moon Atlas.
-  </p>
- </description>
- <keywords>
-  <keyword>astronomy</keyword>
-  <keyword>atlas</keyword>
-  <keyword>planets</keyword>
- </keywords>
- <screenshots>
-  <screenshot type="default">
-      <image>http://ap-i.net/avp/_media/en/screenshot/frfullscreenwindow.jpg</image>
-      <caption>Mars “Viking colors” Zoom at minimum / “Full screen” display</caption>
-  </screenshot>
- </screenshots>
- <url type="homepage">http://ap-i.net/avp/</url>
- <updatecontact>pch@ap-i.net</updatecontact>
-</application>
diff --git a/virtualplanet.spec b/virtualplanet.spec
index 1ae42ea..e5e5760 100644
--- a/virtualplanet.spec
+++ b/virtualplanet.spec
@@ -1,8 +1,8 @@
-%global revision 159
+%global revision 164
 
 Name: virtualplanet
-Version: 2.0
-Release: 6%{?dist}
+Version: 2.5
+Release: 1.%{revision}svn%{?dist}
 Summary: An atlas for planets surface formations
 # Some component of glscene used by virtualplanet are licensed MPLv1.1 only
 License: GPLv3+ and MPLv1.1
@@ -34,22 +34,20 @@ Source16: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_T
 Source17: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mars_Historical.tgz
 Source18: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mercury_Historical.tgz
 
-# Appdata files - asked upstream to include in sources
-Source19: virtualplanet.appdata.xml
-Source20: virtualplanet-data-historical.metainfo.xml
-
-
 
 # Virtualplanet doesn't support set FPC options from command line
 # This patch changes options in Makefiles to avoid stripping
 # executables and to enable debug info
 # Fedora specific, not reported upstream
-Patch1: virtualplanet-fix-debuginfo.patch
+Patch1:         vpa-2.5-fix_debuginfo.patch
 
 # Virtualplanet use wget to download source data
 # We disable that and use source files
 # Fedora specific, not reported upstream
-Patch2: virtualplanet-wgetdata.patch
+Patch2:         virtualplanet-wgetdata.patch
+
+# Appdata files are present in sources but not installed
+Patch99:        vpa-2.5-appdata.patch
 
 
 ExclusiveArch: %{fpc_arches}
@@ -65,7 +63,6 @@ BuildRequires:  fpc
 BuildRequires:  lazarus >= 1.6.2
 BuildRequires:  libappstream-glib
 
-BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glu)
 
 Requires:       %{name}-data-base = %{version}-%{release}
@@ -110,11 +107,7 @@ BuildArch:      noarch
 Historical addon textures for Virtual Planets Atlas
 
 %prep
-%setup -q -n %{name}-%{version}-src
-
-%patch1 -p1
-
-%patch2 -p1
+%autosetup -p1 -n %{name}-%{version}-src
 
 
 %build
@@ -157,19 +150,13 @@ make install install_data2 PREFIX=%{buildroot}%{_prefix}
 # because they're over 1GB of data
 #make install install_data3 PREFIX=%%{buildroot}%%{_prefix}
 
-# Copy self created appdata files in buildroot
-%{__mkdir_p} %{buildroot}%{_datadir}/appdata
-%{__cp} -p %SOURCE19 %{buildroot}%{_datadir}/appdata
-%{__mkdir_p} %{buildroot}%{_datadir}/metainfo
-%{__cp} -p %SOURCE20 %{buildroot}%{_datadir}/metainfo
-
 
 %check
 # Menu entry
 desktop-file-validate %{buildroot}%{_datadir}/applications/virtualplanet.desktop
 
 # Appdata file check
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -191,7 +178,7 @@ fi
 %doc %{_datadir}/doc/%{name}
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.appdata.xml
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/*/*/*/%{name}.png
 %dir %{_datadir}/%{name}
@@ -214,6 +201,9 @@ fi
 
 
 %changelog
+* Fri Dec 08 2017 Mattia Verga <mattia.verga@email.it> - 2.5-1.164svn
+- Update to development version rev164
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/vpa-2.5-appdata.patch b/vpa-2.5-appdata.patch
new file mode 100644
index 0000000..c412596
--- /dev/null
+++ b/vpa-2.5-appdata.patch
@@ -0,0 +1,15 @@
+diff -U 3 -dHrN -- b/install.sh c/install.sh
+--- b/install.sh	2017-12-08 12:00:22.214368073 +0100
++++ c/install.sh	2017-12-08 12:36:35.288840230 +0100
+@@ -22,8 +22,11 @@
+ install -m 755 -d $destdir/share/icons/hicolor
+ install -m 755 -d $destdir/share/icons/hicolor/48x48
+ install -m 755 -d $destdir/share/icons/hicolor/48x48/apps
++install -m 755 -d $destdir/share/metainfo
+ 
+ install -v -m 755 vpa/vpa  $destdir/bin/virtualplanet
++install -v -m 644 Installer/Linux/vpa/share/appdata/virtualplanet.appdata.xml $destdir/share/metainfo/virtualplanet.appdata.xml
++install -v -m 644 Installer/Linux/vpa/share/appdata/virtualplanet-data-historical.metainfo.xml $destdir/share/metainfo/virtualplanet-data-historical.metainfo.xml
+ install -v -m 644 Installer/Linux/vpa/share/applications/virtualplanet.desktop $destdir/share/applications/virtualplanet.desktop
+ install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/pixmaps/virtualplanet.png
+ install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/icons/hicolor/48x48/apps/virtualplanet.png
diff --git a/vpa-2.5-fix_debuginfo.patch b/vpa-2.5-fix_debuginfo.patch
new file mode 100644
index 0000000..2514f29
--- /dev/null
+++ b/vpa-2.5-fix_debuginfo.patch
@@ -0,0 +1,72 @@
+diff -U 3 -dHrN -- a/component/enhedits/Makefile.in b/component/enhedits/Makefile.in
+--- a/component/enhedits/Makefile.in	2017-12-08 10:23:59.000000000 +0100
++++ b/component/enhedits/Makefile.in	2017-12-08 11:58:55.225430356 +0100
+@@ -12,7 +12,7 @@
+ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ unitdir=$(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./
+ includedir=./
+-options=  $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi
++options=  $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -gw3 -fPIC
+ 
+ [target]
+ units=enhedit.pas
+diff -U 3 -dHrN -- a/component/glscene/Packages/Makefile.in b/component/glscene/Packages/Makefile.in
+--- a/component/glscene/Packages/Makefile.in	2017-12-08 11:22:07.000000000 +0100
++++ b/component/glscene/Packages/Makefile.in	2017-12-08 11:58:35.506223869 +0100
+@@ -12,7 +12,7 @@
+ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+ unitdir=../Source ../Source/Basis ../Source/FileFormats ../Source/SoundVideoAPIs ../Source/GameAPIs ../Source/Shaders $(LAZDIR)/components/images/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)  $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) .
+ includedir=../Source
+-options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -Xs -CX -XX
++options= -MDelphi -Saghi -O1 -vewni -l -dLCL -dLCL$(LCL_PLATFORM) -CX -XX -gw3 -fPIC
+ 
+ [target]
+ units=GLScene_RunTime.pas
+diff -U 3 -dHrN -- a/component/libsql/Makefile.in b/component/libsql/Makefile.in
+--- a/component/libsql/Makefile.in	2017-12-08 10:23:59.000000000 +0100
++++ b/component/libsql/Makefile.in	2017-12-08 11:59:11.150597116 +0100
+@@ -12,7 +12,7 @@
+ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ unitdir=jansql/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+ includedir=./
+-options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi
++options= $(fpcopts) -dLCL -dLCL$(LCL_PLATFORM) -O1 -MObjFPC -Sgi -gw3 -fPIC
+ 
+ [target]
+ units=libsql.pas
+diff -U 3 -dHrN -- a/component/Makefile.in b/component/Makefile.in
+--- a/component/Makefile.in	2015-07-27 14:43:35.000000000 +0200
++++ b/component/Makefile.in	2017-12-08 11:59:55.628079274 +0100
+@@ -21,7 +21,7 @@
+ unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ unitdir=uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET) libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+ includedir=./
+-options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -Xs -CX -XX
++options=-dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -CX -XX -gw3 -fPIC
+ 
+ [clean]
+ files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+diff -U 3 -dHrN -- a/install.sh b/install.sh
+--- a/install.sh	2015-12-18 11:58:20.000000000 +0100
++++ b/install.sh	2017-12-08 12:00:22.214368073 +0100
+@@ -23,7 +23,7 @@
+ install -m 755 -d $destdir/share/icons/hicolor/48x48
+ install -m 755 -d $destdir/share/icons/hicolor/48x48/apps
+ 
+-install -v -m 755 -s vpa/vpa  $destdir/bin/virtualplanet
++install -v -m 755 vpa/vpa  $destdir/bin/virtualplanet
+ install -v -m 644 Installer/Linux/vpa/share/applications/virtualplanet.desktop $destdir/share/applications/virtualplanet.desktop
+ install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/pixmaps/virtualplanet.png
+ install -v -m 644 Installer/Linux/vpa/share/pixmaps/virtualplanet.png $destdir/share/icons/hicolor/48x48/apps/virtualplanet.png
+diff -U 3 -dHrN -- a/vpa/Makefile.in b/vpa/Makefile.in
+--- a/vpa/Makefile.in	2016-12-05 09:46:35.000000000 +0100
++++ b/vpa/Makefile.in	2017-12-08 12:00:41.400576487 +0100
+@@ -17,7 +17,7 @@
+ [compiler]
+ unittargetdir=units/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)
+ includedir=./ ../component/glscene/Source/
+-options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -Xs -CX -XX
++options= $(opt_target) -dUseCThreads -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Sgi -O1 -vewni -l -CX -XX -gw3 -fPIC
+ unitdir=../component/glscene/Packages/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/uniqueinstance/lib/$(CPU_TARGET)-$(OS_TARGET)/ ../component/libsql/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/downloaddialog/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ ../component/synapse/source/lib/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/  ../component/enhedits/lib/$(CPU_TARGET)-$(OS_TARGET)-$(LCL_PLATFORM)/ $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/printers/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/components/cairocanvas/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ $(LAZDIR)/packager/units/$(CPU_TARGET)-$(OS_TARGET)/ $(LAZDIR)/components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET) $(LAZDIR)/ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM) ./
+ 
+ [clean]