git » kio.git » commit f8d50d4

upgpkg: 5.240.0.20231014-3: One conflict fixed upstream

author Antonio Rojas
2023-10-16 14:50:53 UTC
committer Antonio Rojas
2023-10-16 14:50:53 UTC
parent 3562eb8f3b8f949efad71f1c55534bd67929fe0f

upgpkg: 5.240.0.20231014-3: One conflict fixed upstream

.SRCINFO +2 -2
PKGBUILD +3 -3

diff --git a/.SRCINFO b/.SRCINFO
index dd3a7a0..9759e1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kio
 	pkgdesc = Resource and network access abstraction
 	pkgver = 5.240.0.20231014
-	pkgrel = 2
+	pkgrel = 3
 	url = https://community.kde.org/Frameworks
 	arch = x86_64
 	groups = kf6
@@ -48,7 +48,7 @@ pkgbase = kio
 	optdepends = kio-extras: extra protocols support (sftp, fish and more)
 	optdepends = kio-fuse: to mount remote filesystems via FUSE
 	optdepends = switcheroo-control: hybrid GPU support
-	source = git+https://invent.kde.org/frameworks/kio#commit=d79917b4934e793dc1c51da147b45ebc2137f119
+	source = git+https://invent.kde.org/frameworks/kio#commit=c301b116d7909e1120076a22d99fe144cef1771d
 	validpgpkeys = 53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index ec56059..27c9b36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kio
 pkgver=5.240.0.20231014
-pkgrel=2
+pkgrel=3
 pkgdesc='Resource and network access abstraction'
 arch=(x86_64)
 url='https://community.kde.org/Frameworks'
@@ -53,7 +53,7 @@ optdepends=('kded: proxy management and cookie storage'
 groups=(kf6)
 #source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig})
 makedepends+=(git)
-_commit=d79917b4934e793dc1c51da147b45ebc2137f119
+_commit=c301b116d7909e1120076a22d99fe144cef1771d
 source=(git+https://invent.kde.org/frameworks/$pkgname#commit=$_commit)
 sha256sums=('SKIP')
 validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
@@ -69,5 +69,5 @@ build() {
 package() {
   DESTDIR="$pkgdir" cmake --install build
 
-  rm -r "$pkgdir"/{etc/xdg,usr/share/kconf_update} # Conflict with KF5
+  rm -r "$pkgdir"/etc # Conflict with KF5
 }