rpms/qlandkartegt/devel qlandkartegt-0.8.1-types.patch, NONE, 1.1 qlandkartegt.desktop, NONE, 1.1 qlandkartegt.png, NONE, 1.1 qlandkartegt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dan Horák
sharkcz at fedoraproject.org
Wed Nov 19 08:17:52 UTC 2008
Author: sharkcz
Update of /cvs/pkgs/rpms/qlandkartegt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31239
Modified Files:
.cvsignore sources
Added Files:
qlandkartegt-0.8.1-types.patch qlandkartegt.desktop
qlandkartegt.png qlandkartegt.spec
Log Message:
initial import
qlandkartegt-0.8.1-types.patch:
--- NEW FILE qlandkartegt-0.8.1-types.patch ---
--- src/CMapTDB.cpp.orig 2008-11-16 19:20:44.000000000 +0100
+++ src/CMapTDB.cpp 2008-11-16 19:22:08.000000000 +0100
@@ -501,7 +501,7 @@ void CMapTDB::readTDB(const QString& fil
bool tainted = false;
while((quint8*)pRecord < pRawData + data.size()) {
- pRecord->size = gar_load(quint16,pRecord->size);
+ pRecord->size = gar_load(uint16_t,pRecord->size);
switch(pRecord->type) {
case 0x50: // product name
{
@@ -514,11 +514,11 @@ void CMapTDB::readTDB(const QString& fil
{
tdb_map_t * p = (tdb_map_t*)pRecord;
- basemapId = gar_load(quint32,p->id);
- double n = GARMIN_RAD((gar_load(qint32,p->north) >> 8) & 0x00FFFFFF);
- double e = GARMIN_RAD((gar_load(qint32,p->east) >> 8) & 0x00FFFFFF);
- double s = GARMIN_RAD((gar_load(qint32,p->south) >> 8) & 0x00FFFFFF);
- double w = GARMIN_RAD((gar_load(qint32,p->west) >> 8) & 0x00FFFFFF);
+ basemapId = gar_load(uint32_t,p->id);
+ double n = GARMIN_RAD((gar_load(int32_t,p->north) >> 8) & 0x00FFFFFF);
+ double e = GARMIN_RAD((gar_load(int32_t,p->east) >> 8) & 0x00FFFFFF);
+ double s = GARMIN_RAD((gar_load(int32_t,p->south) >> 8) & 0x00FFFFFF);
+ double w = GARMIN_RAD((gar_load(int32_t,p->west) >> 8) & 0x00FFFFFF);
if(north < n) north = n;
if(east < e) east = e;
@@ -561,7 +561,7 @@ void CMapTDB::readTDB(const QString& fil
case 0x4C: // map tiles
{
tdb_map_t * p = (tdb_map_t*)pRecord;
- p->id = gar_load(quint32,p->id);
+ p->id = gar_load(uint32_t,p->id);
if(p->id == basemapId) break;
QString tilename = QString::fromLatin1(p->name);
@@ -579,10 +579,10 @@ void CMapTDB::readTDB(const QString& fil
// qDebug() << tile.file;
- tile.north = GARMIN_RAD((gar_load(qint32,p->north) >> 8) & 0x00FFFFFF);
- tile.east = GARMIN_RAD((gar_load(qint32,p->east) >> 8) & 0x00FFFFFF);
- tile.south = GARMIN_RAD((gar_load(qint32,p->south) >> 8) & 0x00FFFFFF);
- tile.west = GARMIN_RAD((gar_load(qint32,p->west) >> 8) & 0x00FFFFFF);
+ tile.north = GARMIN_RAD((gar_load(int32_t,p->north) >> 8) & 0x00FFFFFF);
+ tile.east = GARMIN_RAD((gar_load(int32_t,p->east) >> 8) & 0x00FFFFFF);
+ tile.south = GARMIN_RAD((gar_load(int32_t,p->south) >> 8) & 0x00FFFFFF);
+ tile.west = GARMIN_RAD((gar_load(int32_t,p->west) >> 8) & 0x00FFFFFF);
tile.area = QRectF(QPointF(tile.west, tile.north), QPointF(tile.east, tile.south));
tile.defAreaU << tile.west << tile.east << tile.east << tile.west;
@@ -593,7 +593,7 @@ void CMapTDB::readTDB(const QString& fil
tdb_map_size_t * s = (tdb_map_size_t*)(p->name + tilename.size() + 1);
for(quint16 i=0; i < s->count; ++i) {
- tile.memSize += gar_load(quint32,s->sizes[i]);
+ tile.memSize += gar_load(uint32_t,s->sizes[i]);
}
try
@@ -651,7 +651,7 @@ void CMapTDB::readTDB(const QString& fil
tdb_copyrights_t * p = (tdb_copyrights_t*)pRecord;
tdb_copyright_t * c = &p->entry;
- while((void*)c < (void*)((quint8*)p + gar_load(quint16,p->size) + 3)) {
+ while((void*)c < (void*)((quint8*)p + gar_load(uint16_t,p->size) + 3)) {
if(c->type != 0x07) {
out << c->str << "<br/>" << endl;
--- NEW FILE qlandkartegt.desktop ---
[Desktop Entry]
Version=1.0
Name=QLandkarteGT
Exec=qlandkartegt
Icon=qlandkartegt
Terminal=false
Type=Application
X-MultipleArgs=false
Categories=Qt;Utility;Geography;
GenericName=GPS device mapping utility
--- NEW FILE qlandkartegt.spec ---
%define cap_name QLandkarteGT
%define rel_date 2008.11.13
Name: qlandkartegt
Version: 0.8.1
Release: 3%{?dist}
Summary: GPS device mapping tool
Group: Applications/Communications
License: GPLv2+
URL: http://www.qlandkarte.org/
Source0: http://downloads.sourceforge.net/%{name}/%{cap_name}.%{version}.tar.gz
Source1: %{name}.desktop
Source2: %{name}.png
# applied as a part of upstream revision X
Patch0: %{name}-0.8.1-types.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: garmindev(interface) = 1.15
BuildRequires: cmake qt4-devel proj-devel gdal-devel desktop-file-utils
%description
QLandkarte GT is the ultimate outdoor aficionado's tool for GPS maps in
GeoTiff format as well as Garmin's img vector map format. Additional it is
the PC side frontend to QLandkarte M, a moving map application for mobile
devices. And it fills the gap Garmin leaves in refusing to support Linux.
QLandkarte GT is the proof that writing portable applications for Unix,
Windows and OSX is feasible with a minimum of overhead. No excuses!
QLandkarte GT does replace the original QLandkarte with a much more
flexible architecture. It's not limited to a map format or device. Thus
if you think your Magellan GPS or other should be supported, join the team.
Additionally it is a front end to the GDAL tools, to make georeferencing
scanned maps feasible for the normal user. Compared to similar tools like
QGis, it's target users are more on the consumer side than on the scientific
one. QLandkarte GT might not let you select every possible feature of the
GDAL tools, but it will simplify their use to the demands of most users.
%prep
%setup -q -n %{cap_name}.%{rel_date}
%patch0 -p0 -b .types
# fix libdir
sed -i "s|/usr/lib/qlandkarte|%{_libdir}/%{name}|g" CMakeLists.txt
%build
%cmake .
make VERBOSE=1 %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
install -m 0644 -p -D %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
desktop-file-install --vendor fedora \
--dir %{buildroot}%{_datadir}/applications \
%{SOURCE1}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc copying changelog.txt
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%changelog
* Wed Nov 19 2008 Dan Horak <dan[at]danny.cz> 0.8.1-3
- require garmindev(interface) = 1.15 for correct interraction with the Germin GPS drivers
- add comment to the patch0
* Sun Nov 16 2008 Dan Horak <dan[at]danny.cz> 0.8.1-2
- add patch for bigendian arches
* Fri Nov 14 2008 Dan Horak <dan[at]danny.cz> 0.8.1-1
- initial Fedora version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Nov 2008 01:55:29 -0000 1.1
+++ .cvsignore 19 Nov 2008 08:17:21 -0000 1.2
@@ -0,0 +1 @@
+QLandkarteGT.0.8.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qlandkartegt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Nov 2008 01:55:29 -0000 1.1
+++ sources 19 Nov 2008 08:17:21 -0000 1.2
@@ -0,0 +1 @@
+0cf413cc59e092ed2277578093d6c70d QLandkarteGT.0.8.1.tar.gz
More information about the fedora-extras-commits
mailing list