From c4ca3bb5da4d29067af0a47ded23bdc1a02856ef Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 5 Oct 2022 14:52:47 +0300 Subject: [PATCH] pisi rebuild qt6 --- system/base/pisi/files/qt6-actionsapi.patch | 80 +++++++++++++++++++++ system/base/pisi/pspec.xml | 10 ++- 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 system/base/pisi/files/qt6-actionsapi.patch diff --git a/system/base/pisi/files/qt6-actionsapi.patch b/system/base/pisi/files/qt6-actionsapi.patch new file mode 100644 index 00000000..0d749622 --- /dev/null +++ b/system/base/pisi/files/qt6-actionsapi.patch @@ -0,0 +1,80 @@ +diff -Nuar a/pisi/actionsapi/qt6.py b/pisi/actionsapi/qt6.py +--- a/pisi/actionsapi/qt6.py 1970-01-01 02:00:00.000000000 +0200 ++++ b/pisi/actionsapi/qt6.py 2020-12-31 20:28:31.441916203 +0300 +@@ -0,0 +1,76 @@ ++# -*- coding: utf-8 -*- ++# ++# Copyright (C) 2010 TUBITAK/UEKAE ++# ++# This program is free software; you can redistribute it and/or modify it under ++# the terms of the GNU General Public License as published by the Free ++# Software Foundation; either version 2 of the License, or (at your option) ++# any later version. ++# ++# Please read the COPYING file. ++ ++import glob ++import gettext ++__trans = gettext.translation('pisi', fallback=True) ++_ = __trans.ugettext ++ ++# Pisi Modules ++import pisi.context as ctx ++ ++# ActionsAPI Modules ++import pisi.actionsapi ++ ++# ActionsAPI Modules ++from pisi.actionsapi import get ++from pisi.actionsapi import cmaketools ++from pisi.actionsapi import shelltools ++ ++basename = "qt6" ++ ++prefix = "/%s" % get.defaultprefixDIR() ++libdir = "%s/lib" % prefix ++libexecdir = "%s/libexec" % prefix ++sysconfdir= "/etc" ++bindir = "%s/bin" % prefix ++includedir = "%s/include" % prefix ++ ++# qt6 spesific variables ++ ++headerdir = "%s/include/%s" % (prefix, basename) ++datadir = "%s/share/%s" % (prefix, basename) ++docdir = "/%s/%s" % (get.docDIR(), basename) ++archdatadir = "%s/%s" % (libdir, basename) ++mkspecsdir = "%s/%s/mkspecs" % (libdir, basename) ++examplesdir = "%s/%s/examples" % (libdir, basename) ++importdir = "%s/%s/imports" % (libdir, basename) ++plugindir = "%s/%s/plugins" % (libdir, basename) ++qmldir = "%s/%s/qml" % (libdir, basename) ++testdir = "%s/share/%s" % (prefix, basename) ++translationdir = "%s/translations" % datadir ++ ++#Temporary bindir to avoid qt5 conflicts ++qmake = "%s/qmake-qt6" % bindir ++#qmake = "%s/qmake-qt6" % bindir ++ ++class ConfigureError(pisi.actionsapi.Error): ++ def __init__(self, value=''): ++ pisi.actionsapi.Error.__init__(self, value) ++ self.value = value ++ ctx.ui.error(value) ++ ++def configure(projectfile='', parameters='', installPrefix=prefix): ++ if projectfile != '' and not shelltools.can_access_file(projectfile): ++ raise ConfigureError(_("Project file '%s' not found.") % projectfile) ++ ++ profiles = glob.glob("*.pro") ++ if len(profiles) > 1 and projectfile == '': ++ raise ConfigureError(_("It seems there are more than one .pro file, you must specify one. (Possible .pro files: %s)") % ", ".join(profiles)) ++ ++ shelltools.system("%s -makefile %s PREFIX='%s' QMAKE_CFLAGS+='%s' QMAKE_CXXFLAGS+='%s' %s" % (qmake, projectfile, installPrefix, get.CFLAGS(), get.CXXFLAGS(), parameters)) ++ ++def make(parameters=''): ++ cmaketools.make(parameters) ++ ++def install(parameters='', argument='install'): ++ cmaketools.install('INSTALL_ROOT="%s" %s' % (get.installDIR(), parameters), argument) ++ diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml index adceb91d..5aaac792 100644 --- a/system/base/pisi/pspec.xml +++ b/system/base/pisi/pspec.xml @@ -25,6 +25,7 @@ 0001-PackageKit-Search-Bug-Fix.patch pot_file_and_ru_translation.patch + qt6-actionsapi.patch @@ -75,7 +76,14 @@ - + + 2022-10-05 + 2.7.2 + Rebuild qt6 actionsapi. + Mustafa Cinasal + muscnsl@gmail.com + + 2022-07-23 2.7.2 Rebuild.