Compare commits

..

No commits in common. "ubuntu/questing" and "debian/1.1.0-2" have entirely different histories.

8 changed files with 124 additions and 203 deletions

79
debian/changelog vendored
View File

@ -1,82 +1,3 @@
lximage-qt (2.2.0-0ubuntu1) questing; urgency=medium
* New upstream release.
- Update build dependencies.
* Update copyright file.
* Update Standards-Version to 4.7.2, no changes needed.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Wed, 13 Aug 2025 12:06:33 -0500
lximage-qt (2.1.1-0ubuntu2) plucky; urgency=medium
* Update Standards-Version to 4.7.1, no changes needed.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 21 Feb 2025 17:03:55 -0600
lximage-qt (2.1.1-0ubuntu1) plucky; urgency=medium
* New upstream release.
-- Simon Quigley <tsimonq2@ubuntu.com> Tue, 04 Feb 2025 15:27:05 -0600
lximage-qt (2.1.0-0ubuntu1) plucky; urgency=medium
* New upstream release.
- Bump build dependencies.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 15 Nov 2024 15:32:14 -0600
lximage-qt (2.0.1-0ubuntu1) oracular; urgency=medium
* New upstream release.
* Update copyright file.
* Bump Standards-Version to 4.7.0, no changes necessary.
* Adjust dependencies.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 15 Aug 2024 16:51:12 -0500
lximage-qt (1.4.0-0ubuntu1) noble; urgency=medium
* New upstream release.
* Updated copyright file.
* Bumped build dependency versions.
* Ran wrap-and-sort.
-- Aaron Rainbolt <arraybolt3@gmail.com> Sun, 12 Nov 2023 17:36:16 -0600
lximage-qt (1.3.0-0ubuntu1) mantic; urgency=medium
* New upstream release.
* Bump build dependencies.
-- Simon Quigley <tsimonq2@ubuntu.com> Fri, 11 Aug 2023 09:48:31 -0500
lximage-qt (1.2.0-2ubuntu1) lunar; urgency=medium
* Revert a sync from Debian.
* Bumped build dependencies.
* Added 'Rules-Requires-Root: no' to debian/control.
* Bumped Standards-Version to 4.6.2, no changes necessary.
* Overhauled copyright file.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Fri, 10 Feb 2023 14:19:56 -0600
lximage-qt (1.2.0-0ubuntu2) lunar; urgency=medium
* No-change rebuild against libfm-qt 1.2.1.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Fri, 27 Jan 2023 15:46:45 -0600
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 ]

58
debian/control vendored
View File

@ -1,6 +1,5 @@
Source: lximage-qt
Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
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,50 +7,24 @@ Section: x11
Priority: optional
Build-Depends: debhelper-compat (= 13),
libexif-dev,
libfm-qt6-dev (>= 2.2.0),
libfm-qt-dev (>= 1.0.0~),
libkf5windowsystem-dev,
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
libxcb-composite0-dev,
libxcb-cursor-dev,
libxcb-damage0-dev,
libxcb-dpms0-dev,
libxcb-dri2-0-dev,
libxcb-dri3-dev,
libxcb-ewmh-dev,
libxcb-glx0-dev,
libxcb-icccm4-dev,
libxcb-keysyms1-dev,
libxcb-present-dev,
libxcb-record0-dev,
libxcb-render0-dev,
libxcb-res0-dev,
libxcb-screensaver0-dev,
libxcb-shape0-dev,
libxcb-shm0-dev,
libxcb-util-dev,
libxcb-xf86dri0-dev,
libxcb-xfixes0-dev,
libxcb-xinerama0-dev,
libxcb-xinput-dev,
libxcb-xkb-dev,
libxcb-xtest0-dev,
libxcb-xv0-dev,
libxcb-xvmc0-dev,
libxfixes-dev,
libxkbcommon-dev (>= 0.5.0),
lxqt-build-tools (>= 2.2.0),
qt6-svg-dev (>= 6.6.0)
Standards-Version: 4.7.2
Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging
Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-about-packaging.git
Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-about
Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-about.git
lxqt-build-tools (>= 0.10.0~),
Standards-Version: 4.6.1
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
Rules-Requires-Root: no
Package: lximage-qt
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: lximage-qt-l10n, qt6-image-formats-plugins
Depends: ${misc:Depends},
${shlibs:Depends}
Recommends: lximage-qt-l10n,
qt5-image-formats-plugins
Description: Image viewer for LXQt
A simple image viewer for LXQt. Additional file formats can be processed if
one install qt5-image-formats-plugins.
@ -62,9 +35,10 @@ Package: lximage-qt-l10n
Architecture: all
Multi-Arch: foreign
Section: localization
Depends: qt6-translations-l10n, ${misc:Depends}
Depends: ${misc:Depends},
qttranslations5-l10n
Description: Language-package for lximage-qt
A simple image viewer for LXQt. Additional file formats can be processed if
one install qt6-image-formats-plugins.
one install qt5-image-formats-plugins.
.
This package contains the l10n files needed by the lximage-qt.

50
debian/copyright vendored
View File

@ -4,38 +4,43 @@ Source: https://github.com/lxqt/lximage-qt
Files: *
Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2013-2025 LXQt team
2013-2022 LXQt team
License: GPL-2+ and LGPL-2.1+
Files: src/application.*
src/graphicsscene.*
src/imageview.cpp
src/loadimagejob.*
src/lximage-qt.*
src/mainwindow.*
src/modelfilter.*
src/mrumenu.*
src/preferencesdialog.*
src/resizeimagedialog.*
src/saveimagejob.*
src/screenshotdialog.*
src/screenshotselectarea.*
src/screenshotselectareagraphicsview.*
src/settings.*
src/statusbar.*
src/upload/*
Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2013 Pedram Pourang <tsujan2000@gmail.com>
2017 Nathan Osman <nathan@quickmediasolutions.com>
2010 Aurélien Gâteau <agateau@kde.org>
2018 Nathan Osman <nathan@quickmediasolutions.com>
2020 Andrea Diamantini <adjam@protonmail.com>
Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: GPL-2+
Files: src/upload/uploaddialog.ui
Copyright: 2013-2016 Hong Jen Yee (PCMan) <pcman.tw@gmail.com> ?
2013-2022 LXQt team
License: GPL-2+ and LGPL-2.1+
Files: src/mrumenu.cpp
Copyright: 2018, Nathan Osman <nathan@quickmediasolutions.com>
2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
License: GPL-2+
Files: src/resizeimagedialog.cpp
src/resizeimagedialog.h
Copyright: 2020, Andrea Diamantini <adjam@protonmail.com>
2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2010, Aurélien Gâteau <agateau@kde.org>
License: GPL-2+
Files: src/statusbar.cpp
src/statusbar.h
Copyright: 2013, Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
2013, Pedram Pourang <tsujan2000@gmail.com>
License: GPL-2+
Files: src/upload/imgbbprovider.cpp
src/upload/imgbbprovider.h
src/upload/imgbbupload.cpp
src/upload/imgbbupload.h
Copyright: 2017, Nathan Osman <nathan@quickmediasolutions.com>
License: GPL-2+
Files: data/lximage-qt.metainfo.xml
Copyright: 2022 LXQt team
@ -45,8 +50,7 @@ Files: debian/*
Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
2023-2025 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
2025 Aaron Rainbolt <arraybolt3@ubuntu.com>
2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
License: LGPL-2.1+
License: LGPL-2.1+

View File

@ -1,4 +0,0 @@
# This is expected
lximage-qt: desktop-entry-lacks-keywords-entry [usr/share/applications/*.desktop]
lximage-qt: appstream-metadata-validation-failed *
lximage-qt: no-manual-page [usr/bin/*]

View File

@ -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);

1
debian/patches/series vendored Normal file
View File

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

6
debian/watch vendored
View File

@ -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