diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /games-puzzle/picpuz |
reinit the tree, so we can have metadata
Diffstat (limited to 'games-puzzle/picpuz')
-rw-r--r-- | games-puzzle/picpuz/Manifest | 7 | ||||
-rw-r--r-- | games-puzzle/picpuz/files/picpuz-2.5-build.patch | 116 | ||||
-rw-r--r-- | games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch | 18 | ||||
-rw-r--r-- | games-puzzle/picpuz/metadata.xml | 8 | ||||
-rw-r--r-- | games-puzzle/picpuz/picpuz-2.5.ebuild | 57 |
5 files changed, 206 insertions, 0 deletions
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest new file mode 100644 index 000000000000..1412b13a92d3 --- /dev/null +++ b/games-puzzle/picpuz/Manifest @@ -0,0 +1,7 @@ +AUX picpuz-2.5-build.patch 5499 SHA256 25784542c35c1a0847db8b293190c03e66198af1389bf8f397abcaeedc3733c0 SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11 WHIRLPOOL 3d176a4a51e0a41ddb655bcd8d55bff9f7868f8a268e1cbb827f72bc9f4f79e5dc21b04e6dcaed7f0bfdb4b035667678bc25c588aa4200a29ad2d2ee58e415b1 +AUX picpuz-2.5-pthread-underlinking.patch 842 SHA256 ec3252815f421a0bb60b680479d2da68f5672abb1b556dcf577bbac4da2e7306 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658 WHIRLPOOL 498f3775367ddc1afd4a8838ce5cea0a0d7c6f1a1a44836ffc42cbfa093c08b0d985defae9807e0b6161878fb45ba3882f89e6398e649085bb34512c780e2602 +DIST picpuz-2.5.tar.gz 267452 SHA256 3caf92b00dd4739f68c557d5c952216fef01ca5de3c83e453ef177648bdf70f0 SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386 WHIRLPOOL 0496c45d377a6fda3ce795a85fa640c06bf51c7308c164b3e08d76c125727d468eb4836657f11a3435341defd58eea03dee5d7c9b7386d2ede9974227dd2c614 +EBUILD picpuz-2.5.ebuild 1131 SHA256 7e1292d917683cd73839f4af32338620a2789de6639fa0b307c32dc247c2b379 SHA512 f93e0f923ee4a2b61ecd4f50ce7b50297f3b8dbbe31633723e181c8143a89b2cd371af2baafeb64b2ec4c06b1c0c15b90a4beaa887f75eae200a4203b6e2a4f9 WHIRLPOOL fb133e3bc9d1a9b8dc0b6a888b530b8bb879939095adbb05960b46795465f309665d67c802dca08d3fba5125de94e84342d319543bdf87ecbc01659f00d2c2f5 +MISC ChangeLog 2764 SHA256 c785baecbf05885ee318954eb8b77ac4545025cec0e2e35e02b7712a8b18472b SHA512 cb1ab7a554312e404d7b1f95f8f28466a3817d3aa45bb723d9df64d9448a8fea82cfcb45378d29848e66b11c2bdac08ffaefeb3715f8f845f454420ab3de6174 WHIRLPOOL e52001587c8742796cde31283db85974c26f947a12595c9e065bb571611e49f4d7920f93bbf826cdafbd1aa4a17e7d2926bbc616b50be12fae814f5ec7e11186 +MISC ChangeLog-2015 2624 SHA256 419ce8429ee961570e7cf498d8f84ecd28430e5bf36e317f561d5051d4a5b255 SHA512 34737da00137d86970fcd0eba441999762bdcd6ebda49c2125d526c11cc7c7443d09212505e548a1cee6ff94a038f30193d6250bc53b1a3c0b062c44d430652b WHIRLPOOL dc6f318d6402a9154584c3e7e000c19ed1514fe56ae3e0ad1e7abbda783539021b0ec4ee57f5e4f92e1013326d82aebadc6c10c58a07034508b49033ffc2391a +MISC metadata.xml 249 SHA256 943b9ce0cd072229b43569ab668dd7ec741d9dfefd942c8921dabd4490b27b0c SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 WHIRLPOOL b10e21575c78e201a652c8582cd16e3f7c86b13dd20a30f4cea44066fb139440b3c186147dbaae83478f11a20b6f457a99c8b29ee1239a4caaa21eee01250088 diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch new file mode 100644 index 000000000000..dfec57fe6ec0 --- /dev/null +++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch @@ -0,0 +1,116 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sat Jul 21 17:03:11 UTC 2012 + +--- picpuz-2.5/Makefile ++++ picpuz-2.5/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) +--- picpuz-2.5/zfuncs.cc ++++ picpuz-2.5/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-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch new file mode 100644 index 000000000000..652231f1d4ff --- /dev/null +++ b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch @@ -0,0 +1,18 @@ +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 +diff --git a/Makefile b/Makefile +index 28638de..700b610 100644 +--- 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/metadata.xml b/games-puzzle/picpuz/metadata.xml new file mode 100644 index 000000000000..78274e0fa550 --- /dev/null +++ b/games-puzzle/picpuz/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> +</maintainer> +</pkgmetadata> diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild new file mode 100644 index 000000000000..3a4fe2400ea9 --- /dev/null +++ b/games-puzzle/picpuz/picpuz-2.5.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils gnome2-utils games + +DESCRIPTION="A jigsaw puzzle program" +HOMEPAGE="http://kornelix.squarespace.com/picpuz/" +SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="x11-libs/gtk+:3" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-build.patch \ + "${FILESDIR}"/${P}-pthread-underlinking.patch +} + +src_compile() { + emake \ + BINDIR="${GAMES_BINDIR}" \ + DATADIR="${GAMES_DATADIR}"/${PN} \ + DOCDIR=/usr/share/doc/${PF}/html +} + +src_install() { + dogamesbin ${PN} + insinto "${GAMES_DATADIR}"/${PN} + doins -r icons locales + doicon -s 48 icons/${PN}.png + make_desktop_entry ${PN} Picpuz + dohtml -r doc/{userguide-en.html,images} + dodoc doc/{changelog,README,translations} + newman doc/${PN}.man ${PN}.1 + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} |