commit ddiwrapper

11 Dec 2006

Hello community,

here is the log from the commit of package ddiwrapper
checked in at Mon Dec 11 01:37:52 CET 2006.

--------

--- arch/i386/ddiwrapper/ddiwrapper.changes	2006-10-19 14:08:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/ddiwrapper/ddiwrapper.changes	2006-12-08 19:03:58.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec  8 19:03:49 CET 2006 - meissner@suse.de
+
+- removed error_status_t definition to fix build
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ddiwrapper.spec ++++++
--- /var/tmp/diff_new_pack.IjHR8g/_old	2006-12-11 01:37:37.000000000 +0100
+++ /var/tmp/diff_new_pack.IjHR8g/_new	2006-12-11 01:37:37.000000000 +0100
@@ -11,11 +11,11 @@
 
 Name:           ddiwrapper
 BuildRequires:  e2fsprogs-devel wine wine-devel
-License:        GNU General Public License (GPL) - all versions, Public Domain, Freeware
+License:        GNU General Public License (GPL), Public Domain, Freeware
 Group:          Hardware/Printing
 Autoreqprov:    on
 Version:        0.2
-Release:        24
+Release:        40
 Summary:        Support for Windows Printer Drivers under Linux
 Source:         %name-%version.tar.gz
 Patch:          ddiwrapper-newwine.patch
@@ -68,6 +68,8 @@
 /usr/share/cups/model/ddiwrapper.ppd.gz
 
 %changelog -n ddiwrapper
+* Fri Dec 08 2006 - meissner@suse.de
+- removed error_status_t definition to fix build
 * Thu Oct 19 2006 - meissner@suse.de
 - Removed some type definitions now present in WINE itself.
 * Wed Jan 25 2006 - mls@suse.de

++++++ ddiwrapper-newwine.patch ++++++
--- /var/tmp/diff_new_pack.IjHR8g/_old	2006-12-11 01:37:37.000000000 +0100
+++ /var/tmp/diff_new_pack.IjHR8g/_new	2006-12-11 01:37:37.000000000 +0100
@@ -1,22 +1,5 @@
-diff -ru ddiwrapper/gdi32/Makefile ddiwrapper/gdi32/Makefile
---- ddiwrapper/gdi32/Makefile	2004-12-13 13:20:55.000000000 +0100
-+++ ddiwrapper/gdi32/Makefile	2005-10-13 15:14:57.000000000 +0200
-@@ -105,10 +105,7 @@
- 
- ### Target specific build rules
- 
--$(gdi32_dll_MODULE).dbg.c: $(gdi32_dll_C_SRCS) $(gdi32_dll_CXX_SRCS)
--	$(WINEBUILD) -o $@ --debug -C$(SRCDIR) $(gdi32_dll_C_SRCS) $(gdi32_dll_CXX_SRCS)
--
--$(gdi32_dll_MODULE).so: $(gdi32_dll_MODULE).dbg.o $(gdi32_dll_OBJS)
--	$(CC) -shared $(gdi32_dll_MODULE).spec $(gdi32_dll_LDFLAGS) -o $@ $(gdi32_dll_OBJS) $(gdi32_dll_MODULE).dbg.o $(gdi32_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(gdi32_dll_DLLS:%=-l%) $(gdi32_dll_LIBRARIES:%=-l%)
-+$(gdi32_dll_MODULE).so: $(gdi32_dll_OBJS)
-+	$(CC) -shared $(gdi32_dll_MODULE).spec $(gdi32_dll_LDFLAGS) -o $@ $(gdi32_dll_OBJS) $(gdi32_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(gdi32_dll_DLLS:%=-l%) $(gdi32_dll_LIBRARIES:%=-l%)
- 
- 
-diff -ru ddiwrapper/Makefile ddiwrapper/Makefile
---- ddiwrapper/Makefile	2004-11-10 17:29:18.000000000 +0100
-+++ ddiwrapper/Makefile	2005-10-13 15:14:33.000000000 +0200
+--- ddiwrapper/Makefile
++++ ddiwrapper/Makefile
 @@ -123,10 +123,7 @@
  
  ### Target specific build rules
@@ -30,24 +13,35 @@
 +	$(CC) $(ddiwrapper_exe_LDFLAGS) -o $@ $(ddiwrapper_exe_OBJS) $(ddiwrapper_exe_LIBRARY_PATH) $(LIBRARY_PATH) $(ddiwrapper_exe_DLLS:%=-l%) $(ddiwrapper_exe_LIBRARIES:%=-l%)
  
  
-diff -ru ddiwrapper/winspool/Makefile ddiwrapper/winspool/Makefile
---- ddiwrapper/winspool/Makefile	2004-11-10 17:27:30.000000000 +0100
-+++ ddiwrapper/winspool/Makefile	2005-10-13 15:15:12.000000000 +0200
+--- ddiwrapper/gdi32/Makefile
++++ ddiwrapper/gdi32/Makefile
 @@ -105,10 +105,7 @@
  
  ### Target specific build rules
  
--$(winspool_dll_MODULE).dbg.c: $(winspool_dll_C_SRCS) $(winspool_dll_CXX_SRCS)
--	$(WINEBUILD) -o $@ --debug -C$(SRCDIR) $(winspool_dll_C_SRCS) $(winspool_dll_CXX_SRCS)
+-$(gdi32_dll_MODULE).dbg.c: $(gdi32_dll_C_SRCS) $(gdi32_dll_CXX_SRCS)
+-	$(WINEBUILD) -o $@ --debug -C$(SRCDIR) $(gdi32_dll_C_SRCS) $(gdi32_dll_CXX_SRCS)
 -
--$(winspool_dll_MODULE).so: $(winspool_dll_MODULE).dbg.o $(winspool_dll_OBJS)
--	$(CC) -shared $(winspool_dll_MODULE).spec $(winspool_dll_LDFLAGS) -o $@ $(winspool_dll_OBJS) $(winspool_dll_MODULE).dbg.o $(winspool_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(winspool_dll_DLLS:%=-l%) $(winspool_dll_LIBRARIES:%=-l%)
-+$(winspool_dll_MODULE).so: $(winspool_dll_OBJS)
-+	$(CC) -shared $(winspool_dll_MODULE).spec $(winspool_dll_LDFLAGS) -o $@ $(winspool_dll_OBJS) $(winspool_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(winspool_dll_DLLS:%=-l%) $(winspool_dll_LIBRARIES:%=-l%)
+-$(gdi32_dll_MODULE).so: $(gdi32_dll_MODULE).dbg.o $(gdi32_dll_OBJS)
+-	$(CC) -shared $(gdi32_dll_MODULE).spec $(gdi32_dll_LDFLAGS) -o $@ $(gdi32_dll_OBJS) $(gdi32_dll_MODULE).dbg.o $(gdi32_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(gdi32_dll_DLLS:%=-l%) $(gdi32_dll_LIBRARIES:%=-l%)
++$(gdi32_dll_MODULE).so: $(gdi32_dll_OBJS)
++	$(CC) -shared $(gdi32_dll_MODULE).spec $(gdi32_dll_LDFLAGS) -o $@ $(gdi32_dll_OBJS) $(gdi32_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(gdi32_dll_DLLS:%=-l%) $(gdi32_dll_LIBRARIES:%=-l%)
  
  
---- ddiwrapper/include/winddk.h.xx	2006-10-19 13:56:50.000000000 +0200
-+++ ddiwrapper/include/winddk.h	2006-10-19 13:57:04.000000000 +0200
+--- ddiwrapper/include/basetyps.h
++++ ddiwrapper/include/basetyps.h
+@@ -129,9 +129,7 @@
+ //typedef CLSID *REFCLSID;
+ typedef GUID FMTID;
+ //typedef FMTID *REFFMTID;
+-typedef unsigned long error_status_t;
+ #define uuid_t UUID
+-typedef unsigned long PROPID;
+ 
+ #ifndef _REFGUID_DEFINED
+ #if defined (__cplusplus) && !defined (CINTERFACE)
+--- ddiwrapper/include/winddk.h
++++ ddiwrapper/include/winddk.h
 @@ -133,7 +133,6 @@
  typedef LONG KPRIORITY;
  typedef UCHAR KIRQL, *PKIRQL;
@@ -56,13 +50,18 @@
  typedef CCHAR KPROCESSOR_MODE;
  
  typedef enum _MODE {
---- ddiwrapper/include/basetyps.h.xx	2006-10-19 13:57:13.000000000 +0200
-+++ ddiwrapper/include/basetyps.h	2006-10-19 13:57:19.000000000 +0200
-@@ -131,7 +131,6 @@
- //typedef FMTID *REFFMTID;
- typedef unsigned long error_status_t;
- #define uuid_t UUID
--typedef unsigned long PROPID;
- 
- #ifndef _REFGUID_DEFINED
- #if defined (__cplusplus) && !defined (CINTERFACE)
+--- ddiwrapper/winspool/Makefile
++++ ddiwrapper/winspool/Makefile
+@@ -105,10 +105,7 @@
+ 
+ ### Target specific build rules
+ 
+-$(winspool_dll_MODULE).dbg.c: $(winspool_dll_C_SRCS) $(winspool_dll_CXX_SRCS)
+-	$(WINEBUILD) -o $@ --debug -C$(SRCDIR) $(winspool_dll_C_SRCS) $(winspool_dll_CXX_SRCS)
+-
+-$(winspool_dll_MODULE).so: $(winspool_dll_MODULE).dbg.o $(winspool_dll_OBJS)
+-	$(CC) -shared $(winspool_dll_MODULE).spec $(winspool_dll_LDFLAGS) -o $@ $(winspool_dll_OBJS) $(winspool_dll_MODULE).dbg.o $(winspool_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(winspool_dll_DLLS:%=-l%) $(winspool_dll_LIBRARIES:%=-l%)
++$(winspool_dll_MODULE).so: $(winspool_dll_OBJS)
++	$(CC) -shared $(winspool_dll_MODULE).spec $(winspool_dll_LDFLAGS) -o $@ $(winspool_dll_OBJS) $(winspool_dll_LIBRARY_PATH) $(LIBRARY_PATH) $(winspool_dll_DLLS:%=-l%) $(winspool_dll_LIBRARIES:%=-l%)
+ 
+ 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)