srcpkgs/x*: convert patches to -Np1

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
This commit is contained in:
Đoàn Trần Công Danh 2021-06-19 10:03:21 +07:00 committed by Đoàn Trần Công Danh
parent 04b9978a29
commit 3353bf4722
122 changed files with 200 additions and 249 deletions

View file

@ -1,8 +1,8 @@
$OpenBSD: patch-src_sslhelper_c,v 1.1 2018/08/09 15:04:21 sthen Exp $ $OpenBSD: patch-src_sslhelper_c,v 1.1 2018/08/09 15:04:21 sthen Exp $
Index: src/sslhelper.c Index: src/sslhelper.c
--- src/sslhelper.c.orig --- a/src/sslhelper.c
+++ src/sslhelper.c +++ b/src/sslhelper.c
@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, in @@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, in
static int crl_callback(X509_STORE_CTX *callback_ctx) { static int crl_callback(X509_STORE_CTX *callback_ctx) {
const ASN1_INTEGER *revoked_serial; const ASN1_INTEGER *revoked_serial;

View file

@ -1,5 +1,5 @@
--- src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000 --- a/src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000
+++ src/uinput.c 2020-01-24 04:49:39.479206612 +0000 +++ b/src/uinput.c 2020-01-24 04:49:39.479206612 +0000
@@ -710,6 +710,7 @@ @@ -710,6 +710,7 @@
static void ptr_move(int dx, int dy) { static void ptr_move(int dx, int dy) {
#ifdef UINPUT_OK #ifdef UINPUT_OK

View file

@ -13,7 +13,6 @@ homepage="http://www.karlrunge.com/x11vnc/"
changelog="https://raw.githubusercontent.com/LibVNC/x11vnc/master/NEWS" changelog="https://raw.githubusercontent.com/LibVNC/x11vnc/master/NEWS"
distfiles="https://github.com/LibVNC/${pkgname}/archive/${version}.tar.gz" distfiles="https://github.com/LibVNC/${pkgname}/archive/${version}.tar.gz"
checksum=885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd checksum=885e5b5f5f25eec6f9e4a1e8be3d0ac71a686331ee1cfb442dba391111bd32bd
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"

View file

@ -1,5 +1,5 @@
--- source/CMakeLists.txt.orig --- a/source/CMakeLists.txt
+++ source/CMakeLists.txt +++ b/source/CMakeLists.txt
@@ -158,7 +162,7 @@ if(GCC) @@ -158,7 +162,7 @@ if(GCC)
add_definitions(-D__STDC_LIMIT_MACROS=1) add_definitions(-D__STDC_LIMIT_MACROS=1)
add_definitions(-std=gnu++98) add_definitions(-std=gnu++98)

View file

@ -13,7 +13,6 @@ license="GPL-2.0-or-later"
homepage="http://x265.org/" homepage="http://x265.org/"
distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz" distfiles="https://bitbucket.org/multicoreware/x265_git/get/${version}.tar.gz"
checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86 checksum=7f2771799bea0f53b5ab47603d5bea46ea2a221e047a7ff398115e9976fd5f86
patch_args=-Np0
build_options="altivec assembly" build_options="altivec assembly"

View file

@ -1,5 +1,5 @@
--- convoLV2/Makefile --- a/convoLV2/Makefile
+++ convoLV2/Makefile +++ b/convoLV2/Makefile
@@ -76,9 +76,6 @@ ifneq ($(BUILDGTK), no) @@ -76,9 +76,6 @@ ifneq ($(BUILDGTK), no)
endif endif

View file

@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
homepage="https://x42-plugins.com" homepage="https://x42-plugins.com"
distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="https://gareus.org/misc/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=4423ea27ccc3f6e93a687d344a8ad5177b830d2bac25be8c36ae12ed0e3092e4 checksum=4423ea27ccc3f6e93a687d344a8ad5177b830d2bac25be8c36ae12ed0e3092e4
patch_args=-Np0
pre_build() { pre_build() {
export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG" export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

View file

@ -1,5 +1,5 @@
--- cmake/xapian-config.cmake.in 2019-03-02 02:45:31.000000000 +0100 --- a/cmake/xapian-config.cmake.in 2019-03-02 02:45:31.000000000 +0100
+++ - 2019-05-15 15:59:12.059370469 +0200 +++ b/cmake/xapian-config.cmake.in 2019-03-02 02:45:31.000000000 +0100
@@ -1,4 +1,14 @@ @@ -1,4 +1,14 @@
-SET(prefix "@prefix@") -SET(prefix "@prefix@")
+get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) +get_filename_component(prefix "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)

View file

@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
homepage="https://www.xapian.org/" homepage="https://www.xapian.org/"
distfiles="https://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz" distfiles="https://oligarchy.co.uk/xapian/${version}/${pkgname}-${version}.tar.xz"
checksum=196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77 checksum=196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77
patch_args=-Np0
# xapian-config needs the .la # xapian-config needs the .la
keep_libtool_archives=yes keep_libtool_archives=yes

View file

@ -1,5 +1,5 @@
--- configure.orig 2012-08-23 16:25:41.891044934 +0200 --- a/configure 2012-08-23 16:25:41.891044934 +0200
+++ configure 2012-08-23 16:25:47.690906017 +0200 +++ b/configure 2012-08-23 16:25:47.690906017 +0200
@@ -3277,7 +3277,7 @@ case "${host}" in @@ -3277,7 +3277,7 @@ case "${host}" in
CFLAGS="$CFLAGS" CFLAGS="$CFLAGS"
abi="elf" abi="elf"

View file

@ -1,5 +1,5 @@
--- lib/ext2.c.orig --- a/lib/ext2.c
+++ lib/ext2.c +++ b/lib/ext2.c
@@ -139,8 +139,10 @@ @@ -139,8 +139,10 @@
if(! (flags & ~EXT2_NOCOMPR_FL) ) if(! (flags & ~EXT2_NOCOMPR_FL) )
x_addprop(f, "NoCompBlock"); x_addprop(f, "NoCompBlock");

View file

@ -2,8 +2,8 @@ Reason: The OpenSSL_add_all_ciphers api doesn't was removed in OpenSSL 1.1
so we just replace the check with something that exists in OpenSSL and LibreSSL so we just replace the check with something that exists in OpenSSL and LibreSSL
--- ---
--- configure 2012-09-17 13:30:07.000000000 +0200 --- a/configure 2012-09-17 13:30:07.000000000 +0200
+++ - 2021-02-03 16:20:59.395787656 +0100 +++ b/configure 2012-09-17 13:30:07.000000000 +0200
@@ -4878,9 +4878,9 @@ @@ -4878,9 +4878,9 @@
done done

View file

@ -11,7 +11,6 @@ license="BSD-3-Clause"
homepage="https://github.com/mackyle/xar" homepage="https://github.com/mackyle/xar"
distfiles="https://github.com/downloads/mackyle/xar/${pkgname}-${version}.tar.gz" distfiles="https://github.com/downloads/mackyle/xar/${pkgname}-${version}.tar.gz"
checksum=ee46089968457cf710b8cf1bdeb98b7ef232eb8a4cdeb34502e1f16ef4d2153e checksum=ee46089968457cf710b8cf1bdeb98b7ef232eb8a4cdeb34502e1f16ef4d2153e
patch_args=-Np0
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) *-musl)

View file

@ -1,5 +1,5 @@
--- src/message.c 2018-07-31 01:20:05.740344556 -0400 --- a/src/message.c 2018-07-31 01:20:05.740344556 -0400
+++ src/message.c 2018-07-31 01:16:33.521671009 -0400 +++ b/src/message.c 2018-07-31 01:16:33.521671009 -0400
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
{ {
XDeleteProperty (d, root, semaphore); XDeleteProperty (d, root, semaphore);

View file

@ -1,5 +1,5 @@
--- src/engine.c 2007-12-28 18:15:26.000000000 +0100 --- a/src/engine.c 2007-12-28 18:15:26.000000000 +0100
+++ src/engine.c 2017-01-25 14:48:00.087399865 +0100 +++ b/src/engine.c 2017-01-25 14:48:00.087399865 +0100
@@ -210,11 +210,7 @@ @@ -210,11 +210,7 @@
#else /* VMS */ #else /* VMS */
if (lockerPid) if (lockerPid)

View file

@ -10,7 +10,6 @@ license="GPL-2"
homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/" homepage="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
distfiles="${homepage}/${pkgname}-${version}.tgz" distfiles="${homepage}/${pkgname}-${version}.tgz"
checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2 checksum=11f0275175634e6db756e96f5713ec91b8b1c41f8663df54e8a5d27dc71c4da2
patch_args=-Np0
do_build() { do_build() {
CC=cc xmkmf CC=cc xmkmf

View file

@ -1,5 +1,5 @@
--- CMakeLists.txt.orig 2020-08-27 15:31:42.000000000 +0700 --- a/CMakeLists.txt 2020-08-27 15:31:42.000000000 +0700
+++ CMakeLists.txt 2021-01-14 21:44:51.704505119 +0700 +++ b/CMakeLists.txt 2021-01-14 21:44:51.704505119 +0700
@@ -10,19 +10,6 @@ @@ -10,19 +10,6 @@
option(SNDIO "SNDIO" ON) option(SNDIO "SNDIO" ON)
option(PORTAUDIO "PORTAUDIO" ON) option(PORTAUDIO "PORTAUDIO" ON)

View file

@ -11,7 +11,6 @@ license="MIT"
homepage="https://github.com/nikp123/xava" homepage="https://github.com/nikp123/xava"
distfiles="https://github.com/nikp123/xava/archive/${version}.tar.gz" distfiles="https://github.com/nikp123/xava/archive/${version}.tar.gz"
checksum=b38b810e4bfd71aff44f223b444ae4f158eb8d6428c5e9d42697343ccb5a19f9 checksum=b38b810e4bfd71aff44f223b444ae4f158eb8d6428c5e9d42697343ccb5a19f9
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE

View file

@ -1,7 +1,7 @@
diff --git Makefile.in Makefile.in diff --git Makefile.in Makefile.in
index 7bb5cba..e557452 100644 index 7bb5cba..e557452 100644
--- Makefile.in --- a/Makefile.in
+++ Makefile.in +++ b/Makefile.in
@@ -205,8 +205,8 @@ top_builddir = @top_builddir@ @@ -205,8 +205,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
@GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall @GUILE_FALSE@AM_CFLAGS = @CFLAGS@ @X_CFLAGS@ @FORK_FLAG@ @GUILE_FLAG@ -I. -Wall

View file

@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html" homepage="http://www.nongnu.org/xbindkeys/xbindkeys.html"
distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="http://www.nongnu.org/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2 checksum=a29b86a8ec91d4abc83b420e547da27470847d0efe808aa6e75147aa0adb82f2
patch_args=-Np0

View file

@ -9,8 +9,8 @@ Subject: [PATCH 1/3] Update SConstruct to python3
diff --git SConstruct SConstruct diff --git SConstruct SConstruct
index 4cd7970..54fa11f 100644 index 4cd7970..54fa11f 100644
--- SConstruct --- a/SConstruct
+++ SConstruct +++ b/SConstruct
@@ -15,7 +15,7 @@ def build_dbus_glue(target, source, env): @@ -15,7 +15,7 @@ def build_dbus_glue(target, source, env):
"--mode=glib-server", "--mode=glib-server",
"--prefix=" + env['DBUS_PREFIX'], source[0].get_path()], "--prefix=" + env['DBUS_PREFIX'], source[0].get_path()],

View file

@ -11,8 +11,8 @@ Subject: [PATCH 3/3] Updating python code to python3
diff --git examples/responsecurve-generator.py examples/responsecurve-generator.py diff --git examples/responsecurve-generator.py examples/responsecurve-generator.py
index c74e34d..942463b 100755 index c74e34d..942463b 100755
--- examples/responsecurve-generator.py --- a/examples/responsecurve-generator.py
+++ examples/responsecurve-generator.py +++ b/examples/responsecurve-generator.py
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/env python3 +#!/usr/bin/env python3
@ -44,8 +44,8 @@ index c74e34d..942463b 100755
# EOF # # EOF #
diff --git runxboxdrv/runxboxdrv runxboxdrv/runxboxdrv diff --git runxboxdrv/runxboxdrv runxboxdrv/runxboxdrv
index 360c836..6983496 100755 index 360c836..6983496 100755
--- runxboxdrv/runxboxdrv --- a/runxboxdrv/runxboxdrv
+++ runxboxdrv/runxboxdrv +++ b/runxboxdrv/runxboxdrv
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python -#!/usr/bin/env python
+#!/usr/bin/env python3 +#!/usr/bin/env python3
@ -198,8 +198,8 @@ index 360c836..6983496 100755
def main(): def main():
diff --git xboxdrvctl xboxdrvctl diff --git xboxdrvctl xboxdrvctl
index 4807a11..57177dc 100755 index 4807a11..57177dc 100755
--- xboxdrvctl --- a/xboxdrvctl
+++ xboxdrvctl +++ b/xboxdrvctl
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/env python2 -#!/usr/bin/env python2
+#!/usr/bin/env python3 +#!/usr/bin/env python3

View file

@ -1,5 +1,5 @@
--- src/linux_uinput.cpp 2015-11-09 11:19:35.000000000 +0100 --- a/src/linux_uinput.cpp 2015-11-09 11:19:35.000000000 +0100
+++ src/linux_uinput.cpp 2020-12-06 17:53:41.472516394 +0100 +++ b/src/linux_uinput.cpp 2020-12-06 17:53:41.472516394 +0100
@@ -289,9 +289,12 @@ @@ -289,9 +289,12 @@
needs_sync = true; needs_sync = true;

View file

@ -13,7 +13,6 @@ homepage="https://xboxdrv.gitlab.io/"
distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2" distfiles="https://xboxdrv.gitlab.io/xboxdrv-linux-${version}.tar.bz2"
checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a checksum=f4fb8c09c0ce3841798f129ae4c2caf3f6db9786d78ad941994e425e3ffc168a
python_version=3 python_version=3
patch_args=-Np0
do_install() { do_install() {
make PREFIX=/usr DESTDIR=${DESTDIR} install make PREFIX=/usr DESTDIR=${DESTDIR} install

View file

@ -1,5 +1,5 @@
--- RgbSink.c --- a/RgbSink.c
+++ RgbSink.c +++ b/RgbSink.c
@@ -98,6 +99,12 @@ @@ -98,6 +99,12 @@
#endif /* LIB_X11R5 */ #endif /* LIB_X11R5 */
#endif /* LIB_X11R6 */ #endif /* LIB_X11R6 */
@ -13,8 +13,8 @@
/* No resources */ /* No resources */
/* No actions */ /* No actions */
--- RgbText.c --- a/RgbText.c
+++ RgbText.c +++ b/RgbText.c
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
{ XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns), { XtNcolumns, XtCColumns, XtRDimension, sizeof(Dimension), offset(columns),
XtRString, (XtPointer) "30" }, XtRString, (XtPointer) "30" },
@ -24,8 +24,8 @@
{ XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width), { XtNtileWidth, XtCTileWidth, XtRDimension, sizeof(Dimension), offset(tile_width),
XtRString, (XtPointer) "3" }, XtRString, (XtPointer) "3" },
{ XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red), { XtNmaxRed, XtCMaxRed, XtRShort, sizeof(unsigned short), offset(max_red),
--- RgbSrc.c --- a/RgbSrc.c
+++ RgbSrc.c +++ b/RgbSrc.c
@@ -81,8 +81,14 @@ @@ -81,8 +81,14 @@
#include <X11/IntrinsicP.h> #include <X11/IntrinsicP.h>
@ -41,8 +41,8 @@
/* No resources */ /* No resources */
/* No actions */ /* No actions */
--- Xcolorsel.ad --- a/Xcolorsel.ad
+++ Xcolorsel.ad +++ b/Xcolorsel.ad
@@ -1,4 +1,6 @@ @@ -1,4 +1,6 @@
! Standard layout: ! Standard layout:
+Xcolorsel.width: 420 +Xcolorsel.width: 420
@ -50,8 +50,8 @@
*.text.scrollHorizontal: WhenNeeded *.text.scrollHorizontal: WhenNeeded
*.text.scrollVertical: WhenNeeded *.text.scrollVertical: WhenNeeded
*.text.displayCaret: False *.text.displayCaret: False
--- Imakefile --- a/Imakefile
+++ Imakefile +++ b/Imakefile
@@ -82,9 +82,9 @@ @@ -82,9 +82,9 @@
DependTarget() DependTarget()
@ -64,8 +64,8 @@
purge: purge:
$(RM) xcolorsel *.o appdef.h appdef-c.h Xcolorsel.help *.tar.Z Makefile Makefile.bak makefile *.tar *.tar.gz $(RM) xcolorsel *.o appdef.h appdef-c.h Xcolorsel.help *.tar.Z Makefile Makefile.bak makefile *.tar *.tar.gz
Xcolorsel.help: xcolorsel.man Xcolorsel.help: xcolorsel.man
--- Xcolorsel-color.ad --- a/Xcolorsel-color.ad
+++ Xcolorsel-color.ad +++ b/Xcolorsel-color.ad
@@ -13,57 +13,57 @@ @@ -13,57 +13,57 @@
! If this is the case you may also want to include the following ! If this is the case you may also want to include the following
! (by removing the leading !) ! (by removing the leading !)

View file

@ -16,7 +16,6 @@ homepage="http://packages.debian.org/stable/x11/xcolorsel"
distfiles="${DEBIAN_SITE}/main/x/${pkgname}/${pkgname}_${version}.orig.tar.gz" distfiles="${DEBIAN_SITE}/main/x/${pkgname}/${pkgname}_${version}.orig.tar.gz"
checksum=ba0813af427dfab7dfbd9eaadbedd217d432f8141179ac43bb39393b1424f7a2 checksum=ba0813af427dfab7dfbd9eaadbedd217d432f8141179ac43bb39393b1424f7a2
nocross=yes nocross=yes
patch_args=-Np0
do_configure() { do_configure() {
xmkmf -a -DHasSELinux=0 -DUseConfDirForAppDefaults=0 xmkmf -a -DHasSELinux=0 -DUseConfDirForAppDefaults=0

View file

@ -1,5 +1,5 @@
--- dbus-proxy.c 2019-01-15 18:02:01.000000000 +0000 --- a/dbus-proxy.c 2019-01-15 18:02:01.000000000 +0000
+++ - 2019-08-25 19:41:33.423715619 +0000 +++ b/dbus-proxy.c 2019-01-15 18:02:01.000000000 +0000
@@ -31,6 +31,16 @@ @@ -31,6 +31,16 @@
#include "flatpak-proxy.h" #include "flatpak-proxy.h"

View file

@ -12,4 +12,3 @@ license="GPL-3.0-or-later"
homepage="https://github.com/flatpak/xdg-dbus-proxy" homepage="https://github.com/flatpak/xdg-dbus-proxy"
distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz" distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz"
checksum=1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f checksum=1749d6f9f46dcc9edc87725641cf56cf91dcad1b01707891ea0850c1000c520f
patch_args=-Np0

View file

@ -1,8 +1,8 @@
xdg-settings uses the ${parameter:offset} substring expansion, xdg-settings uses the ${parameter:offset} substring expansion,
which is not available in posix shell which is not available in posix shell
--- scripts/xdg-settings.in 2018-05-10 17:02:31.000000000 +0200 --- a/scripts/xdg-settings.in 2018-05-10 17:02:31.000000000 +0200
+++ - 2021-06-12 21:17:34.555007469 +0200 +++ b/scripts/xdg-settings.in 2018-05-10 17:02:31.000000000 +0200
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-#!/bin/sh -#!/bin/sh
+#!/bin/bash +#!/bin/bash

View file

@ -13,7 +13,6 @@ homepage="https://www.freedesktop.org/wiki/Software/xdg-utils/"
#changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog" #changelog="https://cgit.freedesktop.org/xdg/xdg-utils/plain/ChangeLog"
distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz" distfiles="https://portland.freedesktop.org/download/${pkgname}-${version}.tar.gz"
checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9 checksum=d798b08af8a8e2063ddde6c9fa3398ca81484f27dec642c5627ffcaa0d4051d9
patch_args=-Np0
post_install() { post_install() {
vlicense LICENSE vlicense LICENSE

View file

@ -3,8 +3,8 @@ make cross compiling possible again. The results are all
true for glibc and musl libc, thus unconditionally add true for glibc and musl libc, thus unconditionally add
the corresponding defines via AC_DEFINE_UNQUOTED. the corresponding defines via AC_DEFINE_UNQUOTED.
--- configure.ac 2017-08-06 20:09:44.000000000 +0200 --- a/configure.ac 2017-08-06 20:09:44.000000000 +0200
+++ configure.ac 2017-09-01 14:22:45.842676418 +0200 +++ b/configure.ac 2017-09-01 14:22:45.842676418 +0200
@@ -174,69 +174,9 @@ @@ -174,69 +174,9 @@
] ]
) )

View file

@ -12,7 +12,6 @@ license="Apache-2.0"
homepage="http://xerces.apache.org/xerces-c/" homepage="http://xerces.apache.org/xerces-c/"
distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2" distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
checksum=45c2329e684405f2b8854ecbddfb8d5b055cdf0fe4d35736cc352c504989bbb6 checksum=45c2329e684405f2b8854ecbddfb8d5b055cdf0fe4d35736cc352c504989bbb6
patch_args=-Np0
pre_configure() { pre_configure() {
autoreconf -fi autoreconf -fi

View file

@ -1,5 +1,5 @@
--- src/hwstate.c 2018-01-28 20:46:17.000000000 +0100 --- a/src/hwstate.c 2018-01-28 20:46:17.000000000 +0100
+++ src/hwstate.c 2020-12-02 22:58:45.149335108 +0100 +++ b/src/hwstate.c 2020-12-02 22:58:45.149335108 +0100
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
if (!caps->has_abs[MTDEV_WIDTH_MINOR]) if (!caps->has_abs[MTDEV_WIDTH_MINOR])
s->data[i].width_minor = s->data[i].width_major; s->data[i].width_minor = s->data[i].width_major;

View file

@ -13,7 +13,6 @@ homepage="http://xorg.freedesktop.org/"
distfiles="https://github.com/p2rkw/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/p2rkw/${pkgname}/archive/v${version}.tar.gz"
checksum=a976723720028832afd45bfcaab479f60833ff6f1c780be727d1791675dc14c4 checksum=a976723720028832afd45bfcaab479f60833ff6f1c780be727d1791675dc14c4
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

View file

@ -1,5 +1,5 @@
--- src/eventcomm.c 2018-05-29 05:18:45.000000000 +0200 --- a/src/eventcomm.c 2018-05-29 05:18:45.000000000 +0200
+++ src/eventcomm.c 2020-12-01 21:27:55.746811502 +0100 +++ b/src/eventcomm.c 2020-12-01 21:27:55.746811502 +0100
@@ -575,9 +575,12 @@ @@ -575,9 +575,12 @@
ev->type = EV_SYN; ev->type = EV_SYN;
ev->code = SYN_REPORT; ev->code = SYN_REPORT;

View file

@ -14,7 +14,6 @@ homepage="http://www.x.org/"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576 checksum=7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

View file

@ -42,8 +42,8 @@ Closes: https://bugzilla.altlinux.org/show_bug.cgi?id=37539
diff --git a/src/radeon.h b/src/radeon.h diff --git a/src/radeon.h b/src/radeon.h
index 2c913466..e4a2ba66 100644 index 2c913466..e4a2ba66 100644
--- src/radeon.h --- a/src/radeon.h
+++ src/radeon.h +++ b/src/radeon.h
@@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo @@ -790,8 +790,8 @@ static inline Bool radeon_set_pixmap_bo(PixmapPtr pPix, struct radeon_buffer *bo
static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix) static inline struct radeon_buffer *radeon_get_pixmap_bo(PixmapPtr pPix)

View file

@ -13,7 +13,6 @@ license="MIT"
homepage="https://wiki.freedesktop.org/xorg" homepage="https://wiki.freedesktop.org/xorg"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49 checksum=659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49
patch_args=-Np0
lib32disabled=yes lib32disabled=yes
CFLAGS="-fcommon" CFLAGS="-fcommon"

View file

@ -11,8 +11,8 @@ Subject: [PATCH] only attempt to use VBE on x86
diff --git src/alp_driver.c src/alp_driver.c diff --git src/alp_driver.c src/alp_driver.c
index bd5e52f..f478eb5 100644 index bd5e52f..f478eb5 100644
--- src/alp_driver.c --- a/src/alp_driver.c
+++ src/alp_driver.c +++ b/src/alp_driver.c
@@ -61,7 +61,9 @@ @@ -61,7 +61,9 @@
@ -53,8 +53,8 @@ index bd5e52f..f478eb5 100644
pScrn->monitor = pScrn->confScreen->monitor; pScrn->monitor = pScrn->confScreen->monitor;
diff --git src/cir_driver.c src/cir_driver.c diff --git src/cir_driver.c src/cir_driver.c
index 2df4a2e..d9c2f0c 100644 index 2df4a2e..d9c2f0c 100644
--- src/cir_driver.c --- a/src/cir_driver.c
+++ src/cir_driver.c +++ b/src/cir_driver.c
@@ -31,7 +31,9 @@ @@ -31,7 +31,9 @@
#include "alp.h" #include "alp.h"
#include "lg.h" #include "lg.h"
@ -81,8 +81,8 @@ index 2df4a2e..d9c2f0c 100644
} }
diff --git src/lg_driver.c src/lg_driver.c diff --git src/lg_driver.c src/lg_driver.c
index 589d14e..6bc3154 100644 index 589d14e..6bc3154 100644
--- src/lg_driver.c --- a/src/lg_driver.c
+++ src/lg_driver.c +++ b/src/lg_driver.c
@@ -51,7 +51,9 @@ @@ -51,7 +51,9 @@
/* Needed by the Shadow Framebuffer */ /* Needed by the Shadow Framebuffer */
#include "shadowfb.h" #include "shadowfb.h"

View file

@ -13,7 +13,6 @@ license="MIT"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab
patch_args=-Np0
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"
CFLAGS="-fcommon -Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label" CFLAGS="-fcommon -Wno-pointer-arith -Wno-discarded-qualifiers -Wno-unused-label"

View file

@ -1,7 +1,7 @@
This macro cannot be normally defined in cross. This macro cannot be normally defined in cross.
--- src/fbdev.c 2019-04-30 17:41:01.660203681 +0200 --- a/src/fbdev.c 2019-04-30 17:41:01.660203681 +0200
+++ src/fbdev.c 2019-04-30 17:41:07.756263574 +0200 +++ b/src/fbdev.c 2019-04-30 17:41:07.756263574 +0200
@@ -1010,7 +1010,6 @@ @@ -1010,7 +1010,6 @@
fPtr->CloseScreen = pScreen->CloseScreen; fPtr->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = FBDevCloseScreen; pScreen->CloseScreen = FBDevCloseScreen;

View file

@ -13,7 +13,6 @@ homepage="http://xorg.freedesktop.org"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 checksum=dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg"
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"

View file

@ -1,5 +1,5 @@
--- src/fbdev.c --- a/src/fbdev.c
+++ src/fbdev.c +++ b/src/fbdev.c
@@ -1037,7 +1037,7 @@ @@ -1037,7 +1037,7 @@
fPtr->CloseScreen = pScreen->CloseScreen; fPtr->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = FBDevCloseScreen; pScreen->CloseScreen = FBDevCloseScreen;

View file

@ -13,7 +13,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://github.com/ssvb/xf86-video-fbturbo" homepage="http://github.com/ssvb/xf86-video-fbturbo"
distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz"
checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f
patch_args=-Np0
archs="armv7l" archs="armv7l"
conflicts="xf86-video-fbturbo>=0" conflicts="xf86-video-fbturbo>=0"

View file

@ -1,5 +1,5 @@
--- src/fbdev.c.orig --- a/src/fbdev.c
+++ src/fbdev.c +++ b/src/fbdev.c
@@ -1037,7 +1037,7 @@ @@ -1037,7 +1037,7 @@
fPtr->CloseScreen = pScreen->CloseScreen; fPtr->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = FBDevCloseScreen; pScreen->CloseScreen = FBDevCloseScreen;

View file

@ -9,7 +9,6 @@ license="MIT, GPL-2.0-or-later"
homepage="http://github.com/ssvb/xf86-video-fbturbo" homepage="http://github.com/ssvb/xf86-video-fbturbo"
distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz" distfiles="https://github.com/ssvb/xf86-video-fbturbo/archive/${version}.tar.gz"
checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f checksum=10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f
patch_args=-Np0
archs="armv6l* armv7l* aarch64*" archs="armv6l* armv7l* aarch64*"
hostmakedepends="pkg-config xorg-server-devel" hostmakedepends="pkg-config xorg-server-devel"

View file

@ -1,5 +1,5 @@
--- src/sna/kgem.c.orig --- a/src/sna/kgem.c
+++ src/sna/kgem.c +++ b/src/sna/kgem.c
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <time.h> #include <time.h>

View file

@ -1,5 +1,5 @@
--- src/sna/sna_render_inline.h 2018-08-10 09:04:33.466268800 +0200 --- a/src/sna/sna_render_inline.h 2018-08-10 09:04:33.466268800 +0200
+++ src/sna/sna_render_inline.h 2018-08-10 09:06:56.537276181 +0200 +++ b/src/sna/sna_render_inline.h 2018-08-10 09:06:56.537276181 +0200
@@ -1,6 +1,12 @@ @@ -1,6 +1,12 @@
#ifndef SNA_RENDER_INLINE_H #ifndef SNA_RENDER_INLINE_H
#define SNA_RENDER_INLINE_H #define SNA_RENDER_INLINE_H
@ -82,8 +82,8 @@
{ {
union { union {
uint32_t dw; uint32_t dw;
--- src/sna/gen4_vertex.c 2018-08-10 09:08:26.380280816 +0200 --- a/src/sna/gen4_vertex.c 2018-08-10 09:08:26.380280816 +0200
+++ src/sna/gen4_vertex.c 2018-08-10 09:09:55.522285415 +0200 +++ b/src/sna/gen4_vertex.c 2018-08-10 09:09:55.522285415 +0200
@@ -308,7 +308,7 @@ @@ -308,7 +308,7 @@
#define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */
#define OUT_VERTEX_F(v) vertex_emit(sna, v) #define OUT_VERTEX_F(v) vertex_emit(sna, v)

View file

@ -18,7 +18,6 @@ homepage="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel/"
distfiles="${homepage}/-/archive/master/xf86-video-intel-${_commit}.tar.gz" distfiles="${homepage}/-/archive/master/xf86-video-intel-${_commit}.tar.gz"
checksum=3cdcf2f84bddf9e9174a8413d8fc855dae893dbc53889329978dec62ee8f6e62 checksum=3cdcf2f84bddf9e9174a8413d8fc855dae893dbc53889329978dec62ee8f6e62
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
CFLAGS="-fcommon" CFLAGS="-fcommon"
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"

View file

@ -9,8 +9,8 @@ Subject: [PATCH xf86-video-mach64 1/4] avoid including VBE paths when not used
diff --git src/atipreinit.c src/atipreinit.c diff --git src/atipreinit.c src/atipreinit.c
index 96ec68f..be30141 100644 index 96ec68f..be30141 100644
--- src/atipreinit.c --- a/src/atipreinit.c
+++ src/atipreinit.c +++ b/src/atipreinit.c
@@ -51,7 +51,9 @@ @@ -51,7 +51,9 @@
#include "atixv.h" #include "atixv.h"
#include "atiadjust.h" #include "atiadjust.h"

View file

@ -11,8 +11,8 @@ Fixes EXA detection spuriously failing with current xserver.
diff --git configure.ac configure.ac diff --git configure.ac configure.ac
index d3933b2..b8b722b 100644 index d3933b2..b8b722b 100644
--- configure.ac --- a/configure.ac
+++ configure.ac +++ b/configure.ac
@@ -169,7 +169,8 @@ if test "x$EXA" = xyes; then @@ -169,7 +169,8 @@ if test "x$EXA" = xyes; then
SAVE_CPPFLAGS="$CPPFLAGS" SAVE_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"

View file

@ -10,8 +10,8 @@ Without this change, the compiler emits an error about pPict being undefined whe
diff --git src/atimach64render.c src/atimach64render.c diff --git src/atimach64render.c src/atimach64render.c
index 8d259fa..e4ddea8 100644 index 8d259fa..e4ddea8 100644
--- src/atimach64render.c --- a/src/atimach64render.c
+++ src/atimach64render.c +++ b/src/atimach64render.c
@@ -701,8 +701,8 @@ Mach64PrepareComposite @@ -701,8 +701,8 @@ Mach64PrepareComposite
break; break;
} }

View file

@ -15,8 +15,8 @@ each of the diagonally opposed corner vertices.
diff --git src/atimach64render.c src/atimach64render.c diff --git src/atimach64render.c src/atimach64render.c
index e4ddea8..e172546 100644 index e4ddea8..e172546 100644
--- src/atimach64render.c --- a/src/atimach64render.c
+++ src/atimach64render.c +++ b/src/atimach64render.c
@@ -814,7 +814,10 @@ Mach64Composite @@ -814,7 +814,10 @@ Mach64Composite
float ooa; float ooa;
CARD32 col; CARD32 col;

View file

@ -16,7 +16,6 @@ lib32disabled=yes
# fails at XORG_DRIVER_CHECK_EXT even though xorg-util-macros is on host # fails at XORG_DRIVER_CHECK_EXT even though xorg-util-macros is on host
nocross=yes nocross=yes
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"
patch_args=-Np0
pre_configure() { pre_configure() {
autoreconf -if autoreconf -if

View file

@ -1,7 +1,7 @@
Remove some checks that break cross. Remove some checks that break cross.
--- configure.ac 2019-04-30 17:00:37.796389608 +0200 --- a/configure.ac 2019-04-30 17:00:37.796389608 +0200
+++ configure.ac 2019-04-30 17:01:44.933049215 +0200 +++ b/configure.ac 2019-04-30 17:01:44.933049215 +0200
@@ -63,37 +63,14 @@ @@ -63,37 +63,14 @@
[EXA="$enableval"], [EXA="$enableval"],
[EXA=yes]) [EXA=yes])

View file

@ -10,8 +10,8 @@ Subject: [PATCH] only attempt to use VBE on x86
diff --git src/mga_driver.c src/mga_driver.c diff --git src/mga_driver.c src/mga_driver.c
index 94183db..68f911f 100644 index 94183db..68f911f 100644
--- src/mga_driver.c --- a/src/mga_driver.c
+++ src/mga_driver.c +++ b/src/mga_driver.c
@@ -77,7 +77,9 @@ @@ -77,7 +77,9 @@
#include "xf86DDC.h" #include "xf86DDC.h"
@ -73,8 +73,8 @@ index 94183db..68f911f 100644
pScrn->monitor->DDC = MGAdoDDC(pScrn); pScrn->monitor->DDC = MGAdoDDC(pScrn);
diff --git src/mga_merge.c src/mga_merge.c diff --git src/mga_merge.c src/mga_merge.c
index 64c85b4..62a6330 100644 index 64c85b4..62a6330 100644
--- src/mga_merge.c --- a/src/mga_merge.c
+++ src/mga_merge.c +++ b/src/mga_merge.c
@@ -406,7 +406,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) @@ -406,7 +406,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags)
*/ */
(*pMga->PreInit)(pScrn); (*pMga->PreInit)(pScrn);

View file

@ -13,7 +13,6 @@ homepage="http://xorg.freedesktop.org"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79 checksum=268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79
lib32disabled=yes lib32disabled=yes
patch_args=-Np0
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"
CFLAGS="-fcommon" CFLAGS="-fcommon"

View file

@ -16,8 +16,8 @@ https://code.foxkit.us/adelie/packages/blob/master/user/xf86-video-r128
diff --git src/r128_driver.c src/r128_driver.c diff --git src/r128_driver.c src/r128_driver.c
index 18ff57f..3f9159a 100644 index 18ff57f..3f9159a 100644
--- src/r128_driver.c --- a/src/r128_driver.c
+++ src/r128_driver.c +++ b/src/r128_driver.c
@@ -91,7 +91,11 @@ @@ -91,7 +91,11 @@
#endif #endif
#include "xf86cmap.h" #include "xf86cmap.h"
@ -108,8 +108,8 @@ index 18ff57f..3f9159a 100644
} }
diff --git src/r128_output.c src/r128_output.c diff --git src/r128_output.c src/r128_output.c
index 1d98fb9..5a94a3f 100644 index 1d98fb9..5a94a3f 100644
--- src/r128_output.c --- a/src/r128_output.c
+++ src/r128_output.c +++ b/src/r128_output.c
@@ -426,6 +426,7 @@ void R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes) @@ -426,6 +426,7 @@ void R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes)
/* non-x86 platform */ /* non-x86 platform */
if (!info->VBIOS) { if (!info->VBIOS) {

View file

@ -14,7 +14,6 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
checksum=801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057 checksum=801c86882cbd2bbb3084d471dcc5cfee2c1754dcbfb4dc446676d58a6bd9e057
lib32disabled=yes lib32disabled=yes
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

View file

@ -1,5 +1,5 @@
--- src/vmware.h 2018-05-11 17:43:24.776710047 +0200 --- a/src/vmware.h 2018-05-11 17:43:24.776710047 +0200
+++ src/vmware.h.new 2018-05-11 17:45:16.599821536 +0200 +++ b/src/vmware.h.new 2018-05-11 17:45:16.599821536 +0200
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
typedef struct { typedef struct {
@ -18,8 +18,8 @@
#define VENDOR_ID(p) (p)->vendor_id #define VENDOR_ID(p) (p)->vendor_id
#define DEVICE_ID(p) (p)->device_id #define DEVICE_ID(p) (p)->device_id
#define SUBVENDOR_ID(p) (p)->subvendor_id #define SUBVENDOR_ID(p) (p)->subvendor_id
--- src/vmware.c 2018-05-11 17:28:30.612158774 +0200 --- a/src/vmware.c 2018-05-11 17:28:30.612158774 +0200
+++ src/vmware.c.new 2018-05-11 17:38:40.108785284 +0200 +++ b/src/vmware.c.new 2018-05-11 17:38:40.108785284 +0200
@@ -341,7 +341,7 @@ @@ -341,7 +341,7 @@
SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32); SVGA_LEGACY_BASE_PORT + SVGA_VALUE_PORT*sizeof(uint32);
} else { } else {
@ -90,8 +90,8 @@
pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); pci_device_unmap_range(pVMWARE->PciInfo, pVMWARE->mmioVirtBase, pVMWARE->mmioSize);
#else #else
xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize); xf86UnMapVidMem(pScrn->scrnIndex, pVMWARE->mmioVirtBase, pVMWARE->mmioSize);
--- src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200 --- a/src/vmware_bootstrap.c 2018-05-11 20:59:15.003530525 +0200
+++ src/vmware_bootstrap.c.new 2018-05-11 21:02:11.228289137 +0200 +++ b/src/vmware_bootstrap.c.new 2018-05-11 21:02:11.228289137 +0200
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \ VMW_STRING(PACKAGE_VERSION_MAJOR) "." VMW_STRING(PACKAGE_VERSION_MINOR) \
"." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL) "." VMW_STRING(PACKAGE_VERSION_PATCHLEVEL)

View file

@ -14,7 +14,6 @@ license="MIT"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c checksum=47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c
patch_args=-Np0
lib32disabled=yes lib32disabled=yes

View file

@ -1,5 +1,5 @@
--- src/xfpm-pm-helper.c.orig 2019-08-13 12:17:22.787621859 +0200 --- a/src/xfpm-pm-helper.c 2019-08-13 12:17:22.787621859 +0200
+++ src/xfpm-pm-helper.c 2019-08-13 12:18:31.946471555 +0200 +++ b/src/xfpm-pm-helper.c 2019-08-13 12:18:31.946471555 +0200
@@ -69,11 +69,8 @@ @@ -69,11 +69,8 @@
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3" #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4" #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
@ -14,8 +14,8 @@
#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz" #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ" #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
#endif #endif
--- src/xfpm-suspend.c.orig 2020-12-22 20:56:08.139119371 -0500 --- a/src/xfpm-suspend.c 2020-12-22 20:56:08.139119371 -0500
+++ src/xfpm-suspend.c 2020-12-22 20:56:52.359241485 -0500 +++ b/src/xfpm-suspend.c 2020-12-22 20:56:52.359241485 -0500
@@ -105,40 +105,6 @@ @@ -105,40 +105,6 @@
} }
#endif #endif

View file

@ -13,4 +13,3 @@ license="GPL-2.0-or-later"
homepage="https://xfce.org/" homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
checksum=eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3 checksum=eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- src/u_fonts.c --- a/src/u_fonts.c
+++ src/u_fonts.c +++ b/src/u_fonts.c
@@ -22,41 +22,41 @@ @@ -22,41 +22,41 @@
/* X11 font names */ /* X11 font names */

View file

@ -13,7 +13,6 @@ license="MIT-like"
homepage="http://mcj.sourceforge.net/" homepage="http://mcj.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz" distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578 checksum=ba43c0ea85b230d3efa5a951a3239e206d0b033d044c590a56208f875f888578
patch_args=-Np0
post_extract() { post_extract() {
sed -i 's/spell/aspell/' app-defaults/Fig.in sed -i 's/spell/aspell/' app-defaults/Fig.in

View file

@ -1,5 +1,5 @@
--- io/mmap.c --- a/io/mmap.c
+++ io/mmap.c +++ b/io/mmap.c
@@ -189,7 +189,11 @@ @@ -189,7 +189,11 @@
prot |= PROT_EXEC; prot |= PROT_EXEC;
break; break;

View file

@ -12,7 +12,6 @@ license="LGPL-2.1-or-later"
homepage="http://xfs.org/index.php/Main_Page" homepage="http://xfs.org/index.php/Main_Page"
distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz" distfiles="${KERNEL_SITE}/utils/fs/xfs/xfsprogs/xfsprogs-${version}.tar.xz"
checksum=bec44445cf18f49e63971d4f27dc4e90a17b118b852714a1104b621ea30e3507 checksum=bec44445cf18f49e63971d4f27dc4e90a17b118b852714a1104b621ea30e3507
patch_args=-Np0
post_extract() { post_extract() {
sed -i '1i#include <signal.h>' include/linux.h sed -i '1i#include <signal.h>' include/linux.h

View file

@ -1,5 +1,5 @@
--- xinetd/builtins.c --- a/xinetd/builtins.c
+++ xinetd/builtins.c +++ b/xinetd/builtins.c
@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) @@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
if( SC_IS_INTERNAL( scp ) ) { if( SC_IS_INTERNAL( scp ) ) {
SC_INTERNAL(scp, nserp); SC_INTERNAL(scp, nserp);

View file

@ -1,5 +1,5 @@
--- xinetd/confparse.c.orig 2015-05-31 12:28:33.148468478 +0200 --- a/xinetd/confparse.c 2015-05-31 12:28:33.148468478 +0200
+++ xinetd/confparse.c 2015-05-31 12:28:41.588557956 +0200 +++ b/xinetd/confparse.c 2015-05-31 12:28:41.588557956 +0200
@@ -746,7 +746,7 @@ static status_e check_entry( struct serv @@ -746,7 +746,7 @@ static status_e check_entry( struct serv
} }

View file

@ -11,7 +11,6 @@ license="xinetd"
homepage="http://www.xinetd.org/" homepage="http://www.xinetd.org/"
distfiles="http://ponce.cc/slackware/sources/repo/xinetd-${version}.tar.gz" distfiles="http://ponce.cc/slackware/sources/repo/xinetd-${version}.tar.gz"
checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 checksum=bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3
patch_args=-Np0
conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services" conf_files="/etc/xinetd.conf /etc/xinetd.d/servers /etc/xinetd.d/services"

View file

@ -7,8 +7,8 @@ The trap patch didn't seem to work on reboot.
Index: startx.cpp.orig Index: startx.cpp.orig
=================================================================== ===================================================================
--- startx.cpp.orig --- a/startx.cpp
+++ startx.cpp +++ b/startx.cpp
@@ -273,7 +273,7 @@ @@ -273,7 +273,7 @@
dummy=0 dummy=0

View file

@ -1,5 +1,5 @@
--- startx.cpp.orig 2018-03-10 02:46:03.000000000 +0100 --- a/startx.cpp 2018-03-10 02:46:03.000000000 +0100
+++ startx.cpp 2018-03-12 20:30:43.041201031 +0100 +++ b/startx.cpp 2018-03-12 20:30:43.041201031 +0100
@@ -296,9 +296,9 @@ @@ -296,9 +296,9 @@
XCOMM now add the same credentials to the client authority file XCOMM now add the same credentials to the client authority file
XCOMM if '$displayname' already exists do not overwrite it as another XCOMM if '$displayname' already exists do not overwrite it as another

View file

@ -12,7 +12,6 @@ license="MIT"
homepage="https://xorgwiki.freedesktop.org/xorg" homepage="https://xorgwiki.freedesktop.org/xorg"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
patch_args=-Np0
conf_files=" conf_files="
/etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc

View file

@ -1,7 +1,7 @@
diff --git Makefile Makefile diff --git Makefile Makefile
index c32ed6b..fb2e7a3 100644 index c32ed6b..fb2e7a3 100644
--- Makefile --- a/Makefile
+++ Makefile +++ b/Makefile
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
-all: xkblayout-state -all: xkblayout-state
+PROG=xkblayout-state +PROG=xkblayout-state

View file

@ -10,4 +10,3 @@ license="GPL-2.0-or-later"
homepage="https://github.com/nonpop/xkblayout-state" homepage="https://github.com/nonpop/xkblayout-state"
distfiles="https://github.com/nonpop/xkblayout-state/archive/v${version}.tar.gz" distfiles="https://github.com/nonpop/xkblayout-state/archive/v${version}.tar.gz"
checksum=ddf2de9949edbea2cb25933c22a6b76d4f868ee3012120216555ac96e9b536d4 checksum=ddf2de9949edbea2cb25933c22a6b76d4f868ee3012120216555ac96e9b536d4
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- get_rload.c --- a/get_rload.c
+++ get_rload.c +++ b/get_rload.c
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
/* Not all OS supports get_rload /* Not all OS supports get_rload
steal the STUB idea from get_load steal the STUB idea from get_load

View file

@ -11,7 +11,6 @@ license="X11, MIT"
homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html" homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html"
distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907 checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907
patch_args=-Np0
post_install() { post_install() {
vlicense COPYING vlicense COPYING

View file

@ -1,5 +1,5 @@
--- Makefile.orig 2017-05-16 00:48:25.302317545 -0500 --- a/Makefile 2017-05-16 00:48:25.302317545 -0500
+++ Makefile 2017-05-16 00:47:47.801022135 -0500 +++ b/Makefile 2017-05-16 00:47:47.801022135 -0500
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
CC = gcc CC = gcc
-LDFLAGS = -lImlib2 -lX11 -LDFLAGS = -lImlib2 -lX11

View file

@ -1,5 +1,5 @@
--- xlunch.c.orig 2017-05-17 21:38:59.048445309 -0500 --- a/xlunch.c 2017-05-17 21:38:59.048445309 -0500
+++ xlunch.c 2017-05-17 21:39:41.334944291 -0500 +++ b/xlunch.c 2017-05-17 21:39:41.334944291 -0500
@@ -27,6 +27,9 @@ @@ -27,6 +27,9 @@
#include <sys/file.h> #include <sys/file.h>
#include <errno.h> #include <errno.h>

View file

@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
homepage="http://xlunch.org/" homepage="http://xlunch.org/"
distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz" distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
checksum=08728beba2a86b1e8f0cccf14903b7e6625e099425b6a254418c75636f2515e6 checksum=08728beba2a86b1e8f0cccf14903b7e6625e099425b6a254418c75636f2515e6
patch_args=-Np0
do_install() { do_install() {
vbin xlunch vbin xlunch

View file

@ -15,8 +15,8 @@ Subject: [PATCH] inotify.h is now provided with libc6. Use that instead of
diff --git src/Makefile src/Makefile diff --git src/Makefile src/Makefile
index 397857a..5ed7c42 100644 index 397857a..5ed7c42 100644
--- src/Makefile --- a/src/Makefile
+++ src/Makefile +++ b/src/Makefile
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
# Source files # Source files
# #
@ -37,7 +37,7 @@ index 397857a..5ed7c42 100644
diff --git src/inotify-syscalls.h src/inotify-syscalls.h diff --git src/inotify-syscalls.h src/inotify-syscalls.h
deleted file mode 100644 deleted file mode 100644
index 1431d46..0000000 index 1431d46..0000000
--- src/inotify-syscalls.h --- a/src/inotify-syscalls.h
+++ /dev/null +++ /dev/null
@@ -1,61 +0,0 @@ @@ -1,61 +0,0 @@
-#ifndef _LINUX_INOTIFY_SYSCALLS_H -#ifndef _LINUX_INOTIFY_SYSCALLS_H
@ -104,7 +104,7 @@ index 1431d46..0000000
diff --git src/inotify.h src/inotify.h diff --git src/inotify.h src/inotify.h
deleted file mode 100644 deleted file mode 100644
index 267c88b..0000000 index 267c88b..0000000
--- src/inotify.h --- a/src/inotify.h
+++ /dev/null +++ /dev/null
@@ -1,113 +0,0 @@ @@ -1,113 +0,0 @@
-/* -/*
@ -222,8 +222,8 @@ index 267c88b..0000000
-#endif /* _LINUX_INOTIFY_H */ -#endif /* _LINUX_INOTIFY_H */
diff --git src/main.c src/main.c diff --git src/main.c src/main.c
index 9007d6d..5bf063e 100644 index 9007d6d..5bf063e 100644
--- src/main.c --- a/src/main.c
+++ src/main.c +++ b/src/main.c
@@ -10,8 +10,7 @@ @@ -10,8 +10,7 @@
#include "xnots.h" #include "xnots.h"
#include <X11/extensions/Xrandr.h> #include <X11/extensions/Xrandr.h>

View file

@ -1,5 +1,5 @@
--- Makefile~ 2009-01-11 21:52:10.000000000 +0100 --- a/Makefile~ 2009-01-11 21:52:10.000000000 +0100
+++ Makefile 2017-11-18 19:31:11.107853009 +0100 +++ b/Makefile 2017-11-18 19:31:11.107853009 +0100
@@ -40,7 +40,6 @@ @@ -40,7 +40,6 @@
# #
# Programs # Programs
@ -8,8 +8,8 @@
INSTALL = install INSTALL = install
INSTALL_PROGRAM = $(INSTALL) INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
--- src/Makefile~ 2009-01-11 21:52:10.000000000 +0100 --- a/src/Makefile~ 2009-01-11 21:52:10.000000000 +0100
+++ src/Makefile 2017-11-18 19:37:49.493851304 +0100 +++ b/src/Makefile 2017-11-18 19:37:49.493851304 +0100
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
objects = $(sources:.c=.o) objects = $(sources:.c=.o)

View file

@ -1,7 +1,7 @@
diff --git src/notes.c src/notes.c diff --git src/notes.c src/notes.c
index 0c427dd..5d32740 100644 index 0c427dd..5d32740 100644
--- src/notes.c --- a/src/notes.c
+++ src/notes.c +++ b/src/notes.c
@@ -731,7 +731,7 @@ correctNoteHeight( Note *note ) @@ -731,7 +731,7 @@ correctNoteHeight( Note *note )
/* /*
Reset the width of note internals (e.g. the pango layout) to note->width. Reset the width of note internals (e.g. the pango layout) to note->width.
@ -13,8 +13,8 @@ index 0c427dd..5d32740 100644
pango_layout_set_width( note->playout, pango_layout_set_width( note->playout,
diff --git src/xnots.h src/xnots.h diff --git src/xnots.h src/xnots.h
index 8280ccb..ef7395b 100644 index 8280ccb..ef7395b 100644
--- src/xnots.h --- a/src/xnots.h
+++ src/xnots.h +++ b/src/xnots.h
@@ -315,7 +315,7 @@ void correctNoteGeometry ( Note *note, @@ -315,7 +315,7 @@ void correctNoteGeometry ( Note *note,
unsigned height unsigned height
); );

View file

@ -14,4 +14,3 @@ license="GPL-2.0-only"
homepage="http://xnots.sourceforge.net/" homepage="http://xnots.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
checksum=80bbab0334880f79aa12cf17ebffc5730a85dc537e8e6208169720656ecd72ca checksum=80bbab0334880f79aa12cf17ebffc5730a85dc537e8e6208169720656ecd72ca
patch_args=-Np0

View file

@ -1,5 +1,5 @@
--- x11/compiler.h.old 2018-02-02 17:00:29.174895866 +0000 --- a/x11/compiler.h.old 2018-02-02 17:00:29.174895866 +0000
+++ x11/compiler.h 2018-02-02 17:00:41.199160781 +0000 +++ b/x11/compiler.h 2018-02-02 17:00:41.199160781 +0000
@@ -117,12 +117,14 @@ @@ -117,12 +117,14 @@
#define MAX_PATH MAXPATHLEN #define MAX_PATH MAXPATHLEN
#endif #endif

View file

@ -13,7 +13,6 @@ license="BSD"
homepage="https://www.nonakap.org/np2" homepage="https://www.nonakap.org/np2"
distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2" distfiles="https://www.nonakap.org/np2/release/xnp2-${version}.tar.bz2"
checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd checksum=e0b8c93f54682a4b3373907fd9ffe78094f95f7430dffc5038eccbcc4c3f78fd
patch_args=-Np0
do_install() { do_install() {
vbin xnp2 vbin xnp2

View file

@ -1,7 +1,7 @@
There is no moncontrol() in musl libc. There is no moncontrol() in musl libc.
--- source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100 --- a/source/darkplaces/sys_shared.c 2015-01-13 19:56:16.000000000 +0100
+++ source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200 +++ b/source/darkplaces/sys_shared.c 2015-08-30 09:24:54.839064473 +0200
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
else else
moncleanup(); moncleanup();

View file

@ -14,7 +14,6 @@ homepage="http://xonotic.org"
distfiles="http://dl.xonotic.org/xonotic-${version}-source.zip" distfiles="http://dl.xonotic.org/xonotic-${version}-source.zip"
checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b checksum=5e6916f1e6e9e22285bb71ddd075189102857383e74ed0b0a3d27cef08e0bd2b
nocross=yes nocross=yes
patch_args=-Np0
do_build() { do_build() {
local target local target

View file

@ -1,7 +1,7 @@
From Arch. From Arch.
--- linux.cf.orig 2006-03-04 18:40:43.000000000 +0000 --- a/linux.cf 2006-03-04 18:40:43.000000000 +0000
+++ linux.cf 2006-03-04 18:41:48.000000000 +0000 +++ b/linux.cf 2006-03-04 18:41:48.000000000 +0000
@@ -193,6 +193,13 @@ @@ -193,6 +193,13 @@
#define FSUseSyslog YES #define FSUseSyslog YES
#endif #endif
@ -16,8 +16,8 @@ From Arch.
#ifndef HasDevRandom #ifndef HasDevRandom
# define HasDevRandom YES # define HasDevRandom YES
# ifndef RandomDeviceName # ifndef RandomDeviceName
--- X11.tmpl.orig 2006-07-15 10:45:23.000000000 +0000 --- a/X11.tmpl 2006-07-15 10:45:23.000000000 +0000
+++ X11.tmpl 2006-07-15 10:46:19.000000000 +0000 +++ b/X11.tmpl 2006-07-15 10:46:19.000000000 +0000
@@ -1502,10 +1502,10 @@ @@ -1502,10 +1502,10 @@
#define DocPdfDir $(DOCDIR)/PDF #define DocPdfDir $(DOCDIR)/PDF
#endif #endif

View file

@ -10,7 +10,6 @@ license="X11"
homepage="http://xorg.freedesktop.org/" homepage="http://xorg.freedesktop.org/"
distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
patch_args=-Np0
pre_configure() { pre_configure() {
autoreconf -fi autoreconf -fi

View file

@ -1,7 +1,7 @@
Prefer the AMD Catalyst "fglrx" driver if found. Prefer the AMD Catalyst "fglrx" driver if found.
--- hw/xfree86/common/xf86pciBus.c.orig 2013-02-07 19:59:55.690518107 +0100 --- a/hw/xfree86/common/xf86pciBus.c 2013-02-07 19:59:55.690518107 +0100
+++ hw/xfree86/common/xf86pciBus.c 2013-02-07 20:01:14.832594170 +0100 +++ b/hw/xfree86/common/xf86pciBus.c 2013-02-07 20:01:14.832594170 +0100
@@ -1132,8 +1132,13 @@ xf86VideoPtrToDriverList(struct pci_devi @@ -1132,8 +1132,13 @@ xf86VideoPtrToDriverList(struct pci_devi
driverList[0] = "ast"; driverList[0] = "ast";
break; break;

View file

@ -1,5 +1,5 @@
--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 --- a/hw/xfree86/common/xf86pciBus.c 2011-09-24 10:53:45.421697668 +0000
+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +++ b/hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000
@@ -1200,9 +1200,15 @@ @@ -1200,9 +1200,15 @@
break; break;
} }

View file

@ -9,8 +9,8 @@ Subject: [PATCH] fix libshadow
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 835d23215..6bd8029b6 100644 index 835d23215..6bd8029b6 100644
--- hw/xfree86/dixmods/meson.build --- a/hw/xfree86/dixmods/meson.build
+++ hw/xfree86/dixmods/meson.build +++ b/hw/xfree86/dixmods/meson.build
@@ -38,6 +38,7 @@ shared_module( @@ -38,6 +38,7 @@ shared_module(
install: true, install: true,

View file

@ -2,8 +2,8 @@ Source: @pullmoll
Upstream: no Upstream: no
Reason: Gracefully handle transition to 64 bit time with musl-1.2.1 Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
--- hw/dmx/input/usb-keyboard.c 2020-12-01 17:32:25.000000000 +0100 --- a/hw/dmx/input/usb-keyboard.c 2020-12-01 17:32:25.000000000 +0100
+++ hw/dmx/input/usb-keyboard.c 2020-12-01 20:28:02.489695853 +0100 +++ b/hw/dmx/input/usb-keyboard.c 2020-12-01 20:28:02.489695853 +0100
@@ -278,8 +278,8 @@ @@ -278,8 +278,8 @@
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
@ -15,8 +15,8 @@ Reason: Gracefully handle transition to 64 bit time with musl-1.2.1
event.type = EV_LED; event.type = EV_LED;
if (i == 0) if (i == 0)
led = 1; /* LED_CAPSL == 0x01 */ led = 1; /* LED_CAPSL == 0x01 */
--- hw/dmx/examples/ev.c 2020-12-01 17:32:25.000000000 +0100 --- a/hw/dmx/examples/ev.c 2020-12-01 17:32:25.000000000 +0100
+++ hw/dmx/examples/ev.c 2020-12-01 20:31:24.585605950 +0100 +++ b/hw/dmx/examples/ev.c 2020-12-01 20:31:24.585605950 +0100
@@ -114,8 +114,8 @@ @@ -114,8 +114,8 @@
if ((fd = open(name, O_RDWR, 0)) >= 0) { if ((fd = open(name, O_RDWR, 0)) >= 0) {
printf("%s: open, fd = %d\n", name, fd); printf("%s: open, fd = %d\n", name, fd);

View file

@ -15,8 +15,8 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
diff --git hw/xfree86/common/xf86platformBus.c hw/xfree86/common/xf86platformBus.c diff --git hw/xfree86/common/xf86platformBus.c hw/xfree86/common/xf86platformBus.c
index cef47da03d..dadbac6c8f 100644 index cef47da03d..dadbac6c8f 100644
--- hw/xfree86/common/xf86platformBus.c --- a/hw/xfree86/common/xf86platformBus.c
+++ hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c
@@ -289,7 +289,7 @@ xf86platformProbe(void) @@ -289,7 +289,7 @@ xf86platformProbe(void)
for (i = 0; i < xf86_num_platform_devices; i++) { for (i = 0; i < xf86_num_platform_devices; i++) {
char *busid = xf86_platform_odev_attributes(i)->busid; char *busid = xf86_platform_odev_attributes(i)->busid;

View file

@ -1,5 +1,5 @@
--- meson.build --- a/meson.build
+++ meson.build +++ b/meson.build
@@ -507,7 +507,7 @@ glx_inc = include_directories('glx') @@ -507,7 +507,7 @@ glx_inc = include_directories('glx')
top_srcdir_inc = include_directories('.') top_srcdir_inc = include_directories('.')

View file

@ -1,5 +1,5 @@
--- meson.build.orig --- a/meson.build
+++ meson.build +++ b/meson.build
@@ -122,8 +122,11 @@ @@ -122,8 +122,11 @@
dfp = get_option('default_font_path') dfp = get_option('default_font_path')
@ -14,8 +14,8 @@
default_font_path = ','.join([ default_font_path = ','.join([
join_paths(fontrootdir, 'misc'), join_paths(fontrootdir, 'misc'),
join_paths(fontrootdir, 'TTF'), join_paths(fontrootdir, 'TTF'),
--- meson_options.txt.orig --- a/meson_options.txt
+++ meson_options.txt +++ b/meson_options.txt
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
option('module_dir', type: 'string', value: 'xorg/modules', option('module_dir', type: 'string', value: 'xorg/modules',
description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)') description: 'X.Org modules directory (absolute or relative to the directory specified by the libdir option)')

View file

@ -1,5 +1,5 @@
--- hw/xfree86/meson.build.orig --- a/hw/xfree86/meson.build
+++ hw/xfree86/meson.build +++ b/hw/xfree86/meson.build
@@ -145,12 +145,15 @@ @@ -145,12 +145,15 @@
install_dir: get_option('libexecdir'), install_dir: get_option('libexecdir'),
# install_mode: ['r-sr-xr-x', 0, 0], # install_mode: ['r-sr-xr-x', 0, 0],

View file

@ -31,7 +31,6 @@ provides="xserver-abi-extension-10_1 xserver-abi-input-24_1
xserver-abi-video-24_1 xf86-video-modesetting-1_1" xserver-abi-video-24_1 xf86-video-modesetting-1_1"
replaces="xf86-video-modesetting>=0 glamor-egl>=0" replaces="xf86-video-modesetting>=0 glamor-egl>=0"
conf_files="/etc/X11/Xwrapper.config" conf_files="/etc/X11/Xwrapper.config"
patch_args=-Np0
build_options="elogind" build_options="elogind"
desc_option_elogind="Rootless Xorg support with elogind" desc_option_elogind="Rootless Xorg support with elogind"

View file

@ -1,5 +1,5 @@
--- linux/serialmeter.cc 2016-01-02 10:39:10.279496776 +0100 --- a/linux/serialmeter.cc 2016-01-02 10:39:10.279496776 +0100
+++ linux/serialmeter.cc 2016-01-02 10:37:54.667491325 +0100 +++ b/linux/serialmeter.cc 2016-01-02 10:37:54.667491325 +0100
@@ -39,9 +39,11 @@ @@ -39,9 +39,11 @@
#endif #endif
#else #else

Some files were not shown because too many files have changed in this diff Show more