Apply upstream patch to fix C99 compatibility issue
Related to: <https://fedoraproject.org/wiki/Changes/PortingToModernC> <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
This commit is contained in:
parent
0422cadaa6
commit
895b14b241
20
libmatchbox-c99.patch
Normal file
20
libmatchbox-c99.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
Part of this upstream commit:
|
||||||
|
|
||||||
|
commit cb17f478bb102bc437976046ac9d39182aa758aa
|
||||||
|
Author: Ross Burton <ross.burton@intel.com>
|
||||||
|
Date: Mon Dec 10 11:33:32 2012 +0000
|
||||||
|
|
||||||
|
Remove some unused variables
|
||||||
|
|
||||||
|
diff --git a/libmb/mbpixbuf.c b/libmb/mbpixbuf.c
|
||||||
|
index 3811d0874b19fa47..f0da64b0a8aa221d 100644
|
||||||
|
--- a/libmb/mbpixbuf.c
|
||||||
|
+++ b/libmb/mbpixbuf.c
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
|
||||||
|
#include <strings.h>
|
||||||
|
#include "mbpixbuf.h"
|
||||||
|
+#include "mbutil.h"
|
||||||
|
|
||||||
|
#define BYTE_ORD_24_RGB 0
|
||||||
|
#define BYTE_ORD_24_RBG 1
|
@ -1,12 +1,13 @@
|
|||||||
Summary: Libraries for the Matchbox Desktop
|
Summary: Libraries for the Matchbox Desktop
|
||||||
Name: libmatchbox
|
Name: libmatchbox
|
||||||
Version: 1.9
|
Version: 1.9
|
||||||
Release: 32%{?dist}
|
Release: 33%{?dist}
|
||||||
Url: http://projects.o-hand.com/matchbox/
|
Url: http://projects.o-hand.com/matchbox/
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Source: http://projects.o-hand.com/matchbox/sources/libmatchbox/%{version}/%{name}-%{version}.tar.bz2
|
Source: http://projects.o-hand.com/matchbox/sources/libmatchbox/%{version}/%{name}-%{version}.tar.bz2
|
||||||
Patch0: libmatchbox-1.9-add-needed.patch
|
Patch0: libmatchbox-1.9-add-needed.patch
|
||||||
Patch1: libmatchbox-1.9-libpng.patch
|
Patch1: libmatchbox-1.9-libpng.patch
|
||||||
|
Patch2: libmatchbox-c99.patch
|
||||||
BuildRequires: pango-devel
|
BuildRequires: pango-devel
|
||||||
BuildRequires: libpng-devel
|
BuildRequires: libpng-devel
|
||||||
BuildRequires: libjpeg-devel
|
BuildRequires: libjpeg-devel
|
||||||
@ -35,6 +36,7 @@ Static libraries and header files from %{name}
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .add-needed
|
%patch0 -p1 -b .add-needed
|
||||||
%patch1 -p1 -b .libpng
|
%patch1 -p1 -b .libpng
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -v --install
|
autoreconf -v --install
|
||||||
@ -62,6 +64,9 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
|
|||||||
%{_includedir}/libmb/*.h
|
%{_includedir}/libmb/*.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Apr 13 2023 Florian Weimer <fweimer@redhat.com> - 1.9-33
|
||||||
|
- Apply upstream patch to fix C99 compatibility issue
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-32
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-32
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user