Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libshumate for openSUSE:Factory 
checked in at 2024-05-03 19:43:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libshumate (Old)
 and      /work/SRC/openSUSE:Factory/.libshumate.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libshumate"

Fri May  3 19:43:58 2024 rev:13 rq:1171400 version:1.2.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/libshumate/libshumate.changes    2024-03-20 
21:13:48.352760358 +0100
+++ /work/SRC/openSUSE:Factory/.libshumate.new.1880/libshumate.changes  
2024-05-03 19:43:58.867610992 +0200
@@ -1,0 +2,7 @@
+Thu May  2 12:28:23 UTC 2024 - Dominique Leuenberger <[email protected]>
+
+- Update to version 1.2.1:
+  + Fix compiling with C++.
+  + Fix crash with null reference map source.
+
+-------------------------------------------------------------------

Old:
----
  libshumate-1.2.0.obscpio

New:
----
  libshumate-1.2.1.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libshumate.spec ++++++
--- /var/tmp/diff_new_pack.ZgXHMd/_old  2024-05-03 19:44:00.015652729 +0200
+++ /var/tmp/diff_new_pack.ZgXHMd/_new  2024-05-03 19:44:00.015652729 +0200
@@ -22,7 +22,7 @@
 %bcond_with profiling
 
 Name:           libshumate
-Version:        1.2.0
+Version:        1.2.1
 Release:        0
 Summary:        C library providing a GtkWidget to display maps
 License:        Apache-2.0 AND LGPL-2.1-or-later AND BSD-3-Clause AND CC0-1.0 
AND CC-BY-3.0 AND GFDL-1.2-only

++++++ _service ++++++
--- /var/tmp/diff_new_pack.ZgXHMd/_old  2024-05-03 19:44:00.047653893 +0200
+++ /var/tmp/diff_new_pack.ZgXHMd/_new  2024-05-03 19:44:00.051654038 +0200
@@ -4,7 +4,7 @@
     <param name="url">https://gitlab.gnome.org/GNOME/libshumate.git</param>
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
-    <param name="revision">1.2.0</param>
+    <param name="revision">1.2.1</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>
   </service>

++++++ libshumate-1.2.0.obscpio -> libshumate-1.2.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libshumate-1.2.0/NEWS new/libshumate-1.2.1/NEWS
--- old/libshumate-1.2.0/NEWS   2024-03-16 09:04:20.000000000 +0100
+++ new/libshumate-1.2.1/NEWS   2024-04-20 10:43:54.000000000 +0200
@@ -1,4 +1,10 @@
 =====================
+Version 1.2.1
+=====================
+ - Fix compiling with C++
+ - Fix crash with null reference map source
+
+=====================
 Version 1.2.0
 =====================
  - Use g_assert_true instead of g_assert in tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libshumate-1.2.0/meson.build 
new/libshumate-1.2.1/meson.build
--- old/libshumate-1.2.0/meson.build    2024-03-16 09:04:20.000000000 +0100
+++ new/libshumate-1.2.1/meson.build    2024-04-20 10:43:54.000000000 +0200
@@ -1,6 +1,6 @@
 project(
   'libshumate', 'c',
-  version: '1.2.0',
+  version: '1.2.1',
   license: 'LGPLv2.1+',
   meson_version: '>= 0.55.0',
   default_options: [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libshumate-1.2.0/shumate/shumate-location.c 
new/libshumate-1.2.1/shumate/shumate-location.c
--- old/libshumate-1.2.0/shumate/shumate-location.c     2024-03-16 
09:04:20.000000000 +0100
+++ new/libshumate-1.2.1/shumate/shumate-location.c     2024-04-20 
10:43:54.000000000 +0200
@@ -118,7 +118,7 @@
 
 /**
  * shumate_location_distance:
- * @this: a [iface@Location]
+ * @self: a [iface@Location]
  * @other: a [iface@Location]
  *
  * Calculates the distance in meters between two locations.
@@ -127,17 +127,17 @@
  * Earth is a perfect sphere. This limits the accuracy of the result,
  * but is good enough for most purposes.
  *
- * Returns: the distance in meters between @this and @other
+ * Returns: the distance in meters between @self and @other
  *
  * Since: 1.2
  */
 double
-shumate_location_distance (ShumateLocation *this, ShumateLocation *other)
+shumate_location_distance (ShumateLocation *self, ShumateLocation *other)
 {
-  double lat1 = shumate_location_get_latitude (this) * G_PI / 180.0f;
-  double lon1 = shumate_location_get_longitude (this) * G_PI / 180.0f;
+  double lat1 = shumate_location_get_latitude (self) * G_PI / 180.0f;
+  double lon1 = shumate_location_get_longitude (self) * G_PI / 180.0f;
   double lat2 = shumate_location_get_latitude (other) * G_PI / 180.0f;
   double lon2 = shumate_location_get_longitude (other) * G_PI / 180.0f;
 
   return acos (sin (lat1) * sin (lat2) + cos (lat1) * cos (lat2) * cos (lon2 - 
lon1)) * EARTH_RADIUS;
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libshumate-1.2.0/shumate/shumate-location.h 
new/libshumate-1.2.1/shumate/shumate-location.h
--- old/libshumate-1.2.0/shumate/shumate-location.h     2024-03-16 
09:04:20.000000000 +0100
+++ new/libshumate-1.2.1/shumate/shumate-location.h     2024-04-20 
10:43:54.000000000 +0200
@@ -86,7 +86,7 @@
 double shumate_location_get_latitude (ShumateLocation *location);
 double shumate_location_get_longitude (ShumateLocation *location);
 
-double shumate_location_distance (ShumateLocation *this, ShumateLocation 
*other);
+double shumate_location_distance (ShumateLocation *self, ShumateLocation 
*other);
 
 G_END_DECLS
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libshumate-1.2.0/shumate/shumate-map-layer.c 
new/libshumate-1.2.1/shumate/shumate-map-layer.c
--- old/libshumate-1.2.0/shumate/shumate-map-layer.c    2024-03-16 
09:04:20.000000000 +0100
+++ new/libshumate-1.2.1/shumate/shumate-map-layer.c    2024-04-20 
10:43:54.000000000 +0200
@@ -224,9 +224,16 @@
 get_effective_zoom_level (ShumateMapLayer *self)
 {
   double zoom_level = shumate_viewport_get_zoom_level 
(shumate_layer_get_viewport (SHUMATE_LAYER (self)));
-  double our_tile_size = shumate_map_source_get_tile_size (self->map_source);
-  double reference_tile_size = shumate_map_source_get_tile_size 
(shumate_viewport_get_reference_map_source (shumate_layer_get_viewport 
(SHUMATE_LAYER (self))));
-  return log2 (reference_tile_size / our_tile_size) + zoom_level;
+  ShumateMapSource *map_source = shumate_viewport_get_reference_map_source 
(shumate_layer_get_viewport (SHUMATE_LAYER (self)));
+
+  if (map_source)
+    {
+      double reference_tile_size = shumate_map_source_get_tile_size 
(map_source);
+      double our_tile_size = shumate_map_source_get_tile_size 
(self->map_source);
+      return log2 (reference_tile_size / our_tile_size) + zoom_level;
+    }
+  else
+    return zoom_level;
 }
 
 static gboolean

++++++ libshumate.obsinfo ++++++
--- /var/tmp/diff_new_pack.ZgXHMd/_old  2024-05-03 19:44:00.231660582 +0200
+++ /var/tmp/diff_new_pack.ZgXHMd/_new  2024-05-03 19:44:00.235660728 +0200
@@ -1,5 +1,5 @@
 name: libshumate
-version: 1.2.0
-mtime: 1710576260
-commit: 14434008eb5da2b382e93704e099c2d6f171ebd7
+version: 1.2.1
+mtime: 1713602634
+commit: 493cc25b1b74aa5b4b099e202a46f7a02459b21c
 

Reply via email to