Attachment 117554 Details for Bug 159640 – file.diff

[patch] file.diff

file.diff (text/plain), 3.16 KB, created by Christoph Moench-Tegeder on 2011-08-10 12:50:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Moench-Tegeder

Created: 2011-08-10 12:50:12 UTC

Size: 3.16 KB

patch

obsolete

>diff -Nru astro/qlandkartegt.orig/Makefile astro/qlandkartegt/Makefile
>--- astro/qlandkartegt.orig/Makefile	2011-07-15 07:42:43.000000000 +0200
>+++ astro/qlandkartegt/Makefile	2011-08-10 12:50:50.000000000 +0200
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	qlandkartegt
>-PORTVERSION=	1.1.1
>-PORTREVISION=	1
>+PORTVERSION=	1.2.2
> CATEGORIES=	astro
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
> 
>diff -Nru astro/qlandkartegt.orig/distinfo astro/qlandkartegt/distinfo
>--- astro/qlandkartegt.orig/distinfo	2011-03-27 21:03:17.000000000 +0200
>+++ astro/qlandkartegt/distinfo	2011-08-10 12:51:07.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (qlandkartegt-1.1.1.tar.gz) = 0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9
>-SIZE (qlandkartegt-1.1.1.tar.gz) = 3963101
>+SHA256 (qlandkartegt-1.2.2.tar.gz) = 37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d
>+SIZE (qlandkartegt-1.2.2.tar.gz) = 4300356
>diff -Nru astro/qlandkartegt.orig/files/patch-src-CDeviceGPSD.cpp astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp
>--- astro/qlandkartegt.orig/files/patch-src-CDeviceGPSD.cpp	2011-05-14 17:09:40.000000000 +0200
>+++ astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,47 +0,0 @@
>-Index: src/CDeviceGPSD.cpp
>-===================================================================
>---- src/CDeviceGPSD.cpp	(revision 2719)
>-+++ src/CDeviceGPSD.cpp	(working copy)
>-@@ -138,6 +138,7 @@
>- log_mutex( new QMutex() ),
>- pipe_fd( _pipe_fd )
>- {
>-+    gpsdata = NULL;
>- }
>- 
>- 
>-@@ -149,7 +150,14 @@
>- 
>- void CGPSDThread::run()
>- {
>-+#if GPSD_API_MAJOR_VERSION >= 5
>-+	int socket;
>-+   
>-+    if( gpsdata = new gps_data_t )
>-+        socket = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata );
>-+#else
>-     gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT );
>-+#endif
>-     if( !gpsdata )
>-     {
>-         // TODO: message box (from other thread)
>-@@ -187,13 +195,20 @@
>-             }                    // if
>-             else if( FD_ISSET( gpsdata->gps_fd, &fds ) )
>-             {
>-+#if GPSD_API_MAJOR_VERSION >= 5
>-+                gps_read( gpsdata );
>-+#else
>-                 gps_poll( gpsdata );
>-+#endif
>-                 if( !decodeData() ) break;
>-             }                    // else if
>-         }                        // else if
>-     }                            // while
>- 
>-     gps_close( gpsdata );
>-+#if GPSD_API_MAJOR_VERSION >= 5
>-+    delete gpsdata;
>-+#endif
>-     qDebug() << "thread done";
>- }
>diff -Nru astro/qlandkartegt.orig/pkg-plist astro/qlandkartegt/pkg-plist
>--- astro/qlandkartegt.orig/pkg-plist	2010-05-19 06:45:54.000000000 +0200
>+++ astro/qlandkartegt/pkg-plist	2011-08-10 13:05:48.000000000 +0200
>@@ -1,10 +1,11 @@
>+bin/map2gcm
> bin/qlandkartegt
> bin/qlandkartegt.bin
> share/applications/qlandkartegt.desktop
> share/pixmaps/qlandkartegt.png
>-%%DATADIR%%/translations/qlandkartegt_de_DE.qm
>+%%DATADIR%%/translations/qlandkartegt_de.qm
> %%DATADIR%%/translations/qlandkartegt_es_ES.qm
>-%%DATADIR%%/translations/qlandkartegt_fr_FR.qm
>+%%DATADIR%%/translations/qlandkartegt_fr.qm
> %%DATADIR%%/translations/qlandkartegt_it_IT.qm
> %%DATADIR%%/translations/qlandkartegt_nl_NL.qm
> %%DATADIR%%/translations/qlandkartegt_ru_RU.qm

Actions: View | Diff

Attachments on bug 159640: 117554