summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--0001-kcmikbd-also-needs-the-moc-files.patch25
-rw-r--r--PKGBUILD34
3 files changed, 31 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 12eb796de42a..f7e1d270af16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,26 @@
pkgbase = kde1-kdebase
pkgdesc = Historical copy of the base applications module of KDE 1, adapted to compile on modern systems (circa. 2016)
pkgver = 1.1.2
- pkgrel = 5
- url = https://github.com/KDE/kde1-kdebase
+ pkgrel = 6
+ url = https://invent.kde.org/historical/kde1-kdebase
arch = i686
arch = x86_64
groups = kde1
license = GPL2
makedepends = cmake
+ makedepends = git
depends = qt1
depends = kde1-kdelibs
depends = libjpeg
depends = libtiff
depends = perl
- source = https://github.com/KDE/kde1-kdebase/archive/a40a9a0de966d1831688bb9371a3c165b825bc7e.tar.gz
- sha256sums = a368f1294edafcae10a78fb5c0694dbcd38ae65379813bac67c2afda66390e6a
+ depends = pulseaudio
+ depends = glu
+ depends = libxpm
+ provides = kde1-kdebase
+ conflicts = kde1-kdebase
+ source = https://invent.kde.org/historical/kde1-kdebase/-/archive/849cc4d1ad30e8d5881b2a7bf42d9c3c2c41e173/kde1-kdebase-849cc4d1ad30e8d5881b2a7bf42d9c3c2c41e173.tar.gz
+ sha512sums = e23ee724c1baa298acd3fd30acf182b2b6ac142158ff5aa3092a8cd615f384007a0df90cc6c47520223943cf860b19cc153bb5428ba7f2f425c7e5fa80283c90
pkgname = kde1-kdebase
diff --git a/0001-kcmikbd-also-needs-the-moc-files.patch b/0001-kcmikbd-also-needs-the-moc-files.patch
deleted file mode 100644
index 654c43d328ca..000000000000
--- a/0001-kcmikbd-also-needs-the-moc-files.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a500ce4711ae789fcf8c5bf8dc32eaad86d288c0 Mon Sep 17 00:00:00 2001
-From: Luca Weiss <luca@z3ntu.xyz>
-Date: Sun, 1 Oct 2017 16:11:55 +0200
-Subject: [PATCH] kcmikbd also needs the moc files
-
----
- kikbd/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kikbd/CMakeLists.txt b/kikbd/CMakeLists.txt
-index 5cb20f7f9..0a9b8d186 100644
---- a/kikbd/CMakeLists.txt
-+++ b/kikbd/CMakeLists.txt
-@@ -25,7 +25,7 @@ install(TARGETS kikbd RUNTIME DESTINATION ${KDE1_BINDIR})
-
- set(KCMIKBD_SRCS widgets.cpp kcmikbd.cpp kikbdconf.cpp kobjconf.cpp kconfobjs.cpp)
-
--add_executable(kcmikbd ${KCMIKBD_SRCS})
-+add_executable(kcmikbd ${KCMIKBD_SRCS} ${MOC_FILES})
- target_link_libraries(kcmikbd
- ${QT_LIBRARIES}
- ${X11_LIBRARIES}
---
-2.14.2
-
diff --git a/PKGBUILD b/PKGBUILD
index fe87a3f3acfa..0888485883de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,33 +2,41 @@
pkgname=kde1-kdebase
pkgver=1.1.2
-pkgrel=5
+pkgrel=6
pkgdesc="Historical copy of the base applications module of KDE 1, adapted to compile on modern systems (circa. 2016)"
arch=('i686' 'x86_64')
-url="https://github.com/KDE/kde1-kdebase"
+url="https://invent.kde.org/historical/kde1-kdebase"
license=("GPL2")
-groups=("kde1")
-depends=("qt1" "kde1-kdelibs" "libjpeg" "libtiff" "perl")
-makedepends=("cmake")
-_commit="a40a9a0de966d1831688bb9371a3c165b825bc7e"
-source=("https://github.com/KDE/$pkgname/archive/$_commit.tar.gz")
-sha256sums=('a368f1294edafcae10a78fb5c0694dbcd38ae65379813bac67c2afda66390e6a')
+groups=('kde1')
+depends=('qt1' 'kde1-kdelibs' 'libjpeg' 'libtiff' 'perl' 'pulseaudio' 'glu' 'libxpm')
+makedepends=('cmake' 'git')
+provides=('kde1-kdebase')
+conflicts=('kde1-kdebase')
+_commit="849cc4d1ad30e8d5881b2a7bf42d9c3c2c41e173"
+source=("https://invent.kde.org/historical/$pkgname/-/archive/$_commit/$pkgname-$_commit.tar.gz")
+sha512sums=('e23ee724c1baa298acd3fd30acf182b2b6ac142158ff5aa3092a8cd615f384007a0df90cc6c47520223943cf860b19cc153bb5428ba7f2f425c7e5fa80283c90')
prepare() {
- mkdir -p build
+ if [[ -d build ]]; then
+ rm -rf build && mkdir build
+ else
+ mkdir build
+ fi
}
build() {
cd build
- cmake ../$pkgname-$_commit -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_LIBRARY_PATH='/opt/kde1/lib'
+ cmake ../$pkgname-$_commit \
+ -DCMAKE_INSTALL_PREFIX='/usr'
make
}
package() {
- make -C build DESTDIR="$pkgdir/" install
+ cd build
+ make DESTDIR="$pkgdir/" install
- cd $pkgname-$_commit
- install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ cd ../$pkgname-$_commit
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
# vim:set ts=2 sw=2 et: