cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deskutils/semantik: update to 1.2.8

This commit is contained in:
Tobias C. Berner 2022-05-23 17:23:00 +02:00
parent 0fe75f2c79
commit 783e985f0d
6 changed files with 5 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deskutils/semantik/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= semantik
DISTVERSION= 1.2.7
DISTVERSION= 1.2.8
CATEGORIES= deskutils kde
MASTER_SITES= https://waf.io/

6
deskutils/semantik/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1626329172
SHA256 (semantik-1.2.7.tar.bz2) = 6544bb9aef29a680570eae864986ef56fd45b75778f38c85efd99f20b82f069d
SIZE (semantik-1.2.7.tar.bz2) = 628473
TIMESTAMP = 1653319124
SHA256 (semantik-1.2.8.tar.bz2) = cb2505577fe386240abbbebcc29fc697606dd576bd3d0401fba3a49de40249a6
SIZE (semantik-1.2.8.tar.bz2) = 628492

25
deskutils/semantik/files/patch-wscript
View File

@ -1,25 +0,0 @@
--- wscript.orig 2021-07-15 06:06:13 UTC
+++ wscript
@@ -220,21 +220,11 @@ def configure(conf):
conf.env.append_value('LIB_KDECORE', 'KF5KDELibs4Support')
- kdelibs4support_candidates = ['', '/usr/include/KF5/KDELibs4Support', '/usr/local/include/KF5/KDELibs4Support']
+ kdelibs4support_candidates = ['@@LOCALBASE@@/include/KF5/KDELibs4Support', "bogus"]
for x in kdelibs4support_candidates:
conf.env.stash()
if os.path.exists(x):
conf.env.append_value('INCLUDES_KDECORE', x)
- try:
- conf.check(fragment='#include <kio/job.h>\n#include <KDE/KDialog>\n',
- features='cxx qt5',
- msg='Checking for kdelibs4support %s' % x,
- use='KDECORE QT5CORE QT5GUI QT5WIDGETS')
- break
- except conf.errors.ConfigurationError:
- conf.env.revert()
- else:
- conf.fatal('kdelibs4support was not found, check the config.log file')
for x in ('', '/usr/local/include'):
conf.env.stash()

11
deskutils/semantik/pkg-plist
View File

@ -6,16 +6,6 @@ lib/libsemantik.so.%%PORTVERSION%%
man/man1/semantik.1.gz
share/applications/semantik-d.desktop
share/applications/semantik.desktop
share/icons/hicolor/128x128/apps/semantik-d.png
share/icons/hicolor/128x128/apps/semantik.png
share/icons/hicolor/22x22/apps/semantik-d.png
share/icons/hicolor/22x22/apps/semantik.png
share/icons/hicolor/32x32/apps/semantik-d.png
share/icons/hicolor/32x32/apps/semantik.png
share/icons/hicolor/48x48/apps/semantik-d.png
share/icons/hicolor/48x48/apps/semantik.png
share/icons/hicolor/64x64/apps/semantik-d.png
share/icons/hicolor/64x64/apps/semantik.png
share/icons/hicolor/scalable/apps/semantik-d.svg
share/icons/hicolor/scalable/apps/semantik.svg
share/kxmlgui5/semantik-d/semantik-dui.rc
@ -73,6 +63,7 @@ share/mime/packages/semantik.xml
%%DATADIR%%/templates/java/Mapview.java
%%DATADIR%%/templates/java/main.html
%%DATADIR%%/templates/java/run.sh
%%DATADIR%%/templates/markdown.sem.py
%%DATADIR%%/templates/odp.sem.py
%%DATADIR%%/templates/odp/content.xml
%%DATADIR%%/templates/odp/manifest.xml

92
finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19
View File

@ -1,92 +0,0 @@
From 3894d1d013310d9212c1df42dbde2161dec16645 Mon Sep 17 00:00:00 2001
From: Klaas Freitag <kraft@freisturz.de>
Date: Sat, 9 Oct 2021 12:00:44 +0200
Subject: [PATCH 1/2] Merge pull request #116 from
kossebau/prepareforakonadi2112
Adapt to new Akonadi includes in Akonadi 5.19
---
src/addressprovider_akonadi.cpp | 15 ++++++++++++++-
src/addressprovider_akonadi.h | 8 +++++++-
src/addressselectorwidget.cpp | 6 ++++++
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git src/addressprovider_akonadi.cpp src/addressprovider_akonadi.cpp
index edb9d0c..4a809a8 100644
--- src/addressprovider_akonadi.cpp
+++ src/addressprovider_akonadi.cpp
@@ -21,16 +21,29 @@
#include <QDebug>
#ifdef HAVE_AKONADI
+#include "akonadi/contact/contactsearchjob.h"
+#include <akonadi_version.h>
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include <Akonadi/ItemFetchJob>
+#include <Akonadi/ItemFetchScope>
+
+#include <Akonadi/CollectionFetchJob>
+
+#include <Akonadi/ItemFetchJob>
+#include <Akonadi/ItemFetchScope>
+#include <Akonadi/EntityDisplayAttribute>
+#include <Akonadi/Control>
+#else
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
-#include "akonadi/contact/contactsearchjob.h"
#include <AkonadiCore/CollectionFetchJob>
#include <AkonadiCore/ItemFetchJob>
#include <AkonadiCore/ItemFetchScope>
#include <AkonadiCore/entitydisplayattribute.h>
#include <AkonadiCore/control.h>
+#endif
using namespace Akonadi;
#endif
diff --git src/addressprovider_akonadi.h src/addressprovider_akonadi.h
index fde0f44..14f6aa2 100644
--- src/addressprovider_akonadi.h
+++ src/addressprovider_akonadi.h
@@ -25,9 +25,15 @@
#ifdef HAVE_AKONADI
#include <kjob.h>
+#include <akonadi/contact/contactstreemodel.h>
+#include <akonadi_version.h>
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include <Akonadi/Session>
+#include <Akonadi/ChangeRecorder>
+#else
#include <AkonadiCore/session.h>
#include <AkonadiCore/changerecorder.h>
-#include <akonadi/contact/contactstreemodel.h>
+#endif
#endif
class QAbstractItemModel;
diff --git src/addressselectorwidget.cpp src/addressselectorwidget.cpp
index ad450c9..bf0c95d 100644
--- src/addressselectorwidget.cpp
+++ src/addressselectorwidget.cpp
@@ -37,9 +37,15 @@
#include <kcontacts/contactgroup.h>
#ifdef HAVE_AKONADI
+#include <akonadi_version.h>
+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
+#include <Akonadi/EntityTreeModel>
+#include <Akonadi/EntityTreeView>
+#else
#include <entitytreemodel.h>
#include <entitytreeview.h>
#endif
+#endif
/* ==================================================================== */
AddressSortProxyModel::AddressSortProxyModel(AddressProvider *provider, QObject *parent)
--
2.36.0

69
finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04
View File

@ -1,69 +0,0 @@
From e492e3d78520ff02aa4626f447ab2eea97cab2cc Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Sun, 24 Apr 2022 17:45:57 +0200
Subject: [PATCH 2/2] Fix build with akonadi-contacts 22.04
---
src/addressprovider_akonadi.cpp | 7 ++++++-
src/addressprovider_akonadi.h | 5 +++++
src/addressselectorwidget.h | 7 ++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git src/addressprovider_akonadi.cpp src/addressprovider_akonadi.cpp
index 4a809a8..33e232a 100644
--- src/addressprovider_akonadi.cpp
+++ src/addressprovider_akonadi.cpp
@@ -21,7 +21,12 @@
#include <QDebug>
#ifdef HAVE_AKONADI
-#include "akonadi/contact/contactsearchjob.h"
+#include <AkonadiContact/akonadi-contact_version.h>
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
+#include <AkonadiContact/akonadi/contactsearchjob.h>
+#else
+#include <akonadi/contact/contactsearchjob.h>
+#endif
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/ItemFetchJob>
diff --git src/addressprovider_akonadi.h src/addressprovider_akonadi.h
index 14f6aa2..4130f8a 100644
--- src/addressprovider_akonadi.h
+++ src/addressprovider_akonadi.h
@@ -25,7 +25,12 @@
#ifdef HAVE_AKONADI
#include <kjob.h>
+#include <AkonadiContact/akonadi-contact_version.h>
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
+#include <AkonadiContact/akonadi/contactstreemodel.h>
+#else
#include <akonadi/contact/contactstreemodel.h>
+#endif
#include <akonadi_version.h>
#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
#include <Akonadi/Session>
diff --git src/addressselectorwidget.h src/addressselectorwidget.h
index cb3428e..7a661c6 100644
--- src/addressselectorwidget.h
+++ src/addressselectorwidget.h
@@ -23,9 +23,14 @@
#include <QSplitter>
#ifdef HAVE_AKONADI
+#include <AkonadiContact/akonadi-contact_version.h>
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
+#include <AkonadiContact/Akonadi/ContactViewer>
+#include <AkonadiContact/Akonadi/ContactEditorDialog>
+#else
#include <Akonadi/Contact/ContactViewer>
#include <Akonadi/Contact/ContactEditorDialog>
-
+#endif
#endif
#include <kcontacts/addressee.h>
--
2.36.0