TeXstudio: bump version, add icon

This commit is contained in:
Gerasim Troeglazov
2020-05-16 18:29:31 +10:00
parent 2f5b749074
commit 1b2801e932
4 changed files with 94 additions and 54 deletions

View File

@@ -0,0 +1,47 @@
resource app_flags B_MULTIPLE_LAUNCH;
resource app_version {
major = @MAJOR@,
middle = @MIDDLE@,
minor = @MINOR@,
variety = B_APPV_FINAL,
internal = 0,
short_info = "TeXstudio",
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 {
$"6E63696606050104015E020016023CC800389C28B89C283CC80049DBD7C6AAE1"
$"00FFFFD3020006023C528F3751EBB751EB3C528F4B7DEB48205100474747FFA5"
$"A0A002001602BC4E3DBC411E3C411EBC4E3D46B8F54AE35C0090FFD402000603"
$"3C1F0A33E667B3E6673C1F0A491170CAF5AE0077D705818CFF05FF7ADC05140A"
$"04323F373B43403F450A0C3351323F3F443F48374537493E4C3E4F374D37503E"
$"533E570A043F45434043443F480A043E503E4C4248424B0A043E573E53424F42"
$"530A04374937453A423A460A043750374C3B493B4D0A04374A3A4642493E4D0A"
$"0437503A4D424F3E530A04232D2A2A372E32320A082332232D323232372E362F"
$"472A4428340A0432373232372E37340A042F472E36323432440A0C42474A3F46"
$"314C334E3B54355B37524156504F4D4D45484A0A0446314A2D4F2E4C330A0454"
$"3558315E325B370A044E3C4C334F2E52390A04564F5141543D594A0612A298EA"
$"AE0A3D4F454D4C56595D60544F55484E464C454A43403EBFC6BF0CBFB9BEDB38"
$"423641BC11C047BB76C0042F3E28432E48364708022549505D100A0501131001"
$"178522040A010112000A0004090A0B0C301F1F01178402040A03020B0C201F1F"
$"0A020109201F1F0A04010A201F1F0A000700010203040708123F0C2700000000"
$"00003EFCC64567C8442F0F01178522040A03020506023F0C270000000000003E"
$"FCC64567C8442F0F0A03020708023F0C270000000000003EFCC64567C8442F0F"
$"0A040101023F0C270000000000003EFCC64567C8442F0F0A020100023F0C2700"
$"00000000003EFCC64567C8442F0F0A0303020304023F0C270000000000003EFC"
$"C64567C8442F0F0A00050D0E0F101130202801178412040A030210112020280A"
$"02020E0F2020280A04010D202028"
};

View File

@@ -1,45 +0,0 @@
From e0ca727f9e8e84b5dad2459da8554a0d6c5b57a6 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sun, 1 Sep 2019 09:20:44 +0200
Subject: Haiku doesn't support the -rdynamic flag
diff --git a/texstudio.pro b/texstudio.pro
index e360316..8a97f2b 100644
--- a/texstudio.pro
+++ b/texstudio.pro
@@ -416,7 +416,7 @@ exists(./.git) {
!win32-msvc*: {
QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas -Wundef -Wpointer-arith -Wwrite-strings -Wempty-body -Wsign-compare -Waddress -Winline
QMAKE_CXXFLAGS += -std=c++0x
- !win32: QMAKE_LFLAGS += -rdynamic # option not supported by mingw
+ !win32:!haiku: QMAKE_LFLAGS += -rdynamic # option not supported by mingw
else {
QMAKE_CXXFLAGS += -gstabs -g
QMAKE_LFLAGS -= -Wl,-s
--
2.23.0
From 351e6f7df07e0477c10e7ced7e9fedfe6c47e43d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Tue, 22 Oct 2019 17:17:25 +0200
Subject: Add Haiku to supported OS's for default viewers
diff --git a/src/buildmanager.cpp b/src/buildmanager.cpp
index b69dc4b..fc136ef 100644
--- a/src/buildmanager.cpp
+++ b/src/buildmanager.cpp
@@ -1196,7 +1196,7 @@ QString getCommandLineGhostscript()
return "";
}
-#elif defined(Q_WS_X11) || defined(Q_OS_LINUX)
+#elif defined(Q_WS_X11) || defined(Q_OS_LINUX) || defined(Q_OS_HAIKU)
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
--
2.23.0

View File

@@ -0,0 +1,22 @@
From 351e6f7df07e0477c10e7ced7e9fedfe6c47e43d Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Tue, 22 Oct 2019 17:17:25 +0200
Subject: Add Haiku to supported OS's for default viewers
diff --git a/src/buildmanager.cpp b/src/buildmanager.cpp
index b69dc4b..fc136ef 100644
--- a/src/buildmanager.cpp
+++ b/src/buildmanager.cpp
@@ -1196,7 +1196,7 @@ QString getCommandLineGhostscript()
return "";
}
-#elif defined(Q_WS_X11) || defined(Q_OS_LINUX)
+#elif defined(Q_WS_X11) || defined(Q_OS_LINUX) || defined(Q_OS_HAIKU)
// xdvi %.dvi -sourceposition @:%.tex
// kdvi "file:%.dvi#src:@ %.tex"
--
2.23.0

View File

@@ -4,20 +4,21 @@ LaTeX documents. Our goal is to make writing LaTeX as easy and comfortable as \
possible. Therefore TeXstudio has numerous features like syntax-highlighting, \
integrated viewer, reference checking and various assistants. "
HOMEPAGE="https://www.texstudio.org/"
COPYRIGHT="2019 Benito van der Zander"
COPYRIGHT="2020 Benito van der Zander"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/texstudio-org/texstudio/archive/$portVersion.tar.gz"
SOURCE_FILENAME="texstudio-$portVersion.tar.gz"
CHECKSUM_SHA256="a14b8912bfd15d982cfbe5f00deed37ca85fb6e38d3aa0c2dac23b4ecaab0984"
CHECKSUM_SHA256="101949620d055ab0224ecbb48b0ad38a7403f179832a28b86e4cb16f4c2adc46"
PATCHES="texstudio-$portVersion.patchset"
ADDITIONAL_FILES="texstudio.rdef.in"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
texstudio$secondaryArchSuffix = $portVersion
cmd:texstudio = $portVersion
app:TeXstudio = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -58,6 +59,7 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:qmake$secondaryArchSuffix >= 5
@@ -65,7 +67,8 @@ BUILD_PREREQUIRES="
BUILD()
{
qmake texstudio.pro PREFIX=$prefix \
qmake texstudio.pro \
PREFIX=$appsDir \
DATADIR=$dataDir \
USE_SYSTEM_HUNSPELL=1
make $jobArgs
@@ -74,10 +77,23 @@ BUILD()
INSTALL()
{
make install
# create a link to $appsDir and Deskbar
mkdir -p $appsDir
ln -s $prefix/bin/texstudio $appsDir/TeXstudio
mv $appsDir/bin/texstudio $appsDir/TeXstudio
rm -rf $dataDir/{appdata,applications,icons} $appsDir/bin
local APP_SIGNATURE="application/x-vnd.qt5-texstudio"
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/texstudio.rdef.in > $sourceDir/texstudio.rdef
addResourcesToBinaries $sourceDir/texstudio.rdef $appsDir/TeXstudio
addAppDeskbarSymlink $appsDir/TeXstudio
# we are not Linux
rm -rf $dataDir/{appdata,applications,icons}
}