summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--010-diamond-editor-do-not-copy-cs-libs.patch2
-rw-r--r--PKGBUILD12
3 files changed, 12 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 28810b3b34ce..77faa4c27941 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = diamond-editor
pkgdesc = Compact text editor designed for programmers
- pkgver = 1.3.6
- pkgrel = 2
+ pkgver = 1.4.1
+ pkgrel = 1
url = https://www.copperspice.com/
arch = x86_64
license = GPL2
@@ -9,14 +9,13 @@ pkgbase = diamond-editor
depends = sh
depends = copperspice
depends = hunspell
- source = https://github.com/copperspice/diamond/archive/diamond-1.3.6/diamond-editor-1.3.6.tar.gz
+ source = https://github.com/copperspice/diamond/archive/diamond-1.4.1/diamond-editor-1.4.1.tar.gz
source = 010-diamond-editor-do-not-copy-cs-libs.patch
source = diamond-editor.desktop
source = diamond-editor.sh
- sha256sums = e1b85890a870236370207c5d6b7aa7d44d7414a090723ecea513f8b5cec4fb67
- sha256sums = 5b569f2bba090f5a32e93da38ee4ab225882a5567f7d1f60ffdeb2aae5469e6d
+ sha256sums = 1dcbe0a55593bdcaa619bb45c509300491970d8e6c9ce3b0cb801577ce54d8ce
+ sha256sums = e1fad1a3ea74dd9e780e5586964d9e69b4f4be2d2380dc771f52eac44f9e76ba
sha256sums = e114cad024aa5d6768bd50fabe51c311e37a4a7969382ace8c16878a06b824e4
sha256sums = 16f8c39d44c7dfcf9784a6b0414af4aa266a67de10e17bffb6fd5ea43a95e48a
pkgname = diamond-editor
-
diff --git a/010-diamond-editor-do-not-copy-cs-libs.patch b/010-diamond-editor-do-not-copy-cs-libs.patch
index 9e61490386d3..cbd5c1c8045f 100644
--- a/010-diamond-editor-do-not-copy-cs-libs.patch
+++ b/010-diamond-editor-do-not-copy-cs-libs.patch
@@ -1,6 +1,6 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -216,17 +216,3 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+@@ -217,17 +217,3 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
else()
install(TARGETS Diamond DESTINATION .)
endif()
diff --git a/PKGBUILD b/PKGBUILD
index 2e8cbf6a99bf..75e6f7c64cf6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=diamond-editor
-pkgver=1.3.6
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
pkgdesc='Compact text editor designed for programmers'
arch=('x86_64')
url='https://www.copperspice.com/'
@@ -13,8 +13,8 @@ source=("https://github.com/copperspice/diamond/archive/diamond-${pkgver}/${pkgn
'010-diamond-editor-do-not-copy-cs-libs.patch'
'diamond-editor.desktop'
'diamond-editor.sh')
-sha256sums=('e1b85890a870236370207c5d6b7aa7d44d7414a090723ecea513f8b5cec4fb67'
- '5b569f2bba090f5a32e93da38ee4ab225882a5567f7d1f60ffdeb2aae5469e6d'
+sha256sums=('1dcbe0a55593bdcaa619bb45c509300491970d8e6c9ce3b0cb801577ce54d8ce'
+ 'e1fad1a3ea74dd9e780e5586964d9e69b4f4be2d2380dc771f52eac44f9e76ba'
'e114cad024aa5d6768bd50fabe51c311e37a4a7969382ace8c16878a06b824e4'
'16f8c39d44c7dfcf9784a6b0414af4aa266a67de10e17bffb6fd5ea43a95e48a')
@@ -31,7 +31,7 @@ build() {
}
package() {
- make -C build DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" cmake --install build
mkdir -p "$pkgdir"{/opt/diamond-editor/{platforms,printerdrivers},/usr/share/pixmaps}
install -D -m755 diamond-editor.sh "${pkgdir}/usr/bin/diamond-editor"
install -D -m644 diamond-editor.desktop -t "${pkgdir}/usr/share/applications"
@@ -48,5 +48,5 @@ package() {
_dir='printerdrivers'
fi
ln -s "../../../usr/lib/${_file##*/}" "${pkgdir}/opt/diamond-editor/${_dir}/${_file##*/}"
- done < <(find -L /usr/lib -type f -regextype posix-extended -regex '.*/Cs(Gui|PrinterDriver).*\.so$' -print0)
+ done < <(find -L /usr/lib -maxdepth 1 -type f -regextype posix-extended -regex '.*/Cs(Gui|PrinterDriver).*\.so$' -print0)
}