diff options
| -rw-r--r-- | user/pcmanfm-qt/APKBUILD | 11 | ||||
| -rw-r--r-- | user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch | 26 |
2 files changed, 5 insertions, 32 deletions
diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index bdca6d425..c357e0410 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=pcmanfm-qt -pkgver=0.13.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="File manager and desktop icon manager for LXQt" url="https://lxqt.org/" @@ -9,9 +9,9 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 liblxqt-dev - libfm-qt-dev>=0.13.0 qt5-qtx11extras-dev qt5-qttools-dev - kwindowsystem-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 + liblxqt-dev>=${pkgver%.*}.0 libfm-qt-dev>=${pkgver%.*}.0 + qt5-qtx11extras-dev qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/pcmanfm-qt/releases/download/$pkgver/pcmanfm-qt-$pkgver.tar.xz" @@ -28,7 +28,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -43,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089 pcmanfm-qt-0.13.0.tar.xz" +sha512sums="244ca30c4f107a797aad77686bcbefc717a2a119ca657d12fd9263a1c552382fac671a8a0156712cb5e49d1f7afceb588d2d4b49882220aa5292db4fda826525 pcmanfm-qt-0.14.0.tar.xz" diff --git a/user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch b/user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch deleted file mode 100644 index b52ce1a9f..000000000 --- a/user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nurd pcmanfm-qt-0.11.3/pcmanfm/mainwindow.cpp pcmanfm-qt-0.11.3.new/pcmanfm/mainwindow.cpp ---- pcmanfm-qt-0.11.3/pcmanfm/mainwindow.cpp 2017-01-14 02:13:45.000000000 +0000 -+++ pcmanfm-qt-0.11.3.new/pcmanfm/mainwindow.cpp 2017-10-12 20:44:25.731044585 +0000 -@@ -970,8 +970,8 @@ - void MainWindow::onBookmarksChanged(FmBookmarks* bookmarks, MainWindow* pThis) { - // delete existing items - QList<QAction*> actions = pThis->ui.menu_Bookmarks->actions(); -- QList<QAction*>::const_iterator it = actions.begin(); -- QList<QAction*>::const_iterator last_it = actions.end() - 2; -+ QList<QAction*>::const_iterator it = actions.constBegin(); -+ QList<QAction*>::const_iterator last_it = actions.constEnd() - 2; - - while(it != last_it) { - QAction* action = *it; -diff -Nurd pcmanfm-qt-0.11.3/pcmanfm/preferencesdialog.cpp pcmanfm-qt-0.11.3.new/pcmanfm/preferencesdialog.cpp ---- pcmanfm-qt-0.11.3/pcmanfm/preferencesdialog.cpp 2017-01-14 02:13:45.000000000 +0000 -+++ pcmanfm-qt-0.11.3.new/pcmanfm/preferencesdialog.cpp 2017-10-12 20:45:17.324377059 +0000 -@@ -90,7 +90,7 @@ - - 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 |