From 2fd57282f0262ca084e05b0f2c63fbada395d02b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jan 2022 20:27:28 +0000 Subject: gentoo resync : 16.01.2021 --- .../viking/files/viking-1.7-no-common.patch | 13 ---- .../viking/files/viking-1.8-libexif.patch | 22 ------ .../viking/files/viking-1.9-geocache.patch | 88 ---------------------- 3 files changed, 123 deletions(-) delete mode 100644 sci-geosciences/viking/files/viking-1.7-no-common.patch delete mode 100644 sci-geosciences/viking/files/viking-1.8-libexif.patch delete mode 100644 sci-geosciences/viking/files/viking-1.9-geocache.patch (limited to 'sci-geosciences/viking/files') diff --git a/sci-geosciences/viking/files/viking-1.7-no-common.patch b/sci-geosciences/viking/files/viking-1.7-no-common.patch deleted file mode 100644 index bf49709dc865..000000000000 --- a/sci-geosciences/viking/files/viking-1.7-no-common.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/babel.h.orig 2020-02-06 07:22:12.924565811 +0100 -+++ b/src/babel.h 2020-02-06 07:22:25.092329302 +0100 -@@ -109,8 +109,8 @@ - gchar *label; - } BabelFile; - --GList *a_babel_file_list; --GList *a_babel_device_list; -+extern GList *a_babel_file_list; -+extern GList *a_babel_device_list; - - void a_babel_foreach_file_with_mode (BabelMode mode, GFunc func, gpointer user_data); - void a_babel_foreach_file_read_any (GFunc func, gpointer user_data); diff --git a/sci-geosciences/viking/files/viking-1.8-libexif.patch b/sci-geosciences/viking/files/viking-1.8-libexif.patch deleted file mode 100644 index 0f8bd81fe1cd..000000000000 --- a/sci-geosciences/viking/files/viking-1.8-libexif.patch +++ /dev/null @@ -1,22 +0,0 @@ -From da4e97b0766243f937d11a4a4cbd6ab5aaac4e0f Mon Sep 17 00:00:00 2001 -From: Rob Norris -Date: Sun, 9 Feb 2020 11:28:30 +0000 -Subject: [PATCH] Github #80: Fix build with '--with-libexif' - ---- - src/geotag_exif.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/geotag_exif.c b/src/geotag_exif.c -index 0e879a39..6e9514a7 100644 ---- a/src/geotag_exif.c -+++ b/src/geotag_exif.c -@@ -362,7 +362,7 @@ VikWaypoint* a_geotag_create_waypoint_from_file ( const gchar *filename, VikCoor - // Not worried if none of the other fields exist, as can default the values to something - // - -- gdouble alt = VIK_DEFAULT_ALTITUDE; -+ gdouble alt = NAN; - ee = exif_content_get_entry (ed->ifd[EXIF_IFD_GPS], EXIF_TAG_GPS_ALTITUDE); - if ( ee && ee->components == 1 && ee->format == EXIF_FORMAT_RATIONAL ) { - alt = Rational2Double ( ee->data, diff --git a/sci-geosciences/viking/files/viking-1.9-geocache.patch b/sci-geosciences/viking/files/viking-1.9-geocache.patch deleted file mode 100644 index 4779c10dcd4c..000000000000 --- a/sci-geosciences/viking/files/viking-1.9-geocache.patch +++ /dev/null @@ -1,88 +0,0 @@ -From bdfa84467787138b8a180938006b864a39d0dec0 Mon Sep 17 00:00:00 2001 -From: Rob Norris -Date: Thu, 3 Jun 2021 21:30:02 +0100 -Subject: [PATCH] Github #128: Maintain datasource_gc.c such that it at least - compiles - ---- - src/datasource_gc.c | 28 +++++++++++++++------------- - 1 file changed, 15 insertions(+), 13 deletions(-) - -diff --git a/src/datasource_gc.c b/src/datasource_gc.c -index 37fa425a..22292b2c 100644 ---- a/src/datasource_gc.c -+++ b/src/datasource_gc.c -@@ -128,9 +128,9 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets ) - gdouble lat, lon; - if ( widgets->circle_onscreen ) { - vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE, -- widgets->circle_x - widgets->circle_width/2, -- widgets->circle_y - widgets->circle_width/2, -- widgets->circle_width, widgets->circle_width, 0, 360*64 ); -+ widgets->circle_x - widgets->circle_width/2, -+ widgets->circle_y - widgets->circle_width/2, -+ widgets->circle_width, widgets->circle_width, 0, 360*64, NULL ); - } - /* calculate widgets circle_x and circle_y */ - /* split up lat,lon into lat and lon */ -@@ -157,13 +157,13 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets ) - pixels_per_meter = ((gdouble)vik_viewport_get_width(widgets->vvp)) / vik_coord_diff(&c1, &c2); - - /* this is approximate */ -- widgets->circle_width = gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ) -+ widgets->circle_width = gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ) - * METERSPERMILE * pixels_per_meter * 2; - - vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE, -- widgets->circle_x - widgets->circle_width/2, -- widgets->circle_y - widgets->circle_width/2, -- widgets->circle_width, widgets->circle_width, 0, 360*64 ); -+ widgets->circle_x - widgets->circle_width/2, -+ widgets->circle_y - widgets->circle_width/2, -+ widgets->circle_width, widgets->circle_width, 0, 360*64, NULL ); - - widgets->circle_onscreen = TRUE; - } else -@@ -172,7 +172,7 @@ static void datasource_gc_draw_circle ( datasource_gc_widgets_t *widgets ) - - /* see if onscreen */ - /* okay */ -- vik_viewport_sync ( widgets->vvp ); -+ vik_viewport_sync ( widgets->vvp, NULL ); - } - - static void datasource_gc_add_setup_widgets ( GtkWidget *dialog, VikViewport *vvp, gpointer user_data ) -@@ -197,7 +197,9 @@ static void datasource_gc_add_setup_widgets ( GtkWidget *dialog, VikViewport *vv - - widgets->vvp = vvp; - widgets->circle_gc = vik_viewport_new_gc ( vvp, "#000000", 3 ); -+#if !GTK_CHECK_VERSION (3,0,0) - gdk_gc_set_function ( widgets->circle_gc, GDK_INVERT ); -+#endif - widgets->circle_onscreen = TRUE; - datasource_gc_draw_circle ( widgets ); - -@@ -240,7 +242,7 @@ static void datasource_gc_get_process_options ( datasource_gc_widgets_t *widgets - po->shell_command = g_strdup_printf( "rm -f ~/.geo/caches/*.html ; %s -H ~/.geo/caches -P -n%d -r%.1fM -u %s -p %s %s %s ; %s -z ~/.geo/caches/*.html ", - GC_PROGRAM1, - gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widgets->num_spin) ), -- gtk_spin_button_get_value_as_float ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ), -+ gtk_spin_button_get_value ( GTK_SPIN_BUTTON(widgets->miles_radius_spin) ), - safe_user, - safe_pass, - slat, slon, -@@ -256,10 +258,10 @@ static void datasource_gc_cleanup ( datasource_gc_widgets_t *widgets ) - { - if ( widgets->circle_onscreen ) { - vik_viewport_draw_arc ( widgets->vvp, widgets->circle_gc, FALSE, -- widgets->circle_x - widgets->circle_width/2, -- widgets->circle_y - widgets->circle_width/2, -- widgets->circle_width, widgets->circle_width, 0, 360*64 ); -- vik_viewport_sync( widgets->vvp ); -+ widgets->circle_x - widgets->circle_width/2, -+ widgets->circle_y - widgets->circle_width/2, -+ widgets->circle_width, widgets->circle_width, 0, 360*64, NULL ); -+ vik_viewport_sync( widgets->vvp, NULL ); - } - g_free ( widgets ); - } -- cgit v1.2.3