mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
Sigil: switch to my fork
This commit is contained in:
Binary file not shown.
@@ -1,41 +0,0 @@
|
||||
From e6a8540e534bda385f85ef96cf56ccc9521daa45 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 8 Oct 2019 18:53:00 +1000
|
||||
Subject: Fix for Haiku
|
||||
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/src/Misc/Utility.cpp b/src/Misc/Utility.cpp
|
||||
index 81100a7..924ed31 100644
|
||||
--- a/src/Misc/Utility.cpp
|
||||
+++ b/src/Misc/Utility.cpp
|
||||
@@ -119,7 +119,7 @@ QStringList Utility::LinuxHunspellDictionaryDirs()
|
||||
}
|
||||
// Bundled dicts were not installed use standard system dictionary location.
|
||||
else if (!dicts_are_bundled) {
|
||||
- paths.append("/usr/share/hunspell");
|
||||
+ paths.append("/system/data/hunspell");
|
||||
// Add additional hunspell dictionary directories. Provided at compile
|
||||
// time via the cmake option EXTRA_DICT_DIRS (colon separated list).
|
||||
if (!extra_dict_dirs.isEmpty()) {
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 92ddba3..6bc9d4b 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -327,9 +327,10 @@ int main(int argc, char *argv[])
|
||||
#endif
|
||||
// Needs to be created on the heap so that
|
||||
// the reply has time to return.
|
||||
+#ifndef __HAIKU__
|
||||
UpdateChecker *checker = new UpdateChecker(&app);
|
||||
checker->CheckForUpdate();
|
||||
-
|
||||
+#endif
|
||||
// Install an event filter for the application
|
||||
// so we can catch OS X's file open events
|
||||
AppEventFilter *filter = new AppEventFilter(&app);
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -1,19 +1,17 @@
|
||||
SUMMARY="Multi-platform WYSIWYG ebook editor for ePub format"
|
||||
DESCRIPTION="Sigil is a free, open source, multi-platform ebook editor that uses \
|
||||
Qt (and QtWebEngine). It is designed to edit books in ePub format (both ePub 2 and ePub 3)."
|
||||
Qt (and QtWebKit). It is designed to edit books in ePub format (both ePub 2 and ePub 3)."
|
||||
HOMEPAGE="http://sigil-ebook.com/"
|
||||
COPYRIGHT="2009-2019 Sigil team"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://github.com/Sigil-Ebook/Sigil/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="6da5482a6158896c7cde50d7787b7d2c681ab3afea032298ccf05f50ec803ac4"
|
||||
SOURCE_DIR="Sigil-$portVersion"
|
||||
PATCHES="sigil-$portVersion.patchset"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/threedeyes/Sigil_WebKit/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="3819e30d72c09b84798294a9ee39c635b1dd034661955f8665631f9bcce01ac5"
|
||||
SOURCE_DIR="Sigil_WebKit-$portVersion"
|
||||
|
||||
ADDITIONAL_FILES="sigil.rdef.in"
|
||||
|
||||
PYTHON_VERSION="3.7"
|
||||
ADDITIONAL_FILES="
|
||||
sigil.rdef.in
|
||||
haiku_icons.zip
|
||||
"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -63,11 +61,6 @@ BUILD_PREREQUIRES="
|
||||
cmd:python$PYTHON_VERSION
|
||||
"
|
||||
|
||||
PATCH()
|
||||
{
|
||||
unzip -o $sourceDir/../../additional-files/haiku_icons.zip -d $sourceDir/src/Resource_Files/main
|
||||
}
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir -p build
|
||||
@@ -82,7 +75,7 @@ BUILD()
|
||||
-DCMAKE_INSTALL_PREFIX=$appsDir/Sigil \
|
||||
-DCMAKE_INSTALL_BINDIR=$appsDir/Sigil \
|
||||
-DSHARE_INSTALL_PREFIX=$appsDir/Sigil \
|
||||
-DCMAKE_INSTALL_LIBDIR=$appsDir/Sigil/lib \
|
||||
-DCMAKE_INSTALL_LIBDIR=$appsDir/Sigil \
|
||||
-DPYTHON_LIBRARY=$pythonLib \
|
||||
-DPYTHON_INCLUDE_DIR=$pythonInclude \
|
||||
-DPYTHON_EXECUTABLE=$pythonBin \
|
||||
@@ -96,10 +89,10 @@ INSTALL()
|
||||
cd build
|
||||
make install
|
||||
|
||||
mv $appsDir/Sigil/lib/sigil/sigil $appsDir/Sigil/Sigil
|
||||
mv $appsDir/Sigil/lib/sigil/*.so $appsDir/Sigil/lib
|
||||
rm -rf $appsDir/Sigil/{lib/sigil,share/applications,share/pixmaps}
|
||||
rm -rf $appsDir/Sigil/sigil
|
||||
mv $appsDir/Sigil/sigil/sigil $appsDir/Sigil/Sigil
|
||||
ln -s $appsDir/Sigil/sigil/libsigilgumbo.so $appsDir/Sigil/libsigilgumbo.so
|
||||
ln -s /system/$relativeLibDir/libhunspell-1.7.so.0 $appsDir/Sigil/libhunspell.so
|
||||
rm -rf $appsDir/Sigil/{share/applications,share/pixmaps}
|
||||
|
||||
local APP_SIGNATURE="application/x-vnd.sigil"
|
||||
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
|
||||
Reference in New Issue
Block a user