debian/changelog

@@ -1,13 +1,3 @@
-lximage-qt (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump build dependencies in debian/control.
-  * Remove reverse-applicable patch.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 17 Nov 2022 17:52:27 -0600
-
 lximage-qt (1.1.0-2) unstable; urgency=medium
 
   [ Debian Janitor ]

debian/control

@@ -1,6 +1,5 @@
 Source: lximage-qt
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>
@@ -8,18 +7,16 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libexif-dev,
-               libfm-qt-dev (>= 1.2.0),
+               libfm-qt-dev (>= 1.0.0~),
                libkf5windowsystem-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libx11-dev,
                libxfixes-dev,
-               lxqt-build-tools (>= 0.12.0),
+               lxqt-build-tools (>= 0.10.0~),
 Standards-Version: 4.6.1
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-about
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-about.git
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lximage-qt
+Vcs-Git: https://salsa.debian.org/lxqt-team/lximage-qt.git
 Homepage: https://github.com/lxqt/lximage-qt
 
 Package: lximage-qt

debian/patches/fix-repainting-cached-images.patch

@@ -0,0 +1,27 @@
+From a526f1b0fcfe1d15368c1d3fdf4676c40fb8524d Mon Sep 17 00:00:00 2001
+From: tsujan <tsujan2000@gmail.com>
+Date: Tue, 21 Jun 2022 01:14:55 +0430
+Subject: [PATCH] Fixed repainting of cached images (#558)
+
+Previously, the cached pixmap was drawn inside the repaint rectangle. That was wrong because there's no guarantee that the repaint rectangle is as big as the cached pixmap (e.g., it isn't so when the toolbar extension popup covers a part of the image and slides back). Therefore, visual glitches were imminent in special cases.
+
+This patch draws the cached pixmap inside its corresponding cache rectangle, so that the image is always repainted correctly. The paint clipping is done by Qt automatically, as QPaintEvent's doc explains.
+
+Fixes https://github.com/lxqt/lximage-qt/issues/557
+---
+ src/imageview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/imageview.cpp b/src/imageview.cpp
+index 4a0c6b2..aa13393 100644
+--- a/src/imageview.cpp
++++ b/src/imageview.cpp
+@@ -630,7 +630,7 @@ void ImageView::paintEvent(QPaintEvent* event) {
+       if(cachedRect_.contains(repaintImageRect)) {
+         QPainter painter(viewport());
+         painter.fillRect(event->rect(), backgroundBrush());
+-        painter.drawPixmap(repaintImageRect, cachedPixmap_);
++        painter.drawPixmap(cachedRect_, cachedPixmap_);
+         // outline
+         if(showOutline_) {
+             QColor col = QColor(Qt::black);

debian/patches/series

@@ -0,0 +1 @@
+fix-repainting-cached-images.patch

debian/watch

@@ -1,5 +1,3 @@
 version=4
-opts="searchmode=plain, \
-pgpsigurlmangle=s/$/.asc/, \
-uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
-  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
+opts="pgpsigurlmangle=s/$/.asc/" \
+https://github.com/lxqt/lximage-qt/releases .*/lximage-qt-([\d\.]+).tar.xz