Compare commits
9 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
7e7a221ea6 | ||
|
53447f3910 | ||
|
4da4228c63 | ||
|
|
8e0985f0eb | ||
|
|
88ce7c8bd7 | ||
|
|
7deea54603 | ||
|
|
781c0a45d9 | ||
|
|
559dc386cc | ||
|
|
55a8128c8f |
8 changed files with 1 additions and 432 deletions
20
.gitignore
vendored
20
.gitignore
vendored
|
|
@ -1,20 +0,0 @@
|
|||
/VPA_Base_JPLeph.tgz
|
||||
/VPA_Base_Overlay.tgz
|
||||
/VPA_Base_Texture_Mars.tgz
|
||||
/VPA_Base_Texture_Mars_Historical.tgz
|
||||
/VPA_Base_Texture_Mercury.tgz
|
||||
/VPA_Base_Texture_Mercury_Historical.tgz
|
||||
/VPA_Base_Texture_Venus.tgz
|
||||
/virtualplanet-1.0-src-99-nopatents.tar.xz
|
||||
/virtualplanet-2.0-src-159-nopatents.tar.xz
|
||||
/VPA_Base_Texture_Callisto_Historical.tgz
|
||||
/VPA_Base_Texture_Callisto.tgz
|
||||
/VPA_Base_Texture_Europa_Historical.tgz
|
||||
/VPA_Base_Texture_Europa.tgz
|
||||
/VPA_Base_Texture_Ganymede_Historical.tgz
|
||||
/VPA_Base_Texture_Ganymede.tgz
|
||||
/VPA_Base_Texture_Io_Historical.tgz
|
||||
/VPA_Base_Texture_Io.tgz
|
||||
/VPA_Base_Texture_Jupiter_Historical.tgz
|
||||
/VPA_Base_Texture_Jupiter.tgz
|
||||
/virtualplanet-2.5-src-164-nopatents.tar.xz
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Package has become unusable, see upstream bug https://www.ap-i.net/mantis/view.php?id=1977
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
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
|
||||
|
||||
#Remove Mac and Windows stuff
|
||||
rm -rf virtualplanet-$VERSION-src/Installer/Mac
|
||||
rm -rf virtualplanet-$VERSION-src/Installer/Windows
|
||||
|
||||
tar -cJvf virtualplanet-$VERSION-src-$REVISION-nopatents.tar.xz virtualplanet-$VERSION-src
|
||||
|
||||
#Remove temporary directory
|
||||
rm -rf virtualplanet-$VERSION-src
|
||||
18
sources
18
sources
|
|
@ -1,18 +0,0 @@
|
|||
SHA512 (VPA_Base_JPLeph.tgz) = cddf3ba2ca62b85f0415f977a71757f06e6f11d5b6ecd47123e4506bfc2da49c85117f0c04032fcdc0df474219f08c4945b5b263985984c21cb2763b1f4989e7
|
||||
SHA512 (VPA_Base_Overlay.tgz) = 1f689a8c783b1a12241336b93a15f94f90fdb8be9d12a516df7d7cf09fd5d304ed3cafb0a8be48aa22ae9a831f08ebb7bb262dce27df0ab2a23ad64b9fee78fb
|
||||
SHA512 (VPA_Base_Texture_Callisto_Historical.tgz) = b88d8827cda37567304f3a6ba25adaf2cb9a241e4b1e558222f8d7a4a971868a9323d80549410cc904563e1030914cd087289dc6c517e28f80ca4ba1b1bb6f48
|
||||
SHA512 (VPA_Base_Texture_Callisto.tgz) = fb13f771bddd9ef835b154dcfdb15fd0d6561121337650903c6acea011838c087c74d6113aaf236dcc9584817de79a62591f88012fefa1ce0a3e89eb7bb7c1e7
|
||||
SHA512 (VPA_Base_Texture_Europa_Historical.tgz) = ad0819a9e3c225e87f501e893fe8985fc6055651dcf4d4e49f5e14f8c3824232bf3a594724a22ae67a668331252a1b256bdf00a9d67d6ed11c7d27772776808a
|
||||
SHA512 (VPA_Base_Texture_Europa.tgz) = 216e65f8124e84a2eb59cb4dba780e396edbd8ea63b2c660dacbf3c4090f8301da567e6adea2f66709ff3621d007185103d7206381441cfc521c9ee23e0506b7
|
||||
SHA512 (VPA_Base_Texture_Ganymede_Historical.tgz) = 7af4d60c78a692374e6a22cc3082ed43e49987f4d0d2e449feb4efc2e2c26444019645668e39f1ab56ce9560f01dee1338fe3e8fc1766abc1fafe4f862b836a7
|
||||
SHA512 (VPA_Base_Texture_Ganymede.tgz) = c34a09d6ee87d95aea24468fe4570ee022a9afdf45234caf9c33f9d2effe37ec6822d7dc9989fb3eee45d004f3255d871a0d52be77a3bdb3e6b74671ea573e77
|
||||
SHA512 (VPA_Base_Texture_Io_Historical.tgz) = 05adcda951073f3a9bf79362c35805643df24306d811cf581832ecd0b2261d55a5e56970a63fb81d38f4111dd10a33645cb220b28f8af70f77e88039db334a59
|
||||
SHA512 (VPA_Base_Texture_Io.tgz) = 78deadf70cf302ff557823653f0b54787253a37e837e3e5b9ed19f0ba00319fd4bb2cd8be19f937e934bda58ffc7279f97610d1b84cd09ce3959fc728fa92e44
|
||||
SHA512 (VPA_Base_Texture_Jupiter_Historical.tgz) = 692da2adb724f26681962a29aaba926f42fc11de6736c0b2d54e6482c63334c696ee0cb220d1ea445c566d2ab68305da53e74bcba9a5c4e2451d6f6dc846a671
|
||||
SHA512 (VPA_Base_Texture_Jupiter.tgz) = ceedc994c7de92d18392cb1a7a2a0355e8d69d8fe7d9c0a3bea75cbbfdf37258ca428f32308ed0133484d6e2e71ef266b17ae5f33a85a9b1c6df7a1e5cc7dc65
|
||||
SHA512 (VPA_Base_Texture_Mars_Historical.tgz) = 0fb07aa704fff8202df7acd14810b14beb4e25df485fd55b2d0f71f8d82fe9680cccf5a3805e06d01e392e50abd9026d4b62b1924b07fdf15d7c4b2fabb5ddab
|
||||
SHA512 (VPA_Base_Texture_Mars.tgz) = b39a3a0bee23e638fd761be38cb9a59fd359f95a29d8fd885e02135108c998de118307a062e0c1da4a966f2f3d92707bbb4a6d623d043bef25af994c5a13375c
|
||||
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
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
diff -U 3 -H -d -r -N -- b/install_data.sh c/install_data.sh
|
||||
--- b/install_data.sh 2015-12-04 08:57:53.399335129 +0100
|
||||
+++ c/install_data.sh 2015-12-04 20:59:02.939336490 +0100
|
||||
@@ -7,9 +7,6 @@
|
||||
pkg=$1.tgz
|
||||
ddir=$2
|
||||
pkgz=BaseData/$pkg
|
||||
- if [ ! -e $pkgz ]; then
|
||||
- wget http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/$pkg/download -O $pkgz
|
||||
- fi
|
||||
tar xvzf $pkgz -C $ddir
|
||||
}
|
||||
|
||||
diff -U 3 -H -d -r -N -- b/install_data2.sh c/install_data2.sh
|
||||
--- b/install_data2.sh 2015-12-04 08:57:53.352329188 +0100
|
||||
+++ c/install_data2.sh 2015-12-05 10:26:58.614432433 +0100
|
||||
@@ -7,9 +7,6 @@
|
||||
pkg=$1.tgz
|
||||
ddir=$2
|
||||
pkgz=BaseData/$pkg
|
||||
- if [ ! -e $pkgz ]; then
|
||||
- wget http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/$pkg/download -O $pkgz
|
||||
- fi
|
||||
tar xvzf $pkgz -C $ddir
|
||||
}
|
||||
|
||||
diff -U 3 -H -d -r -N -- b/install_data3.sh c/install_data3.sh
|
||||
--- b/install_data3.sh 2015-12-04 08:57:53.399335129 +0100
|
||||
+++ c/install_data3.sh 2015-12-04 09:02:26.018902207 +0100
|
||||
@@ -7,9 +7,6 @@
|
||||
pkg=$1.tgz
|
||||
ddir=$2
|
||||
pkgz=BaseData/$pkg
|
||||
- if [ ! -e $pkgz ]; then
|
||||
- wget http://sourceforge.net/projects/virtualplanet/files/9-Source_Data/$pkg/download -O $pkgz
|
||||
- fi
|
||||
tar xvzf $pkgz -C $ddir
|
||||
}
|
||||
|
||||
|
|
@ -1,252 +0,0 @@
|
|||
%global revision 164
|
||||
|
||||
Name: virtualplanet
|
||||
Version: 2.5
|
||||
Release: 5.%{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
|
||||
URL: http://www.ap-i.net/avp/
|
||||
# Virtual Planetary Atlas source contains Mac and Windows stuff
|
||||
# so we use a script to remove that before importing in Fedora.
|
||||
# Use this script to download svn version and clean it up:
|
||||
# ./generate-tarball.sh 2.0 164
|
||||
Source0: %{name}-%{version}-src-%{revision}-nopatents.tar.xz
|
||||
Source1: generate-tarball.sh
|
||||
# Base data
|
||||
Source2: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_JPLeph.tgz
|
||||
Source3: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Overlay.tgz
|
||||
# Base textures
|
||||
Source4: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Callisto.tgz
|
||||
Source5: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Europa.tgz
|
||||
Source6: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Ganymede.tgz
|
||||
Source7: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Io.tgz
|
||||
Source8: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Jupiter.tgz
|
||||
Source9: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mars.tgz
|
||||
Source10: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Mercury.tgz
|
||||
Source11: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Venus.tgz
|
||||
# Historical textures
|
||||
Source12: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Callisto_Historical.tgz
|
||||
Source13: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Europa_Historical.tgz
|
||||
Source14: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Ganymede_Historical.tgz
|
||||
Source15: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Io_Historical.tgz
|
||||
Source16: http://sourceforge.net/projects/%{name}/files/9-Source_Data/VPA_Base_Texture_Jupiter_Historical.tgz
|
||||
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
|
||||
|
||||
|
||||
# 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: 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
|
||||
|
||||
# Appdata files are present in sources but not installed
|
||||
Patch99: vpa-2.5-appdata.patch
|
||||
|
||||
|
||||
ExclusiveArch: %{fpc_arches}
|
||||
# fpc is available on ppc64, but lazarus has some limitations that
|
||||
# prevents this package to build
|
||||
# virtualplanet cannot be built on arm due to incompatibile GLScene component
|
||||
ExcludeArch: ppc64 %{arm}
|
||||
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: dos2unix
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: fpc
|
||||
BuildRequires: lazarus >= 1.6.4
|
||||
BuildRequires: libappstream-glib
|
||||
|
||||
BuildRequires: pkgconfig(glu)
|
||||
|
||||
Requires: %{name}-data-base = %{version}-%{release}
|
||||
# Virtualplanet requires libpasastro to function properly
|
||||
# but rpm doesn't find this autorequire
|
||||
Requires: libpasastro%{?_isa}
|
||||
|
||||
|
||||
%description
|
||||
Virtual Planets Atlas displays surface information for planets
|
||||
Jupiter, Mars, Venus and Mercury and for the major moons
|
||||
of Jupiter.
|
||||
|
||||
It is based on the interface of well known Virtual Moon Atlas
|
||||
|
||||
%package doc
|
||||
Summary: Documentation files for Virtual Planets Atlas
|
||||
License: GFDL
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
Documentation files for Virtual Planets Atlas
|
||||
|
||||
%package data-base
|
||||
Summary: Base data for Virtual Planets Atlas
|
||||
License: Public Domain
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description data-base
|
||||
Base data for Virtual Planets Atlas. It includes base textures,
|
||||
database and overlays
|
||||
|
||||
%package data-historical
|
||||
Summary: Historical textures for Virtual Planets Atlas
|
||||
License: Public Domain
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description data-historical
|
||||
Historical addon textures for Virtual Planets Atlas
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{version}-src
|
||||
|
||||
|
||||
%build
|
||||
./configure lazarus=%{_libdir}/lazarus prefix=%{_prefix}
|
||||
|
||||
# Virtualplanet doesn't like parallel building so we don't use macro.
|
||||
# Some components support passing options to fpc compiler
|
||||
# to generate debug info.
|
||||
make fpcopts="-O1 -gw3 -fPIC"
|
||||
|
||||
# Put additional catalogs files where required for installation
|
||||
%{__cp} -p %SOURCE2 ./BaseData
|
||||
%{__cp} -p %SOURCE3 ./BaseData
|
||||
%{__cp} -p %SOURCE4 ./BaseData
|
||||
%{__cp} -p %SOURCE5 ./BaseData
|
||||
%{__cp} -p %SOURCE6 ./BaseData
|
||||
%{__cp} -p %SOURCE7 ./BaseData
|
||||
%{__cp} -p %SOURCE8 ./BaseData
|
||||
%{__cp} -p %SOURCE9 ./BaseData
|
||||
%{__cp} -p %SOURCE10 ./BaseData
|
||||
%{__cp} -p %SOURCE11 ./BaseData
|
||||
%{__cp} -p %SOURCE12 ./BaseData
|
||||
%{__cp} -p %SOURCE13 ./BaseData
|
||||
%{__cp} -p %SOURCE14 ./BaseData
|
||||
%{__cp} -p %SOURCE15 ./BaseData
|
||||
%{__cp} -p %SOURCE16 ./BaseData
|
||||
%{__cp} -p %SOURCE17 ./BaseData
|
||||
%{__cp} -p %SOURCE18 ./BaseData
|
||||
|
||||
|
||||
%install
|
||||
# Install main program
|
||||
make install PREFIX=%{buildroot}%{_prefix}
|
||||
|
||||
# Install data files
|
||||
make install install_data PREFIX=%{buildroot}%{_prefix}
|
||||
make install install_data2 PREFIX=%{buildroot}%{_prefix}
|
||||
|
||||
# For now we don't provide extra textures
|
||||
# because they're over 1GB of data
|
||||
#make install install_data3 PREFIX=%%{buildroot}%%{_prefix}
|
||||
|
||||
|
||||
%check
|
||||
# Menu entry
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/virtualplanet.desktop
|
||||
|
||||
# Appdata file check
|
||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
|
||||
|
||||
%files
|
||||
%license gpl-3.0.txt LICENSE
|
||||
%doc %{_datadir}/doc/%{name}
|
||||
%{_bindir}/%{name}
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/metainfo/%{name}.appdata.xml
|
||||
%{_datadir}/pixmaps/%{name}.png
|
||||
%{_datadir}/icons/*/*/*/%{name}.png
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/language/
|
||||
|
||||
%files doc
|
||||
%license doc/fdl-1.3.txt doc/LICENSE
|
||||
%doc %{_datadir}/%{name}/doc/
|
||||
|
||||
%files data-base
|
||||
%{_datadir}/%{name}/data/
|
||||
%{_datadir}/%{name}/Database/
|
||||
%{_datadir}/%{name}/Overlay/
|
||||
%{_datadir}/%{name}/Textures/
|
||||
%exclude %{_datadir}/%{name}/Textures/*/Historical/
|
||||
|
||||
%files data-historical
|
||||
%{_datadir}/%{name}/Textures/*/Historical/
|
||||
%{_datadir}/metainfo/%{name}-data-historical.metainfo.xml
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-5.164svn
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sun Feb 25 2018 Mattia Verga <mattia.verga@email.it> - 2.5-4.164svn
|
||||
- Rebuild for fpc 3.0.4 and lazarus 1.8
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3.164svn
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.5-2.164svn
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Fri Dec 08 2017 Mattia Verga <mattia.verga@email.it> - 2.5-1.164svn
|
||||
- Update to development version rev164
|
||||
- Exclude arm architectures due to component not compatible with arm
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Sat Jul 29 2017 Mattia Verga <mattia.verga@tiscali.it> - 2.0-5
|
||||
- Change FPC compiler options to fix debuginfo package build
|
||||
- Change metainfo.xml files location
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Sun Feb 12 2017 Mattia Verga <mattia.verga@tiscali.it> - 2.0-3
|
||||
- Set ExcludeArch ppc64 due to lazarus limitations
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Thu Feb 02 2017 Mattia Verga <mattia.verga@tiscali.it> - 2.0-1
|
||||
- Upgrade to stable 2.0
|
||||
- Add appdata files
|
||||
|
||||
* Sat Mar 12 2016 Mattia Verga <mattia.verga@tiscali.it> - 1.0-7.20160119svn99
|
||||
- Fix directories ownership
|
||||
- Add update-desktop-database scripts
|
||||
- Use ExclusiveArch instead of ExcludeArch
|
||||
- Correct license to reflect some components only MPLv1.1
|
||||
|
||||
* Fri Jan 22 2016 Mattia Verga <mattia.verga@tiscali.it> - 1.0-6.20160119svn99
|
||||
- Update svn revision to fix ARM build
|
||||
- Moved tests into %%check
|
||||
- Added architecture to libpasastro dependency
|
||||
|
||||
* Sun Dec 20 2015 Mattia Verga <mattia.verga@tiscali.it> - 1.0-5.20151220svn
|
||||
- Properly set ExcludeArch
|
||||
|
||||
* Sun Dec 20 2015 Mattia Verga <mattia.verga@tiscali.it> - 1.0-4.20151220svn
|
||||
- Libraries are now in separate package libpasastro
|
||||
|
||||
* Sat Dec 19 2015 Mattia Verga <mattia.verga@tiscali.it> - 1.0-3.20151217svn
|
||||
- Add mesa-libGLU-devel to buildrequire
|
||||
|
||||
* Thu Dec 17 2015 Mattia Verga <mattia.verga@tiscali.it> - 1.0-2.20151217svn
|
||||
- Update svn version
|
||||
- Add license to main package and to documentation
|
||||
- Fix building library with optflags scriptlets
|
||||
|
||||
* Fri Dec 04 2015 Mattia Verga <mattia.verga@tiscali.it> - 1.0-1
|
||||
- Initial release
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
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]
|
||||
Loading…
Add table
Add a link
Reference in a new issue