diff options
| -rw-r--r-- | user/lximage-qt/APKBUILD | 9 | ||||
| -rw-r--r-- | user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch | 24 |
2 files changed, 4 insertions, 29 deletions
diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index 3114ab033..8a769e1dd 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lximage-qt -pkgver=0.7.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="Image viewer and screenshot tool for LXQt" url="https://lxqt.org/" @@ -9,8 +9,8 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 libexif-dev - libfm-qt-dev>=0.12.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev + libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev kwindowsystem-dev" source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz" @@ -27,7 +27,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -42,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4 lximage-qt-0.7.0.tar.xz" +sha512sums="fddf4656f9112e02bb208b7c327d8f1a40326c1b5c9bff1cbd65909e808652c81dcdf5d2b9cf9cffd03c9e82b4980b498337afcb8fb1ee32ca7a7814ef268a0d lximage-qt-0.14.0.tar.xz" diff --git a/user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch b/user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch deleted file mode 100644 index 0a6d20307..000000000 --- a/user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 988a5f40479c23984853fe485a24d356a91343b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com> -Date: Tue, 17 Jan 2017 17:39:53 +0000 -Subject: [PATCH] Use const iterators - -Avoid assignment of a non-const pointer to a const pointer and the -consequent container detach. ---- - src/preferencesdialog.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp -index 123345c..c35183b 100644 ---- a/src/preferencesdialog.cpp -+++ b/src/preferencesdialog.cpp -@@ -111,7 +111,7 @@ void PreferencesDialog::initIconThemes(Settings& settings) { - - iconThemes.remove("hicolor"); // remove hicolor, which is only a fallback - QHash<QString, QString>::const_iterator it; -- for(it = iconThemes.begin(); it != iconThemes.end(); ++it) { -+ for(it = iconThemes.constBegin(); it != iconThemes.constEnd(); ++it) { - ui.iconTheme->addItem(it.value(), it.key()); - } - ui.iconTheme->model()->sort(0); // sort the list of icon theme names |