haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Texmaker: fix data paths

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-16 16:03:53 +10:00
parent 3c3b36c30a
commit 997825b4df
2 changed files with 102 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
app-office/texmaker/patches/texmaker-5.0.4.patchset
View File

@@ -1,4 +1,4 @@
From cabb314875a1199ba7c9d20c98d080a98f9906a1 Mon Sep 17 00:00:00 2001
From 20b096ebfa9d7b188c044ca166e62ce354355c63 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 30 Oct 2019 11:01:35 +0000
Subject: Add Haiku to the platforms
@@ -30,7 +30,7 @@ index f4fc2e8..5c9aa84 100644
2.26.0
From 5aa5669a2edee5ff483fab2546c1c0b39b1f8a3f Mon Sep 17 00:00:00 2001
From 54c5a2dc0271c7d4f701ea2d8eb92d88c504f00d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 30 Oct 2019 11:02:46 +0000
Subject: Haiku doesn't have d_type
@@ -64,7 +64,7 @@ index abd84a8..65c0551 100644
2.26.0
From a2bd1ad135f9861654860da2e1620714b590132d Mon Sep 17 00:00:00 2001
From 535065a5be47f49e629089f5b29b3fbe1cda099d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 15 Jan 2020 16:00:47 +0000
Subject: Fix utilities.path
@@ -97,7 +97,7 @@ index 399cc71..ed807de 100644
2.26.0
From 2d78b044516035e3cf25d9d0fca721658fc4911b Mon Sep 17 00:00:00 2001
From 61eea6acf5fe03a551fcf8555a5ee74865fce3c9 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
@@ -146,3 +146,100 @@ index 9c1f58b..ce93af5 100644
--
2.26.0
From 1fc9fe77fce6d4063d3caf73b12906572914fa30 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 May 2020 15:55:03 +1000
Subject: Fix paths
diff --git a/configdialog.cpp b/configdialog.cpp
index 28a7a60..7b932f6 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -18,7 +18,7 @@
#include <QDir>
#include <QTableWidgetItem>
#include <QDebug>
-
+#include <QStandardPaths>
#include "geticon.h"
ConfigDialog::ConfigDialog(QWidget* parent): QDialog( parent)
@@ -216,7 +216,7 @@ void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previou
//pageditor
void ConfigDialog::browseAspell()
{
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
#ifdef USB_VERSION
QDir spelldir(QCoreApplication::applicationDirPath());
@@ -235,6 +235,9 @@ QDir spelldir(QCoreApplication::applicationDirPath() + "/../Resources");
#if defined(Q_OS_WIN32)
QDir spelldir(QCoreApplication::applicationDirPath());
#endif
+#if defined(Q_OS_HAIKU)
+QDir spelldir(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "hunspell", QStandardPaths::LocateDirectory));
+#endif
QString location=QFileDialog::getOpenFileName(this,tr("Browse dictionary"),spelldir.absolutePath(),"Dictionary (*.dic)",0,QFileDialog::DontResolveSymlinks);
if ( !location.isEmpty() )
{
@@ -248,6 +251,8 @@ void ConfigDialog::browseSvn()
{
#if defined(Q_OS_WIN32)
QString svndir=qgetenv("PROGRAMFILES");
+#elif defined(Q_OS_HAIKU)
+QString svndir="/bin";
#else
QString svndir="/usr/bin";
#endif
diff --git a/texmaker.cpp b/texmaker.cpp
index ce93af5..5dac4e9 100644
--- a/texmaker.cpp
+++ b/texmaker.cpp
@@ -501,7 +501,7 @@ errorIndex=-1;
translationList.clear();
translationList.append(QString("en"));
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
#ifdef USB_VERSION
QDir transdir(QCoreApplication::applicationDirPath());
#else
@@ -515,6 +515,9 @@ QDir transdir(QCoreApplication::applicationDirPath() + "/../Resources");
#if defined(Q_OS_WIN32)
QDir transdir(QCoreApplication::applicationDirPath());
#endif
+#if defined(Q_OS_HAIKU)
+QDir transdir(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "texmaker", QStandardPaths::LocateDirectory));
+#endif
foreach (QFileInfo qmFileInfo, transdir.entryInfoList(QStringList("texmaker_*.qm"),QDir::Files | QDir::Readable, QDir::Name | QDir::IgnoreCase))
{
QString transName = qmFileInfo.completeBaseName();
diff --git a/texmakerapp.cpp b/texmakerapp.cpp
index 45ab1ba..18b9106 100644
--- a/texmakerapp.cpp
+++ b/texmakerapp.cpp
@@ -46,7 +46,7 @@ foreach (QTranslator* tr, translatorsList)
translatorsList.clear();
QTranslator* appTranslator=new QTranslator(this);
QTranslator* basicTranslator=new QTranslator(this);
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
#ifdef USB_VERSION
QString transdir=QCoreApplication::applicationDirPath();
#else
@@ -59,6 +59,9 @@ QString transdir=QCoreApplication::applicationDirPath() + "/../Resources";
#if defined(Q_OS_WIN32)
QString transdir=QCoreApplication::applicationDirPath();
#endif
+#if defined(Q_OS_HAIKU)
+QString transdir(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "texmaker", QStandardPaths::LocateDirectory));
+#endif
if ( locale.length() < 2 ) locale = "en";
if (appTranslator->load(QString("texmaker_")+locale,transdir))
{
--
2.26.0

2
app-office/texmaker/texmaker-5.0.4.recipe
View File

@@ -9,7 +9,7 @@ Texmaker is easy to use and to configure."
HOMEPAGE="https://xm1math.net/texmaker/"
COPYRIGHT="2003-2019 Pascal Brachet"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="https://xm1math.net/texmaker/texmaker-$portVersion.tar.bz2"
CHECKSUM_SHA256="1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2"
PATCHES="texmaker-$portVersion.patchset"