semantik: fix for new kf5
This commit is contained in:
parent
4b6301d656
commit
2fce45391a
2 changed files with 15 additions and 6 deletions
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, wafHook
|
||||
, pkg-config
|
||||
, cmake
|
||||
|
@ -33,7 +34,14 @@ mkDerivation rec {
|
|||
sha256 = "sha256-aXOokji6fYTpaeI/IIV+5RnTE2Cm8X3WfADf4Uftkss=";
|
||||
};
|
||||
|
||||
patches = [ ./qt5.patch ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-kdelibs4support.patch";
|
||||
url = "https://gitlab.com/ita1024/semantik/-/commit/a991265bd6e3ed6541f8ec099420bc08cc62e30c.patch";
|
||||
sha256 = "sha256-E4XjdWfUnqhmFJs9ORznHoXMDS9zHWNXvQIKKkN4AAo=";
|
||||
})
|
||||
./qt5.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
echo "${lib.getDev qtwebengine}"
|
||||
|
|
|
@ -40,14 +40,14 @@ diff --color -ur a/wscript b/wscript
|
|||
if not os.path.exists(specpath):
|
||||
raise ValueError('No spec path, cannot build')
|
||||
|
||||
@@ -196,17 +220,28 @@
|
||||
@@ -196,17 +220,29 @@
|
||||
|
||||
conf.env.append_value('INCLUDES_KDECORE', specpath)
|
||||
|
||||
- libs = ['KF5KIOCore', 'KF5Auth', 'KF5KIOWidgets',
|
||||
- 'KF5IconThemes', 'KF5ConfigWidgets', 'KF5XmlGui',
|
||||
- 'KF5CoreAddons', 'KF5ConfigGui', 'KF5ConfigCore',
|
||||
- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi']
|
||||
- 'KF5WidgetsAddons', 'KF5I18n', 'KF5SonnetUi', 'KF5AuthCore']
|
||||
+ libs = {
|
||||
+ 'KF5KIOCore': '@KF5KIOCore_dev@',
|
||||
+ 'KF5Auth': '@KF5Auth_dev@',
|
||||
|
@ -61,6 +61,7 @@ diff --color -ur a/wscript b/wscript
|
|||
+ 'KF5WidgetsAddons': '@KF5WidgetsAddons_dev@',
|
||||
+ 'KF5I18n': '@KF5I18n_dev@',
|
||||
+ 'KF5SonnetUi': '@KF5SonnetUi_dev@',
|
||||
+ 'KF5AuthCore': '@KF5Auth_dev@',
|
||||
+ }
|
||||
|
||||
- for lib in libs:
|
||||
|
@ -73,6 +74,6 @@ diff --color -ur a/wscript b/wscript
|
|||
- p = '%s/qt_%s.pri' % (path, name)
|
||||
+ p = '%s/qt_%s.pri' % (mkspec_path+"/mkspecs/modules", name)
|
||||
+ print("[log] path :",path,", name : ",name)
|
||||
for line in Utils.readf(p).splitlines():
|
||||
lst = line.strip().split(' = ')
|
||||
if lst[0].endswith('.name'):
|
||||
try:
|
||||
code = Utils.readf(p)
|
||||
except EnvironmentError:
|
||||
|
|
Loading…
Reference in a new issue