summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2004-11-21 17:40:50 +0000
committerMarinus Schraal <foser@gentoo.org>2004-11-21 17:40:50 +0000
commitd36ebd1a532acf55959d1e9a4befcc16c2ed5665 (patch)
treefecf54df16e2ced054f2d76dc1d8eeeb2f2fe815 /gnome-extra/gnome-games
parentadd the executable bit back to bootstrap-macos.sh (diff)
downloadhistorical-d36ebd1a532acf55959d1e9a4befcc16c2ed5665.tar.gz
historical-d36ebd1a532acf55959d1e9a4befcc16c2ed5665.tar.bz2
historical-d36ebd1a532acf55959d1e9a4befcc16c2ed5665.zip
oh yeah, bump
Diffstat (limited to 'gnome-extra/gnome-games')
-rw-r--r--gnome-extra/gnome-games/ChangeLog7
-rw-r--r--gnome-extra/gnome-games/Manifest13
-rw-r--r--gnome-extra/gnome-games/files/digest-gnome-games-2.6.0.11
-rw-r--r--gnome-extra/gnome-games/files/digest-gnome-games-2.6.11
-rw-r--r--gnome-extra/gnome-games/files/digest-gnome-games-2.8.1-r11
-rw-r--r--gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch11
-rw-r--r--gnome-extra/gnome-games/files/gnome-games-2.8.1-fix_upgrade.patch56
-rw-r--r--gnome-extra/gnome-games/files/guile-1.5-gentoo.diff19
-rw-r--r--gnome-extra/gnome-games/gnome-games-2.6.1.ebuild64
-rw-r--r--gnome-extra/gnome-games/gnome-games-2.8.1-r1.ebuild (renamed from gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild)39
10 files changed, 99 insertions, 113 deletions
diff --git a/gnome-extra/gnome-games/ChangeLog b/gnome-extra/gnome-games/ChangeLog
index dfa3e73fa6d8..70afdb597ad1 100644
--- a/gnome-extra/gnome-games/ChangeLog
+++ b/gnome-extra/gnome-games/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/gnome-games
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.82 2004/11/12 04:09:51 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/ChangeLog,v 1.83 2004/11/21 17:40:50 foser Exp $
+
+*gnome-games-2.8.1-r1 (21 Nov 2004)
+
+ 21 Nov 2004; foser <foser@gentoo.org> gnome-games-2.8.1-r1.ebuild :
+ Add patch for possible upgrade problem (#71294)
12 Nov 2004; Mike Gardiner <obz@gentoo.org> gnome-games-2.8.1.ebuild:
Keyworded ppc for GNOME 2.8
diff --git a/gnome-extra/gnome-games/Manifest b/gnome-extra/gnome-games/Manifest
index a848ec36a8f2..142342020440 100644
--- a/gnome-extra/gnome-games/Manifest
+++ b/gnome-extra/gnome-games/Manifest
@@ -1,18 +1,15 @@
-MD5 b26a711f8b5aef9998a2ea2506499077 ChangeLog 9816
+MD5 6f8ceb48ce20b11ed95326325513ed42 gnome-games-2.6.2.ebuild 1430
MD5 f1a7f6e7010166876bf1181099cb15fd gnome-games-1.4.0.3-r3.ebuild 1274
+MD5 ef99ae3cd6f97a23cdc99957226da983 gnome-games-2.8.1-r1.ebuild 2088
MD5 9db4e0ddea684696bb43e5029ecc9bb5 gnome-games-2.4.2.ebuild 1310
-MD5 979b1d3d04d2275f4395da2ac35036fe gnome-games-2.6.0.1.ebuild 1478
+MD5 9d772ef4f6388ca1d6f17238cdfe0cee ChangeLog 9976
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 915e5e78fa86946af8cc657b732f401e gnome-games-2.6.1.ebuild 1492
-MD5 6f8ceb48ce20b11ed95326325513ed42 gnome-games-2.6.2.ebuild 1430
MD5 0261011a0c63f584becfd1df349ce933 gnome-games-2.8.1.ebuild 1983
-MD5 e6684984af39cf3cea7ca09fd08a6552 files/gnome-games-2.6.0.1-aisleriot.patch 491
-MD5 3a5e1fbf83efc9cbd7ce679387b8b2f2 files/digest-gnome-games-2.6.0.1 73
MD5 2301a09a3e02fd7e40f6ee5a7e79e95c files/digest-gnome-games-1.4.0.3-r3 72
-MD5 94622ab0dcdf1cfbb8f6c51855b3a81e files/guile-1.5-gentoo.diff 318
MD5 70c1ce37a2d4a8762d949445e21122b4 files/gnome-games-2.8.0-pkgconfig_gconf.patch 861
+MD5 2105a5dad556d5ace66d269debb6fb20 files/digest-gnome-games-2.8.1-r1 71
MD5 7f65705cb02235fdf356420a2f6cde38 files/gnome-games-2.6.2-amd64.patch 2219
MD5 97e3065e45df12441df89f6ba12f4915 files/digest-gnome-games-2.4.2 71
-MD5 bdfd086ef923a4227e5d551f2a482854 files/digest-gnome-games-2.6.1 71
MD5 9f9b4b44ecc874043f8a7a57d9e96ce7 files/digest-gnome-games-2.6.2 71
MD5 2105a5dad556d5ace66d269debb6fb20 files/digest-gnome-games-2.8.1 71
+MD5 0ceaa7aaf955c911869551921148fab5 files/gnome-games-2.8.1-fix_upgrade.patch 1989
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.6.0.1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.6.0.1
deleted file mode 100644
index bb72e0cf834d..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-2.6.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 569e9d02fdc0cbd3294349cf30adccd1 gnome-games-2.6.0.1.tar.bz2 8215595
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.6.1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.6.1
deleted file mode 100644
index 335305b74c36..000000000000
--- a/gnome-extra/gnome-games/files/digest-gnome-games-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ea145547bfd8aa828b22cbbe34cbedf gnome-games-2.6.1.tar.bz2 8268693
diff --git a/gnome-extra/gnome-games/files/digest-gnome-games-2.8.1-r1 b/gnome-extra/gnome-games/files/digest-gnome-games-2.8.1-r1
new file mode 100644
index 000000000000..f40b184dd0be
--- /dev/null
+++ b/gnome-extra/gnome-games/files/digest-gnome-games-2.8.1-r1
@@ -0,0 +1 @@
+MD5 d3c675e29c835cfa765fbd6ae4a289cc gnome-games-2.8.1.tar.bz2 5926555
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch b/gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch
deleted file mode 100644
index 05c3eee2df28..000000000000
--- a/gnome-extra/gnome-games/files/gnome-games-2.6.0.1-aisleriot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- agnes-old.scm 2004-04-20 14:55:07.000000000 -0500
-+++ agnes.scm 2004-04-20 14:56:09.000000000 -0500
-@@ -225,7 +225,7 @@
- ((or (not (is-visible? (car (reverse card-list))))
- ; (eq? (is-red? (car (reverse card-list)))
- ; (is-black? (car card-list)))
-- (not (check-same-color(card-list)))
-+ (not (check-same-color-list card-list))
- (not (check-straight-descending-list card-list)))
- (strip (reverse (cdr (reverse card-list)))))
- (#t (car (reverse card-list)))))
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.8.1-fix_upgrade.patch b/gnome-extra/gnome-games/files/gnome-games-2.8.1-fix_upgrade.patch
new file mode 100644
index 000000000000..a9551a38ee13
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.8.1-fix_upgrade.patch
@@ -0,0 +1,56 @@
+===================================================================
+RCS file: /cvs/gnome/gnome-games/glines/glines.c,v
+retrieving revision 1.88
+retrieving revision 1.89
+diff -u -r1.88 -r1.89
+--- glines.c 2004/10/14 09:08:47 1.88
++++ glines.c 2004/11/16 06:07:48 1.89
+@@ -127,31 +127,26 @@
+ g_free (tmp);
+
+
+- /* Just think of this as an if statement, but we want to use break. */
+- while (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
++ if (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
+ char * message;
+ GtkWidget * w;
+-
+- /* ball.png was replaced with balls.svg. */
+- if (g_utf8_collate (fname, "ball.png") == 0) {
+- tmp = g_build_filename ("glines", "balls.svg", NULL);
+- fn = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, (tmp), FALSE, NULL);
+- g_free (tmp);
+- if (g_file_test (fn, G_FILE_TEST_EXISTS))
+- break;
++
++ tmp = g_build_filename ("glines", "balls.svg", NULL);
++ fn = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, (tmp), FALSE, NULL);
++ g_free (tmp);
++ if (!g_file_test (fn, G_FILE_TEST_EXISTS)) {
++ message = g_strdup_printf (_("Five or More could not find image file:\n%s\n\n"
++ "Please check Five or More is installed correctly."), fn);
++ w = gtk_message_dialog_new (GTK_WINDOW (app),
++ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_ERROR,
++ GTK_BUTTONS_OK,
++ message,
++ NULL);
++ gtk_dialog_run (GTK_DIALOG (w));
++ g_free (message);
++ exit (1);
+ }
+-
+- message = g_strdup_printf (_("Five or More could not find image file:\n%s\n\n"
+- "Please check Five or More is installed correctly."), fn);
+- w = gtk_message_dialog_new (GTK_WINDOW (app),
+- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+- GTK_MESSAGE_ERROR,
+- GTK_BUTTONS_OK,
+- message,
+- NULL);
+- gtk_dialog_run (GTK_DIALOG (w));
+- g_free (message);
+- exit (1);
+ }
+
+ tmp_preimage = games_preimage_new_from_uri (fn, NULL);
diff --git a/gnome-extra/gnome-games/files/guile-1.5-gentoo.diff b/gnome-extra/gnome-games/files/guile-1.5-gentoo.diff
deleted file mode 100644
index 838d14cb5712..000000000000
--- a/gnome-extra/gnome-games/files/guile-1.5-gentoo.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- cscmi.c.orig Sat Dec 29 02:34:04 2001
-+++ cscmi.c Sat Dec 29 02:35:05 2001
-@@ -155,11 +155,16 @@
- return SCM_EOL;
- }
-
-+/*
-+ * Already defined in >=guile-1.5
-+ *
-+
- SCM scm_add_slot(SCM slot)
- {
- add_slot(slot);
- return SCM_EOL;
- }
-+ */
-
- SCM scm_set_slot_y_expansion(SCM scm_slot_id, SCM new_exp_val)
- {
diff --git a/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
deleted file mode 100644
index c761b89bac3d..000000000000
--- a/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.1.ebuild,v 1.5 2004/06/24 22:04:58 agriffis Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Collection of games for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
-IUSE="guile"
-
-RDEPEND=">=x11-libs/gtk+-2.3
- >=gnome-base/gconf-1.2
- >=gnome-base/gnome-vfs-2
- >=gnome-base/libgnome-2
- >=gnome-base/libgnomeui-2
- >=gnome-base/librsvg-2
- guile? ( dev-util/guile )"
-DEPEND=">=dev-util/pkgconfig-0.12.0
- >=dev-util/intltool-0.29
- >=sys-devel/gettext-0.10.40
- >=app-text/scrollkeeper-0.3.8
- ${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}/aisleriot
- # fix aisleriot crash #46738
- epatch ${FILESDIR}/${PN}-2.6.0.1-aisleriot.patch
-
-}
-
-src_install() {
-
- gnome2_src_install
- cd ${S}
-
- # Documentation install for each of the games
- for game in `find . -type d -maxdepth 1`
- do
- docinto ${game}
- dodoc ${game}/{AUTHORS,ChangeLog,TODO,NEWS,README,COPYING} > /dev/null
- done
-
- rm -rf ${D}/usr/share/doc/${P}/{libgames-support,po}
-
- # Avoid overwriting previous .scores files
- local basefile
- for scorefile in ${D}/var/lib/games/*.scores
- do
- basefile=$(basename $scorefile)
- if [ -s "${ROOT}/var/lib/games/${basefile}" ]
- then
- rm ${scorefile}
- fi
- done
-
-}
diff --git a/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild b/gnome-extra/gnome-games/gnome-games-2.8.1-r1.ebuild
index 08c6f9faab53..6bfd7c04a00e 100644
--- a/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-2.8.1-r1.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.6.0.1.ebuild,v 1.11 2004/07/04 19:25:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-games/gnome-games-2.8.1-r1.ebuild,v 1.1 2004/11/21 17:40:50 foser Exp $
-inherit gnome2 eutils
+inherit gnome2 eutils flag-o-matic
DESCRIPTION="Collection of games for the GNOME desktop"
HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="x86 ppc ~sparc mips alpha hppa amd64"
-IUSE="guile"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
+IUSE="guile artworkextra"
RDEPEND=">=x11-libs/gtk+-2.3
>=gnome-base/gconf-1.2
@@ -18,7 +18,9 @@ RDEPEND=">=x11-libs/gtk+-2.3
>=gnome-base/libgnome-2
>=gnome-base/libgnomeui-2
>=gnome-base/librsvg-2
- guile? ( dev-util/guile )"
+ guile? ( dev-util/guile )
+ artworkextra? ( gnome-extra/gnome-games-extra-data )"
+
DEPEND=">=dev-util/pkgconfig-0.12.0
>=dev-util/intltool-0.29
>=sys-devel/gettext-0.10.40
@@ -27,17 +29,27 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
DOCS="AUTHORS ChangeLog HACKING INSTALL MAINTAINERS NEWS README TODO"
+G2CONF="${G2CONF} --disable-setgid"
+
src_unpack() {
+
unpack ${A}
- cd ${S}/aisleriot
- # fix aisleriot crash #46738
- epatch ${FILESDIR}/${P}-aisleriot.patch
+ # fix theme settings (#71294)
+ cd ${S}/glines
+ epatch ${FILESDIR}/${PN}-2.8.1-fix_upgrade.patch
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-2.8.0-pkgconfig_gconf.patch
+
+ autoconf || die
}
src_install() {
+ # FIXME : for some reason this doesn't get picked up
+ append-ldflags "-Wl,-z,now"
+
gnome2_src_install
cd ${S}
@@ -62,3 +74,14 @@ src_install() {
done
}
+
+pkg_postinst() {
+
+ gnome2_pkg_postinst
+
+ einfo "For security reasons system wide scores are disabled by default from"
+ einfo "now on. To re-enable them, do 'chmod +s <exec>', where <exec> is all"
+ einfo "executables that 'qpkg -l -nc gnome-games | grep /usr/bin/' yields"
+ einfo "(requires gentoolkit)."
+
+}