diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile index e8ac654443c1..bc6c9c8d4280 100644 --- a/deskutils/semantik/Makefile +++ b/deskutils/semantik/Makefile @@ -1,79 +1,79 @@ PORTNAME= semantik -DISTVERSION= 1.2.7 +DISTVERSION= 1.2.8 CATEGORIES= deskutils kde MASTER_SITES= https://waf.io/ MAINTAINER= kde@FreeBSD.org COMMENT= Mind mapping tool LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= kde:5 pkgconfig python:3.6+ qt:5 shebangfix tar:bzip2 waf \ desktop-file-utils gettext shared-mime-info USE_KDE= auth config configwidgets coreaddons i18n iconthemes \ kdelibs4support kio sonnet widgetsaddons xmlgui USE_LDCONFIG= yes USE_QT= core dbus declarative gui location network printsupport \ svg webchannel webengine widgets xml \ buildtools_build qmake_build SHEBANG_FILES= src/templates/beamer/wscript \ src/templates/pdflatex/wscript \ src/filters/fvym.py \ src/filters/kdissert.py \ src/filters/main.py \ src/filters/others.py \ src/filters/semantik.py \ src/sembind.py \ waf \ wscript CONFIGURE_ENV= PATH="${KDE_PREFIX}/bin:$$PATH" \ WAF_HOME="${WRKSRC}" MAKE_ENV= DESTDIR="${STAGEDIR}" CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include # Help WAF a bit more by simply adding the locations to the KF5 # headers ourselves... CXXFLAGS+= -I${LOCALBASE}/include/KF5/KAuthCore \ -I${LOCALBASE}/include/KF5/KConfigCore \ -I${LOCALBASE}/include/KF5/KConfigGui \ -I${LOCALBASE}/include/KF5/KConfigWidgets \ -I${LOCALBASE}/include/KF5/KCoreAddons \ -I${LOCALBASE}/include/KF5/KDELibs4Support \ -I${LOCALBASE}/include/KF5/KI18n \ -I${LOCALBASE}/include/KF5/KIOCore \ -I${LOCALBASE}/include/KF5/KIOWidgets \ -I${LOCALBASE}/include/KF5/KWidgetsAddons \ -I${LOCALBASE}/include/KF5/KXmlGui \ -I${LOCALBASE}/include/KF5/SonnetUi \ PLIST_SUB= PORTVERSION="${PORTVERSION}" OPTIONS_DEFINE= NLS OPTIONS_SUB= yes post-patch: @${REINPLACE_CMD} -e 's+@@LOCALBASE@@+${LOCALBASE}+' \ ${WRKSRC}/wscript post-patch-NLS-off: @${REINPLACE_CMD} -e '/langs/ d' \ ${WRKSRC}/wscript post-configure: # Waf injects some bizzarre 3- and 4-level ../ stacks into the include # paths, which don't match how KDE includes are organized, and in a # poudriere build don't necessarily reach /usr/local/include either. @${REINPLACE_CMD} -e "s+..PWD............/include+${LOCALBASE}/include+g" \ ${WRKSRC}/build/c4che/_cache.py post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-d \ ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${PORTVERSION} ${INSTALL_MAN} ${WRKSRC}/src/data/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}.1 .include diff --git a/deskutils/semantik/distinfo b/deskutils/semantik/distinfo index 0bdadd14fc01..39fa38c0f347 100644 --- a/deskutils/semantik/distinfo +++ b/deskutils/semantik/distinfo @@ -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 diff --git a/deskutils/semantik/files/patch-wscript b/deskutils/semantik/files/patch-wscript deleted file mode 100644 index 8e1c619fdb23..000000000000 --- a/deskutils/semantik/files/patch-wscript +++ /dev/null @@ -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 \n#include \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() diff --git a/deskutils/semantik/pkg-plist b/deskutils/semantik/pkg-plist index d039f93dbcf2..3b7b3be358d8 100644 --- a/deskutils/semantik/pkg-plist +++ b/deskutils/semantik/pkg-plist @@ -1,106 +1,97 @@ bin/semantik bin/semantik-d lib/libsemantik.so lib/libsemantik.so.1 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 share/kxmlgui5/semantik/semantikui.rc %%NLS%%share/locale/cs/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/cs/LC_MESSAGES/semantik.mo %%NLS%%share/locale/de/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/de/LC_MESSAGES/semantik.mo %%NLS%%share/locale/el/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/el/LC_MESSAGES/semantik.mo %%NLS%%share/locale/es/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/es/LC_MESSAGES/semantik.mo %%NLS%%share/locale/fr/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/fr/LC_MESSAGES/semantik.mo %%NLS%%share/locale/it/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/it/LC_MESSAGES/semantik.mo %%NLS%%share/locale/ru/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/ru/LC_MESSAGES/semantik.mo %%NLS%%share/locale/sk/LC_MESSAGES/semantik-d.mo %%NLS%%share/locale/sk/LC_MESSAGES/semantik.mo share/mime/packages/semantik.xml %%DATADIR%%/filters/fvym.py %%DATADIR%%/filters/kdissert.py %%DATADIR%%/filters/main.py %%DATADIR%%/filters/others.py %%DATADIR%%/filters/semantik.py %%DATADIR%%/flags/flag_delay.svg %%DATADIR%%/flags/flag_idea.svg %%DATADIR%%/flags/flag_look.svg %%DATADIR%%/flags/flag_lunch.svg %%DATADIR%%/flags/flag_money.svg %%DATADIR%%/flags/flag_ok.svg %%DATADIR%%/flags/flag_people.svg %%DATADIR%%/flags/flag_phone.svg %%DATADIR%%/flags/flag_star.svg %%DATADIR%%/flags/flag_stop.svg %%DATADIR%%/flags/flag_talk.svg %%DATADIR%%/flags/flag_target.svg %%DATADIR%%/flags/flag_time.svg %%DATADIR%%/flags/flag_tune.svg %%DATADIR%%/flags/flag_unknown.svg %%DATADIR%%/flags/flag_write.svg %%DATADIR%%/images/crsc-app-colors.svg %%DATADIR%%/sembind.py %%DATADIR%%/templates/beamer.sem.py %%DATADIR%%/templates/beamer/main.tex %%DATADIR%%/templates/beamer/wscript %%DATADIR%%/templates/html.sem.py %%DATADIR%%/templates/html/def.css %%DATADIR%%/templates/html/doc_icon.png %%DATADIR%%/templates/html/index.html %%DATADIR%%/templates/java.sem.py %%DATADIR%%/templates/java/Kadapplet.java %%DATADIR%%/templates/java/Makefile %%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 %%DATADIR%%/templates/odp/meta.xml %%DATADIR%%/templates/odp/settings.xml %%DATADIR%%/templates/odp/styles.xml %%DATADIR%%/templates/odt.sem.py %%DATADIR%%/templates/odt/content.xml %%DATADIR%%/templates/odt/manifest.xml %%DATADIR%%/templates/odt/meta.xml %%DATADIR%%/templates/odt/settings.xml %%DATADIR%%/templates/odt/styles.xml %%DATADIR%%/templates/pdflatex.sem.py %%DATADIR%%/templates/pdflatex/main.tex %%DATADIR%%/templates/pdflatex/wscript %%DATADIR%%/templates/s5.sem.py %%DATADIR%%/templates/s5/index.html %%DATADIR%%/templates/s5/ui/default/blank.gif %%DATADIR%%/templates/s5/ui/default/framing.css %%DATADIR%%/templates/s5/ui/default/iepngfix.htc %%DATADIR%%/templates/s5/ui/default/opera.css %%DATADIR%%/templates/s5/ui/default/outline.css %%DATADIR%%/templates/s5/ui/default/pretty.css %%DATADIR%%/templates/s5/ui/default/print.css %%DATADIR%%/templates/s5/ui/default/s5-core.css %%DATADIR%%/templates/s5/ui/default/semantik.css %%DATADIR%%/templates/s5/ui/default/slides.css %%DATADIR%%/templates/s5/ui/default/slides.js %%DATADIR%%/templates/semantik.sem.py %%DATADIR%%/templates/waf %%DATADIR%%/tips diff --git a/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 b/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 deleted file mode 100644 index bb2d20d9d35c..000000000000 --- a/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 +++ /dev/null @@ -1,92 +0,0 @@ -From 3894d1d013310d9212c1df42dbde2161dec16645 Mon Sep 17 00:00:00 2001 -From: Klaas Freitag -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 - - #ifdef HAVE_AKONADI -+#include "akonadi/contact/contactsearchjob.h" -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#include -+ -+#include -+ -+#include -+#include -+#include -+#include -+#else - #include - #include - --#include "akonadi/contact/contactsearchjob.h" - #include - - #include - #include - #include - #include -+#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 -+#include -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#include -+#else - #include - #include --#include -+#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 - - #ifdef HAVE_AKONADI -+#include -+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) -+#include -+#include -+#else - #include - #include - #endif -+#endif - - /* ==================================================================== */ - AddressSortProxyModel::AddressSortProxyModel(AddressProvider *provider, QObject *parent) --- -2.36.0 - diff --git a/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 b/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 deleted file mode 100644 index ec5e40bef965..000000000000 --- a/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 +++ /dev/null @@ -1,69 +0,0 @@ -From e492e3d78520ff02aa4626f447ab2eea97cab2cc Mon Sep 17 00:00:00 2001 -From: "Tobias C. Berner" -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 - - #ifdef HAVE_AKONADI --#include "akonadi/contact/contactsearchjob.h" -+#include -+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) -+#include -+#else -+#include -+#endif - #include - #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) - #include -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 -+#include -+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) -+#include -+#else - #include -+#endif - #include - #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) - #include -diff --git src/addressselectorwidget.h src/addressselectorwidget.h -index cb3428e..7a661c6 100644 ---- src/addressselectorwidget.h -+++ src/addressselectorwidget.h -@@ -23,9 +23,14 @@ - #include - - #ifdef HAVE_AKONADI -+#include -+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) -+#include -+#include -+#else - #include - #include -- -+#endif - #endif - - #include --- -2.36.0 -