diff options
Diffstat (limited to 'x11-libs/dnd/files')
| -rw-r--r-- | x11-libs/dnd/files/Makefile-fix.patch | 44 | ||||
| -rw-r--r-- | x11-libs/dnd/files/dnd-1.1-gentoo.diff | 35 |
2 files changed, 79 insertions, 0 deletions
diff --git a/x11-libs/dnd/files/Makefile-fix.patch b/x11-libs/dnd/files/Makefile-fix.patch new file mode 100644 index 000000000000..a22a1b888ce7 --- /dev/null +++ b/x11-libs/dnd/files/Makefile-fix.patch @@ -0,0 +1,44 @@ +--- Makefile.in.orig 1997-05-22 22:18:22.000000000 -0400 ++++ Makefile.in 2004-06-16 14:41:19.673035936 -0400 +@@ -16,7 +16,7 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-LIB_DIR = @libdir@ ++LIB_DIR = $(DESTDIR)@libdir@ +-INC_DIR = @includedir@/OffiX ++INC_DIR = $(DESTDIR)@includedir@/OffiX + + COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c +@@ -42,19 +42,22 @@ + $(COMPILE) dndtest.c + $(LINK) dndtest.o -L. -lDnd $(LIBS) + +-libDnd.a: DragAndDrop.c +- rm -f DragAndDrop.o +- $(COMPILE) DragAndDrop.c ++libDnd.a: DragAndDropC.o + rm -f libDnd.a +- $(AR) cru libDnd.a DragAndDrop.o ++ $(AR) cru libDnd.a DragAndDropC.o + $(RANLIB) libDnd.a + +-libDnd++.a: DragAndDrop.c +- rm -f DragAndDrop.o DragAndDrop.cxx +- ln -s DragAndDrop.c DragAndDrop.cxx +- $(CXXCOMPILE) DragAndDrop.cxx ++DragAndDropC.o: DragAndDrop.c ++ rm -f DragAndDropC.o ++ $(COMPILE) DragAndDrop.c -o DragAndDropC.o ++ ++DragAndDropCpp.o: DragAndDrop.c ++ rm -f DragAndDropCpp.o ++ $(CXXCOMPILE) DragAndDrop.c -o DragAndDropCpp.o ++ ++libDnd++.a: DragAndDropCpp.o + rm -f libDnd++.a +- $(AR) cru libDnd++.a DragAndDrop.o ++ $(AR) cru libDnd++.a DragAndDropCpp.o + $(RANLIB) libDnd++.a + + clean: diff --git a/x11-libs/dnd/files/dnd-1.1-gentoo.diff b/x11-libs/dnd/files/dnd-1.1-gentoo.diff new file mode 100644 index 000000000000..970c5e473650 --- /dev/null +++ b/x11-libs/dnd/files/dnd-1.1-gentoo.diff @@ -0,0 +1,35 @@ +--- DragAndDrop.c.orig Tue Sep 25 21:14:11 2001 ++++ DragAndDrop.c Tue Sep 25 21:14:16 2001 +@@ -81,23 +81,23 @@ + + static CursorData DndCursor[DndEND]={ + { 0,0,NULL,NULL,0,0,0 }, +- { grey_width, grey_height,grey_bits,grey_mask_bits, ++ { grey_width, grey_height,(char*)grey_bits,(char*)grey_mask_bits, + grey_x_hot,grey_y_hot}, +- { file_width,file_height,file_bits,file_mask_bits, ++ { file_width,file_height,(char*)file_bits,(char*)file_mask_bits, + file_x_hot,file_y_hot}, +- { files_width,files_height,files_bits,files_mask_bits, ++ { files_width,files_height,(char*)files_bits,(char*)files_mask_bits, + files_x_hot,files_y_hot}, +- { text_width,text_height,text_bits,text_mask_bits, ++ { text_width,text_height,(char*)text_bits,(char*)text_mask_bits, + text_x_hot,text_y_hot }, +- { dir_width,dir_height,dir_bits,dir_mask_bits, ++ { dir_width,dir_height,(char*)dir_bits,(char*)dir_mask_bits, + dir_x_hot,dir_y_hot }, +- { link_width,link_height,link_bits,link_mask_bits, ++ { link_width,link_height,(char*)link_bits,(char*)link_mask_bits, + link_x_hot,link_y_hot}, +- { app_width,app_height,app_bits,app_mask_bits, ++ { app_width,app_height,(char*)app_bits,(char*)app_mask_bits, + app_x_hot,app_y_hot }, +- { url_width,url_height,url_bits,url_mask_bits, ++ { url_width,url_height,(char*)url_bits,(char*)url_mask_bits, + url_x_hot,url_y_hot }, +- { mime_width,mime_height,mime_bits,mime_mask_bits, ++ { mime_width,mime_height,(char*)mime_bits,(char*)mime_mask_bits, + mime_x_hot,mime_y_hot } + }; + |