From 53e1fcf794d35eaa9252ef89846fa41be043a999 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 14 Jul 2024 08:53:13 +0200 Subject: [PATCH] marknote, new KDE note taking app. (#10689) --- .../additional-files/marknote.rdef.in | 117 ++++++++++++++++ kde-apps/marknote/marknote-1.3.0.recipe | 126 ++++++++++++++++++ .../marknote/patches/marknote-1.3.0.patchset | 25 ++++ 3 files changed, 268 insertions(+) create mode 100644 kde-apps/marknote/additional-files/marknote.rdef.in create mode 100644 kde-apps/marknote/marknote-1.3.0.recipe create mode 100644 kde-apps/marknote/patches/marknote-1.3.0.patchset diff --git a/kde-apps/marknote/additional-files/marknote.rdef.in b/kde-apps/marknote/additional-files/marknote.rdef.in new file mode 100644 index 000000000..c495dac87 --- /dev/null +++ b/kde-apps/marknote/additional-files/marknote.rdef.in @@ -0,0 +1,117 @@ +resource app_flags B_SINGLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "@APP_NAME@", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource vector_icon { + $"6E6369660F0316A08504003304FF3304006601BEDDF043040043020006023C38" + $"E43D8371BD9A873C2AA841EFC04B2C5B001ABC9CFF16A08504001604004C0400" + $"2304FF6604FF4C05FF02011204387BAF369FE6BABECE3C68B64B0B7A4A3A6000" + $"00FF6300E0CB004FFF000003BDC3C7240209E688AD6CE688AD6CE65AAD82E600" + $"ADAFE62DAD99E6001FE600BDA0E600B850E65ABE82E710C048E6B5BF65E76ABF" + $"65E81FBDA0E7C5BE82E81FB850E81FADAFE81F1FE7F2AD99E798AD6CE7C5AD82" + $"E73DAD6CE687AD6CE6E2AD6CE687AD6CE688AD6CE688AD6CE688AD6C0205E600" + $"ADAFE600ADAFE60020E600BDA0E600B850E62DBDB6E688BDE4E65ABDCDE688B8" + $"93E688ADF3E688B343E65AADDDE600ADAFE62DADC6E600ADAF0205E81FADAFE8" + $"1FADAFE7F2ADC6E798ADF3E7C5ADDDE798B343E798BDE4E798B893E7C5BDCDE8" + $"1FBDA0E7F2BDB6E81FB850E81FADAFE81F20E81FADAF0204E688BDE4E688BDE4" + $"E6E2BDE4E798BDE4E73DBDE4E76ABEAFE70FC047E73DBF7BE6E2BF7BE688BDE4" + $"E6B5BEAFE688BDE40204E600BDA0E600BDA0E62DBDB6E688BDE4E65ABDCDE6B5" + $"BEAFE70FC047E6E2BF7BE6B5BF65E600BDA0E65ABE82E600BDA00207E688AD6C" + $"E688AD6CE65AAD82E600ADAFE62DAD99E62DADC6E688ADF3E65AADDDE6E2ADF3" + $"E798ADF3E73DADF3E7C5ADDDE81FADAFE7F2ADC6E7F2AD99E798AD6CE7C5AD82" + $"E73DAD6CE688AD6CE6E2AD6CE688AD6C0209E600AF8BE600AF8BE600AFB9E600" + $"B014E600AFE6E62DB02AE688B057E65AB041E6E2B057E798B057E73DB057E7C5" + $"B041E81FB014E7F2B02AE81FAFE6E81FAF8BE81FAFB9E7F2AFA2E79817E7C5AF" + $"B9E73D17E68717E6E217E65AAFB9E600AF8BE62DAFA2E600AF8B0209E600AE7B" + $"E600AE7BE600AEA9E600AF04E600AED6E62DAF1AE688AF48E65AAF31E6E2AF48" + $"E798AF48E73DAF48E7C5AF31E81FAF04E7F2AF1AE81FAED6E81FAE7BE81FAEA9" + $"E7F2AE92E798AEBFE7C5AEA9E73DAEBFE687AEBFE6E2AEBFE65AAEA9E600AE7B" + $"E62DAE92E600AE7B0209E600BC8FE600BC8FE600BCBDE600BD17E600BCEAE62D" + $"BD2EE688BD5BE65ABD45E6E2BD5BE798BD5BE73DBD5BE7C5BD45E81FBD17E7F2" + $"BD2EE81FBCEAE81FBC8FE81FBCBDE7F2BCA6E798BCD4E7C5BCBDE73DBCD4E687" + $"BCD4E6E2BCD4E65ABCBDE600BC8FE62DBCA6E600BC8F0206E7B2BEB0E7B2BEB0" + $"E796BEC2E75EBEE7E77ABED4E72ABEE7E6C1BEE7E6F6BEE7E6A5BED5E66DBEB1" + $"E689BEC3E6A3BF38E70FC048E6D940E74640E7B2BEB0E77CBF38E7B2BEB0020A" + $"B7C7B51FB7C7B51FBD17B51FC7B7B51FC267B51FC92FB51FCA5FB7C7CA5FB650" + $"CA5FBD17CA5FC7B7CA5FC267CA5FC92FC7B7CA5FC92FCA5FC267CA5FB7C7CA5F" + $"BD17CA5FB650CA5FB51FC7B7B51FC92FB51FC267B51FB7C7B51FBD17B51FB650" + $"B7C7B51FB650B51FB7C7B51FB7C7B51FB7C7B51FB7C7B51F0606FF0330303030" + $"30BF0A30CA6030C4B5B98DCA60B9E8CA60B9BACA60B9E8C4B5B9E830B9E8BF0A" + $"B9BA303030B98D303030300607FF1FB51F30B51F30B51F3CB51F54B51F48B51F" + $"C930B7C7CA60B64FCA60B84FCA6030CA60B8D7CA6030C4B5303030BF0AB7F530" + $"B51F30B68A30B51F3030020FCA5F40CA5F40CA5FC23ACA5FC72FCA5FC4B5CA60" + $"C7E4C998C911CA18C891C919C990C7B7C9D7C86CC9D8C267C9D7B7C7C9D7BD17" + $"C9D7B713C9D8B5E6C911B666C990B566C891B51FC72FB51FC7E4B51FC75DB51F" + $"54B51FC78AB51FC86CB5E6C999B566C919B666CA19B7C7CA60B713CA60BD17CA" + $"6054CA60C268CA60C86CCA60C999C999C919CA19CA19C919CA6054CA60C86CCA" + $"60C510CA6040CA60C268CA6040CA5F40CA5F40CA5F400606FF07B51F30B51F30" + $"B51FB98DB51FB9E8B51FB9BABC35B9E8CA60B9E8C34AB9E8CA60B9BACA6030CA" + $"60B98DC34A30B51F30BC3530B51F30300209CA60B7C7CA60B7C7CA60B713C999" + $"B5E6CA19B666C919B56654B51FC86CB51FC267B51FB7C7B51FBD17B51FB712B5" + $"1FB5E6B5E6B665B566B566B666B51FB7C7B51EB713B51FB84FB51F30B51FB8D7" + $"BC3430CA5F30C34A30CA5FB8D7CA60B7C7CA60B84FCA60B7C7020EB7C7B51FB7" + $"C7B51FB713B51FB5E6B5E6B666B567B567B666B51FB7C7B51FB713B51FB7F4B5" + $"1FB84FB51FB822B51FB6D6B7C7B5A7B64FB5A7BD17B5A7C7B7B5A7C267B5A7C9" + $"30B5A7CA5FB84FCA5FB6D6CA5FBACACA5F40CA5FBD45CA5F40CA6040CA6040CA" + $"60BD17CA60B7C7CA60BA6FCA60B713C999B5E6CA19B666C919B56654B51FC86C" + $"B51FC267B51FB7C7B51FBD17B51FB7C7B51FB7C7B51FB7C7B51FB7C7B51F0005" + $"34C04834C048BD45C048C1E0C048BF92C04848C048C48740C37740C59840C72F" + $"C048C648C048C7B7C048C8C8C048C840C048C8C8C048000534BD1734BD17BB80" + $"BD1738BD17BC08BD17BDA0BD17BF37BC8FBE27BC8FC048BC8FC1DFBD17C0F9BD" + $"17C42DBD17C8C8BD17C67ABD17C8C8BD17000534C37734C377BC62C377BF37C3" + $"77BDCDC377C048C377C1DF48C0CF484848C487C377C3A1C377C5F2C377C8C8C3" + $"77C75DC377C8C8C37702053450345034C67A34C73034C6D5BD7EC730C28CC730" + $"C005C730C2ADC6D54850C2CFC67AC048503450BDA05034500005BAD3C0D0BAD3" + $"C0D0BD20C0D0C1BBC0D0BF6DC0D0C2CBC0D0C463C048C353C048C573C048C70B" + $"C0CFC624C0CFC793C0CFC8A3C0CFC81BC0CFC8A3C0CF0005BAD3BDA0BAD3BDA0" + $"BB5BBDA0BC6BBDA0BBE3BDA0BD7BBDA0BF13BD17BE03BD17C023BD17C1BBBDA0" + $"C0D4BDA0C408BDA0C8A3BDA0C656BDA0C8A3BDA00005BAD3C400BAD3C400BC3D" + $"C400BF13C400BDA8C400C023C400C1BBC377C0ABC377C2CBC377C463C400C37C" + $"C400C5CEC400C8A3C400C738C400C8A3C4000205BAD3C6A8BAD3C6A8BAD3C703" + $"BAD354BAD3C75DBD5A54C26854BFE154C295C75D48C6A8C2C2C703C03CC6A8BA" + $"D3C6A8BD87C6A8BAD3C6A80205BC43CC0ABC43CC0AC011C564C7AEB819C3E0BE" + $"BFC961B8F5CCC7BAADCB14B9D1C8F8C153C15BCE9EC52AC7F8BFA9CDC2BC43CC" + $"0ABDF661BC43CC0A0208C966B632C966B632C933B635C8CEB63AC901B637C6B3" + $"BB1AC27BC4DBC497BFFBC275C5CFC26854C26EC6C3C315C70BC46FC5B3C3C2C6" + $"5FC68AC0D3CAC2B712C8A6BBF2CAA1B6EBCA60B69ECA80B6C4CA0CB67AC966B6" + $"32C9B9B656C966B6320205C8CEB63AC8CEB63AC6B3BB1AC27CC4DBC497BFFBC2" + $"9DC502C2DEC550C2BDC529C4F9C06FC930B6AFC715BB8FC910B688C8CEB63AC8" + $"EFB661C8CEB63A0205CAC1B712CAC1B712CA8FB715CA2AB71ACA5CB717C80EBB" + $"FBC3D7C5BCC5F3C0DBC40AC5B9C46FC5B3C43CC5B6C68AC0D3CAC1B712C8A6BB" + $"F2CAC1B7120204C2DDC54FC2DDC54FC331C573C3D7C5BBC384C597C35DC665C2" + $"6854C2E2C70EC28FC6EAC2DDC54FC2B6C61DC2DDC54F0204C27CC4DBC27CC4DB" + $"C29CC502C2DDC550C2BDC529C2B6C61DC26754C28EC6EAC26EC6C3C27CC4DBC2" + $"75C5CFC27CC4DB0207C966B632C966B632C933B635C8CEB63AC901B637C8EFB6" + $"61C930B6AFC90FB688C983B6D3CA2AB71BC9D6B6F7CA5CB718CAC1B712CA8FB7" + $"15CAA1B6EBCA60B69ECA80B6C4CA0CB67AC966B632C9B9B656C966B6320209C8" + $"11B7EFC811B7EFC7FFB819C7DBB86CC7EDB842C7FCB893C83DB8E1C81CB8BAC8" + $"90B905C937B94CC8E3B929C969B94AC9CFB944C99CB947C9E1B91ACA05B8C7C9" + $"F3B8F0C9D2B8CAC96DB8D0C99FB8CDC919B8ACC873B864C8C6B888C853B83DC8" + $"11B7EFC832B816C811B7EF0209C87DB6F5C87DB6F5C86BB71FC847B772C859B7" + $"48C868B799C8A9B7E7C888B7C0C8FCB80BC9A3B853C94FB82FC9D5B850CA3BB8" + $"4ACA08B84DCA4DB820CA71B7CDCA5FB7F7CA3EB7D0C9D8B7D6CA0BB7D3C985B7" + $"B2C8DFB76AC932B78EC8BEB743C87DB6F5C89EB71CC87DB6F50209C2E8C3E2C2" + $"E8C3E2C2D6C40BC2B2C45FC2C4C435C2D2C485C313C4D3C2F3C4ACC366C4F7C4" + $"0DC53FC3BAC51BC440C53CC4A5C536C472C539C4B7C50DC4DBC4BAC4C9C4E3C4" + $"A8C4BCC443C4C2C476C4BFC3F0C49EC349C456C39CC47AC329C42FC2E8C3E2C3" + $"08C409C2E8C3E20206C39FC682C39FC682C37EC687C33CC693C35DC68DC30CC6" + $"7EC2ACC654C2DCC669C299C639C273C602C286C61DC26FC694C26854C26BC726" + $"C2CFC750C39FC682C337C6E9C39FC6821C0A000100000A010101000A02010200" + $"0A010103000A030104000A010105000A0403060708000A050109000A06010A00" + $"0A07010B000A08010C000A01010D000A09010E000A0A010F000A0B0110000A0C" + $"031112131001178200040A0C0114000A0C031516171001178200040A0B011800" + $"0A0D0119000A0E011A000A01011B000A02011C000A01011D000A03011E000A01" + $"011F000A0A03202122000A05012300" +}; diff --git a/kde-apps/marknote/marknote-1.3.0.recipe b/kde-apps/marknote/marknote-1.3.0.recipe new file mode 100644 index 000000000..a4f748909 --- /dev/null +++ b/kde-apps/marknote/marknote-1.3.0.recipe @@ -0,0 +1,126 @@ +SUMMARY="Write down your thoughts" +DESCRIPTION="Marknote lets you create rich text notes and easily organise them into notebooks. \ +You can personalise your notebooks by choosing an icon and accent color for each one, making it \ +easy to distinguish between them and keep your notes at your fingertips. Your notes are saved as \ +Markdown files in your Documents folder, making it easy to use your notes outside of Marknote as \ +well as inside the app." +HOMEPAGE="https://invent.kde.org/office/marknote" +COPYRIGHT="2010-2024 KDE Organisation" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/marknote/marknote-$portVersion.tar.xz" +CHECKSUM_SHA256="ff99598415a6cca5900cb4d10d2b72a6f392eafe07874b6e2eb42e9f7ab3bd28" +SOURCE_DIR="marknote-$portVersion" +PATCHES="marknote-$portVersion.patchset" +ADDITIONAL_FILES="marknote.rdef.in" + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + marknote$secondaryArchSuffix = $portVersion + cmd:marknote$commandSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + kirigami_addons1$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libmd4c$secondaryArchSuffix + lib:libmd4c_html$secondaryArchSuffix + # KF6 + lib:libKF6ColorScheme$secondaryArchSuffix + lib:libKF6ConfigCore$secondaryArchSuffix + lib:libKF6ConfigWidgets$secondaryArchSuffix + lib:libKF6CoreAddons$secondaryArchSuffix + lib:libKF6Crash$secondaryArchSuffix + lib:libKF6I18n$secondaryArchSuffix + lib:libKF6WidgetsAddons$secondaryArchSuffix + lib:libKF6XmlGui$secondaryArchSuffix + # KPim6 + lib:libKPim6Mime$secondaryArchSuffix + # Qt6 + lib:libQt6Core$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6OpenGL$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix + lib:libQt6Quick$secondaryArchSuffix + lib:libQt6Svg$secondaryArchSuffix + lib:libQt6Widgets$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + kirigami_addons1${secondaryArchSuffix}_devel + devel:libmd4c$secondaryArchSuffix + # KF6 + breeze_icons${secondaryArchSuffix}_devel >= 6.0.0 + extra_cmake_modules$secondaryArchSuffix >= 6.0.0 + devel:libKF6Codecs$secondaryArchSuffix + devel:libKF6ColorScheme$secondaryArchSuffix + devel:libKF6ConfigCore$secondaryArchSuffix + devel:libKF6ConfigWidgets$secondaryArchSuffix + devel:libKF6CoreAddons$secondaryArchSuffix + devel:libKF6Crash$secondaryArchSuffix + devel:libKF6I18n$secondaryArchSuffix + devel:libKF6WidgetsAddons$secondaryArchSuffix + devel:libKF6XmlGui$secondaryArchSuffix + devel:libKirigami$secondaryArchSuffix + # KPim6 + devel:libKPim6Mime$secondaryArchSuffix + # Qt6 + devel:libQt6Core$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix + devel:libQt6Svg$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:msgfmt + cmd:msgmerge + cmd:pkg_config$secondaryArchSuffix + cmd:xsltproc + " + +BUILD() +{ + cmake -Bbuild -S. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_BINDIR=$commandBinDir \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake -Wno-dev + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + # cleanup + rm -rf $dataDir/{applications,metainfo} + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local APP_NAME="Marknote" + local LONG_INFO="$SUMMARY" + local APP_SIGNATURE="application/x-vnd.marknote" + 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/marknote.rdef.in > marknote.rdef + + addResourcesToBinaries marknote.rdef $commandBinDir/marknote + addAppDeskbarSymlink $commandBinDir/marknote Marknote +} diff --git a/kde-apps/marknote/patches/marknote-1.3.0.patchset b/kde-apps/marknote/patches/marknote-1.3.0.patchset new file mode 100644 index 000000000..20af37de1 --- /dev/null +++ b/kde-apps/marknote/patches/marknote-1.3.0.patchset @@ -0,0 +1,25 @@ +From 50c02ef7bc299aa867cfc57623941768e95b8b87 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Sat, 18 May 2024 09:30:32 +0200 +Subject: Use software rendering + +Text menus don't display too well all the time with Kirigami +Use fallback to software rendering to solve the display + +diff --git a/src/main.cpp b/src/main.cpp +index 04ebf14..f2112ae 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -31,6 +31,9 @@ using namespace Qt::Literals::StringLiterals; + + int main(int argc, char *argv[]) + { ++#if defined(Q_OS_HAIKU) ++ qputenv("QT_QUICK_BACKEND", "software"); ++#endif + #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + #endif +-- +2.45.1 +