| 1 |
commit: f72978ac209056a369d95957908f8850bf0c12fe |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 17 01:16:15 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 17 07:58:47 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f72978ac |
| 7 |
|
| 8 |
games-puzzle/picpuz: EAPI 6->8, simplify patches, remove homepage |
| 9 |
|
| 10 |
Much of zfuncs.cc is actually not used and doesn't |
| 11 |
need to be cared for. |
| 12 |
|
| 13 |
HOMEPAGE seems to be long gone with no replacement. |
| 14 |
|
| 15 |
Should also fix prefix. |
| 16 |
|
| 17 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 18 |
|
| 19 |
games-puzzle/picpuz/files/picpuz-2.5-build.patch | 116 --------------------- |
| 20 |
games-puzzle/picpuz/files/picpuz-2.5-docdir.patch | 7 ++ |
| 21 |
.../files/picpuz-2.5-pthread-underlinking.patch | 16 --- |
| 22 |
games-puzzle/picpuz/picpuz-2.5-r1.ebuild | 54 ++++------ |
| 23 |
4 files changed, 28 insertions(+), 165 deletions(-) |
| 24 |
|
| 25 |
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch |
| 26 |
deleted file mode 100644 |
| 27 |
index 6ca26e178bb..00000000000 |
| 28 |
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,116 +0,0 @@ |
| 31 |
-From: Julian Ospald <hasufell@g.o> |
| 32 |
-Date: Sat Jul 21 17:03:11 UTC 2012 |
| 33 |
- |
| 34 |
---- a/Makefile |
| 35 |
-+++ b/Makefile |
| 36 |
-@@ -11,24 +11,26 @@ |
| 37 |
- |
| 38 |
- # target install directories |
| 39 |
- BINDIR = $(PREFIX)/bin |
| 40 |
--SHAREDIR = $(PREFIX)/share/$(PROGRAM) |
| 41 |
--ICONDIR = $(SHAREDIR)/icons |
| 42 |
--LOCALESDIR = $(SHAREDIR)/locales |
| 43 |
-+DATADIR = $(PREFIX)/share/$(PROGRAM) |
| 44 |
-+ICONDIR = $(DATADIR)/icons |
| 45 |
-+LOCALESDIR = $(DATADIR)/locales |
| 46 |
- DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) |
| 47 |
- MANDIR = $(PREFIX)/share/man/man1 |
| 48 |
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop |
| 49 |
- |
| 50 |
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0` |
| 51 |
-+CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0` |
| 52 |
- LIBS = `pkg-config --libs gtk+-3.0` |
| 53 |
- |
| 54 |
- $(PROGRAM): $(PROGRAM).o zfuncs.o |
| 55 |
-- $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM) |
| 56 |
-+ $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM) |
| 57 |
- |
| 58 |
- $(PROGRAM).o: $(SOURCE) |
| 59 |
-- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) |
| 60 |
-+ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
| 61 |
-+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" |
| 62 |
- |
| 63 |
- zfuncs.o: zfuncs.cc |
| 64 |
-- $(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\" |
| 65 |
-+ $(CXX) $(CXXFLAGS) zfuncs.cc \ |
| 66 |
-+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" |
| 67 |
- |
| 68 |
- install: $(PROGRAM) |
| 69 |
- mkdir -p $(DESTDIR)$(BINDIR) |
| 70 |
-@@ -52,7 +54,7 @@ |
| 71 |
- |
| 72 |
- uninstall: |
| 73 |
- rm -f $(DESTDIR)$(BINDIR)/$(PROGRAM) |
| 74 |
-- rm -R -f $(DESTDIR)$(SHAREDIR) |
| 75 |
-+ rm -R -f $(DESTDIR)$(DATADIR) |
| 76 |
- rm -R -f $(DESTDIR)$(DOCDIR) |
| 77 |
- rm -f $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz |
| 78 |
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE) |
| 79 |
---- a/zfuncs.cc |
| 80 |
-+++ b/zfuncs.cc |
| 81 |
-@@ -3111,7 +3111,6 @@ |
| 82 |
- /prefix/share/appname/locales/ translations: appname-de.po etc. |
| 83 |
- /home/user/.appname/ parameters etc. are copied here |
| 84 |
- |
| 85 |
-- zprefix install location has /bin and /share subtrees |
| 86 |
- zdatadir installed data files .desktop, parameters, etc. |
| 87 |
- zdocdir user documentation README, changelog, user guide |
| 88 |
- zicondir icons icon files .png |
| 89 |
-@@ -3123,7 +3122,7 @@ |
| 90 |
- namespace zfuncs |
| 91 |
- { |
| 92 |
- char zappname[20]; |
| 93 |
-- char zprefix[200], zdatadir[200], zdocdir[200]; // app directories |
| 94 |
-+ char zdatadir[200], zdocdir[200]; // app directories |
| 95 |
- char zicondir[200], zlocalesdir[200], zuserdir[200]; |
| 96 |
- char zlang[8] = "en"; // "lc" or "lc_RC" |
| 97 |
- char JPGquality[4] = "85"; // JPG file save quality |
| 98 |
-@@ -3132,7 +3131,6 @@ |
| 99 |
- pthread_t tid_main = 0; // main thread ID v.4.8 |
| 100 |
- } |
| 101 |
- |
| 102 |
--cchar * get_zprefix() { return zfuncs::zprefix; } // /usr or /home/<userid> |
| 103 |
- cchar * get_zuserdir() { return zfuncs::zuserdir; } // /home/user/.appname |
| 104 |
- cchar * get_zdatadir() { return zfuncs::zdatadir; } // parameters, icons |
| 105 |
- cchar * get_zdocdir() { return zfuncs::zdocdir; } // documentation files |
| 106 |
-@@ -3156,19 +3154,15 @@ |
| 107 |
- |
| 108 |
- catch_signals(); // catch segfault, do backtrace |
| 109 |
- |
| 110 |
-- strcpy(zappname,appname); // save app name |
| 111 |
-- |
| 112 |
-- #ifndef PREFIX // install location v.4.7 |
| 113 |
-- #define PREFIX "/usr" |
| 114 |
-- #endif |
| 115 |
-- |
| 116 |
-- strncpy0(work,PREFIX,199); // /usr or /home/<userid> v.4.6 |
| 117 |
-- strcpy(zprefix,work); // /prefix |
| 118 |
-- strncatv(zdatadir,199,work,"/share/",zappname,"/data",null); // /prefix/share/appname/data |
| 119 |
-- strncatv(zicondir,199,work,"/share/",zappname,"/icons",null); // /prefix/share/appname/icons |
| 120 |
-- strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales |
| 121 |
-- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname |
| 122 |
-- |
| 123 |
-+ strcpy(zappname,appname); |
| 124 |
-+ |
| 125 |
-+ strcpy(zdatadir,DATADIR); // macros from build script |
| 126 |
-+ strcpy(zdocdir,DOCDIR); |
| 127 |
-+ strcpy(zicondir,zdatadir); |
| 128 |
-+ strcat(zicondir,"/icons"); |
| 129 |
-+ strcpy(zlocalesdir,zdatadir); |
| 130 |
-+ strcat(zlocalesdir,"/locales"); |
| 131 |
-+ |
| 132 |
- snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname); // /home/user/.appname/ v.4.3 |
| 133 |
- err = stat(zuserdir,&statdat); // does it exist already? |
| 134 |
- if (err) { |
| 135 |
-@@ -3366,9 +3360,9 @@ |
| 136 |
- fputs(work,fid); |
| 137 |
- fputs("Type=Application\n",fid); // Type=Application |
| 138 |
- fputs("Terminal=false\n",fid); // Terminal=false |
| 139 |
-- snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command); // Exec=/usr/bin/appname -options |
| 140 |
-+ snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname); // Exec=/usr/bin/appname -options |
| 141 |
- fputs(work,fid); |
| 142 |
-- snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname); // Icon=/usr/share/appname/icons/appname.png |
| 143 |
-+ snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname); // Icon=/usr/share/appname/icons/appname.png |
| 144 |
- fputs(work,fid); |
| 145 |
- fclose(fid); |
| 146 |
- |
| 147 |
|
| 148 |
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch |
| 149 |
new file mode 100644 |
| 150 |
index 00000000000..d627d826e56 |
| 151 |
--- /dev/null |
| 152 |
+++ b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch |
| 153 |
@@ -0,0 +1,7 @@ |
| 154 |
+Simplify opening the html guide with right path. |
| 155 |
+--- a/zfuncs.cc |
| 156 |
++++ b/zfuncs.cc |
| 157 |
+@@ -3222,2 +3222,3 @@ |
| 158 |
+ using namespace zfuncs; |
| 159 |
++ showz_html("file://" PREFIX "/share/doc/" DOCDIR "/html/userguide-en.html"); return; |
| 160 |
+ |
| 161 |
|
| 162 |
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch |
| 163 |
deleted file mode 100644 |
| 164 |
index f11f95cbf72..00000000000 |
| 165 |
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch |
| 166 |
+++ /dev/null |
| 167 |
@@ -1,16 +0,0 @@ |
| 168 |
-Fix underlinking on recent binutils: |
| 169 |
- |
| 170 |
-> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz |
| 171 |
-> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5' |
| 172 |
-> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line |
| 173 |
---- a/Makefile |
| 174 |
-+++ b/Makefile |
| 175 |
-@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1 |
| 176 |
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop |
| 177 |
- |
| 178 |
- CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0` |
| 179 |
--LIBS = `pkg-config --libs gtk+-3.0` |
| 180 |
-+LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0` |
| 181 |
- |
| 182 |
- $(PROGRAM): $(PROGRAM).o zfuncs.o |
| 183 |
- $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM) |
| 184 |
|
| 185 |
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild |
| 186 |
index 2b1863eb8bb..92a9c069b79 100644 |
| 187 |
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild |
| 188 |
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild |
| 189 |
@@ -1,60 +1,48 @@ |
| 190 |
# Copyright 1999-2021 Gentoo Authors |
| 191 |
# Distributed under the terms of the GNU General Public License v2 |
| 192 |
|
| 193 |
-EAPI=6 |
| 194 |
+EAPI=8 |
| 195 |
|
| 196 |
-inherit desktop gnome2-utils toolchain-funcs |
| 197 |
+inherit desktop flag-o-matic toolchain-funcs |
| 198 |
|
| 199 |
-DESCRIPTION="A jigsaw puzzle program" |
| 200 |
-HOMEPAGE="http://kornelix.squarespace.com/picpuz/" |
| 201 |
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" |
| 202 |
+DESCRIPTION="Jigsaw puzzle program" |
| 203 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
| 204 |
+SRC_URI="mirror://gentoo/${P}.tar.gz" |
| 205 |
|
| 206 |
-LICENSE="GPL-2" |
| 207 |
+LICENSE="GPL-3+" |
| 208 |
SLOT="0" |
| 209 |
KEYWORDS="~amd64 ~x86" |
| 210 |
|
| 211 |
RDEPEND="x11-libs/gtk+:3" |
| 212 |
-DEPEND="${RDEPEND} |
| 213 |
- virtual/pkgconfig |
| 214 |
-" |
| 215 |
+DEPEND="${RDEPEND}" |
| 216 |
+BDEPEND="virtual/pkgconfig" |
| 217 |
|
| 218 |
PATCHES=( |
| 219 |
- "${FILESDIR}"/${P}-build.patch |
| 220 |
- "${FILESDIR}"/${P}-pthread-underlinking.patch |
| 221 |
+ "${FILESDIR}"/${P}-docdir.patch |
| 222 |
) |
| 223 |
|
| 224 |
src_compile() { |
| 225 |
- tc-export CXX PKG_CONFIG |
| 226 |
+ tc-export CXX |
| 227 |
|
| 228 |
- emake \ |
| 229 |
- BINDIR="/usr/bin" \ |
| 230 |
- DATADIR=/usr/share/${PN} \ |
| 231 |
- DOCDIR=/usr/share/doc/${PF}/html |
| 232 |
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-3.0) -DDOCDIR="'\"${PF}\"'" |
| 233 |
+ append-ldflags -pthread |
| 234 |
+ append-libs $($(tc-getPKG_CONFIG) --libs gtk+-3.0) |
| 235 |
+ |
| 236 |
+ emake PREFIX="${EPREFIX}/usr" CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" LIBS="${LIBS}" |
| 237 |
} |
| 238 |
|
| 239 |
src_install() { |
| 240 |
dobin ${PN} |
| 241 |
+ newman doc/${PN}.man ${PN}.1 |
| 242 |
|
| 243 |
insinto /usr/share/${PN} |
| 244 |
doins -r icons locales |
| 245 |
|
| 246 |
- doicon -s 48 icons/${PN}.png |
| 247 |
- make_desktop_entry ${PN} Picpuz |
| 248 |
- |
| 249 |
- HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs |
| 250 |
+ dodoc doc/{README,changelog,translations} |
| 251 |
|
| 252 |
- dodoc doc/{changelog,README,translations} |
| 253 |
- newman doc/${PN}.man ${PN}.1 |
| 254 |
-} |
| 255 |
+ docinto html |
| 256 |
+ dodoc -r doc/{images,userguide-en.html} |
| 257 |
|
| 258 |
-pkg_preinst() { |
| 259 |
- gnome2_icon_savelist |
| 260 |
-} |
| 261 |
- |
| 262 |
-pkg_postinst() { |
| 263 |
- gnome2_icon_cache_update |
| 264 |
-} |
| 265 |
- |
| 266 |
-pkg_postrm() { |
| 267 |
- gnome2_icon_cache_update |
| 268 |
+ doicon icons/${PN}.png |
| 269 |
+ make_desktop_entry ${PN} Picpuz |
| 270 |
} |
Archives