pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
kf6-kstatusnotifieritem: remove, now in pkgsrc proper.
Module Name: pkgsrc-wip
Committed By: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By: markd
Date: Thu Feb 13 08:38:52 2025 +1300
Changeset: 4ecb94de11bfcc9fe4a18eee754cfe37e85375dd
Modified Files:
Makefile
krusader/Makefile
Removed Files:
kf6-kstatusnotifieritem/DESCR
kf6-kstatusnotifieritem/Makefile
kf6-kstatusnotifieritem/PLIST
kf6-kstatusnotifieritem/TODO
kf6-kstatusnotifieritem/buildlink3.mk
kf6-kstatusnotifieritem/distinfo
kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.cpp
kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.h
Log Message:
kf6-kstatusnotifieritem: remove, now in pkgsrc proper.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4ecb94de11bfcc9fe4a18eee754cfe37e85375dd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
kf6-kstatusnotifieritem/DESCR | 1 -
kf6-kstatusnotifieritem/Makefile | 16 -------
kf6-kstatusnotifieritem/PLIST | 54 ----------------------
kf6-kstatusnotifieritem/TODO | 14 ------
kf6-kstatusnotifieritem/buildlink3.mk | 15 ------
kf6-kstatusnotifieritem/distinfo | 7 ---
...atch-src_libdbusmenu-qt_dbusmenushortcut__p.cpp | 44 ------------------
.../patch-src_libdbusmenu-qt_dbusmenushortcut__p.h | 24 ----------
krusader/Makefile | 2 +-
10 files changed, 1 insertion(+), 177 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 26f1c40395..5754da95ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1884,7 +1884,6 @@ SUBDIR+= kea
SUBDIR+= kea-git
SUBDIR+= keama-git
SUBDIR+= kermit
-SUBDIR+= kf6-kstatusnotifieritem
SUBDIR+= kgamma5
SUBDIR+= kgrab
SUBDIR+= kgraphviewer
diff --git a/kf6-kstatusnotifieritem/DESCR b/kf6-kstatusnotifieritem/DESCR
deleted file mode 100644
index 0088020321..0000000000
--- a/kf6-kstatusnotifieritem/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Implementation of Status Notifier Items.
diff --git a/kf6-kstatusnotifieritem/Makefile b/kf6-kstatusnotifieritem/Makefile
deleted file mode 100644
index 6709fd2e05..0000000000
--- a/kf6-kstatusnotifieritem/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2024/04/06 08:06:18 wiz Exp $
-
-DISTNAME= kstatusnotifieritem-${KF6VER}
-CATEGORIES= misc
-
-HOMEPAGE= https://community.kde.org/Frameworks
-COMMENT= Implementation of Status Notifier Items
-LICENSE= gnu-lgpl-v2
-
-.include "../../meta-pkgs/kde/kf6.mk"
-
-USE_TOOLS+= pkg-config
-
-.include "../../x11/kf6-kwindowsystem/buildlink3.mk"
-.include "../../x11/qt6-qtbase/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/kf6-kstatusnotifieritem/PLIST b/kf6-kstatusnotifieritem/PLIST
deleted file mode 100644
index 05638ca6d0..0000000000
--- a/kf6-kstatusnotifieritem/PLIST
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $NetBSD$
-include/KF6/KStatusNotifierItem/KStatusNotifierItem
-include/KF6/KStatusNotifierItem/kstatusnotifieritem.h
-include/KF6/KStatusNotifierItem/kstatusnotifieritem_export.h
-include/KF6/KStatusNotifierItem/kstatusnotifieritem_version.h
-lib/cmake/KF6StatusNotifierItem/KF6StatusNotifierItemConfig.cmake
-lib/cmake/KF6StatusNotifierItem/KF6StatusNotifierItemConfigVersion.cmake
-lib/cmake/KF6StatusNotifierItem/KF6StatusNotifierItemTargets-noconfig.cmake
-lib/cmake/KF6StatusNotifierItem/KF6StatusNotifierItemTargets.cmake
-lib/libKF6StatusNotifierItem.so
-lib/libKF6StatusNotifierItem.so.6
-lib/libKF6StatusNotifierItem.so.${PKGVERSION}
-share/dbus-1/interfaces/kf6_org.kde.StatusNotifierItem.xml
-share/dbus-1/interfaces/kf6_org.kde.StatusNotifierWatcher.xml
-share/locale/ar/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ast/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/bg/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ca/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ca@valencia/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/cs/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/de/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/en_GB/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/eo/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/es/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/eu/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/fi/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/fr/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/gl/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/he/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/hu/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ia/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/is/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/it/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ja/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ka/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ko/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/lt/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/lv/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/nl/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/nn/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/pl/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/pt_BR/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ro/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ru/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/sa/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/sk/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/sl/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/sv/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/ta/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/tr/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/uk/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/zh_CN/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/locale/zh_TW/LC_MESSAGES/kstatusnotifieritem6_qt.qm
-share/qlogging-categories6/kstatusnotifieritem.categories
diff --git a/kf6-kstatusnotifieritem/TODO b/kf6-kstatusnotifieritem/TODO
deleted file mode 100644
index 877bd8fa2d..0000000000
--- a/kf6-kstatusnotifieritem/TODO
+++ /dev/null
@@ -1,14 +0,0 @@
-fix this build error on NetBSD-10 (atleast)
-
-[ 83%] Building CXX object src/CMakeFiles/KF6StatusNotifierItem.dir/libdbusmenu-qt/utils.cpp.
-o
-In file included from /usr/pkg/qt6/include/QtDBus/QDBusMetaType:1,
- from /src/work/pkgsrc/misc/kf6-kstatusnotifieritem/work.x86_64/kstatusnotifi
-eritem-6.2.0/src/libdbusmenu-qt/dbusmenutypes_p.cpp:15:
-/usr/pkg/qt6/include/QtDBus/qdbusmetatype.h: In instantiation of 'QMetaType qDBusRegisterMeta
-Type() [with T = DBusMenuShortcut]':
-/src/work/pkgsrc/misc/kf6-kstatusnotifieritem/work.x86_64/kstatusnotifieritem-6.2.0/src/libdb
-usmenu-qt/dbusmenutypes_p.cpp:97:45: required from here
-/usr/pkg/qt6/include/QtDBus/qdbusmetatype.h:35:59: error: no match for 'operator<<' (operand types are 'QDBusArgument' and 'const DBusMenuShortcut')
- 35 | auto mf = [](QDBusArgument &arg, const void *t) { arg << *static_cast<const T *>(t); };
- | ~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/kf6-kstatusnotifieritem/buildlink3.mk b/kf6-kstatusnotifieritem/buildlink3.mk
deleted file mode 100644
index 3b5937c839..0000000000
--- a/kf6-kstatusnotifieritem/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= kf6-kstatusnotifieritem
-
-.if !defined(KF6_KSTATUSNOTIFIERITEM_BUILDLINK3_MK)
-KF6_KSTATUSNOTIFIERITEM_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.kf6-kstatusnotifieritem+= kf6-kstatusnotifieritem>=6.2.0
-BUILDLINK_PKGSRCDIR.kf6-kstatusnotifieritem?= ../../wip/kf6-kstatusnotifieritem
-
-.include "../../x11/kf6-kwindowsystem/buildlink3.mk"
-.include "../../x11/qt6-qtbase/buildlink3.mk"
-.endif # KF6_KSTATUSNOTIFIERITEM_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -kf6-kstatusnotifieritem
diff --git a/kf6-kstatusnotifieritem/distinfo b/kf6-kstatusnotifieritem/distinfo
deleted file mode 100644
index 81144aa692..0000000000
--- a/kf6-kstatusnotifieritem/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.17 2024/02/06 10:46:29 markd Exp $
-
-BLAKE2s (kstatusnotifieritem-6.8.0.tar.xz) = 3685eb785be5a2f193c2f3ee59cf7080c5b7931f1ad34f92374ecf71350a6e94
-SHA512 (kstatusnotifieritem-6.8.0.tar.xz) = bf060f2fe9c80151050e81f7b03da8cbaa48262dbd884773131c9df83493622378fc736d514e2a7f66c86f8b6836ad792d02c3bcb81f7eb2228bf6813a2d340a
-Size (kstatusnotifieritem-6.8.0.tar.xz) = 48388 bytes
-SHA1 (patch-src_libdbusmenu-qt_dbusmenushortcut__p.cpp) = 2237a32acb9eb0c70e8a8df8814f86e3f21cea3f
-SHA1 (patch-src_libdbusmenu-qt_dbusmenushortcut__p.h) = 3095b6db9519f34f9d56cda530a113918087cf9c
diff --git a/kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.cpp b/kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.cpp
deleted file mode 100644
index 8db3de7951..0000000000
--- a/kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
-* Add DBusMenuShortcut type overload for QDBusArgument to fix build
-
---- src/libdbusmenu-qt/dbusmenushortcut_p.cpp.orig 2025-01-04 08:49:06.219623820 +0000
-+++ src/libdbusmenu-qt/dbusmenushortcut_p.cpp
-@@ -8,6 +8,8 @@
-
- // Qt
- #include <QKeySequence>
-+#include <QDBusArgument>
-+#include <QDBusMetaType>
-
- // Local
- #include "debug_p.h"
-@@ -70,3 +72,28 @@ QKeySequence DBusMenuShortcut::toKeySequ
- const QString string = tmp.join(QLatin1String(", "));
- return QKeySequence::fromString(string);
- }
-+
-+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &obj)
-+{
-+ argument.beginArray(qMetaTypeId<QStringList>());
-+ typename QList<QStringList>::ConstIterator it = obj.constBegin();
-+ typename QList<QStringList>::ConstIterator end = obj.constEnd();
-+ for ( ; it != end; ++it)
-+ argument << *it;
-+ argument.endArray();
-+ return argument;
-+}
-+
-+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &obj)
-+{
-+ argument.beginArray();
-+ obj.clear();
-+ while (!argument.atEnd()) {
-+ QStringList item;
-+ argument >> item;
-+ obj.push_back(item);
-+ }
-+ argument.endArray();
-+ return argument;
-+}
-+
diff --git a/kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.h b/kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.h
deleted file mode 100644
index dfe1262434..0000000000
--- a/kf6-kstatusnotifieritem/patches/patch-src_libdbusmenu-qt_dbusmenushortcut__p.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* Add DBusMenuShortcut type overload for QDBusArgument to fix build
-
---- src/libdbusmenu-qt/dbusmenushortcut_p.h.orig 2025-01-04 08:49:00.488996262 +0000
-+++ src/libdbusmenu-qt/dbusmenushortcut_p.h
-@@ -12,6 +12,7 @@
- #include <QStringList>
-
- class QKeySequence;
-+class QDBusArgument;
-
- class DBusMenuShortcut : public QList<QStringList>
- {
-@@ -20,6 +21,9 @@ public:
- static DBusMenuShortcut fromKeySequence(const QKeySequence &);
- };
-
-+QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &);
-+const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &);
-+
- Q_DECLARE_METATYPE(DBusMenuShortcut)
-
- #endif /* DBUSMENUSHORTCUT_H */
diff --git a/krusader/Makefile b/krusader/Makefile
index f11b4184ef..f0300946a0 100644
--- a/krusader/Makefile
+++ b/krusader/Makefile
@@ -28,6 +28,6 @@ DEPENDS+= oxygen-icons-[0-9]*:../../graphics/oxygen-icons
.include "../../devel/qt6-qt5compat/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../wip/kf6-kstatusnotifieritem/buildlink3.mk"
+.include "../../misc/kf6-kstatusnotifieritem/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index