git » ktexteditor.git » commit 4e98448

upgpkg: 5.240.0.20231014-3: One conflict fixed upstream

author Antonio Rojas
2023-10-16 07:56:54 UTC
committer Antonio Rojas
2023-10-16 07:56:54 UTC
parent 7364974e02ee97101e5e2021d2c3ff4549b2027c

upgpkg: 5.240.0.20231014-3: One conflict fixed upstream

.SRCINFO +2 -2
PKGBUILD +3 -3

diff --git a/.SRCINFO b/.SRCINFO
index 1202394..6b867ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ktexteditor
 	pkgdesc = Advanced embeddable text editor
 	pkgver = 5.240.0.20231014
-	pkgrel = 2
+	pkgrel = 3
 	url = https://community.kde.org/Frameworks
 	arch = x86_64
 	groups = kf6
@@ -36,7 +36,7 @@ pkgbase = ktexteditor
 	depends = sonnet
 	depends = syntax-highlighting
 	optdepends = git: git integration
-	source = git+https://invent.kde.org/frameworks/ktexteditor#commit=7167526a0d6452eeb8c73b4b8d1532a6c943263a
+	source = git+https://invent.kde.org/frameworks/ktexteditor#commit=02678fd1f01869d3ac26e77aaa9ce3b4642f2d8a
 	validpgpkeys = 53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index ba6d0fa..043de4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=ktexteditor
 pkgver=5.240.0.20231014
-pkgrel=2
+pkgrel=3
 pkgdesc='Advanced embeddable text editor'
 arch=(x86_64)
 url='https://community.kde.org/Frameworks'
@@ -41,7 +41,7 @@ optdepends=('git: git integration')
 groups=(kf6)
 #source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig})
 makedepends+=(git)
-_commit=7167526a0d6452eeb8c73b4b8d1532a6c943263a
+_commit=02678fd1f01869d3ac26e77aaa9ce3b4642f2d8a
 source=(git+https://invent.kde.org/frameworks/$pkgname#commit=$_commit)
 sha256sums=('SKIP')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
@@ -56,5 +56,5 @@ build() {
 package() {
   DESTDIR="$pkgdir" cmake --install build
 
-  rm -r "$pkgdir"/usr/share/{dbus-1,katepart5,polkit-1} # Conflict with KF5
+  rm -r "$pkgdir"/usr/share/{dbus-1,polkit-1} # Conflict with KF5
 }