summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-misc/gourmet/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-misc/gourmet/files')
-rw-r--r--app-misc/gourmet/files/desktop-entry.patch10
-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-0.17.0.patch10
-rw-r--r--app-misc/gourmet/files/no-docs.patch10
-rw-r--r--app-misc/gourmet/files/nutritional-db-fix.patch29
6 files changed, 101 insertions, 0 deletions
diff --git a/app-misc/gourmet/files/desktop-entry.patch b/app-misc/gourmet/files/desktop-entry.patch
new file mode 100644
index 000000000000..b79aa5f7b770
--- /dev/null
+++ b/app-misc/gourmet/files/desktop-entry.patch
@@ -0,0 +1,10 @@
+--- gourmet.desktop.in
++++ gourmet.desktop.in
+@@ -4,6 +4,6 @@ _Comment=Organize recipes, create shopping lists, calculate nutritional informat
+ Exec=gourmet
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;Utility;
++Categories=GNOME;Utility;
+ StartupNotify=true
+ Icon=gourmet
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
new file mode 100644
index 000000000000..2ddbd553222f
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000000..5c2bc3161baa
--- /dev/null
+++ b/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
@@ -0,0 +1,13 @@
+--- 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-0.17.0.patch b/app-misc/gourmet/files/no-docs-0.17.0.patch
new file mode 100644
index 000000000000..9002a2ef3384
--- /dev/null
+++ b/app-misc/gourmet/files/no-docs-0.17.0.patch
@@ -0,0 +1,10 @@
+--- setup.py 2014-03-02 14:56:56.090600468 -0500
++++ setup.py 2014-03-02 14:57:00.184465687 -0500
+@@ -141,7 +141,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'])])
+
+ return files
+
diff --git a/app-misc/gourmet/files/no-docs.patch b/app-misc/gourmet/files/no-docs.patch
new file mode 100644
index 000000000000..0a2aa7eeec41
--- /dev/null
+++ b/app-misc/gourmet/files/no-docs.patch
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..4779551c89d8
--- /dev/null
+++ b/app-misc/gourmet/files/nutritional-db-fix.patch
@@ -0,0 +1,29 @@
+--- 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