Commit cf1917b1 authored by TBK's avatar TBK Committed by Ariadne Conill
Browse files

community/mrxvt: fix for -fno-common

Patches from Gentoo.

Fix gcc10 -fno-common

libpng patch related to http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt
parent 252cdc19
Pipeline #64741 failed with stages
in 1 minute and 54 seconds
......@@ -2,15 +2,18 @@
# Maintainer: Mark Constable <markc@renta.net>
pkgname=mrxvt
pkgver=0.5.4
pkgrel=8
pkgrel=9
pkgdesc="A multi-tabbed X terminal emulator based on rxvt code"
url="http://materm.sourceforge.net/wiki/pmwiki.php"
arch="all"
license="GPL-2.0-or-later"
options="!check" # no test suite
makedepends="libpng-dev libjpeg-turbo-dev libxft-dev libxpm-dev libx11-dev"
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/sourceforge/materm/mrxvt-$pkgver.tar.gz
mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch
mrxvt-0.5.4-libpng14.patch
mrxvt-0.5.4-fno-common.patch
musl-fix-includes.patch
mrxvt.desktop
"
......@@ -48,7 +51,10 @@ package() {
install -Dm644 ../mrxvt.desktop $pkgdir/usr/share/applications/mrxvt.desktop
}
sha512sums="572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 mrxvt-0.5.4.tar.gz
27d8a9775a5ea6e5e0e588d84ab5c76cc76aaa4ebeb473950e8f6b3dbf660a380c2d2385356ab9bd12d2e00b98c467f99f8e1aac16c91f8ffa4e29a38124340a mrxvt-0.5.4-002-fix-segfault-when-wd-empty.patch
a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495 mrxvt-0.5.4-libpng14.patch
1def1813c0db009534259d9319cac827d1dfb0aed3751cba9e1a56fe53ab5819a208f54f7eeef25da26302bf81ab4a43ffc7d9b47a0d60871baed6552bd505a8 mrxvt-0.5.4-fno-common.patch
4f2cf06484b1b364f7eb9f2acc629d2e600d4e614071fca5035d3654b083347f00162d2077496626fe4184dcac938b0b91f3ffe23f259b53ed475c4b8e85dbb0 musl-fix-includes.patch
04e0f2e93449d2656e55bdbdf6742d50c625c86ba8e64062e40f447a077b3a01f457ea855a99df39b4a099b30517d4a8cc45e91de6300023d0072ee76ae2b375 mrxvt.desktop"
--- a/src/rxvtlib.h
+++ b/src/rxvtlib.h
@@ -790,7 +790,7 @@ typedef struct {
} action_t;
/* Values for macro_t.type. Must sync this with macroNames from macros.c */
-enum {
+enum macroFnNames {
MacroFnDummy=0,
MacroFnEsc,
MacroFnStr,
@@ -820,7 +820,7 @@ enum {
MacroFnSaveConfig,
MacroFnToggleMacros,
NMACRO_FUNCS
-} macroFnNames;
+};
typedef unsigned char macro_priority_t;
typedef struct {
http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch
--- ./configure.ac
+++ ./configure.ac
@@ -952,7 +952,7 @@
if test "x$support_png" = "xyes"; then
AC_CHECK_LIB(
png,
- png_check_sig,
+ png_sig_cmp,
[],
[support_png=no],
[-lz -lm]
--- ./src/mpng.c
+++ ./src/mpng.c
@@ -83,7 +83,7 @@
display_depth = XDefaultDepth(display,XDefaultScreen(display));
fread(sig, 1, 8, ifile);
- if (!png_check_sig(sig, 8)){
+ if (png_sig_cmp(sig, 0, 8)){
fclose(ifile);
return -1;
}
@@ -113,7 +113,7 @@
if (png_depth < 8){
if (png_color_type == PNG_COLOR_TYPE_GRAY ){
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
png_row_bytes = png_width;
}else{
png_set_expand(png_ptr);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment