summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-17 20:43:00 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-11-17 20:43:00 +0000
commitd62f730ee6ee75ff4bd3660fb9994a01c51ba11b (patch)
tree4f1694d64ee08151bfecbd895dad00f37d0da24b /media-libs
parentFix patch with absolute paths. (diff)
downloadgentoo-2-d62f730ee6ee75ff4bd3660fb9994a01c51ba11b.tar.gz
gentoo-2-d62f730ee6ee75ff4bd3660fb9994a01c51ba11b.tar.bz2
gentoo-2-d62f730ee6ee75ff4bd3660fb9994a01c51ba11b.zip
Fix patch with absolute paths.
(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/ufo/ChangeLog8
-rw-r--r--media-libs/ufo/files/ufo-0.8.4-namespace.patch28
2 files changed, 20 insertions, 16 deletions
diff --git a/media-libs/ufo/ChangeLog b/media-libs/ufo/ChangeLog
index ab5dffe004e6..2526cf937705 100644
--- a/media-libs/ufo/ChangeLog
+++ b/media-libs/ufo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/ufo
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ufo/ChangeLog,v 1.5 2007/06/19 01:44:12 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ufo/ChangeLog,v 1.6 2008/11/17 20:43:00 flameeyes Exp $
+
+ 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
+ files/ufo-0.8.4-namespace.patch:
+ Fix patch with absolute paths.
19 Jun 2007; Christoph Mende <angelos@gentoo.org> ufo-0.8.4.ebuild:
Added ~amd64 wrt bug 180744
diff --git a/media-libs/ufo/files/ufo-0.8.4-namespace.patch b/media-libs/ufo/files/ufo-0.8.4-namespace.patch
index 23ef83511f6c..fcfa6e213877 100644
--- a/media-libs/ufo/files/ufo-0.8.4-namespace.patch
+++ b/media-libs/ufo/files/ufo-0.8.4-namespace.patch
@@ -1,11 +1,11 @@
diff -Naur /usr/src/ufo-0.8.4/include/ufo/config/stamp-h1 ./include/ufo/config/stamp-h1
---- /usr/src/ufo-0.8.4/include/ufo/config/stamp-h1 1969-12-31 16:00:00.000000000 -0800
-+++ ./include/ufo/config/stamp-h1 2006-08-19 13:34:43.000000000 -0700
+--- a/include/ufo/config/stamp-h1 1969-12-31 16:00:00.000000000 -0800
++++ b/include/ufo/config/stamp-h1 2006-08-19 13:34:43.000000000 -0700
@@ -0,0 +1 @@
+timestamp for include/ufo/config/ufo_config_gnu.hpp
diff -Naur /usr/src/ufo-0.8.4/include/ufo/util/udimension.hpp ./include/ufo/util/udimension.hpp
---- /usr/src/ufo-0.8.4/include/ufo/util/udimension.hpp 2005-09-30 05:36:48.000000000 -0700
-+++ ./include/ufo/util/udimension.hpp 2006-08-19 13:34:40.000000000 -0700
+--- a/include/ufo/util/udimension.hpp 2005-09-30 05:36:48.000000000 -0700
++++ b/include/ufo/util/udimension.hpp 2006-08-19 13:34:40.000000000 -0700
@@ -32,6 +32,8 @@
#include "uinsets.hpp"
@@ -35,8 +35,8 @@ diff -Naur /usr/src/ufo-0.8.4/include/ufo/util/udimension.hpp ./include/ufo/util
inline void
diff -Naur /usr/src/ufo-0.8.4/include/ufo/util/urectangle.hpp ./include/ufo/util/urectangle.hpp
---- /usr/src/ufo-0.8.4/include/ufo/util/urectangle.hpp 2005-09-30 05:36:48.000000000 -0700
-+++ ./include/ufo/util/urectangle.hpp 2006-08-19 13:34:40.000000000 -0700
+--- a/include/ufo/util/urectangle.hpp 2005-09-30 05:36:48.000000000 -0700
++++ b/include/ufo/util/urectangle.hpp 2006-08-19 13:34:40.000000000 -0700
@@ -218,10 +218,10 @@
{}
@@ -117,8 +117,8 @@ diff -Naur /usr/src/ufo-0.8.4/include/ufo/util/urectangle.hpp ./include/ufo/util
dest->y = y;
}
diff -Naur /usr/src/ufo-0.8.4/include/ufo/ux/ux_sdl_prototypes.hpp ./include/ufo/ux/ux_sdl_prototypes.hpp
---- /usr/src/ufo-0.8.4/include/ufo/ux/ux_sdl_prototypes.hpp 2005-02-13 09:49:30.000000000 -0800
-+++ ./include/ufo/ux/ux_sdl_prototypes.hpp 2006-08-19 13:34:40.000000000 -0700
+--- a/include/ufo/ux/ux_sdl_prototypes.hpp 2005-02-13 09:49:30.000000000 -0800
++++ b/include/ufo/ux/ux_sdl_prototypes.hpp 2006-08-19 13:34:40.000000000 -0700
@@ -25,7 +25,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
@@ -129,8 +129,8 @@ diff -Naur /usr/src/ufo-0.8.4/include/ufo/ux/ux_sdl_prototypes.hpp ./include/ufo
UFO_SDL_PROC(SDL_Surface *,SDL_SetVideoMode,(int, int,int, Uint32))
diff -Naur /usr/src/ufo-0.8.4/include/ufo/widgets/uradiobutton.hpp ./include/ufo/widgets/uradiobutton.hpp
---- /usr/src/ufo-0.8.4/include/ufo/widgets/uradiobutton.hpp 2005-05-21 08:19:54.000000000 -0700
-+++ ./include/ufo/widgets/uradiobutton.hpp 2006-08-19 13:34:43.000000000 -0700
+--- a/include/ufo/widgets/uradiobutton.hpp 2005-05-21 08:19:54.000000000 -0700
++++ b/include/ufo/widgets/uradiobutton.hpp 2006-08-19 13:34:43.000000000 -0700
@@ -48,6 +48,12 @@
public:
URadioButton();
@@ -145,8 +145,8 @@ diff -Naur /usr/src/ufo-0.8.4/include/ufo/widgets/uradiobutton.hpp ./include/ufo
} // namespace ufo
diff -Naur /usr/src/ufo-0.8.4/src/widgets/upopupmenu.cpp ./src/widgets/upopupmenu.cpp
---- /usr/src/ufo-0.8.4/src/widgets/upopupmenu.cpp 2005-10-11 12:26:17.000000000 -0700
-+++ ./src/widgets/upopupmenu.cpp 2006-08-19 13:31:02.000000000 -0700
+--- a/src/widgets/upopupmenu.cpp 2005-10-11 12:26:17.000000000 -0700
++++ b/src/widgets/upopupmenu.cpp 2006-08-19 13:31:02.000000000 -0700
@@ -86,7 +86,7 @@
/*m_popup->sigPopupAboutToClose().disconnect(m_closeSlot);
m_sigMenuAboutToClose(this);
@@ -157,8 +157,8 @@ diff -Naur /usr/src/ufo-0.8.4/src/widgets/upopupmenu.cpp ./src/widgets/upopupmen
}
diff -Naur /usr/src/ufo-0.8.4/src/xml/uxul.cpp ./src/xml/uxul.cpp
---- /usr/src/ufo-0.8.4/src/xml/uxul.cpp 2005-10-24 09:00:55.000000000 -0700
-+++ ./src/xml/uxul.cpp 2006-08-19 13:31:01.000000000 -0700
+--- a/src/xml/uxul.cpp 2005-10-24 09:00:55.000000000 -0700
++++ b/src/xml/uxul.cpp 2006-08-19 13:31:01.000000000 -0700
@@ -330,6 +330,11 @@
if ("radio" == value) {
URadioButton * radioButton = new URadioButton();