summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Weiss2017-10-01 16:25:28 +0200
committerLuca Weiss2017-10-01 16:26:05 +0200
commit571a929e30c58d08ca4e284b53981126e651899a (patch)
tree7d9551514e7a48bdce7f49917299644fbfb1fb95
parent1a0acd78b4318b56cd2565ab95ad55b5bfb4d32c (diff)
downloadaur-571a929e30c58d08ca4e284b53981126e651899a.tar.gz
Include patch to fix compilation of kikbd
-rw-r--r--.SRCINFO10
-rw-r--r--0001-kcmikbd-also-needs-the-moc-files.patch25
-rw-r--r--PKGBUILD15
3 files changed, 38 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2c218a82a6..df783ac643b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Oct 23 15:18:31 UTC 2016
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 = 4
+ pkgrel = 5
url = https://github.com/KDE/kde1-kdebase
arch = i686
arch = x86_64
@@ -15,8 +13,10 @@ pkgbase = kde1-kdebase
depends = libjpeg
depends = libtiff
depends = perl
- source = https://github.com/KDE/kde1-kdebase/archive/444ba45c273384ddbb4257027bdd60ec09fda13e.zip
- sha256sums = 29fcd478d9b2b568f426f719059e8ae9f9161d843b0ca122f8ae1f0b6e76aeaf
+ source = https://github.com/KDE/kde1-kdebase/archive/444ba45c273384ddbb4257027bdd60ec09fda13e.tar.gz
+ source = 0001-kcmikbd-also-needs-the-moc-files.patch
+ sha256sums = ff402fb14d1befb606c98a28a1bfe710a290dcf5ffa89849b61607eefc8ef4bf
+ sha256sums = dbb7fa69167c6f8f175793ae0be445450a89a941562a641f462ae518b89135a8
pkgname = kde1-kdebase
diff --git a/0001-kcmikbd-also-needs-the-moc-files.patch b/0001-kcmikbd-also-needs-the-moc-files.patch
new file mode 100644
index 00000000000..654c43d328c
--- /dev/null
+++ b/0001-kcmikbd-also-needs-the-moc-files.patch
@@ -0,0 +1,25 @@
+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 37214cd1b93..d4404c59def 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=kde1-kdebase
pkgver=1.1.2
-pkgrel=4
+pkgrel=5
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"
@@ -11,13 +11,14 @@ groups=("kde1")
depends=("qt1" "kde1-kdelibs" "libjpeg" "libtiff" "perl")
makedepends=("cmake")
_commit="444ba45c273384ddbb4257027bdd60ec09fda13e"
-source=("https://github.com/KDE/$pkgname/archive/$_commit.zip")
-sha256sums=('29fcd478d9b2b568f426f719059e8ae9f9161d843b0ca122f8ae1f0b6e76aeaf')
+source=("https://github.com/KDE/$pkgname/archive/$_commit.tar.gz" 0001-kcmikbd-also-needs-the-moc-files.patch)
+sha256sums=('ff402fb14d1befb606c98a28a1bfe710a290dcf5ffa89849b61607eefc8ef4bf'
+ 'dbb7fa69167c6f8f175793ae0be445450a89a941562a641f462ae518b89135a8')
-#prepare() {
-# cd $srcdir/$pkgname-$_commit
-# patch -p1 kfm/pics/CMakeLists.txt < $srcdir/kfm_CMakeLists.patch
-#}
+prepare() {
+ cd $srcdir/$pkgname-$_commit
+ patch -Np1 < $srcdir/0001-kcmikbd-also-needs-the-moc-files.patch
+}
build() {
cd $srcdir/$pkgname-$_commit