srcpkgs/t*: 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
Đoàn Trần Công Danh
parent
4b97cd2fb4
commit
4f75cf25fd
164 changed files with 316 additions and 374 deletions
|
|
@ -1,5 +1,5 @@
|
|||
--- ./src/Directory.cpp.orig 2015-10-23 19:01:36.570860470 -0400
|
||||
+++ ./src/Directory.cpp 2015-10-23 19:02:12.097860878 -0400
|
||||
--- a/src/Directory.cpp 2015-10-23 19:01:36.570860470 -0400
|
||||
+++ b/src/Directory.cpp 2015-10-23 19:02:12.097860878 -0400
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ license="MIT"
|
|||
homepage="http://taskwarrior.org"
|
||||
distfiles="http://taskwarrior.org/download/${pkgname}-${version}.tar.gz"
|
||||
checksum=7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4
|
||||
patch_args=-Np0
|
||||
|
||||
system_accounts="taskd"
|
||||
taskd_homedir="/var/lib/taskd"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- build/version_info_linux.sh.ORIG
|
||||
+++ build/version_info_linux.sh
|
||||
--- a/build/version_info_linux.sh
|
||||
+++ b/build/version_info_linux.sh
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
# Script used to generate version info string
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/tbbmalloc/proxy.cpp.orig 2018-10-17 14:05:31.311723013 +0200
|
||||
+++ src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200
|
||||
--- a/src/tbbmalloc/proxy.cpp 2018-10-17 14:05:31.311723013 +0200
|
||||
+++ b/src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200
|
||||
@@ -28,6 +28,7 @@
|
||||
// of aligned_alloc as required by new C++ standard, this makes it hard to
|
||||
// redefine aligned_alloc here. However, running on systems with new libc
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ license="Apache-2.0"
|
|||
homepage="https://www.threadingbuildingblocks.org"
|
||||
distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz"
|
||||
checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a
|
||||
patch_args=-Np0
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
x86_64*)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- tcplay.c 2020-01-02 03:32:31.615390563 +0100
|
||||
+++ tcplay.c 2020-01-02 03:32:45.237882108 +0100
|
||||
--- a/tcplay.c 2020-01-02 03:32:31.615390563 +0100
|
||||
+++ b/tcplay.c 2020-01-02 03:32:45.237882108 +0100
|
||||
@@ -30,6 +30,7 @@
|
||||
#define _BSD_SOURCE
|
||||
#include <sys/types.h>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ license="BSD-2-clause"
|
|||
homepage="https://github.com/bwalex/tc-play"
|
||||
distfiles="https://github.com/bwalex/${pkgname}/archive/v${version}.tar.gz"
|
||||
checksum=ad53cd814a23b4f61a1b2b6dc2539624ffb550504c400c45cbd8cd1da4c7d90a
|
||||
patch_args=-Np0
|
||||
|
||||
pre_build() {
|
||||
sed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- generic/tcl.h
|
||||
+++ generic/tcl.h
|
||||
--- a/generic/tcl.h
|
||||
+++ b/generic/tcl.h
|
||||
@@ -17,6 +17,8 @@
|
||||
#ifndef _TCL
|
||||
#define _TCL
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ license="TCL"
|
|||
homepage="http://www.tcl.tk"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}${version}-src.tar.gz"
|
||||
checksum=8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
|
||||
patch_args=-Np0
|
||||
|
||||
shlib_provides="libtcl${version%.*}.so"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -420,7 +420,6 @@
|
||||
[ -d $(DESTDIR)$(bindir) ] || \
|
||||
(mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ homepage="https://www.tcpdump.org"
|
|||
changelog="https://www.tcpdump.org/tcpdump-changes.txt"
|
||||
distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
|
||||
checksum=79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git Makefile Makefile
|
||||
index 8bbf28f..f9d6b9d 100644
|
||||
--- Makefile
|
||||
+++ Makefile
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -12,7 +12,7 @@ ifeq ($(OS), LINUX) # also works on FreeBSD
|
||||
CC ?= gcc
|
||||
CFLAGS ?= -O2 -Wall
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ license="GPL-3"
|
|||
homepage="http://www.pjrc.com/teensy/loader_cli.html"
|
||||
distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz"
|
||||
checksum=5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388
|
||||
patch_args=-Np0
|
||||
|
||||
do_install() {
|
||||
vbin teensy_loader_cli
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Hopefully this prevents FTBFS on non-supported architectures.
|
|||
|
||||
diff --git a/bam.lua b/bam.lua
|
||||
index f511fac..b23d501 100644
|
||||
--- bam.lua
|
||||
+++ bam.lua
|
||||
--- a/bam.lua
|
||||
+++ b/bam.lua
|
||||
@@ -191,9 +191,6 @@ function GenerateLinuxSettings(settings, conf, arch, compiler)
|
||||
settings.link.flags:Add("-m64")
|
||||
elseif arch == "armv7l" then
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Bam doesn't respect cflags when searching for libs/includes like this, so
|
||||
just assume we have zlib for the target (which we do) and link it. Other
|
||||
libs use pkg-config, so there is no problem for those.
|
||||
--- bam.lua
|
||||
+++ bam.lua
|
||||
--- a/bam.lua
|
||||
+++ b/bam.lua
|
||||
@@ -10,7 +10,6 @@ config:Add(OptCCompiler("compiler"))
|
||||
config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
|
||||
config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.7 -isysroot /Developer/SDKs/MacOSX10.7.sdk"))
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ license="custom"
|
|||
homepage="https://www.teeworlds.com"
|
||||
distfiles="https://github.com/teeworlds/teeworlds/archive/${version}.tar.gz"
|
||||
checksum=6e67846b38750d2a372d7835fa3775db016458a20a85aa52f1c758102ddd4abe
|
||||
patch_args=-Np0
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
i686) _ARCH=x86;;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100
|
||||
+++ - 2020-11-21 11:09:50.935306092 +0100
|
||||
--- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100
|
||||
+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100
|
||||
@@ -12,11 +12,6 @@
|
||||
#include <QtCore/QDate>
|
||||
#include <QtGui/QGuiApplication>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- cmake/external/gsl/CMakeLists.txt 2021-03-17 10:33:50.000000000 +0100
|
||||
+++ - 2021-03-21 21:08:36.925095597 +0100
|
||||
--- a/cmake/external/gsl/CMakeLists.txt 2021-03-17 10:33:50.000000000 +0100
|
||||
+++ b/cmake/external/gsl/CMakeLists.txt 2021-03-17 10:33:50.000000000 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
add_library(desktop-app::external_gsl ALIAS external_gsl)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200
|
||||
+++ - 2021-04-26 18:46:55.642218961 +0200
|
||||
--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200
|
||||
+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200
|
||||
@@ -12,6 +12,7 @@
|
||||
#undef signals
|
||||
#include <JavaScriptCore/JavaScript.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- cmake/external/rlottie/CMakeLists.txt 2020-08-11 15:21:17.000000000 +0200
|
||||
+++ - 2020-08-16 21:24:45.680173438 +0200
|
||||
--- a/cmake/external/rlottie/CMakeLists.txt 2020-08-11 15:21:17.000000000 +0200
|
||||
+++ b/cmake/external/rlottie/CMakeLists.txt 2020-08-11 15:21:17.000000000 +0200
|
||||
@@ -8,7 +8,6 @@
|
||||
add_library(desktop-app::external_rlottie ALIAS external_rlottie)
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ homepage="https://desktop.telegram.org/"
|
|||
changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
|
||||
distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
|
||||
checksum=97526f0b4adf04cf86b605ae84f3efaacf58eb8f828bab8f4fe752a4fac62fb2
|
||||
patch_args=-Np0
|
||||
|
||||
build_options="spellcheck"
|
||||
build_options_default="spellcheck"
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ Origin: vendor, FreeBSD, https://lists.freebsd.org/pipermail/svn-ports-head/2016
|
|||
|
||||
diff --git a/src/media-stream.c b/src/media-stream.c
|
||||
index 7b4f29f..da088d1 100644
|
||||
--- src/media-stream.c
|
||||
+++ src/media-stream.c
|
||||
--- a/src/media-stream.c
|
||||
+++ b/src/media-stream.c
|
||||
@@ -1076,7 +1076,7 @@ haze_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
|
||||
if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP)
|
||||
protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
|
|||
homepage="http://telepathy.freedesktop.org"
|
||||
distfiles="${homepage}/releases/$pkgname/$pkgname-$version.tar.gz"
|
||||
checksum=3e76049c05f2cd5900c5c0c1cfebdf7ae79eec987a599f1090946673c5b8f9c9
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ space with '-', but now tightened up the validation.
|
|||
|
||||
diff --git src/mcd-account.c src/mcd-account.c
|
||||
index 8009110e..de5c61cf 100644
|
||||
--- src/mcd-account.c
|
||||
+++ src/mcd-account.c
|
||||
--- a/src/mcd-account.c
|
||||
+++ b/src/mcd-account.c
|
||||
@@ -3442,7 +3442,7 @@ mcd_account_class_init (McdAccountClass * klass)
|
||||
|
||||
g_object_class_install_property
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ license="LGPL-2.1-or-later"
|
|||
homepage="http://telepathy.freedesktop.org"
|
||||
distfiles="${homepage}/releases/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||
checksum=4c6b433b8b9079fd7df3e29aefcad6755a2081a9a634ffb6b33936c7d0d8bd03
|
||||
patch_args=-Np0
|
||||
|
||||
telepathy-mission-control-devel_package() {
|
||||
depends="telepathy-glib-devel>=0.22 ${sourcepkg}>=${version}"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/3rdparty/btparse/lex_auxiliary.c 2018-12-19 01:27:45.874263697 +0000
|
||||
+++ - 2019-01-16 22:24:15.104327218 +0000
|
||||
--- a/src/3rdparty/btparse/lex_auxiliary.c 2018-12-19 01:27:45.874263697 +0000
|
||||
+++ b/src/3rdparty/btparse/lex_auxiliary.c 2018-12-19 01:27:45.874263697 +0000
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "bt_debug.h"
|
||||
#include <stdlib.h>
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
#include <ctype.h>
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
--- src/3rdparty/btparse/sym.c 2018-12-19 02:27:45.878263787 +0100
|
||||
+++ - 2019-01-17 07:59:32.484113315 +0100
|
||||
--- a/src/3rdparty/btparse/sym.c 2018-12-19 02:27:45.878263787 +0100
|
||||
+++ b/src/3rdparty/btparse/sym.c 2018-12-19 02:27:45.878263787 +0100
|
||||
@@ -110,6 +110,7 @@
|
||||
/*#include "bt_config.h"*/
|
||||
#include <stdio.h>
|
||||
|
|
|
|||
|
|
@ -27,4 +27,3 @@ desc_option_xmp="Support for reading PDF/XMP metadata"
|
|||
desc_option_yaz="Support for searching z39.50 databases"
|
||||
desc_option_cddb="Support for CDDB searches"
|
||||
desc_option_scanner="Support for adding scanned images to a collection"
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ Subject: [PATCH] Allow disabling gir
|
|||
|
||||
diff --git meson_options.txt meson_options.txt
|
||||
index cad97dd..5e99084 100644
|
||||
--- meson_options.txt
|
||||
+++ meson_options.txt
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -3,3 +3,8 @@ option(
|
||||
type: 'boolean', value: false,
|
||||
description: 'Build API reference (requires gtk-doc)'
|
||||
|
|
@ -23,8 +23,8 @@ index cad97dd..5e99084 100644
|
|||
+)
|
||||
diff --git tepl/meson.build tepl/meson.build
|
||||
index 226d913..b35dd3a 100644
|
||||
--- tepl/meson.build
|
||||
+++ tepl/meson.build
|
||||
--- a/tepl/meson.build
|
||||
+++ b/tepl/meson.build
|
||||
@@ -164,6 +164,8 @@ PKG_CONFIG.generate(tepl_lib,
|
||||
libraries: TEPL_PUBLIC_DEPS,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://wiki.gnome.org/Projects/Tepl"
|
||||
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
|
||||
checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63
|
||||
patch_args=-Np0
|
||||
|
||||
build_options="gir"
|
||||
build_options_default="gir"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- mdv/markdownviewer.py.orig
|
||||
+++ mdv/markdownviewer.py
|
||||
--- a/mdv/markdownviewer.py
|
||||
+++ b/mdv/markdownviewer.py
|
||||
@@ -129,6 +129,9 @@
|
||||
import io
|
||||
import os
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ license="BSD-3-Clause"
|
|||
homepage="https://github.com/axiros/terminal_markdown_viewer"
|
||||
distfiles="${homepage}/archive/${version}.tar.gz"
|
||||
checksum=58dbdf8c051a2d7f8c00e4dc13c655c335cbc2bc96851dd0388d73a21c4507b6
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/ccutil/ocrclass.h 2019-07-07 14:34:08.000000000 +0200
|
||||
+++ src/ccutil/ocrclass.h 2019-07-08 10:47:15.347415888 +0200
|
||||
--- a/src/ccutil/ocrclass.h 2019-07-07 14:34:08.000000000 +0200
|
||||
+++ b/src/ccutil/ocrclass.h 2019-07-08 10:47:15.347415888 +0200
|
||||
@@ -31,6 +31,9 @@
|
||||
#ifdef _WIN32
|
||||
#include <winsock2.h> // for timeval
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ distfiles="
|
|||
https://github.com/tesseract-ocr/tessdata/archive/${_tessdataver}.tar.gz>tessdata-${_tessdataver}.tar.gz"
|
||||
checksum="2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb
|
||||
38c637d3a1763f6c3d32e8f1d979f045668676ec5feb8ee1869ee77cedd31b08"
|
||||
patch_args=-Np0
|
||||
|
||||
build_options="openmp"
|
||||
build_options_default="openmp"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
This is backported from upstream as redefining the name like that breaks
|
||||
compilation on various modern toolchains. Remove if/when a new release is made.
|
||||
--- src/engine/main.cpp
|
||||
+++ src/engine/main.cpp
|
||||
--- a/src/engine/main.cpp
|
||||
+++ b/src/engine/main.cpp
|
||||
@@ -508,10 +508,10 @@ static void setgamma(int val)
|
||||
}
|
||||
|
||||
|
|
@ -16,8 +16,8 @@ compilation on various modern toolchains. Remove if/when a new release is made.
|
|||
setgamma(curgamma);
|
||||
});
|
||||
|
||||
--- src/shared/cube.h
|
||||
+++ src/shared/cube.h
|
||||
--- a/src/shared/cube.h
|
||||
+++ b/src/shared/cube.h
|
||||
@@ -3,19 +3,11 @@
|
||||
|
||||
#define _FILE_OFFSET_BITS 64
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ license="zlib"
|
|||
homepage="http://tesseract.gg/"
|
||||
distfiles="http://download.tuxfamily.org/tesseract/tesseract_2014_05_12_first_edition_linux.tar.xz"
|
||||
checksum=8d6e07dd154a40a3f593e52289335c036f06cf90a0ebc400c4650adb3395a0f4
|
||||
patch_args=-Np0
|
||||
|
||||
pre_build() {
|
||||
for dim in 16 32 48 64 128 256 512; do
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
tevent.h needs sys/types.h for pid_t
|
||||
|
||||
--- tevent.h 2018-07-12 05:51:30.000000000 +0000
|
||||
+++ tevent.h 2018-07-19 10:13:15.360128807 +0000
|
||||
--- a/tevent.h 2018-07-12 05:51:30.000000000 +0000
|
||||
+++ b/tevent.h 2018-07-19 10:13:15.360128807 +0000
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <stdint.h>
|
||||
#include <talloc.h>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://tevent.samba.org"
|
||||
distfiles="https://ftp.samba.org/pub/tevent/tevent-${version}.tar.gz"
|
||||
checksum=f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696
|
||||
patch_args=-Np0
|
||||
|
||||
export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Needed for __BEGIN_DECLS/__END_DECLS.
|
||||
|
||||
--- extern.h
|
||||
+++ extern.h
|
||||
--- a/extern.h
|
||||
+++ b/extern.h
|
||||
@@ -17,6 +17,8 @@
|
||||
#ifndef EXTERN_H
|
||||
#define EXTERN_H
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ license="ISC"
|
|||
homepage="http://mdocml.bsd.lv/texi2mdoc"
|
||||
distfiles="http://mdocml.bsd.lv/texi2mdoc/snapshots/${pkgname}-${version}.tgz"
|
||||
checksum=7a45fd87c27cc8970a18db9ddddb2f09f18b8dd5152bf0ca377c3a5e7d304bfe
|
||||
patch_args=-Np0
|
||||
|
||||
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
|
||||
makedepends+=" musl-legacy-compat"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ Date: Wed Mar 10 22:52:10 2021 +0100
|
|||
|
||||
diff --git crates/jsonrpc/src/client.rs crates/jsonrpc/src/client.rs
|
||||
index 7d71428..3245e24 100644
|
||||
--- crates/jsonrpc/src/client.rs
|
||||
+++ crates/jsonrpc/src/client.rs
|
||||
--- a/crates/jsonrpc/src/client.rs
|
||||
+++ b/crates/jsonrpc/src/client.rs
|
||||
@@ -7,7 +7,7 @@ use futures::{
|
||||
};
|
||||
use serde::Serialize;
|
||||
|
|
@ -37,8 +37,8 @@ index 7d71428..3245e24 100644
|
|||
}
|
||||
diff --git crates/jsonrpc/src/types.rs crates/jsonrpc/src/types.rs
|
||||
index 30036d1..c1a2dce 100644
|
||||
--- crates/jsonrpc/src/types.rs
|
||||
+++ crates/jsonrpc/src/types.rs
|
||||
--- a/crates/jsonrpc/src/types.rs
|
||||
+++ b/crates/jsonrpc/src/types.rs
|
||||
@@ -6,7 +6,7 @@ pub const PROTOCOL_VERSION: &str = "2.0";
|
||||
#[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)]
|
||||
#[serde(untagged)]
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ Date: Wed Mar 10 22:31:07 2021 +0100
|
|||
|
||||
diff --git salsa/src/revision.rs salsa/src/revision.rs
|
||||
index ca7bb10..a18b581 100644
|
||||
--- salsa/src/revision.rs
|
||||
+++ salsa/src/revision.rs
|
||||
--- a/salsa/src/revision.rs
|
||||
+++ b/salsa/src/revision.rs
|
||||
@@ -1,9 +1,9 @@
|
||||
-use std::num::NonZeroU64;
|
||||
-use std::sync::atomic::{AtomicU64, Ordering};
|
||||
|
|
@ -89,8 +89,8 @@ index ca7bb10..a18b581 100644
|
|||
}
|
||||
diff --git salsa/src/runtime.rs salsa/src/runtime.rs
|
||||
index 181a5ea..ada5fec 100644
|
||||
--- salsa/src/runtime.rs
|
||||
+++ salsa/src/runtime.rs
|
||||
--- a/salsa/src/runtime.rs
|
||||
+++ b/salsa/src/runtime.rs
|
||||
@@ -10,7 +10,7 @@ use parking_lot::{Mutex, RwLock};
|
||||
use rustc_hash::{FxHashMap, FxHasher};
|
||||
use smallvec::SmallVec;
|
||||
|
|
@ -137,8 +137,8 @@ index 181a5ea..ada5fec 100644
|
|||
#[derive(Clone, Debug)]
|
||||
diff --git Cargo.toml Cargo.toml
|
||||
index 0847f06..7c4bb9a 100644
|
||||
--- Cargo.toml
|
||||
+++ Cargo.toml
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -106,6 +106,9 @@ lalrpop = { version = "0.18", optional = true }
|
||||
[profile.release]
|
||||
lto = true
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz
|
|||
https://github.com/salsa-rs/salsa/archive/v0.13.2.tar.gz"
|
||||
checksum="04978b118b455607b5debd0a886f0728ca6c498289d2a0c60d8f83b316dc5ebc
|
||||
2e33e20d22692f6bcd4d638392b9c2cfb716bcd28998e809db0dd88be4f70a31"
|
||||
patch_args=-Np0
|
||||
|
||||
post_extract() {
|
||||
mv ../salsa-* salsa
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- libs/luajit/native/Makefile.in 2018-09-07 06:40:04.000000000 +1000
|
||||
+++ libs/luajit/native/Makefile.in.new 2020-06-07 16:10:40.445000000 +1000
|
||||
--- a/libs/luajit/native/Makefile.in 2018-09-07 06:40:04.000000000 +1000
|
||||
+++ b/libs/luajit/native/Makefile.in.new 2020-06-07 16:10:40.445000000 +1000
|
||||
@@ -154,6 +154,8 @@
|
||||
am__v_CC_1 =
|
||||
CCLD = $(CC)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Disables the use of freetype2-config. Does some weird stuff on
|
|||
i686, armv5tel, ppc*, etc. No harm caused by disabling it
|
||||
everywhere.
|
||||
|
||||
--- texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000
|
||||
+++ texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000
|
||||
--- a/texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000
|
||||
+++ b/texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000
|
||||
@@ -16432,10 +16432,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
@ -16,8 +16,8 @@ everywhere.
|
|||
FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
|
||||
FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
|
||||
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
|
||||
--- configure 2020-06-08 10:03:04.785000000 +1000
|
||||
+++ configure 2020-06-08 10:01:47.902000000 +1000
|
||||
--- a/configure 2020-06-08 10:03:04.785000000 +1000
|
||||
+++ b/configure 2020-06-08 10:01:47.902000000 +1000
|
||||
@@ -21471,10 +21471,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
@ -30,8 +30,8 @@ everywhere.
|
|||
FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
|
||||
FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
|
||||
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
|
||||
--- libs/gd/configure 2019-03-26 04:27:50.000000000 +1100
|
||||
+++ libs/gd/configure 2020-06-08 10:06:28.481000000 +1000
|
||||
--- a/libs/gd/configure 2019-03-26 04:27:50.000000000 +1100
|
||||
+++ b/libs/gd/configure 2020-06-08 10:06:28.481000000 +1000
|
||||
@@ -5933,10 +5933,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
@ -44,8 +44,8 @@ everywhere.
|
|||
FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
|
||||
FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
|
||||
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
|
||||
--- texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100
|
||||
+++ texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000
|
||||
--- a/texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100
|
||||
+++ b/texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000
|
||||
@@ -21794,10 +21794,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
@ -58,8 +58,8 @@ everywhere.
|
|||
FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
|
||||
FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
|
||||
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
|
||||
--- texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100
|
||||
+++ texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000
|
||||
--- a/texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100
|
||||
+++ b/texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000
|
||||
@@ -19055,10 +19055,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
@ -72,8 +72,8 @@ everywhere.
|
|||
FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
|
||||
FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
|
||||
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
|
||||
--- texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100
|
||||
+++ texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000
|
||||
--- a/texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100
|
||||
+++ b/texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000
|
||||
@@ -25346,10 +25346,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
@ -86,8 +86,8 @@ everywhere.
|
|||
FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
|
||||
FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
|
||||
elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
|
||||
--- texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100
|
||||
+++ texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000
|
||||
--- a/texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100
|
||||
+++ b/texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000
|
||||
@@ -15265,10 +15265,7 @@
|
||||
else
|
||||
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
The default progname really should be kpsewhich, and makes a test
|
||||
pass which otherwise fails.
|
||||
|
||||
--- texk/kpathsea/kpsewhich.c 2020-07-01 19:07:23.592000000 +1000
|
||||
+++ texk/kpathsea/kpsewhich.c 2020-07-01 19:07:33.999000000 +1000
|
||||
--- a/texk/kpathsea/kpsewhich.c 2020-07-01 19:07:23.592000000 +1000
|
||||
+++ b/texk/kpathsea/kpsewhich.c 2020-07-01 19:07:33.999000000 +1000
|
||||
@@ -60,7 +60,7 @@
|
||||
boolean must_exist = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ that segfaults).
|
|||
|
||||
Author: q66 <daniel@octaforge.org>
|
||||
|
||||
--- libs/luajit/configure
|
||||
+++ libs/luajit/configure
|
||||
--- a/libs/luajit/configure
|
||||
+++ b/libs/luajit/configure
|
||||
@@ -14243,7 +14243,7 @@ else
|
||||
fi
|
||||
if grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1; then :
|
||||
|
|
@ -28,8 +28,8 @@ Author: q66 <daniel@octaforge.org>
|
|||
fi
|
||||
if grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1; then :
|
||||
DASM_ARCH=ppc64
|
||||
--- libs/luajit/m4/lj-system.m4
|
||||
+++ libs/luajit/m4/lj-system.m4
|
||||
--- a/libs/luajit/m4/lj-system.m4
|
||||
+++ b/libs/luajit/m4/lj-system.m4
|
||||
@@ -52,7 +52,7 @@ AS_IF([grep 'LJ_LE' conftest.i >/dev/null 2>&1],
|
||||
[echo '-D ENDIAN_BE' >>dynasm_flags])
|
||||
AS_IF([grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1],
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Modifications:
|
|||
|
||||
Modified by fosslinux.
|
||||
|
||||
--- texk/texlive/linked_scripts/texlive/tlmgr.pl
|
||||
+++ texk/texlive/linked_scripts/texlive/tlmgr.pl
|
||||
--- a/texk/texlive/linked_scripts/texlive/tlmgr.pl
|
||||
+++ b/texk/texlive/linked_scripts/texlive/tlmgr.pl
|
||||
@@ -21,7 +21,7 @@
|
||||
$tlmgrversion = "$tlmgrrevision ($datrev)";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
kpsewhich TEXMFROOT is not the correct value to use in our setup.
|
||||
|
||||
--- texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:02.314074252 +1100
|
||||
+++ texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:53.365456336 +1100
|
||||
--- a/texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:02.314074252 +1100
|
||||
+++ b/texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:53.365456336 +1100
|
||||
@@ -19,7 +19,7 @@
|
||||
my $TEXMFROOT;
|
||||
BEGIN {
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078
|
|||
python_version=3
|
||||
# Virtual package cares only about year part of version
|
||||
provides="tex-${version%${version#????}}_1"
|
||||
patch_args=-Np0
|
||||
|
||||
if [ "$CROSS_BUILD" ] ; then
|
||||
# Tangle is required for cross compile
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git singleapp/qtlocalpeer.cpp singleapp/qtlocalpeer.cpp
|
||||
index 332b064..c7ce527 100644
|
||||
--- singleapp/qtlocalpeer.cpp
|
||||
+++ singleapp/qtlocalpeer.cpp
|
||||
--- a/singleapp/qtlocalpeer.cpp
|
||||
+++ b/singleapp/qtlocalpeer.cpp
|
||||
@@ -41,6 +41,7 @@
|
||||
|
||||
#include "qtlocalpeer.h"
|
||||
|
|
|
|||
|
|
@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
|
|||
homepage="http://www.xm1math.net/texmaker/index.html"
|
||||
distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
|
||||
checksum=1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#initially based on debian's patch: https://sources.debian.net/patches/texstudio/2.11.2+debian-1/
|
||||
#modification: in Settings menu: disable whole groupBox instead of all single elements
|
||||
--- src/configdialog.ui
|
||||
+++ src/configdialog.ui
|
||||
--- a/src/configdialog.ui
|
||||
+++ b/src/configdialog.ui
|
||||
@@ -485,6 +485,9 @@
|
||||
</item>
|
||||
<item>
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<string>Update</string>
|
||||
</property>
|
||||
|
||||
--- src/configmanager.cpp
|
||||
+++ src/configmanager.cpp
|
||||
--- a/src/configmanager.cpp
|
||||
+++ b/src/configmanager.cpp
|
||||
@@ -477,7 +477,7 @@
|
||||
registerOption("Thesaurus/Database", &thesaurus_database, "<dic not found>", &pseudoDialog->comboBoxThesaurusFileName);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Patches texstudio.desktop to add important keywords. It also removes the
|
||||
# useless categories and no longer needed encoding entry.
|
||||
|
||||
--- utilities/texstudio.desktop
|
||||
+++ utilities/texstudio.desktop
|
||||
--- a/utilities/texstudio.desktop
|
||||
+++ b/utilities/texstudio.desktop
|
||||
@@ -1,5 +1,5 @@
|
||||
[Desktop Entry]
|
||||
-Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- texstudio.pro
|
||||
+++ texstudio.pro
|
||||
--- a/texstudio.pro
|
||||
+++ b/texstudio.pro
|
||||
@@ -79,8 +79,8 @@
|
||||
uitools
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ homepage="https://texstudio.org/"
|
|||
changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt"
|
||||
distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz"
|
||||
checksum=7251f8e6f2b17395c428e9ff13bfc2c58e5f07ec09aae1036ab912dcf89f6fad
|
||||
patch_args=-Np0
|
||||
|
||||
build_options="phonon poppler"
|
||||
desc_option_phonon="build with phonon (=media support for pdf preview)"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/libtextosaurus/saurus/miscellaneous/textapplication.h 2018-11-27 07:50:39.000000000 +0100
|
||||
+++ src/libtextosaurus/saurus/miscellaneous/textapplication.h 2020-07-27 12:33:06.612447044 +0200
|
||||
--- a/src/libtextosaurus/saurus/miscellaneous/textapplication.h 2018-11-27 07:50:39.000000000 +0100
|
||||
+++ b/src/libtextosaurus/saurus/miscellaneous/textapplication.h 2020-07-27 12:33:06.612447044 +0200
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "definitions/definitions.h"
|
||||
#include "saurus/miscellaneous/textapplicationsettings.h"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ distfiles="${homepage}/archive/${version}.tar.gz
|
|||
https://github.com/martinrotter/scintilla/archive/${_scommit}.tar.gz"
|
||||
checksum="82093b6c8725d104498ce4a66e4cf5a3aa1f057b34600bd5d67413dce9bff2cf
|
||||
fad739e3493dea0f7435114ac936dc255d3b1471bd61c7e7349845ab626b95d9"
|
||||
patch_args=-Np0
|
||||
|
||||
post_extract() {
|
||||
cp -Trp ${XBPS_BUILDDIR}/scintilla-${_scommit} ${wrksrc}/src/libtextosaurus/3rd-party/scintilla
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- modules/QtPDF/CMake/Modules/FindPoppler.cmake.orig 2017-04-29 18:23:51.000000000 +0200
|
||||
+++ modules/QtPDF/CMake/Modules/FindPoppler.cmake 2018-08-29 09:13:02.788284947 +0200
|
||||
--- a/modules/QtPDF/CMake/Modules/FindPoppler.cmake 2017-04-29 18:23:51.000000000 +0200
|
||||
+++ b/modules/QtPDF/CMake/Modules/FindPoppler.cmake 2018-08-29 09:13:02.788284947 +0200
|
||||
@@ -69,15 +69,7 @@
|
||||
MESSAGE(STATUS "Could not find libpoppler." )
|
||||
ENDIF ()
|
||||
|
|
@ -17,8 +17,8 @@
|
|||
|
||||
|
||||
FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h
|
||||
--- CMakeLists.txt.orig 2017-04-29 18:23:51.000000000 +0200
|
||||
+++ CMakeLists.txt 2018-08-29 10:49:36.290088209 +0200
|
||||
--- a/CMakeLists.txt 2017-04-29 18:23:51.000000000 +0200
|
||||
+++ b/CMakeLists.txt 2018-08-29 10:49:36.290088209 +0200
|
||||
@@ -91,7 +91,6 @@
|
||||
SET(TeXworks_VERSION ${TeXworks_VER_MAJOR}.${TeXworks_VER_MINOR}.${TeXworks_VER_PATCH})
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ Subject: [PATCH] <QtPDF> Fix compilation with Qt 5.15
|
|||
|
||||
diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp
|
||||
index 0305d87a..500d20aa 100644
|
||||
--- modules/QtPDF/src/PDFBackend.cpp
|
||||
+++ modules/QtPDF/src/PDFBackend.cpp
|
||||
--- a/modules/QtPDF/src/PDFBackend.cpp
|
||||
+++ b/modules/QtPDF/src/PDFBackend.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
#include <PDFBackend.h>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://www.tug.org/texworks"
|
||||
distfiles="https://github.com/texworks/texworks/archive/release-${version}.tar.gz"
|
||||
checksum=b4695539b9666935d2c467cc618c7d79c174e2ec728e31f72df8534862a5c290
|
||||
patch_args=-Np0
|
||||
|
||||
do_check() {
|
||||
: # requires xserver
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
The definition of __WORDSIZE is found in <sys/reg.h>
|
||||
|
||||
--- usr/iscsi/iscsid.h 2015-11-03 04:58:36.000000000 +0100
|
||||
+++ usr/iscsi/iscsid.h 2015-11-04 16:23:25.029877334 +0100
|
||||
--- a/usr/iscsi/iscsid.h 2015-11-03 04:58:36.000000000 +0100
|
||||
+++ b/usr/iscsi/iscsid.h 2015-11-04 16:23:25.029877334 +0100
|
||||
@@ -22,6 +22,9 @@
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
|
|
@ -12,8 +12,8 @@ The definition of __WORDSIZE is found in <sys/reg.h>
|
|||
|
||||
#include "transport.h"
|
||||
#include "list.h"
|
||||
--- usr/tgtd.h 2015-11-04 16:25:05.435884573 +0100
|
||||
+++ usr/tgtd.h 2015-11-04 16:25:52.415887960 +0100
|
||||
--- a/usr/tgtd.h 2015-11-04 16:25:05.435884573 +0100
|
||||
+++ b/usr/tgtd.h 2015-11-04 16:25:52.415887960 +0100
|
||||
@@ -2,6 +2,9 @@
|
||||
#ifndef __TARGET_DAEMON_H
|
||||
#define __TARGET_DAEMON_H
|
||||
|
|
@ -24,8 +24,8 @@ The definition of __WORDSIZE is found in <sys/reg.h>
|
|||
#include "log.h"
|
||||
#include "scsi_cmnd.h"
|
||||
#include "tgtadm_error.h"
|
||||
--- usr/util.h 2015-11-04 16:26:22.262890112 +0100
|
||||
+++ usr/util.h 2015-11-04 16:27:01.364892931 +0100
|
||||
--- a/usr/util.h 2015-11-04 16:26:22.262890112 +0100
|
||||
+++ b/usr/util.h 2015-11-04 16:27:01.364892931 +0100
|
||||
@@ -16,6 +16,9 @@
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ license="GPL-2.0-only"
|
|||
homepage="http://stgt.sourceforge.net/"
|
||||
distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
|
||||
checksum=e2255482f1a2797c115a6d545c37428b10a4ba6276a2af787da5378fa4e34e75
|
||||
patch_args=-Np0
|
||||
|
||||
post_extract() {
|
||||
sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,8 +5,6 @@ SET (TL_PROJECT_VERS 2.0.3)
|
||||
|
||||
PROJECT (${TL_PROJECT_NAME} CXX C)
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ license="BSD"
|
|||
homepage="https://gahr.ch/thingylaunch/"
|
||||
distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz"
|
||||
checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60
|
||||
patch_args=-Np0
|
||||
|
||||
post_install() {
|
||||
vlicense COPYRIGHT
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
|
|||
imported patch decoder_workaround.patch
|
||||
|
||||
diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
|
||||
--- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
--- a/image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ b/image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -422,6 +422,9 @@
|
||||
MOZ_ASSERT(mSwizzleFn);
|
||||
uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
|
||||
|
|
@ -23,8 +23,8 @@ diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
|
|||
|
||||
LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
|
||||
diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
|
||||
--- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
--- a/image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ b/image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -263,6 +263,9 @@
|
||||
case JCS_YCbCr:
|
||||
// By default, we will output directly to BGRA. If we need to apply
|
||||
|
|
@ -44,8 +44,8 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
|
|||
case JCS_CMYK:
|
||||
case JCS_YCCK:
|
||||
diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
|
||||
--- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
--- a/image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ b/image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -361,7 +361,7 @@
|
||||
IResumable* aOnResume) {
|
||||
MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
|
||||
|
|
@ -71,8 +71,8 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
|
|||
|
||||
LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
|
||||
diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
|
||||
--- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
--- a/image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100
|
||||
+++ b/image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100
|
||||
@@ -237,7 +237,12 @@
|
||||
// WebP doesn't guarantee that the alpha generated matches the hint in the
|
||||
// header, so we always need to claim the input is BGRA. If the output is
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- media/libopus/silk/arm/arm_silk_map.c.orig 2019-03-19 20:55:01.249609964 +0100
|
||||
+++ media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100
|
||||
--- a/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:01.249609964 +0100
|
||||
+++ b/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100
|
||||
@@ -28,7 +28,7 @@
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ overwrite HOST_* flags to get rid of -MF
|
|||
|
||||
note: this patch was used from firefox-77 until 80, dropped with the update to 81
|
||||
|
||||
--- third_party/rust/glslopt/build.rs
|
||||
+++ third_party/rust/glslopt/build.rs
|
||||
--- a/third_party/rust/glslopt/build.rs
|
||||
+++ b/third_party/rust/glslopt/build.rs
|
||||
@@ -28,6 +28,8 @@
|
||||
env::remove_var(format!("CXXFLAGS_{}", &target));
|
||||
env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- taskcluster/docker/firefox-snap/firefox.desktop.orig 2019-01-18 19:31:39.428839442 +0100
|
||||
+++ taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100
|
||||
--- a/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:31:39.428839442 +0100
|
||||
+++ b/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100
|
||||
@@ -154,7 +154,7 @@
|
||||
Terminal=false
|
||||
X-MultipleArgs=false
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
|
||||
+++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
|
||||
--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
|
||||
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
|
||||
@@ -27,8 +27,5 @@
|
||||
typedef int16_t int16;
|
||||
typedef unsigned short ushort;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200
|
||||
+++ mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100
|
||||
--- a/mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200
|
||||
+++ b/mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100
|
||||
@@ -41,7 +41,7 @@
|
||||
#define MOZ_STACKWALK_SUPPORTS_MACOSX 0
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
|
||||
handle big-endian formats in Cairo format conversions
|
||||
|
||||
--- gfx/2d/HelpersCairo.h
|
||||
+++ gfx/2d/HelpersCairo.h
|
||||
--- a/gfx/2d/HelpersCairo.h
|
||||
+++ b/gfx/2d/HelpersCairo.h
|
||||
@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
|
||||
case SurfaceFormat::R5G6B5_UINT16:
|
||||
return CAIRO_FORMAT_RGB16_565;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100
|
||||
+++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100
|
||||
--- a/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:09:40.980448579 +0100
|
||||
+++ b/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100
|
||||
@@ -497,8 +501,10 @@
|
||||
ucontext_t sSyncUContext;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- js/src/wasm/WasmSignalHandlers.cpp
|
||||
+++ js/src/wasm/WasmSignalHandlers.cpp
|
||||
--- a/js/src/wasm/WasmSignalHandlers.cpp
|
||||
+++ b/js/src/wasm/WasmSignalHandlers.cpp
|
||||
@@ -243,9 +243,9 @@
|
||||
// If you run into compile problems on a tier-3 platform, you can disable the
|
||||
// emulation here.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2019-01-29 11:20:52.298793223 +0100
|
||||
+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100
|
||||
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:20:52.298793223 +0100
|
||||
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100
|
||||
@@ -14,7 +14,7 @@
|
||||
#ifndef __GLIBC_PREREQ
|
||||
#define __GLIBC_PREREQ(a, b) 0
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ Enable FLAC on platforms without ffvpx like powerpc*
|
|||
|
||||
diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
|
||||
index 53fc3c9937f7..b23771ab80fa 100644
|
||||
--- dom/media/flac/FlacDecoder.cpp
|
||||
+++ dom/media/flac/FlacDecoder.cpp
|
||||
--- a/dom/media/flac/FlacDecoder.cpp
|
||||
+++ b/dom/media/flac/FlacDecoder.cpp
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "FlacDecoder.h"
|
||||
#include "MediaContainerType.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- xpcom/base/nsMemoryReporterManager.cpp.orig 2019-03-19 17:12:20.844810044 +0100
|
||||
+++ xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100
|
||||
--- a/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:12:20.844810044 +0100
|
||||
+++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100
|
||||
@@ -123,6 +123,7 @@
|
||||
return GetProcSelfSmapsPrivate(aN);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
|
||||
+++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
|
||||
--- a/build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
|
||||
+++ b/build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
|
||||
@@ -297,11 +297,20 @@
|
||||
suffix = 'hf'
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
|
|||
Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
|
||||
Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
|
||||
|
||||
--- xpcom/reflect/xptcall/xptcall.h
|
||||
+++ xpcom/reflect/xptcall/xptcall.h
|
||||
--- a/xpcom/reflect/xptcall/xptcall.h
|
||||
+++ b/xpcom/reflect/xptcall/xptcall.h
|
||||
@@ -71,6 +71,11 @@ struct nsXPTCVariant {
|
||||
ExtendedVal ext;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Mozilla rustc check does not support crossbuild: let's remove it
|
||||
Remove calls to unwrap_rustup, they fail if rustup isn't present
|
||||
|
||||
--- build/moz.configure/rust.configure.orig 2019-10-17 04:19:59.000000000 +0700
|
||||
+++ build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700
|
||||
--- a/build/moz.configure/rust.configure 2019-10-17 04:19:59.000000000 +0700
|
||||
+++ b/build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700
|
||||
@@ -78,9 +78,6 @@
|
||||
|
||||
return unwrap
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
The configure check fails for cross builds.
|
||||
i128 is supported since rust-1.26, so it is safe for us to assume it is always present
|
||||
|
||||
--- third_party/rust/num-traits/build.rs.orig 2020-02-14 23:57:25.985355610 +0100
|
||||
+++ third_party/rust/num-traits/build.rs 2020-02-14 23:58:36.255710188 +0100
|
||||
--- a/third_party/rust/num-traits/build.rs 2020-02-14 23:57:25.985355610 +0100
|
||||
+++ b/third_party/rust/num-traits/build.rs 2020-02-14 23:58:36.255710188 +0100
|
||||
@@ -1,14 +1,5 @@
|
||||
-extern crate autocfg;
|
||||
-
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
make SYS_fork non-fatal, musl uses it for fork(2)
|
||||
|
||||
--- security/sandbox/linux/SandboxFilter.cpp
|
||||
+++ security/sandbox/linux/SandboxFilter.cpp
|
||||
--- a/security/sandbox/linux/SandboxFilter.cpp
|
||||
+++ b/security/sandbox/linux/SandboxFilter.cpp
|
||||
@@ -1253,6 +1253,8 @@
|
||||
// usually do something reasonable on error.
|
||||
case __NR_clone:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100
|
||||
+++ security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100
|
||||
--- a/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100
|
||||
+++ b/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100
|
||||
@@ -68,7 +68,13 @@
|
||||
|
||||
// The headers define O_LARGEFILE as 0 on x86_64, but we need the
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
|
||||
https://bugzilla.mozilla.org/attachment.cgi?id=9028600
|
||||
|
||||
--- gfx/skia/skia/third_party/skcms/skcms.cc
|
||||
+++ gfx/skia/skia/third_party/skcms/skcms.cc
|
||||
--- a/gfx/skia/skia/third_party/skcms/skcms.cc
|
||||
+++ b/gfx/skia/skia/third_party/skcms/skcms.cc
|
||||
@@ -30,6 +30,8 @@
|
||||
#include <avx512fintrin.h>
|
||||
#include <avx512dqintrin.h>
|
||||
|
|
@ -45,8 +45,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600
|
|||
#endif
|
||||
}
|
||||
|
||||
--- gfx/2d/DrawTargetSkia.cpp
|
||||
+++ gfx/2d/DrawTargetSkia.cpp
|
||||
--- a/gfx/2d/DrawTargetSkia.cpp
|
||||
+++ b/gfx/2d/DrawTargetSkia.cpp
|
||||
@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
|
||||
return surfaceBounds.Intersect(bounds);
|
||||
}
|
||||
|
|
@ -57,8 +57,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600
|
|||
|
||||
static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
|
||||
const int32_t aStride, SurfaceFormat aFormat) {
|
||||
--- gfx/2d/Types.h
|
||||
+++ gfx/2d/Types.h
|
||||
--- a/gfx/2d/Types.h
|
||||
+++ b/gfx/2d/Types.h
|
||||
@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
|
||||
// The following values are endian-independent synonyms. The _UINT32 suffix
|
||||
// indicates that the name reflects the layout when viewed as a uint32_t
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text
|
|||
right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
|
||||
|
||||
diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
|
||||
--- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200
|
||||
+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200
|
||||
--- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200
|
||||
+++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200
|
||||
@@ -238,7 +238,18 @@
|
||||
AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
|
||||
AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
|
||||
|
|
@ -26,8 +26,8 @@ diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
|
|||
AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
|
||||
|
||||
diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
|
||||
--- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200
|
||||
+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200
|
||||
--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200
|
||||
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200
|
||||
@@ -203,7 +203,13 @@
|
||||
// ~~~>
|
||||
// a = 1*aa + d(1-1*aa) = aa + d(1-aa)
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ Solution: This is not a real solution, but a hack. The real solution would have
|
|||
Side-effects: I have not yet found an unwanted side-effect.
|
||||
|
||||
diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
|
||||
--- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200
|
||||
+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100
|
||||
--- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200
|
||||
+++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100
|
||||
@@ -1861,6 +1861,14 @@
|
||||
SkCanvas::kPreserveLCDText_SaveLayerFlag |
|
||||
(aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
|
||||
|
|
@ -30,8 +30,8 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
|
|||
mCanvas->saveLayer(saveRec);
|
||||
|
||||
SetPermitSubpixelAA(aOpaque);
|
||||
--- gfx/layers/composite/CompositableHost.cpp
|
||||
+++ gfx/layers/composite/CompositableHost.cpp
|
||||
--- a/gfx/layers/composite/CompositableHost.cpp
|
||||
+++ b/gfx/layers/composite/CompositableHost.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "ImageHost.h" // for ImageHostBuffered, etc
|
||||
#include "Layers.h"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- old-configure.in.orig
|
||||
+++ old-configure.in
|
||||
--- a/old-configure.in
|
||||
+++ b/old-configure.in
|
||||
@@ -2818,6 +2818,22 @@
|
||||
_NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
|
||||
fi
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = Maintainer debug option (no --enable equivalent)
|
||||
--- media/libcubeb/src/moz.build.orig
|
||||
+++ media/libcubeb/src/moz.build
|
||||
--- a/media/libcubeb/src/moz.build
|
||||
+++ b/media/libcubeb/src/moz.build
|
||||
@@ -44,11 +44,13 @@
|
||||
]
|
||||
DEFINES['USE_JACK'] = True
|
||||
|
|
@ -40,8 +40,8 @@
|
|||
DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'Darwin':
|
||||
--- build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200
|
||||
+++ - 2020-06-30 12:18:26.027756310 +0200
|
||||
--- a/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200
|
||||
+++ b/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200
|
||||
@@ -210,6 +210,7 @@
|
||||
@old_configure_options(
|
||||
'--cache-file',
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
|
|||
homepage="https://www.thunderbird.net/"
|
||||
distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
|
||||
checksum=ad070eb27ed5087819b62495e8f96ec0c8d8827598c415648c69ef989c634676
|
||||
patch_args=-Np0
|
||||
|
||||
lib32disabled=yes
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/libetm-0.5.0/tcp_socket.c 2020-01-09 10:49:20.000000000 +0100
|
||||
+++ src/libetm-0.5.0/tcp_socket.c.new 2020-06-04 08:57:53.532982208 +0200
|
||||
--- a/src/libetm-0.5.0/tcp_socket.c 2020-01-09 10:49:20.000000000 +0100
|
||||
+++ b/src/libetm-0.5.0/tcp_socket.c.new 2020-06-04 08:57:53.532982208 +0200
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
|
|||
homepage="https://www.open-tickr.net/"
|
||||
distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz"
|
||||
checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802
|
||||
patch_args=-Np0
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- CMakeLists.txt 2015-11-23 16:07:04.000000000 +0100
|
||||
+++ CMakeLists.txt 2015-11-25 09:59:50.944941514 +0100
|
||||
--- a/CMakeLists.txt 2015-11-23 16:07:04.000000000 +0100
|
||||
+++ b/CMakeLists.txt 2015-11-25 09:59:50.944941514 +0100
|
||||
@@ -238,7 +238,7 @@
|
||||
# run built EXE to generate xml output
|
||||
add_custom_command(
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ license="W3C"
|
|||
homepage="http://www.htacg.org/${_reponame}/"
|
||||
distfiles="https://github.com/htacg/${_reponame}/archive/${version}.tar.gz"
|
||||
checksum=5caa2c769204f506e24ea4986a45abe23f71d14f0fe968314f20065f342ffdba
|
||||
patch_args=-Np0
|
||||
|
||||
provides="tidy-${version}_${revision}"
|
||||
replaces="tidy>0"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- src/Makefile.am.orig
|
||||
+++ src/Makefile.am
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -9,16 +9,16 @@
|
||||
tilp_CPPFLAGS = -I$(top_srcdir)/intl \
|
||||
@TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
tilp_SOURCES = *.h \
|
||||
tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \
|
||||
tilp_files.c tilp_gif.c tilp_main.c \
|
||||
--- configure.ac.orig
|
||||
+++ configure.ac
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -118,22 +118,23 @@
|
||||
CFLAGS="$CFLAGS $ARCH"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
|
|||
homepage="https://www.ticalc.org"
|
||||
distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2"
|
||||
checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
|
||||
patch_args=-Np0
|
||||
|
||||
pre_configure() {
|
||||
mkdir -p m4
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ Index: tinyxml.cpp
|
|||
RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v
|
||||
retrieving revision 1.105
|
||||
diff -u -r1.105 tinyxml.cpp
|
||||
--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
|
||||
+++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000
|
||||
--- a/tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105
|
||||
+++ b/tinyxml.cpp 19 Jul 2010 21:24:16 -0000
|
||||
@@ -57,30 +57,7 @@
|
||||
{
|
||||
unsigned char c = (unsigned char) str[i];
|
||||
|
|
@ -42,8 +42,8 @@ Index: xmltest.cpp
|
|||
RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v
|
||||
retrieving revision 1.89
|
||||
diff -u -r1.89 xmltest.cpp
|
||||
--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
|
||||
+++ xmltest.cpp 19 Jul 2010 21:24:16 -0000
|
||||
--- a/xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89
|
||||
+++ b/xmltest.cpp 19 Jul 2010 21:24:16 -0000
|
||||
@@ -1340,6 +1340,16 @@
|
||||
}*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- tinyxml.h~ 2007-11-30 22:39:36.000000000 +0100
|
||||
+++ tinyxml.h 2007-11-30 22:39:36.000000000 +0100
|
||||
--- a/tinyxml.h~ 2007-11-30 22:39:36.000000000 +0100
|
||||
+++ b/tinyxml.h 2007-11-30 22:39:36.000000000 +0100
|
||||
@@ -26,6 +26,8 @@ distribution.
|
||||
#ifndef TINYXML_INCLUDED
|
||||
#define TINYXML_INCLUDED
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ homepage="http://www.grinninglizard.com/tinyxml/"
|
|||
license="zlib"
|
||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_2_6_2.tar.gz"
|
||||
checksum=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593
|
||||
patch_args=-Np0
|
||||
|
||||
do_build() {
|
||||
# Fix Makefile
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||
endif()
|
||||
else(CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ license="Apache-2.0, BSD-3-Clause"
|
|||
homepage="https://github.com/trendmicro/tlsh"
|
||||
distfiles="https://github.com/trendmicro/tlsh/archive/${version}.tar.gz"
|
||||
checksum=a8a7972d8bafb5fd66bd597b72037356dd9882e71a7e9b5f37281751a99ce686
|
||||
patch_args=-Np0
|
||||
|
||||
pre_configure() {
|
||||
vsed -i src/CMakeLists.txt -e 's/set(TLSH_SHARED_LIBRARY 0)/set(TLSH_SHARED_LIBRARY 1)/'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git src/readdir.cc src/readdir.cc
|
||||
index 9b31232..94000bc 100644
|
||||
--- src/readdir.cc
|
||||
+++ src/readdir.cc
|
||||
--- a/src/readdir.cc
|
||||
+++ b/src/readdir.cc
|
||||
@@ -13,7 +13,7 @@ int tmfs_readdir(const char * path, void * buf, fuse_fill_dir_t filler_cb, off_t
|
||||
struct stat stbuf;
|
||||
|
||||
|
|
|
|||
|
|
@ -14,4 +14,3 @@ checksum="897ad09e21ddd8e912dc1baba4466d8a65a09b3abdeb31e4640c2d770915f2f4"
|
|||
post_install() {
|
||||
vlicense LICENSE
|
||||
}
|
||||
patch_args=-Np0
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue