Attachment 5909 Details for Bug 15266 – hplip-3.13.2-mga-85_rebuild_python_ui.dpatch

[patch] hplip-3.13.2-mga-85_rebuild_python_ui.dpatch

hplip-3.13.2-mga-85_rebuild_python_ui.dpatch (text/plain), 1.11 KB, created by Vincent D on 2015-02-13 22:19:31 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Vincent D

Created: 2015-02-13 22:19:31 CET

Size: 1.11 KB

patch

obsolete

>Index: hplip-3.15.2/Makefile.am
>===================================================================
>--- hplip-3.15.2/Makefile.am
>+++ hplip-3.15.2/Makefile.am	2015-01-29 13:20:49.000000000 +0200
>@@ -3,6 +3,11 @@
> #
> #  (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP
> #  Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
>+
>+# Generic rules
>+%.py: %.ui
>+	$(PYUIC4) -x -o $@ $<
>+
> INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
> AUTOMAKE_OPTIONS = subdir-objects
> CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
>Index: hplip-3.15.2/configure.in
>===================================================================
>--- hplip-3.15.2/configure.in
>+++ hplip-3.15.2/configure.in	2015-01-29 13:20:58.000000000 +0200
>@@ -531,6 +531,8 @@
>           [FOUND_HEADER=yes; break;])
>    AS_IF([test "x$FOUND_HEADER" != "xyes"],
>           [AC_MSG_ERROR([cannot find python-devel support], 6)])
>+   AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command])
>+   AC_CHECK_TOOLS([PYUIC4], [pyuic4])
> fi
> 
> if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then

Index: hplip-3.15.2/Makefile.am
===================================================================
--- hplip-3.15.2/Makefile.am
+++ hplip-3.15.2/Makefile.am	2015-01-29 13:20:49.000000000 +0200
@@ -3,6 +3,11 @@
 #
 #  (c) 2004-2015 Copyright Hewlett-Packard Development Company, LP
 #  Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
+
+# Generic rules
+%.py: %.ui
+	$(PYUIC4) -x -o $@ $<
+
 INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
 AUTOMAKE_OPTIONS = subdir-objects
 CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
Index: hplip-3.15.2/configure.in
===================================================================
--- hplip-3.15.2/configure.in
+++ hplip-3.15.2/configure.in	2015-01-29 13:20:58.000000000 +0200
@@ -531,6 +531,8 @@
           [FOUND_HEADER=yes; break;])
    AS_IF([test "x$FOUND_HEADER" != "xyes"],
           [AC_MSG_ERROR([cannot find python-devel support], 6)])
+   AC_ARG_VAR([PYUIC4], [PyQT pyuic4 .ui to .py compiler command])
+   AC_CHECK_TOOLS([PYUIC4], [pyuic4])
 fi
 
 if test "$hpijs_only_build" = "no" && test "$scan_build" = "yes" && test "$hpcups_only_build" = "no"; then

Actions: View | Diff

Attachments on bug 15266: 5909 | 5910 | 5911 | 5912 | 6704 | 6705 | 6895 | 6896 | 6897