[arch-commits] Commit in qt5ct/repos/community-x86_64 (4 files)

[Antonio Rojas]

    Date: Friday, October 1, 2021 @ 18:10:08
  Author: arojas
Revision: 1026517

archrelease: copy trunk to community-x86_64

Added:
  qt5ct/repos/community-x86_64/PKGBUILD
    (from rev 1026516, qt5ct/trunk/PKGBUILD)
  qt5ct/repos/community-x86_64/qt5ct-datadir.patch
    (from rev 1026516, qt5ct/trunk/qt5ct-datadir.patch)
Deleted:
  qt5ct/repos/community-x86_64/PKGBUILD
  qt5ct/repos/community-x86_64/qt5ct-datadir.patch

---------------------+
 PKGBUILD            |   59 +++++++++++++++++++++++++++-----------------------
 qt5ct-datadir.patch |   28 +++++++++++------------
 2 files changed, 46 insertions(+), 41 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-01 18:09:55 UTC (rev 1026516)
+++ PKGBUILD	2021-10-01 18:10:08 UTC (rev 1026517)
@@ -1,27 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: FadeMind <fademind at gmail.com>
-# Contributor: Zatherz <zatherz at linux dot pl>
-
-pkgname=qt5ct
-pkgver=1.3
-pkgrel=1
-pkgdesc='Qt5 Configuration Utility'
-arch=(x86_64)
-url='https://qt5ct.sourceforge.io/'
-license=(BSD)
-depends=(qt5-svg)
-makedepends=(cmake qt5-tools)
-source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('dd443b14e590aff76a16e1316d56e688882e3248c470df4f71bc952569f3c3bc')
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  install -Dm644 $pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-} 

Copied: qt5ct/repos/community-x86_64/PKGBUILD (from rev 1026516, qt5ct/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-10-01 18:10:08 UTC (rev 1026517)
@@ -0,0 +1,32 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: FadeMind <fademind at gmail.com>
+# Contributor: Zatherz <zatherz at linux dot pl>
+
+pkgname=qt5ct
+pkgver=1.4
+pkgrel=1
+pkgdesc='Qt5 Configuration Utility'
+arch=(x86_64)
+url='https://qt5ct.sourceforge.io/'
+license=(BSD)
+depends=(qt5-svg)
+makedepends=(cmake qt5-tools)
+source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('645dc4756a7807acc5f3b53f8d216e90d0a02666c62e57569bf463332b605e2c')
+
+build() {
+#  cmake -B build -S $pkgname-$pkgver \
+#    -DCMAKE_INSTALL_PREFIX=/usr
+#  cmake --build build
+  cd $pkgname-$pkgver
+  qmake-qt5
+  make
+}
+
+package() {
+#  DESTDIR="$pkgdir" cmake --install build
+
+  cd $pkgname-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+} 

Deleted: qt5ct-datadir.patch
===================================================================
--- qt5ct-datadir.patch	2021-10-01 18:09:55 UTC (rev 1026516)
+++ qt5ct-datadir.patch	2021-10-01 18:10:08 UTC (rev 1026517)
@@ -1,14 +0,0 @@
-diff -ru qt5ct-1.2/CMakeLists.txt qt5ct-1.2.orig/CMakeLists.txt
---- qt5ct-1.2.orig/CMakeLists.txt	2021-04-20 21:29:54.000000000 +0200
-+++ qt5ct-1.2/CMakeLists.txt	2021-04-20 21:53:46.049860142 +0200
-@@ -54,8 +54,8 @@
- add_subdirectory(src/qt5ct-qtplugin)
- add_subdirectory(src/qt5ct-style)
- 
--install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR})
--install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR})
-+install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
-+install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
- 
- if(UNIX)
-     add_custom_target(distclean @echo cleaning for source distribution)

Copied: qt5ct/repos/community-x86_64/qt5ct-datadir.patch (from rev 1026516, qt5ct/trunk/qt5ct-datadir.patch)
===================================================================
--- qt5ct-datadir.patch	                        (rev 0)
+++ qt5ct-datadir.patch	2021-10-01 18:10:08 UTC (rev 1026517)
@@ -0,0 +1,14 @@
+diff -ru qt5ct-1.2/CMakeLists.txt qt5ct-1.2.orig/CMakeLists.txt
+--- qt5ct-1.2.orig/CMakeLists.txt	2021-04-20 21:29:54.000000000 +0200
++++ qt5ct-1.2/CMakeLists.txt	2021-04-20 21:53:46.049860142 +0200
+@@ -54,8 +54,8 @@
+ add_subdirectory(src/qt5ct-qtplugin)
+ add_subdirectory(src/qt5ct-style)
+ 
+-install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR})
+-install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR})
++install(DIRECTORY qss DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
++install(DIRECTORY colors DESTINATION ${CMAKE_INSTALL_DATADIR}/qt5ct)
+ 
+ if(UNIX)
+     add_custom_target(distclean @echo cleaning for source distribution)