diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-07-06 00:07:04 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-07-06 00:07:04 +0000 |
| commit | 0d4b925d1b3d555d9c632f5a7aeb88c5da253b10 (patch) | |
| tree | acf1e850a79ba5ef005f898be0f84444bfec3982 /dev-util/meld/files | |
| parent | Added metadata.xml (diff) | |
| download | historical-0d4b925d1b3d555d9c632f5a7aeb88c5da253b10.tar.gz historical-0d4b925d1b3d555d9c632f5a7aeb88c5da253b10.tar.bz2 historical-0d4b925d1b3d555d9c632f5a7aeb88c5da253b10.zip | |
fix problem starting up
Diffstat (limited to 'dev-util/meld/files')
| -rw-r--r-- | dev-util/meld/files/meld-0.8.2-gentoo.diff | 39 |
1 files changed, 21 insertions, 18 deletions
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. + + |