Attachment 1474097 Details for Bug 1606784 – Hack to fix zbar build

[patch] Hack to fix zbar build

zbar_fedora29_hack_for_codegen_to_work.patch (text/plain), 2.86 KB, created by Mauro Carvalho Chehab on 2018-08-07 20:30:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mauro Carvalho Chehab

Created: 2018-08-07 20:30:49 UTC

Size: 2.86 KB

patch

obsolete

>diff --git a/examples/upcrpc.py b/examples/upcrpc.py
>index 2e2a66867c8c..bc0bc8b884c6 100755
>--- a/examples/upcrpc.py
>+++ b/examples/upcrpc.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> from xmlrpclib import ServerProxy
> import sys, re
> 
>diff --git a/pygtk/Makefile.am.inc b/pygtk/Makefile.am.inc
>index 433412c8bcb5..33c65ad8975b 100644
>--- a/pygtk/Makefile.am.inc
>+++ b/pygtk/Makefile.am.inc
>@@ -18,6 +18,8 @@ pygtk/zbarpygtk.defs: include/zbar/zbargtk.h
> 	$(SED) -e 's/Z_TYPE_BAR_/ZBAR_TYPE_/' > $@
> 
> pygtk/%.c: pygtk/%.defs $(srcdir)/pygtk/zbarpygtk.override
>-	$(PYGTK_CODEGEN) --prefix zbarpygtk \
>+	env $(PYGTK_CODEGEN) |sed s,python,python2, > ./codegen.sh
>+	chmod 755 ./codegen.sh
>+	./codegen.sh --prefix zbarpygtk \
>             --register $(PYGTK_DEFS)/gdk-types.defs \
> 	    --override $(srcdir)/pygtk/zbarpygtk.override $< > $@
>diff --git a/python/examples/processor.py b/python/examples/processor.py
>index b8f20f053dc6..e0ae92d30ceb 100644
>--- a/python/examples/processor.py
>+++ b/python/examples/processor.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> from sys import argv
> import zbar
> 
>diff --git a/python/examples/read_one.py b/python/examples/read_one.py
>index 7a18c9998c0f..3b881e5d133f 100644
>--- a/python/examples/read_one.py
>+++ b/python/examples/read_one.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> from sys import argv
> import zbar
> 
>diff --git a/python/examples/scan_image.py b/python/examples/scan_image.py
>index e26cb427064b..8b8bce0323d4 100644
>--- a/python/examples/scan_image.py
>+++ b/python/examples/scan_image.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> from sys import argv
> import zbar
> from PIL import Image
>diff --git a/python/setup.py b/python/setup.py
>index f7639c57bd9d..585baf0be43e 100644
>--- a/python/setup.py
>+++ b/python/setup.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> from distutils.core import setup, Extension
> 
> setup(
>diff --git a/python/test/test_zbar.py b/python/test/test_zbar.py
>index 5b63de47adb3..b5aad03ca51b 100755
>--- a/python/test/test_zbar.py
>+++ b/python/test/test_zbar.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> import sys, os, re
> import unittest as ut
> import zbar
>diff --git a/test/barcodetest.py b/test/barcodetest.py
>index e271f0681116..488df70db7c6 100755
>--- a/test/barcodetest.py
>+++ b/test/barcodetest.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> 
> import sys, re, unittest as UT, xml.etree.ElementTree as ET
> from os import path, getcwd
>diff --git a/test/test_pygtk.py b/test/test_pygtk.py
>index 902b8ff62266..ab413894e086 100755
>--- a/test/test_pygtk.py
>+++ b/test/test_pygtk.py
>@@ -1,4 +1,4 @@
>-#!/usr/bin/env python
>+#!/usr/bin/ env python2
> #------------------------------------------------------------------------
> #  Copyright 2008-2009 (c) Jeff Brown <spadix@users.sourceforge.net>
> #

Actions: View | Diff

Attachments on bug 1606784: 1469233 | 1469234 | 1469235 | 1474097 | 1474098