Dirk Mueller
44bc099863
- Refresh patches and remove the visibility patch that I upstreamed few releases ago in a different form. OBS-URL: https://build.opensuse.org/request/show/161841 OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=75
46 lines
1.1 KiB
Plaintext
46 lines
1.1 KiB
Plaintext
Index: doc/Makefile.am
|
|
===================================================================
|
|
--- doc/Makefile.am.orig
|
|
+++ doc/Makefile.am
|
|
@@ -5,7 +5,8 @@ else
|
|
man_MAGIC = magic.4
|
|
endif
|
|
fsect = @fsect@
|
|
-man_MANS = file.1 $(man_MAGIC) libmagic.3
|
|
+#man_MANS = file.1 $(man_MAGIC) libmagic.3
|
|
+man_MANS = file.1 magic.5 libmagic.3
|
|
|
|
EXTRA_DIST = file.man magic.man libmagic.man
|
|
CLEANFILES = $(man_MANS)
|
|
@@ -17,7 +18,8 @@ file.1: Makefile file.man
|
|
-e s@__VERSION__@${VERSION}@g \
|
|
-e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man > $@
|
|
|
|
-magic.${fsect}: Makefile magic.man
|
|
+#magic.${fsect}: Makefile magic.man
|
|
+magic.5: Makefile magic.man
|
|
@rm -f $@
|
|
sed -e s@__CSECTION__@1@g \
|
|
-e s@__FSECTION__@${fsect}@g \
|
|
Index: src/readelf.h
|
|
===================================================================
|
|
--- src/readelf.h.orig
|
|
+++ src/readelf.h
|
|
@@ -34,7 +34,10 @@
|
|
#ifndef __fake_elf_h__
|
|
#define __fake_elf_h__
|
|
|
|
+#include <features.h>
|
|
+
|
|
#if HAVE_STDINT_H
|
|
+__BEGIN_DECLS
|
|
#include <stdint.h>
|
|
#endif
|
|
|
|
@@ -322,4 +325,5 @@ typedef struct {
|
|
#define AV_386_SSE4_1 0x00800000
|
|
#define AV_386_SSE4_2 0x01000000
|
|
|
|
+__END_DECLS
|
|
#endif
|