git » kde-gtk-config.git » commit 5c6a929

diff --git a/PKGBUILD b/PKGBUILD
index bb386e6..1ad2904 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kde-gtk-config
-pkgver=5.16.4
+pkgver=5.16.5
 pkgrel=1
 pkgdesc='GTK2 and GTK3 Configurator for KDE'
 arch=(x86_64)
@@ -13,11 +13,9 @@ depends=(systemsettings gtk3)
 makedepends=(extra-cmake-modules gtk2)
 optdepends=('gtk2: GTK2 apps support')
 groups=(plasma)
-source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
-         kde-gtk-config-pango-1.44.patch)
-sha256sums=('c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c'
-            'SKIP'
-            'd91a3474d524686941f772b127c49e312adabe8ee2a44c9308061110b91173c8')
+source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('f78abf129aaa7afac2c7a71105b36b9553a975bbcb89ec65a0166099d1cca8c1'
+            'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr@jriddell.org>
               '0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D'  # Bhushan Shah <bshah@kde.org>
               'D07BD8662C56CB291B316EB2F5675605C74E02CF'  # David Edmundson <davidedmundson@kde.org>
@@ -25,16 +23,11 @@ validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell <jr
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../kde-gtk-config-pango-1.44.patch # Fix build with pango 1.44
 }
 
 build() {
   cd build
   cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DBUILD_TESTING=OFF
   make
diff --git a/kde-gtk-config-pango-1.44.patch b/kde-gtk-config-pango-1.44.patch
deleted file mode 100644
index 2c41bca..0000000
--- a/kde-gtk-config-pango-1.44.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/cmake/modules/FindGTK3.cmake b/cmake/modules/FindGTK3.cmake
-index f178523..b5a6efb 100644
---- a/cmake/modules/FindGTK3.cmake
-+++ b/cmake/modules/FindGTK3.cmake
-@@ -110,6 +110,24 @@ FIND_LIBRARY(
- 	PANGO_LIBRARY NAMES pango-1.0
- 	HINTS ${PC_PANGO_LIBDIR} ${PC_PANGO_LIBRARY_DIRS})
- 
-+#
-+# harfbuzz
-+#
-+if(PC_PANGO_VERSION VERSION_EQUAL 1.44 OR PC_PANGO_VERSION VERSION_GREATER 1.44)
-+    PKG_CHECK_MODULES(PC_HARFBUZZ REQUIRED harfbuzz)
-+
-+    SET(HARFBUZZ_DEFINITIONS ${PC_HARFBUZZ_CXXFLAGS_OTHER})
-+
-+    FIND_PATH(
-+            HARFBUZZ_INCLUDE_DIR hb.h
-+            HINTS ${PC_HARFBUZZ_INCLUDEDIR} ${PC_HARFBUZZ_INCLUDE_DIRS}
-+            PATH_SUFFIXES harfbuzz)
-+
-+    FIND_LIBRARY(
-+            HARFBUZZ_LIBRARY NAMES harfbuzz
-+            HINTS ${PC_HARFBUZZ_LIBDIR} ${PC_HARFBUZZ_LIBRARY_DIRS})
-+endif()
-+
- #
- # cairo
- #
-@@ -163,8 +181,8 @@ FIND_LIBRARY(
- #result
- #
- #
--SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
--SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GIO2_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
-+SET(GTK3_LIBRARY_DIRS ${GTK3_LIBRARY} ${GLIB2_LIBRARY} ${PANGO_LIBRARY} ${HARFBUZZ_LIBRARY} ${CAIRO_LIBRARY} ${GDKPIXBUF_LIBRARY} ${ATK_LIBRARY})
-+SET(GTK3_INCLUDE_DIRS ${GTK3_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GIO2_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR} ${PANGO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR} ${GDKPIXBUF_INCLUDE_DIR} ${ATK_INCLUDE_DIR})
- 
- INCLUDE(FindPackageHandleStandardArgs)
-