summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/gourmet')
-rw-r--r--app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch29
-rw-r--r--app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch13
-rw-r--r--app-misc/gourmet/files/no-docs.patch10
-rw-r--r--app-misc/gourmet/files/nutritional-db-fix.patch29
4 files changed, 0 insertions, 81 deletions
diff --git a/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch b/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
deleted file mode 100644
index 2ddbd553222f..000000000000
--- a/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4eb110bbbc58af97fd6994b96d9482783037058d Mon Sep 17 00:00:00 2001
-From: Bernhard Reiter <ockham@raz.or.at>
-Date: Wed, 13 Nov 2013 15:24:09 +0100
-Subject: [PATCH] Fix another PIL import.
-
-Reported at https://answers.launchpad.net/gourmet/+question/238352#comment-6
----
- gourmet/gtk_extras/thumbnail.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gourmet/gtk_extras/thumbnail.py b/gourmet/gtk_extras/thumbnail.py
-index d096126..ea7e72c 100644
---- a/gourmet/gtk_extras/thumbnail.py
-+++ b/gourmet/gtk_extras/thumbnail.py
-@@ -81,7 +81,10 @@ def create_thumbnail (path, thumbpath, uri, type="large"):
- info['Software']='Gourmet Recipe Manager'
- info['URI']=str(uri)
- # now we must create our image guy
-- import PngImagePlugin
-+ try:
-+ from PIL import PngImagePlugin
-+ except ImportError:
-+ import PngImagePlugin
- pnginfo = PngImagePlugin.PngInfo()
-
- for k,v in info.items():
---
-1.8.4
-
diff --git a/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch b/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
deleted file mode 100644
index 5c2bc3161baa..000000000000
--- a/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gourmet/gtk_extras/dialog_extras.py 2013-10-31 09:03:08.456469166 -0500
-+++ gourmet/gtk_extras/dialog_extras.py 2013-10-31 09:04:18.175067008 -0500
-@@ -1096,7 +1096,9 @@
- buttons=None
- ):
- FileSelectorDialog.__init__(self, title, filename, filters, action, set_filter, buttons)
-- self.fsd.set_current_folder(get_user_special_dir(USER_DIRECTORY_PICTURES))
-+ pictures_dir = get_user_special_dir(USER_DIRECTORY_PICTURES)
-+ if not pictures_dir == None:
-+ self.fsd.set_current_folder(pictures_dir)
-
- def post_dialog (self):
- self.preview = gtk.Image()
diff --git a/app-misc/gourmet/files/no-docs.patch b/app-misc/gourmet/files/no-docs.patch
deleted file mode 100644
index 0a2aa7eeec41..000000000000
--- a/app-misc/gourmet/files/no-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py 2013-03-16 15:26:19.760162984 -0400
-+++ setup.py 2013-03-16 15:26:26.966497095 -0400
-@@ -119,7 +119,6 @@
-
- files.extend(data_files)
- files.extend([(os.path.join(base,'ui'), glob.glob(os.path.join('ui','*.ui')))])
-- files.extend([(os.path.join('share','doc','gourmet'), ['FAQ', 'LICENSE'])])
- #print 'DATA FILES:',files
- return files
-
diff --git a/app-misc/gourmet/files/nutritional-db-fix.patch b/app-misc/gourmet/files/nutritional-db-fix.patch
deleted file mode 100644
index 4779551c89d8..000000000000
--- a/app-misc/gourmet/files/nutritional-db-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gourmet/plugins/nutritional_information/data_plugin.py 2013-08-28 19:13:38.000000000 -0400
-+++ gourmet/plugins/nutritional_information/data_plugin.py 2013-10-30 23:37:51.358616037 -0400
-@@ -20,7 +20,7 @@
- pass
- self.db._setup_object_for_table(self.db.usda_weights_table, UsdaWeight)
-
-- def setup_nutrition_conversions_table (self):
-+ def setup_nutritionconversions_table (self):
- self.db.nutritionconversions_table = Table('nutritionconversions',self.db.metadata,
- Column('id',Integer(),primary_key=True),
- Column('ingkey',String(length=255),**{}),
-@@ -58,7 +58,7 @@
-
- self.setup_usda_weights_table()
- self.setup_nutritionaliases_table()
-- self.setup_nutrition_conversions_table()
-+ self.setup_nutritionconversions_table()
- self.db.do_add_nutrition = self.do_add_nutrition
-
- def update_version (self, gourmet_stored, plugin_stored, gourmet_current, plugin_current):
-@@ -68,7 +68,7 @@
- print 'RECREATE USDA WEIGHTS TABLE'
- self.db.alter_table('usda_weights',self.setup_usda_weights_table,{},
- [name for lname,name,typ in parser_data.WEIGHT_FIELDS])
-- self.db.alter_table('nutritionconversions',self.setup_nutrition_conversions_table,{},
-+ self.db.alter_table('nutritionconversions',self.setup_nutritionconversions_table,{},
- ['ingkey','unit','factor'])
- if plugin_stored == '1':
- # Add choline