[gentoo-commits] gentoo-x86 commit in games-puzzle/toppler/files: toppler-1.1.3-gentoo.patch

[gentoo-commits] gentoo-x86 commit in games-puzzle/toppler/files: toppler-1.1.3-gentoo.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    09/02/06 22:31:49

  Added:                toppler-1.1.3-gentoo.patch
  Log:
  EAPI=2; add use-based dep; replace seds with patch; add third parameter to open for bug #257340
  (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)

Revision  Changes    Path
1.1                  games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch?rev=1.1&content-type=text/plain

Index: toppler-1.1.3-gentoo.patch
===================================================================
diff -ru toppler-1.1.3.orig/Makefile.in toppler-1.1.3/Makefile.in
--- toppler-1.1.3.orig/Makefile.in	2007-07-19 10:27:58.000000000 -0400
+++ toppler-1.1.3/Makefile.in	2009-02-06 15:44:46.000000000 -0500
@@ -298,8 +298,8 @@
   txtsys.cc        txtsys.h        \
   qnxicon.c
 
-pixmapsdir = $(datadir)/pixmaps
-applicationsdir = $(datadir)/applications
+pixmapsdir = /usr/share/pixmaps
+applicationsdir = /usr/share/applications
 pkgdocdir = $(docdir)/$(PACKAGE)
 pkglocalstatedir = $(localstatedir)/$(PACKAGE)
 dist_pixmaps_DATA = $(PACKAGE).xpm
@@ -952,7 +952,7 @@
 info-am:
 
 install-data-am: install-applicationsDATA install-dist_pixmapsDATA \
-	install-dist_pkgdataDATA install-dist_pkgdocDATA \
+	install-dist_pkgdataDATA \
 	install-dist_pkglocalstateDATA install-man
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -1015,7 +1015,7 @@
 	info-am install install-am install-applicationsDATA \
 	install-binPROGRAMS install-data install-data-am \
 	install-data-hook install-dist_pixmapsDATA \
-	install-dist_pkgdataDATA install-dist_pkgdocDATA \
+	install-dist_pkgdataDATA \
 	install-dist_pkglocalstateDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-exec-hook install-html \
 	install-html-am install-info install-info-am install-man \
diff -ru toppler-1.1.3.orig/highscore.cc toppler-1.1.3/highscore.cc
--- toppler-1.1.3.orig/highscore.cc	2007-07-19 10:26:35.000000000 -0400
+++ toppler-1.1.3/highscore.cc	2009-02-06 15:46:06.000000000 -0500
@@ -139,7 +139,7 @@
     setegid(GameGroupID);
     int lockfd;
     
-    while ((lockfd = open(HISCOREDIR "/" SCOREFNAME ".lck", O_CREAT | O_RDWR | O_EXCL)) == -1) {
+    while ((lockfd = open(HISCOREDIR "/" SCOREFNAME ".lck", O_CREAT | O_RDWR | O_EXCL, 0660)) == -1) {
       dcl_wait();
       scr_swap();
     }
diff -ru toppler-1.1.3.orig/po/Makefile.in.in toppler-1.1.3/po/Makefile.in.in
--- toppler-1.1.3.orig/po/Makefile.in.in	2007-07-19 10:27:04.000000000 -0400
+++ toppler-1.1.3/po/Makefile.in.in	2009-02-06 15:44:46.000000000 -0500
@@ -21,7 +21,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = /usr/share/locale
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@