diff --git a/x11-libs/libx11/libx11-1.3.3.recipe b/x11-libs/libx11/libx11-1.3.3.recipe deleted file mode 100644 index 24ef8447d..000000000 --- a/x11-libs/libx11/libx11-1.3.3.recipe +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION="libx11" -HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/" -SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.gz" -CHECKSUM_MD5="f5669fa5843e54cb4cc7ebf8f7cc741e" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="x11-misc/util-macros >= 1.7.0 - x11-proto/xproto >= 7.0.16 - x11-libs/xtrans >= 1.2.5 - x11-proto/inputproto >= 2.0 - x11-proto/kbproto >= 1.0.4 - x11-proto/xcb-proto >= 1.6 - dev-libs/libxslt >= 1.1.26 - dev-libs/libpthread-stubs >= 0.3 - x11-libs/libxcb >= 1.6 - x11-libs/libXau >= 1.0.5 - x11-proto/xextproto >= 7.1.1" -BUILD() -{ - cd libX11-1.3.3 - libtoolize --force --copy --install - autoreconf -i - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libX11-1.3.3 - make install -} diff --git a/x11-libs/libx11/libx11-1.6.3.recipe b/x11-libs/libx11/libx11-1.6.3.recipe new file mode 100644 index 000000000..f916f0203 --- /dev/null +++ b/x11-libs/libx11/libx11-1.6.3.recipe @@ -0,0 +1,142 @@ +SUMMARY="X.Org X11 library" +DESCRIPTION="The X.Org project provides an open source implementation of the \ +X Window System. \ +The development work is being done in conjunction with the freedesktop.org \ +community. \ +The X.Org Foundation is the educational non-profit corporation whose \ +Board serves this effort, and whose Members lead this work." +HOMEPAGE="http://xorg.freedesktop.org/" +# TODO: sort & merge +COPYRIGHT="2003-2006,2008 Jamey Sharp, Josh Triplett + 2009 Red Hat, Inc. + 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates. + 1984-1994, 1998 The Open Group + 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium + 2000 The XFree86 Project, Inc. + 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993 Digital Equipment Corporation + 1990, 1991 by Tektronix, Inc. + 1999-2000 Free Software Foundation, Inc. + 1990, 1991 Tektronix, Inc. + 1990, 1991, 1992, 1993, 1994, 1995 FUJITSU LIMITED + 1992 by Oki Technosystems Laboratory, Inc. + 1992 by Fuji Xerox Co., Ltd. + 1995 David E. Wexelblat + 1990, 1991 by OMRON Corporation + 1993 Digital Equipment Corporation, Maynard, Massachusetts, + 1994 Sony Corporation + 1991 the Open Software Foundation + 1993, 1994 Sony Corporation + 1993, 1995 Silicon Graphics Computer Systems, Inc. + 1992, 1993 by FUJITSU LIMITED + 1993 Fujitsu Open Systems Solutions, Inc. + 1994 Sony Corporation + 1987, 1988, 1990, 1993 by Digital Equipment Corporation, Maynard, Massachusetts, + 1993 SunSoft, Inc. + 1999-2000 by Bruno Haible + 1991 the Open Software Foundation + 1993 the TOSHIBA Corp + 1988 Wyse Technology, Inc., San Jose, Ca. + 1991 the Open Software Foundation + 1993, 1994 the Sony Corporation + 1992, 1993 FUJITSU LIMITED + 1993 Fujitsu Open Systems Solutions, Inc. + 1993, 1994 Sony Corporation + 1986, 1998 The Open Group + 2000 The XFree86 Project, Inc. + 1990, 1991 OMRON Corporation, NTT Software Corporation, and Nippon Telegraph and Telephone Corporation + 1991 the Open Software Foundation + 1993 the FUJITSU LIMITED + 1988 Wyse Technology, Inc., San Jose, Ca, + 1987 Digital Equipment Corporation, Maynard, Massachusetts + 1991, 1992 Fuji Xerox Co., Ltd. + 1992, 1993, 1994 FUJITSU LIMITED + 2006 Josh Triplett + 1996 Sebastien Marineau and Holger Veit + 1990, 1991 OMRON Corporation, NTT Software Corporation, and Nippon Telegraph and Telephone Corporation + 1991 the Open Software Foundation + 1993 the TOSHIBA Corp. + 1993, 1994 Sony Corporation + 1993, 1994 the FUJITSU LIMITED + 2000 Bruno Haible + 2003 Keith Packard + 2007-2009 Troy D. Hanson + 1992, 1993 TOSHIBA Corp. + 1993 IBM Corporation + 1990, 1991 OMRON Corporation, NTT Software Corporation, and Nippon Telegraph and Telephone Corporation + " +# TODO: check all the licenses in the COPYING file in the next century. +LICENSE="MIT" +REVISION="1" +SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/libX11-1.6.3.tar.gz" +CHECKSUM_SHA256="0b03b9d22f4c9e59b4ba498f294e297f013cae27050dfa0f3496640200db5376" +SOURCE_DIR="libX11-$portVersion" + +PATCHES="libx11-1.6.3.patchset" + +ARCHITECTURES="?x86 x86_gcc2 ?x86_64" + +# TODO: patch to detect libnetwork + +PROVIDES=" + libx11$secondaryArchSuffix = $portVersion + lib:libx11$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + " + +PROVIDES_devel=" + libx11${secondaryArchSuffix}_devel = $portVersion + devel:libx11$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + libx11$secondaryArchSuffix == $portVersion base + " + + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:util_macros$secondaryArchSuffix + devel:xproto$secondaryArchSuffix + devel:xtrans$secondaryArchSuffix + devel:inputproto$secondaryArchSuffix + devel:kbproto$secondaryArchSuffix + devel:xcb_proto$secondaryArchSuffix + devel:libxslt$secondaryArchSuffix + devel:libpthread_stubs$secondaryArchSuffix + devel:libxcb_composite$secondaryArchSuffix + devel:libxau$secondaryArchSuffix + devel:xextproto$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:autoconf + cmd:make + cmd:pkg_config$secondaryArchSuffix + " +#cmd:xmlto + +BUILD() +{ + libtoolize --force --copy --install + autoreconf -i + # --disable-selective-werror else makekeys does not even reach main() + runConfigure ./configure --disable-selective-werror + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs \ + libX11 + + fixPkgconfig + + packageEntries devel \ + $developDir +} + diff --git a/x11-libs/libx11/patches/libx11-1.6.3.patchset b/x11-libs/libx11/patches/libx11-1.6.3.patchset new file mode 100644 index 000000000..f11bdc8c2 --- /dev/null +++ b/x11-libs/libx11/patches/libx11-1.6.3.patchset @@ -0,0 +1,76 @@ +From c4ce80f6bdf346890d68514c529ca75c6a357965 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sat, 16 Jan 2016 04:40:34 +0100 +Subject: [PATCH 1/2] 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 +--- a/configure.ac ++++ b/configure.ac +@@ -219,6 +219,8 @@ AC_CHECK_HEADERS([sys/select.h]) + # Checks for typedefs, structures, and compiler characteristics. + + # Checks for library functions. ++AC_SEARCH_LIBS(issetugid, [bsd]) ++AC_SEARCH_LIBS(getresuid, [bsd]) + 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, + [xthreads=$enableval],[xthreads=yes]) + + AC_CHECK_LIB(c, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"]) ++if test "x$mtsafeapi" = xno; then ++ AC_CHECK_LIB(root, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"]) ++fi + + case x$xthreads in + xyes) +@@ -276,7 +281,9 @@ xyes) + ;; + esac + +-AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"]) ++AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [ ++ AC_CHECK_LIB(root, pthread_self, [thrstubs="no"], [thrstubs="yes"]) ++]) + AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes) + + # XXX incomplete, please fill this in +-- +2.7.0 + + +From 3cc52f5599e73d929efb73bad5f27578e26a8326 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= +Date: Sat, 16 Jan 2016 04:37:11 +0100 +Subject: [PATCH 2/2] 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 +--- a/src/Iconify.c ++++ b/src/Iconify.c +@@ -78,9 +78,10 @@ Status XIconifyWindow ( + .window = w, + .message_type = prop, + .format = 32, +- .data.l[0] = IconicState + }; +- Window root = RootWindow (dpy, screen); ++ Window root; ++ ev.data.l[0] = IconicState; ++ root = RootWindow (dpy, screen); + + return (XSendEvent (dpy, root, False, + SubstructureRedirectMask|SubstructureNotifyMask, +-- +2.7.0 +