diff options
| author | Lenard Spencer <lenard@lenardspencer.com> | 2017-06-19 06:52:22 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:27:26 -0500 |
| commit | 2012566954daf6273ece3130bdf17b8eee8aaf55 (patch) | |
| tree | 07e19bd24196bbd5ba5c8053a5e9d4b91c855851 | |
| parent | 354bc6c32bef6a1189755e3ebe784742bafbabfb (diff) | |
misc/gourmet: Switch from tostring to tobytes in the code.
This is needed for the newer python-2.7.x.
Include two additional dependencies
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | misc/gourmet/gourmet.SlackBuild | 5 | ||||
| -rw-r--r-- | misc/gourmet/gourmet.info | 2 | ||||
| -rw-r--r-- | misc/gourmet/slack-desc | 2 | ||||
| -rw-r--r-- | misc/gourmet/tostring-to-tobytes.patch | 26 |
4 files changed, 32 insertions, 3 deletions
diff --git a/misc/gourmet/gourmet.SlackBuild b/misc/gourmet/gourmet.SlackBuild index e9a2f0f93dd7..0121943095d5 100644 --- a/misc/gourmet/gourmet.SlackBuild +++ b/misc/gourmet/gourmet.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=gourmet VERSION=${VERSION:-0.17.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch to replace removed tostring() with tobytes() +patch -p1 < $CWD/tostring-to-tobytes.patch + python setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/misc/gourmet/gourmet.info b/misc/gourmet/gourmet.info index 16bbef1a6578..64f0f2590289 100644 --- a/misc/gourmet/gourmet.info +++ b/misc/gourmet/gourmet.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/thinkle/gourmet/archive/0.17.4.tar.gz" MD5SUM="937334364abc3093709a604c1d473e9f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="SQLAlchemy python-distutils-extra reportlab pygtkspell gst0-python python-elib.intl" +REQUIRES="SQLAlchemy lxml python-distutils-extra reportlab pygtkspell gst0-python python-elib.intl pypoppler" MAINTAINER="Erwin van Zanten" EMAIL="e.van.zanten.evz@gmail.com" diff --git a/misc/gourmet/slack-desc b/misc/gourmet/slack-desc index 16eb4722a429..ae51c1b38cc4 100644 --- a/misc/gourmet/slack-desc +++ b/misc/gourmet/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -gourmet: gourmet (A Recipe organizer for Linux) +gourmet: Gourmet (a recipe organizer for Linux) gourmet: gourmet: Gourmet Recipe Manager is a recipe-organizer that allows you gourmet: to collect, search, organize, and browse your recipes. diff --git a/misc/gourmet/tostring-to-tobytes.patch b/misc/gourmet/tostring-to-tobytes.patch new file mode 100644 index 000000000000..e42c59403d51 --- /dev/null +++ b/misc/gourmet/tostring-to-tobytes.patch @@ -0,0 +1,26 @@ +diff --git a/gourmet/gtk_extras/ratingWidget.py b/gourmet/gtk_extras/ratingWidget.py +index 0e01735..efa6463 100644 +--- a/gourmet/gtk_extras/ratingWidget.py ++++ b/gourmet/gtk_extras/ratingWidget.py +@@ -135,7 +135,7 @@ class StarGenerator: + if is_rgba: rowstride = 4 + else: rowstride = 3 + pb=gtk.gdk.pixbuf_new_from_data( +- image.tostring(), ++ image.tobytes(), + gtk.gdk.COLORSPACE_RGB, + is_rgba, + 8, +diff --git a/gourmet/plugins/browse_recipes/icon_helpers.py b/gourmet/plugins/browse_recipes/icon_helpers.py +index 61c772c..2e7b08b 100644 +--- a/gourmet/plugins/browse_recipes/icon_helpers.py ++++ b/gourmet/plugins/browse_recipes/icon_helpers.py +@@ -38,7 +38,7 @@ def get_pixbuf_from_image (image): + if is_rgba: rowstride = 4 + else: rowstride = 3 + pb=gtk.gdk.pixbuf_new_from_data( +- image.tostring(), ++ image.tobytes(), + gtk.gdk.COLORSPACE_RGB, + is_rgba, + 8, |