hplip/85_rebuild_python_ui.dpatch
2016-04-03 18:51:59 +03:00

27 lines
1.1 KiB
Text

diff -Naur hplip-3.16.3.orig/configure.in hplip-3.16.3/configure.in
--- hplip-3.16.3.orig/configure.in 2016-04-03 18:31:41.643757544 +0300
+++ hplip-3.16.3/configure.in 2016-04-03 18:31:41.784759423 +0300
@@ -558,6 +558,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
diff -Naur hplip-3.16.3.orig/Makefile.am hplip-3.16.3/Makefile.am
--- hplip-3.16.3.orig/Makefile.am 2016-04-03 18:31:41.777759330 +0300
+++ hplip-3.16.3/Makefile.am 2016-04-03 18:31:41.784759423 +0300
@@ -3,6 +3,11 @@
#
# (c) 2004-2015 Copyright HP 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/
CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"