Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haikuports/haikuports
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bbb93aed5966
Choose a base ref
...
head repository: haikuports/haikuports
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cfa4ca7b2cda
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 7, 2022

  1. xorgproto: Bump version.

    @waddlesplash
    waddlesplash committed Jan 7, 2022
    Copy the full SHA
    cfa4ca7 View commit details
22 changes: 11 additions & 11 deletions ...g-proto/patches/xorgproto-2018.4.patchset → ...g-proto/patches/xorgproto-2021.5.patchset
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
From 21f368b9b7bc8f540923b6f897e03c80cd526d3c Mon Sep 17 00:00:00 2001
From b66daa576885031c18437e407300128785a1cc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 14 Jul 2018 15:24:53 +0200
Date: Fri, 7 Jan 2022 15:15:24 -0500
Subject: configure: add proper check for fd_set.bits


diff --git a/configure.ac b/configure.ac
index 51d77bd..48f627f 100644
index a6008fa..02a7a3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,28 @@ case $host_os in
@@ -58,6 +58,28 @@ case $host_os in
*) fds_bits_found=false;;
esac

+if test "x$fds_bits_found" = xfalse ; then
+ AC_CHECK_MEMBER(fd_set.bits,
+ AC_CHECK_MEMBER(fd_set.bits,
+ [
+ fds_bits_found=plain_simple
+ USE_FDS_BITS="bits"
@@ -35,13 +35,13 @@ index 51d77bd..48f627f 100644
+fi
+
if test "x$fds_bits_found" = xfalse ; then
AC_CHECK_MEMBER(fd_set.fds_bits,
AC_CHECK_MEMBER(fd_set.fds_bits,
[
--
2.16.4
2.30.2


From b7590df866d76c0abf87f3c68197263d6bf03043 Mon Sep 17 00:00:00 2001
From ae10146adf2902f7fbb66381fb518a61f3b80bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 14 Jul 2018 15:26:34 +0200
Subject: Assume Haiku uses POSIX thread safe functions
@@ -63,10 +63,10 @@ index f963b64..f8b727b 100644

#ifdef __cplusplus
--
2.16.4
2.30.2


From 60f1b23ba452203e5bbe39a824865a861d52208a Mon Sep 17 00:00:00 2001
From e3cfb189dd01d1541611c533340c46d957febe1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 14 Jul 2018 15:29:54 +0200
Subject: Haiku only has POSIX-mandated passwd fields
@@ -86,5 +86,5 @@ index f8b727b..970f37d 100644
{
memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
--
2.16.4
2.30.2

19 changes: 13 additions & 6 deletions x11-base/xorg-proto/xorgproto-2018.4.recipe → x11-base/xorg-proto/xorgproto-2021.5.recipe
View file
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@ COPYRIGHT="1991 Oracle and/or its affiliates. All rights reserved.
1989 Hewlett-Packard Company.
1999 The XFree86 Project Inc."
LICENSE="MIT (no promotion)"
REVISION="3"
REVISION="1"
SOURCE_URI="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$portVersion.tar.bz2"
CHECKSUM_SHA256="fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0"
CHECKSUM_SHA256="aa2f663b8dbd632960b24f7477aa07d901210057f6ab1a1db5158732569ca015"
PATCHES="xorgproto-$portVersion.patchset"

ARCHITECTURES="any"
@@ -22,31 +22,38 @@ PROVIDES="
devel:compositeproto = 0.4.2
devel:damageproto = 1.2.1
devel:dmxproto = 2.3.1
devel:dpmsproto = 1.2
devel:dri2proto = 2.8
devel:dri3proto = 1.2
devel:fixesproto = 5.0
devel:evieproto = 1.1.1
devel:fixesproto = 6.0
devel:fontcacheproto = 0.1.3
devel:fontsproto = 2.1.3
devel:glproto = 1.4.17
devel:inputproto = 2.3.2
devel:inputproto = 2.3.99.2
devel:kbproto = 1.0.7
devel:lg3dproto = 5.0
devel:presentproto = 1.2
devel:printproto = 1.0.5
devel:randrproto = 1.6.0
devel:recordproto = 1.14.2
devel:renderproto = 0.11.1
devel:resourceproto = 1.2.0
devel:scrnsaverproto = 1.2.2
devel:scrnsaverproto = 1.2.3
devel:trapproto = 3.4.3
devel:videoproto = 2.3.3
devel:windowswmproto = 1.0.4
devel:xcalibrateproto = 0.1.0
devel:xcmiscproto = 1.2.2
devel:xextproto = 7.3.0
devel:xf86bigfontproto = 1.2.0
devel:xf86dgaproto = 2.1
devel:xf86driproto = 2.1.1
devel:xf86miscproto = 0.9.3
devel:xf86rushproto = 1.1.2
devel:xf86vidmodeproto = 2.3.1
devel:xineramaproto = 1.2.1
devel:xproto = 7.0.32
devel:xproto = 7.0.33
devel:xproxymngproto = 1.0.3
"
REQUIRES="