mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
tokodon, bump version, switch to KF6 (#11508)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,92 +1,37 @@
|
||||
From bf6bfd71a72fe964a70364e2d631270b77dee8e8 Mon Sep 17 00:00:00 2001
|
||||
From f918851fd2f20cdc83afad08962ac8da556a9bfc Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Fri, 1 Mar 2024 15:03:22 +0100
|
||||
Subject: undef HAVE_KDBUSADDONS
|
||||
Date: Fri, 20 Dec 2024 15:29:06 +0100
|
||||
Subject: Disable KF6DBusAddons on Haiku
|
||||
|
||||
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index a48773d..7438cc8 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -19,6 +19,10 @@
|
||||
#include <QApplication>
|
||||
#endif
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1fca775..2d39904 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -124,7 +124,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT TOKODON_FLATPAK)
|
||||
)
|
||||
endif ()
|
||||
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+#undef HAVE_KDBUSADDONS
|
||||
+#endif
|
||||
+
|
||||
#include <KAboutData>
|
||||
#ifdef HAVE_KDBUSADDONS
|
||||
#include <KDBusService>
|
||||
-if (NOT ANDROID AND NOT WIN32 AND NOT APPLE)
|
||||
+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU)
|
||||
find_package(KF6DBusAddons ${KF_MIN_VERSION})
|
||||
set_package_properties(KF6DBusAddons PROPERTIES
|
||||
TYPE REQUIRED
|
||||
--
|
||||
2.43.2
|
||||
2.45.2
|
||||
|
||||
|
||||
From 27f557a92d71b19ce0d5624d9aa9ba52b3e85892 Mon Sep 17 00:00:00 2001
|
||||
From 0df11c529eb09b25979c4d5b36a8f152aa3a4efa Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 31 Mar 2024 11:36:18 +1000
|
||||
Subject: Style fixes for Haiku
|
||||
|
||||
|
||||
diff --git a/src/content/ui/StatusDelegate/InteractionButton.qml b/src/content/ui/StatusDelegate/InteractionButton.qml
|
||||
index b0b8010..d8c3730 100644
|
||||
--- a/src/content/ui/StatusDelegate/InteractionButton.qml
|
||||
+++ b/src/content/ui/StatusDelegate/InteractionButton.qml
|
||||
@@ -44,7 +44,7 @@ QQC2.AbstractButton {
|
||||
|
||||
source: control.interacted ? control.interactedIconName : control.iconName
|
||||
|
||||
- isMask: true
|
||||
+ isMask: false
|
||||
color: (interactable && (control.hovered || parent.activeFocus)) ? Kirigami.Theme.focusColor : (control.interacted ? control.interactionColor : Kirigami.Theme.textColor)
|
||||
}
|
||||
|
||||
diff --git a/src/content/ui/StatusDelegate/StatusDelegate.qml b/src/content/ui/StatusDelegate/StatusDelegate.qml
|
||||
index c5143f4..ae95e7e 100644
|
||||
--- a/src/content/ui/StatusDelegate/StatusDelegate.qml
|
||||
+++ b/src/content/ui/StatusDelegate/StatusDelegate.qml
|
||||
@@ -230,7 +230,7 @@ QQC2.ItemDelegate {
|
||||
|
||||
return ''
|
||||
}
|
||||
- isMask: true
|
||||
+ isMask: false
|
||||
Layout.alignment: Qt.AlignRight | Qt.AlignVCenter
|
||||
color: root.type === Notification.Repeat ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
|
||||
Layout.preferredHeight: Kirigami.Units.largeSpacing * 2
|
||||
@@ -289,7 +289,7 @@ QQC2.ItemDelegate {
|
||||
Layout.alignment: Qt.AlignTop
|
||||
iconName: switch(root.visibility) {
|
||||
case Post.Public:
|
||||
- return "kstars_xplanet";
|
||||
+ return "globe";
|
||||
case Post.Unlisted:
|
||||
return "unlock";
|
||||
case Post.Private:
|
||||
@@ -297,7 +297,7 @@ QQC2.ItemDelegate {
|
||||
case Post.Direct:
|
||||
return "mail-message";
|
||||
default:
|
||||
- return "kstars_xplanet";
|
||||
+ return "globe";
|
||||
}
|
||||
tooltip: switch(root.visibility) {
|
||||
case Post.Public:
|
||||
@@ -508,7 +508,7 @@ QQC2.ItemDelegate {
|
||||
interacted: root.bookmarked
|
||||
interactionColor: "red"
|
||||
|
||||
- iconName: 'bookmarks'
|
||||
+ iconName: 'post-bookmark'
|
||||
interactedIconName: 'post-bookmarked'
|
||||
|
||||
tooltip: root.bookmarked ? i18n("Remove bookmark") : i18nc("Bookmark a post", "Bookmark")
|
||||
diff --git a/src/content/ui/main.qml b/src/content/ui/main.qml
|
||||
index 3864401..f1e23b0 100644
|
||||
--- a/src/content/ui/main.qml
|
||||
+++ b/src/content/ui/main.qml
|
||||
@@ -292,7 +292,7 @@ Kirigami.ApplicationWindow {
|
||||
diff --git a/src/content/ui/Main.qml b/src/content/ui/Main.qml
|
||||
index 03a6dae..49a2057 100644
|
||||
--- a/src/content/ui/Main.qml
|
||||
+++ b/src/content/ui/Main.qml
|
||||
@@ -445,7 +445,7 @@ StatefulApp.StatefulWindow {
|
||||
}
|
||||
}
|
||||
property Kirigami.Action globalTimelineAction: Kirigami.Action {
|
||||
@@ -95,16 +40,16 @@ index 3864401..f1e23b0 100644
|
||||
text: i18n("Global")
|
||||
checkable: true
|
||||
onTriggered: {
|
||||
@@ -308,7 +308,7 @@ Kirigami.ApplicationWindow {
|
||||
@@ -461,7 +461,7 @@ StatefulApp.StatefulWindow {
|
||||
}
|
||||
|
||||
property Kirigami.Action conversationAction: Kirigami.Action {
|
||||
- icon.name: "tokodon-chat-reply"
|
||||
+ icon.name: "dialog-messages"
|
||||
text: i18n("Conversation")
|
||||
text: i18n("Conversations")
|
||||
checkable: true
|
||||
onTriggered: {
|
||||
@@ -338,7 +338,7 @@ Kirigami.ApplicationWindow {
|
||||
@@ -488,7 +488,7 @@ StatefulApp.StatefulWindow {
|
||||
}
|
||||
|
||||
property Kirigami.Action bookmarksAction: Kirigami.Action {
|
||||
@@ -113,7 +58,7 @@ index 3864401..f1e23b0 100644
|
||||
text: i18n("Bookmarks")
|
||||
checkable: true
|
||||
onTriggered: {
|
||||
@@ -354,7 +354,7 @@ Kirigami.ApplicationWindow {
|
||||
@@ -504,7 +504,7 @@ StatefulApp.StatefulWindow {
|
||||
}
|
||||
|
||||
property Kirigami.Action exploreAction: Kirigami.Action {
|
||||
@@ -122,11 +67,58 @@ index 3864401..f1e23b0 100644
|
||||
text: i18n("Explore")
|
||||
checkable: true
|
||||
onTriggered: {
|
||||
diff --git a/src/icons/tokodon/scalable/post-bookmark.svg b/src/icons/tokodon/scalable/post-bookmark.svg
|
||||
diff --git a/src/content/ui/PostDelegate/InteractionButton.qml b/src/content/ui/PostDelegate/InteractionButton.qml
|
||||
index b7cc65f..55eb9cb 100644
|
||||
--- a/src/content/ui/PostDelegate/InteractionButton.qml
|
||||
+++ b/src/content/ui/PostDelegate/InteractionButton.qml
|
||||
@@ -41,7 +41,7 @@ QQC2.ToolButton {
|
||||
|
||||
source: control.interacted ? control.interactedIconName : control.iconName
|
||||
|
||||
- isMask: true
|
||||
+ isMask: false
|
||||
color: (interactable && parent.activeFocus) ? Kirigami.Theme.focusColor : (control.interacted ? control.interactionColor : Kirigami.Theme.textColor)
|
||||
}
|
||||
|
||||
diff --git a/src/icons/tokodon-chat-reply.svg b/src/icons/tokodon-chat-reply.svg
|
||||
index 24a65c5..52329b4 100644
|
||||
--- a/src/icons/tokodon-chat-reply.svg
|
||||
+++ b/src/icons/tokodon-chat-reply.svg
|
||||
@@ -1,11 +1,19 @@
|
||||
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
- <defs id="defs172">
|
||||
- <style id="current-color-scheme" type="text/css">
|
||||
- .ColorScheme-Text {
|
||||
- color:#232629;
|
||||
- }
|
||||
- </style>
|
||||
- </defs>
|
||||
- <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Text" d="m 3,3 v 12 h 2.2304687 v 4.353516 L 9.8222656,15 19,15.054688 V 3 Z M 4,4 H 18 V 14.054688 L 9.5,14 6.2304687,17.048828 V 14 H 4 Z" />
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
|
||||
+ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
|
||||
+ <g>
|
||||
+ <path style="fill:#000000; fill-opacity:0.3686"
|
||||
+ d="M34.45 9.93C47.86 9.93 58.75 19.12 58.75 30.42C58.75 41.72 47.86 51.79 31.93 51C30.88 54.49 27.1 58.66 20.79 58.81C22.42 56.61 24.63 54.41 24.69 49.13C16.15 45.95 10.15 38.79 10.15 30.42C10.15 19.12 21.04 9.93 34.45 9.93V9.93V9.93V9.93V9.93z"
|
||||
+ />
|
||||
+ <linearGradient id="gradient0" gradientUnits="userSpaceOnUse" x1="169.43" y1="6.53" x2="169.43" y2="54.9">
|
||||
+ <stop offset="0" stop-color="#ffffff"/>
|
||||
+ <stop offset="1" stop-color="#e5e5e5"/>
|
||||
+ </linearGradient>
|
||||
+ <path style="fill:url(#gradient0)"
|
||||
+ d="M31.45 6.4C45.09 6.4 56.16 15.57 56.16 26.87C56.16 38.18 45.09 48.25 28.88 47.47C27.84 50.95 23.97 55.13 17.56 55.27C19.21 53.08 21.47 50.88 21.53 45.59C12.84 42.4 6.75 35.25 6.75 26.87C6.75 15.57 17.81 6.4 31.45 6.4V6.4V6.4V6.4V6.4z"
|
||||
+ />
|
||||
+ <path style="fill:none; stroke:#545454; stroke-width:2.982"
|
||||
+ d="M31.45 6.4C45.09 6.4 56.16 15.57 56.16 26.87C56.16 38.18 45.09 48.25 28.88 47.47C27.84 50.95 23.97 55.13 17.56 55.27C19.21 53.08 21.47 50.88 21.53 45.59C12.84 42.4 6.75 35.25 6.75 26.87C6.75 15.57 17.81 6.4 31.45 6.4V6.4V6.4V6.4V6.4z"
|
||||
+ />
|
||||
+ </g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon-post-bookmark.svg b/src/icons/tokodon-post-bookmark.svg
|
||||
new file mode 100644
|
||||
index 0000000..e4d9bfc
|
||||
--- /dev/null
|
||||
+++ b/src/icons/tokodon/scalable/post-bookmark.svg
|
||||
+++ b/src/icons/tokodon-post-bookmark.svg
|
||||
@@ -0,0 +1,51 @@
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
|
||||
@@ -179,10 +171,10 @@ index 0000000..e4d9bfc
|
||||
+ />
|
||||
+ </g>
|
||||
+</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-bookmarked.svg b/src/icons/tokodon/scalable/post-bookmarked.svg
|
||||
diff --git a/src/icons/tokodon-post-bookmarked.svg b/src/icons/tokodon-post-bookmarked.svg
|
||||
index 05d9343..d39f89f 100644
|
||||
--- a/src/icons/tokodon/scalable/post-bookmarked.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-bookmarked.svg
|
||||
--- a/src/icons/tokodon-post-bookmarked.svg
|
||||
+++ b/src/icons/tokodon-post-bookmarked.svg
|
||||
@@ -1,4 +1,47 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -234,14 +226,17 @@ index 05d9343..d39f89f 100644
|
||||
+ />
|
||||
+ </g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-boost.svg b/src/icons/tokodon/scalable/post-boost.svg
|
||||
index 9e84006..8492fa7 100644
|
||||
--- a/src/icons/tokodon/scalable/post-boost.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-boost.svg
|
||||
@@ -1,9 +1,37 @@
|
||||
diff --git a/src/icons/tokodon-post-boost.svg b/src/icons/tokodon-post-boost.svg
|
||||
index 4d1287f..8492fa7 100644
|
||||
--- a/src/icons/tokodon-post-boost.svg
|
||||
+++ b/src/icons/tokodon-post-boost.svg
|
||||
@@ -1,12 +1,37 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="a" width="22px" height="22px" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
- <g class="ColorScheme-Text" transform="matrix(1.0672 0 0 1.0672 -.73956 -.73956)" fill="none" stroke="#000">
|
||||
- <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
|
||||
- color:#232629;
|
||||
- }</style>
|
||||
- <g class="ColorScheme-Text" transform="matrix(1.0672 0 0 1.0672 -.73956 -.73956)" fill="none" stroke="currentColor">
|
||||
- <path d="m17.091 12.874v-7.0275h-11.244" opacity=".998" stroke-width="1"/>
|
||||
- <path d="m4.9095 9.126v7.0275h11.244" stroke-width="1"/>
|
||||
- <path d="m9.2137 4.0396-4.4683 1.8069 4.4683 1.8069" stroke-linecap="square" stroke-width="1"/>
|
||||
@@ -283,10 +278,10 @@ index 9e84006..8492fa7 100644
|
||||
+ />
|
||||
</g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-boosted.svg b/src/icons/tokodon/scalable/post-boosted.svg
|
||||
diff --git a/src/icons/tokodon-post-boosted.svg b/src/icons/tokodon-post-boosted.svg
|
||||
index 50c4c12..c8e895d 100644
|
||||
--- a/src/icons/tokodon/scalable/post-boosted.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-boosted.svg
|
||||
--- a/src/icons/tokodon-post-boosted.svg
|
||||
+++ b/src/icons/tokodon-post-boosted.svg
|
||||
@@ -1,11 +1,37 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="a" width="22px" height="22px" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -334,15 +329,18 @@ index 50c4c12..c8e895d 100644
|
||||
+ />
|
||||
</g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-favorite.svg b/src/icons/tokodon/scalable/post-favorite.svg
|
||||
index 704963d..e771e1f 100644
|
||||
--- a/src/icons/tokodon/scalable/post-favorite.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-favorite.svg
|
||||
@@ -1,5 +1,22 @@
|
||||
diff --git a/src/icons/tokodon-post-favorite.svg b/src/icons/tokodon-post-favorite.svg
|
||||
index b52d315..e771e1f 100644
|
||||
--- a/src/icons/tokodon-post-favorite.svg
|
||||
+++ b/src/icons/tokodon-post-favorite.svg
|
||||
@@ -1,8 +1,22 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="a" width="22" height="22" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
- <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
|
||||
- color:#232629;
|
||||
- }</style>
|
||||
- <path d="m11.053 3.7607 2.4051 4.8386 5.378 0.77592-3.8916 3.7664 0.91868 5.3183-4.8103-2.5109-4.8103 2.5109 0.91868-5.3183-3.8916-3.7664 5.378-0.77592z"
|
||||
- fill="none" stroke="#000" stroke-linecap="square" stroke-width="1"/>
|
||||
- fill="none" class="ColorScheme-Text" stroke="currentColor" stroke-linecap="square" stroke-width="1"/>
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
|
||||
+ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -365,10 +363,10 @@ index 704963d..e771e1f 100644
|
||||
+ />
|
||||
+ </g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-favorited.svg b/src/icons/tokodon/scalable/post-favorited.svg
|
||||
diff --git a/src/icons/tokodon-post-favorited.svg b/src/icons/tokodon-post-favorited.svg
|
||||
index 9759a38..66104d1 100644
|
||||
--- a/src/icons/tokodon/scalable/post-favorited.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-favorited.svg
|
||||
--- a/src/icons/tokodon-post-favorited.svg
|
||||
+++ b/src/icons/tokodon-post-favorited.svg
|
||||
@@ -1,5 +1,22 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="a" width="22" height="22" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -396,10 +394,10 @@ index 9759a38..66104d1 100644
|
||||
+ />
|
||||
+ </g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-reply-filled.svg b/src/icons/tokodon/scalable/post-reply-filled.svg
|
||||
diff --git a/src/icons/tokodon-post-reply-filled.svg b/src/icons/tokodon-post-reply-filled.svg
|
||||
index f25dc9e..ca51602 100644
|
||||
--- a/src/icons/tokodon/scalable/post-reply-filled.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-reply-filled.svg
|
||||
--- a/src/icons/tokodon-post-reply-filled.svg
|
||||
+++ b/src/icons/tokodon-post-reply-filled.svg
|
||||
@@ -1,6 +1,19 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="a" width="22px" height="22px" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -424,15 +422,20 @@ index f25dc9e..ca51602 100644
|
||||
+ />
|
||||
</g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/post-reply.svg b/src/icons/tokodon/scalable/post-reply.svg
|
||||
index c2930a7..52329b4 100644
|
||||
--- a/src/icons/tokodon/scalable/post-reply.svg
|
||||
+++ b/src/icons/tokodon/scalable/post-reply.svg
|
||||
@@ -1,6 +1,19 @@
|
||||
diff --git a/src/icons/tokodon-post-reply.svg b/src/icons/tokodon-post-reply.svg
|
||||
index bc53d1e..52329b4 100644
|
||||
--- a/src/icons/tokodon-post-reply.svg
|
||||
+++ b/src/icons/tokodon-post-reply.svg
|
||||
@@ -1,11 +1,19 @@
|
||||
-<?xml version="1.0" encoding="UTF-8"?>
|
||||
-<svg id="a" width="22px" height="22px" version="1.1" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
- <style id="current-color-scheme" type="text/css">
|
||||
- .ColorScheme-Text {
|
||||
- color:#232629;
|
||||
- }
|
||||
- </style>
|
||||
- <g class="ColorScheme-Text" fill="none" stroke="currentColor">
|
||||
- <path d="m17.5 14.5v-10l-13.008-0.0082539 0.0082545 10.008h2v4l3.5-4z" fill="none" opacity="1" stroke="#000"/>
|
||||
- <path d="m17.5 14.5v-10l-13.008-0.0082539 0.0082545 10.008h2v4l3.5-4z" fill="none" opacity="1" stroke="currentColor"/>
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
|
||||
+ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
|
||||
@@ -452,68 +455,6 @@ index c2930a7..52329b4 100644
|
||||
+ />
|
||||
</g>
|
||||
</svg>
|
||||
diff --git a/src/icons/tokodon/scalable/tokodon-chat-reply.svg b/src/icons/tokodon/scalable/tokodon-chat-reply.svg
|
||||
index 24a65c5..52329b4 100644
|
||||
--- a/src/icons/tokodon/scalable/tokodon-chat-reply.svg
|
||||
+++ b/src/icons/tokodon/scalable/tokodon-chat-reply.svg
|
||||
@@ -1,11 +1,19 @@
|
||||
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg">
|
||||
- <defs id="defs172">
|
||||
- <style id="current-color-scheme" type="text/css">
|
||||
- .ColorScheme-Text {
|
||||
- color:#232629;
|
||||
- }
|
||||
- </style>
|
||||
- </defs>
|
||||
- <path style="fill:currentColor;fill-opacity:1;stroke:none" class="ColorScheme-Text" d="m 3,3 v 12 h 2.2304687 v 4.353516 L 9.8222656,15 19,15.054688 V 3 Z M 4,4 H 18 V 14.054688 L 9.5,14 6.2304687,17.048828 V 14 H 4 Z" />
|
||||
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
+<svg version="1.1" width="64" height="64" color-interpolation="linearRGB"
|
||||
+ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg">
|
||||
+ <g>
|
||||
+ <path style="fill:#000000; fill-opacity:0.3686"
|
||||
+ d="M34.45 9.93C47.86 9.93 58.75 19.12 58.75 30.42C58.75 41.72 47.86 51.79 31.93 51C30.88 54.49 27.1 58.66 20.79 58.81C22.42 56.61 24.63 54.41 24.69 49.13C16.15 45.95 10.15 38.79 10.15 30.42C10.15 19.12 21.04 9.93 34.45 9.93V9.93V9.93V9.93V9.93z"
|
||||
+ />
|
||||
+ <linearGradient id="gradient0" gradientUnits="userSpaceOnUse" x1="169.43" y1="6.53" x2="169.43" y2="54.9">
|
||||
+ <stop offset="0" stop-color="#ffffff"/>
|
||||
+ <stop offset="1" stop-color="#e5e5e5"/>
|
||||
+ </linearGradient>
|
||||
+ <path style="fill:url(#gradient0)"
|
||||
+ d="M31.45 6.4C45.09 6.4 56.16 15.57 56.16 26.87C56.16 38.18 45.09 48.25 28.88 47.47C27.84 50.95 23.97 55.13 17.56 55.27C19.21 53.08 21.47 50.88 21.53 45.59C12.84 42.4 6.75 35.25 6.75 26.87C6.75 15.57 17.81 6.4 31.45 6.4V6.4V6.4V6.4V6.4z"
|
||||
+ />
|
||||
+ <path style="fill:none; stroke:#545454; stroke-width:2.982"
|
||||
+ d="M31.45 6.4C45.09 6.4 56.16 15.57 56.16 26.87C56.16 38.18 45.09 48.25 28.88 47.47C27.84 50.95 23.97 55.13 17.56 55.27C19.21 53.08 21.47 50.88 21.53 45.59C12.84 42.4 6.75 35.25 6.75 26.87C6.75 15.57 17.81 6.4 31.45 6.4V6.4V6.4V6.4V6.4z"
|
||||
+ />
|
||||
+ </g>
|
||||
</svg>
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 7438cc8..8388bcb 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -88,6 +88,11 @@ int main(int argc, char *argv[])
|
||||
QGuiApplication app(argc, argv);
|
||||
QQuickStyle::setStyle(QStringLiteral("org.kde.breeze"));
|
||||
QIcon::setThemeName("tokodon");
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+ QGuiApplication app(argc, argv);
|
||||
+ QQuickStyle::setStyle(QStringLiteral("org.kde.desktop"));
|
||||
+ QIcon::setFallbackThemeName("tokodon");
|
||||
+ QIcon::setThemeName("haiku");
|
||||
#else
|
||||
QApplication app(argc, argv);
|
||||
// Default to org.kde.desktop style unless the user forces another style
|
||||
diff --git a/src/resources.qrc b/src/resources.qrc
|
||||
index 907795a..7ff3931 100644
|
||||
--- a/src/resources.qrc
|
||||
+++ b/src/resources.qrc
|
||||
@@ -48,6 +48,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
||||
<file>content/ui/Settings/SonnetCard.qml</file>
|
||||
<file>content/ui/Settings/PreferencesCard.qml</file>
|
||||
<file>content/elephant.svg</file>
|
||||
+ <file>icons/tokodon/scalable/post-bookmark.svg</file>
|
||||
<file>icons/tokodon/scalable/post-bookmarked.svg</file>
|
||||
<file>icons/tokodon/scalable/post-boost.svg</file>
|
||||
<file>icons/tokodon/scalable/post-boosted.svg</file>
|
||||
--
|
||||
2.43.2
|
||||
2.45.2
|
||||
|
||||
@@ -1,140 +0,0 @@
|
||||
SUMMARY="KDE Mastodon client"
|
||||
DESCRIPTION="Tokodon is a Mastodon client. It allows you to interact with the Fediverse community."
|
||||
HOMEPAGE="https://invent.kde.org/network/tokodon"
|
||||
COPYRIGHT="2021-2023 Carl Schlwan
|
||||
2002-2023 KDE Organisation"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
SOURCE_URI="$HOMEPAGE/-/archive/v$portVersion/tokodon-v$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="66052291bae51b2c6396343aec309e77660829b66b8d5b0013a17443e778b84f"
|
||||
SOURCE_DIR="tokodon-v$portVersion"
|
||||
PATCHES="tokodon-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="tokodon.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
tokodon$secondaryArchSuffix = $portVersion
|
||||
cmd:tokodon$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libmpv$secondaryArchSuffix
|
||||
# KF5
|
||||
kirigami_addons$secondaryArchSuffix
|
||||
lib:libKF5Auth$secondaryArchSuffix
|
||||
lib:libKF5Codecs$secondaryArchSuffix
|
||||
lib:libKF5Completion$secondaryArchSuffix
|
||||
lib:libKF5ConfigCore$secondaryArchSuffix
|
||||
lib:libKF5ConfigGui$secondaryArchSuffix
|
||||
lib:libKF5ConfigWidgets$secondaryArchSuffix
|
||||
lib:libKF5CoreAddons$secondaryArchSuffix
|
||||
lib:libKF5DbusAddons$secondaryArchSuffix
|
||||
lib:libKF5I18n$secondaryArchSuffix
|
||||
lib:libKF5KIOCore$secondaryArchSuffix
|
||||
lib:libKF5Kirigami2$secondaryArchSuffix
|
||||
lib:libKF5JobWidgets$secondaryArchSuffix
|
||||
lib:libKF5Notifications$secondaryArchSuffix
|
||||
lib:libKF5Purpose$secondaryArchSuffix
|
||||
lib:libKF5Service$secondaryArchSuffix
|
||||
lib:libKF5Solid$secondaryArchSuffix
|
||||
lib:libKF5WidgetsAddons$secondaryArchSuffix
|
||||
lib:libKF5WindowSystem$secondaryArchSuffix
|
||||
# Qt5
|
||||
lib:libQt5Core$secondaryArchSuffix
|
||||
lib:libQt5DBus$secondaryArchSuffix
|
||||
lib:libQt5Gui$secondaryArchSuffix
|
||||
lib:libQT5Keychain$secondaryArchSuffix
|
||||
lib:libQt5Network$secondaryArchSuffix
|
||||
lib:libQt5Qml$secondaryArchSuffix
|
||||
lib:libQt5Quick$secondaryArchSuffix
|
||||
lib:libQt5Webengine$secondaryArchSuffix
|
||||
lib:libQt5Widgets$secondaryArchSuffix
|
||||
lib:libQt5Xml$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libmpv$secondaryArchSuffix
|
||||
# KF5
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
kirigami_addons$secondaryArchSuffix
|
||||
qqc2_desktop_style${secondaryArchSuffix}_devel
|
||||
devel:libKF5Auth$secondaryArchSuffix
|
||||
devel:libKF5Bookmarks$secondaryArchSuffix
|
||||
devel:libKF5Codecs$secondaryArchSuffix
|
||||
devel:libKF5Completion$secondaryArchSuffix
|
||||
devel:libKF5ConfigCore$secondaryArchSuffix
|
||||
devel:libKF5ConfigWidgets$secondaryArchSuffix
|
||||
devel:libKF5CoreAddons$secondaryArchSuffix
|
||||
devel:libKF5DbusAddons$secondaryArchSuffix
|
||||
devel:libKF5I18n$secondaryArchSuffix
|
||||
devel:libKF5ItemModels$secondaryArchSuffix
|
||||
devel:libKF5ItemViews$secondaryArchSuffix
|
||||
devel:libKF5KIOCore$secondaryArchSuffix
|
||||
devel:libKF5JobWidgets$secondaryArchSuffix
|
||||
devel:libKF5Kirigami2$secondaryArchSuffix
|
||||
devel:libKF5Notifications$secondaryArchSuffix
|
||||
devel:libKF5Service$secondaryArchSuffix
|
||||
devel:libKF5Solid$secondaryArchSuffix
|
||||
devel:libKF5WidgetsAddons$secondaryArchSuffix
|
||||
devel:libKF5WindowSystem$secondaryArchSuffix
|
||||
devel:libKF5XmlGui$secondaryArchSuffix
|
||||
# Qt5
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQT5Keychain$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:msgfmt
|
||||
cmd:msgmerge
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
|
||||
"
|
||||
|
||||
TEST_REQUIRES="
|
||||
qthaikuplugins$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -Bbuild -S. $cmakeDirArgs \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DKDE_INSTALL_QMLDIR=$dataDir/Qt5/qml \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
local APP_NAME="Tokodon"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
local APP_SIGNATURE="application/x-vnd.tokodon"
|
||||
sed \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
-e "s|@APP_NAME@|$APP_NAME|" \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
$portDir/additional-files/tokodon.rdef.in > tokodon.rdef
|
||||
|
||||
addResourcesToBinaries tokodon.rdef $binDir/tokodon
|
||||
|
||||
addAppDeskbarSymlink $binDir/tokodon Tokodon
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
|
||||
make -C build test
|
||||
}
|
||||
133
net-im/tokodon/tokodon-24.12.0.recipe
Normal file
133
net-im/tokodon/tokodon-24.12.0.recipe
Normal file
@@ -0,0 +1,133 @@
|
||||
SUMMARY="KDE Mastodon client"
|
||||
DESCRIPTION="Tokodon is a Mastodon client. It allows you to interact with the Fediverse community."
|
||||
HOMEPAGE="https://invent.kde.org/network/tokodon"
|
||||
COPYRIGHT="2021-2024 KDE Organisation"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/tokodon-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="debc060f1c8573d5b937ada1ca043290bb37f58f420ef4a9c8327683e21fa537"
|
||||
PATCHES="tokodon-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="tokodon.rdef.in"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
tokodon$secondaryArchSuffix = $portVersion
|
||||
cmd:tokodon$secondaryArchSuffix = $portVersion
|
||||
cmd:tokodon_offline$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libGL$secondaryArchSuffix
|
||||
lib:libKirigamiAddonsStatefulApp$secondaryArchSuffix
|
||||
lib:libopenal$secondaryArchSuffix
|
||||
lib:libQt6Keychain$secondaryArchSuffix
|
||||
# KF6
|
||||
lib:libKF6ColorScheme$secondaryArchSuffix
|
||||
lib:libKF6Completion$secondaryArchSuffix
|
||||
lib:libKF6ConfigCore$secondaryArchSuffix
|
||||
lib:libKF6CoreAddons$secondaryArchSuffix
|
||||
lib:libKF6Crash$secondaryArchSuffix
|
||||
lib:libKF6I18n$secondaryArchSuffix
|
||||
lib:libKF6KIOCore$secondaryArchSuffix
|
||||
lib:libKF6JobWidgets$secondaryArchSuffix
|
||||
lib:libKF6Notifications$secondaryArchSuffix
|
||||
lib:libKF6Service$secondaryArchSuffix
|
||||
lib:libKF6Solid$secondaryArchSuffix
|
||||
lib:libKF6WidgetsAddons$secondaryArchSuffix
|
||||
lib:libKirigami$secondaryArchSuffix
|
||||
# Qt6
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Network$secondaryArchSuffix
|
||||
lib:libQt6OpenGL$secondaryArchSuffix
|
||||
lib:libQt6MultiMedia$secondaryArchSuffix
|
||||
lib:libQt6Qml$secondaryArchSuffix
|
||||
lib:libQt6Quick$secondaryArchSuffix
|
||||
lib:libQt6WebView$secondaryArchSuffix
|
||||
lib:libQt6WebSockets$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix
|
||||
devel:libQt6Keychain$secondaryArchSuffix
|
||||
# KF6
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
qqc2_desktop_style6${secondaryArchSuffix}_devel
|
||||
devel:libKF6ColorScheme$secondaryArchSuffix
|
||||
devel:libKF6ConfigCore$secondaryArchSuffix
|
||||
devel:libKF6Crash$secondaryArchSuffix
|
||||
devel:libKF6I18n$secondaryArchSuffix
|
||||
devel:libKF6ItemModels$secondaryArchSuffix
|
||||
devel:libKF6KIOCore$secondaryArchSuffix
|
||||
devel:libKF6Notifications$secondaryArchSuffix
|
||||
devel:libKF6Purpose$secondaryArchSuffix
|
||||
devel:libKF6WindowSystem$secondaryArchSuffix
|
||||
devel:libKirigami$secondaryArchSuffix
|
||||
# Qt6
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6MultiMedia$secondaryArchSuffix
|
||||
devel:libQt6Qml$secondaryArchSuffix
|
||||
devel:libQt6Svg$secondaryArchSuffix
|
||||
devel:libQt6WebView$secondaryArchSuffix
|
||||
devel:libQt6WebSockets$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:msgfmt$secondaryArchSuffix
|
||||
cmd:msgmerge$secondaryArchSuffix
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
TEST_REQUIRES="
|
||||
qthaikuplugins$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
|
||||
$cmakeDirArgs \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
|
||||
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DUSE_QTMULTIMEDIA=ON \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-Wno-dev
|
||||
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make -C build install
|
||||
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
|
||||
local MINOR="`echo "$portVersion" | cut -d. -f3`"
|
||||
local APP_NAME="Tokodon"
|
||||
local LONG_INFO="$SUMMARY"
|
||||
local APP_SIGNATURE="application/x-vnd.tokodon"
|
||||
sed \
|
||||
-e "s|@MAJOR@|$MAJOR|" \
|
||||
-e "s|@MIDDLE@|$MIDDLE|" \
|
||||
-e "s|@MINOR@|$MINOR|" \
|
||||
-e "s|@LONG_INFO@|$LONG_INFO|" \
|
||||
-e "s|@APP_NAME@|$APP_NAME|" \
|
||||
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
|
||||
$portDir/additional-files/tokodon.rdef.in > tokodon.rdef
|
||||
|
||||
addResourcesToBinaries tokodon.rdef $binDir/tokodon
|
||||
|
||||
addAppDeskbarSymlink $binDir/tokodon Tokodon
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}"
|
||||
make -C build test
|
||||
}
|
||||
Reference in New Issue
Block a user