From 7bc942f034757f4d4ad117e11f24cad9da4ba0b5 Mon Sep 17 00:00:00 2001 From: Anarchos Date: Fri, 27 May 2022 19:58:31 +0200 Subject: [PATCH] Betex modernized (#6785) * Adding templates * templates * compile on x86_64 * add gs as dependency * remove gs as dependency * haikuports version * download v1.0.0 version of source code * betex, fix 32bit Co-authored-by: begasus --- haiku-apps/betex/betex-20141221.recipe | 43 -------------- haiku-apps/betex/betex-20220223.recipe | 56 +++++++++++++++++++ .../betex/patches/betex-20220223.patchset | 34 +++++++++++ 3 files changed, 90 insertions(+), 43 deletions(-) delete mode 100644 haiku-apps/betex/betex-20141221.recipe create mode 100644 haiku-apps/betex/betex-20220223.recipe create mode 100644 haiku-apps/betex/patches/betex-20220223.patchset diff --git a/haiku-apps/betex/betex-20141221.recipe b/haiku-apps/betex/betex-20141221.recipe deleted file mode 100644 index fc7843e47..000000000 --- a/haiku-apps/betex/betex-20141221.recipe +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY="LaTeX editor for Haiku" -DESCRIPTION="BeTeX is the premier TeX/LaTeX editor for BeOS/Haiku. With it you \ -can create, compile and preview your latex documents all from within a single \ -user-friendly interface." -HOMEPAGE="https://github.com/HaikuArchives/BeTeX/" -COPYRIGHT="2005 Tim de Jong, Brent Miszalski" -LICENSE="MIT" -REVISION="1" -srcGitRev="ee49071e000d94b6fb957215c0480767854dec68" -SOURCE_URI="https://github.com/HaikuArchives/BeTeX/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="ec9c16d63f9b58ac843c4acf1cd3890803e272ff353dda96478fec24506fc142" -SOURCE_DIR="BeTeX-$srcGitRev" - -ARCHITECTURES="x86_gcc2" - -PROVIDES=" - betex = $portVersion - app:BeTeX = $portVersion - " -REQUIRES=" - haiku - " - -BUILD_REQUIRES=" - haiku_devel - " -BUILD_PREREQUIRES=" - makefile_engine - cmd:gcc - cmd:make - " - -BUILD() -{ - make $jobArgs OBJ_DIR=objects -} - -INSTALL() -{ - mkdir -p $appsDir - cp objects/BeTeX $appsDir/BeTeX - addAppDeskbarSymlink $appsDir/BeTeX -} diff --git a/haiku-apps/betex/betex-20220223.recipe b/haiku-apps/betex/betex-20220223.recipe new file mode 100644 index 000000000..7831620ec --- /dev/null +++ b/haiku-apps/betex/betex-20220223.recipe @@ -0,0 +1,56 @@ +SUMMARY="A TeX source text graphical editor" +DESCRIPTION="BeTeX is an easy way to run TeX and its various tools on a source document. +In addition, nice little tools bar enable you to be more productive and to find easily the \ +operators you look for." +HOMEPAGE="https://github.com/HaikuArchives/BeTeX" +COPYRIGHT="2005 Tim de Jong, Brent Miszalski, 2021 Sylvain Kerjean" +LICENSE="MIT" +REVISION="1" +fullVersion=20211031 +#SOURCE_URI="https://github.com/HaikuArchives/BeTeX/archive/$portVersion.tar.gz" +SOURCE_URI="https://github.com/Sylvain78/BeTeX/archive/refs/tags/BeTeX-1.0.0.tar.gz" +CHECKSUM_SHA256="b1a074e3251677113883633d7c3a09290424978ac23f7ba70801edec96a019e0" +SOURCE_FILENAME="BeTeX-1.0.0.tar.gz" +SOURCE_DIR="BeTeX-BeTeX-1.0.0" +PATCHES="betex-$portVersion.patchset" + +ARCHITECTURES="x86_gcc2 x86_64 ?ppc ?sparc" +SECONDARY_ARCHITECTURES="x86" + +GLOBAL_WRITABLE_FILES="var/betex/templates directory auto-merge \ + var/betex/templates/beos.tex auto-merge \ + var/betex/templates/betex_logo.png auto-merge \ + var/betex/templates/betex.tex auto-merge + " +USER_SETTINGS_FILES="settings/betex.settings" + +PROVIDES=" + betex = $portVersion + app:BeTeX = $portVersion + " +REQUIRES=" + haiku + " + +BUILD_REQUIRES=" + haiku_devel + " +BUILD_PREREQUIRES=" + makefile_engine + cmd:gcc + cmd:make + " + +BUILD() +{ + make $jobArgs OBJ_DIR=objects +} + +INSTALL() +{ + mkdir -p $appsDir + mkdir -p $prefix/var/betex/templates + cp BeTeX $appsDir/BeTeX + cp Docs/* $prefix/var/betex/templates + addAppDeskbarSymlink $appsDir/BeTeX +} diff --git a/haiku-apps/betex/patches/betex-20220223.patchset b/haiku-apps/betex/patches/betex-20220223.patchset new file mode 100644 index 000000000..1634a2daf --- /dev/null +++ b/haiku-apps/betex/patches/betex-20220223.patchset @@ -0,0 +1,34 @@ +From 0806ff8212b4afe24103d9f98daf24f64f0c3ec2 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Fri, 27 May 2022 19:44:08 +0200 +Subject: Fix build for 32bit + + +diff --git a/Makefile b/Makefile +index 27cc51b..1d67869 100644 +--- a/Makefile ++++ b/Makefile +@@ -91,9 +91,8 @@ RSRCS = + # - if your library does not follow the standard library naming scheme, + # you need to specify the path to the library and it's name. + # (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a") +-LIBS = /boot/system/lib/libbe.so \ +- /boot/system/lib/libroot.so \ +- /boot/system/lib/libtracker.so ++LIBS = be root tracker $(STDCPPLIBS) ++ + + # Specify additional paths to directories following the standard libXXX.so + # or libXXX.a naming scheme. You can specify full paths or paths relative +@@ -148,7 +147,7 @@ DEBUGGER := + COMPILER_FLAGS = -g -I /boot/system/develop/headers + + # Specify any additional linker flags to be used. +-LINKER_FLAGS = -lstdc++ ++LINKER_FLAGS = + + # (Only used when "TYPE" is "DRIVER"). Specify the desired driver install + # location in the /dev hierarchy. Example: +-- +2.36.1 +