From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- games-puzzle/picpuz/Manifest | 1 + games-puzzle/picpuz/files/picpuz-2.5-build.patch | 116 +++++++++++++++++++++ .../files/picpuz-2.5-pthread-underlinking.patch | 18 ++++ games-puzzle/picpuz/metadata.xml | 5 + games-puzzle/picpuz/picpuz-2.5.ebuild | 54 ++++++++++ 5 files changed, 194 insertions(+) create mode 100644 games-puzzle/picpuz/Manifest create mode 100644 games-puzzle/picpuz/files/picpuz-2.5-build.patch create mode 100644 games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch create mode 100644 games-puzzle/picpuz/metadata.xml create mode 100644 games-puzzle/picpuz/picpuz-2.5.ebuild (limited to 'games-puzzle/picpuz') diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest new file mode 100644 index 00000000000..305c24a0463 --- /dev/null +++ b/games-puzzle/picpuz/Manifest @@ -0,0 +1 @@ +DIST picpuz-2.5.tar.gz 267452 SHA256 3caf92b00dd4739f68c557d5c952216fef01ca5de3c83e453ef177648bdf70f0 SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386 WHIRLPOOL 0496c45d377a6fda3ce795a85fa640c06bf51c7308c164b3e08d76c125727d468eb4836657f11a3435341defd58eea03dee5d7c9b7386d2ede9974227dd2c614 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 00000000000..dfec57fe6ec --- /dev/null +++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch @@ -0,0 +1,116 @@ +From: Julian Ospald +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/ + 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/ 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 00000000000..652231f1d4f --- /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 00000000000..d3c2cc926f0 --- /dev/null +++ b/games-puzzle/picpuz/metadata.xml @@ -0,0 +1,5 @@ + + + +games + diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild new file mode 100644 index 00000000000..5fb2ece8972 --- /dev/null +++ b/games-puzzle/picpuz/picpuz-2.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 +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" + +PATCHES=( "${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 +} -- cgit v1.2.1