Remove patch and update to newer version

3 files changed, 12 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8293675412c..8f6298035eaf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Oct 14 20:23:16 UTC 2016
+# Sat Oct 15 11:03:56 UTC 2016
 pkgbase = kde1-kdelibs
 	pkgdesc = Historical copy of the libraries module of KDE 1, adapted to compile on modern systems (circa. 2016)
 	pkgver = 1.1.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/KDE/kde1-kdelibs
 	arch = i686
 	arch = x86_64
@@ -15,10 +15,8 @@ pkgbase = kde1-kdelibs
 	depends = libpng
 	depends = libjpeg-turbo
 	depends = libtiff
-	source = https://github.com/KDE/kde1-kdelibs/archive/98b923b0a56423c6de5c5f2f68f457249b3e3cf6.zip
-	source = KDE1Macros.patch
-	sha256sums = be19075ccddb1141267cc445a3025ebb4654d0dc4e928580c571f16c699c59a6
-	sha256sums = d7adbb94ba65fc0d37c5e8ad4975a2c550562dae9131ff23086507a17d4cdba9
+	source = https://github.com/KDE/kde1-kdelibs/archive/045c89f8a71d521897bb6ac2447f0d396c2d1016.zip
+	sha256sums = 7270c0e1d5fc55643a1faabae0003a6a1b39ade5ce6465d8965fe2bc3acd4409
 
 pkgname = kde1-kdelibs
 
diff --git a/KDE1Macros.patch b/KDE1Macros.patch
deleted file mode 100644
index 79c231177a5c..000000000000
--- a/KDE1Macros.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-80a81
->         endforeach()
-84c85,91
-< function (install_icon icon targetdir)
----
-> function (install_icon_int icon targetdir absolutepath)
->     if(absolutepath)
->         set(targetpath ${targetdir})
->     else()
->         set(targetpath "${KDE1_ICONDIR}/${targetdir}")
->     endif()
-> 
-86c93
-<         install(FILES ${icon} DESTINATION ${KDE1_ICONDIR}/${targetdir} RENAME ${icon})
----
->         install(FILES ${icon} DESTINATION ${targetpath} RENAME ${icon})
-89c96
-<         install(FILES mini-${icon} DESTINATION ${KDE1_MINIDIR}/${targetdir} RENAME ${icon})
----
->         install(FILES mini-${icon} DESTINATION ${targetpath} RENAME ${icon})
-92c99
-<         install(FILES large-${icon} DESTINATION ${KDE1_ICONDIR}/${targetdir}/large/ RENAME ${icon})
----
->         install(FILES large-${icon} DESTINATION ${targetpath}/large/ RENAME ${icon})
-94a102,109
-> 
-> function (install_icon icon targetdir)
->     install_icon_int("${icon}" "${targetdir}" FALSE)
-> endfunction ()
-> 
-> function (install_icon_abs icon targetdir)
->     install_icon_int("${icon}" "${targetdir}" TRUE)
-> endfunction()
diff --git a/PKGBUILD b/PKGBUILD
index cf471a1d5f16..39cba37c1770 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=kde1-kdelibs
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Historical copy of the libraries module of KDE 1, adapted to compile on modern systems (circa. 2016)"
 arch=('i686' 'x86_64')
 url="https://github.com/KDE/kde1-kdelibs"
@@ -10,16 +10,14 @@ license=("GPL2" "LGPL2")
 groups=("kde1")
 depends=("qt1" "libpng" "libjpeg-turbo" "libtiff")
 makedepends=("cmake")
-_commit="98b923b0a56423c6de5c5f2f68f457249b3e3cf6"
-source=("https://github.com/KDE/$pkgname/archive/$_commit.zip"
-        "KDE1Macros.patch")
-sha256sums=('be19075ccddb1141267cc445a3025ebb4654d0dc4e928580c571f16c699c59a6'
-            'd7adbb94ba65fc0d37c5e8ad4975a2c550562dae9131ff23086507a17d4cdba9')
+_commit="045c89f8a71d521897bb6ac2447f0d396c2d1016"
+source=("https://github.com/KDE/$pkgname/archive/$_commit.zip")
+sha256sums=('7270c0e1d5fc55643a1faabae0003a6a1b39ade5ce6465d8965fe2bc3acd4409')
 
-prepare() {
-  cd $srcdir/$pkgname-$_commit
-  patch -p1 cmake/KDE1Macros.cmake < $srcdir/KDE1Macros.patch
-}
+#prepare() {
+#  cd $srcdir/$pkgname-$_commit
+#  patch -p1 cmake/KDE1Macros.cmake < $srcdir/KDE1Macros.patch
+#}
 
 build() {
   cd $srcdir/$pkgname-$_commit