diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/d/FTBFSlog | 4 | ||||
| -rwxr-xr-x | source/d/binutils/binutils.SlackBuild | 1 | ||||
| -rw-r--r-- | source/d/binutils/patches/binutils-revert-PLT-elision.patch | 243 | ||||
| -rw-r--r-- | source/d/gdb/1add37b567a7dee39d99f37b37802034c3fce9c4.patch | 37 | ||||
| -rwxr-xr-x | source/d/gdb/gdb.SlackBuild | 3 | ||||
| -rwxr-xr-x | source/d/oprofile/oprofile.SlackBuild | 2 | ||||
| -rw-r--r-- | source/installer/ChangeLog.txt | 4 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/pxesetup | 4 | ||||
| -rw-r--r-- | source/n/httpd/httpd.url | 4 | ||||
| -rw-r--r-- | source/x/x11/build/igt-gpu-tools | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/igt-gpu-tools.patch | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch | 36 |
12 files changed, 54 insertions, 288 deletions
diff --git a/source/d/FTBFSlog b/source/d/FTBFSlog index b6ca69df1..330f20276 100644 --- a/source/d/FTBFSlog +++ b/source/d/FTBFSlog @@ -1,3 +1,7 @@ +Tue Jan 17 21:57:52 UTC 2023 + gdb: patched to fix the build with readline-8.2.001. + Thanks to nobodino and marav. ++--------------------------+ Sat Aug 6 04:18:11 UTC 2022 llvm: patched to fix the build with glibc-2.36. rust: patched to fix the build with glibc-2.36. diff --git a/source/d/binutils/binutils.SlackBuild b/source/d/binutils/binutils.SlackBuild index 8edcd5b41..24e9b9be3 100755 --- a/source/d/binutils/binutils.SlackBuild +++ b/source/d/binutils/binutils.SlackBuild @@ -120,7 +120,6 @@ zcat $CWD/patches/binutils-gold-i386-gnu-property-notes.patch.gz | patch -p1 --v zcat $CWD/patches/binutils-gold-mismatched-section-flags.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/binutils-gold-warn-unsupported.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/binutils-readelf-other-sym-info.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/binutils-revert-PLT-elision.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/binutils-special-sections-in-groups.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/binutils-testsuite-fixes.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/d/binutils/patches/binutils-revert-PLT-elision.patch b/source/d/binutils/patches/binutils-revert-PLT-elision.patch deleted file mode 100644 index 885bbeeed..000000000 --- a/source/d/binutils/patches/binutils-revert-PLT-elision.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d ---- binutils.orig/ld/testsuite/ld-i386/pltgot-1.d 2017-11-15 13:32:39.335065263 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d 2017-11-15 15:03:55.649727195 +0000 -@@ -2,6 +2,7 @@ - #readelf: -S --wide - #as: --32 - -+#pass - #... - +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.* - #... -diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d ---- binutils.orig/ld/testsuite/ld-i386/pltgot-2.d 2017-11-15 13:32:39.329065335 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d 2017-11-15 15:04:20.803430034 +0000 -@@ -3,7 +3,6 @@ - #readelf: -d --wide - #as: --32 - --#failif - #... - +0x[0-9a-f]+ +\(PLTREL.* - #... -diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d ---- binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d 2017-11-15 13:32:39.336065251 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d 2017-11-15 15:03:00.413379749 +0000 -@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse - [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func -- -+#... - Symbol table '\.dynsym' contains [0-9]+ entries: - +Num: +Value +Size Type +Bind +Vis +Ndx Name - #... -diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d ---- binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d 2017-11-15 13:32:39.330065323 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d 2017-11-15 15:03:28.928042882 +0000 -@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse - [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func - [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func -- -+#... - Symbol table '\.dynsym' contains [0-9]+ entries: - +Num: +Value +Size Type +Bind +Vis +Ndx Name - #... -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d ---- binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d 2017-11-15 13:32:39.415064300 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d 2017-11-15 15:08:39.333375801 +0000 -@@ -2,8 +2,4 @@ - #readelf: -S --wide - #as: --64 - --#... -- +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.* --#... -- +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+18 +.* - #pass -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d ---- binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d 2017-11-15 13:32:39.404064432 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d 2017-11-15 15:08:59.031143095 +0000 -@@ -3,7 +3,6 @@ - #readelf: -d --wide - #as: --64 - --#failif - #... - +0x[0-9a-f]+ +\(PLTREL.* - #... -diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd ---- binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd 2017-11-15 13:32:39.407064397 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd 2017-11-15 15:06:17.244054423 +0000 -@@ -1,4 +1,3 @@ --#failif - #... - [0-9a-f ]+R_X86_64_JUMP_SLOT +0+ +bar \+ 0 - #... -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d 2017-11-15 13:32:39.412064336 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d 2017-11-15 15:15:09.918750288 +0000 -@@ -20,6 +20,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -+#pass - - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d 2017-11-15 13:32:39.413064324 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d 2017-11-15 15:16:08.227055104 +0000 -@@ -20,6 +20,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -+#pass - - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d 2017-11-15 13:32:39.413064324 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d 2017-11-15 15:16:20.115913358 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d 2017-11-15 13:32:39.411064348 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d 2017-11-15 15:16:29.012807282 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038a.d 2017-11-15 13:32:39.408064384 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a.d 2017-11-15 15:19:48.097433680 +0000 -@@ -19,7 +19,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038a-now.d 2017-11-15 13:32:39.401064469 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038a-now.d 2017-11-15 15:10:56.077760324 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038b.d 2017-11-15 13:32:39.405064420 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b.d 2017-11-15 15:10:42.828916844 +0000 -@@ -19,6 +19,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -+#pass - - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038b-now.d 2017-11-15 13:32:39.416064288 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038b-now.d 2017-11-15 15:11:11.550577531 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001d8..00000000000001dd - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038c.d 2017-11-15 13:32:39.411064348 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c.d 2017-11-15 15:09:52.664509478 +0000 -@@ -19,7 +19,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d ---- binutils.orig/ld/testsuite/ld-x86-64/pr21038c-now.d 2017-11-15 13:32:39.413064324 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr21038c-now.d 2017-11-15 15:11:22.975442559 +0000 -@@ -20,7 +20,8 @@ Contents of the .eh_frame section: - DW_CFA_offset: r16 \(rip\) at cfa-8 - DW_CFA_nop - DW_CFA_nop -- -+#pass -+ - 0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000220..0000000000000231 - DW_CFA_nop - DW_CFA_nop -diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd ---- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd 2017-11-15 13:32:39.417064276 +0000 -+++ binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd 2017-11-15 15:05:02.950932110 +0000 -@@ -14,6 +14,7 @@ Section Headers: - +\[[ 0-9]+\] .dynsym +.* - +\[[ 0-9]+\] .dynstr +.* - +\[[ 0-9]+\] .rela.dyn +.* -+#pass - +\[[ 0-9]+\] .plt +.* - +\[[ 0-9]+\] .plt.got +.* - +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+31a 00 +AX +0 +0 4096 ---- binutils.orig/bfd/elfxx-x86.c 2018-01-22 15:59:25.875788033 +0000 -+++ binutils-2.30.0/bfd/elfxx-x86.c 2018-01-22 16:00:20.789146597 +0000 -@@ -107,7 +107,7 @@ elf_x86_allocate_dynrelocs (struct elf_l - plt_entry_size = htab->plt.plt_entry_size; - - resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh); -- -+#if 0 - /* We can't use the GOT PLT if pointer equality is needed since - finish_dynamic_symbol won't clear symbol value and the dynamic - linker won't update the GOT slot. We will get into an infinite -@@ -125,7 +125,7 @@ elf_x86_allocate_dynrelocs (struct elf_l - /* Use the GOT PLT. */ - eh->plt_got.refcount = 1; - } -- -+#endif - /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it - here if it is defined and referenced in a non-shared object. */ - if (h->type == STT_GNU_IFUNC ---- binutils.orig/ld/testsuite/ld-i386/pr20830.d 2018-07-09 09:49:51.277239857 +0100 -+++ binutils-2.30.90/ld/testsuite/ld-i386/pr20830.d 2018-07-09 10:32:41.113356733 +0100 -@@ -19,7 +19,7 @@ Contents of the .eh_frame section: - DW_CFA_offset: r8 \(eip\) at cfa-4 - DW_CFA_nop - DW_CFA_nop -- -+#pass - 0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133 - DW_CFA_nop - DW_CFA_nop diff --git a/source/d/gdb/1add37b567a7dee39d99f37b37802034c3fce9c4.patch b/source/d/gdb/1add37b567a7dee39d99f37b37802034c3fce9c4.patch new file mode 100644 index 000000000..1e874f159 --- /dev/null +++ b/source/d/gdb/1add37b567a7dee39d99f37b37802034c3fce9c4.patch @@ -0,0 +1,37 @@ +From 1add37b567a7dee39d99f37b37802034c3fce9c4 Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@linux-m68k.org> +Date: Sun, 20 Mar 2022 14:01:54 +0100 +Subject: [PATCH] Add support for readline 8.2 + +In readline 8.2 the type of rl_completer_word_break_characters changed to +include const. +--- + gdb/completer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdb/completer.c b/gdb/completer.c +index d3900ae2014..a51c16ac7f8 100644 +--- a/gdb/completer.c ++++ b/gdb/completer.c +@@ -36,7 +36,7 @@ + calling a hook instead so we eliminate the CLI dependency. */ + #include "gdbcmd.h" + +-/* Needed for rl_completer_word_break_characters() and for ++/* Needed for rl_completer_word_break_characters and for + rl_filename_completion_function. */ + #include "readline/readline.h" + +@@ -2011,7 +2011,7 @@ gdb_completion_word_break_characters_throw () + rl_basic_quote_characters = NULL; + } + +- return rl_completer_word_break_characters; ++ return (char *) rl_completer_word_break_characters; + } + + char * +-- +2.31.1 + + diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild index 5e5ea831a..4984f9e5e 100755 --- a/source/d/gdb/gdb.SlackBuild +++ b/source/d/gdb/gdb.SlackBuild @@ -75,6 +75,9 @@ find . \ # This has been perpetually broken, so we'll default to turning it off: GUILE_OPTION=${GUILE_OPTION:"--without-guile"} +# Fix FTBFS with recent system readline: +zcat $CWD/1add37b567a7dee39d99f37b37802034c3fce9c4.patch.gz | patch -p1 --verbose || exit 1 + # Make a build directory: mkdir build-gdb cd build-gdb diff --git a/source/d/oprofile/oprofile.SlackBuild b/source/d/oprofile/oprofile.SlackBuild index a2aa92c60..6e5903306 100755 --- a/source/d/oprofile/oprofile.SlackBuild +++ b/source/d/oprofile/oprofile.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=oprofile VERSION=${VERSION:-$(echo oprofile-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-10} +BUILD=${BUILD:-11} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index d1671e1e4..5ac0c1199 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,7 @@ +Tue Jan 17 20:55:17 UTC 2023 + pxesetup: after sorting the partition list, run it through 'uniq' to ensure + no duplicates are listed. Thanks to 'opty' in Libera.Chat ##slackware. ++--------------------------+ Mon Jan 9 09:37:40 UTC 2023 /sbin/probe: Removed old mmc discovery code. Filter devices that contain reserved file system labels for Slackware diff --git a/source/installer/sources/initrd/usr/lib/setup/pxesetup b/source/installer/sources/initrd/usr/lib/setup/pxesetup index fb7831a39..7241b5c8c 100755 --- a/source/installer/sources/initrd/usr/lib/setup/pxesetup +++ b/source/installer/sources/initrd/usr/lib/setup/pxesetup @@ -40,12 +40,12 @@ export COLOR=on # before the boot - perhaps the Slackware tree is on a local partition: vgchange -ay 1> /dev/null 2> /dev/null if probe -l 2> /dev/null | grep -E 'Linux$' 1> /dev/null 2> /dev/null ; then - probe -l 2> /dev/null | grep -E 'Linux$' | sort 1> $TMP/SeTplist 2> /dev/null + probe -l 2> /dev/null | grep -E 'Linux$' | sort | uniq 1> $TMP/SeTplist 2> /dev/null fi while [ 0 ]; do - dialog --title "Slackware PXE Setup (version 13.37)" \ + dialog --title "Slackware PXE Setup (version 15.1)" \ --menu \ "Welcome to Slackware PXE Setup.\n\ Select an option below using the UP/DOWN keys and SPACE or ENTER.\n\ diff --git a/source/n/httpd/httpd.url b/source/n/httpd/httpd.url index ed84c65d2..2d790b703 100644 --- a/source/n/httpd/httpd.url +++ b/source/n/httpd/httpd.url @@ -1,2 +1,2 @@ -http://www.apache.org/dist/httpd/httpd-2.4.54.tar.bz2 -http://www.apache.org/dist/httpd/httpd-2.4.54.tar.bz2.asc +http://www.apache.org/dist/httpd/httpd-2.4.55.tar.bz2 +http://www.apache.org/dist/httpd/httpd-2.4.55.tar.bz2.asc diff --git a/source/x/x11/build/igt-gpu-tools b/source/x/x11/build/igt-gpu-tools index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/igt-gpu-tools +++ b/source/x/x11/build/igt-gpu-tools @@ -1 +1 @@ -2 +1 diff --git a/source/x/x11/patch/igt-gpu-tools.patch b/source/x/x11/patch/igt-gpu-tools.patch deleted file mode 100644 index d55f9b922..000000000 --- a/source/x/x11/patch/igt-gpu-tools.patch +++ /dev/null @@ -1,2 +0,0 @@ -zcat $CWD/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch.gz | patch -p1 --verbose \ - || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch b/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch deleted file mode 100644 index 142e2fa44..000000000 --- a/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001 -From: Petri Latvala <petri.latvala@intel.com> -Date: Thu, 28 Oct 2021 11:05:31 +0300 -Subject: [PATCH] lib/meson.build: Fix underscorify call -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -f.underscorify() is correct, f.underscorify(f) is an error that later -meson versions don't like at all. - -Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107 -Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities") -Cc: Arkadiusz Hiler <arek@hiler.eu> -Signed-off-by: Petri Latvala <petri.latvala@intel.com> -Reviewed-by: José Roberto de Souza <jose.souza@intel.com> ---- - lib/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/meson.build b/lib/meson.build -index c3080fc8..297b0ad2 100644 ---- a/lib/meson.build -+++ b/lib/meson.build -@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', - - lib_intermediates = [] - foreach f: lib_sources -- name = f.underscorify(f) -+ name = f.underscorify() - lib = static_library('igt-' + name, - [ f, lib_version ], - include_directories: inc, --- -GitLab - |