Update to version 1.8.1

3 files changed, 54 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f76882a7d2e5..91c6b0c56a7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = copperspice
 	pkgdesc = Libraries for developing cross platform software applications in C++
-	pkgver = 1.8.0
+	pkgver = 1.8.1
 	pkgrel = 1
 	url = https://www.copperspice.com/
 	arch = x86_64
@@ -42,9 +42,9 @@ pkgbase = copperspice
 	optdepends = mariadb-libs: for MySQL database support
 	optdepends = postgresql-libs: for PostgreSQL database support
 	options = !lto
-	source = https://github.com/copperspice/copperspice/archive/cs-1.8.0/copperspice-1.8.0.tar.gz
+	source = https://github.com/copperspice/copperspice/archive/cs-1.8.1/copperspice-1.8.1.tar.gz
 	source = 010-copperspice-fix-cmake-include-dirs.patch
-	sha256sums = 33eecd475f77b347343806e94d80efc68523acae3d382fba4a29b36a1d0cc505
-	sha256sums = f383d50fe4b3a6ba428dbc1a4822173aff1bd2ba57efb31c8bd977f75db5c3e8
+	sha256sums = c3992575bd9eaf01b0c5333c8fecb16c997201f6b56b703ae9f33d5a1a8e24e1
+	sha256sums = 1bef08debd977fb08861552e39e2752459c5fe9743d9d593bc135f5978df9c46
 
 pkgname = copperspice
diff --git a/010-copperspice-fix-cmake-include-dirs.patch b/010-copperspice-fix-cmake-include-dirs.patch
index 55e9988e6335..c382d2b8ca28 100644
--- a/010-copperspice-fix-cmake-include-dirs.patch
+++ b/010-copperspice-fix-cmake-include-dirs.patch
@@ -1,123 +1,134 @@
 --- a/src/core/CMakeLists.txt
 +++ b/src/core/CMakeLists.txt
-@@ -162,8 +162,8 @@ target_sources(CsCore
- 
- target_include_directories(CsCore
+@@ -26,8 +26,8 @@ target_include_directories(CsCore
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtCore>
 -   $<INSTALL_INTERFACE:include>
 -   $<INSTALL_INTERFACE:include/QtCore>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtCore>
  )
  
- if(MSVC)
+ include_directories(
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
-@@ -179,7 +179,7 @@ target_sources(CsGui
- 
+@@ -18,7 +18,7 @@ set(EXTRA_GUI_LDFLAGS)
  target_include_directories(CsGui
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtGui>
 -   $<INSTALL_INTERFACE:include/QtGui>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtGui>
-    ${OPENGL_INCLUDE_DIR}
  )
  
+ include_directories(
 --- a/src/multimedia/CMakeLists.txt
 +++ b/src/multimedia/CMakeLists.txt
-@@ -81,7 +81,7 @@ target_link_libraries(CsMultimedia
+@@ -14,7 +14,7 @@ set(EXTRA_MULTIMEDIA_LDFLAGS)
  target_include_directories(CsMultimedia
     PUBLIC
-    ${GSTREAMER_INCLUDE_DIRS}
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtMultimedia>
 -   $<INSTALL_INTERFACE:include/QtMultimedia>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtMultimedia>
  )
  
- set_target_properties(CsMultimedia
+ include_directories(
 --- a/src/network/CMakeLists.txt
 +++ b/src/network/CMakeLists.txt
-@@ -92,7 +92,7 @@ target_link_libraries(CsNetwork
- 
+@@ -36,7 +36,7 @@ endif()
  target_include_directories(CsNetwork
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtNetwork>
 -   $<INSTALL_INTERFACE:include/QtNetwork>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtNetwork>
  )
  
- set_target_properties(CsNetwork
+ include_directories(
 --- a/src/opengl/CMakeLists.txt
 +++ b/src/opengl/CMakeLists.txt
-@@ -130,7 +130,7 @@ function_variable_fixup("${EXTRA_OPENGL_LDFLAGS}"  EXTRA_OPENGL_LDFLAGS)
- 
+@@ -15,7 +15,7 @@ set(EXTRA_OPENGL_LDFLAGS)
  target_include_directories(CsOpenGL
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtOpenGL>
 -   $<INSTALL_INTERFACE:include/QtOpenGL>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtOpenGL>
  )
  
- target_link_libraries(CsOpenGL
+ include_directories(
 --- a/src/script/CMakeLists.txt
 +++ b/src/script/CMakeLists.txt
-@@ -569,7 +569,7 @@ target_sources(CsScript
- 
+@@ -37,7 +37,7 @@ set(EXTRA_SCRIPT_LDFLAGS)
  target_include_directories(CsScript
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtScript>
 -   $<INSTALL_INTERFACE:include/QtScript>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtScript>
  )
  
- target_link_libraries(CsScript
+ include_directories(
 --- a/src/sql/CMakeLists.txt
 +++ b/src/sql/CMakeLists.txt
-@@ -76,7 +76,7 @@ target_link_libraries(CsSql
- 
+@@ -15,7 +15,7 @@ set(EXTRA_SQL_LDFLAGS)
  target_include_directories(CsSql
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtSql>
 -   $<INSTALL_INTERFACE:include/QtSql>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtSql>
  )
  
- set_target_properties(CsSql
+ include_directories(
 --- a/src/svg/CMakeLists.txt
 +++ b/src/svg/CMakeLists.txt
-@@ -89,7 +89,7 @@ target_sources(CsSvg
- 
+@@ -13,7 +13,7 @@ set(EXTRA_SVG_LDFLAGS)
  target_include_directories(CsSvg
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtSvg>
 -   $<INSTALL_INTERFACE:include/QtSvg>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtSvg>
  )
  
- target_link_libraries(CsSvg
+ include_directories(
+--- a/src/vulkan/CMakeLists.txt
++++ b/src/vulkan/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(EXTRA_VULKAN_LDFLAGS)
+ target_include_directories(CsVulkan
+    PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtVulkan>
+-   $<INSTALL_INTERFACE:include/QtVulkan>
++   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtVulkan>
+ )
+ 
+ include_directories(
 --- a/src/webkit/CMakeLists.txt
 +++ b/src/webkit/CMakeLists.txt
-@@ -2432,7 +2432,7 @@ function_variable_fixup("${EXTRA_WEBKIT_LDFLAGS}"  EXTRA_WEBKIT_LDFLAGS)
- 
+@@ -39,7 +39,7 @@ endif()
  target_include_directories(CsWebKit
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtWebKit>
 -   $<INSTALL_INTERFACE:include/QtWebKit>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtWebKit>
  )
  
- target_link_libraries(CsWebKit
+ include_directories(
 --- a/src/xml/CMakeLists.txt
 +++ b/src/xml/CMakeLists.txt
-@@ -44,7 +44,7 @@ target_sources(CsXml
- 
+@@ -13,7 +13,7 @@ set(EXTRA_XML_LDFLAGS)
  target_include_directories(CsXml
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtXml>
 -   $<INSTALL_INTERFACE:include/QtXml>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtXml>
  )
  
- target_link_libraries(CsXml
+ include_directories(
 --- a/src/xmlpatterns/CMakeLists.txt
 +++ b/src/xmlpatterns/CMakeLists.txt
-@@ -67,7 +67,7 @@ target_sources(CsXmlPatterns
- 
+@@ -13,7 +13,7 @@ set(EXTRA_XMLPATTERNS_LDFLAGS)
  target_include_directories(CsXmlPatterns
     PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/QtXmlPatterns>
 -   $<INSTALL_INTERFACE:include/QtXmlPatterns>
 +   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/QtXmlPatterns>
  )
  
- target_link_libraries(CsXmlPatterns
+ include_directories(
diff --git a/PKGBUILD b/PKGBUILD
index 9b46be9cc5b3..7f5b59223723 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=copperspice
-pkgver=1.8.0
+pkgver=1.8.1
 pkgrel=1
 pkgdesc='Libraries for developing cross platform software applications in C++'
 arch=('x86_64')
@@ -19,8 +19,8 @@ makedepends=('cmake' 'alsa-lib' 'mariadb-libs' 'postgresql' 'postgresql-libs'
 options=('!lto')
 source=("https://github.com/copperspice/copperspice/archive/cs-${pkgver}/${pkgname}-${pkgver}.tar.gz"
         '010-copperspice-fix-cmake-include-dirs.patch')
-sha256sums=('33eecd475f77b347343806e94d80efc68523acae3d382fba4a29b36a1d0cc505'
-            'f383d50fe4b3a6ba428dbc1a4822173aff1bd2ba57efb31c8bd977f75db5c3e8')
+sha256sums=('c3992575bd9eaf01b0c5333c8fecb16c997201f6b56b703ae9f33d5a1a8e24e1'
+            '1bef08debd977fb08861552e39e2752459c5fe9743d9d593bc135f5978df9c46')
 
 prepare() {
     patch -d "copperspice-cs-${pkgver}" -Np1 -i "${srcdir}/010-copperspice-fix-cmake-include-dirs.patch"
@@ -32,12 +32,13 @@ build() {
         -DCMAKE_INSTALL_BINDIR:PATH='lib/copperspice/bin' \
         -DCMAKE_INSTALL_INCLUDEDIR:PATH='include/copperspice' \
         -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+        -DCMAKE_SKIP_RPATH:BOOL='YES' \
         -Wno-dev
     make -C build
 }
 
 package() {
-    make -C build DESTDIR="$pkgdir" install
+    DESTDIR="$pkgdir" cmake --install build
     
     local _file
     mkdir -p "${pkgdir}/usr/bin"