add some patches from Bruce Schultz (bug #226483)

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27.8 i686

4 files changed, 107 insertions, 11 deletions

diff --git a/games-kids/stickers/ChangeLog b/games-kids/stickers/ChangeLog
index 40f74f3aa1c1..fbdedd9de8bb 100644
--- a/games-kids/stickers/ChangeLog
+++ b/games-kids/stickers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-kids/stickers
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/ChangeLog,v 1.15 2009/01/12 16:27:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/ChangeLog,v 1.16 2009/01/12 16:54:04 mr_bones_ Exp $
+
+  12 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/stickers-0.1.3-gentoo.patch, stickers-0.1.3-r2.ebuild:
+  add some patches from Bruce Schultz (bug #226483)
 
   12 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
   stickers-0.1.3-r2.ebuild:
diff --git a/games-kids/stickers/Manifest b/games-kids/stickers/Manifest
index 18576776bf9c..1ea0463ea6a6 100644
--- a/games-kids/stickers/Manifest
+++ b/games-kids/stickers/Manifest
@@ -1,4 +1,5 @@
+AUX stickers-0.1.3-gentoo.patch 2655 RMD160 704171155c24e4b154b7878c4228994b9ef17b44 SHA1 3deaf0365cac228521329e8ee9af1db9f0629421 SHA256 8c8de9f065d56bbf965af7563c67a526a6a9af415090edaa02b32f38142b75b1
 DIST stickers-0.1.3.tar.gz 1141437 RMD160 ef50902cef3274293fcb04fac6c930e1bb99386f SHA1 47981e17f86b00604d5125f99701ad73057a8714 SHA256 28009ec22495c8c466abb7c276a68f639efe58d6faf51030ab9a70454f874fef
-EBUILD stickers-0.1.3-r2.ebuild 1250 RMD160 11d34a217c1df5c01d552997410cb87245a69f47 SHA1 314522cd31df12a76f20cc68c24327460164de87 SHA256 bb5f42e461ec640c97bf12f35aa0cde7cd6262aa5f549751fffd87b2682aa267
-MISC ChangeLog 2398 RMD160 4578eb9e442e36e04efaf478eeed5d76392b8491 SHA1 02f2d3de484bc108a2f4e7b8268ea6714ad5412d SHA256 28cdc22b903dcbc27a2abdcdfe9e46483ba789c761801750f4164a9ede4b65d9
+EBUILD stickers-0.1.3-r2.ebuild 1223 RMD160 a1f754660685ed585993df0e8f9139e42c78cacb SHA1 1d3f13bda786f9e66c701869132abfcfd8ff11db SHA256 dc8df7422a997b171fc2185843a52566a2bb486881cf232bea1fd020389e832e
+MISC ChangeLog 2570 RMD160 e488546d838674052ecc119d406b8cb55011c601 SHA1 44f711ecb1d39a396f28a502648909b97abd370e SHA256 3cc6b5ff0aa548c4d826d7ebcd439c8d6a3716f24b3af11f533c72ec821b439a
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-kids/stickers/files/stickers-0.1.3-gentoo.patch b/games-kids/stickers/files/stickers-0.1.3-gentoo.patch
new file mode 100644
index 000000000000..2ab46e26e85b
--- /dev/null
+++ b/games-kids/stickers/files/stickers-0.1.3-gentoo.patch
@@ -0,0 +1,95 @@
+=== modified file 'main.c'
+--- main.c	2008-06-11 02:05:34 +0000
++++ main.c	2008-06-11 11:13:25 +0000
+@@ -1574,6 +1574,9 @@
+   gtk_init (&argc, &argv);
+   gdk_imlib_init();
+ 
++  gtk_widget_push_visual(gdk_imlib_get_visual());
++  gtk_widget_push_colormap(gdk_imlib_get_colormap());
++
+   config_load(argc==2?argv[1]:NULL);
+   select_scene();
+   gtk_main ();
+
+=== modified file 'select.c'
+--- select.c	2008-06-11 02:05:34 +0000
++++ select.c	2008-06-12 13:42:59 +0000
+@@ -229,7 +229,7 @@
+   }
+   free(files1);
+   while (j < count2) free(files2[j++]);
+-  if (count2) free(files2);
++  if (count2 > 0) free(files2);
+ 
+   return table;
+ }
+
+=== modified file 'rc.c'
+--- rc.c	2008-06-11 02:10:01 +0000
++++ rc.c	2008-06-12 14:07:55 +0000
+@@ -271,14 +271,14 @@
+ 
+   if (config.sticker_dir[0] != '/'
+       || config.icon_dir[0] != '/'
+-      || (config.work_dir[0] != '/' && !strcmp(config.work_dir, "./"))) {
++      || (config.work_dir[0] != '/' && strcmp(config.work_dir, "./") != 0)) {
+ 
+     GtkWidget *box, *button;
+ 
+     box=gtk_dialog_new();
+     gtk_signal_connect (GTK_OBJECT (box), "destroy",
+ 			GTK_SIGNAL_FUNC(gtk_widget_destroyed),
+-			&box);
++			GTK_OBJECT(box));
+     gtk_window_set_title (GTK_WINDOW (box), _("Sticker Warning"));
+ 
+     gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG(box)->vbox), 10);
+
+=== modified file 'rc.c'
+--- rc.c	2008-06-11 02:05:34 +0000
++++ rc.c	2008-06-11 02:10:01 +0000
+@@ -440,7 +440,6 @@
+   TRACE("[%p,%p]",wptrs[0],wptrs[1]);
+   s = gtk_font_selection_dialog_get_font_name
+     (GTK_FONT_SELECTION_DIALOG (wptrs[0]));
+-ONTRACE("s=%p", s);
+   if (s) {
+     gtk_entry_set_text(GTK_ENTRY(wptrs[1]), s);
+     g_free(s);
+
+=== modified file 'stickers.h'
+--- stickers.h	2008-06-11 02:05:34 +0000
++++ stickers.h	2008-06-11 14:10:22 +0000
+@@ -95,8 +95,8 @@
+ 
+ #define NOTRACE(x, args...) do { } while(0)
+ #define ONTRACE(format, args...) \
+-  fprintf(stderr, format  "\t##" __FUNCTION__ "(" __FILE__ ":%d)\n" \
+-	  , ## args , __LINE__)
++  fprintf(stderr, format "\t## in %s (%s:%d)\n" , ## args , \
++      __func__, __FILE__, __LINE__)
+ 
+ 
+ 
+
+=== modified file 'main.c'
+--- main.c	2008-06-11 11:13:25 +0000
++++ main.c	2008-06-14 00:34:21 +0000
+@@ -210,7 +210,14 @@
+ 
+ int size2pixel(int percent)
+ {
+-  return (percent * gdk_screen_width() + 50) / 100;
++  /* limit the aspect ratio to 4:3 to stop the window from being too wide
++     on dual monitor setups */
++  gint width = gdk_screen_width();
++  gint height = gdk_screen_height();
++  if (width > (height * 4 / 3)) {
++    width = height * 4 / 3;
++  }
++  return (percent * width + 50) / 100;
+ }
+ 
+ /* Create a picture widget of the given dimension while preserving the
+
diff --git a/games-kids/stickers/stickers-0.1.3-r2.ebuild b/games-kids/stickers/stickers-0.1.3-r2.ebuild
index ceb0a4462e18..fb5af290bc86 100644
--- a/games-kids/stickers/stickers-0.1.3-r2.ebuild
+++ b/games-kids/stickers/stickers-0.1.3-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/stickers-0.1.3-r2.ebuild,v 1.4 2009/01/12 16:27:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/stickers/stickers-0.1.3-r2.ebuild,v 1.5 2009/01/12 16:54:04 mr_bones_ Exp $
 
 EAPI=2
-inherit eutils
+inherit base eutils
 
 DESCRIPTION="Stickers Book for small children"
 HOMEPAGE="http://users.powernet.co.uk/kienzle/stickers/"
@@ -25,17 +25,13 @@ DEPEND="${RDEPEND}
 	x11-proto/xproto
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	# gcc34 fix? (bug #72734)
-	sed -i \
-		-e '/ONTRACE/d' rc.c \
-		|| die "sed failed"
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_configure() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 
+	# not an autoconf script
 	./configure \
 		--prefix=/usr \
 		--infodir=/usr/share/info \