uncommitted - xygrib
Recent merge proposals
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/debian/changelog b/debian/changelog
index 22a08fc..d013855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xygrib (1.2.6.1-3) unstable; urgency=medium
+
+ * Add patch via Eugene Savelov for Wayland usability.
+
+ -- Alastair McKinstry <mckinstry@debian.org> Mon, 08 May 2023 09:17:55 +0100
+
xygrib (1.2.6.1-2) unstable; urgency=medium
* Build against libg2c-dev instead of libgrib2c-dev. Closes: #1011182
diff --git a/debian/patches/series b/debian/patches/series
index 7c4e7ef..aeb8fa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ qt5.patch
# grib2-fixes.patch
qt5-gcc10.patch
proj8.patch
+wayland-fix.patch
diff --git a/debian/patches/wayland-fix.patch b/debian/patches/wayland-fix.patch
new file mode 100644
index 0000000..4645212
--- /dev/null
+++ b/debian/patches/wayland-fix.patch
@@ -0,0 +1,33 @@
+Description: Fix for Wayland
+Bug-Origin: https://github.com/opengribs/XyGrib/pull/276/commits/313dade1e179f141a1dfd323731167ef670fe383
+Author: https://github.com/norulz
+Last-Updated: 2023-05-08
+Forwarded: not-needed
+
+--- a/src/Terrain.cpp
++++ b/src/Terrain.cpp
+@@ -117,10 +117,10 @@
+ * B=0 and M=1 gives white.
+ * B=0 and M=0 gives transparent.
+ * B=1 and M=0 gives an XOR'd result.*/
+- QBitmap *crossBits = new QBitmap(32,32);
++ QPixmap *crossBits = new QPixmap(32,32);
+ QBitmap *crossMask = new QBitmap(32,32);
+- crossBits->clear();
+- crossMask->clear();
++ crossBits->fill(Qt::color0);
++ crossMask->clear();
+ QPainter pb (crossBits);
+ QPainter pm (crossMask);
+ QPen pen1(Qt::color1);
+@@ -141,7 +141,9 @@
+
+ pb.end();
+ pm.end();
+- myCrossCursor = QCursor(*crossBits, *crossMask);
++
++ crossBits->setMask(*crossMask);
++ myCrossCursor == QCursor(*crossBits);
+
+ int v = 180;
+ selectColor = QColor(v,v,v);
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/lib/debug/.build-id/fe/a991607967d79417f41afb3d1c4d285e0d9037.debug
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/lib/debug/.build-id/aa/e7b99861802228dec2ffcea3af04220894c16a.debug
Control files of package xygrib: lines which differ (wdiff format)
Depends: libbz2-1.0, libc6 (>= 2.34), libgcc-s1 (>= 3.0), libopenjp2-7 (>= 2.0.0), libpng16-16 (>= 1.6.2-1), libproj25 (>= 5.1.0), libqt5core5a (>= 5.15.1), libqt5gui5 (>= 5.14.1) | libqt5gui5-gles (>= 5.14.1), libqt5network5 (>= 5.14.1), libqt5printsupport5 (>= 5.0.2), libqt5widgets5 (>= 5.14.1), libstdc++6 (>= 11), 13.1), zlib1g (>= 1:1.1.4), xygrib-maps, fonts-liberation
Control files of package xygrib-dbgsym: lines which differ (wdiff format)
Build-Ids: aae7b99861802228dec2ffcea3af04220894c16a fea991607967d79417f41afb3d1c4d285e0d9037
No differences were encountered between the control files of package xygrib-maps