mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 20:20:06 +02:00
fixup! libX11, cleanup, remove unneeded requirements
This commit is contained in:
begasus
waddlesplash
@@ -85,9 +85,7 @@ PROVIDES="
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
# lib:libXau$secondaryArchSuffix
|
||||
lib:libXcb$secondaryArchSuffix
|
||||
# lib:libXdmcp$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
@@ -106,17 +104,9 @@ BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
docbook_xml_dtd
|
||||
docbook_xsl_stylesheets
|
||||
# devel:inputproto
|
||||
# devel:kbproto
|
||||
# devel:libpthread_stubs
|
||||
# devel:libXau$secondaryArchSuffix
|
||||
devel:libXcb$secondaryArchSuffix
|
||||
# devel:libXdmcp$secondaryArchSuffix
|
||||
devel:util_macros
|
||||
# devel:xcb_proto
|
||||
# devel:xextproto
|
||||
devel:xorg_sgml_doctools
|
||||
# devel:xproto
|
||||
devel:xtrans
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
@@ -135,19 +125,28 @@ defineDebugInfoPackage libx11$secondaryArchSuffix \
|
||||
|
||||
BUILD()
|
||||
{
|
||||
export CPPFLAGS="-D_BSD_SOURCE"
|
||||
export LDFLAGS="-lnetwork"
|
||||
autoreconf -vfi
|
||||
# --disable-selective-werror else makekeys does not even reach main()
|
||||
runConfigure ./configure --disable-selective-werror --enable-static=no
|
||||
runConfigure --omit-dirs docDir ./configure \
|
||||
--docdir=$developDocDir \
|
||||
--disable-selective-werror \
|
||||
--enable-static=no \
|
||||
--enable-unix-transport \
|
||||
--enable-loadable-i18n \
|
||||
--enable-xlocaledir
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install-strip
|
||||
install -d -m 755 "$docDir"
|
||||
install -m 644 -t "$docDir" README
|
||||
install -d -m 755 "$developDocDir"
|
||||
install -m 644 -t "$developDocDir" README
|
||||
|
||||
rm -f $libDir/lib*.la
|
||||
rm -f $libDir/X11/locale/common/*.la
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libX11 \
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
From c4ce80f6bdf346890d68514c529ca75c6a357965 Mon Sep 17 00:00:00 2001
|
||||
From 67bf19531800952ab5d1f915b4de923c09e50315 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sat, 16 Jan 2016 04:40:34 +0100
|
||||
Subject: [PATCH 1/2] configure.ac: add some checks for Haiku
|
||||
Subject: configure.ac: add some checks for Haiku
|
||||
|
||||
---
|
||||
configure.ac | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 92b791c..c63ea9b 100644
|
||||
index 9f1953e..09b6245 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -219,6 +219,8 @@ AC_CHECK_HEADERS([sys/select.h])
|
||||
@@ -144,6 +144,8 @@ AC_CHECK_HEADERS([sys/select.h])
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
|
||||
# Checks for library functions.
|
||||
@@ -20,7 +17,7 @@ index 92b791c..c63ea9b 100644
|
||||
AC_CHECK_FUNCS([strtol seteuid])
|
||||
# Used in lcFile.c (see also --enable-xlocaledir settings below)
|
||||
XLOCALEDIR_IS_SAFE="no"
|
||||
@@ -263,6 +265,9 @@ AC_ARG_ENABLE(xthreads,
|
||||
@@ -188,6 +190,9 @@ AC_ARG_ENABLE(xthreads,
|
||||
[xthreads=$enableval],[xthreads=yes])
|
||||
|
||||
AC_CHECK_LIB(c, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"])
|
||||
@@ -30,7 +27,7 @@ index 92b791c..c63ea9b 100644
|
||||
|
||||
case x$xthreads in
|
||||
xyes)
|
||||
@@ -276,7 +281,9 @@ xyes)
|
||||
@@ -201,7 +206,9 @@ xyes)
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -42,17 +39,14 @@ index 92b791c..c63ea9b 100644
|
||||
|
||||
# XXX incomplete, please fill this in
|
||||
--
|
||||
2.7.0
|
||||
2.16.4
|
||||
|
||||
|
||||
From 3cc52f5599e73d929efb73bad5f27578e26a8326 Mon Sep 17 00:00:00 2001
|
||||
From fb3af584f439af64e31a3b39344705410493b51f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Sat, 16 Jan 2016 04:37:11 +0100
|
||||
Subject: [PATCH 2/2] gcc2 initializer
|
||||
Subject: gcc2 initializer
|
||||
|
||||
---
|
||||
src/Iconify.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/Iconify.c b/src/Iconify.c
|
||||
index 9da4165..7b1d4e2 100644
|
||||
@@ -72,5 +66,34 @@ index 9da4165..7b1d4e2 100644
|
||||
return (XSendEvent (dpy, root, False,
|
||||
SubstructureRedirectMask|SubstructureNotifyMask,
|
||||
--
|
||||
2.7.0
|
||||
2.16.4
|
||||
|
||||
|
||||
From 7e42e3939e2974bc1565b8a06b62ae4ab46a272f Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Sun, 29 Jul 2018 15:56:09 +0200
|
||||
Subject: remove xml files preventing a full build
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 09b6245..aab8fa8 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -369,11 +369,10 @@ locales="\
|
||||
iso8859-15 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 \
|
||||
iso8859-7 iso8859-8 iso8859-9 iso8859-9e ja ja.JIS \
|
||||
ja_JP.UTF-8 ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r \
|
||||
- koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
|
||||
- microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 pt_PT.UTF-8 \
|
||||
+ koi8-u ko_KR.UTF-8 mulelao-1 nokhchi-1 pt_BR.UTF-8 pt_PT.UTF-8 \
|
||||
ru_RU.UTF-8 sr_CS.UTF-8 tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
|
||||
- vi_VN.tcvn vi_VN.viscii zh_CN zh_CN.gb18030 \
|
||||
- zh_CN.gbk zh_CN.UTF-8 zh_HK.big5 zh_HK.big5hkscs zh_HK.UTF-8 \
|
||||
+ vi_VN.tcvn vi_VN.viscii zh_CN \
|
||||
+ zh_CN.UTF-8 zh_HK.big5 zh_HK.big5hkscs zh_HK.UTF-8 \
|
||||
zh_TW zh_TW.big5 zh_TW.UTF-8"
|
||||
AC_SUBST(locales)
|
||||
|
||||
--
|
||||
2.16.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user