aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPouria Rezaei <Pouria.rz@outlook.com>2024-07-12 23:07:12 +0330
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2024-07-13 07:49:14 +0700
commitd9097ddfcc8d1b1737bcc8a0123021c02906c2eb (patch)
treeef0b50f82e5886c0cdbef9939dd0d2ecae92f7aa
parentc97e0dcba4c601ea330aabb2f7eaa51eb72a3a93 (diff)
system/kvantum-qt5: Updated to 1.1.2.
Signed-off-by: Pouria Rezaei <Pouria.rz@outlook.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/kvantum-qt5/doinst.sh5
-rw-r--r--system/kvantum-qt5/fix-kvantum-options.patch93
-rw-r--r--system/kvantum-qt5/kvantum-qt5.SlackBuild20
-rw-r--r--system/kvantum-qt5/kvantum-qt5.info6
4 files changed, 107 insertions, 17 deletions
diff --git a/system/kvantum-qt5/doinst.sh b/system/kvantum-qt5/doinst.sh
new file mode 100644
index 000000000000..4110f5514d7c
--- /dev/null
+++ b/system/kvantum-qt5/doinst.sh
@@ -0,0 +1,5 @@
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/system/kvantum-qt5/fix-kvantum-options.patch b/system/kvantum-qt5/fix-kvantum-options.patch
new file mode 100644
index 000000000000..2f4ebbfe4177
--- /dev/null
+++ b/system/kvantum-qt5/fix-kvantum-options.patch
@@ -0,0 +1,93 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bf12898..6fc94ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,12 +8,12 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ endif()
+
+ option(ENABLE_QT4 "Building Qt4 plugin." OFF)
+-option(ENABLE_QT5 "Building Qt5 plugin." OFF)
++option(ENABLE_QT5 "Building Qt5 plugin." ON)
+ option(WITHOUT_KF "Compiling without KDE Frameworks..." OFF)
+
+ add_subdirectory(style)
+ if(NOT ENABLE_QT4)
+- if(NOT ENABLE_QT5)
++ if(ENABLE_QT5)
+ add_subdirectory(kvantumpreview)
+ add_subdirectory(kvantummanager)
+ add_subdirectory(themes)
+diff --git a/kvantummanager/CMakeLists.txt b/kvantummanager/CMakeLists.txt
+index 89e2558..c5d61c0 100644
+--- a/kvantummanager/CMakeLists.txt
++++ b/kvantummanager/CMakeLists.txt
+@@ -1,12 +1,11 @@
+ set(QT5_MINIMUM_VERSION "5.15.0")
+ set(QT6_MINIMUM_VERSION "6.2.0")
+
+-if(NOT ENABLE_QT5)
+- set(QT_VERSION_MAJOR 6)
+- find_package(Qt6 "${QT6_MINIMUM_VERSION}" REQUIRED COMPONENTS Core Gui Widgets Svg)
+-else()
++if(ENABLE_QT5)
+ set(QT_VERSION_MAJOR 5)
+ find_package(Qt5 "${QT5_MINIMUM_VERSION}" REQUIRED COMPONENTS Core Gui Widgets Svg)
++else()
++ message(FATAL_ERROR "Non-Qt5 is not supported in this build.")
+ endif()
+
+ find_package(Qt${QT_VERSION_MAJOR} QUIET COMPONENTS LinguistTools)
+diff --git a/kvantumpreview/CMakeLists.txt b/kvantumpreview/CMakeLists.txt
+index ab934b5..30c493a 100644
+--- a/kvantumpreview/CMakeLists.txt
++++ b/kvantumpreview/CMakeLists.txt
+@@ -1,12 +1,11 @@
+ set(QT5_MINIMUM_VERSION "5.15.0")
+ set(QT6_MINIMUM_VERSION "6.2.0")
+
+-if(NOT ENABLE_QT5)
+- set(QT_VERSION_MAJOR 6)
+- find_package(Qt6 "${QT6_MINIMUM_VERSION}" REQUIRED COMPONENTS Core Gui Widgets)
+-else()
++if(ENABLE_QT5)
+ set(QT_VERSION_MAJOR 5)
+ find_package(Qt5 "${QT5_MINIMUM_VERSION}" REQUIRED COMPONENTS Core Gui Widgets)
++else()
++ message(FATAL_ERROR "Non-Qt5 is not supported in this build.")
+ endif()
+
+ find_package(Qt${QT_VERSION_MAJOR} QUIET COMPONENTS LinguistTools)
+diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt
+index e59cb61..48c6e47 100644
+--- a/style/CMakeLists.txt
++++ b/style/CMakeLists.txt
+@@ -4,25 +4,15 @@ set(KF5_MINIMUM_VERSION "5.82.0")
+ set(KF6_MINIMUM_VERSION "6.0.0")
+
+ if(NOT ENABLE_QT4)
+- if(NOT ENABLE_QT5)
+- set(QT_VERSION_MAJOR 6)
+- find_package(Qt6 "${QT6_MINIMUM_VERSION}" REQUIRED COMPONENTS Core Gui Widgets Svg)
+- if(NOT WITHOUT_KF)
+- find_package(KF6WindowSystem "${KF6_MINIMUM_VERSION}" REQUIRED)
+- endif()
+- else()
++ if(ENABLE_QT5)
+ set(QT_VERSION_MAJOR 5)
+ find_package(Qt5 "${QT5_MINIMUM_VERSION}" REQUIRED COMPONENTS Core Gui Widgets Svg X11Extras)
+ if(NOT WITHOUT_KF)
+- find_package(KF5WindowSystem "${KF5_MINIMUM_VERSION}" REQUIRED)
++ find_package(KF5WindowSystem "${KF5_MINIMUM_VERSION}" REQUIRED)
+ endif()
++ else()
++ message(FATAL_ERROR "Non-Qt5 is not supported in this build.")
+ endif()
+-else()
+- set(QT_VERSION_MAJOR 4)
+- find_package(Qt4 4.8.7 REQUIRED)
+-
+- include(${QT_USE_FILE})
+- add_definitions(${QT_DEFINITIONS})
+ endif()
+
+ find_package(X11 REQUIRED)
diff --git a/system/kvantum-qt5/kvantum-qt5.SlackBuild b/system/kvantum-qt5/kvantum-qt5.SlackBuild
index ae8e8c69c356..a322ea5817d6 100644
--- a/system/kvantum-qt5/kvantum-qt5.SlackBuild
+++ b/system/kvantum-qt5/kvantum-qt5.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Kvantum
-# Copyright 2019-2022 Pouria Rezaei <Pouria.rz@outlook.com>
+# Copyright 2019-2024 Pouria Rezaei <Pouria.rz@outlook.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=kvantum-qt5
-VERSION=${VERSION:-1.0.10}
+VERSION=${VERSION:-1.1.2}
SRCNAM=Kvantum
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -47,25 +47,13 @@ fi
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-QTVER=$(qmake -v 2>&1 | grep -oP '(?<=Qt version )[^ ]+')
-
-# This is as far as it goes, kvantum-qt6 is needed after this point.
-if [[ ! "$QTVER" == 5* ]]; then
- exit 1
-fi
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -78,6 +66,9 @@ tar -xvf $CWD/$SRCNAM-$VERSION.tar.xz
mv $SRCNAM-$VERSION/$SRCNAM $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
+# We'll make you work with Qt5, don't worry.
+patch -p1 < "$CWD/fix-kvantum-options.patch"
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -107,6 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/kvantum-qt5/kvantum-qt5.info b/system/kvantum-qt5/kvantum-qt5.info
index 5024f31bf2b5..91157a50dafb 100644
--- a/system/kvantum-qt5/kvantum-qt5.info
+++ b/system/kvantum-qt5/kvantum-qt5.info
@@ -1,8 +1,8 @@
PRGNAM="kvantum-qt5"
-VERSION="1.0.10"
+VERSION="1.1.2"
HOMEPAGE="https://github.com/tsujan/Kvantum"
-DOWNLOAD="https://github.com/tsujan/Kvantum/releases/download/V1.0.10/Kvantum-1.0.10.tar.xz"
-MD5SUM="3746a454e30ddb5ecf5cef6d4c124bc5"
+DOWNLOAD="https://github.com/tsujan/Kvantum/releases/download/V1.1.2/Kvantum-1.1.2.tar.xz"
+MD5SUM="5f492b66ba73d2edc4701bbef66b3912"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""