haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

texmaker, bump version (#9744)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-11-11 09:51:16 +00:00
committed by GitHub
parent 9284d7c5da
commit f0745ac6be
2 changed files with 81 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
app-office/texmaker/patches/texmaker-5.0.4.patchset → app-office/texmaker/patches/texmaker-5.1.4.patchset
View File

@@ -1,13 +1,13 @@
From 20b096ebfa9d7b188c044ca166e62ce354355c63 Mon Sep 17 00:00:00 2001
From 11d6c2e661d15944ec19b75c866573d13a9f1fea 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
diff --git a/pdfium/core/fxcrt/include/fx_system.h b/pdfium/core/fxcrt/include/fx_system.h
index f4fc2e8..5c9aa84 100644
--- a/pdfium/core/fxcrt/include/fx_system.h
+++ b/pdfium/core/fxcrt/include/fx_system.h
diff --git a/pdfium/core/fxcrt/fx_system.h b/pdfium/core/fxcrt/fx_system.h
index c31bef9..ac2eeca 100644
--- a/pdfium/core/fxcrt/fx_system.h
+++ b/pdfium/core/fxcrt/fx_system.h
@@ -23,6 +23,7 @@
#define _FX_LINUX_DESKTOP_ 4
#define _FX_MACOSX_ 7
@@ -27,54 +27,44 @@ index f4fc2e8..5c9aa84 100644
#endif // _FX_OS_
--
2.26.0
2.42.0
From 54c5a2dc0271c7d4f701ea2d8eb92d88c504f00d Mon Sep 17 00:00:00 2001
From 23151877f511a590722933e410472756f702586c 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
diff --git a/pdfium/core/fxcrt/fx_basic_util.cpp b/pdfium/core/fxcrt/fx_basic_util.cpp
index abd84a8..65c0551 100644
index e52ff2e..774ca53 100644
--- a/pdfium/core/fxcrt/fx_basic_util.cpp
+++ b/pdfium/core/fxcrt/fx_basic_util.cpp
@@ -199,7 +199,9 @@ FX_BOOL FX_GetNextFile(void* handle,
return FALSE;
}
filename = de->d_name;
@@ -185,7 +185,9 @@ bool FX_GetNextFile(FX_FileHandle* handle,
if (!de)
return false;
*filename = de->d_name;
+#ifndef __HAIKU__
bFolder = de->d_type == DT_DIR;
*bFolder = de->d_type == DT_DIR;
+#endif
return TRUE;
#endif
}
@@ -229,7 +231,9 @@ FX_BOOL FX_GetNextFile(void* handle,
return FALSE;
}
filename = CFX_WideString::FromLocal(de->d_name);
+#ifndef __HAIKU__
bFolder = de->d_type == DT_DIR;
+#endif
return TRUE;
return true;
#endif
}
--
2.26.0
2.42.0
From 535065a5be47f49e629089f5b29b3fbe1cda099d Mon Sep 17 00:00:00 2001
From dd9d21c7aa5376416a743c47c1aca1df0c874698 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
diff --git a/texmaker.pro b/texmaker.pro
index 399cc71..ed807de 100644
index ce7d3b1..e428051 100644
--- a/texmaker.pro
+++ b/texmaker.pro
@@ -1043,6 +1043,9 @@ OBJECTS_DIR = .obj
@@ -1136,6 +1136,9 @@ OBJECTS_DIR = .obj
isEmpty( PREFIX ) {
PREFIX=/usr
}
@@ -84,7 +74,7 @@ index 399cc71..ed807de 100644
isEmpty( DESKTOPDIR ) {
DESKTOPDIR=/usr/share/applications
}
@@ -1064,7 +1067,7 @@ DEFINES += AUTHORIZE_LINUX_QSTYLES
@@ -1160,7 +1163,7 @@ DEFINES += AUTHORIZE_LINUX_QSTYLES
target.path = $${PREFIX}/bin
@@ -92,22 +82,22 @@ index 399cc71..ed807de 100644
+utilities.path = $${UTILITIESDIR}
desktop.path = $${DESKTOPDIR}
icon.path = $${ICONDIR}
#not for openSUSE :
metainfo.path = $${METAINFODIR}
--
2.26.0
2.42.0
From 61eea6acf5fe03a551fcf8555a5ee74865fce3c9 Mon Sep 17 00:00:00 2001
From 54adb66e118739e9f12c7fabccf3869c92363daa 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
index fde1aa9..b2d0714 100644
--- a/texmaker.cpp
+++ b/texmaker.cpp
@@ -4754,6 +4754,9 @@ QString kdesession= ::getenv("KDE_FULL_SESSION");
@@ -5244,6 +5244,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;
@@ -116,8 +106,8 @@ index 9c1f58b..ce93af5 100644
+#endif
//desktop_env=1;
latex_command=config->value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString();
@@ -4788,6 +4791,14 @@ switch (desktop_env)
latex_command=config->value("Tools/Latex","latex -synctex=1 -interaction=nonstopmode %.tex").toString();
@@ -5278,6 +5281,14 @@ switch (desktop_env)
viewps_command=config->value("Tools/Ps","okular %.ps").toString();
viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
}break;
@@ -132,7 +122,7 @@ index 9c1f58b..ce93af5 100644
}
@@ -4816,8 +4827,9 @@ else if (styles.contains("Breeze")) qApp->setStyle(QLatin1String("breeze"));
@@ -5298,8 +5309,9 @@ else if (styles.contains("Breeze")) qApp->setStyle(QLatin1String("breeze"));
else qApp->setStyle(QLatin1String("fusion"));
}
else if (styles.contains("Breeze")) qApp->setStyle(QLatin1String("breeze"));
@@ -144,29 +134,28 @@ index 9c1f58b..ce93af5 100644
#endif
// QApplication::setPalette(QApplication::style()->standardPalette());
--
2.26.0
2.42.0
From 1fc9fe77fce6d4063d3caf73b12906572914fa30 Mon Sep 17 00:00:00 2001
From a011585e059b859486f0611134b1eba453e6fadb 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
index 0c4e86e..cea5b9f 100644
--- a/configdialog.cpp
+++ b/configdialog.cpp
@@ -18,7 +18,7 @@
#include <QDir>
#include <QTableWidgetItem>
#include <QDebug>
-
@@ -25,6 +25,7 @@
#include <QtCore5Compat/QTextCodec>
#endif
+#include <QStandardPaths>
#include "geticon.h"
ConfigDialog::ConfigDialog(QWidget* parent): QDialog( parent)
@@ -216,7 +216,7 @@ void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previou
@@ -223,7 +224,7 @@ void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previou
//pageditor
void ConfigDialog::browseAspell()
{
@@ -175,7 +164,7 @@ index 28a7a60..7b932f6 100644
#ifdef USB_VERSION
QDir spelldir(QCoreApplication::applicationDirPath());
@@ -235,6 +235,9 @@ QDir spelldir(QCoreApplication::applicationDirPath() + "/../Resources");
@@ -242,6 +243,9 @@ QDir spelldir(QCoreApplication::applicationDirPath() + "/../Resources");
#if defined(Q_OS_WIN32)
QDir spelldir(QCoreApplication::applicationDirPath());
#endif
@@ -185,7 +174,7 @@ index 28a7a60..7b932f6 100644
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()
@@ -255,6 +259,8 @@ void ConfigDialog::browseSvn()
{
#if defined(Q_OS_WIN32)
QString svndir=qgetenv("PROGRAMFILES");
@@ -195,10 +184,10 @@ index 28a7a60..7b932f6 100644
QString svndir="/usr/bin";
#endif
diff --git a/texmaker.cpp b/texmaker.cpp
index ce93af5..5dac4e9 100644
index b2d0714..d10cd7a 100644
--- a/texmaker.cpp
+++ b/texmaker.cpp
@@ -501,7 +501,7 @@ errorIndex=-1;
@@ -986,7 +986,7 @@ errorIndex=-1;
translationList.clear();
translationList.append(QString("en"));
@@ -207,7 +196,7 @@ index ce93af5..5dac4e9 100644
#ifdef USB_VERSION
QDir transdir(QCoreApplication::applicationDirPath());
#else
@@ -515,6 +515,9 @@ QDir transdir(QCoreApplication::applicationDirPath() + "/../Resources");
@@ -1000,6 +1000,9 @@ QDir transdir(QCoreApplication::applicationDirPath() + "/../Resources");
#if defined(Q_OS_WIN32)
QDir transdir(QCoreApplication::applicationDirPath());
#endif
@@ -218,10 +207,10 @@ index ce93af5..5dac4e9 100644
{
QString transName = qmFileInfo.completeBaseName();
diff --git a/texmakerapp.cpp b/texmakerapp.cpp
index 45ab1ba..18b9106 100644
index f8139a9..968cace 100644
--- a/texmakerapp.cpp
+++ b/texmakerapp.cpp
@@ -46,7 +46,7 @@ foreach (QTranslator* tr, translatorsList)
@@ -50,7 +50,7 @@ foreach (QTranslator* tr, translatorsList)
translatorsList.clear();
QTranslator* appTranslator=new QTranslator(this);
QTranslator* basicTranslator=new QTranslator(this);
@@ -230,7 +219,7 @@ index 45ab1ba..18b9106 100644
#ifdef USB_VERSION
QString transdir=QCoreApplication::applicationDirPath();
#else
@@ -59,6 +59,9 @@ QString transdir=QCoreApplication::applicationDirPath() + "/../Resources";
@@ -63,6 +63,9 @@ QString transdir=QCoreApplication::applicationDirPath() + "/../Resources";
#if defined(Q_OS_WIN32)
QString transdir=QCoreApplication::applicationDirPath();
#endif
@@ -241,5 +230,37 @@ index 45ab1ba..18b9106 100644
if (appTranslator->load(QString("texmaker_")+locale,transdir))
{
--
2.26.0
2.42.0
From d2ada4e78037d4775d518edc9f8a9e111b56a243 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 11 Nov 2023 10:25:35 +0100
Subject: Fix paths for documentations
diff --git a/texmaker.cpp b/texmaker.cpp
index d10cd7a..efcff17 100644
--- a/texmaker.cpp
+++ b/texmaker.cpp
@@ -10568,6 +10568,8 @@ void Texmaker::LatexHelp()
#ifdef USB_VERSION
QString docfile=QCoreApplication::applicationDirPath() + "/latexhelp.html";
+#elif defined(Q_OS_HAIKU)
+QString docfile=PREFIX"/data/texmaker/latexhelp.html";
#else
QString docfile=PREFIX"/share/texmaker/latexhelp.html";
#endif
@@ -10606,6 +10608,8 @@ if ( locale.length() < 2 || (locale!="fr" /*&& locale!="hu" && locale!="ru"*/) )
#ifdef USB_VERSION
QString docfile=QCoreApplication::applicationDirPath() + "/usermanual_"+locale+".html";
+#elif defined(Q_OS_HAIKU)
+QString docfile=PREFIX"/data/texmaker/usermanual_"+locale+".html";
#else
QString docfile=PREFIX"/share/texmaker/usermanual_"+locale+".html";
#endif
--
2.42.0

10
app-office/texmaker/texmaker-5.0.4.recipe → app-office/texmaker/texmaker-5.1.4.recipe
View File

@@ -7,11 +7,11 @@ folding and a built-in pdf viewer with synctex support and continuous view \
mode.
Texmaker is easy to use and to configure."
HOMEPAGE="https://xm1math.net/texmaker/"
COPYRIGHT="2003-2019 Pascal Brachet"
COPYRIGHT="2003-2023 Pascal Brachet"
LICENSE="GNU GPL v2"
REVISION="4"
REVISION="1"
SOURCE_URI="https://xm1math.net/texmaker/texmaker-$portVersion.tar.bz2"
CHECKSUM_SHA256="1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2"
CHECKSUM_SHA256="320504d62b71b591c06b7d0b1202ac750a3112fe2ca328e30580055eb308fea6"
PATCHES="texmaker-$portVersion.patchset"
ADDITIONAL_FILES="texmaker.rdef.in"
@@ -20,7 +20,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
texmaker$secondaryArchSuffix = $portVersion
cmd:texmaker = $portVersion
app:Texmaker = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -72,7 +72,7 @@ INSTALL()
make install
mkdir -p $appsDir
ln -s $prefix/bin/texmaker $appsDir/Texmaker
mv $prefix/bin/texmaker $appsDir/Texmaker
rm -rf $dataDir/{applications,pixmaps,metainfo}
local APP_SIGNATURE="application/x-vnd.qt5-texmaker"