Version bump, also fixing glib-2.32 compilation. Thanks a lot to Julian Ospald (hasufell) for his work.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 178 insertions, 2 deletions

diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog
index 87a3f4c2184d..b9857cec2f5c 100644
--- a/games-puzzle/picpuz/ChangeLog
+++ b/games-puzzle/picpuz/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-puzzle/picpuz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.13 2012/07/21 18:22:32 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.14 2012/07/24 17:55:27 pacho Exp $
+
+*picpuz-2.5 (24 Jul 2012)
+
+  24 Jul 2012; Pacho Ramos <pacho@gentoo.org> +files/picpuz-2.5-build.patch,
+  +picpuz-2.5.ebuild:
+  Version bump, also fixing glib-2.32 compilation. Thanks a lot to Julian Ospald
+  (hasufell) for his work.
 
   21 Jul 2012; Julian Ospald <hasufell@gentoo.org> ChangeLog:
   fix bug 427520
@@ -59,4 +66,3 @@
   21 Feb 2007; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +picpuz-06.ebuild:
   initial commit - ebuild submitted by Wojciech Myrda via bug #158391
-
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/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild
new file mode 100644
index 000000000000..4c9cf181c8e5
--- /dev/null
+++ b/games-puzzle/picpuz/picpuz-2.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-2.5.ebuild,v 1.1 2012/07/24 17:55:27 pacho Exp $
+
+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 )
+
+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
+}