diff --git a/desktop/lookandfeel/kvantum/actions.py b/desktop/lookandfeel/kvantum/actions.py index 2b87a9dc5a..f1c0a3d3e6 100644 --- a/desktop/lookandfeel/kvantum/actions.py +++ b/desktop/lookandfeel/kvantum/actions.py @@ -4,17 +4,21 @@ # Licensed under the GNU General Public License, version 3. # See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import pisitools, qt5, get +from pisi.actionsapi import cmaketools, mesontools, pisitools, get WorkDir = "Kvantum-%s/Kvantum" % get.srcVERSION() def setup(): - qt5.configure() + pisitools.dosed("style/CMakeLists.txt", "Qt5\ Qt6", "Qt6") + cmaketools.configure("-DENABLE_QT5=ON -B_build5 -G Ninja") + cmaketools.configure("-DENABLE_QT5=OFF -B_build6 -G Ninja") def build(): - qt5.make() + mesontools.build("-C _build5") + mesontools.build("-C _build6") def install(): - qt5.install() + mesontools.install("-C _build5") + mesontools.install("-C _build6") pisitools.dodoc("ChangeLog") diff --git a/desktop/lookandfeel/kvantum/pspec.xml b/desktop/lookandfeel/kvantum/pspec.xml index cd9d351d84..27743413a5 100644 --- a/desktop/lookandfeel/kvantum/pspec.xml +++ b/desktop/lookandfeel/kvantum/pspec.xml @@ -8,13 +8,17 @@ PisiLinux Community admins@pisilinux.org - GPLv3 - app + GPL-3 + app:gui desktop.lookandfeel Kvantum is an SVG-based theme engine for Qt4/Qt5, KDE and LXQt. Kvantum Qt4 / Qt5, KDE ve LXQt için SVG tabanlı bir tema motorudur. - https://github.com/tsujan/Kvantum/releases/download/V1.0.2/Kvantum-1.0.2.tar.xz + + https://github.com/tsujan/Kvantum/releases/download/V1.0.7/Kvantum-1.0.7.tar.xz + + cmake + ninja libX11-devel qt5-linguist qt5-svg-devel @@ -24,6 +28,12 @@ kwindowsystem-devel qt5-x11extras-devel qt5-assistant-devel + + qt6-linguist + qt6-svg-devel + qt6-base-devel + qt6-designer-devel + qt6-assistant-devel @@ -33,20 +43,34 @@ libgcc libX11 qt5-svg + qt6-svg qt5-base + qt6-base kwindowsystem qt5-x11extras - /usr/bin - /usr/lib + /usr/bin/kvantummanager + /usr/bin/kvantumpreview + /usr/lib/qt5/plugins/styles/libkvantum.so + /usr/lib/qt6/plugins/styles/libkvantum.so /usr/share + /usr/share/color-schemes /usr/share/Kvantum + /usr/share/kvantummanager + /usr/share/kvantumpreview /usr/share/doc + + 2023-02-02 + 1.0.7 + Version bump and rebuild for Qt6. + fury + uglyside@yandex.ru + 2022-06-15 1.0.2 diff --git a/desktop/lookandfeel/kvantum/translations.xml b/desktop/lookandfeel/kvantum/translations.xml index da25643a18..18a0494746 100644 --- a/desktop/lookandfeel/kvantum/translations.xml +++ b/desktop/lookandfeel/kvantum/translations.xml @@ -2,7 +2,7 @@ Kvantum - Kvantum Qt4 / Qt5, KDE ve LXQt için SVG tabanlı bir tema motorudur. - Kvantum Qt4 / Qt5, KDE ve LXQt için SVG tabanlı bir tema motorudur. + Kvantum Qt5 / Qt6, KDE ve LXQt için SVG tabanlı bir tema motorudur. + Kvantum Qt5 / Qt6, KDE ve LXQt için SVG tabanlı bir tema motorudur. diff --git a/desktop/toolkit/qt6/qt6-tools/pspec.xml b/desktop/toolkit/qt6/qt6-tools/pspec.xml index e33ac0f9e3..946dce5b2c 100755 --- a/desktop/toolkit/qt6/qt6-tools/pspec.xml +++ b/desktop/toolkit/qt6/qt6-tools/pspec.xml @@ -43,6 +43,7 @@ llvm-libs llvm-clang qt6-base + qt6-sql-sqlite qt6-declarative diff --git a/desktop/toolkit/qt6/qt6ct/actions.py b/desktop/toolkit/qt6/qt6ct/actions.py new file mode 100644 index 0000000000..43f32a427e --- /dev/null +++ b/desktop/toolkit/qt6/qt6ct/actions.py @@ -0,0 +1,18 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file https://www.gnu.org/licenses/gpl-3.0.txt + +from pisi.actionsapi import cmaketools, mesontools, pisitools + +def setup(): + cmaketools.configure("-B_build -G Ninja -L") + +def build(): + mesontools.build("-C _build") + +def install(): + mesontools.install("-C _build") + + pisitools.dodoc("AUTHORS", "ChangeLog") diff --git a/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch b/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch new file mode 100644 index 0000000000..9e823adcb3 --- /dev/null +++ b/desktop/toolkit/qt6/qt6ct/files/alpine/find_lrelease.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe21597..1dd3266 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,7 +25,7 @@ ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DUSE_WIDGETS) + find_package(Qt6 COMPONENTS BuildInternals Widgets LinguistTools REQUIRED) + + #get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION) +-get_target_property(QT_LRELEASE_EXECUTABLE Qt6::lrelease IMPORTED_LOCATION) ++set(QT_LRELEASE_EXECUTABLE /usr/lib/qt6/bin/lrelease) + + #if(QT_QTPATHS_EXECUTABLE) + # message(STATUS "Found qtpaths executable: " ${QT_QTPATHS_EXECUTABLE}) diff --git a/desktop/toolkit/qt6/qt6ct/pspec.xml b/desktop/toolkit/qt6/qt6ct/pspec.xml new file mode 100644 index 0000000000..43d42854f0 --- /dev/null +++ b/desktop/toolkit/qt6/qt6ct/pspec.xml @@ -0,0 +1,56 @@ + + + + + qt6ct + https://github.com/trialuser02/qt6ct + + fury + uglyside@yandex.ru + + BSD-2-Clause + app:gui + desktop.toolkit.qt6 + Qt6 Configuration Tool. + This program allows users to configure Qt6 settings (theme, font, icons, etc.) under DE/WM without Qt integration. + + https://github.com/trialuser02/qt6ct/releases/download/0.7/qt6ct-0.7.tar.xz + + + cmake + ninja + ccache + qt6-linguist + qt6-svg-devel + qt6-base-devel + + + + alpine/find_lrelease.patch + + + + + qt6ct + + libgcc + qt6-svg + qt6-base + + + /usr/bin + /usr/lib/qt6/plugins + /usr/share + + + + + + 2023-02-02 + 0.7 + First build. + fury + uglyside@yandex.ru + + + diff --git a/hardware/disk/nilfs-utils/actions.py b/hardware/disk/nilfs-utils/actions.py index 82a47e1886..6c010723d2 100644 --- a/hardware/disk/nilfs-utils/actions.py +++ b/hardware/disk/nilfs-utils/actions.py @@ -16,5 +16,5 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s sbindir=/usr/sbin" % get.installDIR()) - + pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README") diff --git a/hardware/disk/nilfs-utils/pspec.xml b/hardware/disk/nilfs-utils/pspec.xml index 0e0af4b06d..e45a59651c 100644 --- a/hardware/disk/nilfs-utils/pspec.xml +++ b/hardware/disk/nilfs-utils/pspec.xml @@ -10,11 +10,11 @@ GPLv2 LGPLv2.1 - app:gui + app hardware.disk A log-structured file system supporting continuous snapshotting (userspace utils). NILFS is a log-structured file system supporting versioning of the entire file system and continuous snapshotting which allows users to even restore files mistakenly overwritten or destroyed just a few seconds ago. - https://nilfs.sourceforge.io/download/nilfs-utils-2.2.8.tar.bz2 + https://nilfs.sourceforge.io/download/nilfs-utils-2.2.9.tar.bz2 libutil-linux-devel @@ -38,7 +38,6 @@ nilfs-utils-devel - nilfs-utils için geliştirm edosyaları nilfs-utils @@ -48,6 +47,13 @@ + + 2023-02-01 + 2.2.9 + Version bump. + fury + uglyside@yandex.ru + 2021-01-12 2.2.8