diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rwxr-xr-x | PKGBUILD | 6 | ||||
| -rw-r--r-- | dontadddir-2.1.patch | 14 | ||||
| -rw-r--r-- | sorting-2.1.patch | 25 |
4 files changed, 6 insertions, 45 deletions
@@ -22,9 +22,9 @@ pkgbase = photoqt depends = pugixml optdepends = libqpsd-git: PSB/PSD support optdepends = xcftools: XCF support - source = http://photoqt.org/pkgs/photoqt-2.1.tar.gz - source = sorting-2.1.patch - source = dontadddir-2.1.patch + source = https://photoqt.org/pkgs/photoqt-2.1.tar.gz + source = https://photoqt.org/downloads/patches/sorting-2.1.patch + source = https://photoqt.org/downloads/patches/dontadddir-2.1.patch sha256sums = a334c73efb9a6be272b8e837a009e819d5672581273d56bb585a93595794d43a sha256sums = 8c05d137674fead5b9026e9e2f25a8198c019313d54e84f813718e683edd1448 sha256sums = d0676748a3db1398708947c3e638316c8862d958d1d6b54ae85cf8684b249878 @@ -14,9 +14,9 @@ depends=('exiv2' 'graphicsmagick' 'qt5-imageformats' 'qt5-multimedia' 'qt5-svg' optdepends=('libqpsd-git: PSB/PSD support' 'xcftools: XCF support') makedepends=('cmake' 'qt5-tools' 'extra-cmake-modules') -source=(http://photoqt.org/pkgs/$pkgname-$pkgver.tar.gz - sorting-2.1.patch - dontadddir-2.1.patch) +source=(https://photoqt.org/pkgs/$pkgname-$pkgver.tar.gz + https://photoqt.org/downloads/patches/sorting-2.1.patch + https://photoqt.org/downloads/patches/dontadddir-2.1.patch) sha256sums=('a334c73efb9a6be272b8e837a009e819d5672581273d56bb585a93595794d43a' '8c05d137674fead5b9026e9e2f25a8198c019313d54e84f813718e683edd1448' 'd0676748a3db1398708947c3e638316c8862d958d1d6b54ae85cf8684b249878') diff --git a/dontadddir-2.1.patch b/dontadddir-2.1.patch deleted file mode 100644 index 1fe3d60e61ec..000000000000 --- a/dontadddir-2.1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/qml/loadfiles.js b/qml/loadfiles.js -index 53cd3d6143934e5b299a02aac6d6e9749cd352df..f6b3d31dc9a188c1a6e240bb7c0f4e3a1a631038 100644 ---- a/qml/loadfiles.js -+++ b/qml/loadfiles.js -@@ -62,7 +62,7 @@ function loadFile(path, copyOfAllFiles) { - sortField, - !PQSettings.sortbyAscending) - -- if(variables.allImageFilesInOrder.indexOf(path) == -1) -+ if(!handlingFileDir.isDir(path) && variables.allImageFilesInOrder.indexOf(path) == -1) - variables.allImageFilesInOrder.push(path) - - } - diff --git a/sorting-2.1.patch b/sorting-2.1.patch deleted file mode 100644 index c77a51f87954..000000000000 --- a/sorting-2.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/qml/loadfiles.js b/qml/loadfiles.js -index 06f8933c3c337d0a597e50e7eef4d73709e03795..53cd3d6143934e5b299a02aac6d6e9749cd352df 100644 ---- a/qml/loadfiles.js -+++ b/qml/loadfiles.js -@@ -46,14 +46,14 @@ function loadFile(path, copyOfAllFiles) { - else { - - var sortField = PQSettings.sortby=="name" ? -- filefoldermodel.Name : -+ PQFileFolderModel.Name : - (PQSettings.sortby == "naturalname" ? -- filefoldermodel.NaturalName : -+ PQFileFolderModel.NaturalName : - (PQSettings.sortby == "time" ? -- filefoldermodel.Time : -+ PQFileFolderModel.Time : - (PQSettings.sortby == "size" ? -- filefoldermodel.Size : -- filefoldermodel.Type))) -+ PQFileFolderModel.Size : -+ PQFileFolderModel.Type))) - - variables.allImageFilesInOrder = filefoldermodel.loadFilesInFolder(path, - PQSettings.openShowHiddenFilesFolders, - |