summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-01-14 00:29:40 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-01-14 00:29:40 +0000
commitec32d6152c11a963c86d53e66f9b4dc6320b3983 (patch)
tree155490e8af18d31ef12d9c0e938f4bcc23e9d761 /games-puzzle/toppler/files
parentold (diff)
downloadgentoo-2-ec32d6152c11a963c86d53e66f9b4dc6320b3983.tar.gz
gentoo-2-ec32d6152c11a963c86d53e66f9b4dc6320b3983.tar.bz2
gentoo-2-ec32d6152c11a963c86d53e66f9b4dc6320b3983.zip
old
(Portage version: 2.1.9.25/cvs/Linux i686)
Diffstat (limited to 'games-puzzle/toppler/files')
-rw-r--r--games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch56
-rw-r--r--games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch11
2 files changed, 0 insertions, 67 deletions
diff --git a/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch b/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch
deleted file mode 100644
index 269b0f28e2ea..000000000000
--- a/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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@
diff --git a/games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch b/games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch
deleted file mode 100644
index 2821917b99d5..000000000000
--- a/games-puzzle/toppler/files/toppler-1.1.3-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- leveledit.cc.old 2010-11-02 09:33:24.000000000 +0100
-+++ leveledit.cc 2010-11-02 10:12:11.000000000 +0100
-@@ -436,7 +436,7 @@
-
- snprintf(knam, 256, "%s%s", keymod2str(_ed_keys[k].mod), SDL_GetKeyName(_ed_keys[k].key));
-
-- snprintf(tabbuf2, 256, "%3i", maxkeylen - scr_textlength(knam));
-+ snprintf(tabbuf2, sizeof(tabbuf2), "%3i", maxkeylen - scr_textlength(knam));
- if (tabbuf2[0] < '0') tabbuf2[0] = '0';
- if (tabbuf2[1] < '0') tabbuf2[1] = '0';
- if (tabbuf2[2] < '0') tabbuf2[2] = '0';