fix problem starting up

4 files changed, 31 insertions, 24 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index a108f4e94bc3..4d4b82719bcf 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.2 2003/07/01 20:19:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.3 2003/07/06 00:06:56 liquidx Exp $
+
+  06 Jul 2003; Alastair Tse <liquidx@gentoo.org> meld-0.8.2.ebuild,
+  files/meld-0.8.2-gentoo.diff:
+  add patch thanks to suka <suka@t0.or.at>
 
 *meld-0.8.2 (01 Jul 2003)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index f51c43c5a75a..8c37ade35b61 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,8 +1,8 @@
 MD5 ffb236603fbdb43657048801a2ee5e0a meld-0.8.1.ebuild 957
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 67743d813ce2213a7f49af5b6938eea0 ChangeLog 501
-MD5 aeefa71b598f4d8477cce6c1a880cb40 meld-0.8.2.ebuild 965
+MD5 1893ba4e0351e0b278127c77e0ef95f6 ChangeLog 648
+MD5 f32f9f33aa4207ef8bcda3cdbede0f2a meld-0.8.2.ebuild 967
 MD5 774e0a890077f2d11ffba5afb4dd8dee files/meld-0.8.1-gentoo.diff 1443
 MD5 c99fc566baf1043d1736556c5b31357d files/digest-meld-0.8.1 58
 MD5 946ab2fafb24e4b2b9fa1e7c7dffb643 files/digest-meld-0.8.2 58
-MD5 b07a3111398c4a37e7f74ddfae048835 files/meld-0.8.2-gentoo.diff 1971
+MD5 5fb4bb4cf227397160317e332613f923 files/meld-0.8.2-gentoo.diff 1637
diff --git a/dev-util/meld/files/meld-0.8.2-gentoo.diff b/dev-util/meld/files/meld-0.8.2-gentoo.diff
index b692e36a148b..c93c142444b2 100644
--- a/dev-util/meld/files/meld-0.8.2-gentoo.diff
+++ b/dev-util/meld/files/meld-0.8.2-gentoo.diff
@@ -1,6 +1,5 @@
-diff -ur meld-0.8.2.orig/meld meld-0.8.2/meld
---- meld-0.8.2.orig/meld	2003-07-01 20:06:46.000000000 +0000
-+++ meld-0.8.2/meld	2003-07-01 20:08:33.000000000 +0000
+--- meld-0.8.2.orig/meld
++++ meld-0.8.2/meld
 @@ -52,6 +52,12 @@
      print "Due to incompatible API changes some functions may not operate as expected."
  
@@ -14,9 +13,8 @@ diff -ur meld-0.8.2.orig/meld meld-0.8.2/meld
  # main
  #
  import meldapp
-diff -ur meld-0.8.2.orig/meld.desktop meld-0.8.2/meld.desktop
---- meld-0.8.2.orig/meld.desktop	2003-07-01 20:06:46.000000000 +0000
-+++ meld-0.8.2/meld.desktop	2003-07-01 20:09:17.000000000 +0000
+--- meld-0.8.2.orig/meld.desktop
++++ meld-0.8.2/meld.desktop
 @@ -6,6 +6,6 @@
  Comment=Compare and merge your files.
  TryExec=meld
@@ -25,27 +23,32 @@ diff -ur meld-0.8.2.orig/meld.desktop meld-0.8.2/meld.desktop
  Terminal=false
  Categories=GNOME;Application;Development;
 +Icon=/usr/share/meld/glade2/pixmaps/icon.png
-diff -ur meld-0.8.2.orig/meldapp.py meld-0.8.2/meldapp.py
---- meld-0.8.2.orig/meldapp.py	2003-07-01 20:06:46.000000000 +0000
-+++ meld-0.8.2/meldapp.py	2003-07-01 20:10:27.000000000 +0000
+--- meld-0.8.2.orig/meldapp.py
++++ meld-0.8.2/meldapp.py
 @@ -453,7 +453,7 @@
          gnome.url_show("http://meld.sourceforge.net")
  
      def on_menu_users_manual_activate(self, button):
 -        gnome.url_show("file:///"+os.path.abspath(misc.appdir("manual/index.html") ) )
-+	gnome.url_show("file:///usr/share/doc/meld-0.8.2/html/index.html")
++        gnome.url_show("file:///usr/share/doc/meld-0.8.2/html/index.html")
  
      def on_menu_about_activate(self, *extra):
          about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about")
-diff -ur meld-0.8.2.orig/misc.py meld-0.8.2/misc.py
---- meld-0.8.2.orig/misc.py	2003-07-01 20:06:46.000000000 +0000
-+++ meld-0.8.2/misc.py	2003-07-01 20:16:42.000000000 +0000
-@@ -49,7 +49,7 @@
+--- meld-0.8.2.orig/misc.py
++++ meld-0.8.2/misc.py
+@@ -49,12 +49,7 @@
  def appdir(pathin):
      """Return where the application is installed.
      """
 -    where = os.path.dirname(sys.argv[0])
-+    where = /usr/share/meld
-     pathout = os.path.join( where, pathin )
-     if not os.path.exists(pathout):
-         run_dialog("Cannot find '%s'\nI looked in '%s'\n(%s)" % (pathin,where,pathout), gtk.MESSAGE_ERROR)
+-    pathout = os.path.join( where, pathin )
+-    if not os.path.exists(pathout):
+-        run_dialog("Cannot find '%s'\nI looked in '%s'\n(%s)" % (pathin,where,pathout), gtk.MESSAGE_ERROR)
+-        sys.exit(1)
+-    return pathout
++    return os.path.join("/usr/share/meld", pathin)
+ 
+ class struct:
+     """Similar to a dictionary except that members may be accessed as s.member.
+
+
diff --git a/dev-util/meld/meld-0.8.2.ebuild b/dev-util/meld/meld-0.8.2.ebuild
index a911414073bb..f14738597aea 100644
--- a/dev-util/meld/meld-0.8.2.ebuild
+++ b/dev-util/meld/meld-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.8.2.ebuild,v 1.1 2003/07/01 20:19:16 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.8.2.ebuild,v 1.2 2003/07/06 00:06:56 liquidx Exp $
 
 DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
 HOMEPAGE="http://meld.sourceforge.net/"
@@ -20,7 +20,7 @@ DEPEND=">=dev-lang/python-2.2
 
 src_unpack(){
     unpack ${A} ; cd ${S}
-#    epatch ${FILESDIR}/${P}-gentoo.diff
+    epatch ${FILESDIR}/${P}-gentoo.diff
 } 
 
 src_install() {