summaryrefslogtreecommitdiff
path: root/games-puzzle/picpuz
diff options
context:
space:
mode:
Diffstat (limited to 'games-puzzle/picpuz')
-rw-r--r--games-puzzle/picpuz/Manifest5
-rw-r--r--games-puzzle/picpuz/files/picpuz-2.5-build.patch116
-rw-r--r--games-puzzle/picpuz/files/picpuz-2.5-docdir.patch7
-rw-r--r--games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch16
-rw-r--r--games-puzzle/picpuz/picpuz-2.5-r1.ebuild54
5 files changed, 30 insertions, 168 deletions
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 8d5f48efe9d4..01792c835847 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,4 @@
-AUX picpuz-2.5-build.patch 5466 BLAKE2B c99edcd74cfdd606f10b8b579ab9daf718e43618a331251c5fbecd0e4166cc959e4eead0bc6a292c875b73126cb4602cf5f23fec75bdcbfe4c61d3d44cc00f8d SHA512 5029124dfc9ed9a338cbe8899831dff38bea28b44cee612bfc95cd1ea434a4f942d53a832a4769229e7f31244a278d6ceae27e499108d4fe3b9e7c7e3a518622
-AUX picpuz-2.5-pthread-underlinking.patch 785 BLAKE2B 6b25d10b1c545a96965667032fa0c39b892b634e069d13079c8993f3b0a3ba1e7d0c7ccf74ac40dd10aa3663f2d06fe017d8f6b7cb3241d5d7b16a0244699999 SHA512 d2dfc2c44599bd125124709f6ecbc24b02c24cf8d3129a54d5f4ad434044689953606e062c784ba8200f40bec3175d8fa8f4d1e3643a925884374ccca394c424
+AUX picpuz-2.5-docdir.patch 222 BLAKE2B 8cfb90707508dd9af8186ba42033948d64829eb7336d90856ef7c61bfe5bb71d73faa39a36be181cebfa3295bdc02560be880410827498eb1fe5ee9c7422df2e SHA512 6eba6a2c251191d69325660e2e40e6ed89aad928f317faf9e131430098bb49987129fda3b5d8e0a1d2e24f68705f4ec6af238049d7c6fab26beef1210b636984
DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5-r1.ebuild 1081 BLAKE2B 198d039674871dcbb37bdf217b9b3a45711d29b169c7de3667c561a09a141505b90f151ec53b16c47104beededba8b53da85056402f09195e86b0f0e28df1754 SHA512 aeb931c5a26d595cb475af3293cd4651e869ddf6e65982a6a840e32de23a9359a1985363be1fa8fce28ef87da4f6ea01851c3661ef7f074a7f0df047a2d256c0
+EBUILD picpuz-2.5-r1.ebuild 1003 BLAKE2B 60199194c8b817bcf38b0717ee07f90e9baa7bfc65d6433b3b46fd7bb5b3b429186df18f5c7c3b26191d64e4cde84434e86f7874e3307d38561fcb1d32d55143 SHA512 cf10163d9da81e5b3443719cc38dc1e93e94fcd60d0557fcf35bbfe617292f1b1a58c2a29dc4f1c4a95870382e8d1b8d7436e51bc2a7877541c2b0873e249b40
MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
deleted file mode 100644
index 6ca26e178bbf..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 21 17:03:11 UTC 2012
-
---- a/Makefile
-+++ b/Makefile
-@@ -11,24 +11,26 @@
-
- # target install directories
- BINDIR = $(PREFIX)/bin
--SHAREDIR = $(PREFIX)/share/$(PROGRAM)
--ICONDIR = $(SHAREDIR)/icons
--LOCALESDIR = $(SHAREDIR)/locales
-+DATADIR = $(PREFIX)/share/$(PROGRAM)
-+ICONDIR = $(DATADIR)/icons
-+LOCALESDIR = $(DATADIR)/locales
- DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
- MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
-
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
-
- $(PROGRAM): $(PROGRAM).o zfuncs.o
-- $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
-+ $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
-
- $(PROGRAM).o: $(SOURCE)
-- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
-+ $(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
-+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-
- zfuncs.o: zfuncs.cc
-- $(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
-+ $(CXX) $(CXXFLAGS) zfuncs.cc \
-+ -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
-
- install: $(PROGRAM)
- mkdir -p $(DESTDIR)$(BINDIR)
-@@ -52,7 +54,7 @@
-
- uninstall:
- rm -f $(DESTDIR)$(BINDIR)/$(PROGRAM)
-- rm -R -f $(DESTDIR)$(SHAREDIR)
-+ rm -R -f $(DESTDIR)$(DATADIR)
- rm -R -f $(DESTDIR)$(DOCDIR)
- rm -f $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
- xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- a/zfuncs.cc
-+++ b/zfuncs.cc
-@@ -3111,7 +3111,6 @@
- /prefix/share/appname/locales/ translations: appname-de.po etc.
- /home/user/.appname/ parameters etc. are copied here
-
-- zprefix install location has /bin and /share subtrees
- zdatadir installed data files .desktop, parameters, etc.
- zdocdir user documentation README, changelog, user guide
- zicondir icons icon files .png
-@@ -3123,7 +3122,7 @@
- namespace zfuncs
- {
- char zappname[20];
-- char zprefix[200], zdatadir[200], zdocdir[200]; // app directories
-+ char zdatadir[200], zdocdir[200]; // app directories
- char zicondir[200], zlocalesdir[200], zuserdir[200];
- char zlang[8] = "en"; // "lc" or "lc_RC"
- char JPGquality[4] = "85"; // JPG file save quality
-@@ -3132,7 +3131,6 @@
- pthread_t tid_main = 0; // main thread ID v.4.8
- }
-
--cchar * get_zprefix() { return zfuncs::zprefix; } // /usr or /home/<userid>
- cchar * get_zuserdir() { return zfuncs::zuserdir; } // /home/user/.appname
- cchar * get_zdatadir() { return zfuncs::zdatadir; } // parameters, icons
- cchar * get_zdocdir() { return zfuncs::zdocdir; } // documentation files
-@@ -3156,19 +3154,15 @@
-
- catch_signals(); // catch segfault, do backtrace
-
-- strcpy(zappname,appname); // save app name
--
-- #ifndef PREFIX // install location v.4.7
-- #define PREFIX "/usr"
-- #endif
--
-- strncpy0(work,PREFIX,199); // /usr or /home/<userid> v.4.6
-- strcpy(zprefix,work); // /prefix
-- strncatv(zdatadir,199,work,"/share/",zappname,"/data",null); // /prefix/share/appname/data
-- strncatv(zicondir,199,work,"/share/",zappname,"/icons",null); // /prefix/share/appname/icons
-- strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null); // /prefix/share/appname/locales
-- strncatv(zdocdir,199,work,"/share/doc/",zappname,null); // /prefix/share/doc/appname
--
-+ strcpy(zappname,appname);
-+
-+ strcpy(zdatadir,DATADIR); // macros from build script
-+ strcpy(zdocdir,DOCDIR);
-+ strcpy(zicondir,zdatadir);
-+ strcat(zicondir,"/icons");
-+ strcpy(zlocalesdir,zdatadir);
-+ strcat(zlocalesdir,"/locales");
-+
- snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname); // /home/user/.appname/ v.4.3
- err = stat(zuserdir,&statdat); // does it exist already?
- if (err) {
-@@ -3366,9 +3360,9 @@
- fputs(work,fid);
- fputs("Type=Application\n",fid); // Type=Application
- fputs("Terminal=false\n",fid); // Terminal=false
-- snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command); // Exec=/usr/bin/appname -options
-+ snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname); // Exec=/usr/bin/appname -options
- fputs(work,fid);
-- snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname); // Icon=/usr/share/appname/icons/appname.png
-+ snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname); // Icon=/usr/share/appname/icons/appname.png
- fputs(work,fid);
- fclose(fid);
-
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
new file mode 100644
index 000000000000..d627d826e56e
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
@@ -0,0 +1,7 @@
+Simplify opening the html guide with right path.
+--- a/zfuncs.cc
++++ b/zfuncs.cc
+@@ -3222,2 +3222,3 @@
+ using namespace zfuncs;
++ showz_html("file://" PREFIX "/share/doc/" DOCDIR "/html/userguide-en.html"); return;
+
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
deleted file mode 100644
index f11f95cbf72b..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix underlinking on recent binutils:
-
-> 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
-> /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'
-> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
-
- CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0`
-
- $(PROGRAM): $(PROGRAM).o zfuncs.o
- $(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 2b1863eb8bbe..92a9c069b79a 100644
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -1,60 +1,48 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-inherit desktop gnome2-utils toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
-DESCRIPTION="A jigsaw puzzle program"
-HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+DESCRIPTION="Jigsaw puzzle program"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${P}-build.patch
- "${FILESDIR}"/${P}-pthread-underlinking.patch
+ "${FILESDIR}"/${P}-docdir.patch
)
src_compile() {
- tc-export CXX PKG_CONFIG
+ tc-export CXX
- emake \
- BINDIR="/usr/bin" \
- DATADIR=/usr/share/${PN} \
- DOCDIR=/usr/share/doc/${PF}/html
+ append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-3.0) -DDOCDIR="'\"${PF}\"'"
+ append-ldflags -pthread
+ append-libs $($(tc-getPKG_CONFIG) --libs gtk+-3.0)
+
+ emake PREFIX="${EPREFIX}/usr" CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" LIBS="${LIBS}"
}
src_install() {
dobin ${PN}
+ newman doc/${PN}.man ${PN}.1
insinto /usr/share/${PN}
doins -r icons locales
- doicon -s 48 icons/${PN}.png
- make_desktop_entry ${PN} Picpuz
-
- HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+ dodoc doc/{README,changelog,translations}
- dodoc doc/{changelog,README,translations}
- newman doc/${PN}.man ${PN}.1
-}
+ docinto html
+ dodoc -r doc/{images,userguide-en.html}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
+ doicon icons/${PN}.png
+ make_desktop_entry ${PN} Picpuz
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 15:35:35 +0000