1 files changed, 45 insertions, 0 deletions
diff --git a/giflib/giflib-5.2.2-upstream_fixes-1.patch b/giflib/giflib-5.2.2-upstream_fixes-1.patch
new file mode 100644
index 0000000..798d8b6
--- /dev/null
+++ b/giflib/giflib-5.2.2-upstream_fixes-1.patch
@@ -0,0 +1,45 @@
+Submitted By:            Douglas R. Reno <renodr at linuxfromscratch dot org>
+Date:                    2024-03-02
+Initial Package Version: 5.2.2
+Origin:                  Upstream (thanks to Joe Locash for the pointer)
+Upstream Status:         Applied
+Description:             Prevents giflib from installing XML files into
+                         /usr/share/man/man1 instead of manual pages.
+diff -Naurp giflib-5.2.2.orig/Makefile giflib-5.2.2/Makefile
+--- giflib-5.2.2.orig/Makefile  2024-03-02 12:53:46.244595714 -0600
+++ giflib-5.2.2/Makefile       2024-03-02 12:55:35.428874223 -0600
+@@ -63,15 +63,19 @@ UTILS = $(INSTALLABLE) \
+ 
+ LDLIBS=libgif.a -lm
+ 
+-MANUAL_PAGES = \
+MANUAL_PAGES_1 = \
+        doc/gif2rgb.xml \
+        doc/gifbuild.xml \
+        doc/gifclrmp.xml \
+        doc/giffix.xml \
+-       doc/giflib.xml \
+        doc/giftext.xml \
+        doc/giftool.xml
+ 
+MANUAL_PAGES_7 = \
+       doc/giflib.xml
+
+MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
+
+ SOEXTENSION    = so
+ LIBGIFSO       = libgif.$(SOEXTENSION)
+ LIBGIFSOMAJOR  = libgif.$(SOEXTENSION).$(LIBMAJOR)
+@@ -148,8 +152,9 @@ install-lib:
+        ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
+        ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
+ install-man:
+-       $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
+-       $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
+       $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
+       $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
+       $(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
+ uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
+ uninstall-bin:
+        cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)

diff --git a/giflib/giflib-5.2.2-upstream_fixes-1.patch b/giflib/giflib-5.2.2-upstream_fixes-1.patch new file mode 100644 index 0000000..798d8b6 --- /dev/null +++ b/giflib/giflib-5.2.2-upstream_fixes-1.patch
@@ -0,0 +1,45 @@
	1	Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org>
	2	Date: 2024-03-02
	3	Initial Package Version: 5.2.2
	4	Origin: Upstream (thanks to Joe Locash for the pointer)
	5	Upstream Status: Applied
	6	Description: Prevents giflib from installing XML files into
	7	/usr/share/man/man1 instead of manual pages.
	8
	9	diff -Naurp giflib-5.2.2.orig/Makefile giflib-5.2.2/Makefile
	10	--- giflib-5.2.2.orig/Makefile 2024-03-02 12:53:46.244595714 -0600
	11	+++ giflib-5.2.2/Makefile 2024-03-02 12:55:35.428874223 -0600
	12	@@ -63,15 +63,19 @@ UTILS = $(INSTALLABLE) \
	13
	14	LDLIBS=libgif.a -lm
	15
	16	-MANUAL_PAGES = \
	17	+MANUAL_PAGES_1 = \
	18	doc/gif2rgb.xml \
	19	doc/gifbuild.xml \
	20	doc/gifclrmp.xml \
	21	doc/giffix.xml \
	22	- doc/giflib.xml \
	23	doc/giftext.xml \
	24	doc/giftool.xml
	25
	26	+MANUAL_PAGES_7 = \
	27	+ doc/giflib.xml
	28	+
	29	+MANUAL_PAGES = $(MANUAL_PAGES_1) $(MANUAL_PAGES_7)
	30	+
	31	SOEXTENSION = so
	32	LIBGIFSO = libgif.$(SOEXTENSION)
	33	LIBGIFSOMAJOR = libgif.$(SOEXTENSION).$(LIBMAJOR)
	34	@@ -148,8 +152,9 @@ install-lib:
	35	ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)"
	36	ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)"
	37	install-man:
	38	- $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1"
	39	- $(INSTALL) -m 644 $(MANUAL_PAGES) "$(DESTDIR)$(MANDIR)/man1"
	40	+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7"
	41	+ $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1"
	42	+ $(INSTALL) -m 644 $(MANUAL_PAGES_7:xml=7) "$(DESTDIR)$(MANDIR)/man7"
	43	uninstall: uninstall-man uninstall-include uninstall-lib uninstall-bin
	44	uninstall-bin:
	45	cd "$(DESTDIR)$(BINDIR)" && rm -f $(INSTALLABLE)