diff --git a/app-office/texmaker/additional-files/texmaker.rdef.in b/app-office/texmaker/additional-files/texmaker.rdef.in new file mode 100644 index 000000000..c4d28f542 --- /dev/null +++ b/app-office/texmaker/additional-files/texmaker.rdef.in @@ -0,0 +1,80 @@ + +resource app_flags B_MULTIPLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + + variety = B_APPV_FINAL, + internal = 0, + + short_info = "TexMaker", + long_info = "@LONG_INFO@" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource("QT:QPA_FLAGS") "Q_REF_TO_ARGV|Q_REF_TO_FORK"; + +resource file_types message { + "types" = "text/x-tex", + "types" = "application/x-latex" +}; + +resource vector_icon { + $"6E6369660E020006023B3048396B09BA90823C646E4A101543299500FFFFFFFF" + $"FFF289020006023B2B47BB18653D0FA43D225148297046CA1900FFEC4BFFF0A5" + $"06020006023A1DA5393F03BBB5BB3C6B074AEA3648091100F99B05FFFCB23D03" + $"FFACAC020006023C0AE63B3927BC611E3D03FE4C25624A1A9600A3043CFFFF90" + $"AF020006023621143C7C5CBC9C2E363C554BB602490E0C00EC9393FFE3494902" + $"00060238A928BB1C893CC2283A5BDF46B52549B5B6000569D0FE033E7A020006" + $"023AF3E63CC117BCA4E33AD5AA4A62BB492A0900FFFFFFFF63C2F4020006022B" + $"A5AE3E2FFFBD3FFF2AB5974AC77D490F52003383D5FF02356902000602000000" + $"3C6028BC60280000004A3FEB4A6FEB00ABD5FFFF006CD9050104016D05000200" + $"16023C335C3AD2E1BAD2E13C335C4988A3499C7A00FDFF8D170A04323F373B43" + $"403F450A0C3351323F3F443F48374537493E4C3E4F374D37503E533E570A043F" + $"45434043443F480A043E503E4C4248424B0A043E573E53424F42530A04374937" + $"453A423A460A043750374C3B493B4D0A04374A3A4642493E4D0A0437503A4D42" + $"4F3E530A04232D2A2A372E32320A082332232D323232372E362F472A4428340A" + $"0432373232372E37340A042F472E36323432440A0C42474A3F46314C334E3B54" + $"355B37524156504F4D4D45484A0A0446314A2D4F2E4C330A04543558315E325B" + $"370A044E3C4C334F2E52390A04564F5141543D594A0A0F3F5846574F4E55515D" + $"50604A6044533D4441413E453A37353139344C35520221B97EBE29B97EBE29B8" + $"90BE34B6F6BEF9B7B3BE80B6F6BEF9B728BFCDB6F1BF77B728BFCDB798C07BB7" + $"98C07BB709C0E7B660C228B69CC17AB660C228B59DC1F5B59DC1F5B53BC1DBB4" + $"C3C204B4C3C204B4A7C26DB49AC350B49AC2DEB49AC3CBB4C6C4AEB4A9C43FB4" + $"C6C4AEB5A1C4BDB53DC4D8B5A1C4BDB665C486B665C486B6A1C52EB79AC62BB7" + $"0EC5C2B79AC62BB72BC6D6B72BC6D6B6F5C72CB6F9C7ABB6F9C7ABB7B5C824B9" + $"7FC879B891C86EB97FC879B9CFC7B2B9CAC818B9CFC7B2B9D8C6E4B9D8C6E433" + $"C6E1BBCDC644BB3DC6A5BBCDC644BC4CC6E2BC4CC6E2BC8CC731BD05C756BD05" + $"C756BDB5C6C6BE97C530BE41C60ABE97C530BDF1C4A7BE50C4CDBDF1C4A7BD32" + $"C45BBD32C45BBD4BC408BD58C352BD58C3ADBD58C2F9BD36C251BD4DC2A4BD36" + $"C251BDF3C20BBDF3C20BBE53C1E6BE9BC17DBE9BC17DBE49C0A2BD0ABF51BDBC" + $"BFE2BD0ABF51BC52BFC5BC94BF76BC52BFC5BBD3C065BBD3C065BB44C000B9D8" + $"40BA96BFC4B9D840B9CFBEF0B9CFBEF0B9CCBE8AB97FBE29B97FBE29B97FBE29" + $"0204344934C2AC34C3FE314CBA6E4CB91D4C2E492EC3FE2EC2AC3146B91C46BA" + $"6E460221B97EBE29B97EBE29B890BE34B6F6BEF9B7B3BE80B6F6BEF9B728BFCD" + $"B6F1BF77B728BFCDB798C07BB798C07BB709C0E7B660C228B69CC17AB660C228" + $"B59DC1F5B59DC1F5B53BC1DBB4C3C204B4C3C204B4A7C26DB49AC350B49AC2DE" + $"B49AC3CBB4C6C4AEB4A9C43FB4C6C4AEB5A1C4BDB53DC4D8B5A1C4BDB665C486" + $"B665C486B6A1C52EB79AC62BB70EC5C2B79AC62BB72BC6D6B72BC6D6B6F5C72C" + $"B6F9C7ABB6F9C7ABB7B5C824B97FC879B891C86EB97FC879B9CFC7B2B9CAC818" + $"B9CFC7B2B9D8C6E4B9D8C6E433C6E1BBCDC644BB3DC6A5BBCDC644BC4CC6E2BC" + $"4CC6E2BC8CC731BD05C756BD05C756BDB5C6C6BE97C530BE41C60ABE97C530BD" + $"F1C4A7BE50C4CDBDF1C4A7BD32C45BBD32C45BBD4BC408BD58C352BD58C3ADBD" + $"58C2F9BD36C251BD4DC2A4BD36C251BDF3C20BBDF3C20BBE53C1E6BE9BC17DBE" + $"9BC17DBE49C0A2BD0ABF51BDBCBFE2BD0ABF51BC52BFC5BC94BF76BC52BFC5BB" + $"D3C065BBD3C065BB44C000B9D840BA96BFC4B9D840B9CFBEF0B9CFBEF0B9CCBE" + $"8AB97FBE29B97FBE29B97FBE290204344934C2AC34C3FE314CBA6E4CB91D4C2E" + $"492EC3FE2EC2AC3146B91C46BA6E46110A0B0112201F190A0A04090A0B0C301F" + $"1901178413040A02020B0C201F190A000109201F190A01010A201F190A0A050D" + $"0E0F101130201701178413040A040210112020170A03020E0F2020170A05010D" + $"2020170A0A070001020304070812404927000000000000402067C34957C6A5E1" + $"01178313040A0802050602404927000000000000402067C34957C6A5E10A0602" + $"070802404927000000000000402067C34957C6A5E10A09010102404927000000" + $"000000402067C34957C6A5E10A07010002404927000000000000402067C34957" + $"C6A5E10A080302030402404927000000000000402067C34957C6A5E10A0C0213" + $"14123F44C40000000000003F6B33C0D42E47FD8201178410040A0D021516023F" + $"44C40000000000003F6B33C0D42E47FD82" +}; diff --git a/app-office/texmaker/patches/texmaker-5.0.4.patchset b/app-office/texmaker/patches/texmaker-5.0.4.patchset index ee20ba7c1..261121e22 100644 --- a/app-office/texmaker/patches/texmaker-5.0.4.patchset +++ b/app-office/texmaker/patches/texmaker-5.0.4.patchset @@ -1,4 +1,4 @@ -From 3fdb931572500f23420cbc7cd648709affcd0ae3 Mon Sep 17 00:00:00 2001 +From cabb314875a1199ba7c9d20c98d080a98f9906a1 Mon Sep 17 00:00:00 2001 From: begasus Date: Wed, 30 Oct 2019 11:01:35 +0000 Subject: Add Haiku to the platforms @@ -27,10 +27,10 @@ index f4fc2e8..5c9aa84 100644 #endif // _FX_OS_ -- -2.24.1 +2.26.0 -From 7c9ef884ff58495bf21fd210a81d32bfc1477d87 Mon Sep 17 00:00:00 2001 +From 5aa5669a2edee5ff483fab2546c1c0b39b1f8a3f Mon Sep 17 00:00:00 2001 From: begasus Date: Wed, 30 Oct 2019 11:02:46 +0000 Subject: Haiku doesn't have d_type @@ -61,10 +61,10 @@ index abd84a8..65c0551 100644 #endif } -- -2.24.1 +2.26.0 -From 7d4ba7fb63d82f57ae2fde3d3327b82b7f36e6ed Mon Sep 17 00:00:00 2001 +From a2bd1ad135f9861654860da2e1620714b590132d Mon Sep 17 00:00:00 2001 From: begasus Date: Wed, 15 Jan 2020 16:00:47 +0000 Subject: Fix utilities.path @@ -94,5 +94,55 @@ index 399cc71..ed807de 100644 icon.path = $${ICONDIR} #not for openSUSE : -- -2.24.1 +2.26.0 + + +From 2d78b044516035e3cf25d9d0fca721658fc4911b Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 16 May 2020 13:58:59 +1000 +Subject: Don't set fusion style for Haiku + + +diff --git a/texmaker.cpp b/texmaker.cpp +index 9c1f58b..ce93af5 100644 +--- a/texmaker.cpp ++++ b/texmaker.cpp +@@ -4754,6 +4754,9 @@ QString kdesession= ::getenv("KDE_FULL_SESSION"); + QString kdeversion= ::getenv("KDE_SESSION_VERSION"); + if (!kdesession.isEmpty()) desktop_env=2; + if (!kdeversion.isEmpty()) desktop_env=3; ++#ifdef __HAIKU__ ++desktop_env=4; ++#endif + + //desktop_env=1; + latex_command=config->value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); +@@ -4788,6 +4791,14 @@ switch (desktop_env) + viewps_command=config->value("Tools/Ps","okular %.ps").toString(); + viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString(); + }break; ++#ifdef __HAIKU__ ++ case 4: ++ { ++ viewdvi_command=config->value("Tools/Dvi","open %.dvi").toString(); ++ viewps_command=config->value("Tools/Ps","open %.ps").toString(); ++ viewpdf_command=config->value("Tools/Pdf","open %.pdf").toString(); ++ }break; ++#endif + } + + +@@ -4816,8 +4827,9 @@ else if (styles.contains("Breeze")) qApp->setStyle(QLatin1String("breeze")); + else qApp->setStyle(QLatin1String("fusion")); + } + else if (styles.contains("Breeze")) qApp->setStyle(QLatin1String("breeze")); +-else qApp->setStyle(QLatin1String("fusion")); ++else if (desktop_env != 4)qApp->setStyle(QLatin1String("fusion")); + #else ++ + qApp->setStyle(QLatin1String("fusion")); + #endif + // QApplication::setPalette(QApplication::style()->standardPalette()); +-- +2.26.0 diff --git a/app-office/texmaker/texmaker-5.0.4.recipe b/app-office/texmaker/texmaker-5.0.4.recipe index c9759d07d..6c633cd78 100644 --- a/app-office/texmaker/texmaker-5.0.4.recipe +++ b/app-office/texmaker/texmaker-5.0.4.recipe @@ -9,10 +9,11 @@ Texmaker is easy to use and to configure." HOMEPAGE="https://xm1math.net/texmaker/" COPYRIGHT="2003-2019 Pascal Brachet" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://xm1math.net/texmaker/texmaker-$portVersion.tar.bz2" CHECKSUM_SHA256="1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2" PATCHES="texmaker-$portVersion.patchset" +ADDITIONAL_FILES="texmaker.rdef.in" ARCHITECTURES="!x86_gcc2 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -56,15 +57,37 @@ BUILD_PREREQUIRES=" BUILD() { - qmake texmaker.pro PREFIX=$prefix UTILITIESDIR=$dataDir/texmaker + qmake texmaker.pro \ + PREFIX=$prefix \ + UTILITIESDIR=$dataDir/texmaker \ + DESKTOPDIR=$dataDir/applications \ + ICONDIR=$dataDir/pixmaps \ + METAINFODIR=$dataDir/metainfo \ + AUTHORIZELINUXQSTYLES=yes make $jobArgs } INSTALL() { make install - # create a link to $appsDir and Deskbar + mkdir -p $appsDir ln -s $prefix/bin/texmaker $appsDir/Texmaker + rm -rf $dataDir/{applications,pixmaps,metainfo} + + local APP_SIGNATURE="application/x-vnd.qt5-texmaker" + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local LONG_INFO="$SUMMARY" + sed \ + -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@LONG_INFO@|$LONG_INFO|" \ + $portDir/additional-files/texmaker.rdef.in > $sourceDir/texmaker.rdef + + addResourcesToBinaries $sourceDir/texmaker.rdef $appsDir/Texmaker addAppDeskbarSymlink $appsDir/Texmaker }