haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

lyx-2.1.3

Browse Source
This commit is contained in:
Jessica Hamilton
2015-06-05 19:17:14 +12:00
parent 1a8dd8b54b
commit 23b51e95c4
3 changed files with 190 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app-office/lyx/patches/icon.patch Normal file
View File

@@ -0,0 +1,27 @@
From 91a1aa98aea441581408e0f6429720aa114e1bed Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Fri, 5 Jun 2015 17:56:20 +1200
Subject: [PATCH] Haiku vector icon file (from SVG)
---
lib/images/lyx.hvif | Bin 0 -> 312 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 lib/images/lyx.hvif
diff --git a/lib/images/lyx.hvif b/lib/images/lyx.hvif
new file mode 100644
index 0000000000000000000000000000000000000000..9ec61291c8e30cd7bda2708fdf638a8184ea0e3a
GIT binary patch
literal 312
zcmc~x&P-!tW~l$q%n-SW`Lr<u^GtOH=Klv6m^ZaBuyL{P$UJ;`%j4Z^x9{2&x&8Dm
z$6ccP&+NInFKwUTK@I}4Jcp+2cz$%_&b(vkyK|23-g)D+%C4FdT6;g9{D0`{vCu>7
zj?Ulz^$6=B`-2(>a}K}T8_Y$z4$fV7chBCJxkqe&`99ABr}rcsiQRMKp!mV&171ge
z?fG%EcyHIiA}*p-v2iglGB9v4GBOG<iZ?K@a4|75F>o<6GDEp6j4TXXtc<J>E&y@Q
Bn=b$W
literal 0
HcmV?d00001
--
2.2.2

76
app-office/lyx/patches/lyx.patchset Normal file
View File

@@ -0,0 +1,76 @@
From e719aa8ed98a9fdef1d2ee3beeec2d748a96b7ab Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Fri, 5 Jun 2015 14:44:12 +1200
Subject: Qt4: Prevent crash on Haiku when clicking in a document
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 024c680..e3369b3 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -798,7 +798,7 @@ void GuiWorkArea::mousePressEvent(QMouseEvent * e)
return;
}
-#if (QT_VERSION < 0x050000)
+#if (QT_VERSION < 0x050000) && !defined(__HAIKU__)
inputContext()->reset();
#endif
--
2.2.2
From ee4014ed1fa9107aaf859152672e53a1d4f8aed6 Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Fri, 5 Jun 2015 14:49:00 +1200
Subject: configure: also search for sockets in libnetwork
diff --git a/configure.ac b/configure.ac
index 8a8326b..935baa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,8 +188,8 @@ save_LIBS="$LIBS"
LIBS=
AC_CHECK_FUNCS(fcntl,
[AC_SEARCH_LIBS([gethostbyname], [nsl])
- AC_SEARCH_LIBS([socket], [socket], [],
- [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+ AC_SEARCH_LIBS([socket], [socket network], [],
+ [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl -lnetwork $LIBS"],
[], [-lnsl])])],
[lyx_client_subdir=false])
AC_SUBST(SOCKET_LIBS,$LIBS)
--
2.2.2
From 77f718b5259891b8509247981ebcc3e505262dff Mon Sep 17 00:00:00 2001
From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
Date: Fri, 5 Jun 2015 15:13:06 +1200
Subject: autotools: search for libm when using system boost libraries
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 61ea48d..b8e41ed 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -313,11 +313,12 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[
AC_MSG_RESULT([$lyx_cv_with_included_boost])
if test x$lyx_cv_with_included_boost != xyes ; then
AC_LANG_PUSH(C++)
+ AC_SEARCH_LIBS(cos, [m])
save_LIBS=$LIBS
- LIBS="$save_LIBS -lboost_signals -lm"
+ LIBS="$save_LIBS -lboost_signals"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_plain=yes], [])
- LIBS="$save_LIBS -lboost_signals-mt -lm $LIBTHREAD"
+ LIBS="$save_LIBS -lboost_signals-mt $LIBTHREAD"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <boost/signal.hpp>], [boost::signal<void ()> s;])], [lyx_boost_mt=yes], [])
LIBS=$save_LIBS
--
2.2.2