rpms/hplip/devel hplip-no-asm.patch, NONE, 1.1 hplip.spec, 1.220, 1.221

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10100

Modified Files:
	hplip.spec 
Added Files:
	hplip-no-asm.patch 
Log Message:
* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
- Make sure to avoid handwritten asm.
- Don't use obsolete configure options.


hplip-no-asm.patch:
 ipmain.c |    3 ---
 xfax.c   |   13 -------------
 2 files changed, 16 deletions(-)

--- NEW FILE hplip-no-asm.patch ---
diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
--- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-19 11:35:39.770825475 +0100
+++ hplip-3.9.8/ip/ipmain.c	2009-08-19 11:36:25.767828346 +0100
@@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
 void fatalBreakPoint (void)
 {
    /* do nothing */
-#if defined _DEBUG
-    __asm int 3;
-#endif
    PRINT0 (_T("\nhit fatalBreakPoint!\n"));
 }
 
diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
--- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-19 11:35:45.484827783 +0100
+++ hplip-3.9.8/ip/xfax.c	2009-08-19 11:36:39.815701961 +0100
@@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
                  & ((1u<<n_bits) - 1u);                                      \
 }
 
-#if 0
-
-#define BITS_LOAD(g, num_bits, par_result) {                                 \
-    int n_bits = (int)(num_bits);                                            \
-                                                                             \
-    par_result = g->gb_cache;                                                \
-                                                                             \
-    asm ("extract %1,%2,%0"                                                  \
-        : "=d" (par_result)                                                  \
-        : "dI" (g->gb_cache_cnt - n_bits), "dI" (n_bits), "0" (par_result)); \
-}
-
-#endif
 
 
 


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -p -r1.220 -r1.221
--- hplip.spec	19 Aug 2009 10:14:08 -0000	1.220
+++ hplip.spec	19 Aug 2009 10:38:56 -0000	1.221
@@ -16,6 +16,7 @@ Source0: http://kent.dl.sourceforge.net/
 Patch1: hplip-hpcups-reorder.patch
 Patch2: hplip-strstr-const.patch
 Patch3: hplip-ui-optional.patch
+Patch4: hplip-no-asm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(pre): /sbin/service
@@ -105,10 +106,13 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 # Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
 %patch3 -p1 -b .ui-optional
 
+# Make sure to avoid handwritten asm.
+%patch4 -p1 -b .no-asm
+
 %build
-%configure --disable-foomatic-xml-install --disable-cups-install \
+%configure \
 	--enable-scan-build --enable-gui-build --enable-fax-build \
-	--disable-foomatic-rip-hplip-install --enable-dbus \
+	--disable-foomatic-rip-hplip-install \
 	--enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
 	--enable-hpijs-install --enable-udev-acl-rules
 
@@ -306,6 +310,10 @@ fi
 exit 0
 
 %changelog
+* Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-6
+- Make sure to avoid handwritten asm.
+- Don't use obsolete configure options.
+
 * Wed Aug 19 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-5
 - Use upstream udev rules instead of hal policy (bug #518172).
 - Removed unnecessary dependency on PyQt as we only use PyQt4 now.