| 1 |
commit: 3a61a87fb0377487cae6802751ec18e0629fdc40 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Sat Jan 21 11:36:35 2023 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 01:13:35 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a61a87f |
| 7 |
|
| 8 |
media-gfx/tuxpaint: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/29203 |
| 12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 13 |
|
| 14 |
.../tuxpaint/files/tuxpaint-0.9.28-Makefile.patch | 158 --------------------- |
| 15 |
1 file changed, 158 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index f5a0ac3b76bb..000000000000 |
| 20 |
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,158 +0,0 @@ |
| 23 |
---- a/Makefile |
| 24 |
-+++ b/Makefile |
| 25 |
-@@ -73,7 +73,7 @@ endif |
| 26 |
- # <HOSTROOT> is the directory containing support files for building for <HOST>: |
| 27 |
- # <HOSTROOT>/include Header files. |
| 28 |
- # <HOSTROOT>/lib Library files. |
| 29 |
--# <HOSTROOT>/lib/pkgconfig *.pc files. |
| 30 |
-+# <HOSTROOT>/pkgconfig *.pc files. |
| 31 |
- # |
| 32 |
- ifdef HOST |
| 33 |
- ifdef HOSTROOT |
| 34 |
-@@ -104,7 +104,7 @@ ifdef HOST |
| 35 |
- # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to |
| 36 |
- # *change* where pkg-config looks for .pc files instead of adding to the |
| 37 |
- # default path which may have libraries that aren't for HOST. |
| 38 |
-- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig |
| 39 |
-+ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig |
| 40 |
- endif |
| 41 |
- endif |
| 42 |
- |
| 43 |
-@@ -170,14 +170,14 @@ windows_ARCH_CFLAGS:= |
| 44 |
- macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR |
| 45 |
- ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY |
| 46 |
- beos_ARCH_CFLAGS:= |
| 47 |
--linux_ARCH_CFLAGS:= |
| 48 |
-+linux_ARCH_CFLAGS:=${CFLAGS} |
| 49 |
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS) |
| 50 |
- |
| 51 |
- windows_ARCH_LDFLAGS:= |
| 52 |
- macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) |
| 53 |
- ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) |
| 54 |
- beos_ARCH_LDFLAGS:= |
| 55 |
--linux_ARCH_LDFLAGS:= |
| 56 |
-+linux_ARCH_LDFLAGS:=${LDFLAGS} |
| 57 |
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS) |
| 58 |
- LDFLAGS:=$(ARCH_LDFLAGS) |
| 59 |
- |
| 60 |
-@@ -206,7 +206,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS) |
| 61 |
- windows_PREFIX:=/usr/local |
| 62 |
- macos_PREFIX:=Resources |
| 63 |
- ios_PREFIX:=. |
| 64 |
--linux_PREFIX:=/usr/local |
| 65 |
-+linux_PREFIX:=/usr |
| 66 |
- PREFIX:=$($(OS)_PREFIX) |
| 67 |
- |
| 68 |
- # Root directory to place files when creating packages. |
| 69 |
-@@ -244,7 +244,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins |
| 70 |
- |
| 71 |
- # Docs and man page: |
| 72 |
- DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION) |
| 73 |
--DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev |
| 74 |
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev |
| 75 |
- MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man |
| 76 |
- DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man |
| 77 |
- |
| 78 |
-@@ -359,7 +359,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES |
| 79 |
- # are 132x80. On larger screens, they will be bigger (since the New dialog |
| 80 |
- # is always 4x4 thumbnails); therefore, generating larger thumbs, which can |
| 81 |
- # be still be scaled down fairly quickly (esp. complicated SVG ones). |
| 82 |
--CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none |
| 83 |
-+CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none |
| 84 |
- |
| 85 |
- .SUFFIXES: |
| 86 |
- |
| 87 |
-@@ -551,7 +551,7 @@ trans: |
| 88 |
- windows_ARCH_INSTALL:= |
| 89 |
- macos_ARCH_INSTALL:=install-macbundle |
| 90 |
- ios_ARCH_INSTALL:=install-iosbundle |
| 91 |
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion |
| 92 |
-+linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion |
| 93 |
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) |
| 94 |
- |
| 95 |
- # "make install" installs all of the various parts |
| 96 |
-@@ -719,12 +719,12 @@ uninstall: uninstall-i18n |
| 97 |
- -rm $(BIN_PREFIX)/tuxpaint-import |
| 98 |
- -rm -r $(DATA_PREFIX) |
| 99 |
- -rm -r $(DOC_PREFIX) |
| 100 |
-- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz |
| 101 |
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz |
| 102 |
-- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz |
| 103 |
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz |
| 104 |
-- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz |
| 105 |
-- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz |
| 106 |
-+ -rm $(MAN_PREFIX)/man1/tuxpaint.1 |
| 107 |
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1 |
| 108 |
-+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1 |
| 109 |
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1 |
| 110 |
-+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1 |
| 111 |
-+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1 |
| 112 |
- -rm -f -r $(CONFDIR) |
| 113 |
- -rm $(COMPLETIONDIR)/tuxpaint-completion.bash |
| 114 |
- -rm -r $(MAGIC_PREFIX) |
| 115 |
-@@ -817,11 +817,11 @@ $(THUMB_STARTERS): |
| 116 |
- @mkdir -p starters/.thumbs |
| 117 |
- @if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \ |
| 118 |
- then \ |
| 119 |
-- composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \ |
| 120 |
-- convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \ |
| 121 |
-+ gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \ |
| 122 |
-+ gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \ |
| 123 |
- rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \ |
| 124 |
- else \ |
| 125 |
-- convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 126 |
-+ gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 127 |
- fi |
| 128 |
- |
| 129 |
- $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % |
| 130 |
-@@ -876,7 +876,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv |
| 131 |
- $(THUMB_TEMPLATES): |
| 132 |
- @printf "." |
| 133 |
- @mkdir -p templates/.thumbs |
| 134 |
-- @convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 135 |
-+ @gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \ |
| 136 |
- |
| 137 |
- $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % |
| 138 |
- @install -D -m 644 $< $@ || ( echo "NO THUMB $<" ) |
| 139 |
-@@ -988,9 +988,9 @@ install-dlls: |
| 140 |
- @cp -R win32/etc/ $(BIN_PREFIX) |
| 141 |
- @echo |
| 142 |
- @echo "...Installing Library Modules..." |
| 143 |
-- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders |
| 144 |
-- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders |
| 145 |
-- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll |
| 146 |
-+ @mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders |
| 147 |
-+ @cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders |
| 148 |
-+ @strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll |
| 149 |
- |
| 150 |
- # Install symlink: |
| 151 |
- .PHONY: install-haiku |
| 152 |
-@@ -1065,24 +1065,20 @@ install-man: |
| 153 |
- @install -d $(MAN_PREFIX)/man1 |
| 154 |
- @# tuxpaint.1 |
| 155 |
- @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/ |
| 156 |
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1 |
| 157 |
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz |
| 158 |
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1 |
| 159 |
- @# tuxpaint-import.1 |
| 160 |
- @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/ |
| 161 |
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1 |
| 162 |
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz |
| 163 |
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1 |
| 164 |
- @# tp-magic-config.1 |
| 165 |
- @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/ |
| 166 |
-- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1 |
| 167 |
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz |
| 168 |
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1 |
| 169 |
- @echo |
| 170 |
- for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \ |
| 171 |
- DEST=$(MAN_PREFIX)/$$l/man1 ; \ |
| 172 |
- echo "...Installing $$l man pages into $$DEST..." ; \ |
| 173 |
- install -d $$DEST ; \ |
| 174 |
- cp man/$$l/tuxpaint.1 $$DEST ; \ |
| 175 |
-- gzip -f $$DEST/tuxpaint.1 ; \ |
| 176 |
-- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \ |
| 177 |
-+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \ |
| 178 |
- done |
| 179 |
- @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14 |
| 180 |
- |
Archives